Fixes to persistence layer to ensure there is only a single canonical version of each object in the system.