SF bug #1328915, try to word kill a bit more generically.  Backport candidate.
SF bug #1328915, try to word kill a bit more generically.  Backport candidate.

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