Update for upstream StrBuf changes