Another round of Python 3 fixes.