Minor refactor to XML XPath deserializer and tests.