These are two cases where I have used qualify macro before, obviously with Eric’s help. Sharing it here, in case it helps you.