[Mantle/remind101] Lots of code cleanup for managed object adaptor uniquing