Make setup more sane around 2to3