Fix token class over consumption when parsing.