Minor changes here that for some reason fix the invocation of the callback on the replaced task.