Reformat XML

The XML was becoming unwieldy. Let's run it through an XML tidier.
A cavalcade of -04 updates