Merge "Py3: don't access the `unicode` type directly."