Shuffle things around in the lexer, hopefully nothing broke