Revised the SMT interface in preparation for CVC4