Updated to latest Rust: ~str -> StrBuf