This doesn't need to do nearly as much for the new conversion, so simplify.
This doesn't need to do nearly as much for the new conversion, so
simplify.

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