Add a slightly safer evaluator