fixes the duplicate entries in 1.0.0

This was part of another pull request that won't be merged for a while due to the sweeping changes it contains.

It fixes the bug in `release` and works fine with the `ARC` branch once you remove the `retain` call.

I never made the additional changes discussed on the commit. I’m guessing I’ll need to do that before we merge.