Refactor ExecutorPreference suite to hopefully simplify.