Further Py2/P3 cleanup (e.g., bytestring vs. string)