Fix the lexer for the new changes to the language