Refactored ConcreteToken typedef's.