[PATCH 0/5] Refactor few old-style XML node lookup loops