Some minor updates to lexer code.