Fix compiler warnings. This closes some of the #458880 problem.
Fix compiler warnings. This closes some of the #458880 problem.

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