Move to strict ByteStrings where possible