Slight config.xml refactoring.