Update for Rust 0.6