Add function name token
Create token disambiguator
Use the token disambiguator
Disambiguate axis names
Better leverage disambiguated tokens in the parser
Restructure node parsing to better match grammar
Shorten disambiguation token names