Evaluator bug fix

Weakening out of scope variables should not happen (we had a flawed
assumption about where the evaluator might be called from...)