Fixes for (re)moved language constructs in Python 3