Reworking the constraint solver to minimize the changes made to patsopt export functionality