Modify ObjectIdDictionary to use ReferenceQueue for cleaning-up WeakReferences

Per discussion on the dev mailing list, the appropriate way to cleanup weak references is to use a ReferenceQueue, instead of iterating over all of the objects. Attached is a patch which implements this fix for ObjectIdDictionary.