Comment processing in lexer, refactored