cleanups in cli.OptionParser.

Also reenabled the help strings for some options.

Related commit: 067d5f5.