First attempt at removing XPath 1.0