Fixes for rustc master.