Backing out nested scopes broke the Windows build.  Repairing.
Backing out nested scopes broke the Windows build.  Repairing.

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