Get closer to supporting Python 3