Tokenizer: Move 'else if' simplification to tokenize