Fix recently introduced excessive task creation.