Some more work making sure that objects destroy links to other objects for bug #7936.