Updated for Rust master.