[cssom] Yet more xref tweaks