Less gorpy.  Tests passed in py2 and py3.