Remove the need for TASK_NULL