Adding more xref-specific params, and stripping out duplicate param references.