Merge pull request #482 from micmac1/ast-no-xml-hacks