And more Python 3 compat.