Some modifications of the lexer.