Some minor lexer progress.