Adding support to mathsat, cleaning things.