Allow changes to run under Python 3