Handle UTF-8 and whitespace better in XML.