Remove file-level typedefs that were inconsistently used throughout the file. Just move over to the public API names.
Remove file-level typedefs that were inconsistently used throughout the file.
Just move over to the public API names.

Closes issue1238.

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