Polishing lexer bugs