Another large batch of patches from Jeff Rush for OS/2.
Another large batch of patches from Jeff Rush for OS/2.

I hope this time I've taken out all // comments and indended #ifdefs.

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