More lexer work