Additional Python 3 conversion fixes.