Tweaks here and there to produce XML that needs less cleanup