update: Perform the cleanup after letting call_outs happen, for convenience/safety