Import directly from six when possible instead of compat.py so we can clean it a little