Some more task simplifications.