Reorder some lexical analysis calls.