Step one of a nicer config.c is to start yanking out the parts that aren't strictly speaking related to configuration. The big chunks there are the or_state_t code and the generic configuration parser code. Splitting out the generic configuration parser code will also help my sinister plan (legacy/trac#6802) to make configuration parsing nicer.