Fix lexer ambiguities