Adapt simplifier to smtlib2 changes
Adapt to changes in bindings-llvm
Fix import problems