Fixes for rustc 0.13.0-nightly (c46812f65 2014-10-19 00:47:18 +0000)

Travis says the build is passing (https://travis-ci.org/stepancheg/rust-protobuf), but that's because it hasn't built in the last 6 days or so~