Further changes to XPath expressions.