Predictable Cleanup Patterns

Structure object hierarchies to ensure predictable destruction order of dependencies.