Fix ordering issue in Core Data sync with iCloud.