Cope with the latest ~str/StrBuf changes