Fix XPath binary expressions