Added clear-out-structure fix for make_unistr2.