Make it work with latest Rust