Be more consistent, both internally and with recommended practice. This closes SF bug #547953.
Be more consistent, both internally and with recommended practice.
This closes SF bug #547953.

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