Fix various issues (mostly Python 2 relics) found by Jacques Ducasse.
9 files changed