Ongoing work splitting Python 2 from Python 3