Update for rust-nightly after RFC #173