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