ExpressionTokenizer and Tokenizer now implement a common interface.