#7 replaced matched delim with tokenizer