Do refactoring in normalize_cmdline_options()