Would be nice if we didn't have to nest these inside the `upgrade_config` function, not that it causes problems other than indentation.