Fix some other instances where we may delete the object prior to the callback
being run during shutdown.