Fix GCC warnings.  It turns out two out of three pointed to real bugs!
Fix GCC warnings.  It turns out two out of three pointed to real bugs!

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