Couple of minor cleanups
#[track_caller]
Please read the rustc-dev-guide chapter on Backend Agnostic Codegen.