More XPath improvements