Clean up obsolete EvalContext parameters