Fix #364

This cleans up our use of bytestrings in make_franken_headers to avoid
implicit casts to unicode.