Update to latest master. (~str to StrBuf)