Port over enough to Python 3 to allow the sytests to start.