xpath.py: Changed order that main and other branches are processed in so it is consistent with the order the branches are specified in the XPath