Changes preparing for stricter enforcement of bytes vs. str.
2 files changed