I also made the add_argument blocks shorter by allowing more
than one named arg per line.  I removed the metavar lines
and action=store lines since one was only used in help messages
and the other was already matching the default for add_argument.

R=johnmccutchan@google.com

Review URL: https://codereview.chromium.org/1234803004 .