Better support for XML parsing.