Update for current Rustc