Rewrote Jack's latest change so it does what it intended to do...
Rewrote Jack's latest change so it does what it intended to do...

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