Switch to tokenizer + semantic analyzer