Better character escaping in DataConvert