Fix two bugs discovered by PyChecker.  (I cannot test these, but I'm confident that the old code was utterly broken -- the worse that can happen is that the new code is still broken.)
Fix two bugs discovered by PyChecker.  (I cannot test these, but I'm
confident that the old code was utterly broken -- the worse that can
happen is that the new code is still broken.)

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