[cssom] More xref tweaks and fixes