Account for latest changes to upstream Rust