Upgraded to work with Rust nightly.