Improvements to set-variables-from-cmdline.