Some XML cleanup.