Did further evaluator refactoring.