Tidy up XMLHelper (first pass). Updated XMLHelperSpec.