This is part of an ongoing crusade to eliminate EvalContext wherever possible.