Update for latest Rust!