Updated for latest rustc.