Make config file stuff somewhat clearer and easier to understand, and possibly easier to extend later.