Make work with latest Rust nightly