Don't substitute command line arg with default

For issue #307, as user may have explicitly removed the default.