More StrBuf cleanup