Adapt to recent Rust changes.