Part-way through changing how refs/xrefs work