Better str/unicode support across Py2 and Py3.