Incorporate code from Andrei RE: SyncRecord.