in set_config_option wasn't quite right. Also clean up a couple other things that could have been done better.
