Oops, task cleanup handlers were broken all the while!