Some missed py3 bits post rebase
YET MOAR PY3 and a non py3 optimization to fix for py3