Small attempt to smooth forthcoming merge of experimental Python 3 support.