Further work on implementing the grammar for XPath 3