Modifications to allow rust to work with the latest version of
rust-master.