More porting to Py3.