Merge "Minor refactor to support strings with embedded zeros."