Apologies- in the event that this patch is satisfactory, the following includes `xref-find-references-and-replace`. I didn’t realize it would be a simple replacement.