Adapt to StrBuf being renamed to String