Update for Rustc changes.