More future.utils.six replacements