Conform to strict str/bytes distinction.
2 files changed