Modified the token enum so there is no need to use pointers.