Update for changes in rustc