Fixes for Rust 07/07/2014

Addresses the recent breaking change https://github.com/rust-lang/rust/issues/15312 in the compiler