Update for current rustc