Add support for some of the newer commands, a little cleanup.
Add support for some of the newer commands, a little cleanup.

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