Update for Rust 0.12