reference/classes: fix up and condense xrefs