ExpressionEvaluator minor update