Rearranged token parsing.