Merge pull request #3397 from nrwahl2/nrwahl2-xml_attrs3
Start separating XML tree traversal from work