separate lib from compiler

156 files changed, 0 insertions, 4043 deletions

diff --git a/src/scala/Eq.scala b/src/scala/Eq.scala
deleted file mode 100644
index d6d617cab..000000000
--- a/src/scala/Eq.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-package scala
-
-import annotation.implicitNotFound
-
-/** A marker trait indicating that values of type `L` can be compared to values of type `R`. */
-@implicitNotFound("Values of types ${L} and ${R} cannot be compared with == or !=")
-sealed trait Eq[-L, -R]
-
-/** Besides being a companion object, this object
- *  can also be used as a value that's compatible with
- *  any instance of `Eq`.
- */
-object Eq extends Eq[Any, Any]
-
diff --git a/src/scala/Function23.scala b/src/scala/Function23.scala
deleted file mode 100644
index 254772d53..000000000
--- a/src/scala/Function23.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002-2013, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-package scala
-
-
-/** A function of 23 parameters. Used as a temporary fix until arity limit is dropped.
- *
- */
-trait Function23[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10, -T11, -T12, -T13, -T14, -T15, -T16, -T17, -T18, -T19, -T20, -T21, -T22, -T23, +R] extends AnyRef { self =>
-  /** Apply the body of this function to the arguments.
-   *  @return   the result of function application.
-   */
-  def apply(v1: T1, v2: T2, v3: T3, v4: T4, v5: T5, v6: T6, v7: T7, v8: T8, v9: T9, v10: T10, v11: T11, v12: T12, v13: T13, v14: T14, v15: T15, v16: T16, v17: T17, v18: T18, v19: T19, v20: T20, v21: T21, v22: T22, v23: T23): R
-
-  override def toString() = "<function23>"
-}
diff --git a/src/scala/Function24.scala b/src/scala/Function24.scala
deleted file mode 100644
index 8af8ed995..000000000
--- a/src/scala/Function24.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002-2013, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-package scala
-
-
-/** A function of 24 parameters. Used as a temporary fix until arity limit is dropped.
- *
- */
-trait Function24[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10, -T11, -T12, -T13, -T14, -T15, -T16, -T17, -T18, -T19, -T20, -T21, -T22, -T23, -T24, +R] extends AnyRef { self =>
-  /** Apply the body of this function to the arguments.
-   *  @return   the result of function application.
-   */
-  def apply(v1: T1, v2: T2, v3: T3, v4: T4, v5: T5, v6: T6, v7: T7, v8: T8, v9: T9, v10: T10, v11: T11, v12: T12, v13: T13, v14: T14, v15: T15, v16: T16, v17: T17, v18: T18, v19: T19, v20: T20, v21: T21, v22: T22, v23: T23, v24: T24): R
-
-  override def toString() = "<function24>"
-}
diff --git a/src/scala/Function25.scala b/src/scala/Function25.scala
deleted file mode 100644
index 6df740b5b..000000000
--- a/src/scala/Function25.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002-2013, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-package scala
-
-
-/** A function of 25 parameters. Used as a temporary fix until arity limit is dropped.
- *
- */
-trait Function25[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10, -T11, -T12, -T13, -T14, -T15, -T16, -T17, -T18, -T19, -T20, -T21, -T22, -T23, -T24, -T25, +R] extends AnyRef { self =>
-  /** Apply the body of this function to the arguments.
-   *  @return   the result of function application.
-   */
-  def apply(v1: T1, v2: T2, v3: T3, v4: T4, v5: T5, v6: T6, v7: T7, v8: T8, v9: T9, v10: T10, v11: T11, v12: T12, v13: T13, v14: T14, v15: T15, v16: T16, v17: T17, v18: T18, v19: T19, v20: T20, v21: T21, v22: T22, v23: T23, v24: T24, v25: T25): R
-
-  override def toString() = "<function25>"
-}
diff --git a/src/scala/Function26.scala b/src/scala/Function26.scala
deleted file mode 100644
index 5daccb6f0..000000000
--- a/src/scala/Function26.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002-2013, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-package scala
-
-/** A function of 26 parameters. Used as a temporary fix until arity limit is dropped.
- *
- */
-trait Function26[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10, -T11, -T12, -T13, -T14, -T15, -T16, -T17, -T18, -T19, -T20, -T21, -T22, -T23, -T24, -T25, -T26, +R] extends AnyRef { self =>
-  /** Apply the body of this function to the arguments.
-   *  @return   the result of function application.
-   */
-  def apply(v1: T1, v2: T2, v3: T3, v4: T4, v5: T5, v6: T6, v7: T7, v8: T8, v9: T9, v10: T10, v11: T11, v12: T12, v13: T13, v14: T14, v15: T15, v16: T16, v17: T17, v18: T18, v19: T19, v20: T20, v21: T21, v22: T22, v23: T23, v24: T24, v25: T25, v26: T26): R
-
-  override def toString() = "<function26>"
-}
diff --git a/src/scala/Function27.scala b/src/scala/Function27.scala
deleted file mode 100644
index daebd3ed4..000000000
--- a/src/scala/Function27.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002-2013, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-package scala
-
-/** A function of 27 parameters. Used as a temporary fix until arity limit is dropped.
- *
- */
-trait Function27[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10, -T11, -T12, -T13, -T14, -T15, -T16, -T17, -T18, -T19, -T20, -T21, -T22, -T23, -T24, -T25, -T26, -T27, +R] extends AnyRef { self =>
-  /** Apply the body of this function to the arguments.
-   *  @return   the result of function application.
-   */
-  def apply(v1: T1, v2: T2, v3: T3, v4: T4, v5: T5, v6: T6, v7: T7, v8: T8, v9: T9, v10: T10, v11: T11, v12: T12, v13: T13, v14: T14, v15: T15, v16: T16, v17: T17, v18: T18, v19: T19, v20: T20, v21: T21, v22: T22, v23: T23, v24: T24, v25: T25, v26: T26, v27: T27): R
-
-  override def toString() = "<function27>"
-}
diff --git a/src/scala/Function28.scala b/src/scala/Function28.scala
deleted file mode 100644
index 82912caea..000000000
--- a/src/scala/Function28.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002-2013, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-package scala
-
-/** A function of 28 parameters. Used as a temporary fix until arity limit is dropped.
- *
- */
-trait Function28[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10, -T11, -T12, -T13, -T14, -T15, -T16, -T17, -T18, -T19, -T20, -T21, -T22, -T23, -T24, -T25, -T26, -T27, -T28, +R] extends AnyRef { self =>
-  /** Apply the body of this function to the arguments.
-   *  @return   the result of function application.
-   */
-  def apply(v1: T1, v2: T2, v3: T3, v4: T4, v5: T5, v6: T6, v7: T7, v8: T8, v9: T9, v10: T10, v11: T11, v12: T12, v13: T13, v14: T14, v15: T15, v16: T16, v17: T17, v18: T18, v19: T19, v20: T20, v21: T21, v22: T22, v23: T23, v24: T24, v25: T25, v26: T26, v27: T27, v28: T28): R
-
-  override def toString() = "<function28>"
-}
diff --git a/src/scala/Function29.scala b/src/scala/Function29.scala
deleted file mode 100644
index 6dabf2051..000000000
--- a/src/scala/Function29.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002-2013, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-package scala
-
-/** A function of 29 parameters. Used as a temporary fix until arity limit is dropped.
- *
- */
-trait Function29[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10, -T11, -T12, -T13, -T14, -T15, -T16, -T17, -T18, -T19, -T20, -T21, -T22, -T23, -T24, -T25, -T26, -T27, -T28, -T29, +R] extends AnyRef { self =>
-  /** Apply the body of this function to the arguments.
-   *  @return   the result of function application.
-   */
-  def apply(v1: T1, v2: T2, v3: T3, v4: T4, v5: T5, v6: T6, v7: T7, v8: T8, v9: T9, v10: T10, v11: T11, v12: T12, v13: T13, v14: T14, v15: T15, v16: T16, v17: T17, v18: T18, v19: T19, v20: T20, v21: T21, v22: T22, v23: T23, v24: T24, v25: T25, v26: T26, v27: T27, v28: T28, v29: T29): R
-
-  override def toString() = "<function29>"
-}
diff --git a/src/scala/Function30.scala b/src/scala/Function30.scala
deleted file mode 100644
index 20fd970dd..000000000
--- a/src/scala/Function30.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002-2013, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-package scala
-
-/** A function of 30 parameters. Used as a temporary fix until arity limit is dropped.
- *
- */
-trait Function30[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10, -T11, -T12, -T13, -T14, -T15, -T16, -T17, -T18, -T19, -T20, -T21, -T22, -T23, -T24, -T25, -T26, -T27, -T28, -T29, -T30, +R] extends AnyRef { self =>
-  /** Apply the body of this function to the arguments.
-   *  @return   the result of function application.
-   */
-  def apply(v1: T1, v2: T2, v3: T3, v4: T4, v5: T5, v6: T6, v7: T7, v8: T8, v9: T9, v10: T10, v11: T11, v12: T12, v13: T13, v14: T14, v15: T15, v16: T16, v17: T17, v18: T18, v19: T19, v20: T20, v21: T21, v22: T22, v23: T23, v24: T24, v25: T25, v26: T26, v27: T27, v28: T28, v29: T29, v30: T30): R
-
-  override def toString() = "<function30>"
-}
diff --git a/src/scala/Product0.scala b/src/scala/Product0.scala
deleted file mode 100644
index d50721d02..000000000
--- a/src/scala/Product0.scala
+++ /dev/null
@@ -1,23 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002-2013, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-package scala
-
-/** A class for Product0 which was missing from the scala distribution. */
-object Product0 {
-  def unapply(x: Product0): Option[Product0] =
-    Some(x)
-}
-
-trait Product0 extends Any with Product {
-
-  override def productArity = 0
-
-  @throws(classOf[IndexOutOfBoundsException])
-  override def productElement(n: Int) =
-    throw new IndexOutOfBoundsException(n.toString())
-}
diff --git a/src/scala/annotation/internal/Alias.scala b/src/scala/annotation/internal/Alias.scala
deleted file mode 100644
index e3f56e70c..000000000
--- a/src/scala/annotation/internal/Alias.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-package scala.annotation.internal
-
-import scala.annotation.Annotation
-
-/** An annotation to record a Scala2 pickled alias.
- *  @param aliased  A TermRef pointing to the aliased field.
- */
-class Alias(aliased: Any) extends Annotation {
-
-}
diff --git a/src/scala/annotation/internal/AnnotationDefault.scala b/src/scala/annotation/internal/AnnotationDefault.scala
deleted file mode 100644
index 5280d091c..000000000
--- a/src/scala/annotation/internal/AnnotationDefault.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package scala.annotation.internal
-
-import scala.annotation.Annotation
-
-/** An annotation to tag Java annotation default values */
-class AnnotationDefault extends Annotation {
-
-}
diff --git a/src/scala/annotation/internal/Body.scala b/src/scala/annotation/internal/Body.scala
deleted file mode 100644
index b6aa0c0fb..000000000
--- a/src/scala/annotation/internal/Body.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package scala.annotation.internal
-
-import scala.annotation.Annotation
-
-/** The class associated with a `BodyAnnotation`, which indicates
- *  an inline method's right hand side
- */
-final class Body() extends Annotation
diff --git a/src/scala/annotation/internal/Child.scala b/src/scala/annotation/internal/Child.scala
deleted file mode 100644
index c90871945..000000000
--- a/src/scala/annotation/internal/Child.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-package scala.annotation.internal
-
-import scala.annotation.Annotation
-
-/** An annotation to indicate a child class or object of the annotated class.
- *  E.g. if we have
- *
- *    sealed class A
- *    case class B() extends A
- *    case class C() extends A
- *
- *  Then the class symbol `A` would carry the annotations
- *  `@Child[Bref] @Child[Cref]` where `Bref`, `Cref` are TypeRefs
- *  referring to the class symbols of `B` and `C`
- */
-class Child[T] extends Annotation
diff --git a/src/scala/annotation/internal/InlineParam.scala b/src/scala/annotation/internal/InlineParam.scala
deleted file mode 100644
index 0b3649e89..000000000
--- a/src/scala/annotation/internal/InlineParam.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-package scala.annotation.internal
-
-import scala.annotation.Annotation
-
-/** An annotation produced by Namer to indicate an inline parameter */
-final class InlineParam() extends Annotation
diff --git a/src/scala/annotation/internal/Repeated.scala b/src/scala/annotation/internal/Repeated.scala
deleted file mode 100644
index 75eb3bc25..000000000
--- a/src/scala/annotation/internal/Repeated.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-package scala.annotation.internal
-
-import scala.annotation.Annotation
-
-/** An annotation produced by desugaring to indicate that a
- *  sequence is a repeated parameter. I.e.
- *
- *      T*  is expanded by Desugar to    Seq[T] @Repeated
- */
-final class Repeated() extends Annotation
diff --git a/src/scala/annotation/internal/SourceFile.scala b/src/scala/annotation/internal/SourceFile.scala
deleted file mode 100644
index b203869cf..000000000
--- a/src/scala/annotation/internal/SourceFile.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-package scala.annotation.internal
-
-import scala.annotation.Annotation
-
-/** An annotation to record a Scala2 pickled alias.
- *  @param aliased  A TermRef pointing to the aliased field.
- */
-class SourceFile(path: String) extends Annotation {
-
-}
diff --git a/src/scala/annotation/internal/TASTYLongSignature.java b/src/scala/annotation/internal/TASTYLongSignature.java
deleted file mode 100644
index 2278da258..000000000
--- a/src/scala/annotation/internal/TASTYLongSignature.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package scala.annotation.internal;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface TASTYLongSignature {
-    public String[] bytes();
-}
diff --git a/src/scala/annotation/internal/TASTYSignature.java b/src/scala/annotation/internal/TASTYSignature.java
deleted file mode 100644
index a6372f008..000000000
--- a/src/scala/annotation/internal/TASTYSignature.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package scala.annotation.internal;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface TASTYSignature {
-    public String bytes();
-}
diff --git a/src/scala/annotation/internal/UnsafeNonvariant.scala b/src/scala/annotation/internal/UnsafeNonvariant.scala
deleted file mode 100644
index b33df65d6..000000000
--- a/src/scala/annotation/internal/UnsafeNonvariant.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package scala.annotation.internal
-
-import scala.annotation.Annotation
-
-/** This annotation is used as a marker for unsafe
- *  instantiations in asSeenFrom. See TypeOps.asSeenfrom for an explanation.
- */
-class UnsafeNonvariant extends Annotation
diff --git a/src/scala/annotation/static.scala b/src/scala/annotation/static.scala
deleted file mode 100644
index b00072b18..000000000
--- a/src/scala/annotation/static.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-package scala.annotation
-
-import scala.annotation.meta._
-
-/** https://github.com/scala/scala.github.com/pull/491 */
-
-@field
-@getter
-@beanGetter
-@beanSetter
-@param
-@setter
-final class static extends StaticAnnotation
diff --git a/src/scala/compat/java8/JFunction.java b/src/scala/compat/java8/JFunction.java
deleted file mode 100644
index d68805d08..000000000
--- a/src/scala/compat/java8/JFunction.java
+++ /dev/null
@@ -1,233 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-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/src/scala/compat/java8/JFunction0$mcB$sp.java b/src/scala/compat/java8/JFunction0$mcB$sp.java
deleted file mode 100644
index 354667b63..000000000
--- a/src/scala/compat/java8/JFunction0$mcB$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction0$mcB$sp extends JFunction0 {
-    abstract byte apply$mcB$sp();
-
-    default Object apply() { return (Byte) apply$mcB$sp(); }
-}
diff --git a/src/scala/compat/java8/JFunction0$mcC$sp.java b/src/scala/compat/java8/JFunction0$mcC$sp.java
deleted file mode 100644
index 85c1d25e8..000000000
--- a/src/scala/compat/java8/JFunction0$mcC$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction0$mcC$sp extends JFunction0 {
-    abstract char apply$mcC$sp();
-
-    default Object apply() { return (Character) apply$mcC$sp(); }
-}
diff --git a/src/scala/compat/java8/JFunction0$mcD$sp.java b/src/scala/compat/java8/JFunction0$mcD$sp.java
deleted file mode 100644
index e430cddd7..000000000
--- a/src/scala/compat/java8/JFunction0$mcD$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction0$mcD$sp extends JFunction0 {
-    abstract double apply$mcD$sp();
-
-    default Object apply() { return (Double) apply$mcD$sp(); }
-}
diff --git a/src/scala/compat/java8/JFunction0$mcF$sp.java b/src/scala/compat/java8/JFunction0$mcF$sp.java
deleted file mode 100644
index e839d1edf..000000000
--- a/src/scala/compat/java8/JFunction0$mcF$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction0$mcF$sp extends JFunction0 {
-    abstract float apply$mcF$sp();
-
-    default Object apply() { return (Float) apply$mcF$sp(); }
-}
diff --git a/src/scala/compat/java8/JFunction0$mcI$sp.java b/src/scala/compat/java8/JFunction0$mcI$sp.java
deleted file mode 100644
index 6d592a41e..000000000
--- a/src/scala/compat/java8/JFunction0$mcI$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction0$mcI$sp extends JFunction0 {
-    abstract int apply$mcI$sp();
-
-    default Object apply() { return (Integer) apply$mcI$sp(); }
-}
diff --git a/src/scala/compat/java8/JFunction0$mcJ$sp.java b/src/scala/compat/java8/JFunction0$mcJ$sp.java
deleted file mode 100644
index 8347b0df1..000000000
--- a/src/scala/compat/java8/JFunction0$mcJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction0$mcJ$sp extends JFunction0 {
-    abstract long apply$mcJ$sp();
-
-    default Object apply() { return (Long) apply$mcJ$sp(); }
-}
diff --git a/src/scala/compat/java8/JFunction0$mcS$sp.java b/src/scala/compat/java8/JFunction0$mcS$sp.java
deleted file mode 100644
index dede12cf1..000000000
--- a/src/scala/compat/java8/JFunction0$mcS$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction0$mcS$sp extends JFunction0 {
-    abstract short apply$mcS$sp();
-
-    default Object apply() { return (Short) apply$mcS$sp(); }
-}
diff --git a/src/scala/compat/java8/JFunction0$mcV$sp.java b/src/scala/compat/java8/JFunction0$mcV$sp.java
deleted file mode 100644
index 933c9a28a..000000000
--- a/src/scala/compat/java8/JFunction0$mcV$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction0$mcV$sp extends JFunction0 {
-    abstract void apply$mcV$sp();
-
-    default Object apply() { apply$mcV$sp(); return scala.runtime.BoxedUnit.UNIT; }
-}
diff --git a/src/scala/compat/java8/JFunction0$mcZ$sp.java b/src/scala/compat/java8/JFunction0$mcZ$sp.java
deleted file mode 100644
index c51141b00..000000000
--- a/src/scala/compat/java8/JFunction0$mcZ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction0$mcZ$sp extends JFunction0 {
-    abstract boolean apply$mcZ$sp();
-
-    default Object apply() { return (Boolean) apply$mcZ$sp(); }
-}
diff --git a/src/scala/compat/java8/JFunction0.java b/src/scala/compat/java8/JFunction0.java
deleted file mode 100644
index e1c6f364a..000000000
--- a/src/scala/compat/java8/JFunction0.java
+++ /dev/null
@@ -1,39 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction0<R> extends scala.Function0<R> {
-    default void $init$() {
-    };
-    default void apply$mcV$sp() {
-        apply();
-    }
-    default byte apply$mcB$sp() {
-        return (Byte) apply();
-    }
-    default short apply$mcS$sp() {
-        return (Short) apply();
-    }
-    default int apply$mcI$sp() {
-        return (Integer) apply();
-    }
-    default long apply$mcJ$sp() {
-        return (Long) apply();
-    }
-    default char apply$mcC$sp() {
-        return (Character) apply();
-    }
-    default float apply$mcF$sp() {
-        return (Float) apply();
-    }
-    default double apply$mcD$sp() {
-        return (Double) apply();
-    }
-    default boolean apply$mcZ$sp() {
-        return (Boolean) apply();
-    }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcDD$sp.java b/src/scala/compat/java8/JFunction1$mcDD$sp.java
deleted file mode 100644
index cccdd3a44..000000000
--- a/src/scala/compat/java8/JFunction1$mcDD$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcDD$sp extends JFunction1 {
-    abstract double apply$mcDD$sp(double v1);
-
-    default Object apply(Object t) { return (Double) apply$mcDD$sp((Double) t); }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcDF$sp.java b/src/scala/compat/java8/JFunction1$mcDF$sp.java
deleted file mode 100644
index 8c86f3585..000000000
--- a/src/scala/compat/java8/JFunction1$mcDF$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcDF$sp extends JFunction1 {
-    abstract double apply$mcDF$sp(float v1);
-
-    default Object apply(Object t) { return (Double) apply$mcDF$sp((Float) t); }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcDI$sp.java b/src/scala/compat/java8/JFunction1$mcDI$sp.java
deleted file mode 100644
index 4b2cf185b..000000000
--- a/src/scala/compat/java8/JFunction1$mcDI$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcDI$sp extends JFunction1 {
-    abstract double apply$mcDI$sp(int v1);
-
-    default Object apply(Object t) { return (Double) apply$mcDI$sp((Integer) t); }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcDJ$sp.java b/src/scala/compat/java8/JFunction1$mcDJ$sp.java
deleted file mode 100644
index 24deff2dc..000000000
--- a/src/scala/compat/java8/JFunction1$mcDJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcDJ$sp extends JFunction1 {
-    abstract double apply$mcDJ$sp(long v1);
-
-    default Object apply(Object t) { return (Double) apply$mcDJ$sp((Long) t); }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcFD$sp.java b/src/scala/compat/java8/JFunction1$mcFD$sp.java
deleted file mode 100644
index 138120dbf..000000000
--- a/src/scala/compat/java8/JFunction1$mcFD$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcFD$sp extends JFunction1 {
-    abstract float apply$mcFD$sp(double v1);
-
-    default Object apply(Object t) { return (Float) apply$mcFD$sp((Double) t); }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcFF$sp.java b/src/scala/compat/java8/JFunction1$mcFF$sp.java
deleted file mode 100644
index ba6ef5e7e..000000000
--- a/src/scala/compat/java8/JFunction1$mcFF$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcFF$sp extends JFunction1 {
-    abstract float apply$mcFF$sp(float v1);
-
-    default Object apply(Object t) { return (Float) apply$mcFF$sp((Float) t); }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcFI$sp.java b/src/scala/compat/java8/JFunction1$mcFI$sp.java
deleted file mode 100644
index f37b26527..000000000
--- a/src/scala/compat/java8/JFunction1$mcFI$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcFI$sp extends JFunction1 {
-    abstract float apply$mcFI$sp(int v1);
-
-    default Object apply(Object t) { return (Float) apply$mcFI$sp((Integer) t); }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcFJ$sp.java b/src/scala/compat/java8/JFunction1$mcFJ$sp.java
deleted file mode 100644
index fe697df45..000000000
--- a/src/scala/compat/java8/JFunction1$mcFJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcFJ$sp extends JFunction1 {
-    abstract float apply$mcFJ$sp(long v1);
-
-    default Object apply(Object t) { return (Float) apply$mcFJ$sp((Long) t); }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcID$sp.java b/src/scala/compat/java8/JFunction1$mcID$sp.java
deleted file mode 100644
index 4a8cae858..000000000
--- a/src/scala/compat/java8/JFunction1$mcID$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcID$sp extends JFunction1 {
-    abstract int apply$mcID$sp(double v1);
-
-    default Object apply(Object t) { return (Integer) apply$mcID$sp((Double) t); }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcIF$sp.java b/src/scala/compat/java8/JFunction1$mcIF$sp.java
deleted file mode 100644
index 38a262377..000000000
--- a/src/scala/compat/java8/JFunction1$mcIF$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcIF$sp extends JFunction1 {
-    abstract int apply$mcIF$sp(float v1);
-
-    default Object apply(Object t) { return (Integer) apply$mcIF$sp((Float) t); }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcII$sp.java b/src/scala/compat/java8/JFunction1$mcII$sp.java
deleted file mode 100644
index 14fce8afc..000000000
--- a/src/scala/compat/java8/JFunction1$mcII$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcII$sp extends JFunction1 {
-    abstract int apply$mcII$sp(int v1);
-
-    default Object apply(Object t) { return (Integer) apply$mcII$sp((Integer) t); }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcIJ$sp.java b/src/scala/compat/java8/JFunction1$mcIJ$sp.java
deleted file mode 100644
index dd033736b..000000000
--- a/src/scala/compat/java8/JFunction1$mcIJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcIJ$sp extends JFunction1 {
-    abstract int apply$mcIJ$sp(long v1);
-
-    default Object apply(Object t) { return (Integer) apply$mcIJ$sp((Long) t); }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcJD$sp.java b/src/scala/compat/java8/JFunction1$mcJD$sp.java
deleted file mode 100644
index 9a9e37fca..000000000
--- a/src/scala/compat/java8/JFunction1$mcJD$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcJD$sp extends JFunction1 {
-    abstract long apply$mcJD$sp(double v1);
-
-    default Object apply(Object t) { return (Long) apply$mcJD$sp((Double) t); }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcJF$sp.java b/src/scala/compat/java8/JFunction1$mcJF$sp.java
deleted file mode 100644
index 1dac4d5f2..000000000
--- a/src/scala/compat/java8/JFunction1$mcJF$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcJF$sp extends JFunction1 {
-    abstract long apply$mcJF$sp(float v1);
-
-    default Object apply(Object t) { return (Long) apply$mcJF$sp((Float) t); }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcJI$sp.java b/src/scala/compat/java8/JFunction1$mcJI$sp.java
deleted file mode 100644
index a9dcc859d..000000000
--- a/src/scala/compat/java8/JFunction1$mcJI$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcJI$sp extends JFunction1 {
-    abstract long apply$mcJI$sp(int v1);
-
-    default Object apply(Object t) { return (Long) apply$mcJI$sp((Integer) t); }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcJJ$sp.java b/src/scala/compat/java8/JFunction1$mcJJ$sp.java
deleted file mode 100644
index 8dfcdcd84..000000000
--- a/src/scala/compat/java8/JFunction1$mcJJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcJJ$sp extends JFunction1 {
-    abstract long apply$mcJJ$sp(long v1);
-
-    default Object apply(Object t) { return (Long) apply$mcJJ$sp((Long) t); }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcVD$sp.java b/src/scala/compat/java8/JFunction1$mcVD$sp.java
deleted file mode 100644
index 9ebd8cb12..000000000
--- a/src/scala/compat/java8/JFunction1$mcVD$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcVD$sp extends JFunction1 {
-    abstract void apply$mcVD$sp(double v1);
-
-    default Object apply(Object t) { apply$mcVD$sp((Double) t); return scala.runtime.BoxedUnit.UNIT; }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcVF$sp.java b/src/scala/compat/java8/JFunction1$mcVF$sp.java
deleted file mode 100644
index 663f16a10..000000000
--- a/src/scala/compat/java8/JFunction1$mcVF$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcVF$sp extends JFunction1 {
-    abstract void apply$mcVF$sp(float v1);
-
-    default Object apply(Object t) { apply$mcVF$sp((Float) t); return scala.runtime.BoxedUnit.UNIT; }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcVI$sp.java b/src/scala/compat/java8/JFunction1$mcVI$sp.java
deleted file mode 100644
index 657973eb1..000000000
--- a/src/scala/compat/java8/JFunction1$mcVI$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcVI$sp extends JFunction1 {
-    abstract void apply$mcVI$sp(int v1);
-
-    default Object apply(Object t) { apply$mcVI$sp((Integer) t); return scala.runtime.BoxedUnit.UNIT; }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcVJ$sp.java b/src/scala/compat/java8/JFunction1$mcVJ$sp.java
deleted file mode 100644
index 123e8907f..000000000
--- a/src/scala/compat/java8/JFunction1$mcVJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcVJ$sp extends JFunction1 {
-    abstract void apply$mcVJ$sp(long v1);
-
-    default Object apply(Object t) { apply$mcVJ$sp((Long) t); return scala.runtime.BoxedUnit.UNIT; }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcZD$sp.java b/src/scala/compat/java8/JFunction1$mcZD$sp.java
deleted file mode 100644
index 6928c3742..000000000
--- a/src/scala/compat/java8/JFunction1$mcZD$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcZD$sp extends JFunction1 {
-    abstract boolean apply$mcZD$sp(double v1);
-
-    default Object apply(Object t) { return (Boolean) apply$mcZD$sp((Double) t); }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcZF$sp.java b/src/scala/compat/java8/JFunction1$mcZF$sp.java
deleted file mode 100644
index 2abc0a158..000000000
--- a/src/scala/compat/java8/JFunction1$mcZF$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcZF$sp extends JFunction1 {
-    abstract boolean apply$mcZF$sp(float v1);
-
-    default Object apply(Object t) { return (Boolean) apply$mcZF$sp((Float) t); }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcZI$sp.java b/src/scala/compat/java8/JFunction1$mcZI$sp.java
deleted file mode 100644
index cdde336a4..000000000
--- a/src/scala/compat/java8/JFunction1$mcZI$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcZI$sp extends JFunction1 {
-    abstract boolean apply$mcZI$sp(int v1);
-
-    default Object apply(Object t) { return (Boolean) apply$mcZI$sp((Integer) t); }
-}
diff --git a/src/scala/compat/java8/JFunction1$mcZJ$sp.java b/src/scala/compat/java8/JFunction1$mcZJ$sp.java
deleted file mode 100644
index ce784542e..000000000
--- a/src/scala/compat/java8/JFunction1$mcZJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1$mcZJ$sp extends JFunction1 {
-    abstract boolean apply$mcZJ$sp(long v1);
-
-    default Object apply(Object t) { return (Boolean) apply$mcZJ$sp((Long) t); }
-}
diff --git a/src/scala/compat/java8/JFunction1.java b/src/scala/compat/java8/JFunction1.java
deleted file mode 100644
index 69176cdea..000000000
--- a/src/scala/compat/java8/JFunction1.java
+++ /dev/null
@@ -1,314 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction1<T1, R> extends scala.Function1<T1, R> {
-    default void $init$() {
-    };
-
-    @Override
-    @SuppressWarnings("unchecked")
-    default <A> scala.Function1<T1, A> andThen(scala.Function1<R, A> g) {
-        return scala.Function1$class.andThen(this, g);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    default <A> scala.Function1<A, R> compose(scala.Function1<A, T1> g) {
-        return scala.Function1$class.compose(this, g);
-    }
-    @SuppressWarnings("unchecked")
-    default void apply$mcVI$sp(int v1) {
-        apply((T1) ((Integer) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default boolean apply$mcZI$sp(int v1) {
-        return (Boolean) apply((T1) ((Integer) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default int apply$mcII$sp(int v1) {
-        return (Integer) apply((T1) ((Integer) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default float apply$mcFI$sp(int v1) {
-        return (Float) apply((T1) ((Integer) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default long apply$mcJI$sp(int v1) {
-        return (Long) apply((T1) ((Integer) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default double apply$mcDI$sp(int v1) {
-        return (Double) apply((T1) ((Integer) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default void apply$mcVJ$sp(long v1) {
-        apply((T1) ((Long) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default boolean apply$mcZJ$sp(long v1) {
-        return (Boolean) apply((T1) ((Long) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default int apply$mcIJ$sp(long v1) {
-        return (Integer) apply((T1) ((Long) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default float apply$mcFJ$sp(long v1) {
-        return (Float) apply((T1) ((Long) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default long apply$mcJJ$sp(long v1) {
-        return (Long) apply((T1) ((Long) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default double apply$mcDJ$sp(long v1) {
-        return (Double) apply((T1) ((Long) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default void apply$mcVF$sp(float v1) {
-        apply((T1) ((Float) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default boolean apply$mcZF$sp(float v1) {
-        return (Boolean) apply((T1) ((Float) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default int apply$mcIF$sp(float v1) {
-        return (Integer) apply((T1) ((Float) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default float apply$mcFF$sp(float v1) {
-        return (Float) apply((T1) ((Float) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default long apply$mcJF$sp(float v1) {
-        return (Long) apply((T1) ((Float) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default double apply$mcDF$sp(float v1) {
-        return (Double) apply((T1) ((Float) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default void apply$mcVD$sp(double v1) {
-        apply((T1) ((Double) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default boolean apply$mcZD$sp(double v1) {
-        return (Boolean) apply((T1) ((Double) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default int apply$mcID$sp(double v1) {
-        return (Integer) apply((T1) ((Double) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default float apply$mcFD$sp(double v1) {
-        return (Float) apply((T1) ((Double) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default long apply$mcJD$sp(double v1) {
-        return (Long) apply((T1) ((Double) v1));
-    }
-    @SuppressWarnings("unchecked")
-    default double apply$mcDD$sp(double v1) {
-        return (Double) apply((T1) ((Double) v1));
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcVI$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcZI$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcII$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcFI$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcJI$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcDI$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcVJ$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcZJ$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcIJ$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcFJ$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcJJ$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcDJ$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcVF$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcZF$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcIF$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcFF$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcJF$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcDF$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcVD$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcZD$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcID$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcFD$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 compose$mcJD$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    @SuppressWarnings("unchecked")
-    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);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcZI$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcII$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcFI$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcJI$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcDI$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcVJ$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcZJ$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcIJ$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcFJ$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcJJ$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcDJ$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcVF$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcZF$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcIF$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcFF$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcJF$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcDF$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcVD$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcZD$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcID$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcFD$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcJD$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 andThen$mcDD$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-}
diff --git a/src/scala/compat/java8/JFunction10.java b/src/scala/compat/java8/JFunction10.java
deleted file mode 100644
index 8519ac223..000000000
--- a/src/scala/compat/java8/JFunction10.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@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> {
-    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() {
-      return scala.Function10$class.curried(this);
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>, R> tupled() {
-      return scala.Function10$class.tupled(this);
-    }
-
-
-}
diff --git a/src/scala/compat/java8/JFunction11.java b/src/scala/compat/java8/JFunction11.java
deleted file mode 100644
index 032ee40af..000000000
--- a/src/scala/compat/java8/JFunction11.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@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> {
-    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() {
-      return scala.Function11$class.curried(this);
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>, R> tupled() {
-      return scala.Function11$class.tupled(this);
-    }
-
-
-}
diff --git a/src/scala/compat/java8/JFunction12.java b/src/scala/compat/java8/JFunction12.java
deleted file mode 100644
index 3f3eff492..000000000
--- a/src/scala/compat/java8/JFunction12.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@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> {
-    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() {
-      return scala.Function12$class.curried(this);
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>, R> tupled() {
-      return scala.Function12$class.tupled(this);
-    }
-
-
-}
diff --git a/src/scala/compat/java8/JFunction13.java b/src/scala/compat/java8/JFunction13.java
deleted file mode 100644
index 2bed6ee97..000000000
--- a/src/scala/compat/java8/JFunction13.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@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> {
-    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() {
-      return scala.Function13$class.curried(this);
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>, R> tupled() {
-      return scala.Function13$class.tupled(this);
-    }
-
-
-}
diff --git a/src/scala/compat/java8/JFunction14.java b/src/scala/compat/java8/JFunction14.java
deleted file mode 100644
index 77fac237d..000000000
--- a/src/scala/compat/java8/JFunction14.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@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> {
-    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() {
-      return scala.Function14$class.curried(this);
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>, R> tupled() {
-      return scala.Function14$class.tupled(this);
-    }
-
-
-}
diff --git a/src/scala/compat/java8/JFunction15.java b/src/scala/compat/java8/JFunction15.java
deleted file mode 100644
index 25adc1679..000000000
--- a/src/scala/compat/java8/JFunction15.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@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> {
-    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() {
-      return scala.Function15$class.curried(this);
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>, R> tupled() {
-      return scala.Function15$class.tupled(this);
-    }
-
-
-}
diff --git a/src/scala/compat/java8/JFunction16.java b/src/scala/compat/java8/JFunction16.java
deleted file mode 100644
index fda1ea0c7..000000000
--- a/src/scala/compat/java8/JFunction16.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@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> {
-    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() {
-      return scala.Function16$class.curried(this);
-    }
-
-    @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() {
-      return scala.Function16$class.tupled(this);
-    }
-
-
-}
diff --git a/src/scala/compat/java8/JFunction17.java b/src/scala/compat/java8/JFunction17.java
deleted file mode 100644
index 89cb1b312..000000000
--- a/src/scala/compat/java8/JFunction17.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@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> {
-    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() {
-      return scala.Function17$class.curried(this);
-    }
-
-    @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() {
-      return scala.Function17$class.tupled(this);
-    }
-
-
-}
diff --git a/src/scala/compat/java8/JFunction18.java b/src/scala/compat/java8/JFunction18.java
deleted file mode 100644
index 428cee961..000000000
--- a/src/scala/compat/java8/JFunction18.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@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> {
-    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() {
-      return scala.Function18$class.curried(this);
-    }
-
-    @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() {
-      return scala.Function18$class.tupled(this);
-    }
-
-
-}
diff --git a/src/scala/compat/java8/JFunction19.java b/src/scala/compat/java8/JFunction19.java
deleted file mode 100644
index 95e47df7e..000000000
--- a/src/scala/compat/java8/JFunction19.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@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> {
-    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() {
-      return scala.Function19$class.curried(this);
-    }
-
-    @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() {
-      return scala.Function19$class.tupled(this);
-    }
-
-
-}
diff --git a/src/scala/compat/java8/JFunction2$mcDDD$sp.java b/src/scala/compat/java8/JFunction2$mcDDD$sp.java
deleted file mode 100644
index 2bb68e698..000000000
--- a/src/scala/compat/java8/JFunction2$mcDDD$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcDDD$sp extends JFunction2 {
-    abstract double apply$mcDDD$sp(double v1, double v2);
-
-    default Object apply(Object v1, Object v2) { return (Double) apply$mcDDD$sp((Double) v1, (Double) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcDDI$sp.java b/src/scala/compat/java8/JFunction2$mcDDI$sp.java
deleted file mode 100644
index 61e4d1b17..000000000
--- a/src/scala/compat/java8/JFunction2$mcDDI$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcDDI$sp extends JFunction2 {
-    abstract double apply$mcDDI$sp(double v1, int v2);
-
-    default Object apply(Object v1, Object v2) { return (Double) apply$mcDDI$sp((Double) v1, (Integer) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcDDJ$sp.java b/src/scala/compat/java8/JFunction2$mcDDJ$sp.java
deleted file mode 100644
index aa8564960..000000000
--- a/src/scala/compat/java8/JFunction2$mcDDJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcDDJ$sp extends JFunction2 {
-    abstract double apply$mcDDJ$sp(double v1, long v2);
-
-    default Object apply(Object v1, Object v2) { return (Double) apply$mcDDJ$sp((Double) v1, (Long) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcDID$sp.java b/src/scala/compat/java8/JFunction2$mcDID$sp.java
deleted file mode 100644
index ba56c080c..000000000
--- a/src/scala/compat/java8/JFunction2$mcDID$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcDID$sp extends JFunction2 {
-    abstract double apply$mcDID$sp(int v1, double v2);
-
-    default Object apply(Object v1, Object v2) { return (Double) apply$mcDID$sp((Integer) v1, (Double) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcDII$sp.java b/src/scala/compat/java8/JFunction2$mcDII$sp.java
deleted file mode 100644
index ec7bc956b..000000000
--- a/src/scala/compat/java8/JFunction2$mcDII$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcDII$sp extends JFunction2 {
-    abstract double apply$mcDII$sp(int v1, int v2);
-
-    default Object apply(Object v1, Object v2) { return (Double) apply$mcDII$sp((Integer) v1, (Integer) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcDIJ$sp.java b/src/scala/compat/java8/JFunction2$mcDIJ$sp.java
deleted file mode 100644
index 152e067e0..000000000
--- a/src/scala/compat/java8/JFunction2$mcDIJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcDIJ$sp extends JFunction2 {
-    abstract double apply$mcDIJ$sp(int v1, long v2);
-
-    default Object apply(Object v1, Object v2) { return (Double) apply$mcDIJ$sp((Integer) v1, (Long) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcDJD$sp.java b/src/scala/compat/java8/JFunction2$mcDJD$sp.java
deleted file mode 100644
index 27b5b6567..000000000
--- a/src/scala/compat/java8/JFunction2$mcDJD$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcDJD$sp extends JFunction2 {
-    abstract double apply$mcDJD$sp(long v1, double v2);
-
-    default Object apply(Object v1, Object v2) { return (Double) apply$mcDJD$sp((Long) v1, (Double) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcDJI$sp.java b/src/scala/compat/java8/JFunction2$mcDJI$sp.java
deleted file mode 100644
index c8130a78d..000000000
--- a/src/scala/compat/java8/JFunction2$mcDJI$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcDJI$sp extends JFunction2 {
-    abstract double apply$mcDJI$sp(long v1, int v2);
-
-    default Object apply(Object v1, Object v2) { return (Double) apply$mcDJI$sp((Long) v1, (Integer) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcDJJ$sp.java b/src/scala/compat/java8/JFunction2$mcDJJ$sp.java
deleted file mode 100644
index 48705ca6f..000000000
--- a/src/scala/compat/java8/JFunction2$mcDJJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcDJJ$sp extends JFunction2 {
-    abstract double apply$mcDJJ$sp(long v1, long v2);
-
-    default Object apply(Object v1, Object v2) { return (Double) apply$mcDJJ$sp((Long) v1, (Long) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcFDD$sp.java b/src/scala/compat/java8/JFunction2$mcFDD$sp.java
deleted file mode 100644
index b9d39f3cd..000000000
--- a/src/scala/compat/java8/JFunction2$mcFDD$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcFDD$sp extends JFunction2 {
-    abstract float apply$mcFDD$sp(double v1, double v2);
-
-    default Object apply(Object v1, Object v2) { return (Float) apply$mcFDD$sp((Double) v1, (Double) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcFDI$sp.java b/src/scala/compat/java8/JFunction2$mcFDI$sp.java
deleted file mode 100644
index a1a887bfe..000000000
--- a/src/scala/compat/java8/JFunction2$mcFDI$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcFDI$sp extends JFunction2 {
-    abstract float apply$mcFDI$sp(double v1, int v2);
-
-    default Object apply(Object v1, Object v2) { return (Float) apply$mcFDI$sp((Double) v1, (Integer) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcFDJ$sp.java b/src/scala/compat/java8/JFunction2$mcFDJ$sp.java
deleted file mode 100644
index 2a864db0f..000000000
--- a/src/scala/compat/java8/JFunction2$mcFDJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcFDJ$sp extends JFunction2 {
-    abstract float apply$mcFDJ$sp(double v1, long v2);
-
-    default Object apply(Object v1, Object v2) { return (Float) apply$mcFDJ$sp((Double) v1, (Long) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcFID$sp.java b/src/scala/compat/java8/JFunction2$mcFID$sp.java
deleted file mode 100644
index 502836254..000000000
--- a/src/scala/compat/java8/JFunction2$mcFID$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcFID$sp extends JFunction2 {
-    abstract float apply$mcFID$sp(int v1, double v2);
-
-    default Object apply(Object v1, Object v2) { return (Float) apply$mcFID$sp((Integer) v1, (Double) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcFII$sp.java b/src/scala/compat/java8/JFunction2$mcFII$sp.java
deleted file mode 100644
index a9dded128..000000000
--- a/src/scala/compat/java8/JFunction2$mcFII$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcFII$sp extends JFunction2 {
-    abstract float apply$mcFII$sp(int v1, int v2);
-
-    default Object apply(Object v1, Object v2) { return (Float) apply$mcFII$sp((Integer) v1, (Integer) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcFIJ$sp.java b/src/scala/compat/java8/JFunction2$mcFIJ$sp.java
deleted file mode 100644
index c3070f196..000000000
--- a/src/scala/compat/java8/JFunction2$mcFIJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcFIJ$sp extends JFunction2 {
-    abstract float apply$mcFIJ$sp(int v1, long v2);
-
-    default Object apply(Object v1, Object v2) { return (Float) apply$mcFIJ$sp((Integer) v1, (Long) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcFJD$sp.java b/src/scala/compat/java8/JFunction2$mcFJD$sp.java
deleted file mode 100644
index 686b67468..000000000
--- a/src/scala/compat/java8/JFunction2$mcFJD$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcFJD$sp extends JFunction2 {
-    abstract float apply$mcFJD$sp(long v1, double v2);
-
-    default Object apply(Object v1, Object v2) { return (Float) apply$mcFJD$sp((Long) v1, (Double) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcFJI$sp.java b/src/scala/compat/java8/JFunction2$mcFJI$sp.java
deleted file mode 100644
index bc8971fb1..000000000
--- a/src/scala/compat/java8/JFunction2$mcFJI$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcFJI$sp extends JFunction2 {
-    abstract float apply$mcFJI$sp(long v1, int v2);
-
-    default Object apply(Object v1, Object v2) { return (Float) apply$mcFJI$sp((Long) v1, (Integer) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcFJJ$sp.java b/src/scala/compat/java8/JFunction2$mcFJJ$sp.java
deleted file mode 100644
index 25d7057a6..000000000
--- a/src/scala/compat/java8/JFunction2$mcFJJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcFJJ$sp extends JFunction2 {
-    abstract float apply$mcFJJ$sp(long v1, long v2);
-
-    default Object apply(Object v1, Object v2) { return (Float) apply$mcFJJ$sp((Long) v1, (Long) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcIDD$sp.java b/src/scala/compat/java8/JFunction2$mcIDD$sp.java
deleted file mode 100644
index 3fbec6839..000000000
--- a/src/scala/compat/java8/JFunction2$mcIDD$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcIDD$sp extends JFunction2 {
-    abstract int apply$mcIDD$sp(double v1, double v2);
-
-    default Object apply(Object v1, Object v2) { return (Integer) apply$mcIDD$sp((Double) v1, (Double) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcIDI$sp.java b/src/scala/compat/java8/JFunction2$mcIDI$sp.java
deleted file mode 100644
index 02ba78f56..000000000
--- a/src/scala/compat/java8/JFunction2$mcIDI$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcIDI$sp extends JFunction2 {
-    abstract int apply$mcIDI$sp(double v1, int v2);
-
-    default Object apply(Object v1, Object v2) { return (Integer) apply$mcIDI$sp((Double) v1, (Integer) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcIDJ$sp.java b/src/scala/compat/java8/JFunction2$mcIDJ$sp.java
deleted file mode 100644
index 1d954bb0b..000000000
--- a/src/scala/compat/java8/JFunction2$mcIDJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcIDJ$sp extends JFunction2 {
-    abstract int apply$mcIDJ$sp(double v1, long v2);
-
-    default Object apply(Object v1, Object v2) { return (Integer) apply$mcIDJ$sp((Double) v1, (Long) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcIID$sp.java b/src/scala/compat/java8/JFunction2$mcIID$sp.java
deleted file mode 100644
index 473284a6b..000000000
--- a/src/scala/compat/java8/JFunction2$mcIID$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcIID$sp extends JFunction2 {
-    abstract int apply$mcIID$sp(int v1, double v2);
-
-    default Object apply(Object v1, Object v2) { return (Integer) apply$mcIID$sp((Integer) v1, (Double) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcIII$sp.java b/src/scala/compat/java8/JFunction2$mcIII$sp.java
deleted file mode 100644
index 61f5ac97a..000000000
--- a/src/scala/compat/java8/JFunction2$mcIII$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcIII$sp extends JFunction2 {
-    abstract int apply$mcIII$sp(int v1, int v2);
-
-    default Object apply(Object v1, Object v2) { return (Integer) apply$mcIII$sp((Integer) v1, (Integer) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcIIJ$sp.java b/src/scala/compat/java8/JFunction2$mcIIJ$sp.java
deleted file mode 100644
index 2091156ef..000000000
--- a/src/scala/compat/java8/JFunction2$mcIIJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcIIJ$sp extends JFunction2 {
-    abstract int apply$mcIIJ$sp(int v1, long v2);
-
-    default Object apply(Object v1, Object v2) { return (Integer) apply$mcIIJ$sp((Integer) v1, (Long) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcIJD$sp.java b/src/scala/compat/java8/JFunction2$mcIJD$sp.java
deleted file mode 100644
index 93473e694..000000000
--- a/src/scala/compat/java8/JFunction2$mcIJD$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcIJD$sp extends JFunction2 {
-    abstract int apply$mcIJD$sp(long v1, double v2);
-
-    default Object apply(Object v1, Object v2) { return (Integer) apply$mcIJD$sp((Long) v1, (Double) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcIJI$sp.java b/src/scala/compat/java8/JFunction2$mcIJI$sp.java
deleted file mode 100644
index 638dea436..000000000
--- a/src/scala/compat/java8/JFunction2$mcIJI$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcIJI$sp extends JFunction2 {
-    abstract int apply$mcIJI$sp(long v1, int v2);
-
-    default Object apply(Object v1, Object v2) { return (Integer) apply$mcIJI$sp((Long) v1, (Integer) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcIJJ$sp.java b/src/scala/compat/java8/JFunction2$mcIJJ$sp.java
deleted file mode 100644
index d90bbf8ed..000000000
--- a/src/scala/compat/java8/JFunction2$mcIJJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcIJJ$sp extends JFunction2 {
-    abstract int apply$mcIJJ$sp(long v1, long v2);
-
-    default Object apply(Object v1, Object v2) { return (Integer) apply$mcIJJ$sp((Long) v1, (Long) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcJDD$sp.java b/src/scala/compat/java8/JFunction2$mcJDD$sp.java
deleted file mode 100644
index 8116b017a..000000000
--- a/src/scala/compat/java8/JFunction2$mcJDD$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcJDD$sp extends JFunction2 {
-    abstract long apply$mcJDD$sp(double v1, double v2);
-
-    default Object apply(Object v1, Object v2) { return (Long) apply$mcJDD$sp((Double) v1, (Double) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcJDI$sp.java b/src/scala/compat/java8/JFunction2$mcJDI$sp.java
deleted file mode 100644
index bc72f4771..000000000
--- a/src/scala/compat/java8/JFunction2$mcJDI$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcJDI$sp extends JFunction2 {
-    abstract long apply$mcJDI$sp(double v1, int v2);
-
-    default Object apply(Object v1, Object v2) { return (Long) apply$mcJDI$sp((Double) v1, (Integer) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcJDJ$sp.java b/src/scala/compat/java8/JFunction2$mcJDJ$sp.java
deleted file mode 100644
index 360ca0596..000000000
--- a/src/scala/compat/java8/JFunction2$mcJDJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcJDJ$sp extends JFunction2 {
-    abstract long apply$mcJDJ$sp(double v1, long v2);
-
-    default Object apply(Object v1, Object v2) { return (Long) apply$mcJDJ$sp((Double) v1, (Long) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcJID$sp.java b/src/scala/compat/java8/JFunction2$mcJID$sp.java
deleted file mode 100644
index d7257a43f..000000000
--- a/src/scala/compat/java8/JFunction2$mcJID$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcJID$sp extends JFunction2 {
-    abstract long apply$mcJID$sp(int v1, double v2);
-
-    default Object apply(Object v1, Object v2) { return (Long) apply$mcJID$sp((Integer) v1, (Double) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcJII$sp.java b/src/scala/compat/java8/JFunction2$mcJII$sp.java
deleted file mode 100644
index c7bce849f..000000000
--- a/src/scala/compat/java8/JFunction2$mcJII$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcJII$sp extends JFunction2 {
-    abstract long apply$mcJII$sp(int v1, int v2);
-
-    default Object apply(Object v1, Object v2) { return (Long) apply$mcJII$sp((Integer) v1, (Integer) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcJIJ$sp.java b/src/scala/compat/java8/JFunction2$mcJIJ$sp.java
deleted file mode 100644
index 083ea1f85..000000000
--- a/src/scala/compat/java8/JFunction2$mcJIJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcJIJ$sp extends JFunction2 {
-    abstract long apply$mcJIJ$sp(int v1, long v2);
-
-    default Object apply(Object v1, Object v2) { return (Long) apply$mcJIJ$sp((Integer) v1, (Long) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcJJD$sp.java b/src/scala/compat/java8/JFunction2$mcJJD$sp.java
deleted file mode 100644
index 06940bb25..000000000
--- a/src/scala/compat/java8/JFunction2$mcJJD$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcJJD$sp extends JFunction2 {
-    abstract long apply$mcJJD$sp(long v1, double v2);
-
-    default Object apply(Object v1, Object v2) { return (Long) apply$mcJJD$sp((Long) v1, (Double) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcJJI$sp.java b/src/scala/compat/java8/JFunction2$mcJJI$sp.java
deleted file mode 100644
index 8ecc1f4ef..000000000
--- a/src/scala/compat/java8/JFunction2$mcJJI$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcJJI$sp extends JFunction2 {
-    abstract long apply$mcJJI$sp(long v1, int v2);
-
-    default Object apply(Object v1, Object v2) { return (Long) apply$mcJJI$sp((Long) v1, (Integer) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcJJJ$sp.java b/src/scala/compat/java8/JFunction2$mcJJJ$sp.java
deleted file mode 100644
index 2046292c7..000000000
--- a/src/scala/compat/java8/JFunction2$mcJJJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcJJJ$sp extends JFunction2 {
-    abstract long apply$mcJJJ$sp(long v1, long v2);
-
-    default Object apply(Object v1, Object v2) { return (Long) apply$mcJJJ$sp((Long) v1, (Long) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcVDD$sp.java b/src/scala/compat/java8/JFunction2$mcVDD$sp.java
deleted file mode 100644
index 22bc2c1ce..000000000
--- a/src/scala/compat/java8/JFunction2$mcVDD$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcVDD$sp extends JFunction2 {
-    abstract void apply$mcVDD$sp(double v1, double v2);
-
-    default Object apply(Object v1, Object v2) { apply$mcVDD$sp((Double) v1, (Double) v2); return scala.runtime.BoxedUnit.UNIT; }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcVDI$sp.java b/src/scala/compat/java8/JFunction2$mcVDI$sp.java
deleted file mode 100644
index 75b17c326..000000000
--- a/src/scala/compat/java8/JFunction2$mcVDI$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcVDI$sp extends JFunction2 {
-    abstract void apply$mcVDI$sp(double v1, int v2);
-
-    default Object apply(Object v1, Object v2) { apply$mcVDI$sp((Double) v1, (Integer) v2); return scala.runtime.BoxedUnit.UNIT; }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcVDJ$sp.java b/src/scala/compat/java8/JFunction2$mcVDJ$sp.java
deleted file mode 100644
index e649163f6..000000000
--- a/src/scala/compat/java8/JFunction2$mcVDJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcVDJ$sp extends JFunction2 {
-    abstract void apply$mcVDJ$sp(double v1, long v2);
-
-    default Object apply(Object v1, Object v2) { apply$mcVDJ$sp((Double) v1, (Long) v2); return scala.runtime.BoxedUnit.UNIT; }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcVID$sp.java b/src/scala/compat/java8/JFunction2$mcVID$sp.java
deleted file mode 100644
index 334f4aeed..000000000
--- a/src/scala/compat/java8/JFunction2$mcVID$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcVID$sp extends JFunction2 {
-    abstract void apply$mcVID$sp(int v1, double v2);
-
-    default Object apply(Object v1, Object v2) { apply$mcVID$sp((Integer) v1, (Double) v2); return scala.runtime.BoxedUnit.UNIT; }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcVII$sp.java b/src/scala/compat/java8/JFunction2$mcVII$sp.java
deleted file mode 100644
index 1d2d8ca94..000000000
--- a/src/scala/compat/java8/JFunction2$mcVII$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcVII$sp extends JFunction2 {
-    abstract void apply$mcVII$sp(int v1, int v2);
-
-    default Object apply(Object v1, Object v2) { apply$mcVII$sp((Integer) v1, (Integer) v2); return scala.runtime.BoxedUnit.UNIT; }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcVIJ$sp.java b/src/scala/compat/java8/JFunction2$mcVIJ$sp.java
deleted file mode 100644
index 0345e6df7..000000000
--- a/src/scala/compat/java8/JFunction2$mcVIJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcVIJ$sp extends JFunction2 {
-    abstract void apply$mcVIJ$sp(int v1, long v2);
-
-    default Object apply(Object v1, Object v2) { apply$mcVIJ$sp((Integer) v1, (Long) v2); return scala.runtime.BoxedUnit.UNIT; }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcVJD$sp.java b/src/scala/compat/java8/JFunction2$mcVJD$sp.java
deleted file mode 100644
index f277a8b24..000000000
--- a/src/scala/compat/java8/JFunction2$mcVJD$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcVJD$sp extends JFunction2 {
-    abstract void apply$mcVJD$sp(long v1, double v2);
-
-    default Object apply(Object v1, Object v2) { apply$mcVJD$sp((Long) v1, (Double) v2); return scala.runtime.BoxedUnit.UNIT; }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcVJI$sp.java b/src/scala/compat/java8/JFunction2$mcVJI$sp.java
deleted file mode 100644
index 8209b82c0..000000000
--- a/src/scala/compat/java8/JFunction2$mcVJI$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcVJI$sp extends JFunction2 {
-    abstract void apply$mcVJI$sp(long v1, int v2);
-
-    default Object apply(Object v1, Object v2) { apply$mcVJI$sp((Long) v1, (Integer) v2); return scala.runtime.BoxedUnit.UNIT; }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcVJJ$sp.java b/src/scala/compat/java8/JFunction2$mcVJJ$sp.java
deleted file mode 100644
index 9b7e7d68e..000000000
--- a/src/scala/compat/java8/JFunction2$mcVJJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcVJJ$sp extends JFunction2 {
-    abstract void apply$mcVJJ$sp(long v1, long v2);
-
-    default Object apply(Object v1, Object v2) { apply$mcVJJ$sp((Long) v1, (Long) v2); return scala.runtime.BoxedUnit.UNIT; }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcZDD$sp.java b/src/scala/compat/java8/JFunction2$mcZDD$sp.java
deleted file mode 100644
index a921b50ec..000000000
--- a/src/scala/compat/java8/JFunction2$mcZDD$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcZDD$sp extends JFunction2 {
-    abstract boolean apply$mcZDD$sp(double v1, double v2);
-
-    default Object apply(Object v1, Object v2) { return (Boolean) apply$mcZDD$sp((Double) v1, (Double) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcZDI$sp.java b/src/scala/compat/java8/JFunction2$mcZDI$sp.java
deleted file mode 100644
index 1c902b5e6..000000000
--- a/src/scala/compat/java8/JFunction2$mcZDI$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcZDI$sp extends JFunction2 {
-    abstract boolean apply$mcZDI$sp(double v1, int v2);
-
-    default Object apply(Object v1, Object v2) { return (Boolean) apply$mcZDI$sp((Double) v1, (Integer) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcZDJ$sp.java b/src/scala/compat/java8/JFunction2$mcZDJ$sp.java
deleted file mode 100644
index a210da17a..000000000
--- a/src/scala/compat/java8/JFunction2$mcZDJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcZDJ$sp extends JFunction2 {
-    abstract boolean apply$mcZDJ$sp(double v1, long v2);
-
-    default Object apply(Object v1, Object v2) { return (Boolean) apply$mcZDJ$sp((Double) v1, (Long) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcZID$sp.java b/src/scala/compat/java8/JFunction2$mcZID$sp.java
deleted file mode 100644
index ec2309c35..000000000
--- a/src/scala/compat/java8/JFunction2$mcZID$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcZID$sp extends JFunction2 {
-    abstract boolean apply$mcZID$sp(int v1, double v2);
-
-    default Object apply(Object v1, Object v2) { return (Boolean) apply$mcZID$sp((Integer) v1, (Double) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcZII$sp.java b/src/scala/compat/java8/JFunction2$mcZII$sp.java
deleted file mode 100644
index 91fe9c689..000000000
--- a/src/scala/compat/java8/JFunction2$mcZII$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcZII$sp extends JFunction2 {
-    abstract boolean apply$mcZII$sp(int v1, int v2);
-
-    default Object apply(Object v1, Object v2) { return (Boolean) apply$mcZII$sp((Integer) v1, (Integer) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcZIJ$sp.java b/src/scala/compat/java8/JFunction2$mcZIJ$sp.java
deleted file mode 100644
index 024522a20..000000000
--- a/src/scala/compat/java8/JFunction2$mcZIJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcZIJ$sp extends JFunction2 {
-    abstract boolean apply$mcZIJ$sp(int v1, long v2);
-
-    default Object apply(Object v1, Object v2) { return (Boolean) apply$mcZIJ$sp((Integer) v1, (Long) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcZJD$sp.java b/src/scala/compat/java8/JFunction2$mcZJD$sp.java
deleted file mode 100644
index e510eccda..000000000
--- a/src/scala/compat/java8/JFunction2$mcZJD$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcZJD$sp extends JFunction2 {
-    abstract boolean apply$mcZJD$sp(long v1, double v2);
-
-    default Object apply(Object v1, Object v2) { return (Boolean) apply$mcZJD$sp((Long) v1, (Double) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcZJI$sp.java b/src/scala/compat/java8/JFunction2$mcZJI$sp.java
deleted file mode 100644
index 0a251ba12..000000000
--- a/src/scala/compat/java8/JFunction2$mcZJI$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcZJI$sp extends JFunction2 {
-    abstract boolean apply$mcZJI$sp(long v1, int v2);
-
-    default Object apply(Object v1, Object v2) { return (Boolean) apply$mcZJI$sp((Long) v1, (Integer) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2$mcZJJ$sp.java b/src/scala/compat/java8/JFunction2$mcZJJ$sp.java
deleted file mode 100644
index 12e3a896a..000000000
--- a/src/scala/compat/java8/JFunction2$mcZJJ$sp.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2$mcZJJ$sp extends JFunction2 {
-    abstract boolean apply$mcZJJ$sp(long v1, long v2);
-
-    default Object apply(Object v1, Object v2) { return (Boolean) apply$mcZJJ$sp((Long) v1, (Long) v2); }
-}
diff --git a/src/scala/compat/java8/JFunction2.java b/src/scala/compat/java8/JFunction2.java
deleted file mode 100644
index bad1493bb..000000000
--- a/src/scala/compat/java8/JFunction2.java
+++ /dev/null
@@ -1,673 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction2<T1, T2, R> extends scala.Function2<T1, T2, R> {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, R>> curried() {
-      return scala.Function2$class.curried(this);
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple2<T1, T2>, R> tupled() {
-      return scala.Function2$class.tupled(this);
-    }
-
-    @SuppressWarnings("unchecked")
-    default void apply$mcVII$sp(int v1, int v2) {
-        apply((T1) ((Integer) v1), (T2) ((Integer) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default boolean apply$mcZII$sp(int v1, int v2) {
-        return (Boolean) apply((T1) ((Integer) v1), (T2) ((Integer) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default int apply$mcIII$sp(int v1, int v2) {
-        return (Integer) apply((T1) ((Integer) v1), (T2) ((Integer) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default float apply$mcFII$sp(int v1, int v2) {
-        return (Float) apply((T1) ((Integer) v1), (T2) ((Integer) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default long apply$mcJII$sp(int v1, int v2) {
-        return (Long) apply((T1) ((Integer) v1), (T2) ((Integer) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default double apply$mcDII$sp(int v1, int v2) {
-        return (Double) apply((T1) ((Integer) v1), (T2) ((Integer) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default void apply$mcVIJ$sp(int v1, long v2) {
-        apply((T1) ((Integer) v1), (T2) ((Long) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default boolean apply$mcZIJ$sp(int v1, long v2) {
-        return (Boolean) apply((T1) ((Integer) v1), (T2) ((Long) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default int apply$mcIIJ$sp(int v1, long v2) {
-        return (Integer) apply((T1) ((Integer) v1), (T2) ((Long) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default float apply$mcFIJ$sp(int v1, long v2) {
-        return (Float) apply((T1) ((Integer) v1), (T2) ((Long) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default long apply$mcJIJ$sp(int v1, long v2) {
-        return (Long) apply((T1) ((Integer) v1), (T2) ((Long) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default double apply$mcDIJ$sp(int v1, long v2) {
-        return (Double) apply((T1) ((Integer) v1), (T2) ((Long) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default void apply$mcVID$sp(int v1, double v2) {
-        apply((T1) ((Integer) v1), (T2) ((Double) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default boolean apply$mcZID$sp(int v1, double v2) {
-        return (Boolean) apply((T1) ((Integer) v1), (T2) ((Double) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default int apply$mcIID$sp(int v1, double v2) {
-        return (Integer) apply((T1) ((Integer) v1), (T2) ((Double) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default float apply$mcFID$sp(int v1, double v2) {
-        return (Float) apply((T1) ((Integer) v1), (T2) ((Double) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default long apply$mcJID$sp(int v1, double v2) {
-        return (Long) apply((T1) ((Integer) v1), (T2) ((Double) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default double apply$mcDID$sp(int v1, double v2) {
-        return (Double) apply((T1) ((Integer) v1), (T2) ((Double) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default void apply$mcVJI$sp(long v1, int v2) {
-        apply((T1) ((Long) v1), (T2) ((Integer) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default boolean apply$mcZJI$sp(long v1, int v2) {
-        return (Boolean) apply((T1) ((Long) v1), (T2) ((Integer) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default int apply$mcIJI$sp(long v1, int v2) {
-        return (Integer) apply((T1) ((Long) v1), (T2) ((Integer) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default float apply$mcFJI$sp(long v1, int v2) {
-        return (Float) apply((T1) ((Long) v1), (T2) ((Integer) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default long apply$mcJJI$sp(long v1, int v2) {
-        return (Long) apply((T1) ((Long) v1), (T2) ((Integer) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default double apply$mcDJI$sp(long v1, int v2) {
-        return (Double) apply((T1) ((Long) v1), (T2) ((Integer) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default void apply$mcVJJ$sp(long v1, long v2) {
-        apply((T1) ((Long) v1), (T2) ((Long) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default boolean apply$mcZJJ$sp(long v1, long v2) {
-        return (Boolean) apply((T1) ((Long) v1), (T2) ((Long) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default int apply$mcIJJ$sp(long v1, long v2) {
-        return (Integer) apply((T1) ((Long) v1), (T2) ((Long) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default float apply$mcFJJ$sp(long v1, long v2) {
-        return (Float) apply((T1) ((Long) v1), (T2) ((Long) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default long apply$mcJJJ$sp(long v1, long v2) {
-        return (Long) apply((T1) ((Long) v1), (T2) ((Long) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default double apply$mcDJJ$sp(long v1, long v2) {
-        return (Double) apply((T1) ((Long) v1), (T2) ((Long) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default void apply$mcVJD$sp(long v1, double v2) {
-        apply((T1) ((Long) v1), (T2) ((Double) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default boolean apply$mcZJD$sp(long v1, double v2) {
-        return (Boolean) apply((T1) ((Long) v1), (T2) ((Double) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default int apply$mcIJD$sp(long v1, double v2) {
-        return (Integer) apply((T1) ((Long) v1), (T2) ((Double) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default float apply$mcFJD$sp(long v1, double v2) {
-        return (Float) apply((T1) ((Long) v1), (T2) ((Double) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default long apply$mcJJD$sp(long v1, double v2) {
-        return (Long) apply((T1) ((Long) v1), (T2) ((Double) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default double apply$mcDJD$sp(long v1, double v2) {
-        return (Double) apply((T1) ((Long) v1), (T2) ((Double) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default void apply$mcVDI$sp(double v1, int v2) {
-        apply((T1) ((Double) v1), (T2) ((Integer) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default boolean apply$mcZDI$sp(double v1, int v2) {
-        return (Boolean) apply((T1) ((Double) v1), (T2) ((Integer) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default int apply$mcIDI$sp(double v1, int v2) {
-        return (Integer) apply((T1) ((Double) v1), (T2) ((Integer) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default float apply$mcFDI$sp(double v1, int v2) {
-        return (Float) apply((T1) ((Double) v1), (T2) ((Integer) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default long apply$mcJDI$sp(double v1, int v2) {
-        return (Long) apply((T1) ((Double) v1), (T2) ((Integer) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default double apply$mcDDI$sp(double v1, int v2) {
-        return (Double) apply((T1) ((Double) v1), (T2) ((Integer) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default void apply$mcVDJ$sp(double v1, long v2) {
-        apply((T1) ((Double) v1), (T2) ((Long) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default boolean apply$mcZDJ$sp(double v1, long v2) {
-        return (Boolean) apply((T1) ((Double) v1), (T2) ((Long) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default int apply$mcIDJ$sp(double v1, long v2) {
-        return (Integer) apply((T1) ((Double) v1), (T2) ((Long) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default float apply$mcFDJ$sp(double v1, long v2) {
-        return (Float) apply((T1) ((Double) v1), (T2) ((Long) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default long apply$mcJDJ$sp(double v1, long v2) {
-        return (Long) apply((T1) ((Double) v1), (T2) ((Long) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default double apply$mcDDJ$sp(double v1, long v2) {
-        return (Double) apply((T1) ((Double) v1), (T2) ((Long) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default void apply$mcVDD$sp(double v1, double v2) {
-        apply((T1) ((Double) v1), (T2) ((Double) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default boolean apply$mcZDD$sp(double v1, double v2) {
-        return (Boolean) apply((T1) ((Double) v1), (T2) ((Double) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default int apply$mcIDD$sp(double v1, double v2) {
-        return (Integer) apply((T1) ((Double) v1), (T2) ((Double) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default float apply$mcFDD$sp(double v1, double v2) {
-        return (Float) apply((T1) ((Double) v1), (T2) ((Double) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default long apply$mcJDD$sp(double v1, double v2) {
-        return (Long) apply((T1) ((Double) v1), (T2) ((Double) v2));
-    }
-    @SuppressWarnings("unchecked")
-    default double apply$mcDDD$sp(double v1, double v2) {
-        return (Double) apply((T1) ((Double) v1), (T2) ((Double) v2));
-    }
-    
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcVII$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcZII$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcIII$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcFII$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcJII$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcDII$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcVIJ$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcZIJ$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcIIJ$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcFIJ$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcJIJ$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcDIJ$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcVID$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcZID$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcIID$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcFID$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcJID$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcDID$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcVJI$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcZJI$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcIJI$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcFJI$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcJJI$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcDJI$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcVJJ$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcZJJ$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcIJJ$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcFJJ$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcJJJ$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcDJJ$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcVJD$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcZJD$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcIJD$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcFJD$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcJJD$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcDJD$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcVDI$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcZDI$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcIDI$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcFDI$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcJDI$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcDDI$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcVDJ$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcZDJ$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcIDJ$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcFDJ$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcJDJ$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcDDJ$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcVDD$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcZDD$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcIDD$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcFDD$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcJDD$sp() {
-        return curried();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 curried$mcDDD$sp() {
-        return curried();
-    }
-    
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcVII$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcZII$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcIII$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcFII$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcJII$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcDII$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcVIJ$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcZIJ$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcIIJ$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcFIJ$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcJIJ$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcDIJ$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcVID$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcZID$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcIID$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcFID$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcJID$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcDID$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcVJI$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcZJI$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcIJI$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcFJI$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcJJI$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcDJI$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcVJJ$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcZJJ$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcIJJ$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcFJJ$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcJJJ$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcDJJ$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcVJD$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcZJD$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcIJD$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcFJD$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcJJD$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcDJD$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcVDI$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcZDI$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcIDI$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcFDI$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcJDI$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcDDI$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcVDJ$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcZDJ$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcIDJ$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcFDJ$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcJDJ$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcDDJ$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcVDD$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcZDD$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcIDD$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcFDD$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcJDD$sp() {
-        return tupled();
-    }
-    @SuppressWarnings("unchecked")
-    default scala.Function1 tupled$mcDDD$sp() {
-        return tupled();
-    }
-}
diff --git a/src/scala/compat/java8/JFunction20.java b/src/scala/compat/java8/JFunction20.java
deleted file mode 100644
index ed30b41ef..000000000
--- a/src/scala/compat/java8/JFunction20.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@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> {
-    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() {
-      return scala.Function20$class.curried(this);
-    }
-
-    @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() {
-      return scala.Function20$class.tupled(this);
-    }
-
-
-}
diff --git a/src/scala/compat/java8/JFunction21.java b/src/scala/compat/java8/JFunction21.java
deleted file mode 100644
index aa6da8084..000000000
--- a/src/scala/compat/java8/JFunction21.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@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> {
-    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() {
-      return scala.Function21$class.curried(this);
-    }
-
-    @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() {
-      return scala.Function21$class.tupled(this);
-    }
-
-
-}
diff --git a/src/scala/compat/java8/JFunction22.java b/src/scala/compat/java8/JFunction22.java
deleted file mode 100644
index 532145157..000000000
--- a/src/scala/compat/java8/JFunction22.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@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> {
-    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() {
-      return scala.Function22$class.curried(this);
-    }
-
-    @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() {
-      return scala.Function22$class.tupled(this);
-    }
-
-
-}
diff --git a/src/scala/compat/java8/JFunction3.java b/src/scala/compat/java8/JFunction3.java
deleted file mode 100644
index 731608b2e..000000000
--- a/src/scala/compat/java8/JFunction3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction3<T1, T2, T3, R> extends scala.Function3<T1, T2, T3, R> {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, R>>> curried() {
-      return scala.Function3$class.curried(this);
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple3<T1, T2, T3>, R> tupled() {
-      return scala.Function3$class.tupled(this);
-    }
-
-
-}
diff --git a/src/scala/compat/java8/JFunction4.java b/src/scala/compat/java8/JFunction4.java
deleted file mode 100644
index 9bff4c835..000000000
--- a/src/scala/compat/java8/JFunction4.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction4<T1, T2, T3, T4, R> extends scala.Function4<T1, T2, T3, T4, R> {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, R>>>> curried() {
-      return scala.Function4$class.curried(this);
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple4<T1, T2, T3, T4>, R> tupled() {
-      return scala.Function4$class.tupled(this);
-    }
-
-
-}
diff --git a/src/scala/compat/java8/JFunction5.java b/src/scala/compat/java8/JFunction5.java
deleted file mode 100644
index a5566a5ba..000000000
--- a/src/scala/compat/java8/JFunction5.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction5<T1, T2, T3, T4, T5, R> extends scala.Function5<T1, T2, T3, T4, T5, R> {
-    default void $init$() {
-    };
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, R>>>>> curried() {
-      return scala.Function5$class.curried(this);
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple5<T1, T2, T3, T4, T5>, R> tupled() {
-      return scala.Function5$class.tupled(this);
-    }
-
-
-}
diff --git a/src/scala/compat/java8/JFunction6.java b/src/scala/compat/java8/JFunction6.java
deleted file mode 100644
index b30fb5f47..000000000
--- a/src/scala/compat/java8/JFunction6.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction6<T1, T2, T3, T4, T5, T6, R> extends scala.Function6<T1, T2, T3, T4, T5, T6, R> {
-    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() {
-      return scala.Function6$class.curried(this);
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple6<T1, T2, T3, T4, T5, T6>, R> tupled() {
-      return scala.Function6$class.tupled(this);
-    }
-
-
-}
diff --git a/src/scala/compat/java8/JFunction7.java b/src/scala/compat/java8/JFunction7.java
deleted file mode 100644
index 4a4a92cba..000000000
--- a/src/scala/compat/java8/JFunction7.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@FunctionalInterface
-public interface JFunction7<T1, T2, T3, T4, T5, T6, T7, R> extends scala.Function7<T1, T2, T3, T4, T5, T6, T7, R> {
-    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() {
-      return scala.Function7$class.curried(this);
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple7<T1, T2, T3, T4, T5, T6, T7>, R> tupled() {
-      return scala.Function7$class.tupled(this);
-    }
-
-
-}
diff --git a/src/scala/compat/java8/JFunction8.java b/src/scala/compat/java8/JFunction8.java
deleted file mode 100644
index 825236e48..000000000
--- a/src/scala/compat/java8/JFunction8.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@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> {
-    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() {
-      return scala.Function8$class.curried(this);
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple8<T1, T2, T3, T4, T5, T6, T7, T8>, R> tupled() {
-      return scala.Function8$class.tupled(this);
-    }
-
-
-}
diff --git a/src/scala/compat/java8/JFunction9.java b/src/scala/compat/java8/JFunction9.java
deleted file mode 100644
index d0e40c316..000000000
--- a/src/scala/compat/java8/JFunction9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-@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> {
-    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() {
-      return scala.Function9$class.curried(this);
-    }
-
-    @SuppressWarnings("unchecked")
-    default scala.Function1<scala.Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9>, R> tupled() {
-      return scala.Function9$class.tupled(this);
-    }
-
-
-}
diff --git a/src/scala/compat/java8/JProcedure0.java b/src/scala/compat/java8/JProcedure0.java
deleted file mode 100644
index 8361252c6..000000000
--- a/src/scala/compat/java8/JProcedure0.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure0 extends JFunction0<BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid();
-
-    default BoxedUnit apply() {
-        applyVoid();
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure1.java b/src/scala/compat/java8/JProcedure1.java
deleted file mode 100644
index 189e451cd..000000000
--- a/src/scala/compat/java8/JProcedure1.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure1<T1> extends JFunction1<T1, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1);
-
-    default BoxedUnit apply(T1 t1) {
-        applyVoid(t1);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure10.java b/src/scala/compat/java8/JProcedure10.java
deleted file mode 100644
index 63a7543c5..000000000
--- a/src/scala/compat/java8/JProcedure10.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-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> {
-    default void $init$() {
-    }
-
-    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) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure11.java b/src/scala/compat/java8/JProcedure11.java
deleted file mode 100644
index 1f530fba9..000000000
--- a/src/scala/compat/java8/JProcedure11.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-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> {
-    default void $init$() {
-    }
-
-    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) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure12.java b/src/scala/compat/java8/JProcedure12.java
deleted file mode 100644
index 454868e66..000000000
--- a/src/scala/compat/java8/JProcedure12.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-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> {
-    default void $init$() {
-    }
-
-    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) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure13.java b/src/scala/compat/java8/JProcedure13.java
deleted file mode 100644
index 4db2cd866..000000000
--- a/src/scala/compat/java8/JProcedure13.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-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> {
-    default void $init$() {
-    }
-
-    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) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure14.java b/src/scala/compat/java8/JProcedure14.java
deleted file mode 100644
index 9d1c4b89f..000000000
--- a/src/scala/compat/java8/JProcedure14.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-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> {
-    default void $init$() {
-    }
-
-    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) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure15.java b/src/scala/compat/java8/JProcedure15.java
deleted file mode 100644
index c49f042e7..000000000
--- a/src/scala/compat/java8/JProcedure15.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-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> {
-    default void $init$() {
-    }
-
-    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) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure16.java b/src/scala/compat/java8/JProcedure16.java
deleted file mode 100644
index aad602dfa..000000000
--- a/src/scala/compat/java8/JProcedure16.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-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> {
-    default void $init$() {
-    }
-
-    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) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure17.java b/src/scala/compat/java8/JProcedure17.java
deleted file mode 100644
index cdc30b9ee..000000000
--- a/src/scala/compat/java8/JProcedure17.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-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> {
-    default void $init$() {
-    }
-
-    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) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure18.java b/src/scala/compat/java8/JProcedure18.java
deleted file mode 100644
index 2e03d8f80..000000000
--- a/src/scala/compat/java8/JProcedure18.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-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> {
-    default void $init$() {
-    }
-
-    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) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure19.java b/src/scala/compat/java8/JProcedure19.java
deleted file mode 100644
index 5e4fcb9aa..000000000
--- a/src/scala/compat/java8/JProcedure19.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-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> {
-    default void $init$() {
-    }
-
-    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) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure2.java b/src/scala/compat/java8/JProcedure2.java
deleted file mode 100644
index 36e84d8dd..000000000
--- a/src/scala/compat/java8/JProcedure2.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure2<T1, T2> extends JFunction2<T1, T2, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2);
-
-    default BoxedUnit apply(T1 t1, T2 t2) {
-        applyVoid(t1, t2);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure20.java b/src/scala/compat/java8/JProcedure20.java
deleted file mode 100644
index d6598c312..000000000
--- a/src/scala/compat/java8/JProcedure20.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-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> {
-    default void $init$() {
-    }
-
-    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) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure21.java b/src/scala/compat/java8/JProcedure21.java
deleted file mode 100644
index c85cb540c..000000000
--- a/src/scala/compat/java8/JProcedure21.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-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> {
-    default void $init$() {
-    }
-
-    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) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20, t21);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure22.java b/src/scala/compat/java8/JProcedure22.java
deleted file mode 100644
index a1653ae61..000000000
--- a/src/scala/compat/java8/JProcedure22.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-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> {
-    default void $init$() {
-    }
-
-    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) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20, t21, t22);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure3.java b/src/scala/compat/java8/JProcedure3.java
deleted file mode 100644
index f2b1e498a..000000000
--- a/src/scala/compat/java8/JProcedure3.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure3<T1, T2, T3> extends JFunction3<T1, T2, T3, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3) {
-        applyVoid(t1, t2, t3);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure4.java b/src/scala/compat/java8/JProcedure4.java
deleted file mode 100644
index 7a3457b57..000000000
--- a/src/scala/compat/java8/JProcedure4.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure4<T1, T2, T3, T4> extends JFunction4<T1, T2, T3, T4, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4) {
-        applyVoid(t1, t2, t3, t4);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure5.java b/src/scala/compat/java8/JProcedure5.java
deleted file mode 100644
index e9d25854a..000000000
--- a/src/scala/compat/java8/JProcedure5.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure5<T1, T2, T3, T4, T5> extends JFunction5<T1, T2, T3, T4, T5, BoxedUnit> {
-    default void $init$() {
-    }
-
-    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) {
-        applyVoid(t1, t2, t3, t4, t5);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure6.java b/src/scala/compat/java8/JProcedure6.java
deleted file mode 100644
index d1675bd24..000000000
--- a/src/scala/compat/java8/JProcedure6.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure6<T1, T2, T3, T4, T5, T6> extends JFunction6<T1, T2, T3, T4, T5, T6, BoxedUnit> {
-    default void $init$() {
-    }
-
-    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) {
-        applyVoid(t1, t2, t3, t4, t5, t6);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure7.java b/src/scala/compat/java8/JProcedure7.java
deleted file mode 100644
index 1348e051b..000000000
--- a/src/scala/compat/java8/JProcedure7.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-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> {
-    default void $init$() {
-    }
-
-    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) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure8.java b/src/scala/compat/java8/JProcedure8.java
deleted file mode 100644
index df944ca6e..000000000
--- a/src/scala/compat/java8/JProcedure8.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-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> {
-    default void $init$() {
-    }
-
-    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) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/compat/java8/JProcedure9.java b/src/scala/compat/java8/JProcedure9.java
deleted file mode 100644
index 47ad5d234..000000000
--- a/src/scala/compat/java8/JProcedure9.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.compat.java8;
-
-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> {
-    default void $init$() {
-    }
-
-    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) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/scala/runtime/ScalaRunTime.scala b/src/scala/runtime/ScalaRunTime.scala
deleted file mode 100644
index ed1eb82b1..000000000
--- a/src/scala/runtime/ScalaRunTime.scala
+++ /dev/null
@@ -1,377 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002-2013, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-package scala
-package runtime
-
-import dotty.runtime.vc.VCArrayPrototype
-
-import scala.collection.{ Seq, IndexedSeq, TraversableView, AbstractIterator }
-import scala.collection.mutable.WrappedArray
-import scala.collection.immutable.{ StringLike, NumericRange, List, Stream, Nil, :: }
-import scala.collection.generic.{ Sorted, IsTraversableLike }
-import scala.reflect.{ ClassTag, classTag }
-import scala.util.control.ControlThrowable
-import java.lang.{ Class => jClass }
-
-import java.lang.Double.doubleToLongBits
-import java.lang.reflect.{ Modifier, Method => JMethod }
-
-/** The object ScalaRunTime provides support methods required by
-  *  the scala runtime.  All these methods should be considered
-  *  outside the API and subject to change or removal without notice.
-  */
-object ScalaRunTime {
-  def isArray(x: Any, atLevel: Int = 1): Boolean =
-    x != null && isArrayClass(x.getClass, atLevel)
-
-  private def isArrayClass(clazz: jClass[_], atLevel: Int): Boolean =
-    (clazz.isArray || classOf[VCArrayPrototype[_]].isAssignableFrom(clazz)) &&
-      (atLevel == 1 || isArrayClass(clazz.getComponentType, atLevel - 1))
-
-  def isValueClass(clazz: jClass[_]) = clazz.isPrimitive()
-
-  // includes specialized subclasses and future proofed against hypothetical TupleN (for N > 22)
-  def isTuple(x: Any) = x != null && x.getClass.getName.startsWith("scala.Tuple")
-  def isAnyVal(x: Any) = x match {
-    case _: Byte | _: Short | _: Char | _: Int | _: Long | _: Float | _: Double | _: Boolean | _: Unit => true
-    case _                                                                                             => false
-  }
-
-  // A helper method to make my life in the pattern matcher a lot easier.
-  def drop[Repr](coll: Repr, num: Int)(implicit traversable: IsTraversableLike[Repr]): Repr =
-    traversable conversion coll drop num
-
-  /** Return the class object representing an array with element class `clazz`.
-    */
-  def arrayClass(clazz: jClass[_]): jClass[_] = {
-    // Dmitry: I want to see where this method is used to know how to fix it
-    // [Martin] Here's a stacktrace
-    // Exception in thread "main" scala.NotImplementedError: an implementation is missing
-    //  at scala.Predef$.$qmark$qmark$qmark(Predef.scala:225)
-    //  at scala.runtime.ScalaRunTime$.arrayClass(ScalaRunTime.scala:53)
-    //  at scala.Array$.fill(Array.scala:281)
-    //  at dotty.tools.dotc.core.Flags$.<init>(Flags.scala:139)
-    // newInstance throws an exception if the erasure is Void.TYPE. see SI-5680
-    if (clazz == java.lang.Void.TYPE) classOf[Array[Unit]]
-    else java.lang.reflect.Array.newInstance(clazz, 0).getClass
-  }
-
-  /** Return the class object representing elements in arrays described by a given schematic.
-    */
-  def arrayElementClass(schematic: Any): jClass[_] = schematic match {
-    case cls: jClass[_]   => cls.getComponentType
-    case tag: ClassTag[_] => tag.runtimeClass
-    case _                =>
-      throw new UnsupportedOperationException(s"unsupported schematic $schematic (${schematic.getClass})")
-  }
-
-  /** Return the class object representing an unboxed value type,
-    *  e.g., classOf[int], not classOf[java.lang.Integer].  The compiler
-    *  rewrites expressions like 5.getClass to come here.
-    */
-  def anyValClass[T <: AnyVal : ClassTag](value: T): jClass[T] =
-    classTag[T].runtimeClass.asInstanceOf[jClass[T]]
-
-  /** Retrieve generic array element */
-  def array_apply(xs: AnyRef, idx: Int): Any = {
-    xs match {
-      case x: Array[AnyRef]  => x(idx).asInstanceOf[Any]
-      case x: Array[Int]     => x(idx).asInstanceOf[Any]
-      case x: Array[Double]  => x(idx).asInstanceOf[Any]
-      case x: Array[Long]    => x(idx).asInstanceOf[Any]
-      case x: Array[Float]   => x(idx).asInstanceOf[Any]
-      case x: Array[Char]    => x(idx).asInstanceOf[Any]
-      case x: Array[Byte]    => x(idx).asInstanceOf[Any]
-      case x: Array[Short]   => x(idx).asInstanceOf[Any]
-      case x: Array[Boolean] => x(idx).asInstanceOf[Any]
-      case x: Array[Unit]    => x(idx).asInstanceOf[Any]
-      case x: VCArrayPrototype[_] => x.apply(idx)
-      case null => throw new NullPointerException
-    }
-  }
-
-  /** update generic array element */
-  def array_update(xs: AnyRef, idx: Int, value: Any): Unit = {
-    xs match {
-      case x: Array[AnyRef]  => x(idx) = value.asInstanceOf[AnyRef]
-      case x: Array[Int]     => x(idx) = value.asInstanceOf[Int]
-      case x: Array[Double]  => x(idx) = value.asInstanceOf[Double]
-      case x: Array[Long]    => x(idx) = value.asInstanceOf[Long]
-      case x: Array[Float]   => x(idx) = value.asInstanceOf[Float]
-      case x: Array[Char]    => x(idx) = value.asInstanceOf[Char]
-      case x: Array[Byte]    => x(idx) = value.asInstanceOf[Byte]
-      case x: Array[Short]   => x(idx) = value.asInstanceOf[Short]
-      case x: Array[Boolean] => x(idx) = value.asInstanceOf[Boolean]
-      case x: Array[Unit]    => x(idx) = value.asInstanceOf[Unit]
-      case x: VCArrayPrototype[t] => x.update(idx, value.asInstanceOf[t])
-      case null => throw new NullPointerException
-    }
-  }
-
-  /** Get generic array length */
-  def array_length(xs: AnyRef): Int = xs match {
-    case x: Array[AnyRef]  => x.length
-    case x: Array[Int]     => x.length
-    case x: Array[Double]  => x.length
-    case x: Array[Long]    => x.length
-    case x: Array[Float]   => x.length
-    case x: Array[Char]    => x.length
-    case x: Array[Byte]    => x.length
-    case x: Array[Short]   => x.length
-    case x: Array[Boolean] => x.length
-    case x: Array[Unit]    => x.length
-    case x: VCArrayPrototype[_] => x.length
-    case null => throw new NullPointerException
-  }
-
-  def array_clone(xs: AnyRef): AnyRef = xs match {
-    case x: Array[AnyRef]  => ArrayRuntime.cloneArray(x)
-    case x: Array[Int]     => ArrayRuntime.cloneArray(x)
-    case x: Array[Double]  => ArrayRuntime.cloneArray(x)
-    case x: Array[Long]    => ArrayRuntime.cloneArray(x)
-    case x: Array[Float]   => ArrayRuntime.cloneArray(x)
-    case x: Array[Char]    => ArrayRuntime.cloneArray(x)
-    case x: Array[Byte]    => ArrayRuntime.cloneArray(x)
-    case x: Array[Short]   => ArrayRuntime.cloneArray(x)
-    case x: Array[Boolean] => ArrayRuntime.cloneArray(x)
-    case x: Array[Unit]    => x
-    case x: VCArrayPrototype[_] => x.clone()
-    case null => throw new NullPointerException
-  }
-
-  /** Convert an array to an object array.
-    *  Needed to deal with vararg arguments of primitive types that are passed
-    *  to a generic Java vararg parameter T ...
-    */
-  def toObjectArray(src: AnyRef): Array[Object] = src match {
-    case x: Array[AnyRef] => x
-    case _ =>
-      val length = array_length(src)
-      val dest = new Array[Object](length)
-      for (i <- 0 until length)
-        array_update(dest, i, array_apply(src, i))
-      dest
-  }
-
-  def toArray[T](xs: scala.collection.Seq[T]) = {
-    val arr = new Array[AnyRef](xs.length)
-    var i = 0
-    for (x <- xs) {
-      arr(i) = x.asInstanceOf[AnyRef]
-      i += 1
-    }
-    arr
-  }
-
-  // Java bug: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4071957
-  // More background at ticket #2318.
-  def ensureAccessible(m: JMethod): JMethod = scala.reflect.ensureAccessible(m)
-
-  def checkInitialized[T <: AnyRef](x: T): T =
-    if (x == null) throw new UninitializedError else x
-
-  def _toString(x: Product): String =
-    x.productIterator.mkString(x.productPrefix + "(", ",", ")")
-
-  def _hashCode(x: Product): Int = scala.util.hashing.MurmurHash3.productHash(x)
-
-  /** A helper for case classes. */
-  def typedProductIterator[T](x: Product): Iterator[T] = {
-    new AbstractIterator[T] {
-      private var c: Int = 0
-      private val cmax = x.productArity
-      def hasNext = c < cmax
-      def next() = {
-        val result = x.productElement(c)
-        c += 1
-        result.asInstanceOf[T]
-      }
-    }
-  }
-
-  /** Fast path equality method for inlining; used when -optimise is set.
-    */
-  @inline def inlinedEquals(x: Object, y: Object): Boolean =
-    if (x eq y) true
-    else if (x eq null) false
-    else if (x.isInstanceOf[java.lang.Number]) BoxesRunTime.equalsNumObject(x.asInstanceOf[java.lang.Number], y)
-    else if (x.isInstanceOf[java.lang.Character]) BoxesRunTime.equalsCharObject(x.asInstanceOf[java.lang.Character], y)
-    else x.equals(y)
-
-  def _equals(x: Product, y: Any): Boolean = y match {
-    case y: Product if x.productArity == y.productArity => x.productIterator sameElements y.productIterator
-    case _                                              => false
-  }
-
-  // hashcode -----------------------------------------------------------
-  //
-  // Note that these are the implementations called by ##, so they
-  // must not call ## themselves.
-
-  def hash(x: Any): Int =
-    if (x == null) 0
-    else if (x.isInstanceOf[java.lang.Number]) BoxesRunTime.hashFromNumber(x.asInstanceOf[java.lang.Number])
-    else x.hashCode
-
-  def hash(dv: Double): Int = {
-    val iv = dv.toInt
-    if (iv == dv) return iv
-
-    val lv = dv.toLong
-    if (lv == dv) return lv.hashCode
-
-    val fv = dv.toFloat
-    if (fv == dv) fv.hashCode else dv.hashCode
-  }
-  def hash(fv: Float): Int = {
-    val iv = fv.toInt
-    if (iv == fv) return iv
-
-    val lv = fv.toLong
-    if (lv == fv) hash(lv)
-    else fv.hashCode
-  }
-  def hash(lv: Long): Int = {
-    val low = lv.toInt
-    val lowSign = low >>> 31
-    val high = (lv >>> 32).toInt
-    low ^ (high + lowSign)
-  }
-  def hash(x: Number): Int  = runtime.BoxesRunTime.hashFromNumber(x)
-
-  // The remaining overloads are here for completeness, but the compiler
-  // inlines these definitions directly so they're not generally used.
-  def hash(x: Int): Int = x
-  def hash(x: Short): Int = x.toInt
-  def hash(x: Byte): Int = x.toInt
-  def hash(x: Char): Int = x.toInt
-  def hash(x: Boolean): Int = if (x) true.hashCode else false.hashCode
-  def hash(x: Unit): Int = 0
-
-  /** A helper method for constructing case class equality methods,
-    *  because existential types get in the way of a clean outcome and
-    *  it's performing a series of Any/Any equals comparisons anyway.
-    *  See ticket #2867 for specifics.
-    */
-  def sameElements(xs1: scala.collection.Seq[Any], xs2: scala.collection.Seq[Any]) = xs1 sameElements xs2
-
-  /** Given any Scala value, convert it to a String.
-    *
-    * The primary motivation for this method is to provide a means for
-    * correctly obtaining a String representation of a value, while
-    * avoiding the pitfalls of naïvely calling toString on said value.
-    * In particular, it addresses the fact that (a) toString cannot be
-    * called on null and (b) depending on the apparent type of an
-    * array, toString may or may not print it in a human-readable form.
-    *
-    * @param   arg   the value to stringify
-    * @return        a string representation of arg.
-    */
-  def stringOf(arg: Any): String = stringOf(arg, scala.Int.MaxValue)
-  def stringOf(arg: Any, maxElements: Int): String = {
-    def packageOf(x: AnyRef) = x.getClass.getPackage match {
-      case null   => ""
-      case p      => p.getName
-    }
-    def isScalaClass(x: AnyRef)         = packageOf(x) startsWith "scala."
-    def isScalaCompilerClass(x: AnyRef) = packageOf(x) startsWith "scala.tools.nsc."
-
-    // We use reflection because the scala.xml package might not be available
-    def isSubClassOf(potentialSubClass: Class[_], ofClass: String) =
-      try {
-        val classLoader = potentialSubClass.getClassLoader
-        val clazz = Class.forName(ofClass, /*initialize =*/ false, classLoader)
-        clazz.isAssignableFrom(potentialSubClass)
-      } catch {
-        case cnfe: ClassNotFoundException => false
-      }
-    def isXmlNode(potentialSubClass: Class[_])     = isSubClassOf(potentialSubClass, "scala.xml.Node")
-    def isXmlMetaData(potentialSubClass: Class[_]) = isSubClassOf(potentialSubClass, "scala.xml.MetaData")
-
-    // When doing our own iteration is dangerous
-    def useOwnToString(x: Any) = x match {
-      // Range/NumericRange have a custom toString to avoid walking a gazillion elements
-      case _: Range | _: NumericRange[_] => true
-      // Sorted collections to the wrong thing (for us) on iteration - ticket #3493
-      case _: Sorted[_, _]  => true
-      // StringBuilder(a, b, c) and similar not so attractive
-      case _: StringLike[_] => true
-      // Don't want to evaluate any elements in a view
-      case _: TraversableView[_, _] => true
-      // Node extends NodeSeq extends Seq[Node] and MetaData extends Iterable[MetaData]
-      // -> catch those by isXmlNode and isXmlMetaData.
-      // Don't want to a) traverse infinity or b) be overly helpful with peoples' custom
-      // collections which may have useful toString methods - ticket #3710
-      // or c) print AbstractFiles which are somehow also Iterable[AbstractFile]s.
-      case x: Traversable[_] => !x.hasDefiniteSize || !isScalaClass(x) || isScalaCompilerClass(x) || isXmlNode(x.getClass) || isXmlMetaData(x.getClass)
-      // Otherwise, nothing could possibly go wrong
-      case _ => false
-    }
-
-    // A variation on inner for maps so they print -> instead of bare tuples
-    def mapInner(arg: Any): String = arg match {
-      case (k, v)   => inner(k) + " -> " + inner(v)
-      case _        => inner(arg)
-    }
-
-    // Special casing Unit arrays, the value class which uses a reference array type.
-    def arrayToString(x: AnyRef) = {
-      if (x.getClass.getComponentType == classOf[BoxedUnit])
-        0 until (array_length(x) min maxElements) map (_ => "()") mkString ("Array(", ", ", ")")
-      else
-        WrappedArray make x take maxElements map inner mkString ("Array(", ", ", ")")
-    }
-
-    // The recursively applied attempt to prettify Array printing.
-    // Note that iterator is used if possible and foreach is used as a
-    // last resort, because the parallel collections "foreach" in a
-    // random order even on sequences.
-    def inner(arg: Any): String = arg match {
-      case null                         => "null"
-      case ""                           => "\"\""
-      case x: String                    => if (x.head.isWhitespace || x.last.isWhitespace) "\"" + x + "\"" else x
-      case x if useOwnToString(x)       => x.toString
-      case x: AnyRef if isArray(x)      => arrayToString(x)
-      case x: scala.collection.Map[_, _]      => x.iterator take maxElements map mapInner mkString (x.stringPrefix + "(", ", ", ")")
-      case x: Iterable[_]               => x.iterator take maxElements map inner mkString (x.stringPrefix + "(", ", ", ")")
-      case x: Traversable[_]            => x take maxElements map inner mkString (x.stringPrefix + "(", ", ", ")")
-      case x: Product1[_] if isTuple(x) => "(" + inner(x._1) + ",)" // that special trailing comma
-      case x: Product if isTuple(x)     => x.productIterator map inner mkString ("(", ",", ")")
-      case x                            => x.toString
-    }
-
-    // The try/catch is defense against iterables which aren't actually designed
-    // to be iterated, such as some scala.tools.nsc.io.AbstractFile derived classes.
-    try inner(arg)
-    catch {
-      case _: UnsupportedOperationException | _: AssertionError => "" + arg
-    }
-  }
-
-  /** stringOf formatted for use in a repl result. */
-  def replStringOf(arg: Any, maxElements: Int): String = {
-    val s  = stringOf(arg, maxElements)
-    val nl = if (s contains "\n") "\n" else ""
-
-    nl + s + "\n"
-  }
-
-  def box[T](clazz: jClass[T]): jClass[_] = clazz match {
-    case java.lang.Byte.TYPE => classOf[java.lang.Byte]
-    case java.lang.Short.TYPE => classOf[java.lang.Short]
-    case java.lang.Character.TYPE => classOf[java.lang.Character]
-    case java.lang.Integer.TYPE => classOf[java.lang.Integer]
-    case java.lang.Long.TYPE => classOf[java.lang.Long]
-    case java.lang.Float.TYPE => classOf[java.lang.Float]
-    case java.lang.Double.TYPE => classOf[java.lang.Double]
-    case java.lang.Void.TYPE => classOf[scala.runtime.BoxedUnit]
-    case java.lang.Boolean.TYPE => classOf[java.lang.Boolean]
-    case _ => clazz
-  }
-}