Incorporate latest changes to smtlib2