More lexer changes.