Use API better

src/main/scala/leon/synthesis/ExamplesFinder.scala

@@ -57,7 +57,7 @@ class ExamplesFinder(ctx0: LeonContext, program: Program) {
       def isValidTest(e: Example): Boolean = {
         e match {
           case InOutExample(ins, outs) =>
-            evaluator.eval(Equals(outs.head, FunctionInvocation(fd.typed(fd.tparams.map(_.tp)), ins))) match {
+            evaluator.eval(Equals(outs.head, FunctionInvocation(fd.typed, ins))) match {
               case EvaluationResults.Successful(BooleanLiteral(true)) => true
               case _                                                  => false
             }

src/main/scala/leon/synthesis/rules/CEGISLike.scala

@@ -596,7 +596,7 @@ abstract class CEGISLike[T <: Typed](name: String) extends Rule(name) {
       def solveForTentativeProgram(): Option[Option[Set[Identifier]]] = {
         val solverf = SolverFactory.getFromSettings(hctx, programCTree).withTimeout(exSolverTo)
         val solver  = solverf.getNewSolver()
-        val cnstr = FunctionInvocation(phiFd.typed, phiFd.params.map(_.id.toVariable))
+        val cnstr = phiFd.applied
 
         //println("Program: ")
         //println("-"*80)