Update for latest changes to Rust.