minor cleanup
More work on the lexer transition