Review Request 36: improve update syncs