As far as i know, xref and xrefone are already deprecated / removed.
Can you add another commit where you remove these to this patch-3 branch? Then I can hit the merge button. I have no computer here ATM, just my tablet.