Rework XML output.