Minor cleanups to load-config.