Fixing up lexer