Improve xml parsing.