Now that we need to track a registry, there's some more cleanup we can do in all of the `new*FromConfig` functions.