More config refactoring.