Be lazier to consider EQC in UF+cardinality solver.  Minor cleanup.