Use in-place upgrades where possible in static fields Fixes #790 Some extra safety in DictionaryUpgrader For handling in-place upgrades if key hashes change