Cleanup: Reduce extra blocks in delete and destroy call backs.

Cleanup: Reduce extra blocks in delete and destroy call backs.

Early on I was uncertain at how I should handle this.
I wanted the block design, with anticipation that there would be cases where other code might operate after the first scope ended.
This made for easy and copy and paste (as well as some level of consistency) when switching between different types.

There has been massive changes over time regarding the structure of the delete and destroy functions (which are now call backs).

Most of the blocks end right before the function ends.
Simplify the design in these cases by removing one level of block structure.