Re-introduce secific CVC4 implementations, fix scala-smtlib