Cosmetic changes to Christian's patch r58903. (Consider this code review feedback. :-)
Cosmetic changes to Christian's patch r58903.
(Consider this code review feedback. :-)

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