fuel.xref: refactor of normalize-loc and group-xrefs per mrjbq7s comments