We need to remove this helper:

And instead we should be just calling:

and pass the hir id as part of the caller to make it more explicit that you need to think about what id you are using.