Merged with the latest version of ParseArgv.c from libminc