Little more cleanup in config.c.