Adapting to latest Rust changes.