Removed 'if' from lexer/parser tokens