Defer some updates in doEditUpdates()