StrBuf -> String, and a minor fix-up.