The old* stuff seems reasonably concerning.  Are we actually saving something off that you're aware of/where it seemed like we broke if we did not?  It seems better if we just clobber stuff rather than have code that misses out on events for a while and/or get into situations where something gets dead and then comes back to life as a zombie.