Fix hacks of Token class

[asimfarooq5]

Workaround a circular import dependency the Tokens class should eventually be moved to a better location