Fixing an issue with Tokens creating ambiguities with variables.

Requested by @andreistefanescu