Consolidated certain XiVar instances.