Issue #2239079 by quicksketch: Increase the robustness of our update hooks where possible.