Allow uniqueness failures when forcing a conjunction.

Forcing A + B for a space we already knew was A ends up skipping B
otherwise.
Break up monolithic method