Refactor some config options.