Further older python-six fixes