First-pass cleanup of EvalContextVariablePut/Get