Bastian Kleineidam: fix up any supplied command-line options.
Bastian Kleineidam: fix up any supplied command-line options.

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator