Solving CVC4 incompatibilities