Added tokenization for identifiers.
Clear out old tokenization logic.