Updated CSS2XPath utility