diff --git a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
index e2fcb3c61e38..63b4c30bcc28 100644
--- a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
+++ b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
@@ -1176,9 +1176,9 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
       else {
         val arity = field.meth.tpe.widenDealias.paramTypes.size - _1.size
         val returnsUnit = field.meth.tpe.widenDealias.resultType.classSymbol == UnitClass
-        if (returnsUnit)
-          ctx.requiredClass(("dotty.runtime.function.JProcedure" + arity))
-        else ctx.requiredClass(("dotty.runtime.function.JFunction" + arity))
+        if (returnsUnit) ctx.requiredClass(("dotty.runtime.function.JProcedure" + arity))
+        else if (arity <= 2) ctx.requiredClass(("dotty.runtime.function.JFunction" + arity))
+        else ctx.requiredClass(("scala.Function" + arity))
       }
     }
   }
diff --git a/library/src/dotty/runtime/function/JFunction.java b/library/src/dotty/runtime/function/JFunction.java
deleted file mode 100644
index a5f43a6d5b0c..000000000000
--- a/library/src/dotty/runtime/function/JFunction.java
+++ /dev/null
@@ -1,233 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package dotty.runtime.function;
-
-import scala.runtime.BoxedUnit;
-
-public final class JFunction {
-    private JFunction() {}
-    public static <R> scala.Function0<R> func(JFunction0<R> f) { return f; }
-    public static scala.Function0<BoxedUnit> proc(JProcedure0 p) { return p; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function0<BoxedUnit> procSpecialized(JFunction0$mcV$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function0<Byte> funcSpecialized(JFunction0$mcB$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function0<Short> funcSpecialized(JFunction0$mcS$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function0<Integer> funcSpecialized(JFunction0$mcI$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function0<Long> funcSpecialized(JFunction0$mcJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function0<Character> funcSpecialized(JFunction0$mcC$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function0<Float> funcSpecialized(JFunction0$mcF$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function0<Double> funcSpecialized(JFunction0$mcD$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function0<Boolean> funcSpecialized(JFunction0$mcZ$sp f) { return f; }
-    public static <T1, R> scala.Function1<T1, R> func(JFunction1<T1, R> f) { return f; }
-    public static <T1> scala.Function1<T1, BoxedUnit> proc(JProcedure1<T1> p) { return p; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Integer, BoxedUnit> procSpecialized(JFunction1$mcVI$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Integer, Boolean> funcSpecialized(JFunction1$mcZI$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Integer, Integer> funcSpecialized(JFunction1$mcII$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Integer, Float> funcSpecialized(JFunction1$mcFI$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Integer, Long> funcSpecialized(JFunction1$mcJI$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Integer, Double> funcSpecialized(JFunction1$mcDI$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Long, BoxedUnit> procSpecialized(JFunction1$mcVJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Long, Boolean> funcSpecialized(JFunction1$mcZJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Long, Integer> funcSpecialized(JFunction1$mcIJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Long, Float> funcSpecialized(JFunction1$mcFJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Long, Long> funcSpecialized(JFunction1$mcJJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Long, Double> funcSpecialized(JFunction1$mcDJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Float, BoxedUnit> procSpecialized(JFunction1$mcVF$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Float, Boolean> funcSpecialized(JFunction1$mcZF$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Float, Integer> funcSpecialized(JFunction1$mcIF$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Float, Float> funcSpecialized(JFunction1$mcFF$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Float, Long> funcSpecialized(JFunction1$mcJF$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Float, Double> funcSpecialized(JFunction1$mcDF$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Double, BoxedUnit> procSpecialized(JFunction1$mcVD$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Double, Boolean> funcSpecialized(JFunction1$mcZD$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Double, Integer> funcSpecialized(JFunction1$mcID$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Double, Float> funcSpecialized(JFunction1$mcFD$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Double, Long> funcSpecialized(JFunction1$mcJD$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function1<Double, Double> funcSpecialized(JFunction1$mcDD$sp f) { return f; }
-    public static <T1, T2, R> scala.Function2<T1, T2, R> func(JFunction2<T1, T2, R> f) { return f; }
-    public static <T1, T2> scala.Function2<T1, T2, BoxedUnit> proc(JProcedure2<T1, T2> p) { return p; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Integer, Integer, BoxedUnit> procSpecialized(JFunction2$mcVII$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Integer, Integer, Boolean> funcSpecialized(JFunction2$mcZII$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Integer, Integer, Integer> funcSpecialized(JFunction2$mcIII$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Integer, Integer, Float> funcSpecialized(JFunction2$mcFII$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Integer, Integer, Long> funcSpecialized(JFunction2$mcJII$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Integer, Integer, Double> funcSpecialized(JFunction2$mcDII$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Integer, Long, BoxedUnit> procSpecialized(JFunction2$mcVIJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Integer, Long, Boolean> funcSpecialized(JFunction2$mcZIJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Integer, Long, Integer> funcSpecialized(JFunction2$mcIIJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Integer, Long, Float> funcSpecialized(JFunction2$mcFIJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Integer, Long, Long> funcSpecialized(JFunction2$mcJIJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Integer, Long, Double> funcSpecialized(JFunction2$mcDIJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Integer, Double, BoxedUnit> procSpecialized(JFunction2$mcVID$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Integer, Double, Boolean> funcSpecialized(JFunction2$mcZID$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Integer, Double, Integer> funcSpecialized(JFunction2$mcIID$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Integer, Double, Float> funcSpecialized(JFunction2$mcFID$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Integer, Double, Long> funcSpecialized(JFunction2$mcJID$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Integer, Double, Double> funcSpecialized(JFunction2$mcDID$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Long, Integer, BoxedUnit> procSpecialized(JFunction2$mcVJI$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Long, Integer, Boolean> funcSpecialized(JFunction2$mcZJI$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Long, Integer, Integer> funcSpecialized(JFunction2$mcIJI$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Long, Integer, Float> funcSpecialized(JFunction2$mcFJI$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Long, Integer, Long> funcSpecialized(JFunction2$mcJJI$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Long, Integer, Double> funcSpecialized(JFunction2$mcDJI$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Long, Long, BoxedUnit> procSpecialized(JFunction2$mcVJJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Long, Long, Boolean> funcSpecialized(JFunction2$mcZJJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Long, Long, Integer> funcSpecialized(JFunction2$mcIJJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Long, Long, Float> funcSpecialized(JFunction2$mcFJJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Long, Long, Long> funcSpecialized(JFunction2$mcJJJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Long, Long, Double> funcSpecialized(JFunction2$mcDJJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Long, Double, BoxedUnit> procSpecialized(JFunction2$mcVJD$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Long, Double, Boolean> funcSpecialized(JFunction2$mcZJD$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Long, Double, Integer> funcSpecialized(JFunction2$mcIJD$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Long, Double, Float> funcSpecialized(JFunction2$mcFJD$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Long, Double, Long> funcSpecialized(JFunction2$mcJJD$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Long, Double, Double> funcSpecialized(JFunction2$mcDJD$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Double, Integer, BoxedUnit> procSpecialized(JFunction2$mcVDI$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Double, Integer, Boolean> funcSpecialized(JFunction2$mcZDI$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Double, Integer, Integer> funcSpecialized(JFunction2$mcIDI$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Double, Integer, Float> funcSpecialized(JFunction2$mcFDI$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Double, Integer, Long> funcSpecialized(JFunction2$mcJDI$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Double, Integer, Double> funcSpecialized(JFunction2$mcDDI$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Double, Long, BoxedUnit> procSpecialized(JFunction2$mcVDJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Double, Long, Boolean> funcSpecialized(JFunction2$mcZDJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Double, Long, Integer> funcSpecialized(JFunction2$mcIDJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Double, Long, Float> funcSpecialized(JFunction2$mcFDJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Double, Long, Long> funcSpecialized(JFunction2$mcJDJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Double, Long, Double> funcSpecialized(JFunction2$mcDDJ$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Double, Double, BoxedUnit> procSpecialized(JFunction2$mcVDD$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Double, Double, Boolean> funcSpecialized(JFunction2$mcZDD$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Double, Double, Integer> funcSpecialized(JFunction2$mcIDD$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Double, Double, Float> funcSpecialized(JFunction2$mcFDD$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Double, Double, Long> funcSpecialized(JFunction2$mcJDD$sp f) { return f; }
-    @SuppressWarnings("unchecked")
-    public static scala.Function2<Double, Double, Double> funcSpecialized(JFunction2$mcDDD$sp f) { return f; }
-    public static <T1, T2, T3, R> scala.Function3<T1, T2, T3, R> func(JFunction3<T1, T2, T3, R> f) { return f; }
-    public static <T1, T2, T3> scala.Function3<T1, T2, T3, BoxedUnit> proc(JProcedure3<T1, T2, T3> p) { return p; }
-    public static <T1, T2, T3, T4, R> scala.Function4<T1, T2, T3, T4, R> func(JFunction4<T1, T2, T3, T4, R> f) { return f; }
-    public static <T1, T2, T3, T4> scala.Function4<T1, T2, T3, T4, BoxedUnit> proc(JProcedure4<T1, T2, T3, T4> p) { return p; }
-    public static <T1, T2, T3, T4, T5, R> scala.Function5<T1, T2, T3, T4, T5, R> func(JFunction5<T1, T2, T3, T4, T5, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5> scala.Function5<T1, T2, T3, T4, T5, BoxedUnit> proc(JProcedure5<T1, T2, T3, T4, T5> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, R> scala.Function6<T1, T2, T3, T4, T5, T6, R> func(JFunction6<T1, T2, T3, T4, T5, T6, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6> scala.Function6<T1, T2, T3, T4, T5, T6, BoxedUnit> proc(JProcedure6<T1, T2, T3, T4, T5, T6> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, R> scala.Function7<T1, T2, T3, T4, T5, T6, T7, R> func(JFunction7<T1, T2, T3, T4, T5, T6, T7, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7> scala.Function7<T1, T2, T3, T4, T5, T6, T7, BoxedUnit> proc(JProcedure7<T1, T2, T3, T4, T5, T6, T7> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, R> scala.Function8<T1, T2, T3, T4, T5, T6, T7, T8, R> func(JFunction8<T1, T2, T3, T4, T5, T6, T7, T8, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8> scala.Function8<T1, T2, T3, T4, T5, T6, T7, T8, BoxedUnit> proc(JProcedure8<T1, T2, T3, T4, T5, T6, T7, T8> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> scala.Function9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> func(JFunction9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9> scala.Function9<T1, T2, T3, T4, T5, T6, T7, T8, T9, BoxedUnit> proc(JProcedure9<T1, T2, T3, T4, T5, T6, T7, T8, T9> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R> scala.Function10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R> func(JFunction10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> scala.Function10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, BoxedUnit> proc(JProcedure10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R> scala.Function11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R> func(JFunction11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> scala.Function11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, BoxedUnit> proc(JProcedure11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, R> scala.Function12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, R> func(JFunction12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> scala.Function12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, BoxedUnit> proc(JProcedure12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, R> scala.Function13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, R> func(JFunction13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> scala.Function13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, BoxedUnit> proc(JProcedure13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, R> scala.Function14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, R> func(JFunction14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> scala.Function14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, BoxedUnit> proc(JProcedure14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, R> scala.Function15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, R> func(JFunction15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> scala.Function15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, BoxedUnit> proc(JProcedure15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, R> scala.Function16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, R> func(JFunction16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> scala.Function16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, BoxedUnit> proc(JProcedure16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, R> scala.Function17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, R> func(JFunction17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> scala.Function17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, BoxedUnit> proc(JProcedure17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, R> scala.Function18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, R> func(JFunction18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> scala.Function18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, BoxedUnit> proc(JProcedure18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, R> scala.Function19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, R> func(JFunction19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> scala.Function19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, BoxedUnit> proc(JProcedure19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, R> scala.Function20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, R> func(JFunction20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> scala.Function20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, BoxedUnit> proc(JProcedure20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, R> scala.Function21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, R> func(JFunction21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> scala.Function21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, BoxedUnit> proc(JProcedure21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, R> scala.Function22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, R> func(JFunction22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> scala.Function22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, BoxedUnit> proc(JProcedure22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> p) { return p; }
-}
-
diff --git a/library/src/dotty/runtime/function/JFunction0.java b/library/src/dotty/runtime/function/JFunction0.java
index a5ffe005eb5d..2714044c83f5 100644
--- a/library/src/dotty/runtime/function/JFunction0.java
+++ b/library/src/dotty/runtime/function/JFunction0.java
@@ -7,8 +7,6 @@
 
 @FunctionalInterface
 public interface JFunction0<R> extends scala.Function0<R>, java.io.Serializable {
-    default void $init$() {
-    };
     default void apply$mcV$sp() {
         apply();
     }
diff --git a/library/src/dotty/runtime/function/JFunction1.java b/library/src/dotty/runtime/function/JFunction1.java
index 718f90bc6e46..28be7cd43ab3 100644
--- a/library/src/dotty/runtime/function/JFunction1.java
+++ b/library/src/dotty/runtime/function/JFunction1.java
@@ -7,8 +7,6 @@
 
 @FunctionalInterface
 public interface JFunction1<T1, R> extends scala.Function1<T1, R>, java.io.Serializable {
-    default void $init$() {
-    };
 
     @Override
     @SuppressWarnings("unchecked")
@@ -213,7 +211,7 @@ default <A> scala.Function1<A, R> compose(scala.Function1<A, T1> g) {
     default scala.Function1 compose$mcDD$sp(scala.Function1 g) {
         return compose(g);
     }
-    
+
     @SuppressWarnings("unchecked")
     default scala.Function1 andThen$mcVI$sp(scala.Function1 g) {
         return andThen(g);
diff --git a/library/src/dotty/runtime/function/JFunction10.java b/library/src/dotty/runtime/function/JFunction10.java
deleted file mode 100644
index 97ac03e6a8c6..000000000000
--- a/library/src/dotty/runtime/function/JFunction10.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package dotty.runtime.function;
-
-@FunctionalInterface
-public interface JFunction10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R> extends scala.Function10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, R>>>>>>>>>> curried() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>, R> tupled() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-
-}
diff --git a/library/src/dotty/runtime/function/JFunction11.java b/library/src/dotty/runtime/function/JFunction11.java
deleted file mode 100644
index a71bf06e249e..000000000000
--- a/library/src/dotty/runtime/function/JFunction11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package dotty.runtime.function;
-
-@FunctionalInterface
-public interface JFunction11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R> extends scala.Function11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, R>>>>>>>>>>> curried() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>, R> tupled() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-
-}
diff --git a/library/src/dotty/runtime/function/JFunction12.java b/library/src/dotty/runtime/function/JFunction12.java
deleted file mode 100644
index 5c36a2f3be9f..000000000000
--- a/library/src/dotty/runtime/function/JFunction12.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package dotty.runtime.function;
-
-@FunctionalInterface
-public interface JFunction12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, R> extends scala.Function12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, R>>>>>>>>>>>> curried() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>, R> tupled() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-
-}
diff --git a/library/src/dotty/runtime/function/JFunction13.java b/library/src/dotty/runtime/function/JFunction13.java
deleted file mode 100644
index e0ea5e4b46d0..000000000000
--- a/library/src/dotty/runtime/function/JFunction13.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package dotty.runtime.function;
-
-@FunctionalInterface
-public interface JFunction13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, R> extends scala.Function13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, R>>>>>>>>>>>>> curried() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>, R> tupled() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-
-}
diff --git a/library/src/dotty/runtime/function/JFunction14.java b/library/src/dotty/runtime/function/JFunction14.java
deleted file mode 100644
index 1997832b3b65..000000000000
--- a/library/src/dotty/runtime/function/JFunction14.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package dotty.runtime.function;
-
-@FunctionalInterface
-public interface JFunction14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, R> extends scala.Function14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, R>>>>>>>>>>>>>> curried() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>, R> tupled() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-
-}
diff --git a/library/src/dotty/runtime/function/JFunction15.java b/library/src/dotty/runtime/function/JFunction15.java
deleted file mode 100644
index 98cdc2d0fbdc..000000000000
--- a/library/src/dotty/runtime/function/JFunction15.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package dotty.runtime.function;
-
-@FunctionalInterface
-public interface JFunction15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, R> extends scala.Function15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, R>>>>>>>>>>>>>>> curried() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>, R> tupled() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-
-}
diff --git a/library/src/dotty/runtime/function/JFunction16.java b/library/src/dotty/runtime/function/JFunction16.java
deleted file mode 100644
index 46860c1ae072..000000000000
--- a/library/src/dotty/runtime/function/JFunction16.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package dotty.runtime.function;
-
-@FunctionalInterface
-public interface JFunction16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, R> extends scala.Function16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, scala.Function1<T16, R>>>>>>>>>>>>>>>> curried() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>, R> tupled() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-
-}
diff --git a/library/src/dotty/runtime/function/JFunction17.java b/library/src/dotty/runtime/function/JFunction17.java
deleted file mode 100644
index 0424be70e002..000000000000
--- a/library/src/dotty/runtime/function/JFunction17.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package dotty.runtime.function;
-
-@FunctionalInterface
-public interface JFunction17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, R> extends scala.Function17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, scala.Function1<T16, scala.Function1<T17, R>>>>>>>>>>>>>>>>> curried() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>, R> tupled() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-
-}
diff --git a/library/src/dotty/runtime/function/JFunction18.java b/library/src/dotty/runtime/function/JFunction18.java
deleted file mode 100644
index 66df833ff5da..000000000000
--- a/library/src/dotty/runtime/function/JFunction18.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package dotty.runtime.function;
-
-@FunctionalInterface
-public interface JFunction18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, R> extends scala.Function18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, scala.Function1<T16, scala.Function1<T17, scala.Function1<T18, R>>>>>>>>>>>>>>>>>> curried() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>, R> tupled() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-
-}
diff --git a/library/src/dotty/runtime/function/JFunction19.java b/library/src/dotty/runtime/function/JFunction19.java
deleted file mode 100644
index fb11b0ec6c22..000000000000
--- a/library/src/dotty/runtime/function/JFunction19.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package dotty.runtime.function;
-
-@FunctionalInterface
-public interface JFunction19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, R> extends scala.Function19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, scala.Function1<T16, scala.Function1<T17, scala.Function1<T18, scala.Function1<T19, R>>>>>>>>>>>>>>>>>>> curried() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>, R> tupled() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-
-}
diff --git a/library/src/dotty/runtime/function/JFunction2.java b/library/src/dotty/runtime/function/JFunction2.java
index af6f62158cce..637feda88885 100644
--- a/library/src/dotty/runtime/function/JFunction2.java
+++ b/library/src/dotty/runtime/function/JFunction2.java
@@ -9,28 +9,6 @@
 
 @FunctionalInterface
 public interface JFunction2<T1, T2, R> extends scala.Function2<T1, T2, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, R>> curried() {
-      return x1 -> x2 -> apply(x1, x2);
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple2<T1, T2>, R> tupled() {
-        return x0$1 -> {
-            if (x0$1 == null) {
-                throw new MatchError(x0$1);
-            }
-            T1 x1 = x0$1._1();
-            T2 x2 = x0$1._2();
-            R r = this.apply(x1, x2);
-            return r;
-        }
-        ;
-    }
-
     @SuppressWarnings("unchecked")
     default void apply$mcVII$sp(int v1, int v2) {
         apply((T1) ((Integer) v1), (T2) ((Integer) v2));
@@ -247,7 +225,7 @@ default scala.Function1<scala.Tuple2<T1, T2>, R> tupled() {
     default double apply$mcDDD$sp(double v1, double v2) {
         return scala.runtime.BoxesRunTime.unboxToDouble(apply((T1) ((Double) v1), (T2) ((Double) v2)));
     }
-    
+
     @SuppressWarnings("unchecked")
     default scala.Function1 curried$mcVII$sp() {
         return curried();
@@ -464,7 +442,7 @@ default scala.Function1<scala.Tuple2<T1, T2>, R> tupled() {
     default scala.Function1 curried$mcDDD$sp() {
         return curried();
     }
-    
+
     @SuppressWarnings("unchecked")
     default scala.Function1 tupled$mcVII$sp() {
         return tupled();
diff --git a/library/src/dotty/runtime/function/JFunction20.java b/library/src/dotty/runtime/function/JFunction20.java
deleted file mode 100644
index fc3bd14c614e..000000000000
--- a/library/src/dotty/runtime/function/JFunction20.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package dotty.runtime.function;
-
-@FunctionalInterface
-public interface JFunction20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, R> extends scala.Function20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, scala.Function1<T16, scala.Function1<T17, scala.Function1<T18, scala.Function1<T19, scala.Function1<T20, R>>>>>>>>>>>>>>>>>>>> curried() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>, R> tupled() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-
-}
diff --git a/library/src/dotty/runtime/function/JFunction21.java b/library/src/dotty/runtime/function/JFunction21.java
deleted file mode 100644
index 222d01b5e59b..000000000000
--- a/library/src/dotty/runtime/function/JFunction21.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package dotty.runtime.function;
-
-@FunctionalInterface
-public interface JFunction21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, R> extends scala.Function21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, scala.Function1<T16, scala.Function1<T17, scala.Function1<T18, scala.Function1<T19, scala.Function1<T20, scala.Function1<T21, R>>>>>>>>>>>>>>>>>>>>> curried() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>, R> tupled() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-
-}
diff --git a/library/src/dotty/runtime/function/JFunction22.java b/library/src/dotty/runtime/function/JFunction22.java
deleted file mode 100644
index 518d3f51aa53..000000000000
--- a/library/src/dotty/runtime/function/JFunction22.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package dotty.runtime.function;
-
-@FunctionalInterface
-public interface JFunction22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, R> extends scala.Function22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, scala.Function1<T16, scala.Function1<T17, scala.Function1<T18, scala.Function1<T19, scala.Function1<T20, scala.Function1<T21, scala.Function1<T22, R>>>>>>>>>>>>>>>>>>>>>> curried() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>, R> tupled() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-
-}
diff --git a/library/src/dotty/runtime/function/JFunction3.java b/library/src/dotty/runtime/function/JFunction3.java
deleted file mode 100644
index 867aaba23933..000000000000
--- a/library/src/dotty/runtime/function/JFunction3.java
+++ /dev/null
@@ -1,36 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package dotty.runtime.function;
-
-import scala.MatchError;
-
-@FunctionalInterface
-public interface JFunction3<T1, T2, T3, R> extends scala.Function3<T1, T2, T3, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, R>>> curried() {
-      return x1 -> x2 -> x3 -> apply(x1, x2, x3);
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple3<T1, T2, T3>, R> tupled() {
-        return x0$1 -> {
-            if (x0$1 == null) {
-                throw new MatchError(x0$1);
-            }
-            T1 x1 = x0$1._1();
-            T2 x2 = x0$1._2();
-            T3 x3 = x0$1._3();
-            R r = this.apply(x1, x2, x3);
-            return r;
-        }
-        ;
-    }
-
-
-}
diff --git a/library/src/dotty/runtime/function/JFunction4.java b/library/src/dotty/runtime/function/JFunction4.java
deleted file mode 100644
index 0db0ddce054b..000000000000
--- a/library/src/dotty/runtime/function/JFunction4.java
+++ /dev/null
@@ -1,37 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package dotty.runtime.function;
-
-import scala.MatchError;
-
-@FunctionalInterface
-public interface JFunction4<T1, T2, T3, T4, R> extends scala.Function4<T1, T2, T3, T4, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, R>>>> curried() {
-      return x1 -> x2 -> x3 -> x4 -> apply(x1, x2, x3, x4);
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple4<T1, T2, T3, T4>, R> tupled() {
-        return x0$1 -> {
-            if (x0$1 == null) {
-                throw new MatchError(x0$1);
-            }
-            T1 x1 = x0$1._1();
-            T2 x2 = x0$1._2();
-            T3 x3 = x0$1._3();
-            T4 x4 = x0$1._4();
-            R r = this.apply(x1, x2, x3, x4);
-            return r;
-        }
-        ;
-    }
-
-
-}
diff --git a/library/src/dotty/runtime/function/JFunction5.java b/library/src/dotty/runtime/function/JFunction5.java
deleted file mode 100644
index 150c0a3ac18c..000000000000
--- a/library/src/dotty/runtime/function/JFunction5.java
+++ /dev/null
@@ -1,26 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package dotty.runtime.function;
-
-import scala.MatchError;
-
-@FunctionalInterface
-public interface JFunction5<T1, T2, T3, T4, T5, R> extends scala.Function5<T1, T2, T3, T4, T5, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, R>>>>> curried() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple5<T1, T2, T3, T4, T5>, R> tupled() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-
-}
diff --git a/library/src/dotty/runtime/function/JFunction6.java b/library/src/dotty/runtime/function/JFunction6.java
deleted file mode 100644
index 8a128bf3d9e8..000000000000
--- a/library/src/dotty/runtime/function/JFunction6.java
+++ /dev/null
@@ -1,26 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package dotty.runtime.function;
-
-import scala.MatchError;
-
-@FunctionalInterface
-public interface JFunction6<T1, T2, T3, T4, T5, T6, R> extends scala.Function6<T1, T2, T3, T4, T5, T6, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, R>>>>>> curried() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple6<T1, T2, T3, T4, T5, T6>, R> tupled() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-
-}
diff --git a/library/src/dotty/runtime/function/JFunction7.java b/library/src/dotty/runtime/function/JFunction7.java
deleted file mode 100644
index 9a29d2dc1569..000000000000
--- a/library/src/dotty/runtime/function/JFunction7.java
+++ /dev/null
@@ -1,26 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package dotty.runtime.function;
-
-import scala.MatchError;
-
-@FunctionalInterface
-public interface JFunction7<T1, T2, T3, T4, T5, T6, T7, R> extends scala.Function7<T1, T2, T3, T4, T5, T6, T7, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, R>>>>>>> curried() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple7<T1, T2, T3, T4, T5, T6, T7>, R> tupled() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-
-}
diff --git a/library/src/dotty/runtime/function/JFunction8.java b/library/src/dotty/runtime/function/JFunction8.java
deleted file mode 100644
index 35fd63083f0b..000000000000
--- a/library/src/dotty/runtime/function/JFunction8.java
+++ /dev/null
@@ -1,26 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package dotty.runtime.function;
-
-import scala.MatchError;
-
-@FunctionalInterface
-public interface JFunction8<T1, T2, T3, T4, T5, T6, T7, T8, R> extends scala.Function8<T1, T2, T3, T4, T5, T6, T7, T8, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, R>>>>>>>> curried() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple8<T1, T2, T3, T4, T5, T6, T7, T8>, R> tupled() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-
-}
diff --git a/library/src/dotty/runtime/function/JFunction9.java b/library/src/dotty/runtime/function/JFunction9.java
deleted file mode 100644
index 4f3192a1cc29..000000000000
--- a/library/src/dotty/runtime/function/JFunction9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package dotty.runtime.function;
-
-@FunctionalInterface
-public interface JFunction9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> extends scala.Function9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, R>>>>>>>>> curried() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9>, R> tupled() {
-        throw new UnsupportedOperationException("todo");
-    }
-
-
-}
diff --git a/library/src/dotty/runtime/function/JProcedure0.java b/library/src/dotty/runtime/function/JProcedure0.java
index c3430b76d75c..a37f26a6a823 100644
--- a/library/src/dotty/runtime/function/JProcedure0.java
+++ b/library/src/dotty/runtime/function/JProcedure0.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 public interface JProcedure0 extends JFunction0<BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
     void applyVoid();
 
     default BoxedUnit apply() {
diff --git a/library/src/dotty/runtime/function/JProcedure1.java b/library/src/dotty/runtime/function/JProcedure1.java
index 193c7e289980..0b4724116a9c 100644
--- a/library/src/dotty/runtime/function/JProcedure1.java
+++ b/library/src/dotty/runtime/function/JProcedure1.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 public interface JProcedure1<T1> extends JFunction1<T1, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
     void applyVoid(T1 t1);
 
     default BoxedUnit apply(T1 t1) {
diff --git a/library/src/dotty/runtime/function/JProcedure10.java b/library/src/dotty/runtime/function/JProcedure10.java
index e7fb4bf05abc..cf4297823741 100644
--- a/library/src/dotty/runtime/function/JProcedure10.java
+++ b/library/src/dotty/runtime/function/JProcedure10.java
@@ -8,10 +8,7 @@
 import scala.runtime.BoxedUnit;
 
 @FunctionalInterface
-public interface JProcedure10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> extends JFunction10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
+public interface JProcedure10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> extends scala.Function10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, BoxedUnit>, java.io.Serializable {
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10) {
diff --git a/library/src/dotty/runtime/function/JProcedure11.java b/library/src/dotty/runtime/function/JProcedure11.java
index aa93dcfb8a4c..68b186bbc6c2 100644
--- a/library/src/dotty/runtime/function/JProcedure11.java
+++ b/library/src/dotty/runtime/function/JProcedure11.java
@@ -8,10 +8,7 @@
 import scala.runtime.BoxedUnit;
 
 @FunctionalInterface
-public interface JProcedure11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> extends JFunction11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
+public interface JProcedure11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> extends scala.Function11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, BoxedUnit>, java.io.Serializable {
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11) {
diff --git a/library/src/dotty/runtime/function/JProcedure12.java b/library/src/dotty/runtime/function/JProcedure12.java
index a64415f9bdd7..8ab16f898f44 100644
--- a/library/src/dotty/runtime/function/JProcedure12.java
+++ b/library/src/dotty/runtime/function/JProcedure12.java
@@ -8,10 +8,7 @@
 import scala.runtime.BoxedUnit;
 
 @FunctionalInterface
-public interface JProcedure12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> extends JFunction12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
+public interface JProcedure12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> extends scala.Function12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, BoxedUnit>, java.io.Serializable {
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12) {
diff --git a/library/src/dotty/runtime/function/JProcedure13.java b/library/src/dotty/runtime/function/JProcedure13.java
index b77724e3782e..e6f419d6ca9d 100644
--- a/library/src/dotty/runtime/function/JProcedure13.java
+++ b/library/src/dotty/runtime/function/JProcedure13.java
@@ -8,10 +8,7 @@
 import scala.runtime.BoxedUnit;
 
 @FunctionalInterface
-public interface JProcedure13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> extends JFunction13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
+public interface JProcedure13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> extends scala.Function13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, BoxedUnit>, java.io.Serializable {
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13) {
diff --git a/library/src/dotty/runtime/function/JProcedure14.java b/library/src/dotty/runtime/function/JProcedure14.java
index 330a4ae11c42..052a99cfddae 100644
--- a/library/src/dotty/runtime/function/JProcedure14.java
+++ b/library/src/dotty/runtime/function/JProcedure14.java
@@ -8,10 +8,7 @@
 import scala.runtime.BoxedUnit;
 
 @FunctionalInterface
-public interface JProcedure14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> extends JFunction14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
+public interface JProcedure14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> extends scala.Function14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, BoxedUnit>, java.io.Serializable {
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14) {
diff --git a/library/src/dotty/runtime/function/JProcedure15.java b/library/src/dotty/runtime/function/JProcedure15.java
index a1ae0d756a3d..a7aac983c523 100644
--- a/library/src/dotty/runtime/function/JProcedure15.java
+++ b/library/src/dotty/runtime/function/JProcedure15.java
@@ -8,10 +8,7 @@
 import scala.runtime.BoxedUnit;
 
 @FunctionalInterface
-public interface JProcedure15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> extends JFunction15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
+public interface JProcedure15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> extends scala.Function15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, BoxedUnit>, java.io.Serializable {
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15) {
diff --git a/library/src/dotty/runtime/function/JProcedure16.java b/library/src/dotty/runtime/function/JProcedure16.java
index fcb17c9e37ec..9c62ab1a6ac3 100644
--- a/library/src/dotty/runtime/function/JProcedure16.java
+++ b/library/src/dotty/runtime/function/JProcedure16.java
@@ -8,10 +8,7 @@
 import scala.runtime.BoxedUnit;
 
 @FunctionalInterface
-public interface JProcedure16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> extends JFunction16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
+public interface JProcedure16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> extends scala.Function16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, BoxedUnit>, java.io.Serializable {
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16) {
diff --git a/library/src/dotty/runtime/function/JProcedure17.java b/library/src/dotty/runtime/function/JProcedure17.java
index 5fabd706de46..b685fe9bd084 100644
--- a/library/src/dotty/runtime/function/JProcedure17.java
+++ b/library/src/dotty/runtime/function/JProcedure17.java
@@ -8,10 +8,7 @@
 import scala.runtime.BoxedUnit;
 
 @FunctionalInterface
-public interface JProcedure17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> extends JFunction17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
+public interface JProcedure17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> extends scala.Function17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, BoxedUnit>, java.io.Serializable {
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17) {
diff --git a/library/src/dotty/runtime/function/JProcedure18.java b/library/src/dotty/runtime/function/JProcedure18.java
index 8a5d0f18fb86..72dd36912ade 100644
--- a/library/src/dotty/runtime/function/JProcedure18.java
+++ b/library/src/dotty/runtime/function/JProcedure18.java
@@ -8,10 +8,7 @@
 import scala.runtime.BoxedUnit;
 
 @FunctionalInterface
-public interface JProcedure18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> extends JFunction18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
+public interface JProcedure18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> extends scala.Function18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, BoxedUnit>, java.io.Serializable {
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18) {
diff --git a/library/src/dotty/runtime/function/JProcedure19.java b/library/src/dotty/runtime/function/JProcedure19.java
index 7b2b4b76bd6f..afeccb710ae2 100644
--- a/library/src/dotty/runtime/function/JProcedure19.java
+++ b/library/src/dotty/runtime/function/JProcedure19.java
@@ -8,10 +8,7 @@
 import scala.runtime.BoxedUnit;
 
 @FunctionalInterface
-public interface JProcedure19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> extends JFunction19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
+public interface JProcedure19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> extends scala.Function19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, BoxedUnit>, java.io.Serializable {
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19) {
diff --git a/library/src/dotty/runtime/function/JProcedure2.java b/library/src/dotty/runtime/function/JProcedure2.java
index d8cd06dd47e8..ea47fe76fca9 100644
--- a/library/src/dotty/runtime/function/JProcedure2.java
+++ b/library/src/dotty/runtime/function/JProcedure2.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 public interface JProcedure2<T1, T2> extends JFunction2<T1, T2, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
     void applyVoid(T1 t1, T2 t2);
 
     default BoxedUnit apply(T1 t1, T2 t2) {
diff --git a/library/src/dotty/runtime/function/JProcedure20.java b/library/src/dotty/runtime/function/JProcedure20.java
index 4183512277fb..e69e248a1c00 100644
--- a/library/src/dotty/runtime/function/JProcedure20.java
+++ b/library/src/dotty/runtime/function/JProcedure20.java
@@ -8,10 +8,7 @@
 import scala.runtime.BoxedUnit;
 
 @FunctionalInterface
-public interface JProcedure20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> extends JFunction20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
+public interface JProcedure20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> extends scala.Function20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, BoxedUnit>, java.io.Serializable {
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20) {
diff --git a/library/src/dotty/runtime/function/JProcedure21.java b/library/src/dotty/runtime/function/JProcedure21.java
index 26170003a94b..f77f3467b882 100644
--- a/library/src/dotty/runtime/function/JProcedure21.java
+++ b/library/src/dotty/runtime/function/JProcedure21.java
@@ -8,10 +8,7 @@
 import scala.runtime.BoxedUnit;
 
 @FunctionalInterface
-public interface JProcedure21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> extends JFunction21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
+public interface JProcedure21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> extends scala.Function21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, BoxedUnit>, java.io.Serializable {
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20, T21 t21);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20, T21 t21) {
diff --git a/library/src/dotty/runtime/function/JProcedure22.java b/library/src/dotty/runtime/function/JProcedure22.java
index a104b4f4aff4..6c5c7296c41d 100644
--- a/library/src/dotty/runtime/function/JProcedure22.java
+++ b/library/src/dotty/runtime/function/JProcedure22.java
@@ -8,10 +8,7 @@
 import scala.runtime.BoxedUnit;
 
 @FunctionalInterface
-public interface JProcedure22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> extends JFunction22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
+public interface JProcedure22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> extends scala.Function22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, BoxedUnit>, java.io.Serializable {
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20, T21 t21, T22 t22);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20, T21 t21, T22 t22) {
diff --git a/library/src/dotty/runtime/function/JProcedure3.java b/library/src/dotty/runtime/function/JProcedure3.java
index 4d66557b5035..30eb32533d2f 100644
--- a/library/src/dotty/runtime/function/JProcedure3.java
+++ b/library/src/dotty/runtime/function/JProcedure3.java
@@ -8,10 +8,7 @@
 import scala.runtime.BoxedUnit;
 
 @FunctionalInterface
-public interface JProcedure3<T1, T2, T3> extends JFunction3<T1, T2, T3, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
+public interface JProcedure3<T1, T2, T3> extends scala.Function3<T1, T2, T3, BoxedUnit>, java.io.Serializable {
     void applyVoid(T1 t1, T2 t2, T3 t3);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3) {
diff --git a/library/src/dotty/runtime/function/JProcedure4.java b/library/src/dotty/runtime/function/JProcedure4.java
index 8bf7282c8c7b..eaa3b2a24ab1 100644
--- a/library/src/dotty/runtime/function/JProcedure4.java
+++ b/library/src/dotty/runtime/function/JProcedure4.java
@@ -8,10 +8,7 @@
 import scala.runtime.BoxedUnit;
 
 @FunctionalInterface
-public interface JProcedure4<T1, T2, T3, T4> extends JFunction4<T1, T2, T3, T4, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
+public interface JProcedure4<T1, T2, T3, T4> extends scala.Function4<T1, T2, T3, T4, BoxedUnit>, java.io.Serializable {
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4) {
diff --git a/library/src/dotty/runtime/function/JProcedure5.java b/library/src/dotty/runtime/function/JProcedure5.java
index 07fbb0c2d239..aad50f8c9fd3 100644
--- a/library/src/dotty/runtime/function/JProcedure5.java
+++ b/library/src/dotty/runtime/function/JProcedure5.java
@@ -8,10 +8,7 @@
 import scala.runtime.BoxedUnit;
 
 @FunctionalInterface
-public interface JProcedure5<T1, T2, T3, T4, T5> extends JFunction5<T1, T2, T3, T4, T5, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
+public interface JProcedure5<T1, T2, T3, T4, T5> extends scala.Function5<T1, T2, T3, T4, T5, BoxedUnit>, java.io.Serializable {
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5) {
diff --git a/library/src/dotty/runtime/function/JProcedure6.java b/library/src/dotty/runtime/function/JProcedure6.java
index da044b203e5b..63e8f6cf4833 100644
--- a/library/src/dotty/runtime/function/JProcedure6.java
+++ b/library/src/dotty/runtime/function/JProcedure6.java
@@ -8,10 +8,7 @@
 import scala.runtime.BoxedUnit;
 
 @FunctionalInterface
-public interface JProcedure6<T1, T2, T3, T4, T5, T6> extends JFunction6<T1, T2, T3, T4, T5, T6, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
+public interface JProcedure6<T1, T2, T3, T4, T5, T6> extends scala.Function6<T1, T2, T3, T4, T5, T6, BoxedUnit>, java.io.Serializable {
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6) {
diff --git a/library/src/dotty/runtime/function/JProcedure7.java b/library/src/dotty/runtime/function/JProcedure7.java
index 3583e3a6a24a..f69b0f44795d 100644
--- a/library/src/dotty/runtime/function/JProcedure7.java
+++ b/library/src/dotty/runtime/function/JProcedure7.java
@@ -8,10 +8,7 @@
 import scala.runtime.BoxedUnit;
 
 @FunctionalInterface
-public interface JProcedure7<T1, T2, T3, T4, T5, T6, T7> extends JFunction7<T1, T2, T3, T4, T5, T6, T7, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
+public interface JProcedure7<T1, T2, T3, T4, T5, T6, T7> extends scala.Function7<T1, T2, T3, T4, T5, T6, T7, BoxedUnit>, java.io.Serializable {
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7) {
diff --git a/library/src/dotty/runtime/function/JProcedure8.java b/library/src/dotty/runtime/function/JProcedure8.java
index ec7a54d346c4..b172754ec378 100644
--- a/library/src/dotty/runtime/function/JProcedure8.java
+++ b/library/src/dotty/runtime/function/JProcedure8.java
@@ -8,10 +8,7 @@
 import scala.runtime.BoxedUnit;
 
 @FunctionalInterface
-public interface JProcedure8<T1, T2, T3, T4, T5, T6, T7, T8> extends JFunction8<T1, T2, T3, T4, T5, T6, T7, T8, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
+public interface JProcedure8<T1, T2, T3, T4, T5, T6, T7, T8> extends scala.Function8<T1, T2, T3, T4, T5, T6, T7, T8, BoxedUnit>, java.io.Serializable {
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8) {
diff --git a/library/src/dotty/runtime/function/JProcedure9.java b/library/src/dotty/runtime/function/JProcedure9.java
index 1de9b280a6e9..cd7f6b9a67e9 100644
--- a/library/src/dotty/runtime/function/JProcedure9.java
+++ b/library/src/dotty/runtime/function/JProcedure9.java
@@ -8,10 +8,7 @@
 import scala.runtime.BoxedUnit;
 
 @FunctionalInterface
-public interface JProcedure9<T1, T2, T3, T4, T5, T6, T7, T8, T9> extends JFunction9<T1, T2, T3, T4, T5, T6, T7, T8, T9, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
+public interface JProcedure9<T1, T2, T3, T4, T5, T6, T7, T8, T9> extends scala.Function9<T1, T2, T3, T4, T5, T6, T7, T8, T9, BoxedUnit>, java.io.Serializable {
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9) {
diff --git a/tests/run/i6109.scala b/tests/run/i6109.scala
new file mode 100644
index 000000000000..30093fa05242
--- /dev/null
+++ b/tests/run/i6109.scala
@@ -0,0 +1,64 @@
+object Test extends App {
+  val f2 = (x1: Int, x2: Int) => x2
+  assert(f2.curried(1)(2) == 2)
+
+  val f3 = (x1: Int, x2: Int, x3: Int) => x3
+  assert(f3.curried(1)(2)(3) == 3)
+
+  val f4 = (x1: Int, x2: Int, x3: Int, x4: Int) => x4
+  assert(f4.curried(1)(2)(3)(4) == 4)
+
+  val f5 = (x1: Int, x2: Int, x3: Int, x4: Int, x5: Int) => x5
+  assert(f5.curried(1)(2)(3)(4)(5) == 5)
+
+  val f6 = (x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int) => x6
+  assert(f6.curried(1)(2)(3)(4)(5)(6) == 6)
+
+  val f7 = (x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int, x7: Int) => x7
+  assert(f7.curried(1)(2)(3)(4)(5)(6)(7) == 7)
+
+  val f8 = (x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int, x7: Int, x8: Int) => x8
+  assert(f8.curried(1)(2)(3)(4)(5)(6)(7)(8) == 8)
+
+  val f9 = (x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int, x7: Int, x8: Int, x9: Int) => x9
+  assert(f9.curried(1)(2)(3)(4)(5)(6)(7)(8)(9) == 9)
+
+  val f10 = (x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int, x7: Int, x8: Int, x9: Int, x10: Int) => x10
+  assert(f10.curried(1)(2)(3)(4)(5)(6)(7)(8)(9)(10) == 10)
+
+  val f11 = (x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int, x7: Int, x8: Int, x9: Int, x10: Int, x11: Int) => x11
+  assert(f11.curried(1)(2)(3)(4)(5)(6)(7)(8)(9)(10)(11) == 11)
+
+  val f12 = (x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int, x7: Int, x8: Int, x9: Int, x10: Int, x11: Int, x12: Int) => x12
+  assert(f12.curried(1)(2)(3)(4)(5)(6)(7)(8)(9)(10)(11)(12) == 12)
+
+  val f13 = (x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int, x7: Int, x8: Int, x9: Int, x10: Int, x11: Int, x12: Int, x13: Int) => x13
+  assert(f13.curried(1)(2)(3)(4)(5)(6)(7)(8)(9)(10)(11)(12)(13) == 13)
+
+  val f14 = (x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int, x7: Int, x8: Int, x9: Int, x10: Int, x11: Int, x12: Int, x13: Int, x14: Int) => x14
+  assert(f14.curried(1)(2)(3)(4)(5)(6)(7)(8)(9)(10)(11)(12)(13)(14) == 14)
+
+  val f15 = (x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int, x7: Int, x8: Int, x9: Int, x10: Int, x11: Int, x12: Int, x13: Int, x14: Int, x15: Int) => x15
+  assert(f15.curried(1)(2)(3)(4)(5)(6)(7)(8)(9)(10)(11)(12)(13)(14)(15) == 15)
+
+  val f16 = (x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int, x7: Int, x8: Int, x9: Int, x10: Int, x11: Int, x12: Int, x13: Int, x14: Int, x15: Int, x16: Int) => x16
+  assert(f16.curried(1)(2)(3)(4)(5)(6)(7)(8)(9)(10)(11)(12)(13)(14)(15)(16) == 16)
+
+  val f17 = (x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int, x7: Int, x8: Int, x9: Int, x10: Int, x11: Int, x12: Int, x13: Int, x14: Int, x15: Int, x16: Int, x17: Int) => x17
+  assert(f17.curried(1)(2)(3)(4)(5)(6)(7)(8)(9)(10)(11)(12)(13)(14)(15)(16)(17) == 17)
+
+  val f18 = (x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int, x7: Int, x8: Int, x9: Int, x10: Int, x11: Int, x12: Int, x13: Int, x14: Int, x15: Int, x16: Int, x17: Int, x18: Int) => x18
+  assert(f18.curried(1)(2)(3)(4)(5)(6)(7)(8)(9)(10)(11)(12)(13)(14)(15)(16)(17)(18) == 18)
+
+  val f19 = (x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int, x7: Int, x8: Int, x9: Int, x10: Int, x11: Int, x12: Int, x13: Int, x14: Int, x15: Int, x16: Int, x17: Int, x18: Int, x19: Int) => x19
+  assert(f19.curried(1)(2)(3)(4)(5)(6)(7)(8)(9)(10)(11)(12)(13)(14)(15)(16)(17)(18)(19) == 19)
+
+  val f20 = (x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int, x7: Int, x8: Int, x9: Int, x10: Int, x11: Int, x12: Int, x13: Int, x14: Int, x15: Int, x16: Int, x17: Int, x18: Int, x19: Int, x20: Int) => x20
+  assert(f20.curried(1)(2)(3)(4)(5)(6)(7)(8)(9)(10)(11)(12)(13)(14)(15)(16)(17)(18)(19)(20) == 20)
+
+  val f21 = (x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int, x7: Int, x8: Int, x9: Int, x10: Int, x11: Int, x12: Int, x13: Int, x14: Int, x15: Int, x16: Int, x17: Int, x18: Int, x19: Int, x20: Int, x21: Int) => x21
+  assert(f21.curried(1)(2)(3)(4)(5)(6)(7)(8)(9)(10)(11)(12)(13)(14)(15)(16)(17)(18)(19)(20)(21) == 21)
+
+  val f22 = (x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int, x7: Int, x8: Int, x9: Int, x10: Int, x11: Int, x12: Int, x13: Int, x14: Int, x15: Int, x16: Int, x17: Int, x18: Int, x19: Int, x20: Int, x21: Int, x22: Int) => x22
+  assert(f22.curried(1)(2)(3)(4)(5)(6)(7)(8)(9)(10)(11)(12)(13)(14)(15)(16)(17)(18)(19)(20)(21)(22) == 22)
+}
\ No newline at end of file