Fixes rough edges of new parent-based destroy scheme.