Merge "Fix the arguments passed to getopt_long(3)."