Continue py3 adaptation.