Add support for embedded null terminators