Safer CTID hinting during sync (OMG-507)