Trimmed the XPath AST even further.

The excessive use of (path) nodes has been dropped and all parsing conflicts
have been dealt with.