Rework CrashRecoveryContextCleanup to provide a simpler way to create cleanup objects...