Fix tokenizer and parser.