More cleanup of solver interface in preparation for SMTInterpol
Clean up solver interface