More ConfigParser refactoring