More deprecation-warning-induced changes
Python 3-related changes