Assorted code cleanups for readability.  Greatly boosted the size of the test data:  this test fails on WIndows now if universal newlines are enabled (which they aren't yet, by default).  I don't know whether the test will also fail on Linux now.
Assorted code cleanups for readability.  Greatly boosted the size of the
test data:  this test fails on WIndows now if universal newlines are
enabled (which they aren't yet, by default).  I don't know whether the
test will also fail on Linux now.

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