Update for rust-lang changes.