Merge "Clean up task affinity."