Remove remaining XPath usage.