Some PersistPtrHolders seem to reference records stored after them. Add a second pass to cope with these cases