Windows:  make citation support a separable component.