rustc: Remove a few more XXXes from resolve