Improvements to reformat-xml