Remove deprecated EvaluateTask usage for new, easier to update variant.

review by @eed3si9n