This also fixes a fairly major bug that could have caused config file options to override command-line ones, with no-doubt confusing consequences ;-)