Change "str" to "string" in several places.

For compatibility with rust-nightly on 2014-07-11.