Do not use string manipulation to tweak XML output

Problem/Motivation

At the moment it's very buggy to be using string replacements to tweak XML output, instead we should be using a proper XML manipulation library.
We may need to be careful about memory usage though.

Steps to reproduce

Proposed resolution

Remaining tasks

User interface changes

API changes

Data model changes