Two critical fixes to the changes that I made for Greg McFarlane -- patches provided by Greg (am I glad I sent him my latest version!).
Two critical fixes to the changes that I made for Greg McFarlane --
patches provided by Greg (am I glad I sent him my latest version!).

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