- Update ExpressionTokenizer and TemplateTokenizer to be able to tokenize incrementally