[mayah] Tweak evaluator a bit.