Move ordering of options into parse_getopt_long_opt_spec, so other routines do not need to re-sort