Update for latest Rust master.