Minor Config refactoring.