Can we just add a call to resolve here instead of dealing with all the cases (Mu, App, and soon RecName) below?