Add bit more foundational support for deferred deletes