Improve normalize_cmdline_options()