Update to work with current Rust nightly