Tasks a level deeper. Some cleanup.