Make lexer smarter about filtering/fixing.