Update for OS X build after EvalContext introduction