Redid arg/return handling (still not as I would like it to be, though).
Redid arg/return handling (still not as I would like it to be, though).

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