Fleshed out XML/XPath support