Upgraded to latest rust: ~str and StrBuf to String