More whitespace XML cleanup so we can make sense of the structure before changing