Refactor option for uf+cardinality constraints solver.