Fix several leaks of weakRefs
Fix under-retention (related to 0a484bb)
Cleanup: don't need to -weakSelf objects for OOWeakSet

Relates to 0a484bb