Update tokenizer-parser to use assoc lists.