Improve evaluator a bit.