Merge from coreutils to support a more-standard getopt.