Alter input XML to more closely match what is produced out of the box