diff --git c/library.properties w/library.properties
index 05a362621a..f337177955 100644
--- c/library.properties
+++ w/library.properties
@@ -1,4 +1,4 @@
-#Mon, 05 Dec 2011 07:46:47 -0800
+#Mon, 05 Dec 2011 08:03:39 -0800
 
-version.number=2.10.0.dev-1290-g340bb43
+version.number=2.10.0.dev-1291-g84ac9ef
 copyright.string=Copyright 2002-2011, LAMP/EPFL
diff --git c/scala/Either$LeftProjection.class w/scala/Either$LeftProjection.class
index d86f4fb287..9fe9ed7152 100644
--- c/scala/Either$LeftProjection.class
+++ w/scala/Either$LeftProjection.class
@@ -2,7 +2,7 @@ InnerClasses:
 public final #= # of #; //LeftProjection=class scala/Either$LeftProjection of class scala/Either
 
 Compiled from "Either.scala"
-public final class scala.Either$LeftProjection extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.Either$LeftProjection extends java.lang.Object implements scala.Product,scala.Serializable{
 private final scala.Either e;
   Signature: Lscala/Either;
 
diff --git c/scala/Either$RightProjection.class w/scala/Either$RightProjection.class
index 477c2c01b6..0f8a588a0d 100644
--- c/scala/Either$RightProjection.class
+++ w/scala/Either$RightProjection.class
@@ -2,7 +2,7 @@ InnerClasses:
 public final #= # of #; //RightProjection=class scala/Either$RightProjection of class scala/Either
 
 Compiled from "Either.scala"
-public final class scala.Either$RightProjection extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.Either$RightProjection extends java.lang.Object implements scala.Product,scala.Serializable{
 private final scala.Either e;
   Signature: Lscala/Either;
 
diff --git c/scala/Enumeration$Value.class w/scala/Enumeration$Value.class
index 34855067c8..9b90eee1c5 100644
--- c/scala/Enumeration$Value.class
+++ w/scala/Enumeration$Value.class
@@ -4,7 +4,7 @@ public #= # of #; //ValueSet=class scala/Enumeration$ValueSet of class scala/Enu
 public final #= # of #; //ValueSet$=class scala/Enumeration$ValueSet$ of class scala/Enumeration
 
 Compiled from "Enumeration.scala"
-public abstract class scala.Enumeration$Value extends java.lang.Object implements scala.math.Ordered,scala.Serializable,scala.ScalaObject{
+public abstract class scala.Enumeration$Value extends java.lang.Object implements scala.math.Ordered,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/Enumeration$ValueOrdering$.class w/scala/Enumeration$ValueOrdering$.class
index b142d3c814..f1ed0f020e 100644
--- c/scala/Enumeration$ValueOrdering$.class
+++ w/scala/Enumeration$ValueOrdering$.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Value=class scala/Enumeration$Value of class scala/
 public final #= # of #; //ValueOrdering$=class scala/Enumeration$ValueOrdering$ of class scala/Enumeration
 
 Compiled from "Enumeration.scala"
-public final class scala.Enumeration$ValueOrdering$ extends java.lang.Object implements scala.math.Ordering,scala.ScalaObject{
+public final class scala.Enumeration$ValueOrdering$ extends java.lang.Object implements scala.math.Ordering{
 private final scala.Enumeration $outer;
   Signature: Lscala/Enumeration;
 
diff --git c/scala/Enumeration$ValueSet.class w/scala/Enumeration$ValueSet.class
index 4c3ceb7097..bb7be8f2f9 100644
--- c/scala/Enumeration$ValueSet.class
+++ w/scala/Enumeration$ValueSet.class
@@ -5,7 +5,7 @@ public final #= # of #; //ValueSet$=class scala/Enumeration$ValueSet$ of class s
 public final #= # of #; //ValueOrdering$=class scala/Enumeration$ValueOrdering$ of class scala/Enumeration
 
 Compiled from "Enumeration.scala"
-public class scala.Enumeration$ValueSet extends scala.collection.AbstractSet implements scala.collection.immutable.SortedSet,scala.collection.SortedSetLike,scala.Serializable,scala.ScalaObject{
+public class scala.Enumeration$ValueSet extends scala.collection.AbstractSet implements scala.collection.immutable.SortedSet,scala.Serializable{
 private scala.collection.immutable.BitSet nnIds;
   Signature: Lscala/collection/immutable/BitSet;
 
diff --git c/scala/Left.class w/scala/Left.class
index ad54e24ceb..569a7558e6 100644
--- c/scala/Left.class
+++ w/scala/Left.class
@@ -1,6 +1,6 @@
 
 Compiled from "Either.scala"
-public final class scala.Left extends scala.Either implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.Left extends scala.Either implements scala.Product,scala.Serializable{
 private final java.lang.Object a;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/None$.class w/scala/None$.class
index e41e7ceacf..1a880a3eea 100644
--- c/scala/None$.class
+++ w/scala/None$.class
@@ -3,7 +3,7 @@ public #= # of #; //WithFilter=class scala/Option$WithFilter of class scala/Opti
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "Option.scala"
-public final class scala.None$ extends scala.Option implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.None$ extends scala.Option implements scala.Product,scala.Serializable{
 public static final scala.None$ MODULE$;
   Signature: Lscala/None$;
 
diff --git c/scala/Option.class w/scala/Option.class
index c9abec56f4..83d3435f64 100644
--- c/scala/Option.class
+++ w/scala/Option.class
@@ -3,7 +3,7 @@ public #= # of #; //WithFilter=class scala/Option$WithFilter of class scala/Opti
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "Option.scala"
-public abstract class scala.Option extends java.lang.Object implements scala.Product,scala.Serializable,scala.ScalaObject{
+public abstract class scala.Option extends java.lang.Object implements scala.Product,scala.Serializable{
 public static scala.Option empty();
   Signature: ()Lscala/Option;
   Code:
diff --git c/scala/PartialFunction.class w/scala/PartialFunction.class
index c5aec1bf73..587f4c3db0 100644
--- c/scala/PartialFunction.class
+++ w/scala/PartialFunction.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "PartialFunction.scala"
-public interface scala.PartialFunction extends scala.Function1,scala.ScalaObject{
+public interface scala.PartialFunction extends scala.Function1{
 public abstract boolean isDefinedAt(java.lang.Object);
   Signature: (Ljava/lang/Object;)Z
 
diff --git c/scala/Predef$$eq$colon$eq.class w/scala/Predef$$eq$colon$eq.class
index 5a2c7fa21b..8374ca5682 100644
--- c/scala/Predef$$eq$colon$eq.class
+++ w/scala/Predef$$eq$colon$eq.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //$eq$colon$eq=class scala/Predef$$eq$colon$eq of class scala/Predef
 
 Compiled from "Predef.scala"
-public abstract class scala.Predef$$eq$colon$eq extends java.lang.Object implements scala.Function1,scala.Serializable,scala.ScalaObject{
+public abstract class scala.Predef$$eq$colon$eq extends java.lang.Object implements scala.Function1,scala.Serializable{
 public boolean apply$mcZD$sp(double);
   Signature: (D)Z
   Code:
diff --git c/scala/Predef$$less$colon$less.class w/scala/Predef$$less$colon$less.class
index f65271b850..cb4c02713f 100644
--- c/scala/Predef$$less$colon$less.class
+++ w/scala/Predef$$less$colon$less.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "Predef.scala"
-public abstract class scala.Predef$$less$colon$less extends java.lang.Object implements scala.Function1,scala.Serializable,scala.ScalaObject{
+public abstract class scala.Predef$$less$colon$less extends java.lang.Object implements scala.Function1,scala.Serializable{
 public boolean apply$mcZD$sp(double);
   Signature: (D)Z
   Code:
diff --git c/scala/Predef$$less$percent$less.class w/scala/Predef$$less$percent$less.class
index 2fb95f0449..efbe854a93 100644
--- c/scala/Predef$$less$percent$less.class
+++ w/scala/Predef$$less$percent$less.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //$less$percent$less=class scala/Predef$$less$percent$less of class scala/Predef
 
 Compiled from "Predef.scala"
-public abstract class scala.Predef$$less$percent$less extends java.lang.Object implements scala.Function1,scala.Serializable,scala.ScalaObject{
+public abstract class scala.Predef$$less$percent$less extends java.lang.Object implements scala.Function1,scala.Serializable{
 public boolean apply$mcZD$sp(double);
   Signature: (D)Z
   Code:
diff --git c/scala/Product1.class w/scala/Product1.class
index f02b71b95d..18caaeb14d 100644
--- c/scala/Product1.class
+++ w/scala/Product1.class
@@ -1,6 +1,6 @@
 
 Compiled from "Product1.scala"
-public interface scala.Product1 extends scala.Product,scala.ScalaObject{
+public interface scala.Product1 extends scala.Product{
 public abstract int productArity();
   Signature: ()I
 
diff --git c/scala/Product10.class w/scala/Product10.class
index 555abd1c57..26dbdd9e20 100644
diff --git c/scala/Product11.class w/scala/Product11.class
index f16e5c7e74..1a75c21090 100644
--- c/scala/Product11.class
+++ w/scala/Product11.class
@@ -1,6 +1,6 @@
 
 Compiled from "Product11.scala"
-public interface scala.Product11 extends scala.Product,scala.ScalaObject{
+public interface scala.Product11 extends scala.Product{
 public abstract int productArity();
   Signature: ()I
 
diff --git c/scala/Product12.class w/scala/Product12.class
index c5136641d0..1d09e37ac1 100644
--- c/scala/Product12.class
+++ w/scala/Product12.class
@@ -1,6 +1,6 @@
 
 Compiled from "Product12.scala"
-public interface scala.Product12 extends scala.Product,scala.ScalaObject{
+public interface scala.Product12 extends scala.Product{
 public abstract int productArity();
   Signature: ()I
 
diff --git c/scala/Product13.class w/scala/Product13.class
index 896925a589..71a535cefe 100644
--- c/scala/Product13.class
+++ w/scala/Product13.class
@@ -1,6 +1,6 @@
 
 Compiled from "Product13.scala"
-public interface scala.Product13 extends scala.Product,scala.ScalaObject{
+public interface scala.Product13 extends scala.Product{
 public abstract int productArity();
   Signature: ()I
 
diff --git c/scala/Product14.class w/scala/Product14.class
index f2724c1412..9b75dfd8c8 100644
--- c/scala/Product14.class
+++ w/scala/Product14.class
@@ -1,6 +1,6 @@
 
 Compiled from "Product14.scala"
-public interface scala.Product14 extends scala.Product,scala.ScalaObject{
+public interface scala.Product14 extends scala.Product{
 public abstract int productArity();
   Signature: ()I
 
diff --git c/scala/Product15.class w/scala/Product15.class
index 716f3cd19b..2d952059be 100644
--- c/scala/Product15.class
+++ w/scala/Product15.class
@@ -1,6 +1,6 @@
 
 Compiled from "Product15.scala"
-public interface scala.Product15 extends scala.Product,scala.ScalaObject{
+public interface scala.Product15 extends scala.Product{
 public abstract int productArity();
   Signature: ()I
 
diff --git c/scala/Product16.class w/scala/Product16.class
index 9a7a432d3c..5715112e9b 100644
--- c/scala/Product16.class
+++ w/scala/Product16.class
@@ -1,6 +1,6 @@
 
 Compiled from "Product16.scala"
-public interface scala.Product16 extends scala.Product,scala.ScalaObject{
+public interface scala.Product16 extends scala.Product{
 public abstract int productArity();
   Signature: ()I
 
diff --git c/scala/Product17.class w/scala/Product17.class
index 0d6170bafe..86ed61237b 100644
--- c/scala/Product17.class
+++ w/scala/Product17.class
@@ -1,6 +1,6 @@
 
 Compiled from "Product17.scala"
-public interface scala.Product17 extends scala.Product,scala.ScalaObject{
+public interface scala.Product17 extends scala.Product{
 public abstract int productArity();
   Signature: ()I
 
diff --git c/scala/Product18.class w/scala/Product18.class
index 824179a58e..1387a1d7f8 100644
--- c/scala/Product18.class
+++ w/scala/Product18.class
@@ -1,6 +1,6 @@
 
 Compiled from "Product18.scala"
-public interface scala.Product18 extends scala.Product,scala.ScalaObject{
+public interface scala.Product18 extends scala.Product{
 public abstract int productArity();
   Signature: ()I
 
diff --git c/scala/Product19.class w/scala/Product19.class
index 8cec920b1f..afd8283a98 100644
--- c/scala/Product19.class
+++ w/scala/Product19.class
@@ -1,6 +1,6 @@
 
 Compiled from "Product19.scala"
-public interface scala.Product19 extends scala.Product,scala.ScalaObject{
+public interface scala.Product19 extends scala.Product{
 public abstract int productArity();
   Signature: ()I
 
diff --git c/scala/Product2.class w/scala/Product2.class
index b523c5a7ec..8647444432 100644
--- c/scala/Product2.class
+++ w/scala/Product2.class
@@ -1,6 +1,6 @@
 
 Compiled from "Product2.scala"
-public interface scala.Product2 extends scala.Product,scala.ScalaObject{
+public interface scala.Product2 extends scala.Product{
 public abstract int productArity();
   Signature: ()I
 
diff --git c/scala/Product20.class w/scala/Product20.class
index dd3ceed0fd..1d13ac1587 100644
diff --git c/scala/Product21.class w/scala/Product21.class
index 6cd96838f4..c6639c0bb7 100644
--- c/scala/Product21.class
+++ w/scala/Product21.class
@@ -1,6 +1,6 @@
 
 Compiled from "Product21.scala"
-public interface scala.Product21 extends scala.Product,scala.ScalaObject{
+public interface scala.Product21 extends scala.Product{
 public abstract int productArity();
   Signature: ()I
 
diff --git c/scala/Product22.class w/scala/Product22.class
index 5a698be3cd..bf537e507b 100644
--- c/scala/Product22.class
+++ w/scala/Product22.class
@@ -1,6 +1,6 @@
 
 Compiled from "Product22.scala"
-public interface scala.Product22 extends scala.Product,scala.ScalaObject{
+public interface scala.Product22 extends scala.Product{
 public abstract int productArity();
   Signature: ()I
 
diff --git c/scala/Product3.class w/scala/Product3.class
index fea8a77252..e397977f2f 100644
--- c/scala/Product3.class
+++ w/scala/Product3.class
@@ -1,6 +1,6 @@
 
 Compiled from "Product3.scala"
-public interface scala.Product3 extends scala.Product,scala.ScalaObject{
+public interface scala.Product3 extends scala.Product{
 public abstract int productArity();
   Signature: ()I
 
diff --git c/scala/Product4.class w/scala/Product4.class
index 851fbcfcde..1add8234b6 100644
--- c/scala/Product4.class
+++ w/scala/Product4.class
@@ -1,6 +1,6 @@
 
 Compiled from "Product4.scala"
-public interface scala.Product4 extends scala.Product,scala.ScalaObject{
+public interface scala.Product4 extends scala.Product{
 public abstract int productArity();
   Signature: ()I
 
diff --git c/scala/Product5.class w/scala/Product5.class
index 44fdec5843..fa4f7861d2 100644
--- c/scala/Product5.class
+++ w/scala/Product5.class
@@ -1,6 +1,6 @@
 
 Compiled from "Product5.scala"
-public interface scala.Product5 extends scala.Product,scala.ScalaObject{
+public interface scala.Product5 extends scala.Product{
 public abstract int productArity();
   Signature: ()I
 
diff --git c/scala/Product6.class w/scala/Product6.class
index c9a7b54e79..7988e0cb17 100644
--- c/scala/Product6.class
+++ w/scala/Product6.class
@@ -1,6 +1,6 @@
 
 Compiled from "Product6.scala"
-public interface scala.Product6 extends scala.Product,scala.ScalaObject{
+public interface scala.Product6 extends scala.Product{
 public abstract int productArity();
   Signature: ()I
 
diff --git c/scala/Product7.class w/scala/Product7.class
index a28ef1a616..5fadbed639 100644
--- c/scala/Product7.class
+++ w/scala/Product7.class
@@ -1,6 +1,6 @@
 
 Compiled from "Product7.scala"
-public interface scala.Product7 extends scala.Product,scala.ScalaObject{
+public interface scala.Product7 extends scala.Product{
 public abstract int productArity();
   Signature: ()I
 
diff --git c/scala/Product8.class w/scala/Product8.class
index f0a0b67287..371b0c8acf 100644
--- c/scala/Product8.class
+++ w/scala/Product8.class
@@ -1,6 +1,6 @@
 
 Compiled from "Product8.scala"
-public interface scala.Product8 extends scala.Product,scala.ScalaObject{
+public interface scala.Product8 extends scala.Product{
 public abstract int productArity();
   Signature: ()I
 
diff --git c/scala/Product9.class w/scala/Product9.class
index 3bccca3eaa..3a4dbc8e71 100644
--- c/scala/Product9.class
+++ w/scala/Product9.class
@@ -1,6 +1,6 @@
 
 Compiled from "Product9.scala"
-public interface scala.Product9 extends scala.Product,scala.ScalaObject{
+public interface scala.Product9 extends scala.Product{
 public abstract int productArity();
   Signature: ()I
 
diff --git c/scala/Right.class w/scala/Right.class
index 506098d857..92c6f16167 100644
--- c/scala/Right.class
+++ w/scala/Right.class
@@ -1,6 +1,6 @@
 
 Compiled from "Either.scala"
-public final class scala.Right extends scala.Either implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.Right extends scala.Either implements scala.Product,scala.Serializable{
 private final java.lang.Object b;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/Some.class w/scala/Some.class
index f7db04de3c..cfcde6e3f5 100644
--- c/scala/Some.class
+++ w/scala/Some.class
@@ -1,6 +1,6 @@
 
 Compiled from "Option.scala"
-public final class scala.Some extends scala.Option implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.Some extends scala.Option implements scala.Product,scala.Serializable{
 private final java.lang.Object x;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/Tuple1.class w/scala/Tuple1.class
index 8fcd8a2c4d..806195caa5 100644
--- c/scala/Tuple1.class
+++ w/scala/Tuple1.class
@@ -1,6 +1,6 @@
 
 Compiled from "Tuple1.scala"
-public class scala.Tuple1 extends java.lang.Object implements scala.Product1,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.Tuple1 extends java.lang.Object implements scala.Product1,scala.Serializable{
 public final java.lang.Object _1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/Tuple10.class w/scala/Tuple10.class
index c24059967b..12d46e4ee2 100644
diff --git c/scala/Tuple11.class w/scala/Tuple11.class
index 5eda5b3130..f38ec86038 100644
--- c/scala/Tuple11.class
+++ w/scala/Tuple11.class
@@ -1,6 +1,6 @@
 
 Compiled from "Tuple11.scala"
-public class scala.Tuple11 extends java.lang.Object implements scala.Product11,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.Tuple11 extends java.lang.Object implements scala.Product11,scala.Serializable{
 private final java.lang.Object _1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/Tuple12.class w/scala/Tuple12.class
index 1953c7a69e..dbf49808bf 100644
--- c/scala/Tuple12.class
+++ w/scala/Tuple12.class
@@ -1,6 +1,6 @@
 
 Compiled from "Tuple12.scala"
-public class scala.Tuple12 extends java.lang.Object implements scala.Product12,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.Tuple12 extends java.lang.Object implements scala.Product12,scala.Serializable{
 private final java.lang.Object _1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/Tuple13.class w/scala/Tuple13.class
index 1020835f07..cb15a9be5d 100644
--- c/scala/Tuple13.class
+++ w/scala/Tuple13.class
@@ -1,6 +1,6 @@
 
 Compiled from "Tuple13.scala"
-public class scala.Tuple13 extends java.lang.Object implements scala.Product13,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.Tuple13 extends java.lang.Object implements scala.Product13,scala.Serializable{
 private final java.lang.Object _1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/Tuple14.class w/scala/Tuple14.class
index 576d631a75..8272402bd0 100644
--- c/scala/Tuple14.class
+++ w/scala/Tuple14.class
@@ -1,6 +1,6 @@
 
 Compiled from "Tuple14.scala"
-public class scala.Tuple14 extends java.lang.Object implements scala.Product14,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.Tuple14 extends java.lang.Object implements scala.Product14,scala.Serializable{
 private final java.lang.Object _1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/Tuple15.class w/scala/Tuple15.class
index abc63b9546..1f1be26073 100644
--- c/scala/Tuple15.class
+++ w/scala/Tuple15.class
@@ -1,6 +1,6 @@
 
 Compiled from "Tuple15.scala"
-public class scala.Tuple15 extends java.lang.Object implements scala.Product15,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.Tuple15 extends java.lang.Object implements scala.Product15,scala.Serializable{
 private final java.lang.Object _1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/Tuple16.class w/scala/Tuple16.class
index 9bb5605875..9d3a9cf5d8 100644
--- c/scala/Tuple16.class
+++ w/scala/Tuple16.class
@@ -1,6 +1,6 @@
 
 Compiled from "Tuple16.scala"
-public class scala.Tuple16 extends java.lang.Object implements scala.Product16,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.Tuple16 extends java.lang.Object implements scala.Product16,scala.Serializable{
 private final java.lang.Object _1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/Tuple17.class w/scala/Tuple17.class
index 907937eac6..70991ffed4 100644
--- c/scala/Tuple17.class
+++ w/scala/Tuple17.class
@@ -1,6 +1,6 @@
 
 Compiled from "Tuple17.scala"
-public class scala.Tuple17 extends java.lang.Object implements scala.Product17,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.Tuple17 extends java.lang.Object implements scala.Product17,scala.Serializable{
 private final java.lang.Object _1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/Tuple18.class w/scala/Tuple18.class
index 20fee57848..2401b61385 100644
--- c/scala/Tuple18.class
+++ w/scala/Tuple18.class
@@ -1,6 +1,6 @@
 
 Compiled from "Tuple18.scala"
-public class scala.Tuple18 extends java.lang.Object implements scala.Product18,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.Tuple18 extends java.lang.Object implements scala.Product18,scala.Serializable{
 private final java.lang.Object _1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/Tuple19.class w/scala/Tuple19.class
index eb076f36e5..75bb689d40 100644
--- c/scala/Tuple19.class
+++ w/scala/Tuple19.class
@@ -1,6 +1,6 @@
 
 Compiled from "Tuple19.scala"
-public class scala.Tuple19 extends java.lang.Object implements scala.Product19,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.Tuple19 extends java.lang.Object implements scala.Product19,scala.Serializable{
 private final java.lang.Object _1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/Tuple2.class w/scala/Tuple2.class
index 09494da83a..7be83caad6 100644
--- c/scala/Tuple2.class
+++ w/scala/Tuple2.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //Zipped=class scala/Tuple$Zipped of class scala/Tuple
 
 Compiled from "Tuple2.scala"
-public class scala.Tuple2 extends java.lang.Object implements scala.Product2,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.Tuple2 extends java.lang.Object implements scala.Product2,scala.Serializable{
 public final java.lang.Object _1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/Tuple20.class w/scala/Tuple20.class
index b40b2cd51e..45c0c8065d 100644
diff --git c/scala/Tuple21.class w/scala/Tuple21.class
index 42f7bef861..4ba6c0f7d4 100644
--- c/scala/Tuple21.class
+++ w/scala/Tuple21.class
@@ -1,6 +1,6 @@
 
 Compiled from "Tuple21.scala"
-public class scala.Tuple21 extends java.lang.Object implements scala.Product21,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.Tuple21 extends java.lang.Object implements scala.Product21,scala.Serializable{
 private final java.lang.Object _1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/Tuple22.class w/scala/Tuple22.class
index 9717ad359a..262c37efa1 100644
--- c/scala/Tuple22.class
+++ w/scala/Tuple22.class
@@ -1,6 +1,6 @@
 
 Compiled from "Tuple22.scala"
-public class scala.Tuple22 extends java.lang.Object implements scala.Product22,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.Tuple22 extends java.lang.Object implements scala.Product22,scala.Serializable{
 private final java.lang.Object _1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/Tuple3.class w/scala/Tuple3.class
index 0ada97967d..390c0760c6 100644
--- c/scala/Tuple3.class
+++ w/scala/Tuple3.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //Zipped=class scala/Tuple$Zipped of class scala/Tuple
 
 Compiled from "Tuple3.scala"
-public class scala.Tuple3 extends java.lang.Object implements scala.Product3,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.Tuple3 extends java.lang.Object implements scala.Product3,scala.Serializable{
 private final java.lang.Object _1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/Tuple4.class w/scala/Tuple4.class
index 3ce19b893a..00d1befe4f 100644
--- c/scala/Tuple4.class
+++ w/scala/Tuple4.class
@@ -1,6 +1,6 @@
 
 Compiled from "Tuple4.scala"
-public class scala.Tuple4 extends java.lang.Object implements scala.Product4,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.Tuple4 extends java.lang.Object implements scala.Product4,scala.Serializable{
 private final java.lang.Object _1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/Tuple5.class w/scala/Tuple5.class
index 4dcc8004d8..9bf85dce05 100644
--- c/scala/Tuple5.class
+++ w/scala/Tuple5.class
@@ -1,6 +1,6 @@
 
 Compiled from "Tuple5.scala"
-public class scala.Tuple5 extends java.lang.Object implements scala.Product5,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.Tuple5 extends java.lang.Object implements scala.Product5,scala.Serializable{
 private final java.lang.Object _1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/Tuple6.class w/scala/Tuple6.class
index b56b5c3ac3..52709b0550 100644
--- c/scala/Tuple6.class
+++ w/scala/Tuple6.class
@@ -1,6 +1,6 @@
 
 Compiled from "Tuple6.scala"
-public class scala.Tuple6 extends java.lang.Object implements scala.Product6,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.Tuple6 extends java.lang.Object implements scala.Product6,scala.Serializable{
 private final java.lang.Object _1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/Tuple7.class w/scala/Tuple7.class
index ccae4c055f..69a5a6d7a4 100644
--- c/scala/Tuple7.class
+++ w/scala/Tuple7.class
@@ -1,6 +1,6 @@
 
 Compiled from "Tuple7.scala"
-public class scala.Tuple7 extends java.lang.Object implements scala.Product7,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.Tuple7 extends java.lang.Object implements scala.Product7,scala.Serializable{
 private final java.lang.Object _1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/Tuple8.class w/scala/Tuple8.class
index ae929aff68..c3b750d98a 100644
--- c/scala/Tuple8.class
+++ w/scala/Tuple8.class
@@ -1,6 +1,6 @@
 
 Compiled from "Tuple8.scala"
-public class scala.Tuple8 extends java.lang.Object implements scala.Product8,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.Tuple8 extends java.lang.Object implements scala.Product8,scala.Serializable{
 private final java.lang.Object _1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/Tuple9.class w/scala/Tuple9.class
index a6380623d8..bbb511d3c2 100644
--- c/scala/Tuple9.class
+++ w/scala/Tuple9.class
@@ -1,6 +1,6 @@
 
 Compiled from "Tuple9.scala"
-public class scala.Tuple9 extends java.lang.Object implements scala.Product9,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.Tuple9 extends java.lang.Object implements scala.Product9,scala.Serializable{
 private final java.lang.Object _1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/UninitializedFieldError.class w/scala/UninitializedFieldError.class
index caeeff264b..ac19b5fddb 100644
--- c/scala/UninitializedFieldError.class
+++ w/scala/UninitializedFieldError.class
@@ -1,6 +1,6 @@
 
 Compiled from "UninitializedFieldError.scala"
-public final class scala.UninitializedFieldError extends java.lang.RuntimeException implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.UninitializedFieldError extends java.lang.RuntimeException implements scala.Product,scala.Serializable{
 private final java.lang.String msg;
   Signature: Ljava/lang/String;
 
diff --git c/scala/actors/$bang.class w/scala/actors/$bang.class
index 74e4e26d50..e4e933d2df 100644
--- c/scala/actors/$bang.class
+++ w/scala/actors/$bang.class
@@ -1,6 +1,6 @@
 
 Compiled from "Channel.scala"
-public class scala.actors.$bang extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.actors.$bang extends java.lang.Object implements scala.Product,scala.Serializable{
 private final scala.actors.Channel ch;
   Signature: Lscala/actors/Channel;
 
diff --git c/scala/actors/Actor$.class w/scala/actors/Actor$.class
index 7b11e678c4..d25f45439b 100644
--- c/scala/actors/Actor$.class
+++ w/scala/actors/Actor$.class
@@ -5,7 +5,7 @@ public final #= # of #; //blocker$=class scala/actors/Actor$blocker$ of class sc
 public #= # of #; //RecursiveProxyHandler=class scala/actors/Actor$RecursiveProxyHandler of class scala/actors/Actor
 
 Compiled from "Actor.scala"
-public final class scala.actors.Actor$ extends java.lang.Object implements scala.actors.Combinators,scala.ScalaObject,scala.Serializable{
+public final class scala.actors.Actor$ extends java.lang.Object implements scala.actors.Combinators,scala.Serializable{
 public static final scala.actors.Actor$ MODULE$;
   Signature: Lscala/actors/Actor$;
 
diff --git c/scala/actors/Actor.class w/scala/actors/Actor.class
index 59872ad157..2f7854cf21 100644
--- c/scala/actors/Actor.class
+++ w/scala/actors/Actor.class
@@ -6,7 +6,7 @@ public abstract #= # of #; //Value=class scala/Enumeration$Value of class scala/
 public #= # of #; //RecursiveProxyHandler=class scala/actors/Actor$RecursiveProxyHandler of class scala/actors/Actor
 
 Compiled from "Actor.scala"
-public interface scala.actors.Actor extends scala.actors.AbstractActor,scala.actors.ReplyReactor,scala.actors.ActorCanReply,scala.actors.InputChannel,scala.Serializable,scala.ScalaObject{
+public interface scala.actors.Actor extends scala.actors.AbstractActor,scala.actors.ReplyReactor,scala.actors.ActorCanReply,scala.actors.InputChannel,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/actors/ActorCanReply.class w/scala/actors/ActorCanReply.class
index b1c7373a23..d2113ced72 100644
--- c/scala/actors/ActorCanReply.class
+++ w/scala/actors/ActorCanReply.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "ActorCanReply.scala"
-public interface scala.actors.ActorCanReply extends scala.actors.ReactorCanReply,scala.ScalaObject{
+public interface scala.actors.ActorCanReply extends scala.actors.ReactorCanReply{
 public abstract java.lang.Object $bang$qmark(java.lang.Object);
   Signature: (Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git c/scala/actors/ActorProxy.class w/scala/actors/ActorProxy.class
index 104a3ce1b5..31dbba4c92 100644
--- c/scala/actors/ActorProxy.class
+++ w/scala/actors/ActorProxy.class
@@ -4,7 +4,7 @@ public final #= # of #; //blocker$=class scala/actors/Actor$blocker$ of class sc
 public abstract #= # of #; //Value=class scala/Enumeration$Value of class scala/Enumeration
 
 Compiled from "ActorProxy.scala"
-public class scala.actors.ActorProxy extends java.lang.Object implements scala.actors.Actor,scala.ScalaObject{
+public class scala.actors.ActorProxy extends java.lang.Object implements scala.actors.Actor{
 private final scala.actors.IScheduler scheduler;
   Signature: Lscala/actors/IScheduler;
 
diff --git c/scala/actors/DaemonActor.class w/scala/actors/DaemonActor.class
index 965a5c3dc0..536065ec35 100644
--- c/scala/actors/DaemonActor.class
+++ w/scala/actors/DaemonActor.class
@@ -1,6 +1,6 @@
 
 Compiled from "DaemonActor.scala"
-public interface scala.actors.DaemonActor extends scala.actors.Actor,scala.ScalaObject{
+public interface scala.actors.DaemonActor extends scala.actors.Actor{
 public abstract scala.actors.IScheduler scheduler();
   Signature: ()Lscala/actors/IScheduler;
 
diff --git c/scala/actors/Eval$.class w/scala/actors/Eval$.class
index 0b29370b27..50659b636b 100644
--- c/scala/actors/Eval$.class
+++ w/scala/actors/Eval$.class
@@ -1,6 +1,6 @@
 
 Compiled from "Future.scala"
-public final class scala.actors.Eval$ extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.actors.Eval$ extends java.lang.Object implements scala.Product,scala.Serializable{
 public static final scala.actors.Eval$ MODULE$;
   Signature: Lscala/actors/Eval$;
 
diff --git c/scala/actors/Exit.class w/scala/actors/Exit.class
index c8750e651c..f4d0ff511b 100644
--- c/scala/actors/Exit.class
+++ w/scala/actors/Exit.class
@@ -1,6 +1,6 @@
 
 Compiled from "Actor.scala"
-public class scala.actors.Exit extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.actors.Exit extends java.lang.Object implements scala.Product,scala.Serializable{
 private final scala.actors.AbstractActor from;
   Signature: Lscala/actors/AbstractActor;
 
diff --git c/scala/actors/Future.class w/scala/actors/Future.class
index 3d55c27828..c60dc2d1c6 100644
diff --git c/scala/actors/FutureActor.class w/scala/actors/FutureActor.class
index 50a2369163..d05cf30617 100644
--- c/scala/actors/FutureActor.class
+++ w/scala/actors/FutureActor.class
@@ -4,7 +4,7 @@ public final #= # of #; //blocker$=class scala/actors/Actor$blocker$ of class sc
 public abstract #= # of #; //Value=class scala/Enumeration$Value of class scala/Enumeration
 
 Compiled from "Future.scala"
-public class scala.actors.FutureActor extends scala.actors.Future implements scala.actors.DaemonActor,scala.ScalaObject{
+public class scala.actors.FutureActor extends scala.actors.Future implements scala.actors.DaemonActor{
 public final scala.Function1 scala$actors$FutureActor$$fun;
   Signature: Lscala/Function1;
 
diff --git c/scala/actors/KillActorControl.class w/scala/actors/KillActorControl.class
index 135e7e5760..a2c443a9ab 100644
--- c/scala/actors/KillActorControl.class
+++ w/scala/actors/KillActorControl.class
@@ -1,6 +1,6 @@
 
 Compiled from "KillActorControl.scala"
-public class scala.actors.KillActorControl extends java.lang.Throwable implements scala.util.control.ControlThrowable,scala.ScalaObject{
+public class scala.actors.KillActorControl extends java.lang.Throwable implements scala.util.control.ControlThrowable{
 public java.lang.Throwable scala$util$control$NoStackTrace$$super$fillInStackTrace();
   Signature: ()Ljava/lang/Throwable;
   Code:
diff --git c/scala/actors/ReactChannel$SendToReactor.class w/scala/actors/ReactChannel$SendToReactor.class
index 6e1ec65b1e..31f024b111 100644
--- c/scala/actors/ReactChannel$SendToReactor.class
+++ w/scala/actors/ReactChannel$SendToReactor.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //SendToReactor=class scala/actors/ReactChannel$SendToReactor of class scala/actors/ReactChannel
 
 Compiled from "ReactChannel.scala"
-public class scala.actors.ReactChannel$SendToReactor extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.actors.ReactChannel$SendToReactor extends java.lang.Object implements scala.Product,scala.Serializable{
 private final scala.actors.ReactChannel channel;
   Signature: Lscala/actors/ReactChannel;
 
diff --git c/scala/actors/Reactor.class w/scala/actors/Reactor.class
index b599d78eea..f3bfeb6425 100644
--- c/scala/actors/Reactor.class
+++ w/scala/actors/Reactor.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Body=class scala/actors/Actor$Body of class scala/a
 public abstract #= # of #; //Value=class scala/Enumeration$Value of class scala/Enumeration
 
 Compiled from "Reactor.scala"
-public interface scala.actors.Reactor extends scala.actors.OutputChannel,scala.actors.Combinators,scala.ScalaObject{
+public interface scala.actors.Reactor extends scala.actors.OutputChannel,scala.actors.Combinators{
 public abstract void scala$actors$Reactor$_setter_$mailbox_$eq(scala.actors.MQueue);
   Signature: (Lscala/actors/MQueue;)V
 
diff --git c/scala/actors/ReplyReactor.class w/scala/actors/ReplyReactor.class
index dcb6a3bd28..6522767e92 100644
--- c/scala/actors/ReplyReactor.class
+++ w/scala/actors/ReplyReactor.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //Value=class scala/Enumeration$Value of class scala/Enumeration
 
 Compiled from "ReplyReactor.scala"
-public interface scala.actors.ReplyReactor extends scala.actors.Reactor,scala.actors.ReactorCanReply,scala.ScalaObject{
+public interface scala.actors.ReplyReactor extends scala.actors.Reactor,scala.actors.ReactorCanReply{
 public abstract void scala$actors$ReplyReactor$$super$resumeReceiver(scala.Tuple2, scala.PartialFunction, boolean);
   Signature: (Lscala/Tuple2;Lscala/PartialFunction;Z)V
 
diff --git c/scala/actors/Scheduler$.class w/scala/actors/Scheduler$.class
index ce30c97427..c4b0a02822 100644
--- c/scala/actors/Scheduler$.class
+++ w/scala/actors/Scheduler$.class
@@ -1,6 +1,6 @@
 
 Compiled from "Scheduler.scala"
-public final class scala.actors.Scheduler$ extends java.lang.Object implements scala.actors.scheduler.DelegatingScheduler,scala.ScalaObject{
+public final class scala.actors.Scheduler$ extends java.lang.Object implements scala.actors.scheduler.DelegatingScheduler{
 public static final scala.actors.Scheduler$ MODULE$;
   Signature: Lscala/actors/Scheduler$;
 
diff --git c/scala/actors/SchedulerAdapter.class w/scala/actors/SchedulerAdapter.class
index e74518c39a..5055fd088b 100644
--- c/scala/actors/SchedulerAdapter.class
+++ w/scala/actors/SchedulerAdapter.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "SchedulerAdapter.scala"
-public interface scala.actors.SchedulerAdapter extends scala.actors.IScheduler,scala.ScalaObject{
+public interface scala.actors.SchedulerAdapter extends scala.actors.IScheduler{
 public abstract void execute(java.lang.Runnable);
   Signature: (Ljava/lang/Runnable;)V
 
diff --git c/scala/actors/SuspendActorControl.class w/scala/actors/SuspendActorControl.class
index 9c285eb8f6..ba21a7753e 100644
--- c/scala/actors/SuspendActorControl.class
+++ w/scala/actors/SuspendActorControl.class
@@ -1,6 +1,6 @@
 
 Compiled from "Actor.scala"
-public class scala.actors.SuspendActorControl extends java.lang.Throwable implements scala.util.control.ControlThrowable,scala.ScalaObject{
+public class scala.actors.SuspendActorControl extends java.lang.Throwable implements scala.util.control.ControlThrowable{
 public java.lang.Throwable scala$util$control$NoStackTrace$$super$fillInStackTrace();
   Signature: ()Ljava/lang/Throwable;
   Code:
diff --git c/scala/actors/TIMEOUT$.class w/scala/actors/TIMEOUT$.class
index 0ad48f4bc0..c2d2ea3ede 100644
--- c/scala/actors/TIMEOUT$.class
+++ w/scala/actors/TIMEOUT$.class
@@ -1,6 +1,6 @@
 
 Compiled from "Actor.scala"
-public final class scala.actors.TIMEOUT$ extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.actors.TIMEOUT$ extends java.lang.Object implements scala.Product,scala.Serializable{
 public static final scala.actors.TIMEOUT$ MODULE$;
   Signature: Lscala/actors/TIMEOUT$;
 
diff --git c/scala/actors/UncaughtException.class w/scala/actors/UncaughtException.class
index 3791fffe3a..c3944b005b 100644
--- c/scala/actors/UncaughtException.class
+++ w/scala/actors/UncaughtException.class
@@ -1,6 +1,6 @@
 
 Compiled from "UncaughtException.scala"
-public class scala.actors.UncaughtException extends java.lang.Exception implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.actors.UncaughtException extends java.lang.Exception implements scala.Product,scala.Serializable{
 private final scala.actors.Actor actor;
   Signature: Lscala/actors/Actor;
 
diff --git c/scala/actors/remote/Apply0.class w/scala/actors/remote/Apply0.class
index 09bfdeeaad..e6986f5254 100644
diff --git c/scala/actors/remote/DelegateActor.class w/scala/actors/remote/DelegateActor.class
index 3c911d8782..5d4f37bea7 100644
--- c/scala/actors/remote/DelegateActor.class
+++ w/scala/actors/remote/DelegateActor.class
@@ -4,7 +4,7 @@ public final #= # of #; //blocker$=class scala/actors/Actor$blocker$ of class sc
 public abstract #= # of #; //Value=class scala/Enumeration$Value of class scala/Enumeration
 
 Compiled from "Proxy.scala"
-public class scala.actors.remote.DelegateActor extends java.lang.Object implements scala.actors.Actor,scala.ScalaObject{
+public class scala.actors.remote.DelegateActor extends java.lang.Object implements scala.actors.Actor{
 public final scala.actors.remote.Proxy scala$actors$remote$DelegateActor$$creator;
   Signature: Lscala/actors/remote/Proxy;
 
diff --git c/scala/actors/remote/ExitFun.class w/scala/actors/remote/ExitFun.class
index 7f59c2094e..034f6c19ae 100644
--- c/scala/actors/remote/ExitFun.class
+++ w/scala/actors/remote/ExitFun.class
@@ -1,6 +1,6 @@
 
 Compiled from "Proxy.scala"
-public final class scala.actors.remote.ExitFun extends java.lang.Object implements scala.Function2,scala.Serializable,scala.ScalaObject{
+public final class scala.actors.remote.ExitFun extends java.lang.Object implements scala.Function2,scala.Serializable{
 private final java.lang.Object reason;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/actors/remote/LinkToFun.class w/scala/actors/remote/LinkToFun.class
index 9bc73767ad..b5d30b4295 100644
--- c/scala/actors/remote/LinkToFun.class
+++ w/scala/actors/remote/LinkToFun.class
@@ -1,6 +1,6 @@
 
 Compiled from "Proxy.scala"
-public final class scala.actors.remote.LinkToFun extends java.lang.Object implements scala.Function2,scala.Serializable,scala.ScalaObject{
+public final class scala.actors.remote.LinkToFun extends java.lang.Object implements scala.Function2,scala.Serializable{
 public boolean apply$mcZDD$sp(double, double);
   Signature: (DD)Z
   Code:
diff --git c/scala/actors/remote/LocalApply0.class w/scala/actors/remote/LocalApply0.class
index 4a624114b9..40959eed4b 100644
diff --git c/scala/actors/remote/Locator.class w/scala/actors/remote/Locator.class
index 3d85102de0..d72a1d152f 100644
--- c/scala/actors/remote/Locator.class
+++ w/scala/actors/remote/Locator.class
@@ -1,6 +1,6 @@
 
 Compiled from "NetKernel.scala"
-public class scala.actors.remote.Locator extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.actors.remote.Locator extends java.lang.Object implements scala.Product,scala.Serializable{
 private final scala.actors.remote.Node node;
   Signature: Lscala/actors/remote/Node;
 
diff --git c/scala/actors/remote/NamedSend.class w/scala/actors/remote/NamedSend.class
index d6e1e3a0ca..3a05e5f474 100644
--- c/scala/actors/remote/NamedSend.class
+++ w/scala/actors/remote/NamedSend.class
@@ -1,6 +1,6 @@
 
 Compiled from "NetKernel.scala"
-public class scala.actors.remote.NamedSend extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.actors.remote.NamedSend extends java.lang.Object implements scala.Product,scala.Serializable{
 private final scala.actors.remote.Locator senderLoc;
   Signature: Lscala/actors/remote/Locator;
 
diff --git c/scala/actors/remote/Node.class w/scala/actors/remote/Node.class
index 1736472e0a..b3d65fce3a 100644
--- c/scala/actors/remote/Node.class
+++ w/scala/actors/remote/Node.class
@@ -1,6 +1,6 @@
 
 Compiled from "RemoteActor.scala"
-public class scala.actors.remote.Node extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.actors.remote.Node extends java.lang.Object implements scala.Product,scala.Serializable{
 private final java.lang.String address;
   Signature: Ljava/lang/String;
 
diff --git c/scala/actors/remote/Proxy.class w/scala/actors/remote/Proxy.class
index 01df81d1f2..86b099042c 100644
--- c/scala/actors/remote/Proxy.class
+++ w/scala/actors/remote/Proxy.class
@@ -1,6 +1,6 @@
 
 Compiled from "Proxy.scala"
-public class scala.actors.remote.Proxy extends java.lang.Object implements scala.actors.AbstractActor,scala.Serializable,scala.ScalaObject{
+public class scala.actors.remote.Proxy extends java.lang.Object implements scala.actors.AbstractActor,scala.Serializable{
 private final scala.actors.remote.Node node;
   Signature: Lscala/actors/remote/Node;
 
diff --git c/scala/actors/remote/RemoteApply0.class w/scala/actors/remote/RemoteApply0.class
index ed43a5940f..ac37eb4513 100644
diff --git c/scala/actors/remote/SendTo.class w/scala/actors/remote/SendTo.class
index e24a15cf3a..62cced58b2 100644
--- c/scala/actors/remote/SendTo.class
+++ w/scala/actors/remote/SendTo.class
@@ -1,6 +1,6 @@
 
 Compiled from "NetKernel.scala"
-public class scala.actors.remote.SendTo extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.actors.remote.SendTo extends java.lang.Object implements scala.Product,scala.Serializable{
 private final scala.actors.OutputChannel a;
   Signature: Lscala/actors/OutputChannel;
 
diff --git c/scala/actors/remote/TcpService.class w/scala/actors/remote/TcpService.class
index 56b34b4874..e09dbfc8a0 100644
--- c/scala/actors/remote/TcpService.class
+++ w/scala/actors/remote/TcpService.class
@@ -2,7 +2,7 @@ InnerClasses:
 public final #= # of #; //Pair$=class scala/Predef$Pair$ of class scala/Predef
 
 Compiled from "TcpService.scala"
-public class scala.actors.remote.TcpService extends java.lang.Thread implements scala.actors.remote.Service,scala.ScalaObject{
+public class scala.actors.remote.TcpService extends java.lang.Thread implements scala.actors.remote.Service{
 private final int port;
   Signature: I
 
diff --git c/scala/actors/remote/Terminate$.class w/scala/actors/remote/Terminate$.class
index e07bce4f31..4922534531 100644
--- c/scala/actors/remote/Terminate$.class
+++ w/scala/actors/remote/Terminate$.class
@@ -1,6 +1,6 @@
 
 Compiled from "NetKernel.scala"
-public final class scala.actors.remote.Terminate$ extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.actors.remote.Terminate$ extends java.lang.Object implements scala.Product,scala.Serializable{
 public static final scala.actors.remote.Terminate$ MODULE$;
   Signature: Lscala/actors/remote/Terminate$;
 
diff --git c/scala/actors/remote/UnlinkFromFun.class w/scala/actors/remote/UnlinkFromFun.class
index dc68fcb73c..4ebfa20d12 100644
--- c/scala/actors/remote/UnlinkFromFun.class
+++ w/scala/actors/remote/UnlinkFromFun.class
@@ -1,6 +1,6 @@
 
 Compiled from "Proxy.scala"
-public final class scala.actors.remote.UnlinkFromFun extends java.lang.Object implements scala.Function2,scala.Serializable,scala.ScalaObject{
+public final class scala.actors.remote.UnlinkFromFun extends java.lang.Object implements scala.Function2,scala.Serializable{
 public boolean apply$mcZDD$sp(double, double);
   Signature: (DD)Z
   Code:
diff --git c/scala/actors/scheduler/ActorGC.class w/scala/actors/scheduler/ActorGC.class
index 164e6bc1d1..be7886927a 100644
--- c/scala/actors/scheduler/ActorGC.class
+++ w/scala/actors/scheduler/ActorGC.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "ActorGC.scala"
-public interface scala.actors.scheduler.ActorGC extends scala.actors.scheduler.TerminationMonitor,scala.ScalaObject{
+public interface scala.actors.scheduler.ActorGC extends scala.actors.scheduler.TerminationMonitor{
 public abstract void scala$actors$scheduler$ActorGC$_setter_$scala$actors$scheduler$ActorGC$$refQ_$eq(java.lang.ref.ReferenceQueue);
   Signature: (Ljava/lang/ref/ReferenceQueue;)V
 
diff --git c/scala/actors/scheduler/DaemonScheduler$.class w/scala/actors/scheduler/DaemonScheduler$.class
index 6102348b31..41ac879e4a 100644
--- c/scala/actors/scheduler/DaemonScheduler$.class
+++ w/scala/actors/scheduler/DaemonScheduler$.class
@@ -1,6 +1,6 @@
 
 Compiled from "DaemonScheduler.scala"
-public final class scala.actors.scheduler.DaemonScheduler$ extends java.lang.Object implements scala.actors.scheduler.DelegatingScheduler,scala.ScalaObject{
+public final class scala.actors.scheduler.DaemonScheduler$ extends java.lang.Object implements scala.actors.scheduler.DelegatingScheduler{
 public static final scala.actors.scheduler.DaemonScheduler$ MODULE$;
   Signature: Lscala/actors/scheduler/DaemonScheduler$;
 
diff --git c/scala/actors/scheduler/DelegatingScheduler.class w/scala/actors/scheduler/DelegatingScheduler.class
index 2cc4db7a1c..8ec395cd87 100644
--- c/scala/actors/scheduler/DelegatingScheduler.class
+++ w/scala/actors/scheduler/DelegatingScheduler.class
@@ -1,6 +1,6 @@
 
 Compiled from "DelegatingScheduler.scala"
-public interface scala.actors.scheduler.DelegatingScheduler extends scala.actors.IScheduler,scala.ScalaObject{
+public interface scala.actors.scheduler.DelegatingScheduler extends scala.actors.IScheduler{
 public abstract scala.actors.IScheduler makeNewScheduler();
   Signature: ()Lscala/actors/IScheduler;
 
diff --git c/scala/actors/scheduler/ExecutorScheduler.class w/scala/actors/scheduler/ExecutorScheduler.class
index 820df5b58f..1f563c0be9 100644
--- c/scala/actors/scheduler/ExecutorScheduler.class
+++ w/scala/actors/scheduler/ExecutorScheduler.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //RunCallable=class scala/actors/scheduler/ExecutorScheduler$RunCallable of class scala/actors/scheduler/ExecutorScheduler
 
 Compiled from "ExecutorScheduler.scala"
-public interface scala.actors.scheduler.ExecutorScheduler extends scala.actors.IScheduler,scala.actors.scheduler.TerminationService,scala.concurrent.ThreadPoolRunner,scala.ScalaObject{
+public interface scala.actors.scheduler.ExecutorScheduler extends scala.actors.IScheduler,scala.actors.scheduler.TerminationService,scala.concurrent.ThreadPoolRunner{
 public abstract void execute(java.lang.Runnable);
   Signature: (Ljava/lang/Runnable;)V
 
diff --git c/scala/actors/scheduler/ForkJoinScheduler.class w/scala/actors/scheduler/ForkJoinScheduler.class
index 1bf564650c..bebc83b003 100644
--- c/scala/actors/scheduler/ForkJoinScheduler.class
+++ w/scala/actors/scheduler/ForkJoinScheduler.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //ManagedBlocker=class scala/concurrent/forkjoin/ForkJoinPool$ManagedBlocker of class scala/concurrent/forkjoin/ForkJoinPool
 
 Compiled from "ForkJoinScheduler.scala"
-public class scala.actors.scheduler.ForkJoinScheduler extends java.lang.Object implements java.lang.Runnable,scala.actors.IScheduler,scala.actors.scheduler.TerminationMonitor,scala.ScalaObject{
+public class scala.actors.scheduler.ForkJoinScheduler extends java.lang.Object implements java.lang.Runnable,scala.actors.IScheduler,scala.actors.scheduler.TerminationMonitor{
 private final int initCoreSize;
   Signature: I
 
diff --git c/scala/actors/scheduler/QuitControl.class w/scala/actors/scheduler/QuitControl.class
index c03bf8798d..decbf0ea96 100644
--- c/scala/actors/scheduler/QuitControl.class
+++ w/scala/actors/scheduler/QuitControl.class
@@ -1,6 +1,6 @@
 
 Compiled from "QuitControl.scala"
-public class scala.actors.scheduler.QuitControl extends java.lang.Throwable implements scala.util.control.ControlThrowable,scala.ScalaObject{
+public class scala.actors.scheduler.QuitControl extends java.lang.Throwable implements scala.util.control.ControlThrowable{
 public java.lang.Throwable scala$util$control$NoStackTrace$$super$fillInStackTrace();
   Signature: ()Ljava/lang/Throwable;
   Code:
diff --git c/scala/actors/scheduler/ResizableThreadPoolScheduler.class w/scala/actors/scheduler/ResizableThreadPoolScheduler.class
index d03657823f..c0c0ff82da 100644
--- c/scala/actors/scheduler/ResizableThreadPoolScheduler.class
+++ w/scala/actors/scheduler/ResizableThreadPoolScheduler.class
@@ -5,7 +5,7 @@ public #= # of #; //CallerRunsPolicy=class scala/actors/threadpool/ThreadPoolExe
 public #= # of #; //DaemonThreadFactory=class scala/actors/scheduler/ResizableThreadPoolScheduler$DaemonThreadFactory of class scala/actors/scheduler/ResizableThreadPoolScheduler
 
 Compiled from "ResizableThreadPoolScheduler.scala"
-public class scala.actors.scheduler.ResizableThreadPoolScheduler extends java.lang.Thread implements scala.actors.IScheduler,scala.actors.scheduler.TerminationMonitor,scala.ScalaObject{
+public class scala.actors.scheduler.ResizableThreadPoolScheduler extends java.lang.Thread implements scala.actors.IScheduler,scala.actors.scheduler.TerminationMonitor{
 private final boolean terminate;
   Signature: Z
 
diff --git c/scala/actors/scheduler/SingleThreadedScheduler.class w/scala/actors/scheduler/SingleThreadedScheduler.class
index e73bf7a22e..d37df58e28 100644
--- c/scala/actors/scheduler/SingleThreadedScheduler.class
+++ w/scala/actors/scheduler/SingleThreadedScheduler.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "SingleThreadedScheduler.scala"
-public class scala.actors.scheduler.SingleThreadedScheduler extends java.lang.Object implements scala.actors.IScheduler,scala.ScalaObject{
+public class scala.actors.scheduler.SingleThreadedScheduler extends java.lang.Object implements scala.actors.IScheduler{
 private final scala.collection.mutable.Queue tasks;
   Signature: Lscala/collection/mutable/Queue;
 
diff --git c/scala/actors/scheduler/TerminationService.class w/scala/actors/scheduler/TerminationService.class
index 63f56dc106..7593da9608 100644
--- c/scala/actors/scheduler/TerminationService.class
+++ w/scala/actors/scheduler/TerminationService.class
@@ -1,6 +1,6 @@
 
 Compiled from "TerminationService.scala"
-public interface scala.actors.scheduler.TerminationService extends scala.actors.scheduler.TerminationMonitor,scala.ScalaObject{
+public interface scala.actors.scheduler.TerminationService extends scala.actors.scheduler.TerminationMonitor{
 public abstract void scala$actors$scheduler$TerminationService$_setter_$terminate_$eq(boolean);
   Signature: (Z)V
 
diff --git c/scala/collection/AbstractIterable.class w/scala/collection/AbstractIterable.class
index 0478c3656a..43fccb3934 100644
--- c/scala/collection/AbstractIterable.class
+++ w/scala/collection/AbstractIterable.class
@@ -1,6 +1,6 @@
 
 Compiled from "Iterable.scala"
-public abstract class scala.collection.AbstractIterable extends scala.collection.AbstractTraversable implements scala.collection.Iterable,scala.ScalaObject{
+public abstract class scala.collection.AbstractIterable extends scala.collection.AbstractTraversable implements scala.collection.Iterable{
 public scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
   Code:
diff --git c/scala/collection/AbstractIterator.class w/scala/collection/AbstractIterator.class
index 90daf8e5f2..ac00decd5e 100644
--- c/scala/collection/AbstractIterator.class
+++ w/scala/collection/AbstractIterator.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$les
 public #= # of #; //GroupedIterator=class scala/collection/Iterator$GroupedIterator of class scala/collection/Iterator
 
 Compiled from "Iterator.scala"
-public abstract class scala.collection.AbstractIterator extends java.lang.Object implements scala.collection.Iterator,scala.ScalaObject{
+public abstract class scala.collection.AbstractIterator extends java.lang.Object implements scala.collection.Iterator{
 public scala.collection.Iterator seq();
   Signature: ()Lscala/collection/Iterator;
   Code:
diff --git c/scala/collection/AbstractMap.class w/scala/collection/AbstractMap.class
index 34beb70ece..66911c6b37 100644
--- c/scala/collection/AbstractMap.class
+++ w/scala/collection/AbstractMap.class
@@ -1,6 +1,6 @@
 
 Compiled from "Map.scala"
-public abstract class scala.collection.AbstractMap extends scala.collection.AbstractIterable implements scala.collection.Map,scala.ScalaObject{
+public abstract class scala.collection.AbstractMap extends scala.collection.AbstractIterable implements scala.collection.Map{
 public scala.collection.Map empty();
   Signature: ()Lscala/collection/Map;
   Code:
diff --git c/scala/collection/AbstractSeq.class w/scala/collection/AbstractSeq.class
index cfd1a1bc1f..f9076a2eab 100644
--- c/scala/collection/AbstractSeq.class
+++ w/scala/collection/AbstractSeq.class
@@ -1,6 +1,6 @@
 
 Compiled from "Seq.scala"
-public abstract class scala.collection.AbstractSeq extends scala.collection.AbstractIterable implements scala.collection.Seq,scala.ScalaObject{
+public abstract class scala.collection.AbstractSeq extends scala.collection.AbstractIterable implements scala.collection.Seq{
 public scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
   Code:
diff --git c/scala/collection/AbstractSet.class w/scala/collection/AbstractSet.class
index 77151c9650..948f68e516 100644
--- c/scala/collection/AbstractSet.class
+++ w/scala/collection/AbstractSet.class
@@ -1,6 +1,6 @@
 
 Compiled from "Set.scala"
-public abstract class scala.collection.AbstractSet extends scala.collection.AbstractIterable implements scala.collection.Set,scala.ScalaObject{
+public abstract class scala.collection.AbstractSet extends scala.collection.AbstractIterable implements scala.collection.Set{
 public scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
   Code:
diff --git c/scala/collection/AbstractTraversable.class w/scala/collection/AbstractTraversable.class
index 916d7deb03..9b26c3d7ea 100644
--- c/scala/collection/AbstractTraversable.class
+++ w/scala/collection/AbstractTraversable.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "Traversable.scala"
-public abstract class scala.collection.AbstractTraversable extends java.lang.Object implements scala.collection.Traversable,scala.ScalaObject{
+public abstract class scala.collection.AbstractTraversable extends java.lang.Object implements scala.collection.Traversable{
 public scala.collection.Traversable scala$collection$Traversable$$super$flatten(scala.Function1);
   Signature: (Lscala/Function1;)Lscala/collection/Traversable;
   Code:
diff --git c/scala/collection/BitSet$.class w/scala/collection/BitSet$.class
index a2bf3d26fc..bbb25311c4 100644
--- c/scala/collection/BitSet$.class
+++ w/scala/collection/BitSet$.class
@@ -1,6 +1,6 @@
 
 Compiled from "BitSet.scala"
-public final class scala.collection.BitSet$ extends java.lang.Object implements scala.collection.generic.BitSetFactory,scala.ScalaObject{
+public final class scala.collection.BitSet$ extends java.lang.Object implements scala.collection.generic.BitSetFactory{
 public static final scala.collection.BitSet$ MODULE$;
   Signature: Lscala/collection/BitSet$;
 
diff --git c/scala/collection/BitSet.class w/scala/collection/BitSet.class
index d5307bc718..835962e71a 100644
--- c/scala/collection/BitSet.class
+++ w/scala/collection/BitSet.class
@@ -1,6 +1,6 @@
 
 Compiled from "BitSet.scala"
-public interface scala.collection.BitSet extends scala.collection.SortedSet,scala.collection.BitSetLike,scala.ScalaObject{
+public interface scala.collection.BitSet extends scala.collection.SortedSet,scala.collection.BitSetLike{
 public abstract scala.collection.BitSet empty();
   Signature: ()Lscala/collection/BitSet;
 
diff --git c/scala/collection/BitSetLike.class w/scala/collection/BitSetLike.class
index f516681d88..a67b639e07 100644
--- c/scala/collection/BitSetLike.class
+++ w/scala/collection/BitSetLike.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "BitSetLike.scala"
-public interface scala.collection.BitSetLike extends scala.collection.SortedSetLike,scala.ScalaObject{
+public interface scala.collection.BitSetLike extends scala.collection.SortedSetLike{
 public abstract scala.collection.BitSetLike empty();
   Signature: ()Lscala/collection/BitSetLike;
 
diff --git c/scala/collection/BufferedIterator.class w/scala/collection/BufferedIterator.class
index bdc3c23577..41808faf0d 100644
--- c/scala/collection/BufferedIterator.class
+++ w/scala/collection/BufferedIterator.class
@@ -1,6 +1,6 @@
 
 Compiled from "BufferedIterator.scala"
-public interface scala.collection.BufferedIterator extends scala.collection.Iterator,scala.ScalaObject{
+public interface scala.collection.BufferedIterator extends scala.collection.Iterator{
 public abstract java.lang.Object head();
   Signature: ()Ljava/lang/Object;
 
diff --git c/scala/collection/CustomParallelizable.class w/scala/collection/CustomParallelizable.class
index 8b54e595e8..a49a73fb25 100644
--- c/scala/collection/CustomParallelizable.class
+++ w/scala/collection/CustomParallelizable.class
@@ -1,6 +1,6 @@
 
 Compiled from "CustomParallelizable.scala"
-public interface scala.collection.CustomParallelizable extends scala.collection.Parallelizable,scala.ScalaObject{
+public interface scala.collection.CustomParallelizable extends scala.collection.Parallelizable{
 public abstract scala.collection.Parallel par();
   Signature: ()Lscala/collection/Parallel;
 
diff --git c/scala/collection/DefaultMap.class w/scala/collection/DefaultMap.class
index 8fce51536e..5fbfc4d5a2 100644
--- c/scala/collection/DefaultMap.class
+++ w/scala/collection/DefaultMap.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "DefaultMap.scala"
-public interface scala.collection.DefaultMap extends scala.collection.Map,scala.ScalaObject{
+public interface scala.collection.DefaultMap extends scala.collection.Map{
 public abstract scala.collection.Map $plus(scala.Tuple2);
   Signature: (Lscala/Tuple2;)Lscala/collection/Map;
 
diff --git c/scala/collection/GenIterable.class w/scala/collection/GenIterable.class
index 77d3dfeb1b..2604381473 100644
--- c/scala/collection/GenIterable.class
+++ w/scala/collection/GenIterable.class
@@ -1,6 +1,6 @@
 
 Compiled from "GenIterable.scala"
-public interface scala.collection.GenIterable extends scala.collection.GenIterableLike,scala.collection.GenTraversable,scala.collection.generic.GenericTraversableTemplate,scala.ScalaObject{
+public interface scala.collection.GenIterable extends scala.collection.GenIterableLike,scala.collection.GenTraversable{
 public abstract scala.collection.Iterable seq();
   Signature: ()Lscala/collection/Iterable;
 
diff --git c/scala/collection/GenIterableLike.class w/scala/collection/GenIterableLike.class
index 85025563e0..1c9ca6d339 100644
--- c/scala/collection/GenIterableLike.class
+++ w/scala/collection/GenIterableLike.class
@@ -1,6 +1,6 @@
 
 Compiled from "GenIterableLike.scala"
-public interface scala.collection.GenIterableLike extends scala.collection.GenTraversableLike,scala.ScalaObject{
+public interface scala.collection.GenIterableLike extends scala.collection.GenTraversableLike{
 public abstract scala.collection.Iterator iterator();
   Signature: ()Lscala/collection/Iterator;
 
diff --git c/scala/collection/GenIterableViewLike$Appended.class w/scala/collection/GenIterableViewLike$Appended.class
index 7c3a228f8d..581de52517 100644
--- c/scala/collection/GenIterableViewLike$Appended.class
+++ w/scala/collection/GenIterableViewLike$Appended.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Appended=class scala/collection/GenTraversableViewL
 public abstract #= # of #; //Transformed=class scala/collection/GenIterableViewLike$Transformed of class scala/collection/GenIterableViewLike
 
 Compiled from "GenIterableViewLike.scala"
-public interface scala.collection.GenIterableViewLike$Appended extends scala.collection.GenTraversableViewLike$Appended,scala.collection.GenIterableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenIterableViewLike$Appended extends scala.collection.GenTraversableViewLike$Appended,scala.collection.GenIterableViewLike$Transformed{
 public abstract scala.collection.Iterator iterator();
   Signature: ()Lscala/collection/Iterator;
 
diff --git c/scala/collection/GenIterableViewLike$DroppedWhile.class w/scala/collection/GenIterableViewLike$DroppedWhile.class
index 42396d2c3a..62481b3400 100644
--- c/scala/collection/GenIterableViewLike$DroppedWhile.class
+++ w/scala/collection/GenIterableViewLike$DroppedWhile.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //DroppedWhile=class scala/collection/GenIterableView
 public abstract #= # of #; //DroppedWhile=class scala/collection/GenTraversableViewLike$DroppedWhile of class scala/collection/GenTraversableViewLike
 
 Compiled from "GenIterableViewLike.scala"
-public interface scala.collection.GenIterableViewLike$DroppedWhile extends scala.collection.GenTraversableViewLike$DroppedWhile,scala.collection.GenIterableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenIterableViewLike$DroppedWhile extends scala.collection.GenTraversableViewLike$DroppedWhile,scala.collection.GenIterableViewLike$Transformed{
 public abstract scala.collection.Iterator iterator();
   Signature: ()Lscala/collection/Iterator;
 
diff --git c/scala/collection/GenIterableViewLike$EmptyView.class w/scala/collection/GenIterableViewLike$EmptyView.class
index 8703fd7375..1cfa438b2a 100644
--- c/scala/collection/GenIterableViewLike$EmptyView.class
+++ w/scala/collection/GenIterableViewLike$EmptyView.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Transformed=class scala/collection/GenIterableViewL
 public abstract #= # of #; //EmptyView=class scala/collection/GenTraversableViewLike$EmptyView of class scala/collection/GenTraversableViewLike
 
 Compiled from "GenIterableViewLike.scala"
-public interface scala.collection.GenIterableViewLike$EmptyView extends scala.collection.GenIterableViewLike$Transformed,scala.collection.GenTraversableViewLike$EmptyView,scala.ScalaObject{
+public interface scala.collection.GenIterableViewLike$EmptyView extends scala.collection.GenIterableViewLike$Transformed,scala.collection.GenTraversableViewLike$EmptyView{
 public abstract scala.collection.Iterator iterator();
   Signature: ()Lscala/collection/Iterator;
 
diff --git c/scala/collection/GenIterableViewLike$Filtered.class w/scala/collection/GenIterableViewLike$Filtered.class
index cead4c3047..7d7be899f9 100644
--- c/scala/collection/GenIterableViewLike$Filtered.class
+++ w/scala/collection/GenIterableViewLike$Filtered.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Filtered=class scala/collection/GenTraversableViewL
 public abstract #= # of #; //Transformed=class scala/collection/GenIterableViewLike$Transformed of class scala/collection/GenIterableViewLike
 
 Compiled from "GenIterableViewLike.scala"
-public interface scala.collection.GenIterableViewLike$Filtered extends scala.collection.GenTraversableViewLike$Filtered,scala.collection.GenIterableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenIterableViewLike$Filtered extends scala.collection.GenTraversableViewLike$Filtered,scala.collection.GenIterableViewLike$Transformed{
 public abstract scala.collection.Iterator iterator();
   Signature: ()Lscala/collection/Iterator;
 
diff --git c/scala/collection/GenIterableViewLike$FlatMapped.class w/scala/collection/GenIterableViewLike$FlatMapped.class
index 7263dddcf7..ea7bf2fdc3 100644
--- c/scala/collection/GenIterableViewLike$FlatMapped.class
+++ w/scala/collection/GenIterableViewLike$FlatMapped.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Transformed=class scala/collection/GenIterableViewL
 public abstract #= # of #; //FlatMapped=class scala/collection/GenTraversableViewLike$FlatMapped of class scala/collection/GenTraversableViewLike
 
 Compiled from "GenIterableViewLike.scala"
-public interface scala.collection.GenIterableViewLike$FlatMapped extends scala.collection.GenTraversableViewLike$FlatMapped,scala.collection.GenIterableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenIterableViewLike$FlatMapped extends scala.collection.GenTraversableViewLike$FlatMapped,scala.collection.GenIterableViewLike$Transformed{
 public abstract scala.collection.Iterator iterator();
   Signature: ()Lscala/collection/Iterator;
 
diff --git c/scala/collection/GenIterableViewLike$Forced.class w/scala/collection/GenIterableViewLike$Forced.class
index 4c80e91e49..d22c135d82 100644
--- c/scala/collection/GenIterableViewLike$Forced.class
+++ w/scala/collection/GenIterableViewLike$Forced.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Forced=class scala/collection/GenTraversableViewLik
 public abstract #= # of #; //Transformed=class scala/collection/GenIterableViewLike$Transformed of class scala/collection/GenIterableViewLike
 
 Compiled from "GenIterableViewLike.scala"
-public interface scala.collection.GenIterableViewLike$Forced extends scala.collection.GenTraversableViewLike$Forced,scala.collection.GenIterableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenIterableViewLike$Forced extends scala.collection.GenTraversableViewLike$Forced,scala.collection.GenIterableViewLike$Transformed{
 public abstract scala.collection.Iterator iterator();
   Signature: ()Lscala/collection/Iterator;
 
diff --git c/scala/collection/GenIterableViewLike$Mapped.class w/scala/collection/GenIterableViewLike$Mapped.class
index f77b65c61c..de86d72ee3 100644
--- c/scala/collection/GenIterableViewLike$Mapped.class
+++ w/scala/collection/GenIterableViewLike$Mapped.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Mapped=class scala/collection/GenTraversableViewLik
 public abstract #= # of #; //Transformed=class scala/collection/GenIterableViewLike$Transformed of class scala/collection/GenIterableViewLike
 
 Compiled from "GenIterableViewLike.scala"
-public interface scala.collection.GenIterableViewLike$Mapped extends scala.collection.GenTraversableViewLike$Mapped,scala.collection.GenIterableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenIterableViewLike$Mapped extends scala.collection.GenTraversableViewLike$Mapped,scala.collection.GenIterableViewLike$Transformed{
 public abstract scala.collection.Iterator iterator();
   Signature: ()Lscala/collection/Iterator;
 
diff --git c/scala/collection/GenIterableViewLike$Sliced.class w/scala/collection/GenIterableViewLike$Sliced.class
index 86c1d18449..eb8b7620e3 100644
--- c/scala/collection/GenIterableViewLike$Sliced.class
+++ w/scala/collection/GenIterableViewLike$Sliced.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Sliced=class scala/collection/GenTraversableViewLik
 public abstract #= # of #; //Transformed=class scala/collection/GenIterableViewLike$Transformed of class scala/collection/GenIterableViewLike
 
 Compiled from "GenIterableViewLike.scala"
-public interface scala.collection.GenIterableViewLike$Sliced extends scala.collection.GenTraversableViewLike$Sliced,scala.collection.GenIterableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenIterableViewLike$Sliced extends scala.collection.GenTraversableViewLike$Sliced,scala.collection.GenIterableViewLike$Transformed{
 public abstract scala.collection.Iterator iterator();
   Signature: ()Lscala/collection/Iterator;
 
diff --git c/scala/collection/GenIterableViewLike$TakenWhile.class w/scala/collection/GenIterableViewLike$TakenWhile.class
index 109ef8b433..bd9adfb109 100644
--- c/scala/collection/GenIterableViewLike$TakenWhile.class
+++ w/scala/collection/GenIterableViewLike$TakenWhile.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Transformed=class scala/collection/GenIterableViewL
 public abstract #= # of #; //TakenWhile=class scala/collection/GenTraversableViewLike$TakenWhile of class scala/collection/GenTraversableViewLike
 
 Compiled from "GenIterableViewLike.scala"
-public interface scala.collection.GenIterableViewLike$TakenWhile extends scala.collection.GenTraversableViewLike$TakenWhile,scala.collection.GenIterableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenIterableViewLike$TakenWhile extends scala.collection.GenTraversableViewLike$TakenWhile,scala.collection.GenIterableViewLike$Transformed{
 public abstract scala.collection.Iterator iterator();
   Signature: ()Lscala/collection/Iterator;
 
diff --git c/scala/collection/GenIterableViewLike$Transformed.class w/scala/collection/GenIterableViewLike$Transformed.class
index 6dc34279bc..8603219ab6 100644
--- c/scala/collection/GenIterableViewLike$Transformed.class
+++ w/scala/collection/GenIterableViewLike$Transformed.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Transformed=class scala/collection/GenIterableViewL
 public abstract #= # of #; //Transformed=class scala/collection/GenTraversableViewLike$Transformed of class scala/collection/GenTraversableViewLike
 
 Compiled from "GenIterableViewLike.scala"
-public interface scala.collection.GenIterableViewLike$Transformed extends scala.collection.GenIterableView,scala.collection.GenTraversableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenIterableViewLike$Transformed extends scala.collection.GenIterableView,scala.collection.GenTraversableViewLike$Transformed{
 public abstract scala.collection.Iterator iterator();
   Signature: ()Lscala/collection/Iterator;
 
diff --git c/scala/collection/GenIterableViewLike$Zipped.class w/scala/collection/GenIterableViewLike$Zipped.class
index 5868c03819..7a1ece9e04 100644
--- c/scala/collection/GenIterableViewLike$Zipped.class
+++ w/scala/collection/GenIterableViewLike$Zipped.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Zipped=class scala/collection/GenIterableViewLike$Z
 public abstract #= # of #; //Transformed=class scala/collection/GenIterableViewLike$Transformed of class scala/collection/GenIterableViewLike
 
 Compiled from "GenIterableViewLike.scala"
-public interface scala.collection.GenIterableViewLike$Zipped extends scala.collection.GenIterableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenIterableViewLike$Zipped extends scala.collection.GenIterableViewLike$Transformed{
 public abstract scala.collection.GenIterable other();
   Signature: ()Lscala/collection/GenIterable;
 
diff --git c/scala/collection/GenIterableViewLike$ZippedAll.class w/scala/collection/GenIterableViewLike$ZippedAll.class
index 65efa2ae14..0c9ef8dc99 100644
--- c/scala/collection/GenIterableViewLike$ZippedAll.class
+++ w/scala/collection/GenIterableViewLike$ZippedAll.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //ZippedAll=class scala/collection/GenIterableViewLik
 public abstract #= # of #; //Transformed=class scala/collection/GenIterableViewLike$Transformed of class scala/collection/GenIterableViewLike
 
 Compiled from "GenIterableViewLike.scala"
-public interface scala.collection.GenIterableViewLike$ZippedAll extends scala.collection.GenIterableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenIterableViewLike$ZippedAll extends scala.collection.GenIterableViewLike$Transformed{
 public abstract scala.collection.GenIterable other();
   Signature: ()Lscala/collection/GenIterable;
 
diff --git c/scala/collection/GenIterableViewLike.class w/scala/collection/GenIterableViewLike.class
index 2bd7da95f4..a2e2410856 100644
--- c/scala/collection/GenIterableViewLike.class
+++ w/scala/collection/GenIterableViewLike.class
@@ -25,6 +25,6 @@ public abstract #= # of #; //Transformed$class=class scala/collection/GenIterabl
 public abstract #= # of #; //DroppedWhile$class=class scala/collection/GenIterableViewLike$DroppedWhile$class of class scala/collection/GenIterableViewLike
 
 Compiled from "GenIterableViewLike.scala"
-public interface scala.collection.GenIterableViewLike extends scala.collection.GenIterable,scala.collection.GenIterableLike,scala.collection.GenTraversableView,scala.collection.GenTraversableViewLike,scala.ScalaObject{
+public interface scala.collection.GenIterableViewLike extends scala.collection.GenIterable,scala.collection.GenTraversableView{
 }
 
diff --git c/scala/collection/GenMapLike.class w/scala/collection/GenMapLike.class
index 2a92d97acb..9392648eb5 100644
--- c/scala/collection/GenMapLike.class
+++ w/scala/collection/GenMapLike.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "GenMapLike.scala"
-public interface scala.collection.GenMapLike extends scala.collection.GenIterableLike,scala.Equals,scala.collection.Parallelizable,scala.ScalaObject{
+public interface scala.collection.GenMapLike extends scala.collection.GenIterableLike,scala.Equals{
 public abstract java.lang.Object default(java.lang.Object);
   Signature: (Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git c/scala/collection/GenSeq.class w/scala/collection/GenSeq.class
index 751a09fecc..06dbed7ef6 100644
--- c/scala/collection/GenSeq.class
+++ w/scala/collection/GenSeq.class
@@ -1,6 +1,6 @@
 
 Compiled from "GenSeq.scala"
-public interface scala.collection.GenSeq extends scala.collection.GenSeqLike,scala.collection.GenIterable,scala.Equals,scala.collection.generic.GenericTraversableTemplate,scala.ScalaObject{
+public interface scala.collection.GenSeq extends scala.collection.GenSeqLike,scala.collection.GenIterable{
 public abstract scala.collection.Seq seq();
   Signature: ()Lscala/collection/Seq;
 
diff --git c/scala/collection/GenSeqLike.class w/scala/collection/GenSeqLike.class
index 87c0711af4..bb29cd6c9e 100644
--- c/scala/collection/GenSeqLike.class
+++ w/scala/collection/GenSeqLike.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "GenSeqLike.scala"
-public interface scala.collection.GenSeqLike extends scala.collection.GenIterableLike,scala.Equals,scala.collection.Parallelizable,scala.ScalaObject{
+public interface scala.collection.GenSeqLike extends scala.collection.GenIterableLike,scala.Equals{
 public abstract scala.collection.Seq seq();
   Signature: ()Lscala/collection/Seq;
 
diff --git c/scala/collection/GenSeqViewLike$Appended.class w/scala/collection/GenSeqViewLike$Appended.class
index b730a4504c..b7c48838e9 100644
--- c/scala/collection/GenSeqViewLike$Appended.class
+++ w/scala/collection/GenSeqViewLike$Appended.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Transformed=class scala/collection/GenSeqViewLike$T
 public abstract #= # of #; //Appended=class scala/collection/GenIterableViewLike$Appended of class scala/collection/GenIterableViewLike
 
 Compiled from "GenSeqViewLike.scala"
-public interface scala.collection.GenSeqViewLike$Appended extends scala.collection.GenIterableViewLike$Appended,scala.collection.GenSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenSeqViewLike$Appended extends scala.collection.GenIterableViewLike$Appended,scala.collection.GenSeqViewLike$Transformed{
 public abstract scala.collection.GenSeq restSeq();
   Signature: ()Lscala/collection/GenSeq;
 
diff --git c/scala/collection/GenSeqViewLike$DroppedWhile.class w/scala/collection/GenSeqViewLike$DroppedWhile.class
index a9f5a2c764..d61648ef03 100644
--- c/scala/collection/GenSeqViewLike$DroppedWhile.class
+++ w/scala/collection/GenSeqViewLike$DroppedWhile.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //DroppedWhile=class scala/collection/GenSeqViewLike$
 public abstract #= # of #; //DroppedWhile=class scala/collection/GenIterableViewLike$DroppedWhile of class scala/collection/GenIterableViewLike
 
 Compiled from "GenSeqViewLike.scala"
-public interface scala.collection.GenSeqViewLike$DroppedWhile extends scala.collection.GenIterableViewLike$DroppedWhile,scala.collection.GenSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenSeqViewLike$DroppedWhile extends scala.collection.GenIterableViewLike$DroppedWhile,scala.collection.GenSeqViewLike$Transformed{
 public abstract int start();
   Signature: ()I
 
diff --git c/scala/collection/GenSeqViewLike$EmptyView.class w/scala/collection/GenSeqViewLike$EmptyView.class
index 839e5dbfb9..bdbd5410a1 100644
--- c/scala/collection/GenSeqViewLike$EmptyView.class
+++ w/scala/collection/GenSeqViewLike$EmptyView.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Transformed=class scala/collection/GenSeqViewLike$T
 public abstract #= # of #; //EmptyView=class scala/collection/GenIterableViewLike$EmptyView of class scala/collection/GenIterableViewLike
 
 Compiled from "GenSeqViewLike.scala"
-public interface scala.collection.GenSeqViewLike$EmptyView extends scala.collection.GenSeqViewLike$Transformed,scala.collection.GenIterableViewLike$EmptyView,scala.ScalaObject{
+public interface scala.collection.GenSeqViewLike$EmptyView extends scala.collection.GenSeqViewLike$Transformed,scala.collection.GenIterableViewLike$EmptyView{
 public abstract int length();
   Signature: ()I
 
diff --git c/scala/collection/GenSeqViewLike$Filtered.class w/scala/collection/GenSeqViewLike$Filtered.class
index 583c7d8e24..0169c4ea7d 100644
--- c/scala/collection/GenSeqViewLike$Filtered.class
+++ w/scala/collection/GenSeqViewLike$Filtered.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Transformed=class scala/collection/GenSeqViewLike$T
 public abstract #= # of #; //Filtered=class scala/collection/GenIterableViewLike$Filtered of class scala/collection/GenIterableViewLike
 
 Compiled from "GenSeqViewLike.scala"
-public interface scala.collection.GenSeqViewLike$Filtered extends scala.collection.GenIterableViewLike$Filtered,scala.collection.GenSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenSeqViewLike$Filtered extends scala.collection.GenIterableViewLike$Filtered,scala.collection.GenSeqViewLike$Transformed{
 public abstract int[] index();
   Signature: ()[I
 
diff --git c/scala/collection/GenSeqViewLike$FlatMapped.class w/scala/collection/GenSeqViewLike$FlatMapped.class
index 4d661430d1..31370deae5 100644
--- c/scala/collection/GenSeqViewLike$FlatMapped.class
+++ w/scala/collection/GenSeqViewLike$FlatMapped.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Transformed=class scala/collection/GenSeqViewLike$T
 public abstract #= # of #; //FlatMapped=class scala/collection/GenIterableViewLike$FlatMapped of class scala/collection/GenIterableViewLike
 
 Compiled from "GenSeqViewLike.scala"
-public interface scala.collection.GenSeqViewLike$FlatMapped extends scala.collection.GenIterableViewLike$FlatMapped,scala.collection.GenSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenSeqViewLike$FlatMapped extends scala.collection.GenIterableViewLike$FlatMapped,scala.collection.GenSeqViewLike$Transformed{
 public abstract int[] index();
   Signature: ()[I
 
diff --git c/scala/collection/GenSeqViewLike$Forced.class w/scala/collection/GenSeqViewLike$Forced.class
index ea89b8121d..686cab683f 100644
--- c/scala/collection/GenSeqViewLike$Forced.class
+++ w/scala/collection/GenSeqViewLike$Forced.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Forced=class scala/collection/GenIterableViewLike$F
 public abstract #= # of #; //Transformed=class scala/collection/GenSeqViewLike$Transformed of class scala/collection/GenSeqViewLike
 
 Compiled from "GenSeqViewLike.scala"
-public interface scala.collection.GenSeqViewLike$Forced extends scala.collection.GenIterableViewLike$Forced,scala.collection.GenSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenSeqViewLike$Forced extends scala.collection.GenIterableViewLike$Forced,scala.collection.GenSeqViewLike$Transformed{
 public abstract int length();
   Signature: ()I
 
diff --git c/scala/collection/GenSeqViewLike$Mapped.class w/scala/collection/GenSeqViewLike$Mapped.class
index e1726e7615..be064aa7c7 100644
--- c/scala/collection/GenSeqViewLike$Mapped.class
+++ w/scala/collection/GenSeqViewLike$Mapped.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Mapped=class scala/collection/GenIterableViewLike$M
 public abstract #= # of #; //Transformed=class scala/collection/GenSeqViewLike$Transformed of class scala/collection/GenSeqViewLike
 
 Compiled from "GenSeqViewLike.scala"
-public interface scala.collection.GenSeqViewLike$Mapped extends scala.collection.GenIterableViewLike$Mapped,scala.collection.GenSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenSeqViewLike$Mapped extends scala.collection.GenIterableViewLike$Mapped,scala.collection.GenSeqViewLike$Transformed{
 public abstract int length();
   Signature: ()I
 
diff --git c/scala/collection/GenSeqViewLike$Patched.class w/scala/collection/GenSeqViewLike$Patched.class
index efbe17aca7..0fdef9e88d 100644
--- c/scala/collection/GenSeqViewLike$Patched.class
+++ w/scala/collection/GenSeqViewLike$Patched.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Patched=class scala/collection/GenSeqViewLike$Patch
 public abstract #= # of #; //Transformed=class scala/collection/GenSeqViewLike$Transformed of class scala/collection/GenSeqViewLike
 
 Compiled from "GenSeqViewLike.scala"
-public interface scala.collection.GenSeqViewLike$Patched extends scala.collection.GenSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenSeqViewLike$Patched extends scala.collection.GenSeqViewLike$Transformed{
 public abstract int from();
   Signature: ()I
 
diff --git c/scala/collection/GenSeqViewLike$Prepended.class w/scala/collection/GenSeqViewLike$Prepended.class
index 7bb2fe10b4..a72894a5db 100644
--- c/scala/collection/GenSeqViewLike$Prepended.class
+++ w/scala/collection/GenSeqViewLike$Prepended.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Prepended=class scala/collection/GenSeqViewLike$Pre
 public abstract #= # of #; //Transformed=class scala/collection/GenSeqViewLike$Transformed of class scala/collection/GenSeqViewLike
 
 Compiled from "GenSeqViewLike.scala"
-public interface scala.collection.GenSeqViewLike$Prepended extends scala.collection.GenSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenSeqViewLike$Prepended extends scala.collection.GenSeqViewLike$Transformed{
 public abstract java.lang.Object fst();
   Signature: ()Ljava/lang/Object;
 
diff --git c/scala/collection/GenSeqViewLike$Reversed.class w/scala/collection/GenSeqViewLike$Reversed.class
index 3295548a49..0cd97235ab 100644
--- c/scala/collection/GenSeqViewLike$Reversed.class
+++ w/scala/collection/GenSeqViewLike$Reversed.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Reversed=class scala/collection/GenSeqViewLike$Reve
 public abstract #= # of #; //Transformed=class scala/collection/GenSeqViewLike$Transformed of class scala/collection/GenSeqViewLike
 
 Compiled from "GenSeqViewLike.scala"
-public interface scala.collection.GenSeqViewLike$Reversed extends scala.collection.GenSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenSeqViewLike$Reversed extends scala.collection.GenSeqViewLike$Transformed{
 public abstract scala.collection.Iterator iterator();
   Signature: ()Lscala/collection/Iterator;
 
diff --git c/scala/collection/GenSeqViewLike$Sliced.class w/scala/collection/GenSeqViewLike$Sliced.class
index 7f29352a65..98713c8ae7 100644
--- c/scala/collection/GenSeqViewLike$Sliced.class
+++ w/scala/collection/GenSeqViewLike$Sliced.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Sliced=class scala/collection/GenIterableViewLike$S
 public abstract #= # of #; //Transformed=class scala/collection/GenSeqViewLike$Transformed of class scala/collection/GenSeqViewLike
 
 Compiled from "GenSeqViewLike.scala"
-public interface scala.collection.GenSeqViewLike$Sliced extends scala.collection.GenIterableViewLike$Sliced,scala.collection.GenSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenSeqViewLike$Sliced extends scala.collection.GenIterableViewLike$Sliced,scala.collection.GenSeqViewLike$Transformed{
 public abstract int length();
   Signature: ()I
 
diff --git c/scala/collection/GenSeqViewLike$TakenWhile.class w/scala/collection/GenSeqViewLike$TakenWhile.class
index 16456099f4..17557fa4a4 100644
--- c/scala/collection/GenSeqViewLike$TakenWhile.class
+++ w/scala/collection/GenSeqViewLike$TakenWhile.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Transformed=class scala/collection/GenSeqViewLike$T
 public abstract #= # of #; //TakenWhile=class scala/collection/GenIterableViewLike$TakenWhile of class scala/collection/GenIterableViewLike
 
 Compiled from "GenSeqViewLike.scala"
-public interface scala.collection.GenSeqViewLike$TakenWhile extends scala.collection.GenIterableViewLike$TakenWhile,scala.collection.GenSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenSeqViewLike$TakenWhile extends scala.collection.GenIterableViewLike$TakenWhile,scala.collection.GenSeqViewLike$Transformed{
 public abstract int len();
   Signature: ()I
 
diff --git c/scala/collection/GenSeqViewLike$Transformed.class w/scala/collection/GenSeqViewLike$Transformed.class
index f51faf1724..090431c39c 100644
--- c/scala/collection/GenSeqViewLike$Transformed.class
+++ w/scala/collection/GenSeqViewLike$Transformed.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Transformed=class scala/collection/GenSeqViewLike$T
 public abstract #= # of #; //Transformed=class scala/collection/GenIterableViewLike$Transformed of class scala/collection/GenIterableViewLike
 
 Compiled from "GenSeqViewLike.scala"
-public interface scala.collection.GenSeqViewLike$Transformed extends scala.collection.GenSeqView,scala.collection.GenIterableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenSeqViewLike$Transformed extends scala.collection.GenSeqView,scala.collection.GenIterableViewLike$Transformed{
 public abstract int length();
   Signature: ()I
 
diff --git c/scala/collection/GenSeqViewLike$Zipped.class w/scala/collection/GenSeqViewLike$Zipped.class
index aa57ab0ac5..56511136f9 100644
--- c/scala/collection/GenSeqViewLike$Zipped.class
+++ w/scala/collection/GenSeqViewLike$Zipped.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Zipped=class scala/collection/GenIterableViewLike$Z
 public abstract #= # of #; //Transformed=class scala/collection/GenSeqViewLike$Transformed of class scala/collection/GenSeqViewLike
 
 Compiled from "GenSeqViewLike.scala"
-public interface scala.collection.GenSeqViewLike$Zipped extends scala.collection.GenIterableViewLike$Zipped,scala.collection.GenSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenSeqViewLike$Zipped extends scala.collection.GenIterableViewLike$Zipped,scala.collection.GenSeqViewLike$Transformed{
 public abstract scala.collection.Seq thatSeq();
   Signature: ()Lscala/collection/Seq;
 
diff --git c/scala/collection/GenSeqViewLike$ZippedAll.class w/scala/collection/GenSeqViewLike$ZippedAll.class
index 4f35f53101..fe523a6782 100644
--- c/scala/collection/GenSeqViewLike$ZippedAll.class
+++ w/scala/collection/GenSeqViewLike$ZippedAll.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Transformed=class scala/collection/GenSeqViewLike$T
 public abstract #= # of #; //ZippedAll=class scala/collection/GenIterableViewLike$ZippedAll of class scala/collection/GenIterableViewLike
 
 Compiled from "GenSeqViewLike.scala"
-public interface scala.collection.GenSeqViewLike$ZippedAll extends scala.collection.GenIterableViewLike$ZippedAll,scala.collection.GenSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenSeqViewLike$ZippedAll extends scala.collection.GenIterableViewLike$ZippedAll,scala.collection.GenSeqViewLike$Transformed{
 public abstract scala.collection.Seq thatSeq();
   Signature: ()Lscala/collection/Seq;
 
diff --git c/scala/collection/GenSeqViewLike.class w/scala/collection/GenSeqViewLike.class
index 0caec7c618..c3d29f8d0e 100644
--- c/scala/collection/GenSeqViewLike.class
+++ w/scala/collection/GenSeqViewLike.class
@@ -31,6 +31,6 @@ public abstract #= # of #; //Transformed$class=class scala/collection/GenSeqView
 public abstract #= # of #; //DroppedWhile$class=class scala/collection/GenSeqViewLike$DroppedWhile$class of class scala/collection/GenSeqViewLike
 
 Compiled from "GenSeqViewLike.scala"
-public interface scala.collection.GenSeqViewLike extends scala.collection.GenSeq,scala.collection.GenSeqLike,scala.collection.GenIterableView,scala.collection.GenIterableViewLike,scala.ScalaObject{
+public interface scala.collection.GenSeqViewLike extends scala.collection.GenSeq,scala.collection.GenIterableView{
 }
 
diff --git c/scala/collection/GenSet.class w/scala/collection/GenSet.class
index ce2af36434..84874119e1 100644
--- c/scala/collection/GenSet.class
+++ w/scala/collection/GenSet.class
@@ -1,6 +1,6 @@
 
 Compiled from "GenSet.scala"
-public interface scala.collection.GenSet extends scala.collection.GenSetLike,scala.collection.GenIterable,scala.collection.generic.GenericSetTemplate,scala.ScalaObject{
+public interface scala.collection.GenSet extends scala.collection.GenSetLike,scala.collection.GenIterable,scala.collection.generic.GenericSetTemplate{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/GenSetLike.class w/scala/collection/GenSetLike.class
index 066dafcbce..0f1601b7fc 100644
--- c/scala/collection/GenSetLike.class
+++ w/scala/collection/GenSetLike.class
@@ -1,6 +1,6 @@
 
 Compiled from "GenSetLike.scala"
-public interface scala.collection.GenSetLike extends scala.collection.GenIterableLike,scala.Function1,scala.Equals,scala.collection.Parallelizable,scala.ScalaObject{
+public interface scala.collection.GenSetLike extends scala.collection.GenIterableLike,scala.Function1,scala.Equals{
 public abstract scala.collection.Iterator iterator();
   Signature: ()Lscala/collection/Iterator;
 
diff --git c/scala/collection/GenTraversable.class w/scala/collection/GenTraversable.class
index e9a9791f1b..a790ff0dda 100644
--- c/scala/collection/GenTraversable.class
+++ w/scala/collection/GenTraversable.class
@@ -1,6 +1,6 @@
 
 Compiled from "GenTraversable.scala"
-public interface scala.collection.GenTraversable extends scala.collection.GenTraversableLike,scala.collection.GenTraversableOnce,scala.collection.generic.GenericTraversableTemplate,scala.ScalaObject{
+public interface scala.collection.GenTraversable extends scala.collection.GenTraversableLike,scala.collection.generic.GenericTraversableTemplate{
 public abstract scala.collection.Traversable seq();
   Signature: ()Lscala/collection/Traversable;
 
diff --git c/scala/collection/GenTraversableLike.class w/scala/collection/GenTraversableLike.class
index 2083cabaa2..934cb41545 100644
--- c/scala/collection/GenTraversableLike.class
+++ w/scala/collection/GenTraversableLike.class
@@ -1,6 +1,6 @@
 
 Compiled from "GenTraversableLike.scala"
-public interface scala.collection.GenTraversableLike extends scala.collection.GenTraversableOnce,scala.collection.Parallelizable,scala.ScalaObject{
+public interface scala.collection.GenTraversableLike extends scala.collection.GenTraversableOnce,scala.collection.Parallelizable{
 public abstract java.lang.Object repr();
   Signature: ()Ljava/lang/Object;
 
diff --git c/scala/collection/GenTraversableViewLike$Appended.class w/scala/collection/GenTraversableViewLike$Appended.class
index 3a1b25401e..d49dc6af09 100644
--- c/scala/collection/GenTraversableViewLike$Appended.class
+++ w/scala/collection/GenTraversableViewLike$Appended.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Appended=class scala/collection/GenTraversableViewL
 public abstract #= # of #; //Transformed=class scala/collection/GenTraversableViewLike$Transformed of class scala/collection/GenTraversableViewLike
 
 Compiled from "GenTraversableViewLike.scala"
-public interface scala.collection.GenTraversableViewLike$Appended extends scala.collection.GenTraversableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenTraversableViewLike$Appended extends scala.collection.GenTraversableViewLike$Transformed{
 public abstract scala.collection.GenTraversable rest();
   Signature: ()Lscala/collection/GenTraversable;
 
diff --git c/scala/collection/GenTraversableViewLike$DroppedWhile.class w/scala/collection/GenTraversableViewLike$DroppedWhile.class
index 1eb4bf934f..fb03c7bc7c 100644
--- c/scala/collection/GenTraversableViewLike$DroppedWhile.class
+++ w/scala/collection/GenTraversableViewLike$DroppedWhile.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Transformed=class scala/collection/GenTraversableVi
 public abstract #= # of #; //DroppedWhile=class scala/collection/GenTraversableViewLike$DroppedWhile of class scala/collection/GenTraversableViewLike
 
 Compiled from "GenTraversableViewLike.scala"
-public interface scala.collection.GenTraversableViewLike$DroppedWhile extends scala.collection.GenTraversableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenTraversableViewLike$DroppedWhile extends scala.collection.GenTraversableViewLike$Transformed{
 public abstract scala.Function1 pred();
   Signature: ()Lscala/Function1;
 
diff --git c/scala/collection/GenTraversableViewLike$EmptyView.class w/scala/collection/GenTraversableViewLike$EmptyView.class
index b07c5caede..08b07b0296 100644
--- c/scala/collection/GenTraversableViewLike$EmptyView.class
+++ w/scala/collection/GenTraversableViewLike$EmptyView.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //EmptyView=class scala/collection/GenTraversableView
 public abstract #= # of #; //Transformed=class scala/collection/GenTraversableViewLike$Transformed of class scala/collection/GenTraversableViewLike
 
 Compiled from "GenTraversableViewLike.scala"
-public interface scala.collection.GenTraversableViewLike$EmptyView extends scala.collection.GenTraversableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenTraversableViewLike$EmptyView extends scala.collection.GenTraversableViewLike$Transformed{
 public abstract boolean isEmpty();
   Signature: ()Z
 
diff --git c/scala/collection/GenTraversableViewLike$Filtered.class w/scala/collection/GenTraversableViewLike$Filtered.class
index df3ac54ba1..ef75ab00d5 100644
--- c/scala/collection/GenTraversableViewLike$Filtered.class
+++ w/scala/collection/GenTraversableViewLike$Filtered.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Filtered=class scala/collection/GenTraversableViewL
 public abstract #= # of #; //Transformed=class scala/collection/GenTraversableViewLike$Transformed of class scala/collection/GenTraversableViewLike
 
 Compiled from "GenTraversableViewLike.scala"
-public interface scala.collection.GenTraversableViewLike$Filtered extends scala.collection.GenTraversableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenTraversableViewLike$Filtered extends scala.collection.GenTraversableViewLike$Transformed{
 public abstract scala.Function1 pred();
   Signature: ()Lscala/Function1;
 
diff --git c/scala/collection/GenTraversableViewLike$FlatMapped.class w/scala/collection/GenTraversableViewLike$FlatMapped.class
index 15de625420..66d53dcb18 100644
--- c/scala/collection/GenTraversableViewLike$FlatMapped.class
+++ w/scala/collection/GenTraversableViewLike$FlatMapped.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //FlatMapped=class scala/collection/GenTraversableVie
 public abstract #= # of #; //Transformed=class scala/collection/GenTraversableViewLike$Transformed of class scala/collection/GenTraversableViewLike
 
 Compiled from "GenTraversableViewLike.scala"
-public interface scala.collection.GenTraversableViewLike$FlatMapped extends scala.collection.GenTraversableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenTraversableViewLike$FlatMapped extends scala.collection.GenTraversableViewLike$Transformed{
 public abstract scala.Function1 mapping();
   Signature: ()Lscala/Function1;
 
diff --git c/scala/collection/GenTraversableViewLike$Forced.class w/scala/collection/GenTraversableViewLike$Forced.class
index 911cc8dd8c..f8959f0ddf 100644
--- c/scala/collection/GenTraversableViewLike$Forced.class
+++ w/scala/collection/GenTraversableViewLike$Forced.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Forced=class scala/collection/GenTraversableViewLik
 public abstract #= # of #; //Transformed=class scala/collection/GenTraversableViewLike$Transformed of class scala/collection/GenTraversableViewLike
 
 Compiled from "GenTraversableViewLike.scala"
-public interface scala.collection.GenTraversableViewLike$Forced extends scala.collection.GenTraversableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenTraversableViewLike$Forced extends scala.collection.GenTraversableViewLike$Transformed{
 public abstract scala.collection.GenSeq forced();
   Signature: ()Lscala/collection/GenSeq;
 
diff --git c/scala/collection/GenTraversableViewLike$Mapped.class w/scala/collection/GenTraversableViewLike$Mapped.class
index 2eb65921f4..b0eab5bab1 100644
--- c/scala/collection/GenTraversableViewLike$Mapped.class
+++ w/scala/collection/GenTraversableViewLike$Mapped.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Mapped=class scala/collection/GenTraversableViewLik
 public abstract #= # of #; //Transformed=class scala/collection/GenTraversableViewLike$Transformed of class scala/collection/GenTraversableViewLike
 
 Compiled from "GenTraversableViewLike.scala"
-public interface scala.collection.GenTraversableViewLike$Mapped extends scala.collection.GenTraversableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenTraversableViewLike$Mapped extends scala.collection.GenTraversableViewLike$Transformed{
 public abstract scala.Function1 mapping();
   Signature: ()Lscala/Function1;
 
diff --git c/scala/collection/GenTraversableViewLike$Sliced.class w/scala/collection/GenTraversableViewLike$Sliced.class
index 73c71b1eee..0ac53cc060 100644
--- c/scala/collection/GenTraversableViewLike$Sliced.class
+++ w/scala/collection/GenTraversableViewLike$Sliced.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Sliced=class scala/collection/GenTraversableViewLik
 public abstract #= # of #; //Transformed=class scala/collection/GenTraversableViewLike$Transformed of class scala/collection/GenTraversableViewLike
 
 Compiled from "GenTraversableViewLike.scala"
-public interface scala.collection.GenTraversableViewLike$Sliced extends scala.collection.GenTraversableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenTraversableViewLike$Sliced extends scala.collection.GenTraversableViewLike$Transformed{
 public abstract scala.collection.generic.SliceInterval endpoints();
   Signature: ()Lscala/collection/generic/SliceInterval;
 
diff --git c/scala/collection/GenTraversableViewLike$TakenWhile.class w/scala/collection/GenTraversableViewLike$TakenWhile.class
index 5a781fcbdd..215942ef9c 100644
--- c/scala/collection/GenTraversableViewLike$TakenWhile.class
+++ w/scala/collection/GenTraversableViewLike$TakenWhile.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //TakenWhile=class scala/collection/GenTraversableVie
 public abstract #= # of #; //Transformed=class scala/collection/GenTraversableViewLike$Transformed of class scala/collection/GenTraversableViewLike
 
 Compiled from "GenTraversableViewLike.scala"
-public interface scala.collection.GenTraversableViewLike$TakenWhile extends scala.collection.GenTraversableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.GenTraversableViewLike$TakenWhile extends scala.collection.GenTraversableViewLike$Transformed{
 public abstract scala.Function1 pred();
   Signature: ()Lscala/Function1;
 
diff --git c/scala/collection/GenTraversableViewLike$Transformed.class w/scala/collection/GenTraversableViewLike$Transformed.class
index dadcc4676b..a30b6ba665 100644
--- c/scala/collection/GenTraversableViewLike$Transformed.class
+++ w/scala/collection/GenTraversableViewLike$Transformed.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //Transformed=class scala/collection/GenTraversableViewLike$Transformed of class scala/collection/GenTraversableViewLike
 
 Compiled from "GenTraversableViewLike.scala"
-public interface scala.collection.GenTraversableViewLike$Transformed extends scala.collection.GenTraversableView,scala.ScalaObject{
+public interface scala.collection.GenTraversableViewLike$Transformed extends scala.collection.GenTraversableView{
 public abstract void foreach(scala.Function1);
   Signature: (Lscala/Function1;)V
 
diff --git c/scala/collection/GenTraversableViewLike.class w/scala/collection/GenTraversableViewLike.class
index 38ef156fcd..b7b0685adf 100644
--- c/scala/collection/GenTraversableViewLike.class
+++ w/scala/collection/GenTraversableViewLike.class
@@ -21,7 +21,7 @@ public abstract #= # of #; //Transformed$class=class scala/collection/GenTravers
 public abstract #= # of #; //DroppedWhile$class=class scala/collection/GenTraversableViewLike$DroppedWhile$class of class scala/collection/GenTraversableViewLike
 
 Compiled from "GenTraversableViewLike.scala"
-public interface scala.collection.GenTraversableViewLike extends scala.collection.GenTraversable,scala.collection.GenTraversableLike,scala.ScalaObject{
+public interface scala.collection.GenTraversableViewLike extends scala.collection.GenTraversable{
 public abstract java.lang.Object force(scala.collection.generic.CanBuildFrom);
   Signature: (Lscala/collection/generic/CanBuildFrom;)Ljava/lang/Object;
 
diff --git c/scala/collection/IndexedSeq.class w/scala/collection/IndexedSeq.class
index aab3a8d541..592e230acf 100644
--- c/scala/collection/IndexedSeq.class
+++ w/scala/collection/IndexedSeq.class
@@ -1,6 +1,6 @@
 
 Compiled from "IndexedSeq.scala"
-public interface scala.collection.IndexedSeq extends scala.collection.Seq,scala.collection.generic.GenericTraversableTemplate,scala.collection.IndexedSeqLike,scala.ScalaObject{
+public interface scala.collection.IndexedSeq extends scala.collection.Seq,scala.collection.IndexedSeqLike{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/IndexedSeqLike$Elements.class w/scala/collection/IndexedSeqLike$Elements.class
index 9ce1f2ccb5..d923630abb 100644
--- c/scala/collection/IndexedSeqLike$Elements.class
+++ w/scala/collection/IndexedSeqLike$Elements.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //Elements=class scala/collection/IndexedSeqLike$Elements of class scala/collection/IndexedSeqLike
 
 Compiled from "IndexedSeqLike.scala"
-public class scala.collection.IndexedSeqLike$Elements extends scala.collection.AbstractIterator implements scala.collection.BufferedIterator,scala.Serializable,scala.ScalaObject{
+public class scala.collection.IndexedSeqLike$Elements extends scala.collection.AbstractIterator implements scala.collection.BufferedIterator,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/IndexedSeqLike.class w/scala/collection/IndexedSeqLike.class
index b7c31b3f57..76ceae990e 100644
--- c/scala/collection/IndexedSeqLike.class
+++ w/scala/collection/IndexedSeqLike.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //Elements=class scala/collection/IndexedSeqLike$Elements of class scala/collection/IndexedSeqLike
 
 Compiled from "IndexedSeqLike.scala"
-public interface scala.collection.IndexedSeqLike extends scala.collection.SeqLike,scala.ScalaObject{
+public interface scala.collection.IndexedSeqLike extends scala.collection.SeqLike{
 public abstract scala.collection.IndexedSeq seq();
   Signature: ()Lscala/collection/IndexedSeq;
 
diff --git c/scala/collection/IndexedSeqOptimized.class w/scala/collection/IndexedSeqOptimized.class
index a3a481102c..77c281db75 100644
--- c/scala/collection/IndexedSeqOptimized.class
+++ w/scala/collection/IndexedSeqOptimized.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "IndexedSeqOptimized.scala"
-public interface scala.collection.IndexedSeqOptimized extends scala.collection.IndexedSeqLike,scala.ScalaObject{
+public interface scala.collection.IndexedSeqOptimized extends scala.collection.IndexedSeqLike{
 public abstract java.lang.Object scala$collection$IndexedSeqOptimized$$super$reduceLeft(scala.Function2);
   Signature: (Lscala/Function2;)Ljava/lang/Object;
 
diff --git c/scala/collection/Iterable$.class w/scala/collection/Iterable$.class
index 02e6c1f4ab..03b66a4750 100644
--- c/scala/collection/Iterable$.class
+++ w/scala/collection/Iterable$.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //GenericCanBuildFrom=class scala/collection/generic/GenTraversableFactory$GenericCanBuildFrom of class scala/collection/generic/GenTraversableFactory
 
 Compiled from "Iterable.scala"
-public final class scala.collection.Iterable$ extends scala.collection.generic.GenTraversableFactory implements scala.collection.generic.TraversableFactory,scala.ScalaObject{
+public final class scala.collection.Iterable$ extends scala.collection.generic.GenTraversableFactory implements scala.collection.generic.TraversableFactory{
 public static final scala.collection.Iterable$ MODULE$;
   Signature: Lscala/collection/Iterable$;
 
diff --git c/scala/collection/Iterable.class w/scala/collection/Iterable.class
index 18a0e711c8..bfe7570079 100644
--- c/scala/collection/Iterable.class
+++ w/scala/collection/Iterable.class
@@ -1,6 +1,6 @@
 
 Compiled from "Iterable.scala"
-public interface scala.collection.Iterable extends scala.collection.Traversable,scala.collection.GenIterable,scala.collection.generic.GenericTraversableTemplate,scala.collection.IterableLike,scala.ScalaObject{
+public interface scala.collection.Iterable extends scala.collection.Traversable,scala.collection.GenIterable,scala.collection.IterableLike{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/IterableLike.class w/scala/collection/IterableLike.class
index 1651be1f01..189661b844 100644
--- c/scala/collection/IterableLike.class
+++ w/scala/collection/IterableLike.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "IterableLike.scala"
-public interface scala.collection.IterableLike extends scala.Equals,scala.collection.TraversableLike,scala.collection.GenIterableLike,scala.ScalaObject{
+public interface scala.collection.IterableLike extends scala.Equals,scala.collection.TraversableLike,scala.collection.GenIterableLike{
 public abstract scala.collection.Iterable thisCollection();
   Signature: ()Lscala/collection/Iterable;
 
diff --git c/scala/collection/IterableProxyLike.class w/scala/collection/IterableProxyLike.class
index 46926aa22d..316a1cc3a6 100644
--- c/scala/collection/IterableProxyLike.class
+++ w/scala/collection/IterableProxyLike.class
@@ -1,6 +1,6 @@
 
 Compiled from "IterableProxyLike.scala"
-public interface scala.collection.IterableProxyLike extends scala.collection.IterableLike,scala.collection.TraversableProxyLike,scala.ScalaObject{
+public interface scala.collection.IterableProxyLike extends scala.collection.IterableLike,scala.collection.TraversableProxyLike{
 public abstract scala.collection.Iterator iterator();
   Signature: ()Lscala/collection/Iterator;
 
diff --git c/scala/collection/IterableViewLike$AbstractTransformed.class w/scala/collection/IterableViewLike$AbstractTransformed.class
index 6ab35b5d98..ef1585b7e6 100644
--- c/scala/collection/IterableViewLike$AbstractTransformed.class
+++ w/scala/collection/IterableViewLike$AbstractTransformed.class
@@ -11,7 +11,7 @@ public abstract #= # of #; //Transformed$class=class scala/collection/GenIterabl
 public abstract #= # of #; //Transformed$class=class scala/collection/GenTraversableViewLike$Transformed$class of class scala/collection/GenTraversableViewLike
 
 Compiled from "IterableViewLike.scala"
-public abstract class scala.collection.IterableViewLike$AbstractTransformed extends java.lang.Object implements scala.collection.TraversableViewLike$Transformed,scala.collection.IterableViewLike$Transformed,scala.ScalaObject{
+public abstract class scala.collection.IterableViewLike$AbstractTransformed extends java.lang.Object implements scala.collection.IterableViewLike$Transformed{
 public final scala.collection.IterableViewLike $outer;
   Signature: Lscala/collection/IterableViewLike;
 
diff --git c/scala/collection/IterableViewLike$Transformed.class w/scala/collection/IterableViewLike$Transformed.class
index a259ce97d5..620f5c6537 100644
--- c/scala/collection/IterableViewLike$Transformed.class
+++ w/scala/collection/IterableViewLike$Transformed.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Transformed=class scala/collection/TraversableViewL
 public abstract #= # of #; //Transformed=class scala/collection/GenIterableViewLike$Transformed of class scala/collection/GenIterableViewLike
 
 Compiled from "IterableViewLike.scala"
-public interface scala.collection.IterableViewLike$Transformed extends scala.collection.IterableView,scala.collection.TraversableViewLike$Transformed,scala.collection.GenIterableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.IterableViewLike$Transformed extends scala.collection.IterableView,scala.collection.TraversableViewLike$Transformed,scala.collection.GenIterableViewLike$Transformed{
 public abstract scala.collection.Iterator iterator();
   Signature: ()Lscala/collection/Iterator;
 
diff --git c/scala/collection/IterableViewLike.class w/scala/collection/IterableViewLike.class
index 62734388b3..f524be607c 100644
--- c/scala/collection/IterableViewLike.class
+++ w/scala/collection/IterableViewLike.class
@@ -15,7 +15,7 @@ public abstract #= # of #; //Transformed$class=class scala/collection/IterableVi
 public abstract #= # of #; //AbstractTransformed=class scala/collection/IterableViewLike$AbstractTransformed of class scala/collection/IterableViewLike
 
 Compiled from "IterableViewLike.scala"
-public interface scala.collection.IterableViewLike extends scala.collection.Iterable,scala.collection.IterableLike,scala.collection.TraversableView,scala.collection.TraversableViewLike,scala.collection.GenIterableViewLike,scala.ScalaObject{
+public interface scala.collection.IterableViewLike extends scala.collection.Iterable,scala.collection.TraversableView,scala.collection.GenIterableViewLike{
 public abstract scala.collection.IterableViewLike$Transformed newZipped(scala.collection.GenIterable);
   Signature: (Lscala/collection/GenIterable;)Lscala/collection/IterableViewLike$Transformed;
 
diff --git c/scala/collection/Iterator$GroupedIterator.class w/scala/collection/Iterator$GroupedIterator.class
index 843788dbde..aa83367111 100644
--- c/scala/collection/Iterator$GroupedIterator.class
+++ w/scala/collection/Iterator$GroupedIterator.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //GroupedIterator=class scala/collection/Iterator$GroupedIterator of class scala/collection/Iterator
 
 Compiled from "Iterator.scala"
-public class scala.collection.Iterator$GroupedIterator extends scala.collection.AbstractIterator implements scala.collection.Iterator,scala.ScalaObject{
+public class scala.collection.Iterator$GroupedIterator extends scala.collection.AbstractIterator implements scala.collection.Iterator{
 private final scala.collection.Iterator self;
   Signature: Lscala/collection/Iterator;
 
diff --git c/scala/collection/Iterator.class w/scala/collection/Iterator.class
index 6c89e33057..b3f56f4e4d 100644
--- c/scala/collection/Iterator.class
+++ w/scala/collection/Iterator.class
@@ -5,7 +5,7 @@ public #= # of #; //GroupedIterator=class scala/collection/Iterator$GroupedItera
 public #= #; //PartitionIterator$=class scala/collection/Iterator$PartitionIterator$
 
 Compiled from "Iterator.scala"
-public interface scala.collection.Iterator extends scala.collection.TraversableOnce,scala.ScalaObject{
+public interface scala.collection.Iterator extends scala.collection.TraversableOnce{
 public abstract scala.collection.Iterator seq();
   Signature: ()Lscala/collection/Iterator;
 
diff --git c/scala/collection/JavaConversions$DictionaryWrapper.class w/scala/collection/JavaConversions$DictionaryWrapper.class
index c32730b62d..32082d86e9 100644
--- c/scala/collection/JavaConversions$DictionaryWrapper.class
+++ w/scala/collection/JavaConversions$DictionaryWrapper.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //DictionaryWrapper=class scala/collection/JavaConversions$DictionaryWrapper of class scala/collection/JavaConversions
 
 Compiled from "JavaConversions.scala"
-public class scala.collection.JavaConversions$DictionaryWrapper extends java.util.Dictionary implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.JavaConversions$DictionaryWrapper extends java.util.Dictionary implements scala.Product,scala.Serializable{
 private final scala.collection.mutable.Map underlying;
   Signature: Lscala/collection/mutable/Map;
 
diff --git c/scala/collection/JavaConversions$IterableWrapper.class w/scala/collection/JavaConversions$IterableWrapper.class
index 34e3d75686..c95d435b86 100644
--- c/scala/collection/JavaConversions$IterableWrapper.class
+++ w/scala/collection/JavaConversions$IterableWrapper.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //IterableWrapperTrait=class scala/collection/JavaCon
 public abstract #= # of #; //IterableWrapperTrait$class=class scala/collection/JavaConversions$IterableWrapperTrait$class of class scala/collection/JavaConversions
 
 Compiled from "JavaConversions.scala"
-public class scala.collection.JavaConversions$IterableWrapper extends java.util.AbstractCollection implements scala.collection.JavaConversions$IterableWrapperTrait,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.JavaConversions$IterableWrapper extends java.util.AbstractCollection implements scala.collection.JavaConversions$IterableWrapperTrait,scala.Product,scala.Serializable{
 private final scala.collection.Iterable underlying;
   Signature: Lscala/collection/Iterable;
 
diff --git c/scala/collection/JavaConversions$IteratorWrapper.class w/scala/collection/JavaConversions$IteratorWrapper.class
index c065b4a1bd..f92a28fb3d 100644
--- c/scala/collection/JavaConversions$IteratorWrapper.class
+++ w/scala/collection/JavaConversions$IteratorWrapper.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //IteratorWrapper=class scala/collection/JavaConversions$IteratorWrapper of class scala/collection/JavaConversions
 
 Compiled from "JavaConversions.scala"
-public class scala.collection.JavaConversions$IteratorWrapper extends java.lang.Object implements java.util.Iterator,java.util.Enumeration,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.JavaConversions$IteratorWrapper extends java.lang.Object implements java.util.Iterator,java.util.Enumeration,scala.Product,scala.Serializable{
 private final scala.collection.Iterator underlying;
   Signature: Lscala/collection/Iterator;
 
diff --git c/scala/collection/JavaConversions$JCollectionWrapper.class w/scala/collection/JavaConversions$JCollectionWrapper.class
index 81e0fb250f..e5f3756b5a 100644
--- c/scala/collection/JavaConversions$JCollectionWrapper.class
+++ w/scala/collection/JavaConversions$JCollectionWrapper.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //JCollectionWrapper=class scala/collection/JavaConversions$JCollectionWrapper of class scala/collection/JavaConversions
 
 Compiled from "JavaConversions.scala"
-public class scala.collection.JavaConversions$JCollectionWrapper extends scala.collection.AbstractIterable implements scala.collection.Iterable,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.JavaConversions$JCollectionWrapper extends scala.collection.AbstractIterable implements scala.collection.Iterable,scala.Product,scala.Serializable{
 private final java.util.Collection underlying;
   Signature: Ljava/util/Collection;
 
diff --git c/scala/collection/JavaConversions$JConcurrentMapWrapper.class w/scala/collection/JavaConversions$JConcurrentMapWrapper.class
index 01d5517d69..48b91b8efd 100644
--- c/scala/collection/JavaConversions$JConcurrentMapWrapper.class
+++ w/scala/collection/JavaConversions$JConcurrentMapWrapper.class
@@ -4,7 +4,7 @@ public #= # of #; //JConcurrentMapWrapper=class scala/collection/JavaConversions
 public abstract #= # of #; //JMapWrapperLike$class=class scala/collection/JavaConversions$JMapWrapperLike$class of class scala/collection/JavaConversions
 
 Compiled from "JavaConversions.scala"
-public class scala.collection.JavaConversions$JConcurrentMapWrapper extends scala.collection.mutable.AbstractMap implements scala.collection.JavaConversions$JMapWrapperLike,scala.collection.mutable.ConcurrentMap,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.JavaConversions$JConcurrentMapWrapper extends scala.collection.mutable.AbstractMap implements scala.collection.JavaConversions$JMapWrapperLike,scala.collection.mutable.ConcurrentMap,scala.Product,scala.Serializable{
 private final java.util.concurrent.ConcurrentMap underlying;
   Signature: Ljava/util/concurrent/ConcurrentMap;
 
diff --git c/scala/collection/JavaConversions$JDictionaryWrapper.class w/scala/collection/JavaConversions$JDictionaryWrapper.class
index b8e4b889d9..db2b17eb2e 100644
--- c/scala/collection/JavaConversions$JDictionaryWrapper.class
+++ w/scala/collection/JavaConversions$JDictionaryWrapper.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //JDictionaryWrapper=class scala/collection/JavaConversions$JDictionaryWrapper of class scala/collection/JavaConversions
 
 Compiled from "JavaConversions.scala"
-public class scala.collection.JavaConversions$JDictionaryWrapper extends scala.collection.mutable.AbstractMap implements scala.collection.mutable.Map,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.JavaConversions$JDictionaryWrapper extends scala.collection.mutable.AbstractMap implements scala.collection.mutable.Map,scala.Product,scala.Serializable{
 private final java.util.Dictionary underlying;
   Signature: Ljava/util/Dictionary;
 
diff --git c/scala/collection/JavaConversions$JEnumerationWrapper.class w/scala/collection/JavaConversions$JEnumerationWrapper.class
index 52fe66faee..d88780c220 100644
--- c/scala/collection/JavaConversions$JEnumerationWrapper.class
+++ w/scala/collection/JavaConversions$JEnumerationWrapper.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //JEnumerationWrapper=class scala/collection/JavaConversions$JEnumerationWrapper of class scala/collection/JavaConversions
 
 Compiled from "JavaConversions.scala"
-public class scala.collection.JavaConversions$JEnumerationWrapper extends scala.collection.AbstractIterator implements scala.collection.Iterator,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.JavaConversions$JEnumerationWrapper extends scala.collection.AbstractIterator implements scala.collection.Iterator,scala.Product,scala.Serializable{
 private final java.util.Enumeration underlying;
   Signature: Ljava/util/Enumeration;
 
diff --git c/scala/collection/JavaConversions$JIterableWrapper.class w/scala/collection/JavaConversions$JIterableWrapper.class
index d0f9827e6e..84631d045e 100644
--- c/scala/collection/JavaConversions$JIterableWrapper.class
+++ w/scala/collection/JavaConversions$JIterableWrapper.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //JIterableWrapper=class scala/collection/JavaConversions$JIterableWrapper of class scala/collection/JavaConversions
 
 Compiled from "JavaConversions.scala"
-public class scala.collection.JavaConversions$JIterableWrapper extends scala.collection.AbstractIterable implements scala.collection.Iterable,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.JavaConversions$JIterableWrapper extends scala.collection.AbstractIterable implements scala.collection.Iterable,scala.Product,scala.Serializable{
 private final java.lang.Iterable underlying;
   Signature: Ljava/lang/Iterable;
 
diff --git c/scala/collection/JavaConversions$JIteratorWrapper.class w/scala/collection/JavaConversions$JIteratorWrapper.class
index 719f8521e2..b2418de29f 100644
--- c/scala/collection/JavaConversions$JIteratorWrapper.class
+++ w/scala/collection/JavaConversions$JIteratorWrapper.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //JIteratorWrapper=class scala/collection/JavaConversions$JIteratorWrapper of class scala/collection/JavaConversions
 
 Compiled from "JavaConversions.scala"
-public class scala.collection.JavaConversions$JIteratorWrapper extends scala.collection.AbstractIterator implements scala.collection.Iterator,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.JavaConversions$JIteratorWrapper extends scala.collection.AbstractIterator implements scala.collection.Iterator,scala.Product,scala.Serializable{
 private final java.util.Iterator underlying;
   Signature: Ljava/util/Iterator;
 
diff --git c/scala/collection/JavaConversions$JListWrapper.class w/scala/collection/JavaConversions$JListWrapper.class
index 7d7fe90d99..ee39cb1cd7 100644
--- c/scala/collection/JavaConversions$JListWrapper.class
+++ w/scala/collection/JavaConversions$JListWrapper.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //JListWrapper=class scala/collection/JavaConversions$JListWrapper of class scala/collection/JavaConversions
 
 Compiled from "JavaConversions.scala"
-public class scala.collection.JavaConversions$JListWrapper extends scala.collection.mutable.AbstractBuffer implements scala.collection.mutable.Buffer,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.JavaConversions$JListWrapper extends scala.collection.mutable.AbstractBuffer implements scala.collection.mutable.Buffer,scala.Product,scala.Serializable{
 private final java.util.List underlying;
   Signature: Ljava/util/List;
 
diff --git c/scala/collection/JavaConversions$JMapWrapper.class w/scala/collection/JavaConversions$JMapWrapper.class
index 93ea760934..9a983b0a34 100644
--- c/scala/collection/JavaConversions$JMapWrapper.class
+++ w/scala/collection/JavaConversions$JMapWrapper.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //JMapWrapperLike=class scala/collection/JavaConversi
 public abstract #= # of #; //JMapWrapperLike$class=class scala/collection/JavaConversions$JMapWrapperLike$class of class scala/collection/JavaConversions
 
 Compiled from "JavaConversions.scala"
-public class scala.collection.JavaConversions$JMapWrapper extends scala.collection.mutable.AbstractMap implements scala.collection.JavaConversions$JMapWrapperLike,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.JavaConversions$JMapWrapper extends scala.collection.mutable.AbstractMap implements scala.collection.JavaConversions$JMapWrapperLike,scala.Product,scala.Serializable{
 private final java.util.Map underlying;
   Signature: Ljava/util/Map;
 
diff --git c/scala/collection/JavaConversions$JMapWrapperLike.class w/scala/collection/JavaConversions$JMapWrapperLike.class
index f44296cb18..d448e96891 100644
--- c/scala/collection/JavaConversions$JMapWrapperLike.class
+++ w/scala/collection/JavaConversions$JMapWrapperLike.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //JMapWrapperLike=class scala/collection/JavaConversions$JMapWrapperLike of class scala/collection/JavaConversions
 
 Compiled from "JavaConversions.scala"
-public interface scala.collection.JavaConversions$JMapWrapperLike extends scala.collection.mutable.Map,scala.collection.mutable.MapLike,scala.ScalaObject{
+public interface scala.collection.JavaConversions$JMapWrapperLike extends scala.collection.mutable.Map{
 public abstract java.util.Map underlying();
   Signature: ()Ljava/util/Map;
 
diff --git c/scala/collection/JavaConversions$JPropertiesWrapper.class w/scala/collection/JavaConversions$JPropertiesWrapper.class
index d4436d50ae..0cd511f776 100644
--- c/scala/collection/JavaConversions$JPropertiesWrapper.class
+++ w/scala/collection/JavaConversions$JPropertiesWrapper.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //JPropertiesWrapper=class scala/collection/JavaConversions$JPropertiesWrapper of class scala/collection/JavaConversions
 
 Compiled from "JavaConversions.scala"
-public class scala.collection.JavaConversions$JPropertiesWrapper extends scala.collection.mutable.AbstractMap implements scala.collection.mutable.Map,scala.collection.mutable.MapLike,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.JavaConversions$JPropertiesWrapper extends scala.collection.mutable.AbstractMap implements scala.collection.mutable.Map,scala.Product,scala.Serializable{
 private final java.util.Properties underlying;
   Signature: Ljava/util/Properties;
 
diff --git c/scala/collection/JavaConversions$JSetWrapper.class w/scala/collection/JavaConversions$JSetWrapper.class
index b933fdddc8..6680c8a19d 100644
--- c/scala/collection/JavaConversions$JSetWrapper.class
+++ w/scala/collection/JavaConversions$JSetWrapper.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //JSetWrapper=class scala/collection/JavaConversions$JSetWrapper of class scala/collection/JavaConversions
 
 Compiled from "JavaConversions.scala"
-public class scala.collection.JavaConversions$JSetWrapper extends scala.collection.mutable.AbstractSet implements scala.collection.mutable.Set,scala.collection.mutable.SetLike,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.JavaConversions$JSetWrapper extends scala.collection.mutable.AbstractSet implements scala.collection.mutable.Set,scala.Product,scala.Serializable{
 private final java.util.Set underlying;
   Signature: Ljava/util/Set;
 
diff --git c/scala/collection/JavaConversions$MutableBufferWrapper.class w/scala/collection/JavaConversions$MutableBufferWrapper.class
index 72b8a03845..ecfae8780a 100644
--- c/scala/collection/JavaConversions$MutableBufferWrapper.class
+++ w/scala/collection/JavaConversions$MutableBufferWrapper.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //IterableWrapperTrait=class scala/collection/JavaCon
 public abstract #= # of #; //IterableWrapperTrait$class=class scala/collection/JavaConversions$IterableWrapperTrait$class of class scala/collection/JavaConversions
 
 Compiled from "JavaConversions.scala"
-public class scala.collection.JavaConversions$MutableBufferWrapper extends java.util.AbstractList implements scala.collection.JavaConversions$IterableWrapperTrait,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.JavaConversions$MutableBufferWrapper extends java.util.AbstractList implements scala.collection.JavaConversions$IterableWrapperTrait,scala.Product,scala.Serializable{
 private final scala.collection.mutable.Buffer underlying;
   Signature: Lscala/collection/mutable/Buffer;
 
diff --git c/scala/collection/JavaConversions$MutableMapWrapper.class w/scala/collection/JavaConversions$MutableMapWrapper.class
index 4bd156b960..cd09a988c7 100644
--- c/scala/collection/JavaConversions$MutableMapWrapper.class
+++ w/scala/collection/JavaConversions$MutableMapWrapper.class
@@ -3,7 +3,7 @@ public #= # of #; //MapWrapper=class scala/collection/JavaConversions$MapWrapper
 public #= # of #; //MutableMapWrapper=class scala/collection/JavaConversions$MutableMapWrapper of class scala/collection/JavaConversions
 
 Compiled from "JavaConversions.scala"
-public class scala.collection.JavaConversions$MutableMapWrapper extends scala.collection.JavaConversions$MapWrapper implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.JavaConversions$MutableMapWrapper extends scala.collection.JavaConversions$MapWrapper implements scala.Product,scala.Serializable{
 private final scala.collection.mutable.Map underlying;
   Signature: Lscala/collection/mutable/Map;
 
diff --git c/scala/collection/JavaConversions$MutableSeqWrapper.class w/scala/collection/JavaConversions$MutableSeqWrapper.class
index b0a9f8103d..40a6d91578 100644
--- c/scala/collection/JavaConversions$MutableSeqWrapper.class
+++ w/scala/collection/JavaConversions$MutableSeqWrapper.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //IterableWrapperTrait=class scala/collection/JavaCon
 public abstract #= # of #; //IterableWrapperTrait$class=class scala/collection/JavaConversions$IterableWrapperTrait$class of class scala/collection/JavaConversions
 
 Compiled from "JavaConversions.scala"
-public class scala.collection.JavaConversions$MutableSeqWrapper extends java.util.AbstractList implements scala.collection.JavaConversions$IterableWrapperTrait,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.JavaConversions$MutableSeqWrapper extends java.util.AbstractList implements scala.collection.JavaConversions$IterableWrapperTrait,scala.Product,scala.Serializable{
 private final scala.collection.mutable.Seq underlying;
   Signature: Lscala/collection/mutable/Seq;
 
diff --git c/scala/collection/JavaConversions$MutableSetWrapper.class w/scala/collection/JavaConversions$MutableSetWrapper.class
index 8f217b8cef..987c3ac0f6 100644
--- c/scala/collection/JavaConversions$MutableSetWrapper.class
+++ w/scala/collection/JavaConversions$MutableSetWrapper.class
@@ -3,7 +3,7 @@ public #= # of #; //SetWrapper=class scala/collection/JavaConversions$SetWrapper
 public #= # of #; //MutableSetWrapper=class scala/collection/JavaConversions$MutableSetWrapper of class scala/collection/JavaConversions
 
 Compiled from "JavaConversions.scala"
-public class scala.collection.JavaConversions$MutableSetWrapper extends scala.collection.JavaConversions$SetWrapper implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.JavaConversions$MutableSetWrapper extends scala.collection.JavaConversions$SetWrapper implements scala.Product,scala.Serializable{
 private final scala.collection.mutable.Set underlying;
   Signature: Lscala/collection/mutable/Set;
 
diff --git c/scala/collection/JavaConversions$SeqWrapper.class w/scala/collection/JavaConversions$SeqWrapper.class
index e590e1e2ea..138fc0f1ae 100644
--- c/scala/collection/JavaConversions$SeqWrapper.class
+++ w/scala/collection/JavaConversions$SeqWrapper.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //IterableWrapperTrait=class scala/collection/JavaCon
 public abstract #= # of #; //IterableWrapperTrait$class=class scala/collection/JavaConversions$IterableWrapperTrait$class of class scala/collection/JavaConversions
 
 Compiled from "JavaConversions.scala"
-public class scala.collection.JavaConversions$SeqWrapper extends java.util.AbstractList implements scala.collection.JavaConversions$IterableWrapperTrait,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.JavaConversions$SeqWrapper extends java.util.AbstractList implements scala.collection.JavaConversions$IterableWrapperTrait,scala.Product,scala.Serializable{
 private final scala.collection.Seq underlying;
   Signature: Lscala/collection/Seq;
 
diff --git c/scala/collection/LinearSeq.class w/scala/collection/LinearSeq.class
index c71b7b2060..9e5fa75ded 100644
--- c/scala/collection/LinearSeq.class
+++ w/scala/collection/LinearSeq.class
@@ -1,6 +1,6 @@
 
 Compiled from "LinearSeq.scala"
-public interface scala.collection.LinearSeq extends scala.collection.Seq,scala.collection.generic.GenericTraversableTemplate,scala.collection.LinearSeqLike,scala.ScalaObject{
+public interface scala.collection.LinearSeq extends scala.collection.Seq,scala.collection.LinearSeqLike{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/LinearSeqLike.class w/scala/collection/LinearSeqLike.class
index cd86be51a7..78909013cc 100644
--- c/scala/collection/LinearSeqLike.class
+++ w/scala/collection/LinearSeqLike.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "LinearSeqLike.scala"
-public interface scala.collection.LinearSeqLike extends scala.collection.SeqLike,scala.ScalaObject{
+public interface scala.collection.LinearSeqLike extends scala.collection.SeqLike{
 public abstract scala.collection.LinearSeq thisCollection();
   Signature: ()Lscala/collection/LinearSeq;
 
diff --git c/scala/collection/LinearSeqOptimized.class w/scala/collection/LinearSeqOptimized.class
index 69b011d92c..14336d8f8c 100644
--- c/scala/collection/LinearSeqOptimized.class
+++ w/scala/collection/LinearSeqOptimized.class
@@ -1,6 +1,6 @@
 
 Compiled from "LinearSeqOptimized.scala"
-public interface scala.collection.LinearSeqOptimized extends scala.collection.LinearSeqLike,scala.ScalaObject{
+public interface scala.collection.LinearSeqOptimized extends scala.collection.LinearSeqLike{
 public abstract boolean scala$collection$LinearSeqOptimized$$super$sameElements(scala.collection.GenIterable);
   Signature: (Lscala/collection/GenIterable;)Z
 
diff --git c/scala/collection/Map$WithDefault.class w/scala/collection/Map$WithDefault.class
index 6439e2f348..ebc660e9ed 100644
--- c/scala/collection/Map$WithDefault.class
+++ w/scala/collection/Map$WithDefault.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //WithDefault=class scala/collection/Map$WithDefault of class scala/collection/Map
 
 Compiled from "Map.scala"
-public abstract class scala.collection.Map$WithDefault extends scala.collection.AbstractMap implements scala.collection.Map,scala.ScalaObject{
+public abstract class scala.collection.Map$WithDefault extends scala.collection.AbstractMap implements scala.collection.Map{
 private final scala.collection.Map underlying;
   Signature: Lscala/collection/Map;
 
diff --git c/scala/collection/Map.class w/scala/collection/Map.class
index 01c2096dd3..48dfb3581c 100644
--- c/scala/collection/Map.class
+++ w/scala/collection/Map.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //WithDefault=class scala/collection/Map$WithDefault of class scala/collection/Map
 
 Compiled from "Map.scala"
-public interface scala.collection.Map extends scala.collection.Iterable,scala.collection.GenMap,scala.collection.MapLike,scala.ScalaObject{
+public interface scala.collection.Map extends scala.collection.Iterable,scala.collection.GenMap,scala.collection.MapLike{
 public abstract scala.collection.Map empty();
   Signature: ()Lscala/collection/Map;
 
diff --git c/scala/collection/MapLike$DefaultKeySet.class w/scala/collection/MapLike$DefaultKeySet.class
index ec16c0e273..111fe7abaa 100644
--- c/scala/collection/MapLike$DefaultKeySet.class
+++ w/scala/collection/MapLike$DefaultKeySet.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //DefaultKeySet=class scala/collection/MapLike$DefaultKeySet of class scala/collection/MapLike
 
 Compiled from "MapLike.scala"
-public class scala.collection.MapLike$DefaultKeySet extends scala.collection.AbstractSet implements scala.collection.Set,scala.ScalaObject{
+public class scala.collection.MapLike$DefaultKeySet extends scala.collection.AbstractSet implements scala.collection.Set{
 public final scala.collection.MapLike $outer;
   Signature: Lscala/collection/MapLike;
 
diff --git c/scala/collection/MapLike$DefaultValuesIterable.class w/scala/collection/MapLike$DefaultValuesIterable.class
index b341534d82..59414709a5 100644
--- c/scala/collection/MapLike$DefaultValuesIterable.class
+++ w/scala/collection/MapLike$DefaultValuesIterable.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //DefaultValuesIterable=class scala/collection/MapLike$DefaultValuesIterable of class scala/collection/MapLike
 
 Compiled from "MapLike.scala"
-public class scala.collection.MapLike$DefaultValuesIterable extends scala.collection.AbstractIterable implements scala.collection.Iterable,scala.ScalaObject{
+public class scala.collection.MapLike$DefaultValuesIterable extends scala.collection.AbstractIterable implements scala.collection.Iterable{
 public final scala.collection.MapLike $outer;
   Signature: Lscala/collection/MapLike;
 
diff --git c/scala/collection/MapLike.class w/scala/collection/MapLike.class
index 4c5d4e7e43..3fc07cdf9a 100644
--- c/scala/collection/MapLike.class
+++ w/scala/collection/MapLike.class
@@ -3,7 +3,7 @@ public #= # of #; //DefaultKeySet=class scala/collection/MapLike$DefaultKeySet o
 public #= # of #; //DefaultValuesIterable=class scala/collection/MapLike$DefaultValuesIterable of class scala/collection/MapLike
 
 Compiled from "MapLike.scala"
-public interface scala.collection.MapLike extends scala.PartialFunction,scala.collection.IterableLike,scala.collection.GenMapLike,scala.collection.generic.Subtractable,scala.collection.Parallelizable,scala.ScalaObject{
+public interface scala.collection.MapLike extends scala.PartialFunction,scala.collection.IterableLike,scala.collection.GenMapLike,scala.collection.generic.Subtractable{
 public abstract scala.collection.Map empty();
   Signature: ()Lscala/collection/Map;
 
diff --git c/scala/collection/MapProxyLike.class w/scala/collection/MapProxyLike.class
index 8b18658f13..bcf33a5e76 100644
--- c/scala/collection/MapProxyLike.class
+++ w/scala/collection/MapProxyLike.class
@@ -1,6 +1,6 @@
 
 Compiled from "MapProxyLike.scala"
-public interface scala.collection.MapProxyLike extends scala.collection.MapLike,scala.collection.IterableProxyLike,scala.ScalaObject{
+public interface scala.collection.MapProxyLike extends scala.collection.MapLike,scala.collection.IterableProxyLike{
 public abstract scala.Option get(java.lang.Object);
   Signature: (Ljava/lang/Object;)Lscala/Option;
 
diff --git c/scala/collection/Seq.class w/scala/collection/Seq.class
index ec047a9e4b..1b5b467bbf 100644
--- c/scala/collection/Seq.class
+++ w/scala/collection/Seq.class
@@ -1,6 +1,6 @@
 
 Compiled from "Seq.scala"
-public interface scala.collection.Seq extends scala.PartialFunction,scala.collection.Iterable,scala.collection.GenSeq,scala.collection.generic.GenericTraversableTemplate,scala.collection.SeqLike,scala.ScalaObject{
+public interface scala.collection.Seq extends scala.PartialFunction,scala.collection.Iterable,scala.collection.GenSeq,scala.collection.SeqLike{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/SeqLike.class w/scala/collection/SeqLike.class
index b4d50fbc0e..4c2186cf8e 100644
--- c/scala/collection/SeqLike.class
+++ w/scala/collection/SeqLike.class
@@ -3,7 +3,7 @@ public #= # of #; //PermutationsItr=class scala/collection/SeqLike$PermutationsI
 public #= # of #; //CombinationsItr=class scala/collection/SeqLike$CombinationsItr of class scala/collection/SeqLike
 
 Compiled from "SeqLike.scala"
-public interface scala.collection.SeqLike extends scala.collection.IterableLike,scala.collection.GenSeqLike,scala.collection.Parallelizable,scala.ScalaObject{
+public interface scala.collection.SeqLike extends scala.collection.IterableLike,scala.collection.GenSeqLike{
 public abstract scala.collection.Seq thisCollection();
   Signature: ()Lscala/collection/Seq;
 
diff --git c/scala/collection/SeqProxyLike.class w/scala/collection/SeqProxyLike.class
index d22f2b329b..ce8c466b64 100644
--- c/scala/collection/SeqProxyLike.class
+++ w/scala/collection/SeqProxyLike.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "SeqProxyLike.scala"
-public interface scala.collection.SeqProxyLike extends scala.collection.SeqLike,scala.collection.IterableProxyLike,scala.ScalaObject{
+public interface scala.collection.SeqProxyLike extends scala.collection.SeqLike,scala.collection.IterableProxyLike{
 public abstract int size();
   Signature: ()I
 
diff --git c/scala/collection/SeqViewLike$AbstractTransformed.class w/scala/collection/SeqViewLike$AbstractTransformed.class
index 58dba5e5c8..181b4409dd 100644
--- c/scala/collection/SeqViewLike$AbstractTransformed.class
+++ w/scala/collection/SeqViewLike$AbstractTransformed.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //Transformed$class=class scala/collection/GenSeqView
 public abstract #= # of #; //AbstractTransformed=class scala/collection/IterableViewLike$AbstractTransformed of class scala/collection/IterableViewLike
 
 Compiled from "SeqViewLike.scala"
-public abstract class scala.collection.SeqViewLike$AbstractTransformed extends scala.collection.IterableViewLike$AbstractTransformed implements scala.collection.SeqViewLike$Transformed,scala.ScalaObject{
+public abstract class scala.collection.SeqViewLike$AbstractTransformed extends scala.collection.IterableViewLike$AbstractTransformed implements scala.collection.SeqViewLike$Transformed{
 public final scala.collection.SeqViewLike $outer;
   Signature: Lscala/collection/SeqViewLike;
 
diff --git c/scala/collection/SeqViewLike$Transformed.class w/scala/collection/SeqViewLike$Transformed.class
index a388cd33b7..1e74288d7a 100644
--- c/scala/collection/SeqViewLike$Transformed.class
+++ w/scala/collection/SeqViewLike$Transformed.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Transformed=class scala/collection/GenSeqViewLike$T
 public abstract #= # of #; //Transformed=class scala/collection/IterableViewLike$Transformed of class scala/collection/IterableViewLike
 
 Compiled from "SeqViewLike.scala"
-public interface scala.collection.SeqViewLike$Transformed extends scala.collection.SeqView,scala.collection.IterableViewLike$Transformed,scala.collection.GenSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.SeqViewLike$Transformed extends scala.collection.SeqView,scala.collection.IterableViewLike$Transformed,scala.collection.GenSeqViewLike$Transformed{
 public abstract int length();
   Signature: ()I
 
diff --git c/scala/collection/SeqViewLike.class w/scala/collection/SeqViewLike.class
index 75623bc0d9..bdda8427ca 100644
--- c/scala/collection/SeqViewLike.class
+++ w/scala/collection/SeqViewLike.class
@@ -18,7 +18,7 @@ public abstract #= # of #; //Transformed$class=class scala/collection/SeqViewLik
 public abstract #= # of #; //AbstractTransformed=class scala/collection/SeqViewLike$AbstractTransformed of class scala/collection/SeqViewLike
 
 Compiled from "SeqViewLike.scala"
-public interface scala.collection.SeqViewLike extends scala.collection.Seq,scala.collection.SeqLike,scala.collection.IterableView,scala.collection.IterableViewLike,scala.collection.GenSeqViewLike,scala.ScalaObject{
+public interface scala.collection.SeqViewLike extends scala.collection.Seq,scala.collection.IterableView,scala.collection.GenSeqViewLike{
 
 public abstract scala.collection.SeqViewLike$Transformed newAppended(scala.collection.GenTraversable);
   Signature: (Lscala/collection/GenTraversable;)Lscala/collection/SeqViewLike$Transformed;
diff --git c/scala/collection/Set.class w/scala/collection/Set.class
index f3c66dcf2d..f5810a05d8 100644
--- c/scala/collection/Set.class
+++ w/scala/collection/Set.class
@@ -1,6 +1,6 @@
 
 Compiled from "Set.scala"
-public interface scala.collection.Set extends scala.Function1,scala.collection.Iterable,scala.collection.GenSet,scala.collection.generic.GenericSetTemplate,scala.collection.SetLike,scala.ScalaObject{
+public interface scala.collection.Set extends scala.collection.Iterable,scala.collection.GenSet,scala.collection.SetLike{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/SetLike.class w/scala/collection/SetLike.class
index 38adfdd23b..b37ae40f33 100644
--- c/scala/collection/SetLike.class
+++ w/scala/collection/SetLike.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //SubsetsItr=class scala/collection/SetLike$SubsetsItr of class scala/collection/SetLike
 
 Compiled from "SetLike.scala"
-public interface scala.collection.SetLike extends scala.collection.IterableLike,scala.collection.GenSetLike,scala.collection.generic.Subtractable,scala.collection.Parallelizable,scala.ScalaObject{
+public interface scala.collection.SetLike extends scala.collection.IterableLike,scala.collection.GenSetLike,scala.collection.generic.Subtractable{
 public abstract java.lang.Object scala$collection$SetLike$$super$map(scala.Function1, scala.collection.generic.CanBuildFrom);
   Signature: (Lscala/Function1;Lscala/collection/generic/CanBuildFrom;)Ljava/lang/Object;
 
diff --git c/scala/collection/SetProxyLike.class w/scala/collection/SetProxyLike.class
index 65a1cb98ba..97f348cf6f 100644
--- c/scala/collection/SetProxyLike.class
+++ w/scala/collection/SetProxyLike.class
@@ -1,6 +1,6 @@
 
 Compiled from "SetProxyLike.scala"
-public interface scala.collection.SetProxyLike extends scala.collection.SetLike,scala.collection.IterableProxyLike,scala.ScalaObject{
+public interface scala.collection.SetProxyLike extends scala.collection.SetLike,scala.collection.IterableProxyLike{
 public abstract scala.collection.Set empty();
   Signature: ()Lscala/collection/Set;
 
diff --git c/scala/collection/SortedMap.class w/scala/collection/SortedMap.class
index 34d8a138b2..ed3370a1ec 100644
--- c/scala/collection/SortedMap.class
+++ w/scala/collection/SortedMap.class
@@ -1,6 +1,6 @@
 
 Compiled from "SortedMap.scala"
-public interface scala.collection.SortedMap extends scala.collection.Map,scala.collection.SortedMapLike,scala.ScalaObject{
+public interface scala.collection.SortedMap extends scala.collection.Map,scala.collection.SortedMapLike{
 public abstract scala.collection.SortedMap empty();
   Signature: ()Lscala/collection/SortedMap;
 
diff --git c/scala/collection/SortedMapLike$DefaultKeySortedSet.class w/scala/collection/SortedMapLike$DefaultKeySortedSet.class
index ad448d007e..dce2c5472b 100644
--- c/scala/collection/SortedMapLike$DefaultKeySortedSet.class
+++ w/scala/collection/SortedMapLike$DefaultKeySortedSet.class
@@ -3,7 +3,7 @@ public #= # of #; //DefaultKeySet=class scala/collection/MapLike$DefaultKeySet o
 public #= # of #; //DefaultKeySortedSet=class scala/collection/SortedMapLike$DefaultKeySortedSet of class scala/collection/SortedMapLike
 
 Compiled from "SortedMapLike.scala"
-public class scala.collection.SortedMapLike$DefaultKeySortedSet extends scala.collection.MapLike$DefaultKeySet implements scala.collection.SortedSet,scala.ScalaObject{
+public class scala.collection.SortedMapLike$DefaultKeySortedSet extends scala.collection.MapLike$DefaultKeySet implements scala.collection.SortedSet{
 public final scala.collection.SortedMapLike $outer;
   Signature: Lscala/collection/SortedMapLike;
 
diff --git c/scala/collection/SortedMapLike.class w/scala/collection/SortedMapLike.class
index 55fa2696e5..0a8f9fe50d 100644
--- c/scala/collection/SortedMapLike.class
+++ w/scala/collection/SortedMapLike.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //DefaultKeySortedSet=class scala/collection/SortedMapLike$DefaultKeySortedSet of class scala/collection/SortedMapLike
 
 Compiled from "SortedMapLike.scala"
-public interface scala.collection.SortedMapLike extends scala.collection.generic.Sorted,scala.collection.MapLike,scala.ScalaObject{
+public interface scala.collection.SortedMapLike extends scala.collection.generic.Sorted,scala.collection.MapLike{
 public abstract java.lang.Object firstKey();
   Signature: ()Ljava/lang/Object;
 
diff --git c/scala/collection/SortedSet.class w/scala/collection/SortedSet.class
index 7bcd115f6d..3ffcd2ae5b 100644
--- c/scala/collection/SortedSet.class
+++ w/scala/collection/SortedSet.class
@@ -1,6 +1,6 @@
 
 Compiled from "SortedSet.scala"
-public interface scala.collection.SortedSet extends scala.collection.Set,scala.collection.SortedSetLike,scala.ScalaObject{
+public interface scala.collection.SortedSet extends scala.collection.Set,scala.collection.SortedSetLike{
 public abstract scala.collection.SortedSet empty();
   Signature: ()Lscala/collection/SortedSet;
 
diff --git c/scala/collection/SortedSetLike.class w/scala/collection/SortedSetLike.class
index 0e01950c01..3e8c3b0450 100644
--- c/scala/collection/SortedSetLike.class
+++ w/scala/collection/SortedSetLike.class
@@ -1,6 +1,6 @@
 
 Compiled from "SortedSetLike.scala"
-public interface scala.collection.SortedSetLike extends scala.collection.generic.Sorted,scala.collection.SetLike,scala.ScalaObject{
+public interface scala.collection.SortedSetLike extends scala.collection.generic.Sorted,scala.collection.SetLike{
 public abstract boolean scala$collection$SortedSetLike$$super$subsetOf(scala.collection.GenSet);
   Signature: (Lscala/collection/GenSet;)Z
 
diff --git c/scala/collection/Traversable$.class w/scala/collection/Traversable$.class
index 3e02412abd..bd6eb1708c 100644
--- c/scala/collection/Traversable$.class
+++ w/scala/collection/Traversable$.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //GenericCanBuildFrom=class scala/collection/generic/GenTraversableFactory$GenericCanBuildFrom of class scala/collection/generic/GenTraversableFactory
 
 Compiled from "Traversable.scala"
-public final class scala.collection.Traversable$ extends scala.collection.generic.GenTraversableFactory implements scala.collection.generic.TraversableFactory,scala.ScalaObject{
+public final class scala.collection.Traversable$ extends scala.collection.generic.GenTraversableFactory implements scala.collection.generic.TraversableFactory{
 public static final scala.collection.Traversable$ MODULE$;
   Signature: Lscala/collection/Traversable$;
 
diff --git c/scala/collection/Traversable.class w/scala/collection/Traversable.class
index 9e6e4adc48..408b99b78b 100644
--- c/scala/collection/Traversable.class
+++ w/scala/collection/Traversable.class
@@ -1,6 +1,6 @@
 
 Compiled from "Traversable.scala"
-public interface scala.collection.Traversable extends scala.collection.TraversableLike,scala.collection.GenTraversable,scala.collection.TraversableOnce,scala.collection.generic.GenericTraversableTemplate,scala.ScalaObject{
+public interface scala.collection.Traversable extends scala.collection.TraversableLike,scala.collection.GenTraversable{
 public abstract scala.collection.Traversable scala$collection$Traversable$$super$flatten(scala.Function1);
   Signature: (Lscala/Function1;)Lscala/collection/Traversable;
 
diff --git c/scala/collection/TraversableLike.class w/scala/collection/TraversableLike.class
index d7b5cf99f5..f39837b70c 100644
--- c/scala/collection/TraversableLike.class
+++ w/scala/collection/TraversableLike.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //WithFilter=class scala/collection/TraversableLike$WithFilter of class scala/collection/TraversableLike
 
 Compiled from "TraversableLike.scala"
-public interface scala.collection.TraversableLike extends scala.collection.generic.HasNewBuilder,scala.collection.generic.FilterMonadic,scala.collection.TraversableOnce,scala.collection.GenTraversableLike,scala.collection.Parallelizable,scala.ScalaObject{
+public interface scala.collection.TraversableLike extends scala.collection.generic.HasNewBuilder,scala.collection.generic.FilterMonadic,scala.collection.TraversableOnce,scala.collection.GenTraversableLike{
 public abstract java.lang.Object repr();
   Signature: ()Ljava/lang/Object;
 
diff --git c/scala/collection/TraversableOnce.class w/scala/collection/TraversableOnce.class
index 1c16be39b1..e6f2a6eb73 100644
--- c/scala/collection/TraversableOnce.class
+++ w/scala/collection/TraversableOnce.class
@@ -5,7 +5,7 @@ public #= # of #; //FlattenOps=class scala/collection/TraversableOnce$FlattenOps
 public #= # of #; //OnceCanBuildFrom=class scala/collection/TraversableOnce$OnceCanBuildFrom of class scala/collection/TraversableOnce
 
 Compiled from "TraversableOnce.scala"
-public interface scala.collection.TraversableOnce extends scala.collection.GenTraversableOnce,scala.ScalaObject{
+public interface scala.collection.TraversableOnce extends scala.collection.GenTraversableOnce{
 public abstract void foreach(scala.Function1);
   Signature: (Lscala/Function1;)V
 
diff --git c/scala/collection/TraversableProxyLike.class w/scala/collection/TraversableProxyLike.class
index db3022efdc..cc68d1da4d 100644
--- c/scala/collection/TraversableProxyLike.class
+++ w/scala/collection/TraversableProxyLike.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "TraversableProxyLike.scala"
-public interface scala.collection.TraversableProxyLike extends scala.collection.TraversableLike,scala.Proxy,scala.ScalaObject{
+public interface scala.collection.TraversableProxyLike extends scala.collection.TraversableLike,scala.Proxy{
 public abstract scala.collection.Traversable self();
   Signature: ()Lscala/collection/Traversable;
 
diff --git c/scala/collection/TraversableView$NoBuilder.class w/scala/collection/TraversableView$NoBuilder.class
index f2707e17cf..496f6b20f8 100644
--- c/scala/collection/TraversableView$NoBuilder.class
+++ w/scala/collection/TraversableView$NoBuilder.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //NoBuilder=class scala/collection/TraversableView$NoBuilder of class scala/collection/TraversableView
 
 Compiled from "TraversableView.scala"
-public class scala.collection.TraversableView$NoBuilder extends java.lang.Object implements scala.collection.mutable.Builder,scala.ScalaObject{
+public class scala.collection.TraversableView$NoBuilder extends java.lang.Object implements scala.collection.mutable.Builder{
 public void sizeHint(int);
   Signature: (I)V
   Code:
diff --git c/scala/collection/TraversableViewLike$AbstractTransformed.class w/scala/collection/TraversableViewLike$AbstractTransformed.class
index bf4029f4ba..bd81f65650 100644
--- c/scala/collection/TraversableViewLike$AbstractTransformed.class
+++ w/scala/collection/TraversableViewLike$AbstractTransformed.class
@@ -7,7 +7,7 @@ public abstract #= # of #; //AbstractTransformed=class scala/collection/Traversa
 public abstract #= # of #; //Transformed$class=class scala/collection/GenTraversableViewLike$Transformed$class of class scala/collection/GenTraversableViewLike
 
 Compiled from "TraversableViewLike.scala"
-public abstract class scala.collection.TraversableViewLike$AbstractTransformed extends java.lang.Object implements scala.collection.TraversableViewLike$Transformed,scala.ScalaObject{
+public abstract class scala.collection.TraversableViewLike$AbstractTransformed extends java.lang.Object implements scala.collection.TraversableViewLike$Transformed{
 public final scala.collection.TraversableViewLike $outer;
   Signature: Lscala/collection/TraversableViewLike;
 
diff --git c/scala/collection/TraversableViewLike$Transformed.class w/scala/collection/TraversableViewLike$Transformed.class
index ee22e17d07..7879a19273 100644
--- c/scala/collection/TraversableViewLike$Transformed.class
+++ w/scala/collection/TraversableViewLike$Transformed.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Transformed=class scala/collection/TraversableViewL
 public abstract #= # of #; //Transformed=class scala/collection/GenTraversableViewLike$Transformed of class scala/collection/GenTraversableViewLike
 
 Compiled from "TraversableViewLike.scala"
-public interface scala.collection.TraversableViewLike$Transformed extends scala.collection.TraversableView,scala.collection.GenTraversableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.TraversableViewLike$Transformed extends scala.collection.TraversableView,scala.collection.GenTraversableViewLike$Transformed{
 public abstract void foreach(scala.Function1);
   Signature: (Lscala/Function1;)V
 
diff --git c/scala/collection/TraversableViewLike.class w/scala/collection/TraversableViewLike.class
index 8833d287e1..484af89d08 100644
--- c/scala/collection/TraversableViewLike.class
+++ w/scala/collection/TraversableViewLike.class
@@ -13,7 +13,7 @@ public abstract #= # of #; //Transformed$class=class scala/collection/Traversabl
 public abstract #= # of #; //AbstractTransformed=class scala/collection/TraversableViewLike$AbstractTransformed of class scala/collection/TraversableViewLike
 
 Compiled from "TraversableViewLike.scala"
-public interface scala.collection.TraversableViewLike extends scala.collection.Traversable,scala.collection.TraversableLike,scala.collection.ViewMkString,scala.collection.GenTraversableViewLike,scala.ScalaObject{
+public interface scala.collection.TraversableViewLike extends scala.collection.Traversable,scala.collection.ViewMkString,scala.collection.GenTraversableViewLike{
 public abstract scala.collection.mutable.Builder newBuilder();
   Signature: ()Lscala/collection/mutable/Builder;
 
diff --git c/scala/collection/generic/BitOperations$Int$.class w/scala/collection/generic/BitOperations$Int$.class
index 2b061ad5d0..656adc12d1 100644
--- c/scala/collection/generic/BitOperations$Int$.class
+++ w/scala/collection/generic/BitOperations$Int$.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Int=class scala/collection/generic/BitOperations$In
 public abstract #= # of #; //Int$class=class scala/collection/generic/BitOperations$Int$class of class scala/collection/generic/BitOperations
 
 Compiled from "BitOperations.scala"
-public final class scala.collection.generic.BitOperations$Int$ extends java.lang.Object implements scala.collection.generic.BitOperations$Int,scala.ScalaObject{
+public final class scala.collection.generic.BitOperations$Int$ extends java.lang.Object implements scala.collection.generic.BitOperations$Int{
 public static final scala.collection.generic.BitOperations$Int$ MODULE$;
   Signature: Lscala/collection/generic/BitOperations$Int$;
 
diff --git c/scala/collection/generic/BitOperations$Long$.class w/scala/collection/generic/BitOperations$Long$.class
index e2fdf1bccb..397e911fcc 100644
--- c/scala/collection/generic/BitOperations$Long$.class
+++ w/scala/collection/generic/BitOperations$Long$.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Long=class scala/collection/generic/BitOperations$L
 public abstract #= # of #; //Long$class=class scala/collection/generic/BitOperations$Long$class of class scala/collection/generic/BitOperations
 
 Compiled from "BitOperations.scala"
-public final class scala.collection.generic.BitOperations$Long$ extends java.lang.Object implements scala.collection.generic.BitOperations$Long,scala.ScalaObject{
+public final class scala.collection.generic.BitOperations$Long$ extends java.lang.Object implements scala.collection.generic.BitOperations$Long{
 public static final scala.collection.generic.BitOperations$Long$ MODULE$;
   Signature: Lscala/collection/generic/BitOperations$Long$;
 
diff --git c/scala/collection/generic/DefaultSignalling.class w/scala/collection/generic/DefaultSignalling.class
index 791ab29541..c5dab60d25 100644
--- c/scala/collection/generic/DefaultSignalling.class
+++ w/scala/collection/generic/DefaultSignalling.class
@@ -1,6 +1,6 @@
 
 Compiled from "Signalling.scala"
-public class scala.collection.generic.DefaultSignalling extends java.lang.Object implements scala.collection.generic.Signalling,scala.collection.generic.VolatileAbort,scala.ScalaObject{
+public class scala.collection.generic.DefaultSignalling extends java.lang.Object implements scala.collection.generic.VolatileAbort{
 private volatile boolean scala$collection$generic$VolatileAbort$$abortflag;
   Signature: Z
 
diff --git c/scala/collection/generic/DelegatedContext.class w/scala/collection/generic/DelegatedContext.class
index 0be01583b1..5f037b3ca2 100644
--- c/scala/collection/generic/DelegatedContext.class
+++ w/scala/collection/generic/DelegatedContext.class
@@ -1,6 +1,6 @@
 
 Compiled from "Signalling.scala"
-public class scala.collection.generic.DelegatedContext extends java.lang.Object implements scala.collection.generic.DelegatedSignalling,scala.ScalaObject{
+public class scala.collection.generic.DelegatedContext extends java.lang.Object implements scala.collection.generic.DelegatedSignalling{
 private scala.collection.generic.Signalling signalDelegate;
   Signature: Lscala/collection/generic/Signalling;
 
diff --git c/scala/collection/generic/GenericParMapTemplate.class w/scala/collection/generic/GenericParMapTemplate.class
index f34c9344b7..ec62aef94c 100644
--- c/scala/collection/generic/GenericParMapTemplate.class
+++ w/scala/collection/generic/GenericParMapTemplate.class
@@ -1,6 +1,6 @@
 
 Compiled from "GenericParTemplate.scala"
-public interface scala.collection.generic.GenericParMapTemplate extends scala.collection.generic.GenericParTemplate,scala.ScalaObject{
+public interface scala.collection.generic.GenericParMapTemplate extends scala.collection.generic.GenericParTemplate{
 public abstract scala.collection.parallel.Combiner newCombiner();
   Signature: ()Lscala/collection/parallel/Combiner;
 
diff --git c/scala/collection/generic/GenericParTemplate.class w/scala/collection/generic/GenericParTemplate.class
index e3e96cc67e..f15fb103cc 100644
--- c/scala/collection/generic/GenericParTemplate.class
+++ w/scala/collection/generic/GenericParTemplate.class
@@ -1,6 +1,6 @@
 
 Compiled from "GenericParTemplate.scala"
-public interface scala.collection.generic.GenericParTemplate extends scala.collection.generic.GenericTraversableTemplate,scala.collection.generic.HasNewCombiner,scala.ScalaObject{
+public interface scala.collection.generic.GenericParTemplate extends scala.collection.generic.GenericTraversableTemplate,scala.collection.generic.HasNewCombiner{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/generic/GenericSetTemplate.class w/scala/collection/generic/GenericSetTemplate.class
index 80a9df9a73..873703c587 100644
--- c/scala/collection/generic/GenericSetTemplate.class
+++ w/scala/collection/generic/GenericSetTemplate.class
@@ -1,6 +1,6 @@
 
 Compiled from "GenericSetTemplate.scala"
-public interface scala.collection.generic.GenericSetTemplate extends scala.collection.generic.GenericTraversableTemplate,scala.ScalaObject{
+public interface scala.collection.generic.GenericSetTemplate extends scala.collection.generic.GenericTraversableTemplate{
 public abstract scala.collection.GenSet empty();
   Signature: ()Lscala/collection/GenSet;
 
diff --git c/scala/collection/generic/IterableForwarder.class w/scala/collection/generic/IterableForwarder.class
index 298fa981b9..0545b3f305 100644
--- c/scala/collection/generic/IterableForwarder.class
+++ w/scala/collection/generic/IterableForwarder.class
@@ -1,6 +1,6 @@
 
 Compiled from "IterableForwarder.scala"
-public interface scala.collection.generic.IterableForwarder extends scala.collection.Iterable,scala.collection.generic.TraversableForwarder,scala.ScalaObject{
+public interface scala.collection.generic.IterableForwarder extends scala.collection.Iterable,scala.collection.generic.TraversableForwarder{
 public abstract scala.collection.Iterable underlying();
   Signature: ()Lscala/collection/Iterable;
 
diff --git c/scala/collection/generic/SeqFactory.class w/scala/collection/generic/SeqFactory.class
index 323d3c5d48..59dec2cdb8 100644
--- c/scala/collection/generic/SeqFactory.class
+++ w/scala/collection/generic/SeqFactory.class
@@ -1,6 +1,6 @@
 
 Compiled from "SeqFactory.scala"
-public abstract class scala.collection.generic.SeqFactory extends scala.collection.generic.GenSeqFactory implements scala.collection.generic.TraversableFactory,scala.ScalaObject{
+public abstract class scala.collection.generic.SeqFactory extends scala.collection.generic.GenSeqFactory implements scala.collection.generic.TraversableFactory{
 public scala.collection.Traversable scala$collection$generic$TraversableFactory$$super$concat(scala.collection.Seq);
   Signature: (Lscala/collection/Seq;)Lscala/collection/Traversable;
   Code:
diff --git c/scala/collection/generic/SeqForwarder.class w/scala/collection/generic/SeqForwarder.class
index 48a996abb3..29d4edcde8 100644
--- c/scala/collection/generic/SeqForwarder.class
+++ w/scala/collection/generic/SeqForwarder.class
@@ -1,6 +1,6 @@
 
 Compiled from "SeqForwarder.scala"
-public interface scala.collection.generic.SeqForwarder extends scala.collection.Seq,scala.collection.generic.IterableForwarder,scala.ScalaObject{
+public interface scala.collection.generic.SeqForwarder extends scala.collection.Seq,scala.collection.generic.IterableForwarder{
 public abstract scala.collection.Seq underlying();
   Signature: ()Lscala/collection/Seq;
 
diff --git c/scala/collection/generic/SetFactory.class w/scala/collection/generic/SetFactory.class
index 2a5c4eed75..d6f646a1fe 100644
--- c/scala/collection/generic/SetFactory.class
+++ w/scala/collection/generic/SetFactory.class
@@ -1,6 +1,6 @@
 
 Compiled from "SetFactory.scala"
-public abstract class scala.collection.generic.SetFactory extends scala.collection.generic.GenSetFactory implements scala.collection.generic.GenericSeqCompanion,scala.ScalaObject{
+public abstract class scala.collection.generic.SetFactory extends scala.collection.generic.GenSetFactory implements scala.collection.generic.GenericSeqCompanion{
 public scala.collection.Traversable scala$collection$generic$GenericSeqCompanion$$super$empty();
   Signature: ()Lscala/collection/Traversable;
   Code:
diff --git c/scala/collection/generic/TraversableFactory.class w/scala/collection/generic/TraversableFactory.class
index e7d08b3028..cd120737cf 100644
--- c/scala/collection/generic/TraversableFactory.class
+++ w/scala/collection/generic/TraversableFactory.class
@@ -1,6 +1,6 @@
 
 Compiled from "TraversableFactory.scala"
-public interface scala.collection.generic.TraversableFactory extends scala.collection.generic.GenericSeqCompanion,scala.ScalaObject{
+public interface scala.collection.generic.TraversableFactory extends scala.collection.generic.GenericSeqCompanion{
 public abstract scala.collection.Traversable scala$collection$generic$TraversableFactory$$super$concat(scala.collection.Seq);
   Signature: (Lscala/collection/Seq;)Lscala/collection/Traversable;
 
diff --git c/scala/collection/generic/TraversableForwarder.class w/scala/collection/generic/TraversableForwarder.class
index 027d8627de..9439f13f0f 100644
--- c/scala/collection/generic/TraversableForwarder.class
+++ w/scala/collection/generic/TraversableForwarder.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "TraversableForwarder.scala"
-public interface scala.collection.generic.TraversableForwarder extends scala.collection.Traversable,scala.ScalaObject{
+public interface scala.collection.generic.TraversableForwarder extends scala.collection.Traversable{
 public abstract scala.collection.Traversable underlying();
   Signature: ()Lscala/collection/Traversable;
 
diff --git c/scala/collection/immutable/$colon$colon.class w/scala/collection/immutable/$colon$colon.class
index 0707440e55..c3844c0e49 100644
--- c/scala/collection/immutable/$colon$colon.class
+++ w/scala/collection/immutable/$colon$colon.class
@@ -1,6 +1,6 @@
 
 Compiled from "List.scala"
-public final class scala.collection.immutable.$colon$colon extends scala.collection.immutable.List implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.collection.immutable.$colon$colon extends scala.collection.immutable.List implements scala.Product,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/immutable/AbstractMap.class w/scala/collection/immutable/AbstractMap.class
index f75cf05384..c2c5ef6f07 100644
--- c/scala/collection/immutable/AbstractMap.class
+++ w/scala/collection/immutable/AbstractMap.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "Map.scala"
-public abstract class scala.collection.immutable.AbstractMap extends scala.collection.AbstractMap implements scala.collection.immutable.Map,scala.ScalaObject{
+public abstract class scala.collection.immutable.AbstractMap extends scala.collection.AbstractMap implements scala.collection.immutable.Map{
 public scala.collection.immutable.Map empty();
   Signature: ()Lscala/collection/immutable/Map;
   Code:
diff --git c/scala/collection/immutable/BitSet$.class w/scala/collection/immutable/BitSet$.class
index e80dff7424..32727060f8 100644
--- c/scala/collection/immutable/BitSet$.class
+++ w/scala/collection/immutable/BitSet$.class
@@ -4,7 +4,7 @@ public #= # of #; //BitSet=class scala/collection/immutable/BitSet$BitSet of cla
 public #= # of #; //BitSetN=class scala/collection/immutable/BitSet$BitSetN of class scala/collection/immutable/BitSet
 
 Compiled from "BitSet.scala"
-public final class scala.collection.immutable.BitSet$ extends java.lang.Object implements scala.collection.generic.BitSetFactory,scala.ScalaObject,scala.Serializable{
+public final class scala.collection.immutable.BitSet$ extends java.lang.Object implements scala.collection.generic.BitSetFactory,scala.Serializable{
 public static final scala.collection.immutable.BitSet$ MODULE$;
   Signature: Lscala/collection/immutable/BitSet$;
 
diff --git c/scala/collection/immutable/BitSet.class w/scala/collection/immutable/BitSet.class
index 90fcb674d9..5268b1c73f 100644
--- c/scala/collection/immutable/BitSet.class
+++ w/scala/collection/immutable/BitSet.class
@@ -4,7 +4,7 @@ public #= # of #; //BitSet=class scala/collection/immutable/BitSet$BitSet of cla
 public #= # of #; //BitSetN=class scala/collection/immutable/BitSet$BitSetN of class scala/collection/immutable/BitSet
 
 Compiled from "BitSet.scala"
-public abstract class scala.collection.immutable.BitSet extends scala.collection.AbstractSet implements scala.collection.immutable.SortedSet,scala.collection.BitSet,scala.collection.BitSetLike,scala.Serializable,scala.ScalaObject{
+public abstract class scala.collection.immutable.BitSet extends scala.collection.AbstractSet implements scala.collection.immutable.SortedSet,scala.collection.BitSet,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/immutable/DefaultMap.class w/scala/collection/immutable/DefaultMap.class
index f2006fb4c1..2ec31096ff 100644
--- c/scala/collection/immutable/DefaultMap.class
+++ w/scala/collection/immutable/DefaultMap.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "DefaultMap.scala"
-public interface scala.collection.immutable.DefaultMap extends scala.collection.immutable.Map,scala.ScalaObject{
+public interface scala.collection.immutable.DefaultMap extends scala.collection.immutable.Map{
 public abstract scala.collection.immutable.Map $plus(scala.Tuple2);
   Signature: (Lscala/Tuple2;)Lscala/collection/immutable/Map;
 
diff --git c/scala/collection/immutable/HashMap$.class w/scala/collection/immutable/HashMap$.class
index 603e66f236..d87a5a8471 100644
--- c/scala/collection/immutable/HashMap$.class
+++ w/scala/collection/immutable/HashMap$.class
@@ -9,7 +9,7 @@ public #= # of #; //SerializationProxy=class scala/collection/immutable/HashMap$
 public #= # of #; //MapCanBuildFrom=class scala/collection/generic/GenMapFactory$MapCanBuildFrom of class scala/collection/generic/GenMapFactory
 
 Compiled from "HashMap.scala"
-public final class scala.collection.immutable.HashMap$ extends scala.collection.generic.ImmutableMapFactory implements scala.collection.generic.BitOperations$Int,scala.ScalaObject,scala.Serializable{
+public final class scala.collection.immutable.HashMap$ extends scala.collection.generic.ImmutableMapFactory implements scala.collection.generic.BitOperations$Int,scala.Serializable{
 public static final scala.collection.immutable.HashMap$ MODULE$;
   Signature: Lscala/collection/immutable/HashMap$;
 
diff --git c/scala/collection/immutable/HashMap.class w/scala/collection/immutable/HashMap.class
index e98b462e2e..9b844b0631 100644
--- c/scala/collection/immutable/HashMap.class
+++ w/scala/collection/immutable/HashMap.class
@@ -6,7 +6,7 @@ public #= # of #; //HashMapCollision=class scala/collection/immutable/HashMap$Ha
 public #= # of #; //SerializationProxy=class scala/collection/immutable/HashMap$SerializationProxy of class scala/collection/immutable/HashMap
 
 Compiled from "HashMap.scala"
-public class scala.collection.immutable.HashMap extends scala.collection.immutable.AbstractMap implements scala.collection.immutable.Map,scala.collection.immutable.MapLike,scala.Serializable,scala.collection.CustomParallelizable,scala.ScalaObject{
+public class scala.collection.immutable.HashMap extends scala.collection.immutable.AbstractMap implements scala.collection.immutable.Map,scala.Serializable,scala.collection.CustomParallelizable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/immutable/HashSet.class w/scala/collection/immutable/HashSet.class
index 004835a273..59592a8a99 100644
--- c/scala/collection/immutable/HashSet.class
+++ w/scala/collection/immutable/HashSet.class
@@ -6,7 +6,7 @@ public #= # of #; //HashSetCollision=class scala/collection/immutable/HashSet$Ha
 public #= # of #; //SerializationProxy=class scala/collection/immutable/HashSet$SerializationProxy of class scala/collection/immutable/HashSet
 
 Compiled from "HashSet.scala"
-public class scala.collection.immutable.HashSet extends scala.collection.AbstractSet implements scala.collection.immutable.Set,scala.collection.generic.GenericSetTemplate,scala.collection.SetLike,scala.collection.CustomParallelizable,scala.Serializable,scala.ScalaObject{
+public class scala.collection.immutable.HashSet extends scala.collection.AbstractSet implements scala.collection.immutable.Set,scala.collection.CustomParallelizable,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/immutable/IndexedSeq$Impl.class w/scala/collection/immutable/IndexedSeq$Impl.class
index d74be57023..c8c825a74b 100644
--- c/scala/collection/immutable/IndexedSeq$Impl.class
+++ w/scala/collection/immutable/IndexedSeq$Impl.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //Impl=class scala/collection/immutable/IndexedSeq$Impl of class scala/collection/immutable/IndexedSeq
 
 Compiled from "IndexedSeq.scala"
-public class scala.collection.immutable.IndexedSeq$Impl extends scala.collection.AbstractSeq implements scala.collection.immutable.IndexedSeq,scala.Serializable,scala.ScalaObject{
+public class scala.collection.immutable.IndexedSeq$Impl extends scala.collection.AbstractSeq implements scala.collection.immutable.IndexedSeq,scala.Serializable{
 private final scala.collection.mutable.ArrayBuffer buf;
   Signature: Lscala/collection/mutable/ArrayBuffer;
 
diff --git c/scala/collection/immutable/IndexedSeq.class w/scala/collection/immutable/IndexedSeq.class
index af22f5b524..7c772f3168 100644
--- c/scala/collection/immutable/IndexedSeq.class
+++ w/scala/collection/immutable/IndexedSeq.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //Impl=class scala/collection/immutable/IndexedSeq$Impl of class scala/collection/immutable/IndexedSeq
 
 Compiled from "IndexedSeq.scala"
-public interface scala.collection.immutable.IndexedSeq extends scala.collection.immutable.Seq,scala.collection.IndexedSeq,scala.collection.generic.GenericTraversableTemplate,scala.collection.IndexedSeqLike,scala.ScalaObject{
+public interface scala.collection.immutable.IndexedSeq extends scala.collection.immutable.Seq,scala.collection.IndexedSeq{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/immutable/IntMap$Bin.class w/scala/collection/immutable/IntMap$Bin.class
index d95987f90a..fbffd3e249 100644
--- c/scala/collection/immutable/IntMap$Bin.class
+++ w/scala/collection/immutable/IntMap$Bin.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //Bin=class scala/collection/immutable/IntMap$Bin of class scala/collection/immutable/IntMap
 
 Compiled from "IntMap.scala"
-public class scala.collection.immutable.IntMap$Bin extends scala.collection.immutable.IntMap implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.immutable.IntMap$Bin extends scala.collection.immutable.IntMap implements scala.Product,scala.Serializable{
 private final int prefix;
   Signature: I
 
diff --git c/scala/collection/immutable/IntMap$Nil$.class w/scala/collection/immutable/IntMap$Nil$.class
index 7d22347b81..7fc167d639 100644
--- c/scala/collection/immutable/IntMap$Nil$.class
+++ w/scala/collection/immutable/IntMap$Nil$.class
@@ -2,7 +2,7 @@ InnerClasses:
 public final #= # of #; //Nil$=class scala/collection/immutable/IntMap$Nil$ of class scala/collection/immutable/IntMap
 
 Compiled from "IntMap.scala"
-public final class scala.collection.immutable.IntMap$Nil$ extends scala.collection.immutable.IntMap implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.collection.immutable.IntMap$Nil$ extends scala.collection.immutable.IntMap implements scala.Product,scala.Serializable{
 public static final scala.collection.immutable.IntMap$Nil$ MODULE$;
   Signature: Lscala/collection/immutable/IntMap$Nil$;
 
diff --git c/scala/collection/immutable/IntMap$Tip.class w/scala/collection/immutable/IntMap$Tip.class
index fa953632fe..2feaa68cd0 100644
--- c/scala/collection/immutable/IntMap$Tip.class
+++ w/scala/collection/immutable/IntMap$Tip.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //Tip=class scala/collection/immutable/IntMap$Tip of class scala/collection/immutable/IntMap
 
 Compiled from "IntMap.scala"
-public class scala.collection.immutable.IntMap$Tip extends scala.collection.immutable.IntMap implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.immutable.IntMap$Tip extends scala.collection.immutable.IntMap implements scala.Product,scala.Serializable{
 private final int key;
   Signature: I
 
diff --git c/scala/collection/immutable/IntMap.class w/scala/collection/immutable/IntMap.class
index 31c4774ed2..fde33f88c6 100644
--- c/scala/collection/immutable/IntMap.class
+++ w/scala/collection/immutable/IntMap.class
@@ -7,7 +7,7 @@ public final #= # of #; //Bin$=class scala/collection/immutable/IntMap$Bin$ of c
 public abstract #= # of #; //Int=class scala/collection/generic/BitOperations$Int of class scala/collection/generic/BitOperations
 
 Compiled from "IntMap.scala"
-public abstract class scala.collection.immutable.IntMap extends scala.collection.immutable.AbstractMap implements scala.collection.immutable.Map,scala.collection.immutable.MapLike,scala.ScalaObject{
+public abstract class scala.collection.immutable.IntMap extends scala.collection.immutable.AbstractMap implements scala.collection.immutable.Map{
 public static scala.collection.immutable.IntMap singleton(int, java.lang.Object);
   Signature: (ILjava/lang/Object;)Lscala/collection/immutable/IntMap;
   Code:
diff --git c/scala/collection/immutable/IntMapUtils$.class w/scala/collection/immutable/IntMapUtils$.class
index bbc781f9e3..368c503cd1 100644
--- c/scala/collection/immutable/IntMapUtils$.class
+++ w/scala/collection/immutable/IntMapUtils$.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //Int=class scala/collection/generic/BitOperations$In
 public abstract #= # of #; //Int$class=class scala/collection/generic/BitOperations$Int$class of class scala/collection/generic/BitOperations
 
 Compiled from "IntMap.scala"
-public final class scala.collection.immutable.IntMapUtils$ extends java.lang.Object implements scala.collection.generic.BitOperations$Int,scala.ScalaObject{
+public final class scala.collection.immutable.IntMapUtils$ extends java.lang.Object implements scala.collection.generic.BitOperations$Int{
 public static final scala.collection.immutable.IntMapUtils$ MODULE$;
   Signature: Lscala/collection/immutable/IntMapUtils$;
 
diff --git c/scala/collection/immutable/Iterable$.class w/scala/collection/immutable/Iterable$.class
index 88d6780516..8f263ba40d 100644
--- c/scala/collection/immutable/Iterable$.class
+++ w/scala/collection/immutable/Iterable$.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //GenericCanBuildFrom=class scala/collection/generic/GenTraversableFactory$GenericCanBuildFrom of class scala/collection/generic/GenTraversableFactory
 
 Compiled from "Iterable.scala"
-public final class scala.collection.immutable.Iterable$ extends scala.collection.generic.GenTraversableFactory implements scala.collection.generic.TraversableFactory,scala.ScalaObject{
+public final class scala.collection.immutable.Iterable$ extends scala.collection.generic.GenTraversableFactory implements scala.collection.generic.TraversableFactory{
 public static final scala.collection.immutable.Iterable$ MODULE$;
   Signature: Lscala/collection/immutable/Iterable$;
 
diff --git c/scala/collection/immutable/Iterable.class w/scala/collection/immutable/Iterable.class
index e3ab7bab57..c093122b7e 100644
--- c/scala/collection/immutable/Iterable.class
+++ w/scala/collection/immutable/Iterable.class
@@ -1,6 +1,6 @@
 
 Compiled from "Iterable.scala"
-public interface scala.collection.immutable.Iterable extends scala.collection.immutable.Traversable,scala.collection.Iterable,scala.collection.generic.GenericTraversableTemplate,scala.collection.IterableLike,scala.collection.Parallelizable,scala.ScalaObject{
+public interface scala.collection.immutable.Iterable extends scala.collection.immutable.Traversable,scala.collection.Iterable{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/immutable/LinearSeq.class w/scala/collection/immutable/LinearSeq.class
index 926ad049ae..43bd5f42e4 100644
--- c/scala/collection/immutable/LinearSeq.class
+++ w/scala/collection/immutable/LinearSeq.class
@@ -1,6 +1,6 @@
 
 Compiled from "LinearSeq.scala"
-public interface scala.collection.immutable.LinearSeq extends scala.collection.immutable.Seq,scala.collection.LinearSeq,scala.collection.generic.GenericTraversableTemplate,scala.collection.LinearSeqLike,scala.ScalaObject{
+public interface scala.collection.immutable.LinearSeq extends scala.collection.immutable.Seq,scala.collection.LinearSeq{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/immutable/List.class w/scala/collection/immutable/List.class
index 74ef1f97a9..723cb6581f 100644
--- c/scala/collection/immutable/List.class
+++ w/scala/collection/immutable/List.class
@@ -4,7 +4,7 @@ public final #= # of #; //Empty$=class scala/collection/immutable/Stream$Empty$
 public #= # of #; //GenericCanBuildFrom=class scala/collection/generic/GenTraversableFactory$GenericCanBuildFrom of class scala/collection/generic/GenTraversableFactory
 
 Compiled from "List.scala"
-public abstract class scala.collection.immutable.List extends scala.collection.AbstractSeq implements scala.collection.immutable.LinearSeq,scala.Product,scala.collection.generic.GenericTraversableTemplate,scala.collection.LinearSeqOptimized,scala.ScalaObject{
+public abstract class scala.collection.immutable.List extends scala.collection.AbstractSeq implements scala.collection.immutable.LinearSeq,scala.Product,scala.collection.LinearSeqOptimized{
 public static scala.collection.immutable.List empty();
   Signature: ()Lscala/collection/immutable/List;
   Code:
diff --git c/scala/collection/immutable/ListMap.class w/scala/collection/immutable/ListMap.class
index 1add66dc9b..f0ae57249d 100644
--- c/scala/collection/immutable/ListMap.class
+++ w/scala/collection/immutable/ListMap.class
@@ -3,7 +3,7 @@ public #= # of #; //Node=class scala/collection/immutable/ListMap$Node of class
 public final #= # of #; //EmptyListMap$=class scala/collection/immutable/ListMap$EmptyListMap$ of class scala/collection/immutable/ListMap
 
 Compiled from "ListMap.scala"
-public class scala.collection.immutable.ListMap extends scala.collection.immutable.AbstractMap implements scala.collection.immutable.Map,scala.collection.immutable.MapLike,scala.Serializable,scala.ScalaObject{
+public class scala.collection.immutable.ListMap extends scala.collection.immutable.AbstractMap implements scala.collection.immutable.Map,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/immutable/ListSerializeEnd$.class w/scala/collection/immutable/ListSerializeEnd$.class
index 9eddc5bc12..4a7431cbcb 100644
--- c/scala/collection/immutable/ListSerializeEnd$.class
+++ w/scala/collection/immutable/ListSerializeEnd$.class
@@ -1,6 +1,6 @@
 
 Compiled from "List.scala"
-public final class scala.collection.immutable.ListSerializeEnd$ extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.collection.immutable.ListSerializeEnd$ extends java.lang.Object implements scala.Product,scala.Serializable{
 public static final scala.collection.immutable.ListSerializeEnd$ MODULE$;
   Signature: Lscala/collection/immutable/ListSerializeEnd$;
 
diff --git c/scala/collection/immutable/ListSet$ListSetBuilder.class w/scala/collection/immutable/ListSet$ListSetBuilder.class
index 12e2e30026..b8063265e9 100644
--- c/scala/collection/immutable/ListSet$ListSetBuilder.class
+++ w/scala/collection/immutable/ListSet$ListSetBuilder.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //ListSetBuilder=class scala/collection/immutable/ListSet$ListSetBuilder of class scala/collection/immutable/ListSet
 
 Compiled from "ListSet.scala"
-public class scala.collection.immutable.ListSet$ListSetBuilder extends java.lang.Object implements scala.collection.mutable.Builder,scala.ScalaObject{
+public class scala.collection.immutable.ListSet$ListSetBuilder extends java.lang.Object implements scala.collection.mutable.Builder{
 private final scala.collection.mutable.ListBuffer elems;
   Signature: Lscala/collection/mutable/ListBuffer;
 
diff --git c/scala/collection/immutable/ListSet.class w/scala/collection/immutable/ListSet.class
index 5c95438e61..1ff5eb68c1 100644
--- c/scala/collection/immutable/ListSet.class
+++ w/scala/collection/immutable/ListSet.class
@@ -4,7 +4,7 @@ public final #= # of #; //EmptyListSet$=class scala/collection/immutable/ListSet
 public #= # of #; //ListSetBuilder=class scala/collection/immutable/ListSet$ListSetBuilder of class scala/collection/immutable/ListSet
 
 Compiled from "ListSet.scala"
-public class scala.collection.immutable.ListSet extends scala.collection.AbstractSet implements scala.collection.immutable.Set,scala.collection.generic.GenericSetTemplate,scala.collection.SetLike,scala.Serializable,scala.ScalaObject{
+public class scala.collection.immutable.ListSet extends scala.collection.AbstractSet implements scala.collection.immutable.Set,scala.Serializable{
 public static scala.collection.generic.CanBuildFrom canBuildFrom();
   Signature: ()Lscala/collection/generic/CanBuildFrom;
   Code:
diff --git c/scala/collection/immutable/LongMap$Bin.class w/scala/collection/immutable/LongMap$Bin.class
index 7853b57b20..4942069c00 100644
--- c/scala/collection/immutable/LongMap$Bin.class
+++ w/scala/collection/immutable/LongMap$Bin.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //Bin=class scala/collection/immutable/LongMap$Bin of class scala/collection/immutable/LongMap
 
 Compiled from "LongMap.scala"
-public class scala.collection.immutable.LongMap$Bin extends scala.collection.immutable.LongMap implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.immutable.LongMap$Bin extends scala.collection.immutable.LongMap implements scala.Product,scala.Serializable{
 private final long prefix;
   Signature: J
 
diff --git c/scala/collection/immutable/LongMap$Nil$.class w/scala/collection/immutable/LongMap$Nil$.class
index c3a6d77e12..65f2cf7989 100644
--- c/scala/collection/immutable/LongMap$Nil$.class
+++ w/scala/collection/immutable/LongMap$Nil$.class
@@ -2,7 +2,7 @@ InnerClasses:
 public final #= # of #; //Nil$=class scala/collection/immutable/LongMap$Nil$ of class scala/collection/immutable/LongMap
 
 Compiled from "LongMap.scala"
-public final class scala.collection.immutable.LongMap$Nil$ extends scala.collection.immutable.LongMap implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.collection.immutable.LongMap$Nil$ extends scala.collection.immutable.LongMap implements scala.Product,scala.Serializable{
 public static final scala.collection.immutable.LongMap$Nil$ MODULE$;
   Signature: Lscala/collection/immutable/LongMap$Nil$;
 
diff --git c/scala/collection/immutable/LongMap$Tip.class w/scala/collection/immutable/LongMap$Tip.class
index dacd40d433..ae3fd10059 100644
--- c/scala/collection/immutable/LongMap$Tip.class
+++ w/scala/collection/immutable/LongMap$Tip.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //Tip=class scala/collection/immutable/LongMap$Tip of class scala/collection/immutable/LongMap
 
 Compiled from "LongMap.scala"
-public class scala.collection.immutable.LongMap$Tip extends scala.collection.immutable.LongMap implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.immutable.LongMap$Tip extends scala.collection.immutable.LongMap implements scala.Product,scala.Serializable{
 private final long key;
   Signature: J
 
diff --git c/scala/collection/immutable/LongMap.class w/scala/collection/immutable/LongMap.class
index 5bed24cedc..7acd412efa 100644
--- c/scala/collection/immutable/LongMap.class
+++ w/scala/collection/immutable/LongMap.class
@@ -7,7 +7,7 @@ public final #= # of #; //Bin$=class scala/collection/immutable/LongMap$Bin$ of
 public abstract #= # of #; //Long=class scala/collection/generic/BitOperations$Long of class scala/collection/generic/BitOperations
 
 Compiled from "LongMap.scala"
-public abstract class scala.collection.immutable.LongMap extends scala.collection.immutable.AbstractMap implements scala.collection.immutable.Map,scala.collection.immutable.MapLike,scala.ScalaObject{
+public abstract class scala.collection.immutable.LongMap extends scala.collection.immutable.AbstractMap implements scala.collection.immutable.Map{
 public static scala.collection.immutable.LongMap singleton(long, java.lang.Object);
   Signature: (JLjava/lang/Object;)Lscala/collection/immutable/LongMap;
   Code:
diff --git c/scala/collection/immutable/LongMapUtils$.class w/scala/collection/immutable/LongMapUtils$.class
index 63b01de308..f87f0c0454 100644
--- c/scala/collection/immutable/LongMapUtils$.class
+++ w/scala/collection/immutable/LongMapUtils$.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //Long=class scala/collection/generic/BitOperations$L
 public abstract #= # of #; //Long$class=class scala/collection/generic/BitOperations$Long$class of class scala/collection/generic/BitOperations
 
 Compiled from "LongMap.scala"
-public final class scala.collection.immutable.LongMapUtils$ extends java.lang.Object implements scala.collection.generic.BitOperations$Long,scala.ScalaObject{
+public final class scala.collection.immutable.LongMapUtils$ extends java.lang.Object implements scala.collection.generic.BitOperations$Long{
 public static final scala.collection.immutable.LongMapUtils$ MODULE$;
   Signature: Lscala/collection/immutable/LongMapUtils$;
 
diff --git c/scala/collection/immutable/Map$EmptyMap$.class w/scala/collection/immutable/Map$EmptyMap$.class
index b114e9d76b..83d24b400a 100644
--- c/scala/collection/immutable/Map$EmptyMap$.class
+++ w/scala/collection/immutable/Map$EmptyMap$.class
@@ -3,7 +3,7 @@ public #= # of #; //Map=class scala/collection/immutable/Map$Map of class scala/
 public final #= # of #; //EmptyMap$=class scala/collection/immutable/Map$EmptyMap$ of class scala/collection/immutable/Map
 
 Compiled from "Map.scala"
-public final class scala.collection.immutable.Map$EmptyMap$ extends scala.collection.immutable.AbstractMap implements scala.collection.immutable.Map,scala.Serializable,scala.ScalaObject{
+public final class scala.collection.immutable.Map$EmptyMap$ extends scala.collection.immutable.AbstractMap implements scala.collection.immutable.Map,scala.Serializable{
 public static final scala.collection.immutable.Map$EmptyMap$ MODULE$;
   Signature: Lscala/collection/immutable/Map$EmptyMap$;
 
diff --git c/scala/collection/immutable/Map$Map1.class w/scala/collection/immutable/Map$Map1.class
index 95ee660ec8..dd838b2c9c 100644
--- c/scala/collection/immutable/Map$Map1.class
+++ w/scala/collection/immutable/Map$Map1.class
@@ -3,7 +3,7 @@ public #= # of #; //Map=class scala/collection/immutable/Map$Map of class scala/
 public #= # of #; //Map=class scala/collection/immutable/Map$Map of class scala/collection/immutable/Map
 
 Compiled from "Map.scala"
-public class scala.collection.immutable.Map$Map1 extends scala.collection.immutable.AbstractMap implements scala.collection.immutable.Map,scala.Serializable,scala.ScalaObject{
+public class scala.collection.immutable.Map$Map1 extends scala.collection.immutable.AbstractMap implements scala.collection.immutable.Map,scala.Serializable{
 private final java.lang.Object key1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/collection/immutable/Map$Map2.class w/scala/collection/immutable/Map$Map2.class
index a3cb20e8a5..c3fb40574f 100644
--- c/scala/collection/immutable/Map$Map2.class
+++ w/scala/collection/immutable/Map$Map2.class
@@ -4,7 +4,7 @@ public #= # of #; //Map=class scala/collection/immutable/Map$Map of class scala/
 public #= # of #; //Map=class scala/collection/immutable/Map$Map of class scala/collection/immutable/Map
 
 Compiled from "Map.scala"
-public class scala.collection.immutable.Map$Map2 extends scala.collection.immutable.AbstractMap implements scala.collection.immutable.Map,scala.Serializable,scala.ScalaObject{
+public class scala.collection.immutable.Map$Map2 extends scala.collection.immutable.AbstractMap implements scala.collection.immutable.Map,scala.Serializable{
 private final java.lang.Object key1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/collection/immutable/Map$Map3.class w/scala/collection/immutable/Map$Map3.class
index a78356805d..c18d78e234 100644
--- c/scala/collection/immutable/Map$Map3.class
+++ w/scala/collection/immutable/Map$Map3.class
@@ -4,7 +4,7 @@ public #= # of #; //Map=class scala/collection/immutable/Map$Map of class scala/
 public #= # of #; //Map=class scala/collection/immutable/Map$Map of class scala/collection/immutable/Map
 
 Compiled from "Map.scala"
-public class scala.collection.immutable.Map$Map3 extends scala.collection.immutable.AbstractMap implements scala.collection.immutable.Map,scala.Serializable,scala.ScalaObject{
+public class scala.collection.immutable.Map$Map3 extends scala.collection.immutable.AbstractMap implements scala.collection.immutable.Map,scala.Serializable{
 private final java.lang.Object key1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/collection/immutable/Map$Map4.class w/scala/collection/immutable/Map$Map4.class
index 9e1dc5ca1b..90d62d2db8 100644
--- c/scala/collection/immutable/Map$Map4.class
+++ w/scala/collection/immutable/Map$Map4.class
@@ -3,7 +3,7 @@ public #= # of #; //Map=class scala/collection/immutable/Map$Map of class scala/
 public #= # of #; //Map=class scala/collection/immutable/Map$Map of class scala/collection/immutable/Map
 
 Compiled from "Map.scala"
-public class scala.collection.immutable.Map$Map4 extends scala.collection.immutable.AbstractMap implements scala.collection.immutable.Map,scala.Serializable,scala.ScalaObject{
+public class scala.collection.immutable.Map$Map4 extends scala.collection.immutable.AbstractMap implements scala.collection.immutable.Map,scala.Serializable{
 private final java.lang.Object key1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/collection/immutable/Map$WithDefault.class w/scala/collection/immutable/Map$WithDefault.class
index 536dd3bd18..c5d2fa4fba 100644
--- c/scala/collection/immutable/Map$WithDefault.class
+++ w/scala/collection/immutable/Map$WithDefault.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //WithDefault=class scala/collection/Map$WithDefault
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "Map.scala"
-public class scala.collection.immutable.Map$WithDefault extends scala.collection.Map$WithDefault implements scala.collection.immutable.Map,scala.ScalaObject{
+public class scala.collection.immutable.Map$WithDefault extends scala.collection.Map$WithDefault implements scala.collection.immutable.Map{
 private final scala.collection.immutable.Map underlying;
   Signature: Lscala/collection/immutable/Map;
 
diff --git c/scala/collection/immutable/Map.class w/scala/collection/immutable/Map.class
index 3d20ddfb50..af70a1bd82 100644
--- c/scala/collection/immutable/Map.class
+++ w/scala/collection/immutable/Map.class
@@ -8,7 +8,7 @@ public #= # of #; //WithDefault=class scala/collection/immutable/Map$WithDefault
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "Map.scala"
-public interface scala.collection.immutable.Map extends scala.collection.immutable.Iterable,scala.collection.Map,scala.collection.immutable.MapLike,scala.ScalaObject{
+public interface scala.collection.immutable.Map extends scala.collection.immutable.Iterable,scala.collection.Map,scala.collection.immutable.MapLike{
 public abstract scala.collection.immutable.Map empty();
   Signature: ()Lscala/collection/immutable/Map;
 
diff --git c/scala/collection/immutable/MapLike$ImmutableDefaultKeySet.class w/scala/collection/immutable/MapLike$ImmutableDefaultKeySet.class
index 24e139ce1d..240b856fa9 100644
--- c/scala/collection/immutable/MapLike$ImmutableDefaultKeySet.class
+++ w/scala/collection/immutable/MapLike$ImmutableDefaultKeySet.class
@@ -3,7 +3,7 @@ public #= # of #; //DefaultKeySet=class scala/collection/MapLike$DefaultKeySet o
 public #= # of #; //ImmutableDefaultKeySet=class scala/collection/immutable/MapLike$ImmutableDefaultKeySet of class scala/collection/immutable/MapLike
 
 Compiled from "MapLike.scala"
-public class scala.collection.immutable.MapLike$ImmutableDefaultKeySet extends scala.collection.MapLike$DefaultKeySet implements scala.collection.immutable.Set,scala.ScalaObject{
+public class scala.collection.immutable.MapLike$ImmutableDefaultKeySet extends scala.collection.MapLike$DefaultKeySet implements scala.collection.immutable.Set{
 public final scala.collection.immutable.MapLike $outer;
   Signature: Lscala/collection/immutable/MapLike;
 
diff --git c/scala/collection/immutable/MapLike.class w/scala/collection/immutable/MapLike.class
index ac0ca4df69..0130d65a03 100644
--- c/scala/collection/immutable/MapLike.class
+++ w/scala/collection/immutable/MapLike.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //ImmutableDefaultKeySet=class scala/collection/immutable/MapLike$ImmutableDefaultKeySet of class scala/collection/immutable/MapLike
 
 Compiled from "MapLike.scala"
-public interface scala.collection.immutable.MapLike extends scala.collection.MapLike,scala.collection.Parallelizable,scala.ScalaObject{
+public interface scala.collection.immutable.MapLike extends scala.collection.MapLike{
 public abstract scala.collection.parallel.Combiner parCombiner();
   Signature: ()Lscala/collection/parallel/Combiner;
 
diff --git c/scala/collection/immutable/MapProxy.class w/scala/collection/immutable/MapProxy.class
index fd7ccb55f1..7a965c8d9c 100644
--- c/scala/collection/immutable/MapProxy.class
+++ w/scala/collection/immutable/MapProxy.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "MapProxy.scala"
-public interface scala.collection.immutable.MapProxy extends scala.collection.immutable.Map,scala.collection.MapProxyLike,scala.ScalaObject{
+public interface scala.collection.immutable.MapProxy extends scala.collection.immutable.Map,scala.collection.MapProxyLike{
 public abstract scala.collection.immutable.MapProxy repr();
   Signature: ()Lscala/collection/immutable/MapProxy;
 
diff --git c/scala/collection/immutable/Nil$.class w/scala/collection/immutable/Nil$.class
index 1041df01da..6d44a4de1b 100644
--- c/scala/collection/immutable/Nil$.class
+++ w/scala/collection/immutable/Nil$.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "List.scala"
-public final class scala.collection.immutable.Nil$ extends scala.collection.immutable.List implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.collection.immutable.Nil$ extends scala.collection.immutable.List implements scala.Product,scala.Serializable{
 public static final scala.collection.immutable.Nil$ MODULE$;
   Signature: Lscala/collection/immutable/Nil$;
 
diff --git c/scala/collection/immutable/NumericRange.class w/scala/collection/immutable/NumericRange.class
index 50a50c350f..fdb5a2a893 100644
--- c/scala/collection/immutable/NumericRange.class
+++ w/scala/collection/immutable/NumericRange.class
@@ -6,7 +6,7 @@ public #= # of #; //Inclusive=class scala/collection/immutable/NumericRange$Incl
 public #= # of #; //Exclusive=class scala/collection/immutable/NumericRange$Exclusive of class scala/collection/immutable/NumericRange
 
 Compiled from "NumericRange.scala"
-public abstract class scala.collection.immutable.NumericRange extends scala.collection.AbstractSeq implements scala.collection.immutable.IndexedSeq,scala.Serializable,scala.ScalaObject{
+public abstract class scala.collection.immutable.NumericRange extends scala.collection.AbstractSeq implements scala.collection.immutable.IndexedSeq,scala.Serializable{
 private final java.lang.Object start;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/collection/immutable/PagedSeq.class w/scala/collection/immutable/PagedSeq.class
index b2e9430b8f..8fcb75d9db 100644
--- c/scala/collection/immutable/PagedSeq.class
+++ w/scala/collection/immutable/PagedSeq.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "PagedSeq.scala"
-public class scala.collection.immutable.PagedSeq extends scala.collection.AbstractSeq implements scala.collection.IndexedSeq,scala.ScalaObject{
+public class scala.collection.immutable.PagedSeq extends scala.collection.AbstractSeq implements scala.collection.IndexedSeq{
 private final scala.Function3 more;
   Signature: Lscala/Function3;
 
diff --git c/scala/collection/immutable/Queue.class w/scala/collection/immutable/Queue.class
index f0d6579eb6..07a5f40932 100644
--- c/scala/collection/immutable/Queue.class
+++ w/scala/collection/immutable/Queue.class
@@ -2,7 +2,7 @@ InnerClasses:
 public final #= # of #; //EmptyQueue$=class scala/collection/immutable/Queue$EmptyQueue$ of class scala/collection/immutable/Queue
 
 Compiled from "Queue.scala"
-public class scala.collection.immutable.Queue extends scala.collection.AbstractSeq implements scala.collection.immutable.LinearSeq,scala.collection.generic.GenericTraversableTemplate,scala.collection.LinearSeqLike,scala.Serializable,scala.ScalaObject{
+public class scala.collection.immutable.Queue extends scala.collection.AbstractSeq implements scala.collection.immutable.LinearSeq,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/immutable/Range.class w/scala/collection/immutable/Range.class
index a73f1fd46c..3c942be5dc 100644
--- c/scala/collection/immutable/Range.class
+++ w/scala/collection/immutable/Range.class
@@ -9,7 +9,7 @@ public #= # of #; //Inclusive=class scala/collection/immutable/Range$Inclusive o
 public final #= # of #; //BigDecimal$=class scala/collection/immutable/Range$BigDecimal$ of class scala/collection/immutable/Range
 
 Compiled from "Range.scala"
-public class scala.collection.immutable.Range extends scala.collection.AbstractSeq implements scala.collection.immutable.IndexedSeq,scala.collection.CustomParallelizable,scala.Serializable,scala.ScalaObject{
+public class scala.collection.immutable.Range extends scala.collection.AbstractSeq implements scala.collection.immutable.IndexedSeq,scala.collection.CustomParallelizable,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/immutable/RedBlack$BlackTree.class w/scala/collection/immutable/RedBlack$BlackTree.class
index 505e8403fc..9fee10769b 100644
--- c/scala/collection/immutable/RedBlack$BlackTree.class
+++ w/scala/collection/immutable/RedBlack$BlackTree.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //NonEmpty=class scala/collection/immutable/RedBlack$
 public #= # of #; //BlackTree=class scala/collection/immutable/RedBlack$BlackTree of class scala/collection/immutable/RedBlack
 
 Compiled from "RedBlack.scala"
-public class scala.collection.immutable.RedBlack$BlackTree extends scala.collection.immutable.RedBlack$NonEmpty implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.immutable.RedBlack$BlackTree extends scala.collection.immutable.RedBlack$NonEmpty implements scala.Product,scala.Serializable{
 private final java.lang.Object key;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/collection/immutable/RedBlack$Empty$.class w/scala/collection/immutable/RedBlack$Empty$.class
index bcd5cd6da8..91dfc5a9e7 100644
--- c/scala/collection/immutable/RedBlack$Empty$.class
+++ w/scala/collection/immutable/RedBlack$Empty$.class
@@ -5,7 +5,7 @@ public #= # of #; //RedTree=class scala/collection/immutable/RedBlack$RedTree of
 public abstract #= # of #; //NonEmpty=class scala/collection/immutable/RedBlack$NonEmpty of class scala/collection/immutable/RedBlack
 
 Compiled from "RedBlack.scala"
-public final class scala.collection.immutable.RedBlack$Empty$ extends scala.collection.immutable.RedBlack$Tree implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.collection.immutable.RedBlack$Empty$ extends scala.collection.immutable.RedBlack$Tree implements scala.Product,scala.Serializable{
 public boolean isEmpty();
   Signature: ()Z
   Code:
diff --git c/scala/collection/immutable/RedBlack$RedTree.class w/scala/collection/immutable/RedBlack$RedTree.class
index 8398edd3e8..d7b3fdb6dc 100644
--- c/scala/collection/immutable/RedBlack$RedTree.class
+++ w/scala/collection/immutable/RedBlack$RedTree.class
@@ -4,7 +4,7 @@ public #= # of #; //RedTree=class scala/collection/immutable/RedBlack$RedTree of
 public abstract #= # of #; //NonEmpty=class scala/collection/immutable/RedBlack$NonEmpty of class scala/collection/immutable/RedBlack
 
 Compiled from "RedBlack.scala"
-public class scala.collection.immutable.RedBlack$RedTree extends scala.collection.immutable.RedBlack$NonEmpty implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.immutable.RedBlack$RedTree extends scala.collection.immutable.RedBlack$NonEmpty implements scala.Product,scala.Serializable{
 private final java.lang.Object key;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/collection/immutable/Seq.class w/scala/collection/immutable/Seq.class
index 3a1755f585..9405cc1363 100644
--- c/scala/collection/immutable/Seq.class
+++ w/scala/collection/immutable/Seq.class
@@ -1,6 +1,6 @@
 
 Compiled from "Seq.scala"
-public interface scala.collection.immutable.Seq extends scala.collection.immutable.Iterable,scala.collection.Seq,scala.collection.generic.GenericTraversableTemplate,scala.collection.SeqLike,scala.collection.Parallelizable,scala.ScalaObject{
+public interface scala.collection.immutable.Seq extends scala.collection.immutable.Iterable,scala.collection.Seq{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/immutable/Set$EmptySet$.class w/scala/collection/immutable/Set$EmptySet$.class
index ae7e30eaa8..457020999c 100644
--- c/scala/collection/immutable/Set$EmptySet$.class
+++ w/scala/collection/immutable/Set$EmptySet$.class
@@ -3,7 +3,7 @@ public #= # of #; //Set=class scala/collection/immutable/Set$Set of class scala/
 public final #= # of #; //EmptySet$=class scala/collection/immutable/Set$EmptySet$ of class scala/collection/immutable/Set
 
 Compiled from "Set.scala"
-public final class scala.collection.immutable.Set$EmptySet$ extends scala.collection.AbstractSet implements scala.collection.immutable.Set,scala.Serializable,scala.ScalaObject{
+public final class scala.collection.immutable.Set$EmptySet$ extends scala.collection.AbstractSet implements scala.collection.immutable.Set,scala.Serializable{
 public static final scala.collection.immutable.Set$EmptySet$ MODULE$;
   Signature: Lscala/collection/immutable/Set$EmptySet$;
 
diff --git c/scala/collection/immutable/Set$Set1.class w/scala/collection/immutable/Set$Set1.class
index 3fd69003ae..90e2f98615 100644
--- c/scala/collection/immutable/Set$Set1.class
+++ w/scala/collection/immutable/Set$Set1.class
@@ -3,7 +3,7 @@ public #= # of #; //Set=class scala/collection/immutable/Set$Set of class scala/
 public #= # of #; //Set=class scala/collection/immutable/Set$Set of class scala/collection/immutable/Set
 
 Compiled from "Set.scala"
-public class scala.collection.immutable.Set$Set1 extends scala.collection.AbstractSet implements scala.collection.immutable.Set,scala.Serializable,scala.ScalaObject{
+public class scala.collection.immutable.Set$Set1 extends scala.collection.AbstractSet implements scala.collection.immutable.Set,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/immutable/Set$Set2.class w/scala/collection/immutable/Set$Set2.class
index 0424026c2b..105335199c 100644
--- c/scala/collection/immutable/Set$Set2.class
+++ w/scala/collection/immutable/Set$Set2.class
@@ -4,7 +4,7 @@ public #= # of #; //Set=class scala/collection/immutable/Set$Set of class scala/
 public #= # of #; //Set=class scala/collection/immutable/Set$Set of class scala/collection/immutable/Set
 
 Compiled from "Set.scala"
-public class scala.collection.immutable.Set$Set2 extends scala.collection.AbstractSet implements scala.collection.immutable.Set,scala.Serializable,scala.ScalaObject{
+public class scala.collection.immutable.Set$Set2 extends scala.collection.AbstractSet implements scala.collection.immutable.Set,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/immutable/Set$Set3.class w/scala/collection/immutable/Set$Set3.class
index 50bda85571..0641b8f01e 100644
--- c/scala/collection/immutable/Set$Set3.class
+++ w/scala/collection/immutable/Set$Set3.class
@@ -4,7 +4,7 @@ public #= # of #; //Set=class scala/collection/immutable/Set$Set of class scala/
 public #= # of #; //Set=class scala/collection/immutable/Set$Set of class scala/collection/immutable/Set
 
 Compiled from "Set.scala"
-public class scala.collection.immutable.Set$Set3 extends scala.collection.AbstractSet implements scala.collection.immutable.Set,scala.Serializable,scala.ScalaObject{
+public class scala.collection.immutable.Set$Set3 extends scala.collection.AbstractSet implements scala.collection.immutable.Set,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/immutable/Set$Set4.class w/scala/collection/immutable/Set$Set4.class
index a8736c137b..52d16b90bb 100644
--- c/scala/collection/immutable/Set$Set4.class
+++ w/scala/collection/immutable/Set$Set4.class
@@ -3,7 +3,7 @@ public #= # of #; //Set=class scala/collection/immutable/Set$Set of class scala/
 public #= # of #; //Set=class scala/collection/immutable/Set$Set of class scala/collection/immutable/Set
 
 Compiled from "Set.scala"
-public class scala.collection.immutable.Set$Set4 extends scala.collection.AbstractSet implements scala.collection.immutable.Set,scala.Serializable,scala.ScalaObject{
+public class scala.collection.immutable.Set$Set4 extends scala.collection.AbstractSet implements scala.collection.immutable.Set,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/immutable/Set.class w/scala/collection/immutable/Set.class
index 45030c0dc4..3a69063567 100644
--- c/scala/collection/immutable/Set.class
+++ w/scala/collection/immutable/Set.class
@@ -6,7 +6,7 @@ public #= # of #; //Set=class scala/collection/immutable/Set$Set of class scala/
 public final #= # of #; //EmptySet$=class scala/collection/immutable/Set$EmptySet$ of class scala/collection/immutable/Set
 
 Compiled from "Set.scala"
-public interface scala.collection.immutable.Set extends scala.collection.immutable.Iterable,scala.collection.Set,scala.collection.generic.GenericSetTemplate,scala.collection.SetLike,scala.collection.Parallelizable,scala.ScalaObject{
+public interface scala.collection.immutable.Set extends scala.collection.immutable.Iterable,scala.collection.Set{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/immutable/SetProxy.class w/scala/collection/immutable/SetProxy.class
index 96718a3995..50cc588ad6 100644
--- c/scala/collection/immutable/SetProxy.class
+++ w/scala/collection/immutable/SetProxy.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "SetProxy.scala"
-public interface scala.collection.immutable.SetProxy extends scala.collection.immutable.Set,scala.collection.SetProxyLike,scala.ScalaObject{
+public interface scala.collection.immutable.SetProxy extends scala.collection.immutable.Set,scala.collection.SetProxyLike{
 public abstract scala.collection.immutable.SetProxy repr();
   Signature: ()Lscala/collection/immutable/SetProxy;
 
diff --git c/scala/collection/immutable/SortedMap$DefaultKeySortedSet.class w/scala/collection/immutable/SortedMap$DefaultKeySortedSet.class
index 1f6c361758..0df879da6c 100644
--- c/scala/collection/immutable/SortedMap$DefaultKeySortedSet.class
+++ w/scala/collection/immutable/SortedMap$DefaultKeySortedSet.class
@@ -3,7 +3,7 @@ public #= # of #; //DefaultKeySortedSet=class scala/collection/immutable/SortedM
 public #= # of #; //DefaultKeySortedSet=class scala/collection/SortedMapLike$DefaultKeySortedSet of class scala/collection/SortedMapLike
 
 Compiled from "SortedMap.scala"
-public class scala.collection.immutable.SortedMap$DefaultKeySortedSet extends scala.collection.SortedMapLike$DefaultKeySortedSet implements scala.collection.immutable.SortedSet,scala.ScalaObject{
+public class scala.collection.immutable.SortedMap$DefaultKeySortedSet extends scala.collection.SortedMapLike$DefaultKeySortedSet implements scala.collection.immutable.SortedSet{
 public final scala.collection.immutable.SortedMap $outer;
   Signature: Lscala/collection/immutable/SortedMap;
 
diff --git c/scala/collection/immutable/SortedMap.class w/scala/collection/immutable/SortedMap.class
index 16acb456a8..fe0ac2dddc 100644
--- c/scala/collection/immutable/SortedMap.class
+++ w/scala/collection/immutable/SortedMap.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //DefaultKeySortedSet=class scala/collection/immutable/SortedMap$DefaultKeySortedSet of class scala/collection/immutable/SortedMap
 
 Compiled from "SortedMap.scala"
-public interface scala.collection.immutable.SortedMap extends scala.collection.immutable.Map,scala.collection.SortedMap,scala.collection.immutable.MapLike,scala.collection.SortedMapLike,scala.ScalaObject{
+public interface scala.collection.immutable.SortedMap extends scala.collection.immutable.Map,scala.collection.SortedMap{
 public abstract scala.collection.mutable.Builder newBuilder();
   Signature: ()Lscala/collection/mutable/Builder;
 
diff --git c/scala/collection/immutable/SortedSet.class w/scala/collection/immutable/SortedSet.class
index f4d20094f5..8f6d774337 100644
--- c/scala/collection/immutable/SortedSet.class
+++ w/scala/collection/immutable/SortedSet.class
@@ -1,6 +1,6 @@
 
 Compiled from "SortedSet.scala"
-public interface scala.collection.immutable.SortedSet extends scala.collection.immutable.Set,scala.collection.SortedSet,scala.collection.SortedSetLike,scala.ScalaObject{
+public interface scala.collection.immutable.SortedSet extends scala.collection.immutable.Set,scala.collection.SortedSet{
 public abstract scala.collection.immutable.SortedSet empty();
   Signature: ()Lscala/collection/immutable/SortedSet;
 
diff --git c/scala/collection/immutable/Stack.class w/scala/collection/immutable/Stack.class
index a46c7dce30..9ef86d90b5 100644
--- c/scala/collection/immutable/Stack.class
+++ w/scala/collection/immutable/Stack.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "Stack.scala"
-public class scala.collection.immutable.Stack extends scala.collection.AbstractSeq implements scala.collection.immutable.LinearSeq,scala.collection.generic.GenericTraversableTemplate,scala.collection.LinearSeqOptimized,scala.Serializable,scala.ScalaObject{
+public class scala.collection.immutable.Stack extends scala.collection.AbstractSeq implements scala.collection.immutable.LinearSeq,scala.collection.LinearSeqOptimized,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/immutable/Stream.class w/scala/collection/immutable/Stream.class
index 32d82fb525..dc75c42703 100644
--- c/scala/collection/immutable/Stream.class
+++ w/scala/collection/immutable/Stream.class
@@ -10,7 +10,7 @@ public #= # of #; //StreamCanBuildFrom=class scala/collection/immutable/Stream$S
 public #= # of #; //GenericCanBuildFrom=class scala/collection/generic/GenTraversableFactory$GenericCanBuildFrom of class scala/collection/generic/GenTraversableFactory
 
 Compiled from "Stream.scala"
-public abstract class scala.collection.immutable.Stream extends scala.collection.AbstractSeq implements scala.collection.immutable.LinearSeq,scala.collection.generic.GenericTraversableTemplate,scala.collection.LinearSeqOptimized,scala.ScalaObject{
+public abstract class scala.collection.immutable.Stream extends scala.collection.AbstractSeq implements scala.collection.immutable.LinearSeq,scala.collection.LinearSeqOptimized{
 public static scala.collection.immutable.Stream range(java.lang.Object, java.lang.Object, java.lang.Object, scala.math.Integral);
   Signature: (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Lscala/math/Integral;)Lscala/collection/immutable/Stream;
   Code:
diff --git c/scala/collection/immutable/StreamIterator.class w/scala/collection/immutable/StreamIterator.class
index 6f80168f8d..9a53df41d5 100644
--- c/scala/collection/immutable/StreamIterator.class
+++ w/scala/collection/immutable/StreamIterator.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //LazyCell=class scala/collection/immutable/StreamIterator$LazyCell of class scala/collection/immutable/StreamIterator
 
 Compiled from "Stream.scala"
-public final class scala.collection.immutable.StreamIterator extends scala.collection.AbstractIterator implements scala.collection.Iterator,scala.ScalaObject{
+public final class scala.collection.immutable.StreamIterator extends scala.collection.AbstractIterator implements scala.collection.Iterator{
 public final scala.collection.immutable.Stream scala$collection$immutable$StreamIterator$$self;
   Signature: Lscala/collection/immutable/Stream;
 
diff --git c/scala/collection/immutable/StreamViewLike$AbstractTransformed.class w/scala/collection/immutable/StreamViewLike$AbstractTransformed.class
index 00cc54092b..446c9b7225 100644
--- c/scala/collection/immutable/StreamViewLike$AbstractTransformed.class
+++ w/scala/collection/immutable/StreamViewLike$AbstractTransformed.class
@@ -8,7 +8,7 @@ public abstract #= # of #; //Transformed$class=class scala/collection/immutable/
 public abstract #= # of #; //AbstractTransformed=class scala/collection/immutable/StreamViewLike$AbstractTransformed of class scala/collection/immutable/StreamViewLike
 
 Compiled from "StreamViewLike.scala"
-public abstract class scala.collection.immutable.StreamViewLike$AbstractTransformed extends scala.collection.SeqViewLike$AbstractTransformed implements scala.collection.immutable.StreamViewLike$Transformed,scala.ScalaObject{
+public abstract class scala.collection.immutable.StreamViewLike$AbstractTransformed extends scala.collection.SeqViewLike$AbstractTransformed implements scala.collection.immutable.StreamViewLike$Transformed{
 public final scala.collection.immutable.StreamViewLike $outer;
   Signature: Lscala/collection/immutable/StreamViewLike;
 
diff --git c/scala/collection/immutable/StreamViewLike$Transformed.class w/scala/collection/immutable/StreamViewLike$Transformed.class
index e681d078e6..97425195ab 100644
--- c/scala/collection/immutable/StreamViewLike$Transformed.class
+++ w/scala/collection/immutable/StreamViewLike$Transformed.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Transformed=class scala/collection/SeqViewLike$Tran
 public abstract #= # of #; //Transformed=class scala/collection/immutable/StreamViewLike$Transformed of class scala/collection/immutable/StreamViewLike
 
 Compiled from "StreamViewLike.scala"
-public interface scala.collection.immutable.StreamViewLike$Transformed extends scala.collection.immutable.StreamView,scala.collection.SeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.immutable.StreamViewLike$Transformed extends scala.collection.immutable.StreamView,scala.collection.SeqViewLike$Transformed{
 public abstract java.lang.String toString();
   Signature: ()Ljava/lang/String;
 
diff --git c/scala/collection/immutable/StreamViewLike.class w/scala/collection/immutable/StreamViewLike.class
index 71a1a3748f..ee80f1f81a 100644
--- c/scala/collection/immutable/StreamViewLike.class
+++ w/scala/collection/immutable/StreamViewLike.class
@@ -18,7 +18,7 @@ public abstract #= # of #; //Transformed$class=class scala/collection/immutable/
 public abstract #= # of #; //AbstractTransformed=class scala/collection/immutable/StreamViewLike$AbstractTransformed of class scala/collection/immutable/StreamViewLike
 
 Compiled from "StreamViewLike.scala"
-public interface scala.collection.immutable.StreamViewLike extends scala.collection.SeqView,scala.collection.SeqViewLike,scala.ScalaObject{
+public interface scala.collection.immutable.StreamViewLike extends scala.collection.SeqView{
 public abstract java.lang.Object force(scala.collection.generic.CanBuildFrom);
   Signature: (Lscala/collection/generic/CanBuildFrom;)Ljava/lang/Object;
 
diff --git c/scala/collection/immutable/StringLike.class w/scala/collection/immutable/StringLike.class
index d37c416023..a90f803bdc 100644
--- c/scala/collection/immutable/StringLike.class
+++ w/scala/collection/immutable/StringLike.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "StringLike.scala"
-public interface scala.collection.immutable.StringLike extends scala.collection.IndexedSeqOptimized,scala.math.Ordered,scala.ScalaObject{
+public interface scala.collection.immutable.StringLike extends scala.collection.IndexedSeqOptimized,scala.math.Ordered{
 public abstract scala.collection.mutable.Builder newBuilder();
   Signature: ()Lscala/collection/mutable/Builder;
 
diff --git c/scala/collection/immutable/StringOps.class w/scala/collection/immutable/StringOps.class
index 7ac822e2a3..00be42c25c 100644
--- c/scala/collection/immutable/StringOps.class
+++ w/scala/collection/immutable/StringOps.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "StringOps.scala"
-public final class scala.collection.immutable.StringOps extends java.lang.Object implements scala.collection.immutable.StringLike,scala.ScalaObject{
+public final class scala.collection.immutable.StringOps extends java.lang.Object implements scala.collection.immutable.StringLike{
 private final java.lang.String repr;
   Signature: Ljava/lang/String;
 
diff --git c/scala/collection/immutable/Traversable$.class w/scala/collection/immutable/Traversable$.class
index c6aa23f39a..08513eda0a 100644
--- c/scala/collection/immutable/Traversable$.class
+++ w/scala/collection/immutable/Traversable$.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //GenericCanBuildFrom=class scala/collection/generic/GenTraversableFactory$GenericCanBuildFrom of class scala/collection/generic/GenTraversableFactory
 
 Compiled from "Traversable.scala"
-public final class scala.collection.immutable.Traversable$ extends scala.collection.generic.GenTraversableFactory implements scala.collection.generic.TraversableFactory,scala.ScalaObject{
+public final class scala.collection.immutable.Traversable$ extends scala.collection.generic.GenTraversableFactory implements scala.collection.generic.TraversableFactory{
 public static final scala.collection.immutable.Traversable$ MODULE$;
   Signature: Lscala/collection/immutable/Traversable$;
 
diff --git c/scala/collection/immutable/Traversable.class w/scala/collection/immutable/Traversable.class
index 173e2932e1..331c3ce470 100644
--- c/scala/collection/immutable/Traversable.class
+++ w/scala/collection/immutable/Traversable.class
@@ -1,6 +1,6 @@
 
 Compiled from "Traversable.scala"
-public interface scala.collection.immutable.Traversable extends scala.collection.Traversable,scala.collection.generic.GenericTraversableTemplate,scala.collection.TraversableLike,scala.Immutable,scala.ScalaObject{
+public interface scala.collection.immutable.Traversable extends scala.collection.Traversable,scala.Immutable{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/immutable/TreeMap.class w/scala/collection/immutable/TreeMap.class
index fbeff7f0a1..341afa0b0c 100644
--- c/scala/collection/immutable/TreeMap.class
+++ w/scala/collection/immutable/TreeMap.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //NonEmpty=class scala/collection/immutable/RedBlack$
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "TreeMap.scala"
-public class scala.collection.immutable.TreeMap extends scala.collection.immutable.RedBlack implements scala.collection.immutable.SortedMap,scala.collection.SortedMapLike,scala.collection.immutable.MapLike,scala.Serializable,scala.ScalaObject{
+public class scala.collection.immutable.TreeMap extends scala.collection.immutable.RedBlack implements scala.collection.immutable.SortedMap,scala.Serializable{
 private final int size;
   Signature: I
 
diff --git c/scala/collection/immutable/TreeSet.class w/scala/collection/immutable/TreeSet.class
index e283cd0ff8..a132584cc7 100644
--- c/scala/collection/immutable/TreeSet.class
+++ w/scala/collection/immutable/TreeSet.class
@@ -4,7 +4,7 @@ public final #= # of #; //Empty$=class scala/collection/immutable/RedBlack$Empty
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "TreeSet.scala"
-public class scala.collection.immutable.TreeSet extends scala.collection.immutable.RedBlack implements scala.collection.immutable.SortedSet,scala.collection.SortedSetLike,scala.Serializable,scala.ScalaObject{
+public class scala.collection.immutable.TreeSet extends scala.collection.immutable.RedBlack implements scala.collection.immutable.SortedSet,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/immutable/Vector.class w/scala/collection/immutable/Vector.class
index 16d5565fbc..5d87a1f478 100644
--- c/scala/collection/immutable/Vector.class
+++ w/scala/collection/immutable/Vector.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //GenericCanBuildFrom=class scala/collection/generic/GenTraversableFactory$GenericCanBuildFrom of class scala/collection/generic/GenTraversableFactory
 
 Compiled from "Vector.scala"
-public final class scala.collection.immutable.Vector extends scala.collection.AbstractSeq implements scala.collection.immutable.IndexedSeq,scala.collection.generic.GenericTraversableTemplate,scala.collection.IndexedSeqLike,scala.collection.immutable.VectorPointer,scala.Serializable,scala.collection.CustomParallelizable,scala.ScalaObject{
+public final class scala.collection.immutable.Vector extends scala.collection.AbstractSeq implements scala.collection.immutable.IndexedSeq,scala.collection.immutable.VectorPointer,scala.Serializable,scala.collection.CustomParallelizable{
 private final int startIndex;
   Signature: I
 
diff --git c/scala/collection/immutable/VectorBuilder.class w/scala/collection/immutable/VectorBuilder.class
index ed3dae1f78..63091bd660 100644
--- c/scala/collection/immutable/VectorBuilder.class
+++ w/scala/collection/immutable/VectorBuilder.class
@@ -1,6 +1,6 @@
 
 Compiled from "Vector.scala"
-public final class scala.collection.immutable.VectorBuilder extends java.lang.Object implements scala.collection.mutable.Builder,scala.collection.immutable.VectorPointer,scala.ScalaObject{
+public final class scala.collection.immutable.VectorBuilder extends java.lang.Object implements scala.collection.mutable.Builder,scala.collection.immutable.VectorPointer{
 private int blockIndex;
   Signature: I
 
diff --git c/scala/collection/immutable/VectorIterator.class w/scala/collection/immutable/VectorIterator.class
index 54e30af5c7..45e5c0b1ef 100644
--- c/scala/collection/immutable/VectorIterator.class
+++ w/scala/collection/immutable/VectorIterator.class
@@ -1,6 +1,6 @@
 
 Compiled from "Vector.scala"
-public class scala.collection.immutable.VectorIterator extends scala.collection.AbstractIterator implements scala.collection.Iterator,scala.collection.immutable.VectorPointer,scala.ScalaObject{
+public class scala.collection.immutable.VectorIterator extends scala.collection.AbstractIterator implements scala.collection.Iterator,scala.collection.immutable.VectorPointer{
 private final int _endIndex;
   Signature: I
 
diff --git c/scala/collection/immutable/WrappedString.class w/scala/collection/immutable/WrappedString.class
index 55e3e42ca4..043bd86591 100644
--- c/scala/collection/immutable/WrappedString.class
+++ w/scala/collection/immutable/WrappedString.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "WrappedString.scala"
-public class scala.collection.immutable.WrappedString extends scala.collection.AbstractSeq implements scala.collection.immutable.IndexedSeq,scala.collection.immutable.StringLike,scala.ScalaObject{
+public class scala.collection.immutable.WrappedString extends scala.collection.AbstractSeq implements scala.collection.immutable.IndexedSeq,scala.collection.immutable.StringLike{
 private final java.lang.String self;
   Signature: Ljava/lang/String;
 
diff --git c/scala/collection/mutable/AbstractBuffer.class w/scala/collection/mutable/AbstractBuffer.class
index aed9d84d1e..1fd5984112 100644
--- c/scala/collection/mutable/AbstractBuffer.class
+++ w/scala/collection/mutable/AbstractBuffer.class
@@ -1,6 +1,6 @@
 
 Compiled from "Buffer.scala"
-public abstract class scala.collection.mutable.AbstractBuffer extends scala.collection.mutable.AbstractSeq implements scala.collection.mutable.Buffer,scala.ScalaObject{
+public abstract class scala.collection.mutable.AbstractBuffer extends scala.collection.mutable.AbstractSeq implements scala.collection.mutable.Buffer{
 public scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
   Code:
diff --git c/scala/collection/mutable/AbstractIterable.class w/scala/collection/mutable/AbstractIterable.class
index 28db22381f..8a0e8c23e3 100644
--- c/scala/collection/mutable/AbstractIterable.class
+++ w/scala/collection/mutable/AbstractIterable.class
@@ -1,6 +1,6 @@
 
 Compiled from "Iterable.scala"
-public abstract class scala.collection.mutable.AbstractIterable extends scala.collection.AbstractIterable implements scala.collection.mutable.Iterable,scala.ScalaObject{
+public abstract class scala.collection.mutable.AbstractIterable extends scala.collection.AbstractIterable implements scala.collection.mutable.Iterable{
 public scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
   Code:
diff --git c/scala/collection/mutable/AbstractMap.class w/scala/collection/mutable/AbstractMap.class
index b1f6b0e76f..d0f526d62a 100644
--- c/scala/collection/mutable/AbstractMap.class
+++ w/scala/collection/mutable/AbstractMap.class
@@ -1,6 +1,6 @@
 
 Compiled from "Map.scala"
-public abstract class scala.collection.mutable.AbstractMap extends scala.collection.AbstractMap implements scala.collection.mutable.Map,scala.ScalaObject{
+public abstract class scala.collection.mutable.AbstractMap extends scala.collection.AbstractMap implements scala.collection.mutable.Map{
 public scala.collection.mutable.Map empty();
   Signature: ()Lscala/collection/mutable/Map;
   Code:
diff --git c/scala/collection/mutable/AbstractSeq.class w/scala/collection/mutable/AbstractSeq.class
index 39d503724a..932259f964 100644
--- c/scala/collection/mutable/AbstractSeq.class
+++ w/scala/collection/mutable/AbstractSeq.class
@@ -1,6 +1,6 @@
 
 Compiled from "Seq.scala"
-public abstract class scala.collection.mutable.AbstractSeq extends scala.collection.AbstractSeq implements scala.collection.mutable.Seq,scala.ScalaObject{
+public abstract class scala.collection.mutable.AbstractSeq extends scala.collection.AbstractSeq implements scala.collection.mutable.Seq{
 public scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
   Code:
diff --git c/scala/collection/mutable/AbstractSet.class w/scala/collection/mutable/AbstractSet.class
index 8036cf8007..8331c25d20 100644
--- c/scala/collection/mutable/AbstractSet.class
+++ w/scala/collection/mutable/AbstractSet.class
@@ -1,6 +1,6 @@
 
 Compiled from "Set.scala"
-public abstract class scala.collection.mutable.AbstractSet extends scala.collection.mutable.AbstractIterable implements scala.collection.mutable.Set,scala.ScalaObject{
+public abstract class scala.collection.mutable.AbstractSet extends scala.collection.mutable.AbstractIterable implements scala.collection.mutable.Set{
 public scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
   Code:
diff --git c/scala/collection/mutable/ArrayBuffer.class w/scala/collection/mutable/ArrayBuffer.class
index 2c28f0caac..2ad9142f1b 100644
--- c/scala/collection/mutable/ArrayBuffer.class
+++ w/scala/collection/mutable/ArrayBuffer.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "ArrayBuffer.scala"
-public class scala.collection.mutable.ArrayBuffer extends scala.collection.mutable.AbstractBuffer implements scala.collection.mutable.Buffer,scala.collection.generic.GenericTraversableTemplate,scala.collection.mutable.BufferLike,scala.collection.mutable.IndexedSeqOptimized,scala.collection.mutable.Builder,scala.collection.mutable.ResizableArray,scala.collection.CustomParallelizable,scala.Serializable,scala.ScalaObject{
+public class scala.collection.mutable.ArrayBuffer extends scala.collection.mutable.AbstractBuffer implements scala.collection.mutable.Buffer,scala.collection.mutable.Builder,scala.collection.mutable.ResizableArray,scala.collection.CustomParallelizable,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/mutable/ArrayBuilder.class w/scala/collection/mutable/ArrayBuilder.class
index 91545f0308..90e35e9258 100644
--- c/scala/collection/mutable/ArrayBuilder.class
+++ w/scala/collection/mutable/ArrayBuilder.class
@@ -11,7 +11,7 @@ public #= # of #; //ofDouble=class scala/collection/mutable/ArrayBuilder$ofDoubl
 public #= # of #; //ofBoolean=class scala/collection/mutable/ArrayBuilder$ofBoolean of class scala/collection/mutable/ArrayBuilder
 
 Compiled from "ArrayBuilder.scala"
-public abstract class scala.collection.mutable.ArrayBuilder extends java.lang.Object implements scala.collection.mutable.Builder,scala.Serializable,scala.ScalaObject{
+public abstract class scala.collection.mutable.ArrayBuilder extends java.lang.Object implements scala.collection.mutable.Builder,scala.Serializable{
 public static scala.collection.mutable.ArrayBuilder make(scala.reflect.ClassManifest);
   Signature: (Lscala/reflect/ClassManifest;)Lscala/collection/mutable/ArrayBuilder;
   Code:
diff --git c/scala/collection/mutable/ArrayLike.class w/scala/collection/mutable/ArrayLike.class
index 71dda5d590..7bda132cbc 100644
--- c/scala/collection/mutable/ArrayLike.class
+++ w/scala/collection/mutable/ArrayLike.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "ArrayLike.scala"
-public interface scala.collection.mutable.ArrayLike extends scala.collection.mutable.IndexedSeqOptimized,scala.ScalaObject{
+public interface scala.collection.mutable.ArrayLike extends scala.collection.mutable.IndexedSeqOptimized{
 public abstract scala.collection.IndexedSeq deep();
   Signature: ()Lscala/collection/IndexedSeq;
 
diff --git c/scala/collection/mutable/ArrayOps$ofBoolean.class w/scala/collection/mutable/ArrayOps$ofBoolean.class
index 13e7bf8805..413aaa89e9 100644
--- c/scala/collection/mutable/ArrayOps$ofBoolean.class
+++ w/scala/collection/mutable/ArrayOps$ofBoolean.class
@@ -4,7 +4,7 @@ public final #= # of #; //ofBoolean=class scala/collection/mutable/WrappedArray$
 public #= # of #; //ofBoolean=class scala/collection/mutable/ArrayBuilder$ofBoolean of class scala/collection/mutable/ArrayBuilder
 
 Compiled from "ArrayOps.scala"
-public class scala.collection.mutable.ArrayOps$ofBoolean extends scala.collection.mutable.ArrayOps implements scala.collection.mutable.ArrayLike,scala.ScalaObject{
+public class scala.collection.mutable.ArrayOps$ofBoolean extends scala.collection.mutable.ArrayOps implements scala.collection.mutable.ArrayLike{
 private final boolean[] repr;
   Signature: [Z
 
diff --git c/scala/collection/mutable/ArrayOps$ofByte.class w/scala/collection/mutable/ArrayOps$ofByte.class
index 541d86a9e9..fce1098251 100644
--- c/scala/collection/mutable/ArrayOps$ofByte.class
+++ w/scala/collection/mutable/ArrayOps$ofByte.class
@@ -4,7 +4,7 @@ public final #= # of #; //ofByte=class scala/collection/mutable/WrappedArray$ofB
 public #= # of #; //ofByte=class scala/collection/mutable/ArrayBuilder$ofByte of class scala/collection/mutable/ArrayBuilder
 
 Compiled from "ArrayOps.scala"
-public class scala.collection.mutable.ArrayOps$ofByte extends scala.collection.mutable.ArrayOps implements scala.collection.mutable.ArrayLike,scala.ScalaObject{
+public class scala.collection.mutable.ArrayOps$ofByte extends scala.collection.mutable.ArrayOps implements scala.collection.mutable.ArrayLike{
 private final byte[] repr;
   Signature: [B
 
diff --git c/scala/collection/mutable/ArrayOps$ofChar.class w/scala/collection/mutable/ArrayOps$ofChar.class
index 9d9dc8e077..7954272d93 100644
--- c/scala/collection/mutable/ArrayOps$ofChar.class
+++ w/scala/collection/mutable/ArrayOps$ofChar.class
@@ -4,7 +4,7 @@ public final #= # of #; //ofChar=class scala/collection/mutable/WrappedArray$ofC
 public #= # of #; //ofChar=class scala/collection/mutable/ArrayBuilder$ofChar of class scala/collection/mutable/ArrayBuilder
 
 Compiled from "ArrayOps.scala"
-public class scala.collection.mutable.ArrayOps$ofChar extends scala.collection.mutable.ArrayOps implements scala.collection.mutable.ArrayLike,scala.ScalaObject{
+public class scala.collection.mutable.ArrayOps$ofChar extends scala.collection.mutable.ArrayOps implements scala.collection.mutable.ArrayLike{
 private final char[] repr;
   Signature: [C
 
diff --git c/scala/collection/mutable/ArrayOps$ofDouble.class w/scala/collection/mutable/ArrayOps$ofDouble.class
index b734a152ef..374c8076c8 100644
--- c/scala/collection/mutable/ArrayOps$ofDouble.class
+++ w/scala/collection/mutable/ArrayOps$ofDouble.class
@@ -4,7 +4,7 @@ public final #= # of #; //ofDouble=class scala/collection/mutable/WrappedArray$o
 public #= # of #; //ofDouble=class scala/collection/mutable/ArrayBuilder$ofDouble of class scala/collection/mutable/ArrayBuilder
 
 Compiled from "ArrayOps.scala"
-public class scala.collection.mutable.ArrayOps$ofDouble extends scala.collection.mutable.ArrayOps implements scala.collection.mutable.ArrayLike,scala.ScalaObject{
+public class scala.collection.mutable.ArrayOps$ofDouble extends scala.collection.mutable.ArrayOps implements scala.collection.mutable.ArrayLike{
 private final double[] repr;
   Signature: [D
 
diff --git c/scala/collection/mutable/ArrayOps$ofFloat.class w/scala/collection/mutable/ArrayOps$ofFloat.class
index 23ab756ee2..6f59671c3d 100644
--- c/scala/collection/mutable/ArrayOps$ofFloat.class
+++ w/scala/collection/mutable/ArrayOps$ofFloat.class
@@ -4,7 +4,7 @@ public final #= # of #; //ofFloat=class scala/collection/mutable/WrappedArray$of
 public #= # of #; //ofFloat=class scala/collection/mutable/ArrayBuilder$ofFloat of class scala/collection/mutable/ArrayBuilder
 
 Compiled from "ArrayOps.scala"
-public class scala.collection.mutable.ArrayOps$ofFloat extends scala.collection.mutable.ArrayOps implements scala.collection.mutable.ArrayLike,scala.ScalaObject{
+public class scala.collection.mutable.ArrayOps$ofFloat extends scala.collection.mutable.ArrayOps implements scala.collection.mutable.ArrayLike{
 private final float[] repr;
   Signature: [F
 
diff --git c/scala/collection/mutable/ArrayOps$ofInt.class w/scala/collection/mutable/ArrayOps$ofInt.class
index 1fc1db4344..c04a913433 100644
--- c/scala/collection/mutable/ArrayOps$ofInt.class
+++ w/scala/collection/mutable/ArrayOps$ofInt.class
@@ -4,7 +4,7 @@ public final #= # of #; //ofInt=class scala/collection/mutable/WrappedArray$ofIn
 public #= # of #; //ofInt=class scala/collection/mutable/ArrayBuilder$ofInt of class scala/collection/mutable/ArrayBuilder
 
 Compiled from "ArrayOps.scala"
-public class scala.collection.mutable.ArrayOps$ofInt extends scala.collection.mutable.ArrayOps implements scala.collection.mutable.ArrayLike,scala.ScalaObject{
+public class scala.collection.mutable.ArrayOps$ofInt extends scala.collection.mutable.ArrayOps implements scala.collection.mutable.ArrayLike{
 private final int[] repr;
   Signature: [I
 
diff --git c/scala/collection/mutable/ArrayOps$ofLong.class w/scala/collection/mutable/ArrayOps$ofLong.class
index 0505addd35..a027bc788f 100644
--- c/scala/collection/mutable/ArrayOps$ofLong.class
+++ w/scala/collection/mutable/ArrayOps$ofLong.class
@@ -4,7 +4,7 @@ public final #= # of #; //ofLong=class scala/collection/mutable/WrappedArray$ofL
 public #= # of #; //ofLong=class scala/collection/mutable/ArrayBuilder$ofLong of class scala/collection/mutable/ArrayBuilder
 
 Compiled from "ArrayOps.scala"
-public class scala.collection.mutable.ArrayOps$ofLong extends scala.collection.mutable.ArrayOps implements scala.collection.mutable.ArrayLike,scala.ScalaObject{
+public class scala.collection.mutable.ArrayOps$ofLong extends scala.collection.mutable.ArrayOps implements scala.collection.mutable.ArrayLike{
 private final long[] repr;
   Signature: [J
 
diff --git c/scala/collection/mutable/ArrayOps$ofRef.class w/scala/collection/mutable/ArrayOps$ofRef.class
index 3c8da8f6a0..86e7b055e4 100644
--- c/scala/collection/mutable/ArrayOps$ofRef.class
+++ w/scala/collection/mutable/ArrayOps$ofRef.class
@@ -4,7 +4,7 @@ public final #= # of #; //ofRef=class scala/collection/mutable/WrappedArray$ofRe
 public #= # of #; //ofRef=class scala/collection/mutable/ArrayBuilder$ofRef of class scala/collection/mutable/ArrayBuilder
 
 Compiled from "ArrayOps.scala"
-public class scala.collection.mutable.ArrayOps$ofRef extends scala.collection.mutable.ArrayOps implements scala.collection.mutable.ArrayLike,scala.ScalaObject{
+public class scala.collection.mutable.ArrayOps$ofRef extends scala.collection.mutable.ArrayOps implements scala.collection.mutable.ArrayLike{
 private final java.lang.Object[] repr;
   Signature: [Ljava/lang/Object;
 
diff --git c/scala/collection/mutable/ArrayOps$ofShort.class w/scala/collection/mutable/ArrayOps$ofShort.class
index 1e20f035b8..5314b883f2 100644
--- c/scala/collection/mutable/ArrayOps$ofShort.class
+++ w/scala/collection/mutable/ArrayOps$ofShort.class
@@ -4,7 +4,7 @@ public final #= # of #; //ofShort=class scala/collection/mutable/WrappedArray$of
 public #= # of #; //ofShort=class scala/collection/mutable/ArrayBuilder$ofShort of class scala/collection/mutable/ArrayBuilder
 
 Compiled from "ArrayOps.scala"
-public class scala.collection.mutable.ArrayOps$ofShort extends scala.collection.mutable.ArrayOps implements scala.collection.mutable.ArrayLike,scala.ScalaObject{
+public class scala.collection.mutable.ArrayOps$ofShort extends scala.collection.mutable.ArrayOps implements scala.collection.mutable.ArrayLike{
 private final short[] repr;
   Signature: [S
 
diff --git c/scala/collection/mutable/ArrayOps$ofUnit.class w/scala/collection/mutable/ArrayOps$ofUnit.class
index cb65c0548e..d42dd36f61 100644
--- c/scala/collection/mutable/ArrayOps$ofUnit.class
+++ w/scala/collection/mutable/ArrayOps$ofUnit.class
@@ -4,7 +4,7 @@ public final #= # of #; //ofUnit=class scala/collection/mutable/WrappedArray$ofU
 public #= # of #; //ofUnit=class scala/collection/mutable/ArrayBuilder$ofUnit of class scala/collection/mutable/ArrayBuilder
 
 Compiled from "ArrayOps.scala"
-public class scala.collection.mutable.ArrayOps$ofUnit extends scala.collection.mutable.ArrayOps implements scala.collection.mutable.ArrayLike,scala.ScalaObject{
+public class scala.collection.mutable.ArrayOps$ofUnit extends scala.collection.mutable.ArrayOps implements scala.collection.mutable.ArrayLike{
 private final scala.runtime.BoxedUnit[] repr;
   Signature: [Lscala/runtime/BoxedUnit;
 
diff --git c/scala/collection/mutable/ArrayOps.class w/scala/collection/mutable/ArrayOps.class
index 7b275d9968..d6795c3b95 100644
--- c/scala/collection/mutable/ArrayOps.class
+++ w/scala/collection/mutable/ArrayOps.class
@@ -13,7 +13,7 @@ public final #= # of #; //IntIsIntegral$=class scala/math/Numeric$IntIsIntegral$
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "ArrayOps.scala"
-public abstract class scala.collection.mutable.ArrayOps extends java.lang.Object implements scala.collection.mutable.ArrayLike,scala.collection.CustomParallelizable,scala.ScalaObject{
+public abstract class scala.collection.mutable.ArrayOps extends java.lang.Object implements scala.collection.mutable.ArrayLike,scala.collection.CustomParallelizable{
 public scala.collection.parallel.Combiner parCombiner();
   Signature: ()Lscala/collection/parallel/Combiner;
   Code:
diff --git c/scala/collection/mutable/ArraySeq.class w/scala/collection/mutable/ArraySeq.class
index 66c3f66ef5..b7b8b95f1d 100644
--- c/scala/collection/mutable/ArraySeq.class
+++ w/scala/collection/mutable/ArraySeq.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "ArraySeq.scala"
-public class scala.collection.mutable.ArraySeq extends scala.collection.mutable.AbstractSeq implements scala.collection.mutable.IndexedSeq,scala.collection.generic.GenericTraversableTemplate,scala.collection.mutable.IndexedSeqOptimized,scala.collection.CustomParallelizable,scala.Serializable,scala.ScalaObject{
+public class scala.collection.mutable.ArraySeq extends scala.collection.mutable.AbstractSeq implements scala.collection.mutable.IndexedSeq,scala.collection.mutable.IndexedSeqOptimized,scala.collection.CustomParallelizable,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/mutable/ArrayStack.class w/scala/collection/mutable/ArrayStack.class
index 7093763993..b79c4bc7e2 100644
--- c/scala/collection/mutable/ArrayStack.class
+++ w/scala/collection/mutable/ArrayStack.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "ArrayStack.scala"
-public class scala.collection.mutable.ArrayStack extends scala.collection.mutable.AbstractSeq implements scala.collection.mutable.Seq,scala.collection.mutable.SeqLike,scala.collection.generic.GenericTraversableTemplate,scala.collection.mutable.Cloneable,scala.collection.mutable.Builder,scala.Serializable,scala.ScalaObject,java.lang.Cloneable{
+public class scala.collection.mutable.ArrayStack extends scala.collection.mutable.AbstractSeq implements scala.collection.mutable.Seq,scala.collection.mutable.Builder,scala.Serializable,java.lang.Cloneable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/mutable/BitSet$.class w/scala/collection/mutable/BitSet$.class
index 94a13c0611..e7b2e8ddfb 100644
--- c/scala/collection/mutable/BitSet$.class
+++ w/scala/collection/mutable/BitSet$.class
@@ -1,6 +1,6 @@
 
 Compiled from "BitSet.scala"
-public final class scala.collection.mutable.BitSet$ extends java.lang.Object implements scala.collection.generic.BitSetFactory,scala.ScalaObject,scala.Serializable{
+public final class scala.collection.mutable.BitSet$ extends java.lang.Object implements scala.collection.generic.BitSetFactory,scala.Serializable{
 public static final scala.collection.mutable.BitSet$ MODULE$;
   Signature: Lscala/collection/mutable/BitSet$;
 
diff --git c/scala/collection/mutable/BitSet.class w/scala/collection/mutable/BitSet.class
index cd23aa0448..0c6dcfa407 100644
--- c/scala/collection/mutable/BitSet.class
+++ w/scala/collection/mutable/BitSet.class
@@ -1,6 +1,6 @@
 
 Compiled from "BitSet.scala"
-public class scala.collection.mutable.BitSet extends scala.collection.mutable.AbstractSet implements scala.collection.SortedSet,scala.collection.BitSet,scala.collection.BitSetLike,scala.collection.mutable.SetLike,scala.Serializable,scala.ScalaObject{
+public class scala.collection.mutable.BitSet extends scala.collection.mutable.AbstractSet implements scala.collection.BitSet,scala.collection.mutable.SetLike,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/mutable/Buffer.class w/scala/collection/mutable/Buffer.class
index 4c13dbd873..33909a6ed9 100644
--- c/scala/collection/mutable/Buffer.class
+++ w/scala/collection/mutable/Buffer.class
@@ -1,6 +1,6 @@
 
 Compiled from "Buffer.scala"
-public interface scala.collection.mutable.Buffer extends scala.collection.mutable.Seq,scala.collection.generic.GenericTraversableTemplate,scala.collection.mutable.BufferLike,scala.ScalaObject,java.lang.Cloneable{
+public interface scala.collection.mutable.Buffer extends scala.collection.mutable.Seq,scala.collection.mutable.BufferLike,java.lang.Cloneable{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/mutable/BufferLike.class w/scala/collection/mutable/BufferLike.class
index aae26702bd..36dee06928 100644
--- c/scala/collection/mutable/BufferLike.class
+++ w/scala/collection/mutable/BufferLike.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "BufferLike.scala"
-public interface scala.collection.mutable.BufferLike extends scala.collection.generic.Growable,scala.collection.generic.Shrinkable,scala.collection.script.Scriptable,scala.collection.generic.Subtractable,scala.collection.mutable.SeqLike,scala.ScalaObject,java.lang.Cloneable{
+public interface scala.collection.mutable.BufferLike extends scala.collection.generic.Growable,scala.collection.generic.Shrinkable,scala.collection.script.Scriptable,scala.collection.generic.Subtractable,scala.collection.mutable.SeqLike,java.lang.Cloneable{
 public abstract java.lang.Object apply(int);
   Signature: (I)Ljava/lang/Object;
 
diff --git c/scala/collection/mutable/BufferProxy.class w/scala/collection/mutable/BufferProxy.class
index ef1dc5e102..95b1909ab0 100644
--- c/scala/collection/mutable/BufferProxy.class
+++ w/scala/collection/mutable/BufferProxy.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "BufferProxy.scala"
-public interface scala.collection.mutable.BufferProxy extends scala.collection.mutable.Buffer,scala.Proxy,scala.ScalaObject{
+public interface scala.collection.mutable.BufferProxy extends scala.collection.mutable.Buffer,scala.Proxy{
 public abstract scala.collection.mutable.Buffer self();
   Signature: ()Lscala/collection/mutable/Buffer;
 
diff --git c/scala/collection/mutable/Builder.class w/scala/collection/mutable/Builder.class
index 72765fe39a..ed6c3dd4ad 100644
--- c/scala/collection/mutable/Builder.class
+++ w/scala/collection/mutable/Builder.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "Builder.scala"
-public interface scala.collection.mutable.Builder extends scala.collection.generic.Growable,scala.ScalaObject{
+public interface scala.collection.mutable.Builder extends scala.collection.generic.Growable{
 public abstract scala.collection.mutable.Builder $plus$eq(java.lang.Object);
   Signature: (Ljava/lang/Object;)Lscala/collection/mutable/Builder;
 
diff --git c/scala/collection/mutable/DefaultEntry.class w/scala/collection/mutable/DefaultEntry.class
index 8007e98815..179fee08ac 100644
--- c/scala/collection/mutable/DefaultEntry.class
+++ w/scala/collection/mutable/DefaultEntry.class
@@ -1,6 +1,6 @@
 
 Compiled from "DefaultEntry.scala"
-public final class scala.collection.mutable.DefaultEntry extends java.lang.Object implements scala.collection.mutable.HashEntry,scala.Serializable,scala.ScalaObject{
+public final class scala.collection.mutable.DefaultEntry extends java.lang.Object implements scala.collection.mutable.HashEntry,scala.Serializable{
 private final java.lang.Object key;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/collection/mutable/DefaultMapModel.class w/scala/collection/mutable/DefaultMapModel.class
index 8fc1fe414b..29f4fb31d2 100644
--- c/scala/collection/mutable/DefaultMapModel.class
+++ w/scala/collection/mutable/DefaultMapModel.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "DefaultMapModel.scala"
-public interface scala.collection.mutable.DefaultMapModel extends scala.collection.mutable.Map,scala.ScalaObject{
+public interface scala.collection.mutable.DefaultMapModel extends scala.collection.mutable.Map{
 public abstract scala.collection.mutable.DefaultEntry findEntry(java.lang.Object);
   Signature: (Ljava/lang/Object;)Lscala/collection/mutable/DefaultEntry;
 
diff --git c/scala/collection/mutable/DoubleLinkedList.class w/scala/collection/mutable/DoubleLinkedList.class
index aca0aaae69..2fd8bd62ae 100644
--- c/scala/collection/mutable/DoubleLinkedList.class
+++ w/scala/collection/mutable/DoubleLinkedList.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "DoubleLinkedList.scala"
-public class scala.collection.mutable.DoubleLinkedList extends scala.collection.mutable.AbstractSeq implements scala.collection.mutable.LinearSeq,scala.collection.generic.GenericTraversableTemplate,scala.collection.mutable.DoubleLinkedListLike,scala.Serializable,scala.ScalaObject{
+public class scala.collection.mutable.DoubleLinkedList extends scala.collection.mutable.AbstractSeq implements scala.collection.mutable.LinearSeq,scala.collection.mutable.DoubleLinkedListLike,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/mutable/DoubleLinkedListLike.class w/scala/collection/mutable/DoubleLinkedListLike.class
index 892aae63a0..6899de1ab6 100644
--- c/scala/collection/mutable/DoubleLinkedListLike.class
+++ w/scala/collection/mutable/DoubleLinkedListLike.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "DoubleLinkedListLike.scala"
-public interface scala.collection.mutable.DoubleLinkedListLike extends scala.collection.mutable.SeqLike,scala.collection.mutable.LinkedListLike,scala.ScalaObject{
+public interface scala.collection.mutable.DoubleLinkedListLike extends scala.collection.mutable.LinkedListLike{
 public abstract void scala$collection$mutable$DoubleLinkedListLike$$super$insert(scala.collection.mutable.Seq);
   Signature: (Lscala/collection/mutable/Seq;)V
 
diff --git c/scala/collection/mutable/FlatHashTable.class w/scala/collection/mutable/FlatHashTable.class
index 949123e811..924aaf4f60 100644
--- c/scala/collection/mutable/FlatHashTable.class
+++ w/scala/collection/mutable/FlatHashTable.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //HashUtils=class scala/collection/mutable/FlatHashTa
 public abstract #= # of #; //HashUtils$class=class scala/collection/mutable/FlatHashTable$HashUtils$class of class scala/collection/mutable/FlatHashTable
 
 Compiled from "FlatHashTable.scala"
-public interface scala.collection.mutable.FlatHashTable extends scala.collection.mutable.FlatHashTable$HashUtils,scala.ScalaObject{
+public interface scala.collection.mutable.FlatHashTable extends scala.collection.mutable.FlatHashTable$HashUtils{
 public abstract boolean scala$collection$mutable$FlatHashTable$$tableDebug();
   Signature: ()Z
 
diff --git c/scala/collection/mutable/GrowingBuilder.class w/scala/collection/mutable/GrowingBuilder.class
index 0feaeb35bc..71f22acd6f 100644
--- c/scala/collection/mutable/GrowingBuilder.class
+++ w/scala/collection/mutable/GrowingBuilder.class
@@ -1,6 +1,6 @@
 
 Compiled from "GrowingBuilder.scala"
-public class scala.collection.mutable.GrowingBuilder extends java.lang.Object implements scala.collection.mutable.Builder,scala.ScalaObject{
+public class scala.collection.mutable.GrowingBuilder extends java.lang.Object implements scala.collection.mutable.Builder{
 private final scala.collection.generic.Growable empty;
   Signature: Lscala/collection/generic/Growable;
 
diff --git c/scala/collection/mutable/HashMap.class w/scala/collection/mutable/HashMap.class
index 6bf9aa562b..cc19ff57e4 100644
--- c/scala/collection/mutable/HashMap.class
+++ w/scala/collection/mutable/HashMap.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //HashUtils=class scala/collection/mutable/HashTable$
 public abstract #= # of #; //HashUtils$class=class scala/collection/mutable/HashTable$HashUtils$class of class scala/collection/mutable/HashTable
 
 Compiled from "HashMap.scala"
-public class scala.collection.mutable.HashMap extends scala.collection.mutable.AbstractMap implements scala.collection.mutable.Map,scala.collection.mutable.MapLike,scala.collection.mutable.HashTable,scala.collection.CustomParallelizable,scala.Serializable,scala.ScalaObject{
+public class scala.collection.mutable.HashMap extends scala.collection.mutable.AbstractMap implements scala.collection.mutable.Map,scala.collection.mutable.HashTable,scala.collection.CustomParallelizable,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/mutable/HashSet.class w/scala/collection/mutable/HashSet.class
index 2604c99170..28ccaab848 100644
--- c/scala/collection/mutable/HashSet.class
+++ w/scala/collection/mutable/HashSet.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //HashUtils=class scala/collection/mutable/FlatHashTa
 public abstract #= # of #; //HashUtils$class=class scala/collection/mutable/FlatHashTable$HashUtils$class of class scala/collection/mutable/FlatHashTable
 
 Compiled from "HashSet.scala"
-public class scala.collection.mutable.HashSet extends scala.collection.mutable.AbstractSet implements scala.collection.mutable.Set,scala.collection.generic.GenericSetTemplate,scala.collection.mutable.SetLike,scala.collection.mutable.FlatHashTable,scala.collection.CustomParallelizable,scala.Serializable,scala.ScalaObject{
+public class scala.collection.mutable.HashSet extends scala.collection.mutable.AbstractSet implements scala.collection.mutable.Set,scala.collection.mutable.FlatHashTable,scala.collection.CustomParallelizable,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/mutable/HashTable.class w/scala/collection/mutable/HashTable.class
index 84194b133f..bd24a6db79 100644
--- c/scala/collection/mutable/HashTable.class
+++ w/scala/collection/mutable/HashTable.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //HashUtils=class scala/collection/mutable/HashTable$
 public abstract #= # of #; //HashUtils$class=class scala/collection/mutable/HashTable$HashUtils$class of class scala/collection/mutable/HashTable
 
 Compiled from "HashTable.scala"
-public interface scala.collection.mutable.HashTable extends scala.collection.mutable.HashTable$HashUtils,scala.ScalaObject{
+public interface scala.collection.mutable.HashTable extends scala.collection.mutable.HashTable$HashUtils{
 public abstract int _loadFactor();
   Signature: ()I
 
diff --git c/scala/collection/mutable/History.class w/scala/collection/mutable/History.class
index 38daab785d..f27ed32575 100644
--- c/scala/collection/mutable/History.class
+++ w/scala/collection/mutable/History.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "History.scala"
-public class scala.collection.mutable.History extends scala.collection.mutable.AbstractIterable implements scala.collection.mutable.Subscriber,scala.collection.mutable.Iterable,scala.Serializable,scala.ScalaObject{
+public class scala.collection.mutable.History extends scala.collection.mutable.AbstractIterable implements scala.collection.mutable.Subscriber,scala.collection.mutable.Iterable,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/mutable/ImmutableMapAdaptor.class w/scala/collection/mutable/ImmutableMapAdaptor.class
index ff0c739847..31ee046076 100644
--- c/scala/collection/mutable/ImmutableMapAdaptor.class
+++ w/scala/collection/mutable/ImmutableMapAdaptor.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "ImmutableMapAdaptor.scala"
-public class scala.collection.mutable.ImmutableMapAdaptor extends scala.collection.mutable.AbstractMap implements scala.collection.mutable.Map,scala.Serializable,scala.ScalaObject{
+public class scala.collection.mutable.ImmutableMapAdaptor extends scala.collection.mutable.AbstractMap implements scala.collection.mutable.Map,scala.Serializable{
 private scala.collection.immutable.Map imap;
   Signature: Lscala/collection/immutable/Map;
 
diff --git c/scala/collection/mutable/ImmutableSetAdaptor.class w/scala/collection/mutable/ImmutableSetAdaptor.class
index 443ee46861..e094398792 100644
--- c/scala/collection/mutable/ImmutableSetAdaptor.class
+++ w/scala/collection/mutable/ImmutableSetAdaptor.class
@@ -1,6 +1,6 @@
 
 Compiled from "ImmutableSetAdaptor.scala"
-public class scala.collection.mutable.ImmutableSetAdaptor extends scala.collection.mutable.AbstractSet implements scala.collection.mutable.Set,scala.Serializable,scala.ScalaObject{
+public class scala.collection.mutable.ImmutableSetAdaptor extends scala.collection.mutable.AbstractSet implements scala.collection.mutable.Set,scala.Serializable{
 private scala.collection.immutable.Set set;
   Signature: Lscala/collection/immutable/Set;
 
diff --git c/scala/collection/mutable/IndexedSeq.class w/scala/collection/mutable/IndexedSeq.class
index 1e675d4642..eb8ee7e987 100644
--- c/scala/collection/mutable/IndexedSeq.class
+++ w/scala/collection/mutable/IndexedSeq.class
@@ -1,6 +1,6 @@
 
 Compiled from "IndexedSeq.scala"
-public interface scala.collection.mutable.IndexedSeq extends scala.collection.mutable.Seq,scala.collection.IndexedSeq,scala.collection.generic.GenericTraversableTemplate,scala.collection.mutable.IndexedSeqLike,scala.ScalaObject{
+public interface scala.collection.mutable.IndexedSeq extends scala.collection.mutable.Seq,scala.collection.IndexedSeq,scala.collection.mutable.IndexedSeqLike{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/mutable/IndexedSeqLike.class w/scala/collection/mutable/IndexedSeqLike.class
index 5a2f50fc28..4b39434ab7 100644
--- c/scala/collection/mutable/IndexedSeqLike.class
+++ w/scala/collection/mutable/IndexedSeqLike.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "IndexedSeqLike.scala"
-public interface scala.collection.mutable.IndexedSeqLike extends scala.collection.IndexedSeqLike,scala.ScalaObject{
+public interface scala.collection.mutable.IndexedSeqLike extends scala.collection.IndexedSeqLike{
 public abstract scala.collection.mutable.IndexedSeq thisCollection();
   Signature: ()Lscala/collection/mutable/IndexedSeq;
 
diff --git c/scala/collection/mutable/IndexedSeqView$AbstractTransformed.class w/scala/collection/mutable/IndexedSeqView$AbstractTransformed.class
index 09930fa6d0..f4674c2d87 100644
--- c/scala/collection/mutable/IndexedSeqView$AbstractTransformed.class
+++ w/scala/collection/mutable/IndexedSeqView$AbstractTransformed.class
@@ -8,7 +8,7 @@ public abstract #= # of #; //Transformed$class=class scala/collection/mutable/In
 public abstract #= # of #; //AbstractTransformed=class scala/collection/mutable/IndexedSeqView$AbstractTransformed of class scala/collection/mutable/IndexedSeqView
 
 Compiled from "IndexedSeqView.scala"
-public abstract class scala.collection.mutable.IndexedSeqView$AbstractTransformed extends scala.collection.SeqViewLike$AbstractTransformed implements scala.collection.mutable.IndexedSeqView$Transformed,scala.ScalaObject{
+public abstract class scala.collection.mutable.IndexedSeqView$AbstractTransformed extends scala.collection.SeqViewLike$AbstractTransformed implements scala.collection.mutable.IndexedSeqView$Transformed{
 public final scala.collection.mutable.IndexedSeqView $outer;
   Signature: Lscala/collection/mutable/IndexedSeqView;
 
diff --git c/scala/collection/mutable/IndexedSeqView$DroppedWhile.class w/scala/collection/mutable/IndexedSeqView$DroppedWhile.class
index 4884da8c08..0d756b231f 100644
--- c/scala/collection/mutable/IndexedSeqView$DroppedWhile.class
+++ w/scala/collection/mutable/IndexedSeqView$DroppedWhile.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Transformed=class scala/collection/mutable/IndexedS
 public abstract #= # of #; //DroppedWhile=class scala/collection/mutable/IndexedSeqView$DroppedWhile of class scala/collection/mutable/IndexedSeqView
 
 Compiled from "IndexedSeqView.scala"
-public interface scala.collection.mutable.IndexedSeqView$DroppedWhile extends scala.collection.SeqViewLike$DroppedWhile,scala.collection.mutable.IndexedSeqView$Transformed,scala.ScalaObject{
+public interface scala.collection.mutable.IndexedSeqView$DroppedWhile extends scala.collection.SeqViewLike$DroppedWhile,scala.collection.mutable.IndexedSeqView$Transformed{
 public abstract void update(int, java.lang.Object);
   Signature: (ILjava/lang/Object;)V
 
diff --git c/scala/collection/mutable/IndexedSeqView$Filtered.class w/scala/collection/mutable/IndexedSeqView$Filtered.class
index 9f99e1916d..685b2e48be 100644
--- c/scala/collection/mutable/IndexedSeqView$Filtered.class
+++ w/scala/collection/mutable/IndexedSeqView$Filtered.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Filtered=class scala/collection/mutable/IndexedSeqV
 public abstract #= # of #; //Transformed=class scala/collection/mutable/IndexedSeqView$Transformed of class scala/collection/mutable/IndexedSeqView
 
 Compiled from "IndexedSeqView.scala"
-public interface scala.collection.mutable.IndexedSeqView$Filtered extends scala.collection.SeqViewLike$Filtered,scala.collection.mutable.IndexedSeqView$Transformed,scala.ScalaObject{
+public interface scala.collection.mutable.IndexedSeqView$Filtered extends scala.collection.SeqViewLike$Filtered,scala.collection.mutable.IndexedSeqView$Transformed{
 public abstract void update(int, java.lang.Object);
   Signature: (ILjava/lang/Object;)V
 
diff --git c/scala/collection/mutable/IndexedSeqView$Reversed.class w/scala/collection/mutable/IndexedSeqView$Reversed.class
index bcd897ba29..e5883d11cc 100644
--- c/scala/collection/mutable/IndexedSeqView$Reversed.class
+++ w/scala/collection/mutable/IndexedSeqView$Reversed.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Reversed=class scala/collection/mutable/IndexedSeqV
 public abstract #= # of #; //Transformed=class scala/collection/mutable/IndexedSeqView$Transformed of class scala/collection/mutable/IndexedSeqView
 
 Compiled from "IndexedSeqView.scala"
-public interface scala.collection.mutable.IndexedSeqView$Reversed extends scala.collection.SeqViewLike$Reversed,scala.collection.mutable.IndexedSeqView$Transformed,scala.ScalaObject{
+public interface scala.collection.mutable.IndexedSeqView$Reversed extends scala.collection.SeqViewLike$Reversed,scala.collection.mutable.IndexedSeqView$Transformed{
 public abstract void update(int, java.lang.Object);
   Signature: (ILjava/lang/Object;)V
 
diff --git c/scala/collection/mutable/IndexedSeqView$Sliced.class w/scala/collection/mutable/IndexedSeqView$Sliced.class
index 532b866839..036730ef5e 100644
--- c/scala/collection/mutable/IndexedSeqView$Sliced.class
+++ w/scala/collection/mutable/IndexedSeqView$Sliced.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Sliced=class scala/collection/mutable/IndexedSeqVie
 public abstract #= # of #; //Transformed=class scala/collection/mutable/IndexedSeqView$Transformed of class scala/collection/mutable/IndexedSeqView
 
 Compiled from "IndexedSeqView.scala"
-public interface scala.collection.mutable.IndexedSeqView$Sliced extends scala.collection.SeqViewLike$Sliced,scala.collection.mutable.IndexedSeqView$Transformed,scala.ScalaObject{
+public interface scala.collection.mutable.IndexedSeqView$Sliced extends scala.collection.SeqViewLike$Sliced,scala.collection.mutable.IndexedSeqView$Transformed{
 public abstract int length();
   Signature: ()I
 
diff --git c/scala/collection/mutable/IndexedSeqView$TakenWhile.class w/scala/collection/mutable/IndexedSeqView$TakenWhile.class
index 421a15220c..cc502ecede 100644
--- c/scala/collection/mutable/IndexedSeqView$TakenWhile.class
+++ w/scala/collection/mutable/IndexedSeqView$TakenWhile.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //TakenWhile=class scala/collection/mutable/IndexedSe
 public abstract #= # of #; //Transformed=class scala/collection/mutable/IndexedSeqView$Transformed of class scala/collection/mutable/IndexedSeqView
 
 Compiled from "IndexedSeqView.scala"
-public interface scala.collection.mutable.IndexedSeqView$TakenWhile extends scala.collection.SeqViewLike$TakenWhile,scala.collection.mutable.IndexedSeqView$Transformed,scala.ScalaObject{
+public interface scala.collection.mutable.IndexedSeqView$TakenWhile extends scala.collection.SeqViewLike$TakenWhile,scala.collection.mutable.IndexedSeqView$Transformed{
 public abstract void update(int, java.lang.Object);
   Signature: (ILjava/lang/Object;)V
 
diff --git c/scala/collection/mutable/IndexedSeqView$Transformed.class w/scala/collection/mutable/IndexedSeqView$Transformed.class
index a5dd4c9cb3..d39dfdaa03 100644
--- c/scala/collection/mutable/IndexedSeqView$Transformed.class
+++ w/scala/collection/mutable/IndexedSeqView$Transformed.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Transformed=class scala/collection/SeqViewLike$Tran
 public abstract #= # of #; //Transformed=class scala/collection/mutable/IndexedSeqView$Transformed of class scala/collection/mutable/IndexedSeqView
 
 Compiled from "IndexedSeqView.scala"
-public interface scala.collection.mutable.IndexedSeqView$Transformed extends scala.collection.mutable.IndexedSeqView,scala.collection.SeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.mutable.IndexedSeqView$Transformed extends scala.collection.mutable.IndexedSeqView,scala.collection.SeqViewLike$Transformed{
 public abstract void update(int, java.lang.Object);
   Signature: (ILjava/lang/Object;)V
 
diff --git c/scala/collection/mutable/IndexedSeqView.class w/scala/collection/mutable/IndexedSeqView.class
index 4d5c360cc4..fbbe572917 100644
--- c/scala/collection/mutable/IndexedSeqView.class
+++ w/scala/collection/mutable/IndexedSeqView.class
@@ -14,7 +14,7 @@ public abstract #= # of #; //DroppedWhile$class=class scala/collection/mutable/I
 public abstract #= # of #; //AbstractTransformed=class scala/collection/mutable/IndexedSeqView$AbstractTransformed of class scala/collection/mutable/IndexedSeqView
 
 Compiled from "IndexedSeqView.scala"
-public interface scala.collection.mutable.IndexedSeqView extends scala.collection.mutable.IndexedSeq,scala.collection.mutable.IndexedSeqOptimized,scala.collection.SeqView,scala.collection.SeqViewLike,scala.ScalaObject{
+public interface scala.collection.mutable.IndexedSeqView extends scala.collection.mutable.IndexedSeq,scala.collection.mutable.IndexedSeqOptimized,scala.collection.SeqView{
 public abstract void update(int, java.lang.Object);
   Signature: (ILjava/lang/Object;)V
 
diff --git c/scala/collection/mutable/Iterable$.class w/scala/collection/mutable/Iterable$.class
index ccd0dc2d92..e1a39536b1 100644
--- c/scala/collection/mutable/Iterable$.class
+++ w/scala/collection/mutable/Iterable$.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //GenericCanBuildFrom=class scala/collection/generic/GenTraversableFactory$GenericCanBuildFrom of class scala/collection/generic/GenTraversableFactory
 
 Compiled from "Iterable.scala"
-public final class scala.collection.mutable.Iterable$ extends scala.collection.generic.GenTraversableFactory implements scala.collection.generic.TraversableFactory,scala.ScalaObject{
+public final class scala.collection.mutable.Iterable$ extends scala.collection.generic.GenTraversableFactory implements scala.collection.generic.TraversableFactory{
 public static final scala.collection.mutable.Iterable$ MODULE$;
   Signature: Lscala/collection/mutable/Iterable$;
 
diff --git c/scala/collection/mutable/Iterable.class w/scala/collection/mutable/Iterable.class
index 6fa9004013..a5509bd62e 100644
--- c/scala/collection/mutable/Iterable.class
+++ w/scala/collection/mutable/Iterable.class
@@ -1,6 +1,6 @@
 
 Compiled from "Iterable.scala"
-public interface scala.collection.mutable.Iterable extends scala.collection.mutable.Traversable,scala.collection.Iterable,scala.collection.generic.GenericTraversableTemplate,scala.collection.IterableLike,scala.collection.Parallelizable,scala.ScalaObject{
+public interface scala.collection.mutable.Iterable extends scala.collection.mutable.Traversable,scala.collection.Iterable{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/mutable/LazyBuilder.class w/scala/collection/mutable/LazyBuilder.class
index 543d22e8c7..255860847a 100644
--- c/scala/collection/mutable/LazyBuilder.class
+++ w/scala/collection/mutable/LazyBuilder.class
@@ -1,6 +1,6 @@
 
 Compiled from "LazyBuilder.scala"
-public abstract class scala.collection.mutable.LazyBuilder extends java.lang.Object implements scala.collection.mutable.Builder,scala.ScalaObject{
+public abstract class scala.collection.mutable.LazyBuilder extends java.lang.Object implements scala.collection.mutable.Builder{
 private scala.collection.mutable.ListBuffer parts;
   Signature: Lscala/collection/mutable/ListBuffer;
 
diff --git c/scala/collection/mutable/LinearSeq.class w/scala/collection/mutable/LinearSeq.class
index b176170884..13f0279a35 100644
--- c/scala/collection/mutable/LinearSeq.class
+++ w/scala/collection/mutable/LinearSeq.class
@@ -1,6 +1,6 @@
 
 Compiled from "LinearSeq.scala"
-public interface scala.collection.mutable.LinearSeq extends scala.collection.mutable.Seq,scala.collection.LinearSeq,scala.collection.generic.GenericTraversableTemplate,scala.collection.LinearSeqLike,scala.ScalaObject{
+public interface scala.collection.mutable.LinearSeq extends scala.collection.mutable.Seq,scala.collection.LinearSeq{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/mutable/LinkedEntry.class w/scala/collection/mutable/LinkedEntry.class
index 50cdec855b..e486c9bc31 100644
--- c/scala/collection/mutable/LinkedEntry.class
+++ w/scala/collection/mutable/LinkedEntry.class
@@ -1,6 +1,6 @@
 
 Compiled from "LinkedEntry.scala"
-public final class scala.collection.mutable.LinkedEntry extends java.lang.Object implements scala.collection.mutable.HashEntry,scala.Serializable,scala.ScalaObject{
+public final class scala.collection.mutable.LinkedEntry extends java.lang.Object implements scala.collection.mutable.HashEntry,scala.Serializable{
 private final java.lang.Object key;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/collection/mutable/LinkedHashMap.class w/scala/collection/mutable/LinkedHashMap.class
index b337e49526..316a599245 100644
--- c/scala/collection/mutable/LinkedHashMap.class
+++ w/scala/collection/mutable/LinkedHashMap.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //HashUtils=class scala/collection/mutable/HashTable$
 public abstract #= # of #; //HashUtils$class=class scala/collection/mutable/HashTable$HashUtils$class of class scala/collection/mutable/HashTable
 
 Compiled from "LinkedHashMap.scala"
-public class scala.collection.mutable.LinkedHashMap extends scala.collection.mutable.AbstractMap implements scala.collection.mutable.Map,scala.collection.mutable.MapLike,scala.collection.mutable.HashTable,scala.Serializable,scala.ScalaObject{
+public class scala.collection.mutable.LinkedHashMap extends scala.collection.mutable.AbstractMap implements scala.collection.mutable.Map,scala.collection.mutable.HashTable,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/mutable/LinkedHashSet.class w/scala/collection/mutable/LinkedHashSet.class
index 2c58886bf0..d419a4d420 100644
--- c/scala/collection/mutable/LinkedHashSet.class
+++ w/scala/collection/mutable/LinkedHashSet.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //HashUtils=class scala/collection/mutable/FlatHashTa
 public abstract #= # of #; //HashUtils$class=class scala/collection/mutable/FlatHashTable$HashUtils$class of class scala/collection/mutable/FlatHashTable
 
 Compiled from "LinkedHashSet.scala"
-public class scala.collection.mutable.LinkedHashSet extends scala.collection.mutable.AbstractSet implements scala.collection.mutable.Set,scala.collection.generic.GenericSetTemplate,scala.collection.mutable.SetLike,scala.collection.mutable.FlatHashTable,scala.Serializable,scala.ScalaObject{
+public class scala.collection.mutable.LinkedHashSet extends scala.collection.mutable.AbstractSet implements scala.collection.mutable.Set,scala.collection.mutable.FlatHashTable,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/mutable/LinkedList.class w/scala/collection/mutable/LinkedList.class
index e7031965b4..92be0d8fc6 100644
--- c/scala/collection/mutable/LinkedList.class
+++ w/scala/collection/mutable/LinkedList.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "LinkedList.scala"
-public class scala.collection.mutable.LinkedList extends scala.collection.mutable.AbstractSeq implements scala.collection.mutable.LinearSeq,scala.collection.generic.GenericTraversableTemplate,scala.collection.mutable.LinkedListLike,scala.Serializable,scala.ScalaObject{
+public class scala.collection.mutable.LinkedList extends scala.collection.mutable.AbstractSeq implements scala.collection.mutable.LinearSeq,scala.collection.mutable.LinkedListLike,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/mutable/LinkedListLike.class w/scala/collection/mutable/LinkedListLike.class
index 6f361a25d2..36702ef04f 100644
--- c/scala/collection/mutable/LinkedListLike.class
+++ w/scala/collection/mutable/LinkedListLike.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "LinkedListLike.scala"
-public interface scala.collection.mutable.LinkedListLike extends scala.collection.mutable.SeqLike,scala.ScalaObject{
+public interface scala.collection.mutable.LinkedListLike extends scala.collection.mutable.SeqLike{
 public abstract java.lang.Object elem();
   Signature: ()Ljava/lang/Object;
 
diff --git c/scala/collection/mutable/ListBuffer.class w/scala/collection/mutable/ListBuffer.class
index a9c00387cb..b59370692e 100644
--- c/scala/collection/mutable/ListBuffer.class
+++ w/scala/collection/mutable/ListBuffer.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "ListBuffer.scala"
-public final class scala.collection.mutable.ListBuffer extends scala.collection.mutable.AbstractBuffer implements scala.collection.mutable.Buffer,scala.collection.generic.GenericTraversableTemplate,scala.collection.mutable.BufferLike,scala.collection.mutable.Builder,scala.collection.generic.SeqForwarder,scala.Serializable,scala.ScalaObject{
+public final class scala.collection.mutable.ListBuffer extends scala.collection.mutable.AbstractBuffer implements scala.collection.mutable.Buffer,scala.collection.mutable.Builder,scala.collection.generic.SeqForwarder,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/mutable/ListMap.class w/scala/collection/mutable/ListMap.class
index 5111015fd4..110082154c 100644
--- c/scala/collection/mutable/ListMap.class
+++ w/scala/collection/mutable/ListMap.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "ListMap.scala"
-public class scala.collection.mutable.ListMap extends scala.collection.mutable.AbstractMap implements scala.collection.mutable.Map,scala.collection.mutable.MapLike,scala.Serializable,scala.ScalaObject{
+public class scala.collection.mutable.ListMap extends scala.collection.mutable.AbstractMap implements scala.collection.mutable.Map,scala.Serializable{
 private scala.collection.immutable.List elems;
   Signature: Lscala/collection/immutable/List;
 
diff --git c/scala/collection/mutable/Map$WithDefault.class w/scala/collection/mutable/Map$WithDefault.class
index 019eeb9627..92c919a185 100644
--- c/scala/collection/mutable/Map$WithDefault.class
+++ w/scala/collection/mutable/Map$WithDefault.class
@@ -3,7 +3,7 @@ public #= # of #; //WithDefault=class scala/collection/mutable/Map$WithDefault o
 public abstract #= # of #; //WithDefault=class scala/collection/Map$WithDefault of class scala/collection/Map
 
 Compiled from "Map.scala"
-public class scala.collection.mutable.Map$WithDefault extends scala.collection.Map$WithDefault implements scala.collection.mutable.Map,scala.ScalaObject{
+public class scala.collection.mutable.Map$WithDefault extends scala.collection.Map$WithDefault implements scala.collection.mutable.Map{
 private final scala.collection.mutable.Map underlying;
   Signature: Lscala/collection/mutable/Map;
 
diff --git c/scala/collection/mutable/Map.class w/scala/collection/mutable/Map.class
index 20fd27ecb1..a5cec49c55 100644
--- c/scala/collection/mutable/Map.class
+++ w/scala/collection/mutable/Map.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //WithDefault=class scala/collection/mutable/Map$WithDefault of class scala/collection/mutable/Map
 
 Compiled from "Map.scala"
-public interface scala.collection.mutable.Map extends scala.collection.mutable.Iterable,scala.collection.Map,scala.collection.mutable.MapLike,scala.ScalaObject{
+public interface scala.collection.mutable.Map extends scala.collection.mutable.Iterable,scala.collection.Map,scala.collection.mutable.MapLike{
 public abstract scala.collection.mutable.Map empty();
   Signature: ()Lscala/collection/mutable/Map;
 
diff --git c/scala/collection/mutable/MapBuilder.class w/scala/collection/mutable/MapBuilder.class
index d19fd34392..2cb025233b 100644
--- c/scala/collection/mutable/MapBuilder.class
+++ w/scala/collection/mutable/MapBuilder.class
@@ -1,6 +1,6 @@
 
 Compiled from "MapBuilder.scala"
-public class scala.collection.mutable.MapBuilder extends java.lang.Object implements scala.collection.mutable.Builder,scala.ScalaObject{
+public class scala.collection.mutable.MapBuilder extends java.lang.Object implements scala.collection.mutable.Builder{
 private final scala.collection.GenMap empty;
   Signature: Lscala/collection/GenMap;
 
diff --git c/scala/collection/mutable/MapLike.class w/scala/collection/mutable/MapLike.class
index f5e53e607c..01846439c1 100644
--- c/scala/collection/mutable/MapLike.class
+++ w/scala/collection/mutable/MapLike.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "MapLike.scala"
-public interface scala.collection.mutable.MapLike extends scala.collection.MapLike,scala.collection.mutable.Builder,scala.collection.generic.Growable,scala.collection.generic.Shrinkable,scala.collection.mutable.Cloneable,scala.collection.Parallelizable,scala.ScalaObject{
+public interface scala.collection.mutable.MapLike extends scala.collection.MapLike,scala.collection.mutable.Builder,scala.collection.generic.Shrinkable,scala.collection.mutable.Cloneable{
 public abstract scala.collection.mutable.Builder newBuilder();
   Signature: ()Lscala/collection/mutable/Builder;
 
diff --git c/scala/collection/mutable/MapProxy.class w/scala/collection/mutable/MapProxy.class
index 3c534a8ce1..71964d7250 100644
--- c/scala/collection/mutable/MapProxy.class
+++ w/scala/collection/mutable/MapProxy.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "MapProxy.scala"
-public interface scala.collection.mutable.MapProxy extends scala.collection.mutable.Map,scala.collection.MapProxyLike,scala.ScalaObject{
+public interface scala.collection.mutable.MapProxy extends scala.collection.mutable.Map,scala.collection.MapProxyLike{
 public abstract scala.collection.mutable.MapProxy repr();
   Signature: ()Lscala/collection/mutable/MapProxy;
 
diff --git c/scala/collection/mutable/MultiMap.class w/scala/collection/mutable/MultiMap.class
index 7a5f51ba33..9573151289 100644
--- c/scala/collection/mutable/MultiMap.class
+++ w/scala/collection/mutable/MultiMap.class
@@ -1,6 +1,6 @@
 
 Compiled from "MultiMap.scala"
-public interface scala.collection.mutable.MultiMap extends scala.collection.mutable.Map,scala.ScalaObject{
+public interface scala.collection.mutable.MultiMap extends scala.collection.mutable.Map{
 public abstract scala.collection.mutable.Set makeSet();
   Signature: ()Lscala/collection/mutable/Set;
 
diff --git c/scala/collection/mutable/MutableList.class w/scala/collection/mutable/MutableList.class
index a954998630..ee0f1887bd 100644
--- c/scala/collection/mutable/MutableList.class
+++ w/scala/collection/mutable/MutableList.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "MutableList.scala"
-public class scala.collection.mutable.MutableList extends scala.collection.mutable.AbstractSeq implements scala.collection.mutable.LinearSeq,scala.collection.LinearSeqOptimized,scala.collection.generic.GenericTraversableTemplate,scala.collection.mutable.Builder,scala.Serializable,scala.ScalaObject{
+public class scala.collection.mutable.MutableList extends scala.collection.mutable.AbstractSeq implements scala.collection.mutable.LinearSeq,scala.collection.LinearSeqOptimized,scala.collection.mutable.Builder,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/mutable/ObservableBuffer.class w/scala/collection/mutable/ObservableBuffer.class
index b62b6f80e7..64b4691ba8 100644
--- c/scala/collection/mutable/ObservableBuffer.class
+++ w/scala/collection/mutable/ObservableBuffer.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "ObservableBuffer.scala"
-public interface scala.collection.mutable.ObservableBuffer extends scala.collection.mutable.Buffer,scala.collection.mutable.Publisher,scala.ScalaObject{
+public interface scala.collection.mutable.ObservableBuffer extends scala.collection.mutable.Buffer,scala.collection.mutable.Publisher{
 public abstract scala.collection.mutable.ObservableBuffer scala$collection$mutable$ObservableBuffer$$super$$plus$eq(java.lang.Object);
   Signature: (Ljava/lang/Object;)Lscala/collection/mutable/ObservableBuffer;
 
diff --git c/scala/collection/mutable/ObservableMap.class w/scala/collection/mutable/ObservableMap.class
index f106e67d84..8f1cf95dc6 100644
--- c/scala/collection/mutable/ObservableMap.class
+++ w/scala/collection/mutable/ObservableMap.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "ObservableMap.scala"
-public interface scala.collection.mutable.ObservableMap extends scala.collection.mutable.Map,scala.collection.mutable.Publisher,scala.ScalaObject{
+public interface scala.collection.mutable.ObservableMap extends scala.collection.mutable.Map,scala.collection.mutable.Publisher{
 public abstract scala.collection.mutable.ObservableMap scala$collection$mutable$ObservableMap$$super$$plus$eq(scala.Tuple2);
   Signature: (Lscala/Tuple2;)Lscala/collection/mutable/ObservableMap;
 
diff --git c/scala/collection/mutable/ObservableSet.class w/scala/collection/mutable/ObservableSet.class
index c3e005da44..377e29c3b8 100644
--- c/scala/collection/mutable/ObservableSet.class
+++ w/scala/collection/mutable/ObservableSet.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "ObservableSet.scala"
-public interface scala.collection.mutable.ObservableSet extends scala.collection.mutable.Set,scala.collection.mutable.Publisher,scala.ScalaObject{
+public interface scala.collection.mutable.ObservableSet extends scala.collection.mutable.Set,scala.collection.mutable.Publisher{
 public abstract scala.collection.mutable.ObservableSet scala$collection$mutable$ObservableSet$$super$$plus$eq(java.lang.Object);
   Signature: (Ljava/lang/Object;)Lscala/collection/mutable/ObservableSet;
 
diff --git c/scala/collection/mutable/OpenHashMap$OpenEntry.class w/scala/collection/mutable/OpenHashMap$OpenEntry.class
index 31c4f87299..e7da317aae 100644
--- c/scala/collection/mutable/OpenHashMap$OpenEntry.class
+++ w/scala/collection/mutable/OpenHashMap$OpenEntry.class
@@ -2,7 +2,7 @@ InnerClasses:
 public final #= # of #; //OpenEntry=class scala/collection/mutable/OpenHashMap$OpenEntry of class scala/collection/mutable/OpenHashMap
 
 Compiled from "OpenHashMap.scala"
-public final class scala.collection.mutable.OpenHashMap$OpenEntry extends java.lang.Object implements scala.collection.mutable.HashEntry,scala.ScalaObject{
+public final class scala.collection.mutable.OpenHashMap$OpenEntry extends java.lang.Object implements scala.collection.mutable.HashEntry{
 private final java.lang.Object key;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/collection/mutable/OpenHashMap.class w/scala/collection/mutable/OpenHashMap.class
index 7c8bc6a188..c8282765d6 100644
--- c/scala/collection/mutable/OpenHashMap.class
+++ w/scala/collection/mutable/OpenHashMap.class
@@ -2,7 +2,7 @@ InnerClasses:
 public final #= # of #; //OpenEntry=class scala/collection/mutable/OpenHashMap$OpenEntry of class scala/collection/mutable/OpenHashMap
 
 Compiled from "OpenHashMap.scala"
-public class scala.collection.mutable.OpenHashMap extends scala.collection.mutable.AbstractMap implements scala.collection.mutable.Map,scala.collection.mutable.MapLike,scala.ScalaObject{
+public class scala.collection.mutable.OpenHashMap extends scala.collection.mutable.AbstractMap implements scala.collection.mutable.Map{
 private final int actualInitialSize;
   Signature: I
 
diff --git c/scala/collection/mutable/PriorityQueue$ResizableArrayAccess.class w/scala/collection/mutable/PriorityQueue$ResizableArrayAccess.class
index 812fc7eaca..267ba973f4 100644
--- c/scala/collection/mutable/PriorityQueue$ResizableArrayAccess.class
+++ w/scala/collection/mutable/PriorityQueue$ResizableArrayAccess.class
@@ -2,7 +2,7 @@ InnerClasses:
 public final #= # of #; //ResizableArrayAccess=class scala/collection/mutable/PriorityQueue$ResizableArrayAccess of class scala/collection/mutable/PriorityQueue
 
 Compiled from "PriorityQueue.scala"
-public final class scala.collection.mutable.PriorityQueue$ResizableArrayAccess extends scala.collection.mutable.AbstractSeq implements scala.collection.mutable.ResizableArray,scala.ScalaObject{
+public final class scala.collection.mutable.PriorityQueue$ResizableArrayAccess extends scala.collection.mutable.AbstractSeq implements scala.collection.mutable.ResizableArray{
 private java.lang.Object[] array;
   Signature: [Ljava/lang/Object;
 
diff --git c/scala/collection/mutable/PriorityQueue.class w/scala/collection/mutable/PriorityQueue.class
index a2efc3f009..53775cec83 100644
--- c/scala/collection/mutable/PriorityQueue.class
+++ w/scala/collection/mutable/PriorityQueue.class
@@ -3,7 +3,7 @@ public #= # of #; //Ops=class scala/math/Ordering$Ops of class scala/math/Orderi
 public final #= # of #; //ResizableArrayAccess=class scala/collection/mutable/PriorityQueue$ResizableArrayAccess of class scala/collection/mutable/PriorityQueue
 
 Compiled from "PriorityQueue.scala"
-public class scala.collection.mutable.PriorityQueue extends scala.collection.mutable.AbstractIterable implements scala.collection.mutable.Iterable,scala.collection.generic.GenericOrderedTraversableTemplate,scala.collection.IterableLike,scala.collection.generic.Growable,scala.collection.mutable.Builder,scala.Serializable,scala.ScalaObject,java.lang.Cloneable{
+public class scala.collection.mutable.PriorityQueue extends scala.collection.mutable.AbstractIterable implements scala.collection.mutable.Iterable,scala.collection.generic.GenericOrderedTraversableTemplate,scala.collection.mutable.Builder,scala.Serializable,java.lang.Cloneable{
 private final scala.math.Ordering ord;
   Signature: Lscala/math/Ordering;
 
diff --git c/scala/collection/mutable/PriorityQueueProxy.class w/scala/collection/mutable/PriorityQueueProxy.class
index 9de231df60..316b74fe5b 100644
--- c/scala/collection/mutable/PriorityQueueProxy.class
+++ w/scala/collection/mutable/PriorityQueueProxy.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "PriorityQueueProxy.scala"
-public abstract class scala.collection.mutable.PriorityQueueProxy extends scala.collection.mutable.PriorityQueue implements scala.Proxy,scala.ScalaObject{
+public abstract class scala.collection.mutable.PriorityQueueProxy extends scala.collection.mutable.PriorityQueue implements scala.Proxy{
 public int hashCode();
   Signature: ()I
   Code:
diff --git c/scala/collection/mutable/Queue.class w/scala/collection/mutable/Queue.class
index a60f2380a5..b656983f5d 100644
--- c/scala/collection/mutable/Queue.class
+++ w/scala/collection/mutable/Queue.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //GenericCanBuildFrom=class scala/collection/generic/GenTraversableFactory$GenericCanBuildFrom of class scala/collection/generic/GenTraversableFactory
 
 Compiled from "Queue.scala"
-public class scala.collection.mutable.Queue extends scala.collection.mutable.MutableList implements scala.collection.generic.GenericTraversableTemplate,scala.collection.mutable.Cloneable,scala.Serializable,scala.ScalaObject,java.lang.Cloneable{
+public class scala.collection.mutable.Queue extends scala.collection.mutable.MutableList implements scala.collection.generic.GenericTraversableTemplate,scala.collection.mutable.Cloneable,scala.Serializable,java.lang.Cloneable{
 public static scala.collection.generic.CanBuildFrom canBuildFrom();
   Signature: ()Lscala/collection/generic/CanBuildFrom;
   Code:
diff --git c/scala/collection/mutable/QueueProxy.class w/scala/collection/mutable/QueueProxy.class
index 353b29ecfb..a47dd7fca0 100644
--- c/scala/collection/mutable/QueueProxy.class
+++ w/scala/collection/mutable/QueueProxy.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "QueueProxy.scala"
-public interface scala.collection.mutable.QueueProxy extends scala.Proxy,scala.ScalaObject{
+public interface scala.collection.mutable.QueueProxy extends scala.Proxy{
 public abstract scala.collection.mutable.Queue self();
   Signature: ()Lscala/collection/mutable/Queue;
 
diff --git c/scala/collection/mutable/ResizableArray.class w/scala/collection/mutable/ResizableArray.class
index a056824bd8..e7e56f748d 100644
--- c/scala/collection/mutable/ResizableArray.class
+++ w/scala/collection/mutable/ResizableArray.class
@@ -1,6 +1,6 @@
 
 Compiled from "ResizableArray.scala"
-public interface scala.collection.mutable.ResizableArray extends scala.collection.mutable.IndexedSeq,scala.collection.generic.GenericTraversableTemplate,scala.collection.mutable.IndexedSeqOptimized,scala.ScalaObject{
+public interface scala.collection.mutable.ResizableArray extends scala.collection.mutable.IndexedSeq,scala.collection.mutable.IndexedSeqOptimized{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/mutable/Seq.class w/scala/collection/mutable/Seq.class
index e95f6e0f30..5cc53b4f0f 100644
--- c/scala/collection/mutable/Seq.class
+++ w/scala/collection/mutable/Seq.class
@@ -1,6 +1,6 @@
 
 Compiled from "Seq.scala"
-public interface scala.collection.mutable.Seq extends scala.collection.mutable.Iterable,scala.collection.Seq,scala.collection.generic.GenericTraversableTemplate,scala.collection.mutable.SeqLike,scala.ScalaObject{
+public interface scala.collection.mutable.Seq extends scala.collection.mutable.Iterable,scala.collection.Seq,scala.collection.mutable.SeqLike{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/mutable/SeqLike.class w/scala/collection/mutable/SeqLike.class
index ff66110896..a302b96d1d 100644
--- c/scala/collection/mutable/SeqLike.class
+++ w/scala/collection/mutable/SeqLike.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "SeqLike.scala"
-public interface scala.collection.mutable.SeqLike extends scala.collection.SeqLike,scala.collection.mutable.Cloneable,scala.collection.Parallelizable,scala.ScalaObject{
+public interface scala.collection.mutable.SeqLike extends scala.collection.SeqLike,scala.collection.mutable.Cloneable{
 public abstract scala.collection.parallel.Combiner parCombiner();
   Signature: ()Lscala/collection/parallel/Combiner;
 
diff --git c/scala/collection/mutable/Set.class w/scala/collection/mutable/Set.class
index 04dab3d905..1817466ee2 100644
--- c/scala/collection/mutable/Set.class
+++ w/scala/collection/mutable/Set.class
@@ -1,6 +1,6 @@
 
 Compiled from "Set.scala"
-public interface scala.collection.mutable.Set extends scala.collection.mutable.Iterable,scala.collection.Set,scala.collection.generic.GenericSetTemplate,scala.collection.mutable.SetLike,scala.ScalaObject{
+public interface scala.collection.mutable.Set extends scala.collection.mutable.Iterable,scala.collection.Set,scala.collection.mutable.SetLike{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/mutable/SetBuilder.class w/scala/collection/mutable/SetBuilder.class
index ae02eeb216..37c957ae7e 100644
--- c/scala/collection/mutable/SetBuilder.class
+++ w/scala/collection/mutable/SetBuilder.class
@@ -1,6 +1,6 @@
 
 Compiled from "SetBuilder.scala"
-public class scala.collection.mutable.SetBuilder extends java.lang.Object implements scala.collection.mutable.Builder,scala.ScalaObject{
+public class scala.collection.mutable.SetBuilder extends java.lang.Object implements scala.collection.mutable.Builder{
 private final scala.collection.Set empty;
   Signature: Lscala/collection/Set;
 
diff --git c/scala/collection/mutable/SetLike.class w/scala/collection/mutable/SetLike.class
index ed5a762ab5..67b6dca875 100644
--- c/scala/collection/mutable/SetLike.class
+++ w/scala/collection/mutable/SetLike.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "SetLike.scala"
-public interface scala.collection.mutable.SetLike extends scala.collection.SetLike,scala.collection.script.Scriptable,scala.collection.mutable.Builder,scala.collection.generic.Growable,scala.collection.generic.Shrinkable,scala.collection.mutable.Cloneable,scala.collection.Parallelizable,scala.ScalaObject{
+public interface scala.collection.mutable.SetLike extends scala.collection.SetLike,scala.collection.script.Scriptable,scala.collection.mutable.Builder,scala.collection.generic.Shrinkable,scala.collection.mutable.Cloneable{
 public abstract scala.collection.mutable.Builder newBuilder();
   Signature: ()Lscala/collection/mutable/Builder;
 
diff --git c/scala/collection/mutable/SetProxy.class w/scala/collection/mutable/SetProxy.class
index 191e3382db..f1ead8b3ca 100644
--- c/scala/collection/mutable/SetProxy.class
+++ w/scala/collection/mutable/SetProxy.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "SetProxy.scala"
-public interface scala.collection.mutable.SetProxy extends scala.collection.mutable.Set,scala.collection.SetProxyLike,scala.ScalaObject{
+public interface scala.collection.mutable.SetProxy extends scala.collection.mutable.Set,scala.collection.SetProxyLike{
 public abstract scala.collection.mutable.SetProxy repr();
   Signature: ()Lscala/collection/mutable/SetProxy;
 
diff --git c/scala/collection/mutable/Stack$StackBuilder.class w/scala/collection/mutable/Stack$StackBuilder.class
index 531c856371..f95fee2420 100644
--- c/scala/collection/mutable/Stack$StackBuilder.class
+++ w/scala/collection/mutable/Stack$StackBuilder.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //StackBuilder=class scala/collection/mutable/Stack$StackBuilder of class scala/collection/mutable/Stack
 
 Compiled from "Stack.scala"
-public class scala.collection.mutable.Stack$StackBuilder extends java.lang.Object implements scala.collection.mutable.Builder,scala.ScalaObject{
+public class scala.collection.mutable.Stack$StackBuilder extends java.lang.Object implements scala.collection.mutable.Builder{
 private final scala.collection.mutable.ListBuffer lbuff;
   Signature: Lscala/collection/mutable/ListBuffer;
 
diff --git c/scala/collection/mutable/Stack.class w/scala/collection/mutable/Stack.class
index f61986cf0b..834a2b1260 100644
--- c/scala/collection/mutable/Stack.class
+++ w/scala/collection/mutable/Stack.class
@@ -3,7 +3,7 @@ public #= # of #; //StackBuilder=class scala/collection/mutable/Stack$StackBuild
 public #= # of #; //GenericCanBuildFrom=class scala/collection/generic/GenTraversableFactory$GenericCanBuildFrom of class scala/collection/generic/GenTraversableFactory
 
 Compiled from "Stack.scala"
-public class scala.collection.mutable.Stack extends scala.collection.mutable.AbstractSeq implements scala.collection.mutable.Seq,scala.collection.mutable.SeqLike,scala.collection.generic.GenericTraversableTemplate,scala.collection.mutable.Cloneable,scala.Serializable,scala.ScalaObject,java.lang.Cloneable{
+public class scala.collection.mutable.Stack extends scala.collection.mutable.AbstractSeq implements scala.collection.mutable.Seq,scala.Serializable,java.lang.Cloneable{
 private scala.collection.immutable.List elems;
   Signature: Lscala/collection/immutable/List;
 
diff --git c/scala/collection/mutable/StackProxy.class w/scala/collection/mutable/StackProxy.class
index ed99715489..09d23d2378 100644
--- c/scala/collection/mutable/StackProxy.class
+++ w/scala/collection/mutable/StackProxy.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "StackProxy.scala"
-public interface scala.collection.mutable.StackProxy extends scala.Proxy,scala.ScalaObject{
+public interface scala.collection.mutable.StackProxy extends scala.Proxy{
 public abstract scala.collection.mutable.Stack self();
   Signature: ()Lscala/collection/mutable/Stack;
 
diff --git c/scala/collection/mutable/StringBuilder.class w/scala/collection/mutable/StringBuilder.class
index f10452fd24..0a18e57381 100644
--- c/scala/collection/mutable/StringBuilder.class
+++ w/scala/collection/mutable/StringBuilder.class
@@ -1,6 +1,6 @@
 
 Compiled from "StringBuilder.scala"
-public final class scala.collection.mutable.StringBuilder extends scala.collection.mutable.AbstractSeq implements java.lang.CharSequence,scala.collection.mutable.IndexedSeq,scala.collection.immutable.StringLike,scala.collection.mutable.Builder,scala.Serializable,scala.ScalaObject{
+public final class scala.collection.mutable.StringBuilder extends scala.collection.mutable.AbstractSeq implements java.lang.CharSequence,scala.collection.mutable.IndexedSeq,scala.collection.immutable.StringLike,scala.collection.mutable.Builder,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/mutable/SynchronizedBuffer.class w/scala/collection/mutable/SynchronizedBuffer.class
index 4786932b21..b59ec2329b 100644
--- c/scala/collection/mutable/SynchronizedBuffer.class
+++ w/scala/collection/mutable/SynchronizedBuffer.class
@@ -1,6 +1,6 @@
 
 Compiled from "SynchronizedBuffer.scala"
-public interface scala.collection.mutable.SynchronizedBuffer extends scala.collection.mutable.Buffer,scala.ScalaObject{
+public interface scala.collection.mutable.SynchronizedBuffer extends scala.collection.mutable.Buffer{
 public abstract int scala$collection$mutable$SynchronizedBuffer$$super$length();
   Signature: ()I
 
diff --git c/scala/collection/mutable/SynchronizedMap.class w/scala/collection/mutable/SynchronizedMap.class
index f0d0e0a978..9a64573529 100644
--- c/scala/collection/mutable/SynchronizedMap.class
+++ w/scala/collection/mutable/SynchronizedMap.class
@@ -1,6 +1,6 @@
 
 Compiled from "SynchronizedMap.scala"
-public interface scala.collection.mutable.SynchronizedMap extends scala.collection.mutable.Map,scala.ScalaObject{
+public interface scala.collection.mutable.SynchronizedMap extends scala.collection.mutable.Map{
 public abstract scala.Option scala$collection$mutable$SynchronizedMap$$super$get(java.lang.Object);
   Signature: (Ljava/lang/Object;)Lscala/Option;
 
diff --git c/scala/collection/mutable/SynchronizedSet.class w/scala/collection/mutable/SynchronizedSet.class
index 118667fcfa..9dc0b12999 100644
--- c/scala/collection/mutable/SynchronizedSet.class
+++ w/scala/collection/mutable/SynchronizedSet.class
@@ -1,6 +1,6 @@
 
 Compiled from "SynchronizedSet.scala"
-public interface scala.collection.mutable.SynchronizedSet extends scala.collection.mutable.Set,scala.ScalaObject{
+public interface scala.collection.mutable.SynchronizedSet extends scala.collection.mutable.Set{
 public abstract int scala$collection$mutable$SynchronizedSet$$super$size();
   Signature: ()I
 
diff --git c/scala/collection/mutable/Traversable$.class w/scala/collection/mutable/Traversable$.class
index 1df53765aa..01778d7ea0 100644
--- c/scala/collection/mutable/Traversable$.class
+++ w/scala/collection/mutable/Traversable$.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //GenericCanBuildFrom=class scala/collection/generic/GenTraversableFactory$GenericCanBuildFrom of class scala/collection/generic/GenTraversableFactory
 
 Compiled from "Traversable.scala"
-public final class scala.collection.mutable.Traversable$ extends scala.collection.generic.GenTraversableFactory implements scala.collection.generic.TraversableFactory,scala.ScalaObject{
+public final class scala.collection.mutable.Traversable$ extends scala.collection.generic.GenTraversableFactory implements scala.collection.generic.TraversableFactory{
 public static final scala.collection.mutable.Traversable$ MODULE$;
   Signature: Lscala/collection/mutable/Traversable$;
 
diff --git c/scala/collection/mutable/Traversable.class w/scala/collection/mutable/Traversable.class
index dab988a580..39de41d588 100644
--- c/scala/collection/mutable/Traversable.class
+++ w/scala/collection/mutable/Traversable.class
@@ -1,6 +1,6 @@
 
 Compiled from "Traversable.scala"
-public interface scala.collection.mutable.Traversable extends scala.collection.Traversable,scala.collection.generic.GenericTraversableTemplate,scala.collection.TraversableLike,scala.Mutable,scala.ScalaObject{
+public interface scala.collection.mutable.Traversable extends scala.collection.Traversable,scala.Mutable{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/mutable/UnrolledBuffer.class w/scala/collection/mutable/UnrolledBuffer.class
index 81270c7661..6b7d3c860b 100644
--- c/scala/collection/mutable/UnrolledBuffer.class
+++ w/scala/collection/mutable/UnrolledBuffer.class
@@ -3,7 +3,7 @@ public #= # of #; //Unrolled=class scala/collection/mutable/UnrolledBuffer$Unrol
 public final #= # of #; //Unrolled$=class scala/collection/mutable/UnrolledBuffer$Unrolled$ of class scala/collection/mutable/UnrolledBuffer
 
 Compiled from "UnrolledBuffer.scala"
-public class scala.collection.mutable.UnrolledBuffer extends scala.collection.mutable.AbstractBuffer implements scala.collection.mutable.Buffer,scala.collection.mutable.BufferLike,scala.collection.generic.GenericClassManifestTraversableTemplate,scala.collection.mutable.Builder,scala.Serializable,scala.ScalaObject{
+public class scala.collection.mutable.UnrolledBuffer extends scala.collection.mutable.AbstractBuffer implements scala.collection.mutable.Buffer,scala.collection.generic.GenericClassManifestTraversableTemplate,scala.collection.mutable.Builder,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/mutable/WeakHashMap.class w/scala/collection/mutable/WeakHashMap.class
index 1b6757e329..8297c60eb7 100644
--- c/scala/collection/mutable/WeakHashMap.class
+++ w/scala/collection/mutable/WeakHashMap.class
@@ -3,7 +3,7 @@ public #= # of #; //JMapWrapper=class scala/collection/JavaConversions$JMapWrapp
 public abstract #= # of #; //JMapWrapperLike=class scala/collection/JavaConversions$JMapWrapperLike of class scala/collection/JavaConversions
 
 Compiled from "WeakHashMap.scala"
-public class scala.collection.mutable.WeakHashMap extends scala.collection.JavaConversions$JMapWrapper implements scala.collection.JavaConversions$JMapWrapperLike,scala.ScalaObject{
+public class scala.collection.mutable.WeakHashMap extends scala.collection.JavaConversions$JMapWrapper implements scala.collection.JavaConversions$JMapWrapperLike{
 public static scala.collection.generic.CanBuildFrom canBuildFrom();
   Signature: ()Lscala/collection/generic/CanBuildFrom;
   Code:
diff --git c/scala/collection/mutable/WrappedArray.class w/scala/collection/mutable/WrappedArray.class
index 9d4d3e19c2..46ab0a96a6 100644
--- c/scala/collection/mutable/WrappedArray.class
+++ w/scala/collection/mutable/WrappedArray.class
@@ -11,7 +11,7 @@ public final #= # of #; //ofDouble=class scala/collection/mutable/WrappedArray$o
 public final #= # of #; //ofBoolean=class scala/collection/mutable/WrappedArray$ofBoolean of class scala/collection/mutable/WrappedArray
 
 Compiled from "WrappedArray.scala"
-public abstract class scala.collection.mutable.WrappedArray extends scala.collection.mutable.AbstractSeq implements scala.collection.mutable.IndexedSeq,scala.collection.mutable.ArrayLike,scala.collection.CustomParallelizable,scala.ScalaObject{
+public abstract class scala.collection.mutable.WrappedArray extends scala.collection.mutable.AbstractSeq implements scala.collection.mutable.IndexedSeq,scala.collection.mutable.ArrayLike,scala.collection.CustomParallelizable{
 public static scala.collection.generic.CanBuildFrom canBuildFrom(scala.reflect.ClassManifest);
   Signature: (Lscala/reflect/ClassManifest;)Lscala/collection/generic/CanBuildFrom;
   Code:
diff --git c/scala/collection/mutable/WrappedArrayBuilder.class w/scala/collection/mutable/WrappedArrayBuilder.class
index 1951cb9254..30a5022b7d 100644
--- c/scala/collection/mutable/WrappedArrayBuilder.class
+++ w/scala/collection/mutable/WrappedArrayBuilder.class
@@ -1,6 +1,6 @@
 
 Compiled from "WrappedArrayBuilder.scala"
-public class scala.collection.mutable.WrappedArrayBuilder extends java.lang.Object implements scala.collection.mutable.Builder,scala.ScalaObject{
+public class scala.collection.mutable.WrappedArrayBuilder extends java.lang.Object implements scala.collection.mutable.Builder{
 private final scala.reflect.ClassManifest manifest;
   Signature: Lscala/reflect/ClassManifest;
 
diff --git c/scala/collection/parallel/AdaptiveWorkStealingForkJoinTasks$TaskImpl.class w/scala/collection/parallel/AdaptiveWorkStealingForkJoinTasks$TaskImpl.class
index 8e7d8cd13b..340d7dba75 100644
--- c/scala/collection/parallel/AdaptiveWorkStealingForkJoinTasks$TaskImpl.class
+++ w/scala/collection/parallel/AdaptiveWorkStealingForkJoinTasks$TaskImpl.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //TaskImpl$class=class scala/collection/parallel/Adap
 public #= # of #; //TaskImpl=class scala/collection/parallel/AdaptiveWorkStealingForkJoinTasks$TaskImpl of class scala/collection/parallel/AdaptiveWorkStealingForkJoinTasks
 
 Compiled from "Tasks.scala"
-public class scala.collection.parallel.AdaptiveWorkStealingForkJoinTasks$TaskImpl extends scala.concurrent.forkjoin.RecursiveAction implements scala.collection.parallel.ForkJoinTasks$TaskImpl,scala.collection.parallel.AdaptiveWorkStealingTasks$TaskImpl,scala.ScalaObject{
+public class scala.collection.parallel.AdaptiveWorkStealingForkJoinTasks$TaskImpl extends scala.concurrent.forkjoin.RecursiveAction implements scala.collection.parallel.ForkJoinTasks$TaskImpl,scala.collection.parallel.AdaptiveWorkStealingTasks$TaskImpl{
 private final scala.collection.parallel.Tasks$Task body;
   Signature: Lscala/collection/parallel/Tasks$Task;
 
diff --git c/scala/collection/parallel/AdaptiveWorkStealingForkJoinTasks.class w/scala/collection/parallel/AdaptiveWorkStealingForkJoinTasks.class
index cbd99ad462..20e55d0f2e 100644
--- c/scala/collection/parallel/AdaptiveWorkStealingForkJoinTasks.class
+++ w/scala/collection/parallel/AdaptiveWorkStealingForkJoinTasks.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Task=class scala/collection/parallel/Tasks$Task of
 public #= # of #; //TaskImpl=class scala/collection/parallel/AdaptiveWorkStealingForkJoinTasks$TaskImpl of class scala/collection/parallel/AdaptiveWorkStealingForkJoinTasks
 
 Compiled from "Tasks.scala"
-public interface scala.collection.parallel.AdaptiveWorkStealingForkJoinTasks extends scala.collection.parallel.ForkJoinTasks,scala.collection.parallel.AdaptiveWorkStealingTasks,scala.ScalaObject{
+public interface scala.collection.parallel.AdaptiveWorkStealingForkJoinTasks extends scala.collection.parallel.ForkJoinTasks,scala.collection.parallel.AdaptiveWorkStealingTasks{
 public abstract scala.collection.parallel.AdaptiveWorkStealingForkJoinTasks$TaskImpl newTaskImpl(scala.collection.parallel.Tasks$Task);
   Signature: (Lscala/collection/parallel/Tasks$Task;)Lscala/collection/parallel/AdaptiveWorkStealingForkJoinTasks$TaskImpl;
 
diff --git c/scala/collection/parallel/AdaptiveWorkStealingTasks$TaskImpl.class w/scala/collection/parallel/AdaptiveWorkStealingTasks$TaskImpl.class
index 2b2ec429f3..ad529391fb 100644
--- c/scala/collection/parallel/AdaptiveWorkStealingTasks$TaskImpl.class
+++ w/scala/collection/parallel/AdaptiveWorkStealingTasks$TaskImpl.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //TaskImpl=class scala/collection/parallel/Tasks$Task
 public abstract #= # of #; //TaskImpl=class scala/collection/parallel/AdaptiveWorkStealingTasks$TaskImpl of class scala/collection/parallel/AdaptiveWorkStealingTasks
 
 Compiled from "Tasks.scala"
-public interface scala.collection.parallel.AdaptiveWorkStealingTasks$TaskImpl extends scala.collection.parallel.Tasks$TaskImpl,scala.ScalaObject{
+public interface scala.collection.parallel.AdaptiveWorkStealingTasks$TaskImpl extends scala.collection.parallel.Tasks$TaskImpl{
 public abstract scala.collection.parallel.AdaptiveWorkStealingTasks$TaskImpl next();
   Signature: ()Lscala/collection/parallel/AdaptiveWorkStealingTasks$TaskImpl;
 
diff --git c/scala/collection/parallel/AdaptiveWorkStealingTasks.class w/scala/collection/parallel/AdaptiveWorkStealingTasks.class
index f7d2a85ba0..7796d08796 100644
--- c/scala/collection/parallel/AdaptiveWorkStealingTasks.class
+++ w/scala/collection/parallel/AdaptiveWorkStealingTasks.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //TaskImpl=class scala/collection/parallel/AdaptiveWo
 public abstract #= # of #; //TaskImpl$class=class scala/collection/parallel/AdaptiveWorkStealingTasks$TaskImpl$class of class scala/collection/parallel/AdaptiveWorkStealingTasks
 
 Compiled from "Tasks.scala"
-public interface scala.collection.parallel.AdaptiveWorkStealingTasks extends scala.collection.parallel.Tasks,scala.ScalaObject{
+public interface scala.collection.parallel.AdaptiveWorkStealingTasks extends scala.collection.parallel.Tasks{
 public abstract scala.collection.parallel.AdaptiveWorkStealingTasks$TaskImpl newTaskImpl(scala.collection.parallel.Tasks$Task);
   Signature: (Lscala/collection/parallel/Tasks$Task;)Lscala/collection/parallel/AdaptiveWorkStealingTasks$TaskImpl;
 
diff --git c/scala/collection/parallel/AdaptiveWorkStealingThreadPoolTasks$TaskImpl.class w/scala/collection/parallel/AdaptiveWorkStealingThreadPoolTasks$TaskImpl.class
index 03f1d5f9a3..294b9e8ece 100644
--- c/scala/collection/parallel/AdaptiveWorkStealingThreadPoolTasks$TaskImpl.class
+++ w/scala/collection/parallel/AdaptiveWorkStealingThreadPoolTasks$TaskImpl.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //TaskImpl$class=class scala/collection/parallel/Adap
 public #= # of #; //TaskImpl=class scala/collection/parallel/AdaptiveWorkStealingThreadPoolTasks$TaskImpl of class scala/collection/parallel/AdaptiveWorkStealingThreadPoolTasks
 
 Compiled from "Tasks.scala"
-public class scala.collection.parallel.AdaptiveWorkStealingThreadPoolTasks$TaskImpl extends java.lang.Object implements scala.collection.parallel.ThreadPoolTasks$TaskImpl,scala.collection.parallel.AdaptiveWorkStealingTasks$TaskImpl,scala.ScalaObject{
+public class scala.collection.parallel.AdaptiveWorkStealingThreadPoolTasks$TaskImpl extends java.lang.Object implements scala.collection.parallel.ThreadPoolTasks$TaskImpl,scala.collection.parallel.AdaptiveWorkStealingTasks$TaskImpl{
 private final scala.collection.parallel.Tasks$Task body;
   Signature: Lscala/collection/parallel/Tasks$Task;
 
diff --git c/scala/collection/parallel/AdaptiveWorkStealingThreadPoolTasks.class w/scala/collection/parallel/AdaptiveWorkStealingThreadPoolTasks.class
index b1dd0f1105..d4cf1d8659 100644
--- c/scala/collection/parallel/AdaptiveWorkStealingThreadPoolTasks.class
+++ w/scala/collection/parallel/AdaptiveWorkStealingThreadPoolTasks.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Task=class scala/collection/parallel/Tasks$Task of
 public #= # of #; //TaskImpl=class scala/collection/parallel/AdaptiveWorkStealingThreadPoolTasks$TaskImpl of class scala/collection/parallel/AdaptiveWorkStealingThreadPoolTasks
 
 Compiled from "Tasks.scala"
-public interface scala.collection.parallel.AdaptiveWorkStealingThreadPoolTasks extends scala.collection.parallel.ThreadPoolTasks,scala.collection.parallel.AdaptiveWorkStealingTasks,scala.ScalaObject{
+public interface scala.collection.parallel.AdaptiveWorkStealingThreadPoolTasks extends scala.collection.parallel.ThreadPoolTasks,scala.collection.parallel.AdaptiveWorkStealingTasks{
 public abstract scala.collection.parallel.AdaptiveWorkStealingThreadPoolTasks$TaskImpl newTaskImpl(scala.collection.parallel.Tasks$Task);
   Signature: (Lscala/collection/parallel/Tasks$Task;)Lscala/collection/parallel/AdaptiveWorkStealingThreadPoolTasks$TaskImpl;
 
diff --git c/scala/collection/parallel/AugmentedIterableIterator.class w/scala/collection/parallel/AugmentedIterableIterator.class
index 60c6ac8816..826cf86e0c 100644
--- c/scala/collection/parallel/AugmentedIterableIterator.class
+++ w/scala/collection/parallel/AugmentedIterableIterator.class
@@ -1,6 +1,6 @@
 
 Compiled from "RemainsIterator.scala"
-public interface scala.collection.parallel.AugmentedIterableIterator extends scala.collection.parallel.RemainsIterator,scala.ScalaObject{
+public interface scala.collection.parallel.AugmentedIterableIterator extends scala.collection.parallel.RemainsIterator{
 public abstract int count(scala.Function1);
   Signature: (Lscala/Function1;)I
 
diff --git c/scala/collection/parallel/AugmentedSeqIterator.class w/scala/collection/parallel/AugmentedSeqIterator.class
index dcfa0f01eb..e16261bb37 100644
--- c/scala/collection/parallel/AugmentedSeqIterator.class
+++ w/scala/collection/parallel/AugmentedSeqIterator.class
@@ -1,6 +1,6 @@
 
 Compiled from "RemainsIterator.scala"
-public interface scala.collection.parallel.AugmentedSeqIterator extends scala.collection.parallel.AugmentedIterableIterator,scala.ScalaObject{
+public interface scala.collection.parallel.AugmentedSeqIterator extends scala.collection.parallel.AugmentedIterableIterator{
 public abstract int remaining();
   Signature: ()I
 
diff --git c/scala/collection/parallel/BucketCombiner.class w/scala/collection/parallel/BucketCombiner.class
index 7f20e39d4c..9341c8fac4 100644
--- c/scala/collection/parallel/BucketCombiner.class
+++ w/scala/collection/parallel/BucketCombiner.class
@@ -1,6 +1,6 @@
 
 Compiled from "package.scala"
-public abstract class scala.collection.parallel.BucketCombiner extends java.lang.Object implements scala.collection.parallel.Combiner,scala.ScalaObject{
+public abstract class scala.collection.parallel.BucketCombiner extends java.lang.Object implements scala.collection.parallel.Combiner{
 private final int bucketnumber;
   Signature: I
 
diff --git c/scala/collection/parallel/BufferSplitter.class w/scala/collection/parallel/BufferSplitter.class
index a8185a471a..2458e443b5 100644
--- c/scala/collection/parallel/BufferSplitter.class
+++ w/scala/collection/parallel/BufferSplitter.class
@@ -8,7 +8,7 @@ public #= # of #; //Appended=class scala/collection/parallel/IterableSplitter$Ap
 public #= # of #; //ZippedAll=class scala/collection/parallel/IterableSplitter$ZippedAll of class scala/collection/parallel/IterableSplitter
 
 Compiled from "package.scala"
-public class scala.collection.parallel.BufferSplitter extends java.lang.Object implements scala.collection.parallel.IterableSplitter,scala.ScalaObject{
+public class scala.collection.parallel.BufferSplitter extends java.lang.Object implements scala.collection.parallel.IterableSplitter{
 private final scala.collection.mutable.ArrayBuffer scala$collection$parallel$BufferSplitter$$buffer;
   Signature: Lscala/collection/mutable/ArrayBuffer;
 
diff --git c/scala/collection/parallel/Combiner.class w/scala/collection/parallel/Combiner.class
index 3a3344acde..511e80df96 100644
--- c/scala/collection/parallel/Combiner.class
+++ w/scala/collection/parallel/Combiner.class
@@ -1,6 +1,6 @@
 
 Compiled from "Combiner.scala"
-public interface scala.collection.parallel.Combiner extends scala.collection.mutable.Builder,scala.collection.generic.Sizing,scala.collection.Parallel,scala.ScalaObject{
+public interface scala.collection.parallel.Combiner extends scala.collection.mutable.Builder,scala.collection.generic.Sizing,scala.collection.Parallel{
 public abstract void scala$collection$parallel$Combiner$_setter_$tasksupport_$eq(scala.collection.parallel.TaskSupport);
   Signature: (Lscala/collection/parallel/TaskSupport;)V
 
diff --git c/scala/collection/parallel/CompositeThrowable.class w/scala/collection/parallel/CompositeThrowable.class
index c832f52cf3..3fc0764ded 100644
--- c/scala/collection/parallel/CompositeThrowable.class
+++ w/scala/collection/parallel/CompositeThrowable.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "package.scala"
-public final class scala.collection.parallel.CompositeThrowable extends java.lang.Throwable implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.collection.parallel.CompositeThrowable extends java.lang.Throwable implements scala.Product,scala.Serializable{
 private final scala.collection.Set throwables;
   Signature: Lscala/collection/Set;
 
diff --git c/scala/collection/parallel/ForkJoinTaskSupport.class w/scala/collection/parallel/ForkJoinTaskSupport.class
index 2dc1a75803..9b15896aab 100644
--- c/scala/collection/parallel/ForkJoinTaskSupport.class
+++ w/scala/collection/parallel/ForkJoinTaskSupport.class
@@ -6,7 +6,7 @@ public abstract #= # of #; //TaskImpl=class scala/collection/parallel/AdaptiveWo
 public #= # of #; //TaskImpl=class scala/collection/parallel/AdaptiveWorkStealingForkJoinTasks$TaskImpl of class scala/collection/parallel/AdaptiveWorkStealingForkJoinTasks
 
 Compiled from "TaskSupport.scala"
-public class scala.collection.parallel.ForkJoinTaskSupport extends java.lang.Object implements scala.collection.parallel.TaskSupport,scala.collection.parallel.AdaptiveWorkStealingForkJoinTasks,scala.ScalaObject{
+public class scala.collection.parallel.ForkJoinTaskSupport extends java.lang.Object implements scala.collection.parallel.TaskSupport,scala.collection.parallel.AdaptiveWorkStealingForkJoinTasks{
 private java.lang.Object environment;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/collection/parallel/ForkJoinTasks$TaskImpl.class w/scala/collection/parallel/ForkJoinTasks$TaskImpl.class
index f13ba68435..73c22e6272 100644
--- c/scala/collection/parallel/ForkJoinTasks$TaskImpl.class
+++ w/scala/collection/parallel/ForkJoinTasks$TaskImpl.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //TaskImpl=class scala/collection/parallel/Tasks$Task
 public abstract #= # of #; //TaskImpl=class scala/collection/parallel/ForkJoinTasks$TaskImpl of class scala/collection/parallel/ForkJoinTasks
 
 Compiled from "Tasks.scala"
-public interface scala.collection.parallel.ForkJoinTasks$TaskImpl extends scala.collection.parallel.Tasks$TaskImpl,scala.ScalaObject{
+public interface scala.collection.parallel.ForkJoinTasks$TaskImpl extends scala.collection.parallel.Tasks$TaskImpl{
 public abstract void start();
   Signature: ()V
 
diff --git c/scala/collection/parallel/ForkJoinTasks.class w/scala/collection/parallel/ForkJoinTasks.class
index e9761d30ba..6db36322d1 100644
--- c/scala/collection/parallel/ForkJoinTasks.class
+++ w/scala/collection/parallel/ForkJoinTasks.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //TaskImpl=class scala/collection/parallel/ForkJoinTa
 public abstract #= # of #; //TaskImpl$class=class scala/collection/parallel/ForkJoinTasks$TaskImpl$class of class scala/collection/parallel/ForkJoinTasks
 
 Compiled from "Tasks.scala"
-public interface scala.collection.parallel.ForkJoinTasks extends scala.collection.parallel.Tasks,scala.collection.parallel.HavingForkJoinPool,scala.ScalaObject{
+public interface scala.collection.parallel.ForkJoinTasks extends scala.collection.parallel.Tasks,scala.collection.parallel.HavingForkJoinPool{
 public abstract scala.collection.parallel.ForkJoinTasks$TaskImpl newTaskImpl(scala.collection.parallel.Tasks$Task);
   Signature: (Lscala/collection/parallel/Tasks$Task;)Lscala/collection/parallel/ForkJoinTasks$TaskImpl;
 
diff --git c/scala/collection/parallel/FutureThreadPoolTasks$TaskImpl.class w/scala/collection/parallel/FutureThreadPoolTasks$TaskImpl.class
index 4c8c740059..3b6d4015e1 100644
--- c/scala/collection/parallel/FutureThreadPoolTasks$TaskImpl.class
+++ w/scala/collection/parallel/FutureThreadPoolTasks$TaskImpl.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //TaskImpl=class scala/collection/parallel/Tasks$Task
 public abstract #= # of #; //TaskImpl=class scala/collection/parallel/FutureThreadPoolTasks$TaskImpl of class scala/collection/parallel/FutureThreadPoolTasks
 
 Compiled from "Tasks.scala"
-public interface scala.collection.parallel.FutureThreadPoolTasks$TaskImpl extends java.lang.Runnable,scala.collection.parallel.Tasks$TaskImpl,scala.ScalaObject{
+public interface scala.collection.parallel.FutureThreadPoolTasks$TaskImpl extends java.lang.Runnable,scala.collection.parallel.Tasks$TaskImpl{
 public abstract java.util.concurrent.Future future();
   Signature: ()Ljava/util/concurrent/Future;
 
diff --git c/scala/collection/parallel/FutureThreadPoolTasks.class w/scala/collection/parallel/FutureThreadPoolTasks.class
index c04743bb07..984f508b00 100644
--- c/scala/collection/parallel/FutureThreadPoolTasks.class
+++ w/scala/collection/parallel/FutureThreadPoolTasks.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //TaskImpl=class scala/collection/parallel/FutureThre
 public abstract #= # of #; //TaskImpl$class=class scala/collection/parallel/FutureThreadPoolTasks$TaskImpl$class of class scala/collection/parallel/FutureThreadPoolTasks
 
 Compiled from "Tasks.scala"
-public interface scala.collection.parallel.FutureThreadPoolTasks extends scala.collection.parallel.Tasks,scala.ScalaObject{
+public interface scala.collection.parallel.FutureThreadPoolTasks extends scala.collection.parallel.Tasks{
 public abstract scala.collection.parallel.FutureThreadPoolTasks$TaskImpl newTaskImpl(scala.collection.parallel.Tasks$Task);
   Signature: (Lscala/collection/parallel/Tasks$Task;)Lscala/collection/parallel/FutureThreadPoolTasks$TaskImpl;
 
diff --git c/scala/collection/parallel/IterableSplitter$Appended.class w/scala/collection/parallel/IterableSplitter$Appended.class
index 515324197d..fbb81c2b25 100644
--- c/scala/collection/parallel/IterableSplitter$Appended.class
+++ w/scala/collection/parallel/IterableSplitter$Appended.class
@@ -8,7 +8,7 @@ public #= # of #; //Appended=class scala/collection/parallel/IterableSplitter$Ap
 public #= # of #; //ZippedAll=class scala/collection/parallel/IterableSplitter$ZippedAll of class scala/collection/parallel/IterableSplitter
 
 Compiled from "RemainsIterator.scala"
-public class scala.collection.parallel.IterableSplitter$Appended extends java.lang.Object implements scala.collection.parallel.IterableSplitter,scala.ScalaObject{
+public class scala.collection.parallel.IterableSplitter$Appended extends java.lang.Object implements scala.collection.parallel.IterableSplitter{
 private final scala.collection.parallel.IterableSplitter that;
   Signature: Lscala/collection/parallel/IterableSplitter;
 
diff --git c/scala/collection/parallel/IterableSplitter$Mapped.class w/scala/collection/parallel/IterableSplitter$Mapped.class
index 142f1cfa30..a5d35d56bc 100644
--- c/scala/collection/parallel/IterableSplitter$Mapped.class
+++ w/scala/collection/parallel/IterableSplitter$Mapped.class
@@ -8,7 +8,7 @@ public #= # of #; //Appended=class scala/collection/parallel/IterableSplitter$Ap
 public #= # of #; //ZippedAll=class scala/collection/parallel/IterableSplitter$ZippedAll of class scala/collection/parallel/IterableSplitter
 
 Compiled from "RemainsIterator.scala"
-public class scala.collection.parallel.IterableSplitter$Mapped extends java.lang.Object implements scala.collection.parallel.IterableSplitter,scala.ScalaObject{
+public class scala.collection.parallel.IterableSplitter$Mapped extends java.lang.Object implements scala.collection.parallel.IterableSplitter{
 public final scala.Function1 scala$collection$parallel$IterableSplitter$Mapped$$f;
   Signature: Lscala/Function1;
 
diff --git c/scala/collection/parallel/IterableSplitter$Taken.class w/scala/collection/parallel/IterableSplitter$Taken.class
index b9e1a15817..063bd18a6c 100644
--- c/scala/collection/parallel/IterableSplitter$Taken.class
+++ w/scala/collection/parallel/IterableSplitter$Taken.class
@@ -8,7 +8,7 @@ public #= # of #; //Appended=class scala/collection/parallel/IterableSplitter$Ap
 public #= # of #; //ZippedAll=class scala/collection/parallel/IterableSplitter$ZippedAll of class scala/collection/parallel/IterableSplitter
 
 Compiled from "RemainsIterator.scala"
-public class scala.collection.parallel.IterableSplitter$Taken extends java.lang.Object implements scala.collection.parallel.IterableSplitter,scala.ScalaObject{
+public class scala.collection.parallel.IterableSplitter$Taken extends java.lang.Object implements scala.collection.parallel.IterableSplitter{
 private final int taken;
   Signature: I
 
diff --git c/scala/collection/parallel/IterableSplitter$Zipped.class w/scala/collection/parallel/IterableSplitter$Zipped.class
index 9641cb8632..0ef54207af 100644
--- c/scala/collection/parallel/IterableSplitter$Zipped.class
+++ w/scala/collection/parallel/IterableSplitter$Zipped.class
@@ -8,7 +8,7 @@ public #= # of #; //Appended=class scala/collection/parallel/IterableSplitter$Ap
 public #= # of #; //ZippedAll=class scala/collection/parallel/IterableSplitter$ZippedAll of class scala/collection/parallel/IterableSplitter
 
 Compiled from "RemainsIterator.scala"
-public class scala.collection.parallel.IterableSplitter$Zipped extends java.lang.Object implements scala.collection.parallel.IterableSplitter,scala.ScalaObject{
+public class scala.collection.parallel.IterableSplitter$Zipped extends java.lang.Object implements scala.collection.parallel.IterableSplitter{
 private final scala.collection.parallel.SeqSplitter that;
   Signature: Lscala/collection/parallel/SeqSplitter;
 
diff --git c/scala/collection/parallel/IterableSplitter$ZippedAll.class w/scala/collection/parallel/IterableSplitter$ZippedAll.class
index 3ab3991bc4..24be3a29b0 100644
--- c/scala/collection/parallel/IterableSplitter$ZippedAll.class
+++ w/scala/collection/parallel/IterableSplitter$ZippedAll.class
@@ -10,7 +10,7 @@ public #= # of #; //Appended=class scala/collection/parallel/IterableSplitter$Ap
 public #= # of #; //ZippedAll=class scala/collection/parallel/IterableSplitter$ZippedAll of class scala/collection/parallel/IterableSplitter
 
 Compiled from "RemainsIterator.scala"
-public class scala.collection.parallel.IterableSplitter$ZippedAll extends java.lang.Object implements scala.collection.parallel.IterableSplitter,scala.ScalaObject{
+public class scala.collection.parallel.IterableSplitter$ZippedAll extends java.lang.Object implements scala.collection.parallel.IterableSplitter{
 private final scala.collection.parallel.SeqSplitter that;
   Signature: Lscala/collection/parallel/SeqSplitter;
 
diff --git c/scala/collection/parallel/IterableSplitter.class w/scala/collection/parallel/IterableSplitter.class
index 5db8882616..c3a5fdf0d4 100644
--- c/scala/collection/parallel/IterableSplitter.class
+++ w/scala/collection/parallel/IterableSplitter.class
@@ -6,7 +6,7 @@ public #= # of #; //Appended=class scala/collection/parallel/IterableSplitter$Ap
 public #= # of #; //ZippedAll=class scala/collection/parallel/IterableSplitter$ZippedAll of class scala/collection/parallel/IterableSplitter
 
 Compiled from "RemainsIterator.scala"
-public interface scala.collection.parallel.IterableSplitter extends scala.collection.parallel.AugmentedIterableIterator,scala.collection.parallel.Splitter,scala.collection.generic.Signalling,scala.collection.generic.DelegatedSignalling,scala.ScalaObject{
+public interface scala.collection.parallel.IterableSplitter extends scala.collection.parallel.AugmentedIterableIterator,scala.collection.parallel.Splitter,scala.collection.generic.DelegatedSignalling{
 public abstract scala.collection.parallel.IterableSplitter dup();
   Signature: ()Lscala/collection/parallel/IterableSplitter;
 
diff --git c/scala/collection/parallel/ParIterable.class w/scala/collection/parallel/ParIterable.class
index 6b4f5066c7..337a3ca187 100644
--- c/scala/collection/parallel/ParIterable.class
+++ w/scala/collection/parallel/ParIterable.class
@@ -1,6 +1,6 @@
 
 Compiled from "ParIterable.scala"
-public interface scala.collection.parallel.ParIterable extends scala.collection.GenIterable,scala.collection.generic.GenericParTemplate,scala.collection.parallel.ParIterableLike,scala.ScalaObject{
+public interface scala.collection.parallel.ParIterable extends scala.collection.GenIterable,scala.collection.generic.GenericParTemplate,scala.collection.parallel.ParIterableLike{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/parallel/ParIterableLike$Accessor.class w/scala/collection/parallel/ParIterableLike$Accessor.class
index edd6b2ea19..d56e0dbea2 100644
--- c/scala/collection/parallel/ParIterableLike$Accessor.class
+++ w/scala/collection/parallel/ParIterableLike$Accessor.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Accessor=class scala/collection/parallel/ParIterabl
 public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public interface scala.collection.parallel.ParIterableLike$Accessor extends scala.collection.parallel.ParIterableLike$StrictSplitterCheckTask,scala.ScalaObject{
+public interface scala.collection.parallel.ParIterableLike$Accessor extends scala.collection.parallel.ParIterableLike$StrictSplitterCheckTask{
 public abstract java.lang.String scala$collection$parallel$ParIterableLike$Accessor$$super$toString();
   Signature: ()Ljava/lang/String;
 
diff --git c/scala/collection/parallel/ParIterableLike$Aggregate.class w/scala/collection/parallel/ParIterableLike$Aggregate.class
index 00ea929964..07312d79a1 100644
--- c/scala/collection/parallel/ParIterableLike$Aggregate.class
+++ w/scala/collection/parallel/ParIterableLike$Aggregate.class
@@ -8,7 +8,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Aggregate extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Aggregate extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor{
 private final java.lang.Object z;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/collection/parallel/ParIterableLike$Collect.class w/scala/collection/parallel/ParIterableLike$Collect.class
index a5f94de9ff..a95c9bfce0 100644
--- c/scala/collection/parallel/ParIterableLike$Collect.class
+++ w/scala/collection/parallel/ParIterableLike$Collect.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Collect extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Collect extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer{
 private final scala.PartialFunction pf;
   Signature: Lscala/PartialFunction;
 
diff --git c/scala/collection/parallel/ParIterableLike$Composite.class w/scala/collection/parallel/ParIterableLike$Composite.class
index d642846c49..b2d60c12a7 100644
--- c/scala/collection/parallel/ParIterableLike$Composite.class
+++ w/scala/collection/parallel/ParIterableLike$Composite.class
@@ -8,7 +8,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public abstract class scala.collection.parallel.ParIterableLike$Composite extends java.lang.Object implements scala.collection.parallel.ParIterableLike$NonDivisibleTask,scala.ScalaObject{
+public abstract class scala.collection.parallel.ParIterableLike$Composite extends java.lang.Object implements scala.collection.parallel.ParIterableLike$NonDivisibleTask{
 private final scala.collection.parallel.ParIterableLike$StrictSplitterCheckTask ft;
   Signature: Lscala/collection/parallel/ParIterableLike$StrictSplitterCheckTask;
 
diff --git c/scala/collection/parallel/ParIterableLike$Copy.class w/scala/collection/parallel/ParIterableLike$Copy.class
index deda1339a9..0aa8847173 100644
--- c/scala/collection/parallel/ParIterableLike$Copy.class
+++ w/scala/collection/parallel/ParIterableLike$Copy.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Copy extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Copy extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer{
 
 private final scala.collection.parallel.IterableSplitter pit;
   Signature: Lscala/collection/parallel/IterableSplitter;
diff --git c/scala/collection/parallel/ParIterableLike$CopyToArray.class w/scala/collection/parallel/ParIterableLike$CopyToArray.class
index 445e2f738c..895ff2d920 100644
--- c/scala/collection/parallel/ParIterableLike$CopyToArray.class
+++ w/scala/collection/parallel/ParIterableLike$CopyToArray.class
@@ -8,7 +8,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$CopyToArray extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$CopyToArray extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor{
 public final int scala$collection$parallel$ParIterableLike$CopyToArray$$from;
   Signature: I
 
diff --git c/scala/collection/parallel/ParIterableLike$Count.class w/scala/collection/parallel/ParIterableLike$Count.class
index 597abf9896..8fc8e8e84e 100644
--- c/scala/collection/parallel/ParIterableLike$Count.class
+++ w/scala/collection/parallel/ParIterableLike$Count.class
@@ -8,7 +8,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Count extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Count extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor{
 private final scala.Function1 pred;
   Signature: Lscala/Function1;
 
diff --git c/scala/collection/parallel/ParIterableLike$CreateScanTree.class w/scala/collection/parallel/ParIterableLike$CreateScanTree.class
index d82c96521f..0b1e1415be 100644
--- c/scala/collection/parallel/ParIterableLike$CreateScanTree.class
+++ w/scala/collection/parallel/ParIterableLike$CreateScanTree.class
@@ -12,7 +12,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$CreateScanTree extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$CreateScanTree extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer{
 private final int from;
   Signature: I
 
diff --git c/scala/collection/parallel/ParIterableLike$Drop.class w/scala/collection/parallel/ParIterableLike$Drop.class
index 698c8e6999..bdc932b1ce 100644
--- c/scala/collection/parallel/ParIterableLike$Drop.class
+++ w/scala/collection/parallel/ParIterableLike$Drop.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Drop extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Drop extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer{
 public final int scala$collection$parallel$ParIterableLike$Drop$$n;
   Signature: I
 
diff --git c/scala/collection/parallel/ParIterableLike$Exists.class w/scala/collection/parallel/ParIterableLike$Exists.class
index d1782f6094..e2a0fd920e 100644
--- c/scala/collection/parallel/ParIterableLike$Exists.class
+++ w/scala/collection/parallel/ParIterableLike$Exists.class
@@ -8,7 +8,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Exists extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Exists extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor{
 private final scala.Function1 pred;
   Signature: Lscala/Function1;
 
diff --git c/scala/collection/parallel/ParIterableLike$Filter.class w/scala/collection/parallel/ParIterableLike$Filter.class
index 8a0f77f944..ff3e0f0940 100644
--- c/scala/collection/parallel/ParIterableLike$Filter.class
+++ w/scala/collection/parallel/ParIterableLike$Filter.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Filter extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Filter extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer{
 private final scala.Function1 pred;
   Signature: Lscala/Function1;
 
diff --git c/scala/collection/parallel/ParIterableLike$FilterNot.class w/scala/collection/parallel/ParIterableLike$FilterNot.class
index cd2ee99c83..0893690f70 100644
--- c/scala/collection/parallel/ParIterableLike$FilterNot.class
+++ w/scala/collection/parallel/ParIterableLike$FilterNot.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$FilterNot extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$FilterNot extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer{
 private final scala.Function1 pred;
   Signature: Lscala/Function1;
 
diff --git c/scala/collection/parallel/ParIterableLike$Find.class w/scala/collection/parallel/ParIterableLike$Find.class
index 54484e6a98..2a7f500d30 100644
--- c/scala/collection/parallel/ParIterableLike$Find.class
+++ w/scala/collection/parallel/ParIterableLike$Find.class
@@ -8,7 +8,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Find extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Find extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor{
 private final scala.Function1 pred;
   Signature: Lscala/Function1;
 
diff --git c/scala/collection/parallel/ParIterableLike$FlatMap.class w/scala/collection/parallel/ParIterableLike$FlatMap.class
index ebfedf66e2..f9e6752bf1 100644
--- c/scala/collection/parallel/ParIterableLike$FlatMap.class
+++ w/scala/collection/parallel/ParIterableLike$FlatMap.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$FlatMap extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$FlatMap extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer{
 private final scala.Function1 f;
   Signature: Lscala/Function1;
 
diff --git c/scala/collection/parallel/ParIterableLike$Fold.class w/scala/collection/parallel/ParIterableLike$Fold.class
index 1cd1f26a78..934c71a8f2 100644
--- c/scala/collection/parallel/ParIterableLike$Fold.class
+++ w/scala/collection/parallel/ParIterableLike$Fold.class
@@ -8,7 +8,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Fold extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Fold extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor{
 private final java.lang.Object z;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/collection/parallel/ParIterableLike$Forall.class w/scala/collection/parallel/ParIterableLike$Forall.class
index 4001f2fe05..94d060ec2c 100644
--- c/scala/collection/parallel/ParIterableLike$Forall.class
+++ w/scala/collection/parallel/ParIterableLike$Forall.class
@@ -8,7 +8,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Forall extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Forall extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor{
 private final scala.Function1 pred;
   Signature: Lscala/Function1;
 
diff --git c/scala/collection/parallel/ParIterableLike$Foreach.class w/scala/collection/parallel/ParIterableLike$Foreach.class
index d273d2afa3..18578166b7 100644
--- c/scala/collection/parallel/ParIterableLike$Foreach.class
+++ w/scala/collection/parallel/ParIterableLike$Foreach.class
@@ -8,7 +8,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Foreach extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Foreach extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor{
 private final scala.Function1 op;
   Signature: Lscala/Function1;
 
diff --git c/scala/collection/parallel/ParIterableLike$FromScanTree.class w/scala/collection/parallel/ParIterableLike$FromScanTree.class
index dd6c6bc152..ee4e65043c 100644
--- c/scala/collection/parallel/ParIterableLike$FromScanTree.class
+++ w/scala/collection/parallel/ParIterableLike$FromScanTree.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$FromScanTree extends java.lang.Object implements scala.collection.parallel.ParIterableLike$StrictSplitterCheckTask,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$FromScanTree extends java.lang.Object implements scala.collection.parallel.ParIterableLike$StrictSplitterCheckTask{
 private final scala.collection.parallel.ParIterableLike$ScanTree tree;
   Signature: Lscala/collection/parallel/ParIterableLike$ScanTree;
 
diff --git c/scala/collection/parallel/ParIterableLike$GroupBy.class w/scala/collection/parallel/ParIterableLike$GroupBy.class
index 2566ef1af5..f40b6e3f47 100644
--- c/scala/collection/parallel/ParIterableLike$GroupBy.class
+++ w/scala/collection/parallel/ParIterableLike$GroupBy.class
@@ -10,7 +10,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$GroupBy extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$GroupBy extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer{
 private final scala.Function1 f;
   Signature: Lscala/Function1;
 
diff --git c/scala/collection/parallel/ParIterableLike$Map.class w/scala/collection/parallel/ParIterableLike$Map.class
index cbb413da7c..4e0ab1e5d5 100644
--- c/scala/collection/parallel/ParIterableLike$Map.class
+++ w/scala/collection/parallel/ParIterableLike$Map.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Map extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Map extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer{
 private final scala.Function1 f;
   Signature: Lscala/Function1;
 
diff --git c/scala/collection/parallel/ParIterableLike$Max.class w/scala/collection/parallel/ParIterableLike$Max.class
index 46a203967f..589eaf45fd 100644
--- c/scala/collection/parallel/ParIterableLike$Max.class
+++ w/scala/collection/parallel/ParIterableLike$Max.class
@@ -8,7 +8,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Max extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Max extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor{
 private final scala.math.Ordering ord;
   Signature: Lscala/math/Ordering;
 
diff --git c/scala/collection/parallel/ParIterableLike$Min.class w/scala/collection/parallel/ParIterableLike$Min.class
index 4cb50dd8e4..82092e9e39 100644
--- c/scala/collection/parallel/ParIterableLike$Min.class
+++ w/scala/collection/parallel/ParIterableLike$Min.class
@@ -8,7 +8,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Min extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Min extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor{
 private final scala.math.Ordering ord;
   Signature: Lscala/math/Ordering;
 
diff --git c/scala/collection/parallel/ParIterableLike$NonDivisibleTask.class w/scala/collection/parallel/ParIterableLike$NonDivisibleTask.class
index b9a5b43109..3ac1b5068d 100644
--- c/scala/collection/parallel/ParIterableLike$NonDivisibleTask.class
+++ w/scala/collection/parallel/ParIterableLike$NonDivisibleTask.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //NonDivisibleTask=class scala/collection/parallel/Pa
 public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public interface scala.collection.parallel.ParIterableLike$NonDivisibleTask extends scala.collection.parallel.ParIterableLike$StrictSplitterCheckTask,scala.ScalaObject{
+public interface scala.collection.parallel.ParIterableLike$NonDivisibleTask extends scala.collection.parallel.ParIterableLike$StrictSplitterCheckTask{
 public abstract boolean shouldSplitFurther();
   Signature: ()Z
 
diff --git c/scala/collection/parallel/ParIterableLike$ParIterator.class w/scala/collection/parallel/ParIterableLike$ParIterator.class
index ce4e19e2a5..c5a6446835 100644
--- c/scala/collection/parallel/ParIterableLike$ParIterator.class
+++ w/scala/collection/parallel/ParIterableLike$ParIterator.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //ParIterator=class scala/collection/parallel/ParIterableLike$ParIterator of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public interface scala.collection.parallel.ParIterableLike$ParIterator extends scala.collection.parallel.IterableSplitter,scala.ScalaObject{
+public interface scala.collection.parallel.ParIterableLike$ParIterator extends scala.collection.parallel.IterableSplitter{
 public abstract scala.collection.generic.Signalling signalDelegate();
   Signature: ()Lscala/collection/generic/Signalling;
 
diff --git c/scala/collection/parallel/ParIterableLike$Partition.class w/scala/collection/parallel/ParIterableLike$Partition.class
index 78fe23706e..84b30d8c64 100644
--- c/scala/collection/parallel/ParIterableLike$Partition.class
+++ w/scala/collection/parallel/ParIterableLike$Partition.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Partition extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Partition extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer{
 private final scala.Function1 pred;
   Signature: Lscala/Function1;
 
diff --git c/scala/collection/parallel/ParIterableLike$Product.class w/scala/collection/parallel/ParIterableLike$Product.class
index b256be4dd0..228432f542 100644
--- c/scala/collection/parallel/ParIterableLike$Product.class
+++ w/scala/collection/parallel/ParIterableLike$Product.class
@@ -8,7 +8,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Product extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Product extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor{
 private final scala.math.Numeric num;
   Signature: Lscala/math/Numeric;
 
diff --git c/scala/collection/parallel/ParIterableLike$Reduce.class w/scala/collection/parallel/ParIterableLike$Reduce.class
index 42863ed52e..29489b24bd 100644
--- c/scala/collection/parallel/ParIterableLike$Reduce.class
+++ w/scala/collection/parallel/ParIterableLike$Reduce.class
@@ -8,7 +8,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Reduce extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Reduce extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor{
 private final scala.Function2 op;
   Signature: Lscala/Function2;
 
diff --git c/scala/collection/parallel/ParIterableLike$ResultMapping.class w/scala/collection/parallel/ParIterableLike$ResultMapping.class
index 2f985dfaaf..e4cfb2158b 100644
--- c/scala/collection/parallel/ParIterableLike$ResultMapping.class
+++ w/scala/collection/parallel/ParIterableLike$ResultMapping.class
@@ -8,7 +8,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public abstract class scala.collection.parallel.ParIterableLike$ResultMapping extends java.lang.Object implements scala.collection.parallel.ParIterableLike$NonDivisibleTask,scala.ScalaObject{
+public abstract class scala.collection.parallel.ParIterableLike$ResultMapping extends java.lang.Object implements scala.collection.parallel.ParIterableLike$NonDivisibleTask{
 private final scala.collection.parallel.ParIterableLike$StrictSplitterCheckTask inner;
   Signature: Lscala/collection/parallel/ParIterableLike$StrictSplitterCheckTask;
 
diff --git c/scala/collection/parallel/ParIterableLike$ScanLeaf.class w/scala/collection/parallel/ParIterableLike$ScanLeaf.class
index 044e494680..1f677ecee1 100644
--- c/scala/collection/parallel/ParIterableLike$ScanLeaf.class
+++ w/scala/collection/parallel/ParIterableLike$ScanLeaf.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //ScanTree=class scala/collection/parallel/ParIterabl
 public abstract #= # of #; //ScanTree$class=class scala/collection/parallel/ParIterableLike$ScanTree$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$ScanLeaf extends java.lang.Object implements scala.collection.parallel.ParIterableLike$ScanTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.parallel.ParIterableLike$ScanLeaf extends java.lang.Object implements scala.collection.parallel.ParIterableLike$ScanTree,scala.Product,scala.Serializable{
 private final scala.collection.parallel.IterableSplitter pit;
   Signature: Lscala/collection/parallel/IterableSplitter;
 
diff --git c/scala/collection/parallel/ParIterableLike$ScanNode.class w/scala/collection/parallel/ParIterableLike$ScanNode.class
index d72d483019..8ca1a8ddb9 100644
--- c/scala/collection/parallel/ParIterableLike$ScanNode.class
+++ w/scala/collection/parallel/ParIterableLike$ScanNode.class
@@ -5,7 +5,7 @@ public #= # of #; //ScanLeaf=class scala/collection/parallel/ParIterableLike$Sca
 public abstract #= # of #; //ScanTree$class=class scala/collection/parallel/ParIterableLike$ScanTree$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$ScanNode extends java.lang.Object implements scala.collection.parallel.ParIterableLike$ScanTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.parallel.ParIterableLike$ScanNode extends java.lang.Object implements scala.collection.parallel.ParIterableLike$ScanTree,scala.Product,scala.Serializable{
 private final scala.collection.parallel.ParIterableLike$ScanTree left;
   Signature: Lscala/collection/parallel/ParIterableLike$ScanTree;
 
diff --git c/scala/collection/parallel/ParIterableLike$SignalContextPassingIterator.class w/scala/collection/parallel/ParIterableLike$SignalContextPassingIterator.class
index 25a5863233..90ee67e05e 100644
--- c/scala/collection/parallel/ParIterableLike$SignalContextPassingIterator.class
+++ w/scala/collection/parallel/ParIterableLike$SignalContextPassingIterator.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //ParIterator=class scala/collection/parallel/ParIter
 public abstract #= # of #; //SignalContextPassingIterator=class scala/collection/parallel/ParIterableLike$SignalContextPassingIterator of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public interface scala.collection.parallel.ParIterableLike$SignalContextPassingIterator extends scala.collection.parallel.ParIterableLike$ParIterator,scala.ScalaObject{
+public interface scala.collection.parallel.ParIterableLike$SignalContextPassingIterator extends scala.collection.parallel.ParIterableLike$ParIterator{
 public abstract scala.collection.Seq scala$collection$parallel$ParIterableLike$SignalContextPassingIterator$$super$split();
   Signature: ()Lscala/collection/Seq;
 
diff --git c/scala/collection/parallel/ParIterableLike$Slice.class w/scala/collection/parallel/ParIterableLike$Slice.class
index fe6cebae9d..316ac00e27 100644
--- c/scala/collection/parallel/ParIterableLike$Slice.class
+++ w/scala/collection/parallel/ParIterableLike$Slice.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Slice extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Slice extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer{
 public final int scala$collection$parallel$ParIterableLike$Slice$$from;
   Signature: I
 
diff --git c/scala/collection/parallel/ParIterableLike$Span.class w/scala/collection/parallel/ParIterableLike$Span.class
index 2ebc258b50..da5b61388b 100644
--- c/scala/collection/parallel/ParIterableLike$Span.class
+++ w/scala/collection/parallel/ParIterableLike$Span.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Span extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Span extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer{
 public final int scala$collection$parallel$ParIterableLike$Span$$pos;
   Signature: I
 
diff --git c/scala/collection/parallel/ParIterableLike$SplitAt.class w/scala/collection/parallel/ParIterableLike$SplitAt.class
index db39726014..be414f843b 100644
--- c/scala/collection/parallel/ParIterableLike$SplitAt.class
+++ w/scala/collection/parallel/ParIterableLike$SplitAt.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$SplitAt extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$SplitAt extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer{
 public final int scala$collection$parallel$ParIterableLike$SplitAt$$at;
   Signature: I
 
diff --git c/scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask.class w/scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask.class
index 530369f204..a41daa1408 100644
--- c/scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask.class
+++ w/scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Task=class scala/collection/parallel/Tasks$Task of
 public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public interface scala.collection.parallel.ParIterableLike$StrictSplitterCheckTask extends scala.collection.parallel.Tasks$Task,scala.ScalaObject{
+public interface scala.collection.parallel.ParIterableLike$StrictSplitterCheckTask extends scala.collection.parallel.Tasks$Task{
 public abstract boolean requiresStrictSplitters();
   Signature: ()Z
 
diff --git c/scala/collection/parallel/ParIterableLike$Sum.class w/scala/collection/parallel/ParIterableLike$Sum.class
index cd61dcae8f..6c2f7fa0a0 100644
--- c/scala/collection/parallel/ParIterableLike$Sum.class
+++ w/scala/collection/parallel/ParIterableLike$Sum.class
@@ -8,7 +8,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Sum extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Sum extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Accessor{
 private final scala.math.Numeric num;
   Signature: Lscala/math/Numeric;
 
diff --git c/scala/collection/parallel/ParIterableLike$Take.class w/scala/collection/parallel/ParIterableLike$Take.class
index 3df507e435..f952e0d462 100644
--- c/scala/collection/parallel/ParIterableLike$Take.class
+++ w/scala/collection/parallel/ParIterableLike$Take.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Take extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Take extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer{
 public final int scala$collection$parallel$ParIterableLike$Take$$n;
   Signature: I
 
diff --git c/scala/collection/parallel/ParIterableLike$TakeWhile.class w/scala/collection/parallel/ParIterableLike$TakeWhile.class
index 30d0bd06f7..ac3d03f9ea 100644
--- c/scala/collection/parallel/ParIterableLike$TakeWhile.class
+++ w/scala/collection/parallel/ParIterableLike$TakeWhile.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$TakeWhile extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$TakeWhile extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer{
 public final int scala$collection$parallel$ParIterableLike$TakeWhile$$pos;
   Signature: I
 
diff --git c/scala/collection/parallel/ParIterableLike$ToParCollection.class w/scala/collection/parallel/ParIterableLike$ToParCollection.class
index f2b32c50e7..42511375c9 100644
--- c/scala/collection/parallel/ParIterableLike$ToParCollection.class
+++ w/scala/collection/parallel/ParIterableLike$ToParCollection.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$ToParCollection extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$ToParCollection extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer{
 
 private final scala.collection.parallel.IterableSplitter pit;
   Signature: Lscala/collection/parallel/IterableSplitter;
diff --git c/scala/collection/parallel/ParIterableLike$ToParMap.class w/scala/collection/parallel/ParIterableLike$ToParMap.class
index 6394badb5a..0f7aea8928 100644
--- c/scala/collection/parallel/ParIterableLike$ToParMap.class
+++ w/scala/collection/parallel/ParIterableLike$ToParMap.class
@@ -10,7 +10,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$ToParMap extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$ToParMap extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer{
 
 private final scala.collection.parallel.IterableSplitter pit;
   Signature: Lscala/collection/parallel/IterableSplitter;
diff --git c/scala/collection/parallel/ParIterableLike$Zip.class w/scala/collection/parallel/ParIterableLike$Zip.class
index 0d133f4c5a..ef4669530a 100644
--- c/scala/collection/parallel/ParIterableLike$Zip.class
+++ w/scala/collection/parallel/ParIterableLike$Zip.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$Zip extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$Zip extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer{
 public final scala.collection.generic.CanCombineFrom scala$collection$parallel$ParIterableLike$Zip$$pbf;
   Signature: Lscala/collection/generic/CanCombineFrom;
 
diff --git c/scala/collection/parallel/ParIterableLike$ZipAll.class w/scala/collection/parallel/ParIterableLike$ZipAll.class
index b602937a85..a9d62266ae 100644
--- c/scala/collection/parallel/ParIterableLike$ZipAll.class
+++ w/scala/collection/parallel/ParIterableLike$ZipAll.class
@@ -10,7 +10,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public class scala.collection.parallel.ParIterableLike$ZipAll extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableLike$ZipAll extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer{
 private final int len;
   Signature: I
 
diff --git c/scala/collection/parallel/ParIterableLike.class w/scala/collection/parallel/ParIterableLike.class
index da37fa3f85..e7909fa09f 100644
--- c/scala/collection/parallel/ParIterableLike.class
+++ w/scala/collection/parallel/ParIterableLike.class
@@ -61,7 +61,7 @@ public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collectio
 public abstract #= # of #; //SignalContextPassingIterator$class=class scala/collection/parallel/ParIterableLike$SignalContextPassingIterator$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableLike.scala"
-public interface scala.collection.parallel.ParIterableLike extends scala.collection.GenIterableLike,scala.collection.CustomParallelizable,scala.collection.Parallel,scala.collection.generic.HasNewCombiner,scala.ScalaObject{
+public interface scala.collection.parallel.ParIterableLike extends scala.collection.GenIterableLike,scala.collection.CustomParallelizable,scala.collection.Parallel,scala.collection.generic.HasNewCombiner{
 public abstract scala.collection.Iterable seq();
   Signature: ()Lscala/collection/Iterable;
 
diff --git c/scala/collection/parallel/ParIterableView$NoCombiner.class w/scala/collection/parallel/ParIterableView$NoCombiner.class
index 4b151872ad..92460c1ce2 100644
--- c/scala/collection/parallel/ParIterableView$NoCombiner.class
+++ w/scala/collection/parallel/ParIterableView$NoCombiner.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //NoCombiner=class scala/collection/parallel/ParIterableView$NoCombiner of class scala/collection/parallel/ParIterableView
 
 Compiled from "ParIterableView.scala"
-public abstract class scala.collection.parallel.ParIterableView$NoCombiner extends java.lang.Object implements scala.collection.parallel.Combiner,scala.ScalaObject{
+public abstract class scala.collection.parallel.ParIterableView$NoCombiner extends java.lang.Object implements scala.collection.parallel.Combiner{
 private final scala.collection.parallel.TaskSupport tasksupport;
   Signature: Lscala/collection/parallel/TaskSupport;
 
diff --git c/scala/collection/parallel/ParIterableView.class w/scala/collection/parallel/ParIterableView.class
index ade09e279d..3d123f5512 100644
--- c/scala/collection/parallel/ParIterableView.class
+++ w/scala/collection/parallel/ParIterableView.class
@@ -2,6 +2,6 @@ InnerClasses:
 public abstract #= # of #; //NoCombiner=class scala/collection/parallel/ParIterableView$NoCombiner of class scala/collection/parallel/ParIterableView
 
 Compiled from "ParIterableView.scala"
-public interface scala.collection.parallel.ParIterableView extends scala.collection.parallel.ParIterableViewLike,scala.collection.GenIterableView{
+public interface scala.collection.parallel.ParIterableView extends scala.collection.parallel.ParIterableViewLike{
 }
 
diff --git c/scala/collection/parallel/ParIterableViewLike$Appended.class w/scala/collection/parallel/ParIterableViewLike$Appended.class
index 0446dd7385..960ca5b8b9 100644
--- c/scala/collection/parallel/ParIterableViewLike$Appended.class
+++ w/scala/collection/parallel/ParIterableViewLike$Appended.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Appended=class scala/collection/GenIterableViewLike
 public abstract #= # of #; //Transformed=class scala/collection/parallel/ParIterableViewLike$Transformed of class scala/collection/parallel/ParIterableViewLike
 
 Compiled from "ParIterableViewLike.scala"
-public interface scala.collection.parallel.ParIterableViewLike$Appended extends scala.collection.GenIterableViewLike$Appended,scala.collection.parallel.ParIterableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.parallel.ParIterableViewLike$Appended extends scala.collection.GenIterableViewLike$Appended,scala.collection.parallel.ParIterableViewLike$Transformed{
 public abstract scala.collection.parallel.ParIterable restPar();
   Signature: ()Lscala/collection/parallel/ParIterable;
 
diff --git c/scala/collection/parallel/ParIterableViewLike$Force.class w/scala/collection/parallel/ParIterableViewLike$Force.class
index f0a28b2caa..1aa1af6b6f 100644
--- c/scala/collection/parallel/ParIterableViewLike$Force.class
+++ w/scala/collection/parallel/ParIterableViewLike$Force.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParIterableViewLike.scala"
-public class scala.collection.parallel.ParIterableViewLike$Force extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParIterableViewLike$Force extends java.lang.Object implements scala.collection.parallel.ParIterableLike$Transformer{
 private final scala.collection.generic.CanCombineFrom cbf;
   Signature: Lscala/collection/generic/CanCombineFrom;
 
diff --git c/scala/collection/parallel/ParIterableViewLike$Forced.class w/scala/collection/parallel/ParIterableViewLike$Forced.class
index 0373d880f0..a10c6a4661 100644
--- c/scala/collection/parallel/ParIterableViewLike$Forced.class
+++ w/scala/collection/parallel/ParIterableViewLike$Forced.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Forced=class scala/collection/GenIterableViewLike$F
 public abstract #= # of #; //Transformed=class scala/collection/parallel/ParIterableViewLike$Transformed of class scala/collection/parallel/ParIterableViewLike
 
 Compiled from "ParIterableViewLike.scala"
-public interface scala.collection.parallel.ParIterableViewLike$Forced extends scala.collection.GenIterableViewLike$Forced,scala.collection.parallel.ParIterableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.parallel.ParIterableViewLike$Forced extends scala.collection.GenIterableViewLike$Forced,scala.collection.parallel.ParIterableViewLike$Transformed{
 public abstract scala.collection.parallel.ParIterable forcedPar();
   Signature: ()Lscala/collection/parallel/ParIterable;
 
diff --git c/scala/collection/parallel/ParIterableViewLike$Mapped.class w/scala/collection/parallel/ParIterableViewLike$Mapped.class
index 5afe229a1b..4bd1ebcdf5 100644
--- c/scala/collection/parallel/ParIterableViewLike$Mapped.class
+++ w/scala/collection/parallel/ParIterableViewLike$Mapped.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Mapped=class scala/collection/GenIterableViewLike$M
 public abstract #= # of #; //Transformed=class scala/collection/parallel/ParIterableViewLike$Transformed of class scala/collection/parallel/ParIterableViewLike
 
 Compiled from "ParIterableViewLike.scala"
-public interface scala.collection.parallel.ParIterableViewLike$Mapped extends scala.collection.GenIterableViewLike$Mapped,scala.collection.parallel.ParIterableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.parallel.ParIterableViewLike$Mapped extends scala.collection.GenIterableViewLike$Mapped,scala.collection.parallel.ParIterableViewLike$Transformed{
 public abstract scala.collection.parallel.IterableSplitter splitter();
   Signature: ()Lscala/collection/parallel/IterableSplitter;
 
diff --git c/scala/collection/parallel/ParIterableViewLike$Sliced.class w/scala/collection/parallel/ParIterableViewLike$Sliced.class
index a92e5a6f4d..3d4aa98e1d 100644
--- c/scala/collection/parallel/ParIterableViewLike$Sliced.class
+++ w/scala/collection/parallel/ParIterableViewLike$Sliced.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Sliced=class scala/collection/GenIterableViewLike$S
 public abstract #= # of #; //Transformed=class scala/collection/parallel/ParIterableViewLike$Transformed of class scala/collection/parallel/ParIterableViewLike
 
 Compiled from "ParIterableViewLike.scala"
-public interface scala.collection.parallel.ParIterableViewLike$Sliced extends scala.collection.GenIterableViewLike$Sliced,scala.collection.parallel.ParIterableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.parallel.ParIterableViewLike$Sliced extends scala.collection.GenIterableViewLike$Sliced,scala.collection.parallel.ParIterableViewLike$Transformed{
 public abstract scala.collection.parallel.IterableSplitter splitter();
   Signature: ()Lscala/collection/parallel/IterableSplitter;
 
diff --git c/scala/collection/parallel/ParIterableViewLike$Transformed.class w/scala/collection/parallel/ParIterableViewLike$Transformed.class
index e9ebb51221..ef7b9a218d 100644
--- c/scala/collection/parallel/ParIterableViewLike$Transformed.class
+++ w/scala/collection/parallel/ParIterableViewLike$Transformed.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Transformed=class scala/collection/parallel/ParIter
 public abstract #= # of #; //Transformed=class scala/collection/GenIterableViewLike$Transformed of class scala/collection/GenIterableViewLike
 
 Compiled from "ParIterableViewLike.scala"
-public interface scala.collection.parallel.ParIterableViewLike$Transformed extends scala.collection.parallel.ParIterableView,scala.collection.GenIterableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.parallel.ParIterableViewLike$Transformed extends scala.collection.parallel.ParIterableView,scala.collection.GenIterableViewLike$Transformed{
 public abstract scala.collection.parallel.IterableSplitter splitter();
   Signature: ()Lscala/collection/parallel/IterableSplitter;
 
diff --git c/scala/collection/parallel/ParIterableViewLike$Zipped.class w/scala/collection/parallel/ParIterableViewLike$Zipped.class
index 76b0d2dd4f..6609c7eeb3 100644
--- c/scala/collection/parallel/ParIterableViewLike$Zipped.class
+++ w/scala/collection/parallel/ParIterableViewLike$Zipped.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Zipped=class scala/collection/GenIterableViewLike$Z
 public abstract #= # of #; //Transformed=class scala/collection/parallel/ParIterableViewLike$Transformed of class scala/collection/parallel/ParIterableViewLike
 
 Compiled from "ParIterableViewLike.scala"
-public interface scala.collection.parallel.ParIterableViewLike$Zipped extends scala.collection.GenIterableViewLike$Zipped,scala.collection.parallel.ParIterableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.parallel.ParIterableViewLike$Zipped extends scala.collection.GenIterableViewLike$Zipped,scala.collection.parallel.ParIterableViewLike$Transformed{
 public abstract scala.collection.parallel.ParSeq otherPar();
   Signature: ()Lscala/collection/parallel/ParSeq;
 
diff --git c/scala/collection/parallel/ParIterableViewLike$ZippedAll.class w/scala/collection/parallel/ParIterableViewLike$ZippedAll.class
index 538cd0b5f3..d5b7038e9f 100644
--- c/scala/collection/parallel/ParIterableViewLike$ZippedAll.class
+++ w/scala/collection/parallel/ParIterableViewLike$ZippedAll.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //ZippedAll=class scala/collection/GenIterableViewLik
 public abstract #= # of #; //Transformed=class scala/collection/parallel/ParIterableViewLike$Transformed of class scala/collection/parallel/ParIterableViewLike
 
 Compiled from "ParIterableViewLike.scala"
-public interface scala.collection.parallel.ParIterableViewLike$ZippedAll extends scala.collection.GenIterableViewLike$ZippedAll,scala.collection.parallel.ParIterableViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.parallel.ParIterableViewLike$ZippedAll extends scala.collection.GenIterableViewLike$ZippedAll,scala.collection.parallel.ParIterableViewLike$Transformed{
 public abstract scala.collection.parallel.ParSeq otherPar();
   Signature: ()Lscala/collection/parallel/ParSeq;
 
diff --git c/scala/collection/parallel/ParIterableViewLike.class w/scala/collection/parallel/ParIterableViewLike.class
index ca49d3fb09..3b21ec446f 100644
--- c/scala/collection/parallel/ParIterableViewLike.class
+++ w/scala/collection/parallel/ParIterableViewLike.class
@@ -16,7 +16,7 @@ public abstract #= # of #; //ZippedAll$class=class scala/collection/parallel/Par
 public abstract #= # of #; //Transformed$class=class scala/collection/parallel/ParIterableViewLike$Transformed$class of class scala/collection/parallel/ParIterableViewLike
 
 Compiled from "ParIterableViewLike.scala"
-public interface scala.collection.parallel.ParIterableViewLike extends scala.collection.GenIterableView,scala.collection.GenIterableViewLike,scala.collection.parallel.ParIterable,scala.collection.parallel.ParIterableLike,scala.ScalaObject{
+public interface scala.collection.parallel.ParIterableViewLike extends scala.collection.GenIterableView,scala.collection.parallel.ParIterable{
 public abstract void foreach(scala.Function1);
   Signature: (Lscala/Function1;)V
 
diff --git c/scala/collection/parallel/ParMap$WithDefault.class w/scala/collection/parallel/ParMap$WithDefault.class
index a3b786143f..0a67634945 100644
--- c/scala/collection/parallel/ParMap$WithDefault.class
+++ w/scala/collection/parallel/ParMap$WithDefault.class
@@ -10,7 +10,7 @@ public abstract #= # of #; //SignallingOps=class scala/collection/parallel/ParIt
 public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParMap.scala"
-public abstract class scala.collection.parallel.ParMap$WithDefault extends java.lang.Object implements scala.collection.parallel.ParMap,scala.ScalaObject{
+public abstract class scala.collection.parallel.ParMap$WithDefault extends java.lang.Object implements scala.collection.parallel.ParMap{
 private final scala.collection.parallel.ParMap underlying;
   Signature: Lscala/collection/parallel/ParMap;
 
diff --git c/scala/collection/parallel/ParMap.class w/scala/collection/parallel/ParMap.class
index 25fb98f530..30ee712c4c 100644
--- c/scala/collection/parallel/ParMap.class
+++ w/scala/collection/parallel/ParMap.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //WithDefault=class scala/collection/parallel/ParMap$WithDefault of class scala/collection/parallel/ParMap
 
 Compiled from "ParMap.scala"
-public interface scala.collection.parallel.ParMap extends scala.collection.GenMap,scala.collection.generic.GenericParMapTemplate,scala.collection.parallel.ParIterable,scala.collection.parallel.ParMapLike,scala.ScalaObject{
+public interface scala.collection.parallel.ParMap extends scala.collection.GenMap,scala.collection.generic.GenericParMapTemplate,scala.collection.parallel.ParIterable,scala.collection.parallel.ParMapLike{
 public abstract scala.collection.generic.GenericParMapCompanion mapCompanion();
   Signature: ()Lscala/collection/generic/GenericParMapCompanion;
 
diff --git c/scala/collection/parallel/ParMapLike$DefaultKeySet.class w/scala/collection/parallel/ParMapLike$DefaultKeySet.class
index 59aea36613..4e26e1f1df 100644
--- c/scala/collection/parallel/ParMapLike$DefaultKeySet.class
+++ w/scala/collection/parallel/ParMapLike$DefaultKeySet.class
@@ -10,7 +10,7 @@ public abstract #= # of #; //SignallingOps=class scala/collection/parallel/ParIt
 public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParMapLike.scala"
-public class scala.collection.parallel.ParMapLike$DefaultKeySet extends java.lang.Object implements scala.collection.parallel.ParSet,scala.ScalaObject{
+public class scala.collection.parallel.ParMapLike$DefaultKeySet extends java.lang.Object implements scala.collection.parallel.ParSet{
 public final scala.collection.parallel.ParMapLike $outer;
   Signature: Lscala/collection/parallel/ParMapLike;
 
diff --git c/scala/collection/parallel/ParMapLike$DefaultValuesIterable.class w/scala/collection/parallel/ParMapLike$DefaultValuesIterable.class
index 7417497f75..7bf5e805f9 100644
--- c/scala/collection/parallel/ParMapLike$DefaultValuesIterable.class
+++ w/scala/collection/parallel/ParMapLike$DefaultValuesIterable.class
@@ -10,7 +10,7 @@ public #= # of #; //DefaultValuesIterable=class scala/collection/parallel/ParMap
 public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParMapLike.scala"
-public class scala.collection.parallel.ParMapLike$DefaultValuesIterable extends java.lang.Object implements scala.collection.parallel.ParIterable,scala.ScalaObject{
+public class scala.collection.parallel.ParMapLike$DefaultValuesIterable extends java.lang.Object implements scala.collection.parallel.ParIterable{
 public final scala.collection.parallel.ParMapLike $outer;
   Signature: Lscala/collection/parallel/ParMapLike;
 
diff --git c/scala/collection/parallel/ParMapLike.class w/scala/collection/parallel/ParMapLike.class
index 58a0623934..01a8e08511 100644
--- c/scala/collection/parallel/ParMapLike.class
+++ w/scala/collection/parallel/ParMapLike.class
@@ -3,7 +3,7 @@ public #= # of #; //DefaultKeySet=class scala/collection/parallel/ParMapLike$Def
 public #= # of #; //DefaultValuesIterable=class scala/collection/parallel/ParMapLike$DefaultValuesIterable of class scala/collection/parallel/ParMapLike
 
 Compiled from "ParMapLike.scala"
-public interface scala.collection.parallel.ParMapLike extends scala.collection.GenMapLike,scala.collection.parallel.ParIterableLike,scala.ScalaObject{
+public interface scala.collection.parallel.ParMapLike extends scala.collection.GenMapLike,scala.collection.parallel.ParIterableLike{
 public abstract java.lang.Object default(java.lang.Object);
   Signature: (Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git c/scala/collection/parallel/ParSeq.class w/scala/collection/parallel/ParSeq.class
index 9c556a6b41..e6a875aa88 100644
--- c/scala/collection/parallel/ParSeq.class
+++ w/scala/collection/parallel/ParSeq.class
@@ -1,6 +1,6 @@
 
 Compiled from "ParSeq.scala"
-public interface scala.collection.parallel.ParSeq extends scala.collection.GenSeq,scala.collection.parallel.ParIterable,scala.collection.generic.GenericParTemplate,scala.collection.parallel.ParSeqLike,scala.ScalaObject{
+public interface scala.collection.parallel.ParSeq extends scala.collection.GenSeq,scala.collection.parallel.ParIterable,scala.collection.parallel.ParSeqLike{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/parallel/ParSeqLike$Corresponds.class w/scala/collection/parallel/ParSeqLike$Corresponds.class
index dd86de7e19..1c774d789f 100644
--- c/scala/collection/parallel/ParSeqLike$Corresponds.class
+++ w/scala/collection/parallel/ParSeqLike$Corresponds.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParSeqLike.scala"
-public class scala.collection.parallel.ParSeqLike$Corresponds extends java.lang.Object implements scala.collection.parallel.ParSeqLike$Accessor,scala.ScalaObject{
+public class scala.collection.parallel.ParSeqLike$Corresponds extends java.lang.Object implements scala.collection.parallel.ParSeqLike$Accessor{
 public final scala.Function2 scala$collection$parallel$ParSeqLike$Corresponds$$corr;
   Signature: Lscala/Function2;
 
diff --git c/scala/collection/parallel/ParSeqLike$Elements.class w/scala/collection/parallel/ParSeqLike$Elements.class
index f01dbb90b2..ddec4cefbd 100644
--- c/scala/collection/parallel/ParSeqLike$Elements.class
+++ w/scala/collection/parallel/ParSeqLike$Elements.class
@@ -19,7 +19,7 @@ public abstract #= # of #; //SignalContextPassingIterator=class scala/collection
 public abstract #= # of #; //SignalContextPassingIterator=class scala/collection/parallel/ParIterableLike$SignalContextPassingIterator of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParSeqLike.scala"
-public abstract class scala.collection.parallel.ParSeqLike$Elements extends java.lang.Object implements scala.collection.parallel.ParSeqLike$ParIterator,scala.collection.BufferedIterator,scala.ScalaObject{
+public abstract class scala.collection.parallel.ParSeqLike$Elements extends java.lang.Object implements scala.collection.parallel.ParSeqLike$ParIterator,scala.collection.BufferedIterator{
 public final int scala$collection$parallel$ParSeqLike$Elements$$start;
   Signature: I
 
diff --git c/scala/collection/parallel/ParSeqLike$IndexWhere.class w/scala/collection/parallel/ParSeqLike$IndexWhere.class
index 25c1fef53d..eeb680d0e8 100644
--- c/scala/collection/parallel/ParSeqLike$IndexWhere.class
+++ w/scala/collection/parallel/ParSeqLike$IndexWhere.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParSeqLike.scala"
-public class scala.collection.parallel.ParSeqLike$IndexWhere extends java.lang.Object implements scala.collection.parallel.ParSeqLike$Accessor,scala.ScalaObject{
+public class scala.collection.parallel.ParSeqLike$IndexWhere extends java.lang.Object implements scala.collection.parallel.ParSeqLike$Accessor{
 public final scala.Function1 scala$collection$parallel$ParSeqLike$IndexWhere$$pred;
   Signature: Lscala/Function1;
 
diff --git c/scala/collection/parallel/ParSeqLike$LastIndexWhere.class w/scala/collection/parallel/ParSeqLike$LastIndexWhere.class
index cddc16a8c5..0ac6056f24 100644
--- c/scala/collection/parallel/ParSeqLike$LastIndexWhere.class
+++ w/scala/collection/parallel/ParSeqLike$LastIndexWhere.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParSeqLike.scala"
-public class scala.collection.parallel.ParSeqLike$LastIndexWhere extends java.lang.Object implements scala.collection.parallel.ParSeqLike$Accessor,scala.ScalaObject{
+public class scala.collection.parallel.ParSeqLike$LastIndexWhere extends java.lang.Object implements scala.collection.parallel.ParSeqLike$Accessor{
 public final scala.Function1 scala$collection$parallel$ParSeqLike$LastIndexWhere$$pred;
   Signature: Lscala/Function1;
 
diff --git c/scala/collection/parallel/ParSeqLike$Reverse.class w/scala/collection/parallel/ParSeqLike$Reverse.class
index a582d23da6..9e9a47907c 100644
--- c/scala/collection/parallel/ParSeqLike$Reverse.class
+++ w/scala/collection/parallel/ParSeqLike$Reverse.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParSeqLike.scala"
-public class scala.collection.parallel.ParSeqLike$Reverse extends java.lang.Object implements scala.collection.parallel.ParSeqLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParSeqLike$Reverse extends java.lang.Object implements scala.collection.parallel.ParSeqLike$Transformer{
 
 private final scala.collection.parallel.SeqSplitter pit;
   Signature: Lscala/collection/parallel/SeqSplitter;
diff --git c/scala/collection/parallel/ParSeqLike$ReverseMap.class w/scala/collection/parallel/ParSeqLike$ReverseMap.class
index c1f11fd0a1..59db791982 100644
--- c/scala/collection/parallel/ParSeqLike$ReverseMap.class
+++ w/scala/collection/parallel/ParSeqLike$ReverseMap.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParSeqLike.scala"
-public class scala.collection.parallel.ParSeqLike$ReverseMap extends java.lang.Object implements scala.collection.parallel.ParSeqLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParSeqLike$ReverseMap extends java.lang.Object implements scala.collection.parallel.ParSeqLike$Transformer{
 private final scala.Function1 f;
   Signature: Lscala/Function1;
 
diff --git c/scala/collection/parallel/ParSeqLike$SameElements.class w/scala/collection/parallel/ParSeqLike$SameElements.class
index 6d7bedcec6..991c16f0db 100644
--- c/scala/collection/parallel/ParSeqLike$SameElements.class
+++ w/scala/collection/parallel/ParSeqLike$SameElements.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParSeqLike.scala"
-public class scala.collection.parallel.ParSeqLike$SameElements extends java.lang.Object implements scala.collection.parallel.ParSeqLike$Accessor,scala.ScalaObject{
+public class scala.collection.parallel.ParSeqLike$SameElements extends java.lang.Object implements scala.collection.parallel.ParSeqLike$Accessor{
 private final scala.collection.parallel.SeqSplitter pit;
   Signature: Lscala/collection/parallel/SeqSplitter;
 
diff --git c/scala/collection/parallel/ParSeqLike$SegmentLength.class w/scala/collection/parallel/ParSeqLike$SegmentLength.class
index bdce893c15..e58d22cfa9 100644
--- c/scala/collection/parallel/ParSeqLike$SegmentLength.class
+++ w/scala/collection/parallel/ParSeqLike$SegmentLength.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParSeqLike.scala"
-public class scala.collection.parallel.ParSeqLike$SegmentLength extends java.lang.Object implements scala.collection.parallel.ParSeqLike$Accessor,scala.ScalaObject{
+public class scala.collection.parallel.ParSeqLike$SegmentLength extends java.lang.Object implements scala.collection.parallel.ParSeqLike$Accessor{
 public final scala.Function1 scala$collection$parallel$ParSeqLike$SegmentLength$$pred;
   Signature: Lscala/Function1;
 
diff --git c/scala/collection/parallel/ParSeqLike$SignalContextPassingIterator.class w/scala/collection/parallel/ParSeqLike$SignalContextPassingIterator.class
index 08f764e265..ce1333546e 100644
--- c/scala/collection/parallel/ParSeqLike$SignalContextPassingIterator.class
+++ w/scala/collection/parallel/ParSeqLike$SignalContextPassingIterator.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //SignalContextPassingIterator=class scala/collection
 public abstract #= # of #; //SignalContextPassingIterator=class scala/collection/parallel/ParIterableLike$SignalContextPassingIterator of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParSeqLike.scala"
-public interface scala.collection.parallel.ParSeqLike$SignalContextPassingIterator extends scala.collection.parallel.ParSeqLike$ParIterator,scala.collection.parallel.ParIterableLike$SignalContextPassingIterator,scala.ScalaObject{
+public interface scala.collection.parallel.ParSeqLike$SignalContextPassingIterator extends scala.collection.parallel.ParSeqLike$ParIterator,scala.collection.parallel.ParIterableLike$SignalContextPassingIterator{
 public abstract scala.collection.Seq scala$collection$parallel$ParSeqLike$SignalContextPassingIterator$$super$psplit(scala.collection.Seq);
   Signature: (Lscala/collection/Seq;)Lscala/collection/Seq;
 
diff --git c/scala/collection/parallel/ParSeqLike$Updated.class w/scala/collection/parallel/ParSeqLike$Updated.class
index bcabb7081a..9f7bbb5c7b 100644
--- c/scala/collection/parallel/ParSeqLike$Updated.class
+++ w/scala/collection/parallel/ParSeqLike$Updated.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParSeqLike.scala"
-public class scala.collection.parallel.ParSeqLike$Updated extends java.lang.Object implements scala.collection.parallel.ParSeqLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParSeqLike$Updated extends java.lang.Object implements scala.collection.parallel.ParSeqLike$Transformer{
 public final int scala$collection$parallel$ParSeqLike$Updated$$pos;
   Signature: I
 
diff --git c/scala/collection/parallel/ParSeqLike$Zip.class w/scala/collection/parallel/ParSeqLike$Zip.class
index f87cfa786f..394653147c 100644
--- c/scala/collection/parallel/ParSeqLike$Zip.class
+++ w/scala/collection/parallel/ParSeqLike$Zip.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParSeqLike.scala"
-public class scala.collection.parallel.ParSeqLike$Zip extends java.lang.Object implements scala.collection.parallel.ParSeqLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParSeqLike$Zip extends java.lang.Object implements scala.collection.parallel.ParSeqLike$Transformer{
 private final int len;
   Signature: I
 
diff --git c/scala/collection/parallel/ParSeqLike.class w/scala/collection/parallel/ParSeqLike.class
index 6f7f370b2a..3d67019653 100644
--- c/scala/collection/parallel/ParSeqLike.class
+++ w/scala/collection/parallel/ParSeqLike.class
@@ -16,7 +16,7 @@ public abstract #= # of #; //SignalContextPassingIterator=class scala/collection
 public abstract #= # of #; //SignalContextPassingIterator$class=class scala/collection/parallel/ParSeqLike$SignalContextPassingIterator$class of class scala/collection/parallel/ParSeqLike
 
 Compiled from "ParSeqLike.scala"
-public interface scala.collection.parallel.ParSeqLike extends scala.collection.GenSeqLike,scala.collection.parallel.ParIterableLike,scala.ScalaObject{
+public interface scala.collection.parallel.ParSeqLike extends scala.collection.GenSeqLike,scala.collection.parallel.ParIterableLike{
 public abstract java.lang.Object scala$collection$parallel$ParSeqLike$$super$zip(scala.collection.GenIterable, scala.collection.generic.CanBuildFrom);
   Signature: (Lscala/collection/GenIterable;Lscala/collection/generic/CanBuildFrom;)Ljava/lang/Object;
 
diff --git c/scala/collection/parallel/ParSeqView$NoCombiner.class w/scala/collection/parallel/ParSeqView$NoCombiner.class
index b1c3e84b80..05e7842588 100644
--- c/scala/collection/parallel/ParSeqView$NoCombiner.class
+++ w/scala/collection/parallel/ParSeqView$NoCombiner.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //NoCombiner=class scala/collection/parallel/ParSeqView$NoCombiner of class scala/collection/parallel/ParSeqView
 
 Compiled from "ParSeqView.scala"
-public abstract class scala.collection.parallel.ParSeqView$NoCombiner extends java.lang.Object implements scala.collection.parallel.Combiner,scala.ScalaObject{
+public abstract class scala.collection.parallel.ParSeqView$NoCombiner extends java.lang.Object implements scala.collection.parallel.Combiner{
 private final scala.collection.parallel.TaskSupport tasksupport;
   Signature: Lscala/collection/parallel/TaskSupport;
 
diff --git c/scala/collection/parallel/ParSeqViewLike$Appended.class w/scala/collection/parallel/ParSeqViewLike$Appended.class
index da9b5b8a4c..350de89f9a 100644
--- c/scala/collection/parallel/ParSeqViewLike$Appended.class
+++ w/scala/collection/parallel/ParSeqViewLike$Appended.class
@@ -6,7 +6,7 @@ public abstract #= # of #; //Transformed=class scala/collection/parallel/ParSeqV
 public abstract #= # of #; //Appended=class scala/collection/parallel/ParIterableViewLike$Appended of class scala/collection/parallel/ParIterableViewLike
 
 Compiled from "ParSeqViewLike.scala"
-public interface scala.collection.parallel.ParSeqViewLike$Appended extends scala.collection.GenSeqViewLike$Appended,scala.collection.parallel.ParIterableViewLike$Appended,scala.collection.parallel.ParSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.parallel.ParSeqViewLike$Appended extends scala.collection.GenSeqViewLike$Appended,scala.collection.parallel.ParIterableViewLike$Appended,scala.collection.parallel.ParSeqViewLike$Transformed{
 public abstract scala.collection.parallel.ParSeq restPar();
   Signature: ()Lscala/collection/parallel/ParSeq;
 
diff --git c/scala/collection/parallel/ParSeqViewLike$Force.class w/scala/collection/parallel/ParSeqViewLike$Force.class
index 45d59bfc2d..d3031a8570 100644
--- c/scala/collection/parallel/ParSeqViewLike$Force.class
+++ w/scala/collection/parallel/ParSeqViewLike$Force.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public abstract #= # of #; //StrictSplitterCheckTask$class=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask$class of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParSeqViewLike.scala"
-public class scala.collection.parallel.ParSeqViewLike$Force extends java.lang.Object implements scala.collection.parallel.ParSeqLike$Transformer,scala.ScalaObject{
+public class scala.collection.parallel.ParSeqViewLike$Force extends java.lang.Object implements scala.collection.parallel.ParSeqLike$Transformer{
 private final scala.collection.generic.CanCombineFrom cbf;
   Signature: Lscala/collection/generic/CanCombineFrom;
 
diff --git c/scala/collection/parallel/ParSeqViewLike$Forced.class w/scala/collection/parallel/ParSeqViewLike$Forced.class
index e3e44ef135..5d8e9c2389 100644
--- c/scala/collection/parallel/ParSeqViewLike$Forced.class
+++ w/scala/collection/parallel/ParSeqViewLike$Forced.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //Forced=class scala/collection/parallel/ParIterableV
 public abstract #= # of #; //Transformed=class scala/collection/parallel/ParSeqViewLike$Transformed of class scala/collection/parallel/ParSeqViewLike
 
 Compiled from "ParSeqViewLike.scala"
-public interface scala.collection.parallel.ParSeqViewLike$Forced extends scala.collection.GenSeqViewLike$Forced,scala.collection.parallel.ParIterableViewLike$Forced,scala.collection.parallel.ParSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.parallel.ParSeqViewLike$Forced extends scala.collection.GenSeqViewLike$Forced,scala.collection.parallel.ParIterableViewLike$Forced,scala.collection.parallel.ParSeqViewLike$Transformed{
 public abstract scala.collection.parallel.ParSeq forcedPar();
   Signature: ()Lscala/collection/parallel/ParSeq;
 
diff --git c/scala/collection/parallel/ParSeqViewLike$Mapped.class w/scala/collection/parallel/ParSeqViewLike$Mapped.class
index fde69c100c..7dfc11d219 100644
--- c/scala/collection/parallel/ParSeqViewLike$Mapped.class
+++ w/scala/collection/parallel/ParSeqViewLike$Mapped.class
@@ -6,7 +6,7 @@ public abstract #= # of #; //Mapped=class scala/collection/parallel/ParIterableV
 public abstract #= # of #; //Transformed=class scala/collection/parallel/ParSeqViewLike$Transformed of class scala/collection/parallel/ParSeqViewLike
 
 Compiled from "ParSeqViewLike.scala"
-public interface scala.collection.parallel.ParSeqViewLike$Mapped extends scala.collection.GenSeqViewLike$Mapped,scala.collection.parallel.ParIterableViewLike$Mapped,scala.collection.parallel.ParSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.parallel.ParSeqViewLike$Mapped extends scala.collection.GenSeqViewLike$Mapped,scala.collection.parallel.ParIterableViewLike$Mapped,scala.collection.parallel.ParSeqViewLike$Transformed{
 public abstract scala.collection.parallel.SeqSplitter$Mapped splitter();
   Signature: ()Lscala/collection/parallel/SeqSplitter$Mapped;
 
diff --git c/scala/collection/parallel/ParSeqViewLike$Patched.class w/scala/collection/parallel/ParSeqViewLike$Patched.class
index 11c9b829fd..7cd83d4f63 100644
--- c/scala/collection/parallel/ParSeqViewLike$Patched.class
+++ w/scala/collection/parallel/ParSeqViewLike$Patched.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Patched=class scala/collection/GenSeqViewLike$Patch
 public abstract #= # of #; //Transformed=class scala/collection/parallel/ParSeqViewLike$Transformed of class scala/collection/parallel/ParSeqViewLike
 
 Compiled from "ParSeqViewLike.scala"
-public interface scala.collection.parallel.ParSeqViewLike$Patched extends scala.collection.GenSeqViewLike$Patched,scala.collection.parallel.ParSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.parallel.ParSeqViewLike$Patched extends scala.collection.GenSeqViewLike$Patched,scala.collection.parallel.ParSeqViewLike$Transformed{
 public abstract scala.collection.parallel.ParSeq patchPar();
   Signature: ()Lscala/collection/parallel/ParSeq;
 
diff --git c/scala/collection/parallel/ParSeqViewLike$Prepended.class w/scala/collection/parallel/ParSeqViewLike$Prepended.class
index 5ee2878596..7c7f19fe1c 100644
--- c/scala/collection/parallel/ParSeqViewLike$Prepended.class
+++ w/scala/collection/parallel/ParSeqViewLike$Prepended.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Prepended=class scala/collection/GenSeqViewLike$Pre
 public abstract #= # of #; //Transformed=class scala/collection/parallel/ParSeqViewLike$Transformed of class scala/collection/parallel/ParSeqViewLike
 
 Compiled from "ParSeqViewLike.scala"
-public interface scala.collection.parallel.ParSeqViewLike$Prepended extends scala.collection.GenSeqViewLike$Prepended,scala.collection.parallel.ParSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.parallel.ParSeqViewLike$Prepended extends scala.collection.GenSeqViewLike$Prepended,scala.collection.parallel.ParSeqViewLike$Transformed{
 public abstract scala.collection.parallel.ParSeqViewLike scala$collection$parallel$ParSeqViewLike$Prepended$$$outer();
   Signature: ()Lscala/collection/parallel/ParSeqViewLike;
 
diff --git c/scala/collection/parallel/ParSeqViewLike$Reversed.class w/scala/collection/parallel/ParSeqViewLike$Reversed.class
index 61b90a14ac..7f8a5f4677 100644
--- c/scala/collection/parallel/ParSeqViewLike$Reversed.class
+++ w/scala/collection/parallel/ParSeqViewLike$Reversed.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Reversed=class scala/collection/GenSeqViewLike$Reve
 public abstract #= # of #; //Transformed=class scala/collection/parallel/ParSeqViewLike$Transformed of class scala/collection/parallel/ParSeqViewLike
 
 Compiled from "ParSeqViewLike.scala"
-public interface scala.collection.parallel.ParSeqViewLike$Reversed extends scala.collection.GenSeqViewLike$Reversed,scala.collection.parallel.ParSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.parallel.ParSeqViewLike$Reversed extends scala.collection.GenSeqViewLike$Reversed,scala.collection.parallel.ParSeqViewLike$Transformed{
 public abstract scala.collection.parallel.SeqSplitter splitter();
   Signature: ()Lscala/collection/parallel/SeqSplitter;
 
diff --git c/scala/collection/parallel/ParSeqViewLike$Sliced.class w/scala/collection/parallel/ParSeqViewLike$Sliced.class
index ab8a0a8efb..9dd9bee4f8 100644
--- c/scala/collection/parallel/ParSeqViewLike$Sliced.class
+++ w/scala/collection/parallel/ParSeqViewLike$Sliced.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //Sliced=class scala/collection/parallel/ParIterableV
 public abstract #= # of #; //Transformed=class scala/collection/parallel/ParSeqViewLike$Transformed of class scala/collection/parallel/ParSeqViewLike
 
 Compiled from "ParSeqViewLike.scala"
-public interface scala.collection.parallel.ParSeqViewLike$Sliced extends scala.collection.GenSeqViewLike$Sliced,scala.collection.parallel.ParIterableViewLike$Sliced,scala.collection.parallel.ParSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.parallel.ParSeqViewLike$Sliced extends scala.collection.GenSeqViewLike$Sliced,scala.collection.parallel.ParIterableViewLike$Sliced,scala.collection.parallel.ParSeqViewLike$Transformed{
 public abstract scala.collection.parallel.SeqSplitter splitter();
   Signature: ()Lscala/collection/parallel/SeqSplitter;
 
diff --git c/scala/collection/parallel/ParSeqViewLike$Transformed.class w/scala/collection/parallel/ParSeqViewLike$Transformed.class
index 0a6e0caf67..679bfd8326 100644
--- c/scala/collection/parallel/ParSeqViewLike$Transformed.class
+++ w/scala/collection/parallel/ParSeqViewLike$Transformed.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Transformed=class scala/collection/GenSeqViewLike$T
 public abstract #= # of #; //Transformed=class scala/collection/parallel/ParIterableViewLike$Transformed of class scala/collection/parallel/ParIterableViewLike
 
 Compiled from "ParSeqViewLike.scala"
-public interface scala.collection.parallel.ParSeqViewLike$Transformed extends scala.collection.parallel.ParSeqView,scala.collection.parallel.ParIterableViewLike$Transformed,scala.collection.GenSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.parallel.ParSeqViewLike$Transformed extends scala.collection.parallel.ParSeqView,scala.collection.parallel.ParIterableViewLike$Transformed,scala.collection.GenSeqViewLike$Transformed{
 public abstract scala.collection.parallel.SeqSplitter splitter();
   Signature: ()Lscala/collection/parallel/SeqSplitter;
 
diff --git c/scala/collection/parallel/ParSeqViewLike$Zipped.class w/scala/collection/parallel/ParSeqViewLike$Zipped.class
index 588cfb979b..7b1405fe02 100644
--- c/scala/collection/parallel/ParSeqViewLike$Zipped.class
+++ w/scala/collection/parallel/ParSeqViewLike$Zipped.class
@@ -6,7 +6,7 @@ public abstract #= # of #; //Zipped=class scala/collection/parallel/ParIterableV
 public abstract #= # of #; //Transformed=class scala/collection/parallel/ParSeqViewLike$Transformed of class scala/collection/parallel/ParSeqViewLike
 
 Compiled from "ParSeqViewLike.scala"
-public interface scala.collection.parallel.ParSeqViewLike$Zipped extends scala.collection.GenSeqViewLike$Zipped,scala.collection.parallel.ParIterableViewLike$Zipped,scala.collection.parallel.ParSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.parallel.ParSeqViewLike$Zipped extends scala.collection.GenSeqViewLike$Zipped,scala.collection.parallel.ParIterableViewLike$Zipped,scala.collection.parallel.ParSeqViewLike$Transformed{
 public abstract scala.collection.parallel.SeqSplitter$Zipped splitter();
   Signature: ()Lscala/collection/parallel/SeqSplitter$Zipped;
 
diff --git c/scala/collection/parallel/ParSeqViewLike$ZippedAll.class w/scala/collection/parallel/ParSeqViewLike$ZippedAll.class
index e3388ffa8c..b213e97bb0 100644
--- c/scala/collection/parallel/ParSeqViewLike$ZippedAll.class
+++ w/scala/collection/parallel/ParSeqViewLike$ZippedAll.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //Transformed=class scala/collection/parallel/ParSeqV
 public abstract #= # of #; //ZippedAll=class scala/collection/parallel/ParIterableViewLike$ZippedAll of class scala/collection/parallel/ParIterableViewLike
 
 Compiled from "ParSeqViewLike.scala"
-public interface scala.collection.parallel.ParSeqViewLike$ZippedAll extends scala.collection.GenSeqViewLike$ZippedAll,scala.collection.parallel.ParIterableViewLike$ZippedAll,scala.collection.parallel.ParSeqViewLike$Transformed,scala.ScalaObject{
+public interface scala.collection.parallel.ParSeqViewLike$ZippedAll extends scala.collection.GenSeqViewLike$ZippedAll,scala.collection.parallel.ParIterableViewLike$ZippedAll,scala.collection.parallel.ParSeqViewLike$Transformed{
 public abstract scala.collection.parallel.SeqSplitter splitter();
   Signature: ()Lscala/collection/parallel/SeqSplitter;
 
diff --git c/scala/collection/parallel/ParSeqViewLike.class w/scala/collection/parallel/ParSeqViewLike.class
index a0e39400c9..3e2cb65184 100644
--- c/scala/collection/parallel/ParSeqViewLike.class
+++ w/scala/collection/parallel/ParSeqViewLike.class
@@ -22,7 +22,7 @@ public abstract #= # of #; //Prepended$class=class scala/collection/parallel/Par
 public abstract #= # of #; //Transformed$class=class scala/collection/parallel/ParSeqViewLike$Transformed$class of class scala/collection/parallel/ParSeqViewLike
 
 Compiled from "ParSeqViewLike.scala"
-public interface scala.collection.parallel.ParSeqViewLike extends scala.collection.GenSeqView,scala.collection.GenSeqViewLike,scala.collection.parallel.ParIterableView,scala.collection.parallel.ParIterableViewLike,scala.collection.parallel.ParSeq,scala.collection.parallel.ParSeqLike,scala.ScalaObject{
+public interface scala.collection.parallel.ParSeqViewLike extends scala.collection.GenSeqView,scala.collection.parallel.ParIterableView,scala.collection.parallel.ParSeq{
 public abstract scala.collection.parallel.ParSeqViewLike$Transformed newPrepended(java.lang.Object);
   Signature: (Ljava/lang/Object;)Lscala/collection/parallel/ParSeqViewLike$Transformed;
 
diff --git c/scala/collection/parallel/ParSet.class w/scala/collection/parallel/ParSet.class
index 7d39133856..768265ef1a 100644
--- c/scala/collection/parallel/ParSet.class
+++ w/scala/collection/parallel/ParSet.class
@@ -1,6 +1,6 @@
 
 Compiled from "ParSet.scala"
-public interface scala.collection.parallel.ParSet extends scala.collection.GenSet,scala.collection.generic.GenericParTemplate,scala.collection.parallel.ParIterable,scala.collection.parallel.ParSetLike,scala.ScalaObject{
+public interface scala.collection.parallel.ParSet extends scala.collection.GenSet,scala.collection.parallel.ParIterable,scala.collection.parallel.ParSetLike{
 public abstract scala.collection.parallel.ParSet empty();
   Signature: ()Lscala/collection/parallel/ParSet;
 
diff --git c/scala/collection/parallel/ParSetLike.class w/scala/collection/parallel/ParSetLike.class
index d3b6d81ecd..76d426dfe0 100644
--- c/scala/collection/parallel/ParSetLike.class
+++ w/scala/collection/parallel/ParSetLike.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "ParSetLike.scala"
-public interface scala.collection.parallel.ParSetLike extends scala.collection.GenSetLike,scala.collection.parallel.ParIterableLike,scala.ScalaObject{
+public interface scala.collection.parallel.ParSetLike extends scala.collection.GenSetLike,scala.collection.parallel.ParIterableLike{
 public abstract scala.collection.parallel.ParSet empty();
   Signature: ()Lscala/collection/parallel/ParSet;
 
diff --git c/scala/collection/parallel/SeqSplitter$Appended.class w/scala/collection/parallel/SeqSplitter$Appended.class
index 653ed7d61f..a63a486dea 100644
--- c/scala/collection/parallel/SeqSplitter$Appended.class
+++ w/scala/collection/parallel/SeqSplitter$Appended.class
@@ -12,7 +12,7 @@ public #= # of #; //Appended=class scala/collection/parallel/IterableSplitter$Ap
 public #= # of #; //ZippedAll=class scala/collection/parallel/IterableSplitter$ZippedAll of class scala/collection/parallel/IterableSplitter
 
 Compiled from "RemainsIterator.scala"
-public class scala.collection.parallel.SeqSplitter$Appended extends scala.collection.parallel.IterableSplitter$Appended implements scala.collection.parallel.SeqSplitter,scala.ScalaObject{
+public class scala.collection.parallel.SeqSplitter$Appended extends scala.collection.parallel.IterableSplitter$Appended implements scala.collection.parallel.SeqSplitter{
 public final scala.collection.parallel.SeqSplitter $outer;
   Signature: Lscala/collection/parallel/SeqSplitter;
 
diff --git c/scala/collection/parallel/SeqSplitter$Mapped.class w/scala/collection/parallel/SeqSplitter$Mapped.class
index e72b837e35..7b239da772 100644
--- c/scala/collection/parallel/SeqSplitter$Mapped.class
+++ w/scala/collection/parallel/SeqSplitter$Mapped.class
@@ -11,7 +11,7 @@ public #= # of #; //Zipped=class scala/collection/parallel/IterableSplitter$Zipp
 public #= # of #; //ZippedAll=class scala/collection/parallel/IterableSplitter$ZippedAll of class scala/collection/parallel/IterableSplitter
 
 Compiled from "RemainsIterator.scala"
-public class scala.collection.parallel.SeqSplitter$Mapped extends scala.collection.parallel.IterableSplitter$Mapped implements scala.collection.parallel.SeqSplitter,scala.ScalaObject{
+public class scala.collection.parallel.SeqSplitter$Mapped extends scala.collection.parallel.IterableSplitter$Mapped implements scala.collection.parallel.SeqSplitter{
 public final scala.Function1 scala$collection$parallel$SeqSplitter$Mapped$$f;
   Signature: Lscala/Function1;
 
diff --git c/scala/collection/parallel/SeqSplitter$Patched.class w/scala/collection/parallel/SeqSplitter$Patched.class
index 707a4c8987..e86ff67ebe 100644
--- c/scala/collection/parallel/SeqSplitter$Patched.class
+++ w/scala/collection/parallel/SeqSplitter$Patched.class
@@ -14,7 +14,7 @@ public #= # of #; //Appended=class scala/collection/parallel/IterableSplitter$Ap
 public #= # of #; //ZippedAll=class scala/collection/parallel/IterableSplitter$ZippedAll of class scala/collection/parallel/IterableSplitter
 
 Compiled from "RemainsIterator.scala"
-public class scala.collection.parallel.SeqSplitter$Patched extends java.lang.Object implements scala.collection.parallel.SeqSplitter,scala.ScalaObject{
+public class scala.collection.parallel.SeqSplitter$Patched extends java.lang.Object implements scala.collection.parallel.SeqSplitter{
 private final int from;
   Signature: I
 
diff --git c/scala/collection/parallel/SeqSplitter$Taken.class w/scala/collection/parallel/SeqSplitter$Taken.class
index 2ad6030445..bd3ea9cf07 100644
--- c/scala/collection/parallel/SeqSplitter$Taken.class
+++ w/scala/collection/parallel/SeqSplitter$Taken.class
@@ -11,7 +11,7 @@ public #= # of #; //Mapped=class scala/collection/parallel/IterableSplitter$Mapp
 public #= # of #; //ZippedAll=class scala/collection/parallel/IterableSplitter$ZippedAll of class scala/collection/parallel/IterableSplitter
 
 Compiled from "RemainsIterator.scala"
-public class scala.collection.parallel.SeqSplitter$Taken extends scala.collection.parallel.IterableSplitter$Taken implements scala.collection.parallel.SeqSplitter,scala.ScalaObject{
+public class scala.collection.parallel.SeqSplitter$Taken extends scala.collection.parallel.IterableSplitter$Taken implements scala.collection.parallel.SeqSplitter{
 public final scala.collection.parallel.SeqSplitter $outer;
   Signature: Lscala/collection/parallel/SeqSplitter;
 
diff --git c/scala/collection/parallel/SeqSplitter$Zipped.class w/scala/collection/parallel/SeqSplitter$Zipped.class
index aaa25a9131..022655f08c 100644
--- c/scala/collection/parallel/SeqSplitter$Zipped.class
+++ w/scala/collection/parallel/SeqSplitter$Zipped.class
@@ -11,7 +11,7 @@ public #= # of #; //Mapped=class scala/collection/parallel/IterableSplitter$Mapp
 public #= # of #; //ZippedAll=class scala/collection/parallel/IterableSplitter$ZippedAll of class scala/collection/parallel/IterableSplitter
 
 Compiled from "RemainsIterator.scala"
-public class scala.collection.parallel.SeqSplitter$Zipped extends scala.collection.parallel.IterableSplitter$Zipped implements scala.collection.parallel.SeqSplitter,scala.ScalaObject{
+public class scala.collection.parallel.SeqSplitter$Zipped extends scala.collection.parallel.IterableSplitter$Zipped implements scala.collection.parallel.SeqSplitter{
 public final scala.collection.parallel.SeqSplitter $outer;
   Signature: Lscala/collection/parallel/SeqSplitter;
 
diff --git c/scala/collection/parallel/SeqSplitter$ZippedAll.class w/scala/collection/parallel/SeqSplitter$ZippedAll.class
index df2f3a300c..8dbd89c016 100644
--- c/scala/collection/parallel/SeqSplitter$ZippedAll.class
+++ w/scala/collection/parallel/SeqSplitter$ZippedAll.class
@@ -12,7 +12,7 @@ public #= # of #; //Mapped=class scala/collection/parallel/IterableSplitter$Mapp
 public #= # of #; //ZippedAll=class scala/collection/parallel/IterableSplitter$ZippedAll of class scala/collection/parallel/IterableSplitter
 
 Compiled from "RemainsIterator.scala"
-public class scala.collection.parallel.SeqSplitter$ZippedAll extends scala.collection.parallel.IterableSplitter$ZippedAll implements scala.collection.parallel.SeqSplitter,scala.ScalaObject{
+public class scala.collection.parallel.SeqSplitter$ZippedAll extends scala.collection.parallel.IterableSplitter$ZippedAll implements scala.collection.parallel.SeqSplitter{
 public final scala.collection.parallel.SeqSplitter $outer;
   Signature: Lscala/collection/parallel/SeqSplitter;
 
diff --git c/scala/collection/parallel/SeqSplitter.class w/scala/collection/parallel/SeqSplitter.class
index 3dd023e3e5..3a3f343f5e 100644
--- c/scala/collection/parallel/SeqSplitter.class
+++ w/scala/collection/parallel/SeqSplitter.class
@@ -7,7 +7,7 @@ public #= # of #; //Appended=class scala/collection/parallel/SeqSplitter$Appende
 public #= # of #; //ZippedAll=class scala/collection/parallel/SeqSplitter$ZippedAll of class scala/collection/parallel/SeqSplitter
 
 Compiled from "RemainsIterator.scala"
-public interface scala.collection.parallel.SeqSplitter extends scala.collection.parallel.IterableSplitter,scala.collection.parallel.AugmentedSeqIterator,scala.collection.parallel.PreciseSplitter,scala.ScalaObject{
+public interface scala.collection.parallel.SeqSplitter extends scala.collection.parallel.IterableSplitter,scala.collection.parallel.AugmentedSeqIterator,scala.collection.parallel.PreciseSplitter{
 public abstract scala.collection.parallel.SeqSplitter dup();
   Signature: ()Lscala/collection/parallel/SeqSplitter;
 
diff --git c/scala/collection/parallel/ThreadPoolTaskSupport.class w/scala/collection/parallel/ThreadPoolTaskSupport.class
index aa46347f10..e149aa932e 100644
--- c/scala/collection/parallel/ThreadPoolTaskSupport.class
+++ w/scala/collection/parallel/ThreadPoolTaskSupport.class
@@ -6,7 +6,7 @@ public abstract #= # of #; //TaskImpl=class scala/collection/parallel/AdaptiveWo
 public #= # of #; //TaskImpl=class scala/collection/parallel/AdaptiveWorkStealingThreadPoolTasks$TaskImpl of class scala/collection/parallel/AdaptiveWorkStealingThreadPoolTasks
 
 Compiled from "TaskSupport.scala"
-public class scala.collection.parallel.ThreadPoolTaskSupport extends java.lang.Object implements scala.collection.parallel.TaskSupport,scala.collection.parallel.AdaptiveWorkStealingThreadPoolTasks,scala.ScalaObject{
+public class scala.collection.parallel.ThreadPoolTaskSupport extends java.lang.Object implements scala.collection.parallel.TaskSupport,scala.collection.parallel.AdaptiveWorkStealingThreadPoolTasks{
 private java.lang.Object environment;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/collection/parallel/ThreadPoolTasks$TaskImpl.class w/scala/collection/parallel/ThreadPoolTasks$TaskImpl.class
index 9e24374520..6f28949a00 100644
--- c/scala/collection/parallel/ThreadPoolTasks$TaskImpl.class
+++ w/scala/collection/parallel/ThreadPoolTasks$TaskImpl.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //TaskImpl=class scala/collection/parallel/Tasks$Task
 public abstract #= # of #; //TaskImpl=class scala/collection/parallel/ThreadPoolTasks$TaskImpl of class scala/collection/parallel/ThreadPoolTasks
 
 Compiled from "Tasks.scala"
-public interface scala.collection.parallel.ThreadPoolTasks$TaskImpl extends java.lang.Runnable,scala.collection.parallel.Tasks$TaskImpl,scala.ScalaObject{
+public interface scala.collection.parallel.ThreadPoolTasks$TaskImpl extends java.lang.Runnable,scala.collection.parallel.Tasks$TaskImpl{
 public abstract boolean owned();
   Signature: ()Z
 
diff --git c/scala/collection/parallel/ThreadPoolTasks.class w/scala/collection/parallel/ThreadPoolTasks.class
index ba4a20924e..748c767bcf 100644
--- c/scala/collection/parallel/ThreadPoolTasks.class
+++ w/scala/collection/parallel/ThreadPoolTasks.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //TaskImpl=class scala/collection/parallel/ThreadPool
 public abstract #= # of #; //TaskImpl$class=class scala/collection/parallel/ThreadPoolTasks$TaskImpl$class of class scala/collection/parallel/ThreadPoolTasks
 
 Compiled from "Tasks.scala"
-public interface scala.collection.parallel.ThreadPoolTasks extends scala.collection.parallel.Tasks,scala.ScalaObject{
+public interface scala.collection.parallel.ThreadPoolTasks extends scala.collection.parallel.Tasks{
 public abstract scala.collection.parallel.ThreadPoolTasks$TaskImpl newTaskImpl(scala.collection.parallel.Tasks$Task);
   Signature: (Lscala/collection/parallel/Tasks$Task;)Lscala/collection/parallel/ThreadPoolTasks$TaskImpl;
 
diff --git c/scala/collection/parallel/immutable/HashMapCombiner$CreateGroupedTrie.class w/scala/collection/parallel/immutable/HashMapCombiner$CreateGroupedTrie.class
index 3ac51eb995..778f888054 100644
--- c/scala/collection/parallel/immutable/HashMapCombiner$CreateGroupedTrie.class
+++ w/scala/collection/parallel/immutable/HashMapCombiner$CreateGroupedTrie.class
@@ -8,7 +8,7 @@ public #= # of #; //HashMapCollision=class scala/collection/immutable/HashMap$Ha
 public #= # of #; //CreateGroupedTrie=class scala/collection/parallel/immutable/HashMapCombiner$CreateGroupedTrie of class scala/collection/parallel/immutable/HashMapCombiner
 
 Compiled from "ParHashMap.scala"
-public class scala.collection.parallel.immutable.HashMapCombiner$CreateGroupedTrie extends java.lang.Object implements scala.collection.parallel.Tasks$Task,scala.ScalaObject{
+public class scala.collection.parallel.immutable.HashMapCombiner$CreateGroupedTrie extends java.lang.Object implements scala.collection.parallel.Tasks$Task{
 
 private final scala.collection.mutable.UnrolledBuffer$Unrolled[] bucks;
   Signature: [Lscala/collection/mutable/UnrolledBuffer$Unrolled;
diff --git c/scala/collection/parallel/immutable/HashMapCombiner$CreateTrie.class w/scala/collection/parallel/immutable/HashMapCombiner$CreateTrie.class
index 7a59542f77..7cc48d5ff7 100644
--- c/scala/collection/parallel/immutable/HashMapCombiner$CreateTrie.class
+++ w/scala/collection/parallel/immutable/HashMapCombiner$CreateTrie.class
@@ -5,7 +5,7 @@ public #= # of #; //Unrolled=class scala/collection/mutable/UnrolledBuffer$Unrol
 public #= # of #; //CreateTrie=class scala/collection/parallel/immutable/HashMapCombiner$CreateTrie of class scala/collection/parallel/immutable/HashMapCombiner
 
 Compiled from "ParHashMap.scala"
-public class scala.collection.parallel.immutable.HashMapCombiner$CreateTrie extends java.lang.Object implements scala.collection.parallel.Tasks$Task,scala.ScalaObject{
+public class scala.collection.parallel.immutable.HashMapCombiner$CreateTrie extends java.lang.Object implements scala.collection.parallel.Tasks$Task{
 private final scala.collection.mutable.UnrolledBuffer$Unrolled[] bucks;
   Signature: [Lscala/collection/mutable/UnrolledBuffer$Unrolled;
 
diff --git c/scala/collection/parallel/immutable/HashSetCombiner$CreateTrie.class w/scala/collection/parallel/immutable/HashSetCombiner$CreateTrie.class
index 0697137f93..6fe446cbd8 100644
--- c/scala/collection/parallel/immutable/HashSetCombiner$CreateTrie.class
+++ w/scala/collection/parallel/immutable/HashSetCombiner$CreateTrie.class
@@ -5,7 +5,7 @@ public #= # of #; //Unrolled=class scala/collection/mutable/UnrolledBuffer$Unrol
 public #= # of #; //CreateTrie=class scala/collection/parallel/immutable/HashSetCombiner$CreateTrie of class scala/collection/parallel/immutable/HashSetCombiner
 
 Compiled from "ParHashSet.scala"
-public class scala.collection.parallel.immutable.HashSetCombiner$CreateTrie extends java.lang.Object implements scala.collection.parallel.Tasks$Task,scala.ScalaObject{
+public class scala.collection.parallel.immutable.HashSetCombiner$CreateTrie extends java.lang.Object implements scala.collection.parallel.Tasks$Task{
 private final scala.collection.mutable.UnrolledBuffer$Unrolled[] bucks;
   Signature: [Lscala/collection/mutable/UnrolledBuffer$Unrolled;
 
diff --git c/scala/collection/parallel/immutable/LazyParVectorCombiner.class w/scala/collection/parallel/immutable/LazyParVectorCombiner.class
index cd4f3d48da..d6d1828cbd 100644
--- c/scala/collection/parallel/immutable/LazyParVectorCombiner.class
+++ w/scala/collection/parallel/immutable/LazyParVectorCombiner.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "ParVector.scala"
-public class scala.collection.parallel.immutable.LazyParVectorCombiner extends java.lang.Object implements scala.collection.parallel.Combiner,scala.ScalaObject{
+public class scala.collection.parallel.immutable.LazyParVectorCombiner extends java.lang.Object implements scala.collection.parallel.Combiner{
 private int sz;
   Signature: I
 
diff --git c/scala/collection/parallel/immutable/ParHashMap$ParHashMapIterator.class w/scala/collection/parallel/immutable/ParHashMap$ParHashMapIterator.class
index a51764e401..1d9830f5e4 100644
--- c/scala/collection/parallel/immutable/ParHashMap$ParHashMapIterator.class
+++ w/scala/collection/parallel/immutable/ParHashMap$ParHashMapIterator.class
@@ -12,7 +12,7 @@ public abstract #= # of #; //ParIterator$class=class scala/collection/parallel/P
 public abstract #= # of #; //SignalContextPassingIterator=class scala/collection/parallel/ParIterableLike$SignalContextPassingIterator of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParHashMap.scala"
-public class scala.collection.parallel.immutable.ParHashMap$ParHashMapIterator extends java.lang.Object implements scala.collection.parallel.ParIterableLike$ParIterator,scala.ScalaObject{
+public class scala.collection.parallel.immutable.ParHashMap$ParHashMapIterator extends java.lang.Object implements scala.collection.parallel.ParIterableLike$ParIterator{
 private scala.collection.Iterator triter;
   Signature: Lscala/collection/Iterator;
 
diff --git c/scala/collection/parallel/immutable/ParHashMap.class w/scala/collection/parallel/immutable/ParHashMap.class
index 08d8c1d0f6..99a644e667 100644
--- c/scala/collection/parallel/immutable/ParHashMap.class
+++ w/scala/collection/parallel/immutable/ParHashMap.class
@@ -11,7 +11,7 @@ public #= # of #; //ParHashMapIterator=class scala/collection/parallel/immutable
 public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParHashMap.scala"
-public class scala.collection.parallel.immutable.ParHashMap extends java.lang.Object implements scala.collection.parallel.immutable.ParMap,scala.collection.generic.GenericParMapTemplate,scala.collection.parallel.ParMapLike,scala.Serializable,scala.ScalaObject{
+public class scala.collection.parallel.immutable.ParHashMap extends java.lang.Object implements scala.collection.parallel.immutable.ParMap,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/parallel/immutable/ParHashSet$ParHashSetIterator.class w/scala/collection/parallel/immutable/ParHashSet$ParHashSetIterator.class
index 959403c7c5..99117810ff 100644
--- c/scala/collection/parallel/immutable/ParHashSet$ParHashSetIterator.class
+++ w/scala/collection/parallel/immutable/ParHashSet$ParHashSetIterator.class
@@ -12,7 +12,7 @@ public abstract #= # of #; //ParIterator$class=class scala/collection/parallel/P
 public abstract #= # of #; //SignalContextPassingIterator=class scala/collection/parallel/ParIterableLike$SignalContextPassingIterator of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParHashSet.scala"
-public class scala.collection.parallel.immutable.ParHashSet$ParHashSetIterator extends java.lang.Object implements scala.collection.parallel.ParIterableLike$ParIterator,scala.ScalaObject{
+public class scala.collection.parallel.immutable.ParHashSet$ParHashSetIterator extends java.lang.Object implements scala.collection.parallel.ParIterableLike$ParIterator{
 private scala.collection.Iterator triter;
   Signature: Lscala/collection/Iterator;
 
diff --git c/scala/collection/parallel/immutable/ParHashSet.class w/scala/collection/parallel/immutable/ParHashSet.class
index 01694a4c9a..4745044aae 100644
--- c/scala/collection/parallel/immutable/ParHashSet.class
+++ w/scala/collection/parallel/immutable/ParHashSet.class
@@ -10,7 +10,7 @@ public #= # of #; //ParHashSetIterator=class scala/collection/parallel/immutable
 public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParHashSet.scala"
-public class scala.collection.parallel.immutable.ParHashSet extends java.lang.Object implements scala.collection.parallel.immutable.ParSet,scala.collection.generic.GenericParTemplate,scala.collection.parallel.ParSetLike,scala.Serializable,scala.ScalaObject{
+public class scala.collection.parallel.immutable.ParHashSet extends java.lang.Object implements scala.collection.parallel.immutable.ParSet,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/parallel/immutable/ParIterable.class w/scala/collection/parallel/immutable/ParIterable.class
index 06efc4be8c..24af59bdb2 100644
--- c/scala/collection/parallel/immutable/ParIterable.class
+++ w/scala/collection/parallel/immutable/ParIterable.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "ParIterable.scala"
-public interface scala.collection.parallel.immutable.ParIterable extends scala.collection.GenIterable,scala.collection.parallel.ParIterable,scala.collection.generic.GenericParTemplate,scala.collection.parallel.ParIterableLike,scala.ScalaObject{
+public interface scala.collection.parallel.immutable.ParIterable extends scala.collection.parallel.ParIterable{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/parallel/immutable/ParMap$WithDefault.class w/scala/collection/parallel/immutable/ParMap$WithDefault.class
index 7dc0785752..c837a3000e 100644
--- c/scala/collection/parallel/immutable/ParMap$WithDefault.class
+++ w/scala/collection/parallel/immutable/ParMap$WithDefault.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //WithDefault=class scala/collection/parallel/ParMap$
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "ParMap.scala"
-public class scala.collection.parallel.immutable.ParMap$WithDefault extends scala.collection.parallel.ParMap$WithDefault implements scala.collection.parallel.immutable.ParMap,scala.ScalaObject{
+public class scala.collection.parallel.immutable.ParMap$WithDefault extends scala.collection.parallel.ParMap$WithDefault implements scala.collection.parallel.immutable.ParMap{
 private final scala.collection.parallel.immutable.ParMap underlying;
   Signature: Lscala/collection/parallel/immutable/ParMap;
 
diff --git c/scala/collection/parallel/immutable/ParMap.class w/scala/collection/parallel/immutable/ParMap.class
index 6feb891d98..e09af88716 100644
--- c/scala/collection/parallel/immutable/ParMap.class
+++ w/scala/collection/parallel/immutable/ParMap.class
@@ -3,7 +3,7 @@ public #= # of #; //WithDefault=class scala/collection/parallel/immutable/ParMap
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "ParMap.scala"
-public interface scala.collection.parallel.immutable.ParMap extends scala.collection.GenMap,scala.collection.generic.GenericParMapTemplate,scala.collection.parallel.ParMap,scala.collection.parallel.immutable.ParIterable,scala.collection.parallel.ParMapLike,scala.ScalaObject{
+public interface scala.collection.parallel.immutable.ParMap extends scala.collection.parallel.ParMap,scala.collection.parallel.immutable.ParIterable{
 public abstract scala.collection.generic.GenericParMapCompanion mapCompanion();
   Signature: ()Lscala/collection/generic/GenericParMapCompanion;
 
diff --git c/scala/collection/parallel/immutable/ParRange$ParRangeIterator.class w/scala/collection/parallel/immutable/ParRange$ParRangeIterator.class
index 922740e7a6..864c093e21 100644
--- c/scala/collection/parallel/immutable/ParRange$ParRangeIterator.class
+++ w/scala/collection/parallel/immutable/ParRange$ParRangeIterator.class
@@ -18,7 +18,7 @@ public abstract #= # of #; //ParIterator$class=class scala/collection/parallel/P
 public abstract #= # of #; //SignalContextPassingIterator=class scala/collection/parallel/ParIterableLike$SignalContextPassingIterator of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParRange.scala"
-public class scala.collection.parallel.immutable.ParRange$ParRangeIterator extends java.lang.Object implements scala.collection.parallel.ParSeqLike$ParIterator,scala.ScalaObject{
+public class scala.collection.parallel.immutable.ParRange$ParRangeIterator extends java.lang.Object implements scala.collection.parallel.ParSeqLike$ParIterator{
 private final scala.collection.immutable.Range range;
   Signature: Lscala/collection/immutable/Range;
 
diff --git c/scala/collection/parallel/immutable/ParRange.class w/scala/collection/parallel/immutable/ParRange.class
index 98ffdc9861..e394057e29 100644
--- c/scala/collection/parallel/immutable/ParRange.class
+++ w/scala/collection/parallel/immutable/ParRange.class
@@ -11,7 +11,7 @@ public abstract #= # of #; //SignallingOps=class scala/collection/parallel/ParIt
 public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParRange.scala"
-public class scala.collection.parallel.immutable.ParRange extends java.lang.Object implements scala.collection.parallel.immutable.ParSeq,scala.Serializable,scala.ScalaObject{
+public class scala.collection.parallel.immutable.ParRange extends java.lang.Object implements scala.collection.parallel.immutable.ParSeq,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/parallel/immutable/ParSeq.class w/scala/collection/parallel/immutable/ParSeq.class
index 6541c9c4c0..07bc2bbf1c 100644
--- c/scala/collection/parallel/immutable/ParSeq.class
+++ w/scala/collection/parallel/immutable/ParSeq.class
@@ -1,6 +1,6 @@
 
 Compiled from "ParSeq.scala"
-public interface scala.collection.parallel.immutable.ParSeq extends scala.collection.GenSeq,scala.collection.parallel.ParSeq,scala.collection.parallel.immutable.ParIterable,scala.collection.generic.GenericParTemplate,scala.collection.parallel.ParSeqLike,scala.ScalaObject{
+public interface scala.collection.parallel.immutable.ParSeq extends scala.collection.parallel.ParSeq,scala.collection.parallel.immutable.ParIterable{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/parallel/immutable/ParSet.class w/scala/collection/parallel/immutable/ParSet.class
index 0424edae6d..b3d7b1283f 100644
--- c/scala/collection/parallel/immutable/ParSet.class
+++ w/scala/collection/parallel/immutable/ParSet.class
@@ -1,6 +1,6 @@
 
 Compiled from "ParSet.scala"
-public interface scala.collection.parallel.immutable.ParSet extends scala.collection.GenSet,scala.collection.generic.GenericParTemplate,scala.collection.parallel.ParSet,scala.collection.parallel.immutable.ParIterable,scala.collection.parallel.ParSetLike,scala.ScalaObject{
+public interface scala.collection.parallel.immutable.ParSet extends scala.collection.parallel.ParSet,scala.collection.parallel.immutable.ParIterable{
 public abstract scala.collection.parallel.immutable.ParSet empty();
   Signature: ()Lscala/collection/parallel/immutable/ParSet;
 
diff --git c/scala/collection/parallel/immutable/ParVector$ParVectorIterator.class w/scala/collection/parallel/immutable/ParVector$ParVectorIterator.class
index ef8f471992..03dcfa2f44 100644
--- c/scala/collection/parallel/immutable/ParVector$ParVectorIterator.class
+++ w/scala/collection/parallel/immutable/ParVector$ParVectorIterator.class
@@ -17,7 +17,7 @@ public abstract #= # of #; //SignalContextPassingIterator=class scala/collection
 public abstract #= # of #; //SignalContextPassingIterator=class scala/collection/parallel/ParIterableLike$SignalContextPassingIterator of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParVector.scala"
-public class scala.collection.parallel.immutable.ParVector$ParVectorIterator extends scala.collection.immutable.VectorIterator implements scala.collection.parallel.ParSeqLike$ParIterator,scala.ScalaObject{
+public class scala.collection.parallel.immutable.ParVector$ParVectorIterator extends scala.collection.immutable.VectorIterator implements scala.collection.parallel.ParSeqLike$ParIterator{
 public final scala.collection.parallel.immutable.ParVector $outer;
   Signature: Lscala/collection/parallel/immutable/ParVector;
 
diff --git c/scala/collection/parallel/immutable/ParVector.class w/scala/collection/parallel/immutable/ParVector.class
index 52e7cb75b0..106cb55a3f 100644
--- c/scala/collection/parallel/immutable/ParVector.class
+++ w/scala/collection/parallel/immutable/ParVector.class
@@ -11,7 +11,7 @@ public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/para
 public #= # of #; //GenericCanBuildFrom=class scala/collection/generic/GenTraversableFactory$GenericCanBuildFrom of class scala/collection/generic/GenTraversableFactory
 
 Compiled from "ParVector.scala"
-public class scala.collection.parallel.immutable.ParVector extends java.lang.Object implements scala.collection.parallel.immutable.ParSeq,scala.collection.generic.GenericParTemplate,scala.collection.parallel.ParSeqLike,scala.Serializable,scala.ScalaObject{
+public class scala.collection.parallel.immutable.ParVector extends java.lang.Object implements scala.collection.parallel.immutable.ParSeq,scala.Serializable{
 public final scala.collection.immutable.Vector scala$collection$parallel$immutable$ParVector$$vector;
   Signature: Lscala/collection/immutable/Vector;
 
diff --git c/scala/collection/parallel/immutable/Repetition$ParIterator.class w/scala/collection/parallel/immutable/Repetition$ParIterator.class
index fb0e815895..8cfab8272f 100644
--- c/scala/collection/parallel/immutable/Repetition$ParIterator.class
+++ w/scala/collection/parallel/immutable/Repetition$ParIterator.class
@@ -19,7 +19,7 @@ public abstract #= # of #; //SignalContextPassingIterator=class scala/collection
 public abstract #= # of #; //SignalContextPassingIterator=class scala/collection/parallel/ParIterableLike$SignalContextPassingIterator of class scala/collection/parallel/ParIterableLike
 
 Compiled from "package.scala"
-public class scala.collection.parallel.immutable.Repetition$ParIterator extends java.lang.Object implements scala.collection.parallel.ParSeqLike$ParIterator,scala.ScalaObject{
+public class scala.collection.parallel.immutable.Repetition$ParIterator extends java.lang.Object implements scala.collection.parallel.ParSeqLike$ParIterator{
 private int i;
   Signature: I
 
diff --git c/scala/collection/parallel/immutable/Repetition.class w/scala/collection/parallel/immutable/Repetition.class
index 46f1b744c8..31757667ed 100644
--- c/scala/collection/parallel/immutable/Repetition.class
+++ w/scala/collection/parallel/immutable/Repetition.class
@@ -11,7 +11,7 @@ public abstract #= # of #; //SignallingOps=class scala/collection/parallel/ParIt
 public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask of class scala/collection/parallel/ParIterableLike
 
 Compiled from "package.scala"
-public class scala.collection.parallel.immutable.Repetition extends java.lang.Object implements scala.collection.parallel.immutable.ParSeq,scala.ScalaObject{
+public class scala.collection.parallel.immutable.Repetition extends java.lang.Object implements scala.collection.parallel.immutable.ParSeq{
 public final java.lang.Object scala$collection$parallel$immutable$Repetition$$elem;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/collection/parallel/mutable/LazyCombiner.class w/scala/collection/parallel/mutable/LazyCombiner.class
index 56d183902a..7fa3d06f0b 100644
--- c/scala/collection/parallel/mutable/LazyCombiner.class
+++ w/scala/collection/parallel/mutable/LazyCombiner.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "LazyCombiner.scala"
-public interface scala.collection.parallel.mutable.LazyCombiner extends scala.collection.parallel.Combiner,scala.ScalaObject{
+public interface scala.collection.parallel.mutable.LazyCombiner extends scala.collection.parallel.Combiner{
 public abstract void scala$collection$parallel$mutable$LazyCombiner$_setter_$lastbuff_$eq(scala.collection.generic.Growable);
   Signature: (Lscala/collection/generic/Growable;)V
 
diff --git c/scala/collection/parallel/mutable/ParArray$Map.class w/scala/collection/parallel/mutable/ParArray$Map.class
index 06fbab4a29..9926efcc71 100644
--- c/scala/collection/parallel/mutable/ParArray$Map.class
+++ w/scala/collection/parallel/mutable/ParArray$Map.class
@@ -4,7 +4,7 @@ public #= # of #; //Map=class scala/collection/parallel/mutable/ParArray$Map of
 public abstract #= # of #; //Task$class=class scala/collection/parallel/Tasks$Task$class of class scala/collection/parallel/Tasks
 
 Compiled from "ParArray.scala"
-public class scala.collection.parallel.mutable.ParArray$Map extends java.lang.Object implements scala.collection.parallel.Tasks$Task,scala.ScalaObject{
+public class scala.collection.parallel.mutable.ParArray$Map extends java.lang.Object implements scala.collection.parallel.Tasks$Task{
 private final scala.Function1 f;
   Signature: Lscala/Function1;
 
diff --git c/scala/collection/parallel/mutable/ParArray$ParArrayIterator.class w/scala/collection/parallel/mutable/ParArray$ParArrayIterator.class
index 57b74335fa..7e4f94f590 100644
--- c/scala/collection/parallel/mutable/ParArray$ParArrayIterator.class
+++ w/scala/collection/parallel/mutable/ParArray$ParArrayIterator.class
@@ -20,7 +20,7 @@ public abstract #= # of #; //Otherwise=class scala/collection/parallel/ParIterab
 public abstract #= # of #; //SignalContextPassingIterator=class scala/collection/parallel/ParIterableLike$SignalContextPassingIterator of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParArray.scala"
-public class scala.collection.parallel.mutable.ParArray$ParArrayIterator extends java.lang.Object implements scala.collection.parallel.ParSeqLike$ParIterator,scala.ScalaObject{
+public class scala.collection.parallel.mutable.ParArray$ParArrayIterator extends java.lang.Object implements scala.collection.parallel.ParSeqLike$ParIterator{
 private int i;
   Signature: I
 
diff --git c/scala/collection/parallel/mutable/ParArray$ScanToArray.class w/scala/collection/parallel/mutable/ParArray$ScanToArray.class
index eec880acdb..16160f22b7 100644
--- c/scala/collection/parallel/mutable/ParArray$ScanToArray.class
+++ w/scala/collection/parallel/mutable/ParArray$ScanToArray.class
@@ -7,7 +7,7 @@ public #= # of #; //ScanNode=class scala/collection/parallel/ParIterableLike$Sca
 public #= # of #; //ScanLeaf=class scala/collection/parallel/ParIterableLike$ScanLeaf of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParArray.scala"
-public class scala.collection.parallel.mutable.ParArray$ScanToArray extends java.lang.Object implements scala.collection.parallel.Tasks$Task,scala.ScalaObject{
+public class scala.collection.parallel.mutable.ParArray$ScanToArray extends java.lang.Object implements scala.collection.parallel.Tasks$Task{
 private final scala.collection.parallel.ParIterableLike$ScanTree tree;
   Signature: Lscala/collection/parallel/ParIterableLike$ScanTree;
 
diff --git c/scala/collection/parallel/mutable/ParArray.class w/scala/collection/parallel/mutable/ParArray.class
index 5f47d4fed7..334393bcbc 100644
--- c/scala/collection/parallel/mutable/ParArray.class
+++ w/scala/collection/parallel/mutable/ParArray.class
@@ -16,7 +16,7 @@ public #= # of #; //CreateScanTree=class scala/collection/parallel/ParIterableLi
 public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParArray.scala"
-public class scala.collection.parallel.mutable.ParArray extends java.lang.Object implements scala.collection.parallel.mutable.ParSeq,scala.collection.generic.GenericParTemplate,scala.collection.parallel.ParSeqLike,scala.Serializable,scala.ScalaObject{
+public class scala.collection.parallel.mutable.ParArray extends java.lang.Object implements scala.collection.parallel.mutable.ParSeq,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/parallel/mutable/ParFlatHashTable$ParFlatHashTableIterator.class w/scala/collection/parallel/mutable/ParFlatHashTable$ParFlatHashTableIterator.class
index 66628e988c..8478f7408c 100644
--- c/scala/collection/parallel/mutable/ParFlatHashTable$ParFlatHashTableIterator.class
+++ w/scala/collection/parallel/mutable/ParFlatHashTable$ParFlatHashTableIterator.class
@@ -9,7 +9,7 @@ public #= # of #; //ZippedAll=class scala/collection/parallel/IterableSplitter$Z
 public abstract #= # of #; //ParFlatHashTableIterator=class scala/collection/parallel/mutable/ParFlatHashTable$ParFlatHashTableIterator of class scala/collection/parallel/mutable/ParFlatHashTable
 
 Compiled from "ParFlatHashTable.scala"
-public abstract class scala.collection.parallel.mutable.ParFlatHashTable$ParFlatHashTableIterator extends java.lang.Object implements scala.collection.parallel.IterableSplitter,scala.collection.parallel.mutable.SizeMapUtils,scala.ScalaObject{
+public abstract class scala.collection.parallel.mutable.ParFlatHashTable$ParFlatHashTableIterator extends java.lang.Object implements scala.collection.parallel.IterableSplitter,scala.collection.parallel.mutable.SizeMapUtils{
 private int idx;
   Signature: I
 
diff --git c/scala/collection/parallel/mutable/ParFlatHashTable.class w/scala/collection/parallel/mutable/ParFlatHashTable.class
index 65fae00f9e..3f06bdf137 100644
--- c/scala/collection/parallel/mutable/ParFlatHashTable.class
+++ w/scala/collection/parallel/mutable/ParFlatHashTable.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //ParFlatHashTableIterator=class scala/collection/parallel/mutable/ParFlatHashTable$ParFlatHashTableIterator of class scala/collection/parallel/mutable/ParFlatHashTable
 
 Compiled from "ParFlatHashTable.scala"
-public interface scala.collection.parallel.mutable.ParFlatHashTable extends scala.collection.mutable.FlatHashTable,scala.ScalaObject{
+public interface scala.collection.parallel.mutable.ParFlatHashTable extends scala.collection.mutable.FlatHashTable{
 public abstract boolean alwaysInitSizeMap();
   Signature: ()Z
 
diff --git c/scala/collection/parallel/mutable/ParHashMap$ParHashMapIterator.class w/scala/collection/parallel/mutable/ParHashMap$ParHashMapIterator.class
index dace6bfa5d..ce4f8d59f6 100644
--- c/scala/collection/parallel/mutable/ParHashMap$ParHashMapIterator.class
+++ w/scala/collection/parallel/mutable/ParHashMap$ParHashMapIterator.class
@@ -6,7 +6,7 @@ public abstract #= # of #; //ParIterator$class=class scala/collection/parallel/P
 public abstract #= # of #; //SignalContextPassingIterator=class scala/collection/parallel/ParIterableLike$SignalContextPassingIterator of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParHashMap.scala"
-public class scala.collection.parallel.mutable.ParHashMap$ParHashMapIterator extends scala.collection.parallel.mutable.ParHashTable$EntryIterator implements scala.collection.parallel.ParIterableLike$ParIterator,scala.ScalaObject{
+public class scala.collection.parallel.mutable.ParHashMap$ParHashMapIterator extends scala.collection.parallel.mutable.ParHashTable$EntryIterator implements scala.collection.parallel.ParIterableLike$ParIterator{
 public final scala.collection.parallel.mutable.ParHashMap $outer;
   Signature: Lscala/collection/parallel/mutable/ParHashMap;
 
diff --git c/scala/collection/parallel/mutable/ParHashMap.class w/scala/collection/parallel/mutable/ParHashMap.class
index 5236cc6a27..e25507a029 100644
--- c/scala/collection/parallel/mutable/ParHashMap.class
+++ w/scala/collection/parallel/mutable/ParHashMap.class
@@ -13,7 +13,7 @@ public #= # of #; //ParHashMapIterator=class scala/collection/parallel/mutable/P
 public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParHashMap.scala"
-public class scala.collection.parallel.mutable.ParHashMap extends java.lang.Object implements scala.collection.parallel.mutable.ParMap,scala.collection.generic.GenericParMapTemplate,scala.collection.parallel.mutable.ParMapLike,scala.collection.parallel.mutable.ParHashTable,scala.Serializable,scala.ScalaObject{
+public class scala.collection.parallel.mutable.ParHashMap extends java.lang.Object implements scala.collection.parallel.mutable.ParMap,scala.collection.parallel.mutable.ParHashTable,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/parallel/mutable/ParHashMapCombiner$AddingHashTable.class w/scala/collection/parallel/mutable/ParHashMapCombiner$AddingHashTable.class
index a05d9089e1..152925ff41 100644
--- c/scala/collection/parallel/mutable/ParHashMapCombiner$AddingHashTable.class
+++ w/scala/collection/parallel/mutable/ParHashMapCombiner$AddingHashTable.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //HashUtils$class=class scala/collection/mutable/Hash
 public #= # of #; //AddingHashTable=class scala/collection/parallel/mutable/ParHashMapCombiner$AddingHashTable of class scala/collection/parallel/mutable/ParHashMapCombiner
 
 Compiled from "ParHashMap.scala"
-public class scala.collection.parallel.mutable.ParHashMapCombiner$AddingHashTable extends java.lang.Object implements scala.collection.mutable.HashTable,scala.ScalaObject{
+public class scala.collection.parallel.mutable.ParHashMapCombiner$AddingHashTable extends java.lang.Object implements scala.collection.mutable.HashTable{
 public final scala.collection.parallel.mutable.ParHashMapCombiner $outer;
   Signature: Lscala/collection/parallel/mutable/ParHashMapCombiner;
 
diff --git c/scala/collection/parallel/mutable/ParHashMapCombiner$FillBlocks.class w/scala/collection/parallel/mutable/ParHashMapCombiner$FillBlocks.class
index b8c908127b..b8152935ad 100644
--- c/scala/collection/parallel/mutable/ParHashMapCombiner$FillBlocks.class
+++ w/scala/collection/parallel/mutable/ParHashMapCombiner$FillBlocks.class
@@ -7,7 +7,7 @@ public #= # of #; //FillBlocks=class scala/collection/parallel/mutable/ParHashMa
 public #= # of #; //AddingHashTable=class scala/collection/parallel/mutable/ParHashMapCombiner$AddingHashTable of class scala/collection/parallel/mutable/ParHashMapCombiner
 
 Compiled from "ParHashMap.scala"
-public class scala.collection.parallel.mutable.ParHashMapCombiner$FillBlocks extends java.lang.Object implements scala.collection.parallel.Tasks$Task,scala.ScalaObject{
+public class scala.collection.parallel.mutable.ParHashMapCombiner$FillBlocks extends java.lang.Object implements scala.collection.parallel.Tasks$Task{
 private final scala.collection.mutable.UnrolledBuffer$Unrolled[] buckets;
   Signature: [Lscala/collection/mutable/UnrolledBuffer$Unrolled;
 
diff --git c/scala/collection/parallel/mutable/ParHashMapCombiner.class w/scala/collection/parallel/mutable/ParHashMapCombiner.class
index 27562387d5..d13f0524d5 100644
--- c/scala/collection/parallel/mutable/ParHashMapCombiner.class
+++ w/scala/collection/parallel/mutable/ParHashMapCombiner.class
@@ -8,7 +8,7 @@ public #= # of #; //FillBlocks=class scala/collection/parallel/mutable/ParHashMa
 public #= # of #; //AddingHashTable=class scala/collection/parallel/mutable/ParHashMapCombiner$AddingHashTable of class scala/collection/parallel/mutable/ParHashMapCombiner
 
 Compiled from "ParHashMap.scala"
-public abstract class scala.collection.parallel.mutable.ParHashMapCombiner extends scala.collection.parallel.BucketCombiner implements scala.collection.mutable.HashTable$HashUtils,scala.ScalaObject{
+public abstract class scala.collection.parallel.mutable.ParHashMapCombiner extends scala.collection.parallel.BucketCombiner implements scala.collection.mutable.HashTable$HashUtils{
 private final int tableLoadFactor;
   Signature: I
 
diff --git c/scala/collection/parallel/mutable/ParHashSet$ParHashSetIterator.class w/scala/collection/parallel/mutable/ParHashSet$ParHashSetIterator.class
index 5ed670f432..e6e8312209 100644
--- c/scala/collection/parallel/mutable/ParHashSet$ParHashSetIterator.class
+++ w/scala/collection/parallel/mutable/ParHashSet$ParHashSetIterator.class
@@ -6,7 +6,7 @@ public abstract #= # of #; //ParFlatHashTableIterator=class scala/collection/par
 public abstract #= # of #; //SignalContextPassingIterator=class scala/collection/parallel/ParIterableLike$SignalContextPassingIterator of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParHashSet.scala"
-public class scala.collection.parallel.mutable.ParHashSet$ParHashSetIterator extends scala.collection.parallel.mutable.ParFlatHashTable$ParFlatHashTableIterator implements scala.collection.parallel.ParIterableLike$ParIterator,scala.ScalaObject{
+public class scala.collection.parallel.mutable.ParHashSet$ParHashSetIterator extends scala.collection.parallel.mutable.ParFlatHashTable$ParFlatHashTableIterator implements scala.collection.parallel.ParIterableLike$ParIterator{
 public final scala.collection.parallel.mutable.ParHashSet $outer;
   Signature: Lscala/collection/parallel/mutable/ParHashSet;
 
diff --git c/scala/collection/parallel/mutable/ParHashSet.class w/scala/collection/parallel/mutable/ParHashSet.class
index 9562e1b83d..7c8de6239a 100644
--- c/scala/collection/parallel/mutable/ParHashSet.class
+++ w/scala/collection/parallel/mutable/ParHashSet.class
@@ -13,7 +13,7 @@ public #= # of #; //ParHashSetIterator=class scala/collection/parallel/mutable/P
 public abstract #= # of #; //StrictSplitterCheckTask=class scala/collection/parallel/ParIterableLike$StrictSplitterCheckTask of class scala/collection/parallel/ParIterableLike
 
 Compiled from "ParHashSet.scala"
-public class scala.collection.parallel.mutable.ParHashSet extends java.lang.Object implements scala.collection.parallel.mutable.ParSet,scala.collection.generic.GenericParTemplate,scala.collection.parallel.mutable.ParSetLike,scala.collection.parallel.mutable.ParFlatHashTable,scala.Serializable,scala.ScalaObject{
+public class scala.collection.parallel.mutable.ParHashSet extends java.lang.Object implements scala.collection.parallel.mutable.ParSet,scala.collection.parallel.mutable.ParFlatHashTable,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/collection/parallel/mutable/ParHashSetCombiner$AddingFlatHashTable.class w/scala/collection/parallel/mutable/ParHashSetCombiner$AddingFlatHashTable.class
index 61fb133ce2..fa96c22f7c 100644
--- c/scala/collection/parallel/mutable/ParHashSetCombiner$AddingFlatHashTable.class
+++ w/scala/collection/parallel/mutable/ParHashSetCombiner$AddingFlatHashTable.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //HashUtils$class=class scala/collection/mutable/Flat
 public #= # of #; //AddingFlatHashTable=class scala/collection/parallel/mutable/ParHashSetCombiner$AddingFlatHashTable of class scala/collection/parallel/mutable/ParHashSetCombiner
 
 Compiled from "ParHashSet.scala"
-public class scala.collection.parallel.mutable.ParHashSetCombiner$AddingFlatHashTable extends java.lang.Object implements scala.collection.mutable.FlatHashTable,scala.ScalaObject{
+public class scala.collection.parallel.mutable.ParHashSetCombiner$AddingFlatHashTable extends java.lang.Object implements scala.collection.mutable.FlatHashTable{
 public final scala.collection.parallel.mutable.ParHashSetCombiner $outer;
   Signature: Lscala/collection/parallel/mutable/ParHashSetCombiner;
 
diff --git c/scala/collection/parallel/mutable/ParHashSetCombiner$FillBlocks.class w/scala/collection/parallel/mutable/ParHashSetCombiner$FillBlocks.class
index 583ea83d58..ad089e05b4 100644
--- c/scala/collection/parallel/mutable/ParHashSetCombiner$FillBlocks.class
+++ w/scala/collection/parallel/mutable/ParHashSetCombiner$FillBlocks.class
@@ -6,7 +6,7 @@ public #= # of #; //FillBlocks=class scala/collection/parallel/mutable/ParHashSe
 public #= # of #; //AddingFlatHashTable=class scala/collection/parallel/mutable/ParHashSetCombiner$AddingFlatHashTable of class scala/collection/parallel/mutable/ParHashSetCombiner
 
 Compiled from "ParHashSet.scala"
-public class scala.collection.parallel.mutable.ParHashSetCombiner$FillBlocks extends java.lang.Object implements scala.collection.parallel.Tasks$Task,scala.ScalaObject{
+public class scala.collection.parallel.mutable.ParHashSetCombiner$FillBlocks extends java.lang.Object implements scala.collection.parallel.Tasks$Task{
 private final scala.collection.mutable.UnrolledBuffer[] buckets;
   Signature: [Lscala/collection/mutable/UnrolledBuffer;
 
diff --git c/scala/collection/parallel/mutable/ParHashSetCombiner.class w/scala/collection/parallel/mutable/ParHashSetCombiner.class
index 4ba381e20b..438a64e17d 100644
--- c/scala/collection/parallel/mutable/ParHashSetCombiner.class
+++ w/scala/collection/parallel/mutable/ParHashSetCombiner.class
@@ -7,7 +7,7 @@ public #= # of #; //FillBlocks=class scala/collection/parallel/mutable/ParHashSe
 public #= # of #; //AddingFlatHashTable=class scala/collection/parallel/mutable/ParHashSetCombiner$AddingFlatHashTable of class scala/collection/parallel/mutable/ParHashSetCombiner
 
 Compiled from "ParHashSet.scala"
-public abstract class scala.collection.parallel.mutable.ParHashSetCombiner extends scala.collection.parallel.BucketCombiner implements scala.collection.mutable.FlatHashTable$HashUtils,scala.ScalaObject{
+public abstract class scala.collection.parallel.mutable.ParHashSetCombiner extends scala.collection.parallel.BucketCombiner implements scala.collection.mutable.FlatHashTable$HashUtils{
 private final int tableLoadFactor;
   Signature: I
 
diff --git c/scala/collection/parallel/mutable/ParHashTable$EntryIterator.class w/scala/collection/parallel/mutable/ParHashTable$EntryIterator.class
index a28665b74c..1d5aff79fa 100644
--- c/scala/collection/parallel/mutable/ParHashTable$EntryIterator.class
+++ w/scala/collection/parallel/mutable/ParHashTable$EntryIterator.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //EntryIterator=class scala/collection/parallel/mutab
 public #= # of #; //ZippedAll=class scala/collection/parallel/IterableSplitter$ZippedAll of class scala/collection/parallel/IterableSplitter
 
 Compiled from "ParHashTable.scala"
-public abstract class scala.collection.parallel.mutable.ParHashTable$EntryIterator extends java.lang.Object implements scala.collection.parallel.IterableSplitter,scala.collection.parallel.mutable.SizeMapUtils,scala.ScalaObject{
+public abstract class scala.collection.parallel.mutable.ParHashTable$EntryIterator extends java.lang.Object implements scala.collection.parallel.IterableSplitter,scala.collection.parallel.mutable.SizeMapUtils{
 private int scala$collection$parallel$mutable$ParHashTable$EntryIterator$$idx;
   Signature: I
 
diff --git c/scala/collection/parallel/mutable/ParHashTable.class w/scala/collection/parallel/mutable/ParHashTable.class
index 862a3d6496..2e0122d6ee 100644
--- c/scala/collection/parallel/mutable/ParHashTable.class
+++ w/scala/collection/parallel/mutable/ParHashTable.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //EntryIterator=class scala/collection/parallel/mutable/ParHashTable$EntryIterator of class scala/collection/parallel/mutable/ParHashTable
 
 Compiled from "ParHashTable.scala"
-public interface scala.collection.parallel.mutable.ParHashTable extends scala.collection.mutable.HashTable,scala.ScalaObject{
+public interface scala.collection.parallel.mutable.ParHashTable extends scala.collection.mutable.HashTable{
 public abstract boolean alwaysInitSizeMap();
   Signature: ()Z
 
diff --git c/scala/collection/parallel/mutable/ParIterable.class w/scala/collection/parallel/mutable/ParIterable.class
index 38dc5aa2be..bdb9d57b62 100644
--- c/scala/collection/parallel/mutable/ParIterable.class
+++ w/scala/collection/parallel/mutable/ParIterable.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "ParIterable.scala"
-public interface scala.collection.parallel.mutable.ParIterable extends scala.collection.GenIterable,scala.collection.parallel.ParIterable,scala.collection.generic.GenericParTemplate,scala.collection.parallel.ParIterableLike,scala.ScalaObject{
+public interface scala.collection.parallel.mutable.ParIterable extends scala.collection.parallel.ParIterable{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/parallel/mutable/ParMap$WithDefault.class w/scala/collection/parallel/mutable/ParMap$WithDefault.class
index fdc8828bea..2a4dde1297 100644
--- c/scala/collection/parallel/mutable/ParMap$WithDefault.class
+++ w/scala/collection/parallel/mutable/ParMap$WithDefault.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //WithDefault=class scala/collection/parallel/ParMap$
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "ParMap.scala"
-public class scala.collection.parallel.mutable.ParMap$WithDefault extends scala.collection.parallel.ParMap$WithDefault implements scala.collection.parallel.mutable.ParMap,scala.ScalaObject{
+public class scala.collection.parallel.mutable.ParMap$WithDefault extends scala.collection.parallel.ParMap$WithDefault implements scala.collection.parallel.mutable.ParMap{
 private final scala.collection.parallel.mutable.ParMap underlying;
   Signature: Lscala/collection/parallel/mutable/ParMap;
 
diff --git c/scala/collection/parallel/mutable/ParMap.class w/scala/collection/parallel/mutable/ParMap.class
index 81448deb08..58e398dba5 100644
--- c/scala/collection/parallel/mutable/ParMap.class
+++ w/scala/collection/parallel/mutable/ParMap.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //WithDefault=class scala/collection/parallel/mutable/ParMap$WithDefault of class scala/collection/parallel/mutable/ParMap
 
 Compiled from "ParMap.scala"
-public interface scala.collection.parallel.mutable.ParMap extends scala.collection.GenMap,scala.collection.parallel.ParMap,scala.collection.parallel.mutable.ParIterable,scala.collection.generic.GenericParMapTemplate,scala.collection.parallel.mutable.ParMapLike,scala.ScalaObject{
+public interface scala.collection.parallel.mutable.ParMap extends scala.collection.parallel.ParMap,scala.collection.parallel.mutable.ParIterable,scala.collection.parallel.mutable.ParMapLike{
 public abstract scala.collection.parallel.Combiner newCombiner();
   Signature: ()Lscala/collection/parallel/Combiner;
 
diff --git c/scala/collection/parallel/mutable/ParMapLike.class w/scala/collection/parallel/mutable/ParMapLike.class
index 4e76b81d8d..05b4f149b2 100644
--- c/scala/collection/parallel/mutable/ParMapLike.class
+++ w/scala/collection/parallel/mutable/ParMapLike.class
@@ -1,6 +1,6 @@
 
 Compiled from "ParMapLike.scala"
-public interface scala.collection.parallel.mutable.ParMapLike extends scala.collection.GenMapLike,scala.collection.parallel.ParMapLike,scala.collection.generic.Growable,scala.collection.generic.Shrinkable,scala.collection.mutable.Cloneable,scala.ScalaObject{
+public interface scala.collection.parallel.mutable.ParMapLike extends scala.collection.parallel.ParMapLike,scala.collection.generic.Growable,scala.collection.generic.Shrinkable,scala.collection.mutable.Cloneable{
 public abstract scala.Option put(java.lang.Object, java.lang.Object);
   Signature: (Ljava/lang/Object;Ljava/lang/Object;)Lscala/Option;
 
diff --git c/scala/collection/parallel/mutable/ParSeq.class w/scala/collection/parallel/mutable/ParSeq.class
index c847a10957..33a5e8dadf 100644
--- c/scala/collection/parallel/mutable/ParSeq.class
+++ w/scala/collection/parallel/mutable/ParSeq.class
@@ -1,6 +1,6 @@
 
 Compiled from "ParSeq.scala"
-public interface scala.collection.parallel.mutable.ParSeq extends scala.collection.GenSeq,scala.collection.parallel.mutable.ParIterable,scala.collection.parallel.ParSeq,scala.collection.generic.GenericParTemplate,scala.collection.parallel.ParSeqLike,scala.ScalaObject{
+public interface scala.collection.parallel.mutable.ParSeq extends scala.collection.parallel.mutable.ParIterable,scala.collection.parallel.ParSeq{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/parallel/mutable/ParSet.class w/scala/collection/parallel/mutable/ParSet.class
index b8e1e65809..5fe3e5322e 100644
--- c/scala/collection/parallel/mutable/ParSet.class
+++ w/scala/collection/parallel/mutable/ParSet.class
@@ -1,6 +1,6 @@
 
 Compiled from "ParSet.scala"
-public interface scala.collection.parallel.mutable.ParSet extends scala.collection.GenSet,scala.collection.parallel.mutable.ParIterable,scala.collection.parallel.ParSet,scala.collection.generic.GenericParTemplate,scala.collection.parallel.mutable.ParSetLike,scala.ScalaObject{
+public interface scala.collection.parallel.mutable.ParSet extends scala.collection.parallel.mutable.ParIterable,scala.collection.parallel.ParSet,scala.collection.parallel.mutable.ParSetLike{
 public abstract scala.collection.generic.GenericCompanion companion();
   Signature: ()Lscala/collection/generic/GenericCompanion;
 
diff --git c/scala/collection/parallel/mutable/ParSetLike.class w/scala/collection/parallel/mutable/ParSetLike.class
index ca40ae8d1d..6fbb531f49 100644
--- c/scala/collection/parallel/mutable/ParSetLike.class
+++ w/scala/collection/parallel/mutable/ParSetLike.class
@@ -1,6 +1,6 @@
 
 Compiled from "ParSetLike.scala"
-public interface scala.collection.parallel.mutable.ParSetLike extends scala.collection.GenSetLike,scala.collection.parallel.ParIterableLike,scala.collection.parallel.ParSetLike,scala.collection.generic.Growable,scala.collection.generic.Shrinkable,scala.collection.mutable.Cloneable,scala.ScalaObject{
+public interface scala.collection.parallel.mutable.ParSetLike extends scala.collection.parallel.ParSetLike,scala.collection.generic.Growable,scala.collection.generic.Shrinkable,scala.collection.mutable.Cloneable{
 public abstract scala.collection.parallel.mutable.ParSet empty();
   Signature: ()Lscala/collection/parallel/mutable/ParSet;
 
diff --git c/scala/collection/parallel/mutable/ResizableParArrayCombiner$CopyChainToArray.class w/scala/collection/parallel/mutable/ResizableParArrayCombiner$CopyChainToArray.class
index cc3d028909..23d7eb6f85 100644
--- c/scala/collection/parallel/mutable/ResizableParArrayCombiner$CopyChainToArray.class
+++ w/scala/collection/parallel/mutable/ResizableParArrayCombiner$CopyChainToArray.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Task$class=class scala/collection/parallel/Tasks$Ta
 public #= # of #; //CopyChainToArray=class scala/collection/parallel/mutable/ResizableParArrayCombiner$CopyChainToArray of class scala/collection/parallel/mutable/ResizableParArrayCombiner
 
 Compiled from "ResizableParArrayCombiner.scala"
-public class scala.collection.parallel.mutable.ResizableParArrayCombiner$CopyChainToArray extends java.lang.Object implements scala.collection.parallel.Tasks$Task,scala.ScalaObject{
+public class scala.collection.parallel.mutable.ResizableParArrayCombiner$CopyChainToArray extends java.lang.Object implements scala.collection.parallel.Tasks$Task{
 private final java.lang.Object[] array;
   Signature: [Ljava/lang/Object;
 
diff --git c/scala/collection/parallel/mutable/ResizableParArrayCombiner.class w/scala/collection/parallel/mutable/ResizableParArrayCombiner.class
index 8424071e4b..08834f9166 100644
--- c/scala/collection/parallel/mutable/ResizableParArrayCombiner.class
+++ w/scala/collection/parallel/mutable/ResizableParArrayCombiner.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //CopyChainToArray=class scala/collection/parallel/mutable/ResizableParArrayCombiner$CopyChainToArray of class scala/collection/parallel/mutable/ResizableParArrayCombiner
 
 Compiled from "ResizableParArrayCombiner.scala"
-public interface scala.collection.parallel.mutable.ResizableParArrayCombiner extends scala.collection.parallel.mutable.LazyCombiner,scala.ScalaObject{
+public interface scala.collection.parallel.mutable.ResizableParArrayCombiner extends scala.collection.parallel.mutable.LazyCombiner{
 public abstract void sizeHint(int);
   Signature: (I)V
 
diff --git c/scala/collection/parallel/mutable/UnrolledParArrayCombiner$CopyUnrolledToArray.class w/scala/collection/parallel/mutable/UnrolledParArrayCombiner$CopyUnrolledToArray.class
index bfd93dc52f..da21966c0d 100644
--- c/scala/collection/parallel/mutable/UnrolledParArrayCombiner$CopyUnrolledToArray.class
+++ w/scala/collection/parallel/mutable/UnrolledParArrayCombiner$CopyUnrolledToArray.class
@@ -5,7 +5,7 @@ public #= # of #; //Unrolled=class scala/collection/mutable/UnrolledBuffer$Unrol
 public #= # of #; //CopyUnrolledToArray=class scala/collection/parallel/mutable/UnrolledParArrayCombiner$CopyUnrolledToArray of class scala/collection/parallel/mutable/UnrolledParArrayCombiner
 
 Compiled from "UnrolledParArrayCombiner.scala"
-public class scala.collection.parallel.mutable.UnrolledParArrayCombiner$CopyUnrolledToArray extends java.lang.Object implements scala.collection.parallel.Tasks$Task,scala.ScalaObject{
+public class scala.collection.parallel.mutable.UnrolledParArrayCombiner$CopyUnrolledToArray extends java.lang.Object implements scala.collection.parallel.Tasks$Task{
 private final java.lang.Object[] array;
   Signature: [Ljava/lang/Object;
 
diff --git c/scala/collection/parallel/mutable/UnrolledParArrayCombiner.class w/scala/collection/parallel/mutable/UnrolledParArrayCombiner.class
index 53af51e9de..72a52639f2 100644
--- c/scala/collection/parallel/mutable/UnrolledParArrayCombiner.class
+++ w/scala/collection/parallel/mutable/UnrolledParArrayCombiner.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //CopyUnrolledToArray=class scala/collection/parallel/mutable/UnrolledParArrayCombiner$CopyUnrolledToArray of class scala/collection/parallel/mutable/UnrolledParArrayCombiner
 
 Compiled from "UnrolledParArrayCombiner.scala"
-public interface scala.collection.parallel.mutable.UnrolledParArrayCombiner extends scala.collection.parallel.Combiner,scala.ScalaObject{
+public interface scala.collection.parallel.mutable.UnrolledParArrayCombiner extends scala.collection.parallel.Combiner{
 public abstract void scala$collection$parallel$mutable$UnrolledParArrayCombiner$_setter_$buff_$eq(scala.collection.parallel.mutable.DoublingUnrolledBuffer);
   Signature: (Lscala/collection/parallel/mutable/DoublingUnrolledBuffer;)V
 
diff --git c/scala/collection/script/End$.class w/scala/collection/script/End$.class
index d43135de11..41fd94e09c 100644
--- c/scala/collection/script/End$.class
+++ w/scala/collection/script/End$.class
@@ -1,6 +1,6 @@
 
 Compiled from "Location.scala"
-public final class scala.collection.script.End$ extends scala.collection.script.Location implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.collection.script.End$ extends scala.collection.script.Location implements scala.Product,scala.Serializable{
 public static final scala.collection.script.End$ MODULE$;
   Signature: Lscala/collection/script/End$;
 
diff --git c/scala/collection/script/Include.class w/scala/collection/script/Include.class
index cee9c1c2e2..74094bcbb5 100644
--- c/scala/collection/script/Include.class
+++ w/scala/collection/script/Include.class
@@ -1,6 +1,6 @@
 
 Compiled from "Message.scala"
-public class scala.collection.script.Include extends java.lang.Object implements scala.collection.script.Message,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.script.Include extends java.lang.Object implements scala.collection.script.Message,scala.Product,scala.Serializable{
 private final scala.collection.script.Location location;
   Signature: Lscala/collection/script/Location;
 
diff --git c/scala/collection/script/Index.class w/scala/collection/script/Index.class
index d1d8263663..897de0521f 100644
--- c/scala/collection/script/Index.class
+++ w/scala/collection/script/Index.class
@@ -1,6 +1,6 @@
 
 Compiled from "Location.scala"
-public class scala.collection.script.Index extends scala.collection.script.Location implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.script.Index extends scala.collection.script.Location implements scala.Product,scala.Serializable{
 private final int n;
   Signature: I
 
diff --git c/scala/collection/script/NoLo$.class w/scala/collection/script/NoLo$.class
index f7416dee87..6c6c45b8bf 100644
--- c/scala/collection/script/NoLo$.class
+++ w/scala/collection/script/NoLo$.class
@@ -1,6 +1,6 @@
 
 Compiled from "Location.scala"
-public final class scala.collection.script.NoLo$ extends scala.collection.script.Location implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.collection.script.NoLo$ extends scala.collection.script.Location implements scala.Product,scala.Serializable{
 public static final scala.collection.script.NoLo$ MODULE$;
   Signature: Lscala/collection/script/NoLo$;
 
diff --git c/scala/collection/script/Remove.class w/scala/collection/script/Remove.class
index 4ac825fd1e..2e6d2b727b 100644
--- c/scala/collection/script/Remove.class
+++ w/scala/collection/script/Remove.class
@@ -1,6 +1,6 @@
 
 Compiled from "Message.scala"
-public class scala.collection.script.Remove extends java.lang.Object implements scala.collection.script.Message,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.script.Remove extends java.lang.Object implements scala.collection.script.Message,scala.Product,scala.Serializable{
 private final scala.collection.script.Location location;
   Signature: Lscala/collection/script/Location;
 
diff --git c/scala/collection/script/Reset.class w/scala/collection/script/Reset.class
index e022c1b42e..85ee6a5bdc 100644
--- c/scala/collection/script/Reset.class
+++ w/scala/collection/script/Reset.class
@@ -1,6 +1,6 @@
 
 Compiled from "Message.scala"
-public class scala.collection.script.Reset extends java.lang.Object implements scala.collection.script.Message,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.script.Reset extends java.lang.Object implements scala.collection.script.Message,scala.Product,scala.Serializable{
 public scala.collection.script.Reset copy();
   Signature: ()Lscala/collection/script/Reset;
   Code:
diff --git c/scala/collection/script/Start$.class w/scala/collection/script/Start$.class
index 42e1ae757c..856e1b19b1 100644
--- c/scala/collection/script/Start$.class
+++ w/scala/collection/script/Start$.class
@@ -1,6 +1,6 @@
 
 Compiled from "Location.scala"
-public final class scala.collection.script.Start$ extends scala.collection.script.Location implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.collection.script.Start$ extends scala.collection.script.Location implements scala.Product,scala.Serializable{
 public static final scala.collection.script.Start$ MODULE$;
   Signature: Lscala/collection/script/Start$;
 
diff --git c/scala/collection/script/Update.class w/scala/collection/script/Update.class
index 8d3f43ab98..9c57adbca0 100644
--- c/scala/collection/script/Update.class
+++ w/scala/collection/script/Update.class
@@ -1,6 +1,6 @@
 
 Compiled from "Message.scala"
-public class scala.collection.script.Update extends java.lang.Object implements scala.collection.script.Message,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.collection.script.Update extends java.lang.Object implements scala.collection.script.Message,scala.Product,scala.Serializable{
 private final scala.collection.script.Location location;
   Signature: Lscala/collection/script/Location;
 
diff --git c/scala/io/BufferedSource$BufferedLineIterator.class w/scala/io/BufferedSource$BufferedLineIterator.class
index 0a9aed2e0c..9dbf27f3f5 100644
--- c/scala/io/BufferedSource$BufferedLineIterator.class
+++ w/scala/io/BufferedSource$BufferedLineIterator.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //BufferedLineIterator=class scala/io/BufferedSource$BufferedLineIterator of class scala/io/BufferedSource
 
 Compiled from "BufferedSource.scala"
-public class scala.io.BufferedSource$BufferedLineIterator extends scala.collection.AbstractIterator implements scala.collection.Iterator,scala.ScalaObject{
+public class scala.io.BufferedSource$BufferedLineIterator extends scala.collection.AbstractIterator implements scala.collection.Iterator{
 private final java.io.BufferedReader lineReader;
   Signature: Ljava/io/BufferedReader;
 
diff --git c/scala/io/BytePickle$Def.class w/scala/io/BytePickle$Def.class
index 3b54b866f9..f3049c2998 100644
--- c/scala/io/BytePickle$Def.class
+++ w/scala/io/BytePickle$Def.class
@@ -3,7 +3,7 @@ public #= # of #; //Def=class scala/io/BytePickle$Def of class scala/io/BytePick
 public abstract #= # of #; //RefDef=class scala/io/BytePickle$RefDef of class scala/io/BytePickle
 
 Compiled from "BytePickle.scala"
-public class scala.io.BytePickle$Def extends scala.io.BytePickle$RefDef implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.io.BytePickle$Def extends scala.io.BytePickle$RefDef implements scala.Product,scala.Serializable{
 public scala.io.BytePickle$Def copy();
   Signature: ()Lscala/io/BytePickle$Def;
   Code:
diff --git c/scala/io/BytePickle$Ref.class w/scala/io/BytePickle$Ref.class
index 5d7e815b29..8a9a02a964 100644
--- c/scala/io/BytePickle$Ref.class
+++ w/scala/io/BytePickle$Ref.class
@@ -3,7 +3,7 @@ public #= # of #; //Ref=class scala/io/BytePickle$Ref of class scala/io/BytePick
 public abstract #= # of #; //RefDef=class scala/io/BytePickle$RefDef of class scala/io/BytePickle
 
 Compiled from "BytePickle.scala"
-public class scala.io.BytePickle$Ref extends scala.io.BytePickle$RefDef implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.io.BytePickle$Ref extends scala.io.BytePickle$RefDef implements scala.Product,scala.Serializable{
 public scala.io.BytePickle$Ref copy();
   Signature: ()Lscala/io/BytePickle$Ref;
   Code:
diff --git c/scala/io/Codec$.class w/scala/io/Codec$.class
index a8ea9662c7..925e30cec9 100644
--- c/scala/io/Codec$.class
+++ w/scala/io/Codec$.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "Codec.scala"
-public final class scala.io.Codec$ extends java.lang.Object implements scala.io.LowPriorityCodecImplicits,scala.ScalaObject{
+public final class scala.io.Codec$ extends java.lang.Object implements scala.io.LowPriorityCodecImplicits{
 public static final scala.io.Codec$ MODULE$;
   Signature: Lscala/io/Codec$;
 
diff --git c/scala/io/Source$LineIterator.class w/scala/io/Source$LineIterator.class
index a55f64e763..f798e18790 100644
--- c/scala/io/Source$LineIterator.class
+++ w/scala/io/Source$LineIterator.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //LineIterator=class scala/io/Source$LineIterator of class scala/io/Source
 
 Compiled from "Source.scala"
-public class scala.io.Source$LineIterator extends scala.collection.AbstractIterator implements scala.collection.Iterator,scala.ScalaObject{
+public class scala.io.Source$LineIterator extends scala.collection.AbstractIterator implements scala.collection.Iterator{
 private final scala.collection.mutable.StringBuilder sb;
   Signature: Lscala/collection/mutable/StringBuilder;
 
diff --git c/scala/io/Source.class w/scala/io/Source.class
index aec227049e..b9795d781c 100644
--- c/scala/io/Source.class
+++ w/scala/io/Source.class
@@ -8,7 +8,7 @@ public final #= # of #; //RelaxedPositioner$=class scala/io/Source$RelaxedPositi
 public #= # of #; //GroupedIterator=class scala/collection/Iterator$GroupedIterator of class scala/collection/Iterator
 
 Compiled from "Source.scala"
-public abstract class scala.io.Source extends java.lang.Object implements scala.collection.Iterator,scala.ScalaObject{
+public abstract class scala.io.Source extends java.lang.Object implements scala.collection.Iterator{
 private java.lang.String descr;
   Signature: Ljava/lang/String;
 
diff --git c/scala/math/BigDecimal.class w/scala/math/BigDecimal.class
index 5396c88831..15eb137114 100644
--- c/scala/math/BigDecimal.class
+++ w/scala/math/BigDecimal.class
@@ -7,7 +7,7 @@ public #= # of #; //Inclusive=class scala/collection/immutable/NumericRange$Incl
 public final #= # of #; //RoundingMode$=class scala/math/BigDecimal$RoundingMode$ of class scala/math/BigDecimal
 
 Compiled from "BigDecimal.scala"
-public class scala.math.BigDecimal extends scala.math.ScalaNumber implements scala.math.ScalaNumericConversions,scala.Serializable,scala.ScalaObject{
+public class scala.math.BigDecimal extends scala.math.ScalaNumber implements scala.math.ScalaNumericConversions,scala.Serializable{
 private final java.math.BigDecimal bigDecimal;
   Signature: Ljava/math/BigDecimal;
 
diff --git c/scala/math/BigInt.class w/scala/math/BigInt.class
index a31e1b994e..8425d202f8 100644
--- c/scala/math/BigInt.class
+++ w/scala/math/BigInt.class
@@ -4,7 +4,7 @@ public #= # of #; //Exclusive=class scala/collection/immutable/NumericRange$Excl
 public #= # of #; //Inclusive=class scala/collection/immutable/NumericRange$Inclusive of class scala/collection/immutable/NumericRange
 
 Compiled from "BigInt.scala"
-public class scala.math.BigInt extends scala.math.ScalaNumber implements scala.math.ScalaNumericConversions,scala.Serializable,scala.ScalaObject{
+public class scala.math.BigInt extends scala.math.ScalaNumber implements scala.math.ScalaNumericConversions,scala.Serializable{
 private final java.math.BigInteger bigInteger;
   Signature: Ljava/math/BigInteger;
 
diff --git c/scala/math/Equiv$.class w/scala/math/Equiv$.class
index b04b0aba91..bfa3747349 100644
--- c/scala/math/Equiv$.class
+++ w/scala/math/Equiv$.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "Equiv.scala"
-public final class scala.math.Equiv$ extends java.lang.Object implements scala.math.LowPriorityEquiv,scala.ScalaObject{
+public final class scala.math.Equiv$ extends java.lang.Object implements scala.math.LowPriorityEquiv{
 public static final scala.math.Equiv$ MODULE$;
   Signature: Lscala/math/Equiv$;
 
diff --git c/scala/math/Fractional$Implicits$.class w/scala/math/Fractional$Implicits$.class
index 52e3011362..586bd74c9e 100644
--- c/scala/math/Fractional$Implicits$.class
+++ w/scala/math/Fractional$Implicits$.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //ExtraImplicits=class scala/math/Fractional$ExtraImp
 public abstract #= # of #; //ExtraImplicits$class=class scala/math/Fractional$ExtraImplicits$class of class scala/math/Fractional
 
 Compiled from "Fractional.scala"
-public final class scala.math.Fractional$Implicits$ extends java.lang.Object implements scala.math.Fractional$ExtraImplicits,scala.ScalaObject{
+public final class scala.math.Fractional$Implicits$ extends java.lang.Object implements scala.math.Fractional$ExtraImplicits{
 public static final scala.math.Fractional$Implicits$ MODULE$;
   Signature: Lscala/math/Fractional$Implicits$;
 
diff --git c/scala/math/Fractional.class w/scala/math/Fractional.class
index 590304db88..fb797a7fdf 100644
--- c/scala/math/Fractional.class
+++ w/scala/math/Fractional.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //ExtraImplicits=class scala/math/Fractional$ExtraImp
 public abstract #= # of #; //ExtraImplicits$class=class scala/math/Fractional$ExtraImplicits$class of class scala/math/Fractional
 
 Compiled from "Fractional.scala"
-public interface scala.math.Fractional extends scala.math.Numeric,scala.ScalaObject{
+public interface scala.math.Fractional extends scala.math.Numeric{
 public abstract java.lang.Object div(java.lang.Object, java.lang.Object);
   Signature: (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git c/scala/math/Integral$Implicits$.class w/scala/math/Integral$Implicits$.class
index 715551dcd3..9b3237d5a0 100644
--- c/scala/math/Integral$Implicits$.class
+++ w/scala/math/Integral$Implicits$.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //ExtraImplicits=class scala/math/Integral$ExtraImpli
 public abstract #= # of #; //ExtraImplicits$class=class scala/math/Integral$ExtraImplicits$class of class scala/math/Integral
 
 Compiled from "Integral.scala"
-public final class scala.math.Integral$Implicits$ extends java.lang.Object implements scala.math.Integral$ExtraImplicits,scala.ScalaObject{
+public final class scala.math.Integral$Implicits$ extends java.lang.Object implements scala.math.Integral$ExtraImplicits{
 public static final scala.math.Integral$Implicits$ MODULE$;
   Signature: Lscala/math/Integral$Implicits$;
 
diff --git c/scala/math/Integral.class w/scala/math/Integral.class
index 7b7aafa891..3e4013481d 100644
--- c/scala/math/Integral.class
+++ w/scala/math/Integral.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //ExtraImplicits=class scala/math/Integral$ExtraImpli
 public abstract #= # of #; //ExtraImplicits$class=class scala/math/Integral$ExtraImplicits$class of class scala/math/Integral
 
 Compiled from "Integral.scala"
-public interface scala.math.Integral extends scala.math.Numeric,scala.ScalaObject{
+public interface scala.math.Integral extends scala.math.Numeric{
 public abstract java.lang.Object quot(java.lang.Object, java.lang.Object);
   Signature: (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git c/scala/math/Numeric$BigDecimalAsIfIntegral$.class w/scala/math/Numeric$BigDecimalAsIfIntegral$.class
index e20109a7c2..cea49763db 100644
--- c/scala/math/Numeric$BigDecimalAsIfIntegral$.class
+++ w/scala/math/Numeric$BigDecimalAsIfIntegral$.class
@@ -11,7 +11,7 @@ public abstract #= # of #; //BigDecimalAsIfIntegral$class=class scala/math/Numer
 public abstract #= # of #; //BigDecimalIsConflicted$class=class scala/math/Numeric$BigDecimalIsConflicted$class of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public final class scala.math.Numeric$BigDecimalAsIfIntegral$ extends java.lang.Object implements scala.math.Numeric$BigDecimalAsIfIntegral,scala.math.Ordering$BigDecimalOrdering,scala.ScalaObject{
+public final class scala.math.Numeric$BigDecimalAsIfIntegral$ extends java.lang.Object implements scala.math.Numeric$BigDecimalAsIfIntegral,scala.math.Ordering$BigDecimalOrdering{
 public static final scala.math.Numeric$BigDecimalAsIfIntegral$ MODULE$;
   Signature: Lscala/math/Numeric$BigDecimalAsIfIntegral$;
 
diff --git c/scala/math/Numeric$BigDecimalAsIfIntegral.class w/scala/math/Numeric$BigDecimalAsIfIntegral.class
index 2682a1683d..04c53c89e7 100644
--- c/scala/math/Numeric$BigDecimalAsIfIntegral.class
+++ w/scala/math/Numeric$BigDecimalAsIfIntegral.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //BigDecimalAsIfIntegral=class scala/math/Numeric$Big
 public abstract #= # of #; //BigDecimalIsConflicted=class scala/math/Numeric$BigDecimalIsConflicted of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public interface scala.math.Numeric$BigDecimalAsIfIntegral extends scala.math.Numeric$BigDecimalIsConflicted,scala.math.Integral,scala.ScalaObject{
+public interface scala.math.Numeric$BigDecimalAsIfIntegral extends scala.math.Numeric$BigDecimalIsConflicted,scala.math.Integral{
 public abstract scala.math.BigDecimal quot(scala.math.BigDecimal, scala.math.BigDecimal);
   Signature: (Lscala/math/BigDecimal;Lscala/math/BigDecimal;)Lscala/math/BigDecimal;
 
diff --git c/scala/math/Numeric$BigDecimalIsConflicted.class w/scala/math/Numeric$BigDecimalIsConflicted.class
index 130967f868..68797693d9 100644
--- c/scala/math/Numeric$BigDecimalIsConflicted.class
+++ w/scala/math/Numeric$BigDecimalIsConflicted.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //BigDecimalIsConflicted=class scala/math/Numeric$BigDecimalIsConflicted of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public interface scala.math.Numeric$BigDecimalIsConflicted extends scala.math.Numeric,scala.ScalaObject{
+public interface scala.math.Numeric$BigDecimalIsConflicted extends scala.math.Numeric{
 public abstract scala.math.BigDecimal plus(scala.math.BigDecimal, scala.math.BigDecimal);
   Signature: (Lscala/math/BigDecimal;Lscala/math/BigDecimal;)Lscala/math/BigDecimal;
 
diff --git c/scala/math/Numeric$BigDecimalIsFractional$.class w/scala/math/Numeric$BigDecimalIsFractional$.class
index 2e8a2a6e59..d0519e9de4 100644
--- c/scala/math/Numeric$BigDecimalIsFractional$.class
+++ w/scala/math/Numeric$BigDecimalIsFractional$.class
@@ -11,7 +11,7 @@ public abstract #= # of #; //BigDecimalIsFractional$class=class scala/math/Numer
 public abstract #= # of #; //BigDecimalIsConflicted$class=class scala/math/Numeric$BigDecimalIsConflicted$class of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public final class scala.math.Numeric$BigDecimalIsFractional$ extends java.lang.Object implements scala.math.Numeric$BigDecimalIsFractional,scala.math.Ordering$BigDecimalOrdering,scala.ScalaObject{
+public final class scala.math.Numeric$BigDecimalIsFractional$ extends java.lang.Object implements scala.math.Numeric$BigDecimalIsFractional,scala.math.Ordering$BigDecimalOrdering{
 public static final scala.math.Numeric$BigDecimalIsFractional$ MODULE$;
   Signature: Lscala/math/Numeric$BigDecimalIsFractional$;
 
diff --git c/scala/math/Numeric$BigDecimalIsFractional.class w/scala/math/Numeric$BigDecimalIsFractional.class
index 0b04f72804..9cdbe18a5d 100644
--- c/scala/math/Numeric$BigDecimalIsFractional.class
+++ w/scala/math/Numeric$BigDecimalIsFractional.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //BigDecimalIsFractional=class scala/math/Numeric$Big
 public abstract #= # of #; //BigDecimalIsConflicted=class scala/math/Numeric$BigDecimalIsConflicted of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public interface scala.math.Numeric$BigDecimalIsFractional extends scala.math.Numeric$BigDecimalIsConflicted,scala.math.Fractional,scala.ScalaObject{
+public interface scala.math.Numeric$BigDecimalIsFractional extends scala.math.Numeric$BigDecimalIsConflicted,scala.math.Fractional{
 public abstract scala.math.BigDecimal div(scala.math.BigDecimal, scala.math.BigDecimal);
   Signature: (Lscala/math/BigDecimal;Lscala/math/BigDecimal;)Lscala/math/BigDecimal;
 
diff --git c/scala/math/Numeric$BigIntIsIntegral$.class w/scala/math/Numeric$BigIntIsIntegral$.class
index 9a8c0089ab..aca8d283f8 100644
--- c/scala/math/Numeric$BigIntIsIntegral$.class
+++ w/scala/math/Numeric$BigIntIsIntegral$.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //BigIntOrdering$class=class scala/math/Ordering$BigI
 public abstract #= # of #; //BigIntIsIntegral$class=class scala/math/Numeric$BigIntIsIntegral$class of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public final class scala.math.Numeric$BigIntIsIntegral$ extends java.lang.Object implements scala.math.Numeric$BigIntIsIntegral,scala.math.Ordering$BigIntOrdering,scala.ScalaObject{
+public final class scala.math.Numeric$BigIntIsIntegral$ extends java.lang.Object implements scala.math.Numeric$BigIntIsIntegral,scala.math.Ordering$BigIntOrdering{
 public static final scala.math.Numeric$BigIntIsIntegral$ MODULE$;
   Signature: Lscala/math/Numeric$BigIntIsIntegral$;
 
diff --git c/scala/math/Numeric$BigIntIsIntegral.class w/scala/math/Numeric$BigIntIsIntegral.class
index 8b6e248c68..fd628921b9 100644
--- c/scala/math/Numeric$BigIntIsIntegral.class
+++ w/scala/math/Numeric$BigIntIsIntegral.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //BigIntIsIntegral=class scala/math/Numeric$BigIntIsIntegral of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public interface scala.math.Numeric$BigIntIsIntegral extends scala.math.Integral,scala.ScalaObject{
+public interface scala.math.Numeric$BigIntIsIntegral extends scala.math.Integral{
 public abstract scala.math.BigInt plus(scala.math.BigInt, scala.math.BigInt);
   Signature: (Lscala/math/BigInt;Lscala/math/BigInt;)Lscala/math/BigInt;
 
diff --git c/scala/math/Numeric$ByteIsIntegral$.class w/scala/math/Numeric$ByteIsIntegral$.class
index 40a8bbf5b7..cf8888d6ed 100644
--- c/scala/math/Numeric$ByteIsIntegral$.class
+++ w/scala/math/Numeric$ByteIsIntegral$.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //ByteOrdering$class=class scala/math/Ordering$ByteOr
 public abstract #= # of #; //ByteIsIntegral$class=class scala/math/Numeric$ByteIsIntegral$class of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public final class scala.math.Numeric$ByteIsIntegral$ extends java.lang.Object implements scala.math.Numeric$ByteIsIntegral,scala.math.Ordering$ByteOrdering,scala.ScalaObject{
+public final class scala.math.Numeric$ByteIsIntegral$ extends java.lang.Object implements scala.math.Numeric$ByteIsIntegral,scala.math.Ordering$ByteOrdering{
 public static final scala.math.Numeric$ByteIsIntegral$ MODULE$;
   Signature: Lscala/math/Numeric$ByteIsIntegral$;
 
diff --git c/scala/math/Numeric$ByteIsIntegral.class w/scala/math/Numeric$ByteIsIntegral.class
index 22a6f1e9fd..db3dca7ff4 100644
--- c/scala/math/Numeric$ByteIsIntegral.class
+++ w/scala/math/Numeric$ByteIsIntegral.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //ByteIsIntegral=class scala/math/Numeric$ByteIsIntegral of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public interface scala.math.Numeric$ByteIsIntegral extends scala.math.Integral,scala.ScalaObject{
+public interface scala.math.Numeric$ByteIsIntegral extends scala.math.Integral{
 public abstract byte plus(byte, byte);
   Signature: (BB)B
 
diff --git c/scala/math/Numeric$CharIsIntegral$.class w/scala/math/Numeric$CharIsIntegral$.class
index e5884368df..e576e95f76 100644
--- c/scala/math/Numeric$CharIsIntegral$.class
+++ w/scala/math/Numeric$CharIsIntegral$.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //CharOrdering$class=class scala/math/Ordering$CharOr
 public abstract #= # of #; //CharIsIntegral$class=class scala/math/Numeric$CharIsIntegral$class of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public final class scala.math.Numeric$CharIsIntegral$ extends java.lang.Object implements scala.math.Numeric$CharIsIntegral,scala.math.Ordering$CharOrdering,scala.ScalaObject{
+public final class scala.math.Numeric$CharIsIntegral$ extends java.lang.Object implements scala.math.Numeric$CharIsIntegral,scala.math.Ordering$CharOrdering{
 public static final scala.math.Numeric$CharIsIntegral$ MODULE$;
   Signature: Lscala/math/Numeric$CharIsIntegral$;
 
diff --git c/scala/math/Numeric$CharIsIntegral.class w/scala/math/Numeric$CharIsIntegral.class
index fff639cb87..e28911bf8a 100644
--- c/scala/math/Numeric$CharIsIntegral.class
+++ w/scala/math/Numeric$CharIsIntegral.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //CharIsIntegral=class scala/math/Numeric$CharIsIntegral of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public interface scala.math.Numeric$CharIsIntegral extends scala.math.Integral,scala.ScalaObject{
+public interface scala.math.Numeric$CharIsIntegral extends scala.math.Integral{
 public abstract char plus(char, char);
   Signature: (CC)C
 
diff --git c/scala/math/Numeric$DoubleAsIfIntegral$.class w/scala/math/Numeric$DoubleAsIfIntegral$.class
index 2da62fcbce..8541f432d6 100644
--- c/scala/math/Numeric$DoubleAsIfIntegral$.class
+++ w/scala/math/Numeric$DoubleAsIfIntegral$.class
@@ -11,7 +11,7 @@ public abstract #= # of #; //DoubleAsIfIntegral$class=class scala/math/Numeric$D
 public abstract #= # of #; //DoubleIsConflicted$class=class scala/math/Numeric$DoubleIsConflicted$class of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public final class scala.math.Numeric$DoubleAsIfIntegral$ extends java.lang.Object implements scala.math.Numeric$DoubleAsIfIntegral,scala.math.Ordering$DoubleOrdering,scala.ScalaObject{
+public final class scala.math.Numeric$DoubleAsIfIntegral$ extends java.lang.Object implements scala.math.Numeric$DoubleAsIfIntegral,scala.math.Ordering$DoubleOrdering{
 public static final scala.math.Numeric$DoubleAsIfIntegral$ MODULE$;
   Signature: Lscala/math/Numeric$DoubleAsIfIntegral$;
 
diff --git c/scala/math/Numeric$DoubleAsIfIntegral.class w/scala/math/Numeric$DoubleAsIfIntegral.class
index 3c1789531c..d17a4023b7 100644
--- c/scala/math/Numeric$DoubleAsIfIntegral.class
+++ w/scala/math/Numeric$DoubleAsIfIntegral.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //DoubleAsIfIntegral=class scala/math/Numeric$DoubleA
 public abstract #= # of #; //DoubleIsConflicted=class scala/math/Numeric$DoubleIsConflicted of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public interface scala.math.Numeric$DoubleAsIfIntegral extends scala.math.Numeric$DoubleIsConflicted,scala.math.Integral,scala.ScalaObject{
+public interface scala.math.Numeric$DoubleAsIfIntegral extends scala.math.Numeric$DoubleIsConflicted,scala.math.Integral{
 public abstract double quot(double, double);
   Signature: (DD)D
 
diff --git c/scala/math/Numeric$DoubleIsConflicted.class w/scala/math/Numeric$DoubleIsConflicted.class
index ff64258630..d37cf44f14 100644
--- c/scala/math/Numeric$DoubleIsConflicted.class
+++ w/scala/math/Numeric$DoubleIsConflicted.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //DoubleIsConflicted=class scala/math/Numeric$DoubleIsConflicted of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public interface scala.math.Numeric$DoubleIsConflicted extends scala.math.Numeric,scala.ScalaObject{
+public interface scala.math.Numeric$DoubleIsConflicted extends scala.math.Numeric{
 public abstract double plus(double, double);
   Signature: (DD)D
 
diff --git c/scala/math/Numeric$DoubleIsFractional$.class w/scala/math/Numeric$DoubleIsFractional$.class
index eb49b2ac68..376da0d85a 100644
--- c/scala/math/Numeric$DoubleIsFractional$.class
+++ w/scala/math/Numeric$DoubleIsFractional$.class
@@ -11,7 +11,7 @@ public abstract #= # of #; //DoubleIsFractional$class=class scala/math/Numeric$D
 public abstract #= # of #; //DoubleIsConflicted$class=class scala/math/Numeric$DoubleIsConflicted$class of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public final class scala.math.Numeric$DoubleIsFractional$ extends java.lang.Object implements scala.math.Numeric$DoubleIsFractional,scala.math.Ordering$DoubleOrdering,scala.ScalaObject{
+public final class scala.math.Numeric$DoubleIsFractional$ extends java.lang.Object implements scala.math.Numeric$DoubleIsFractional,scala.math.Ordering$DoubleOrdering{
 public static final scala.math.Numeric$DoubleIsFractional$ MODULE$;
   Signature: Lscala/math/Numeric$DoubleIsFractional$;
 
diff --git c/scala/math/Numeric$DoubleIsFractional.class w/scala/math/Numeric$DoubleIsFractional.class
index df489fd16f..0fb01d6f57 100644
--- c/scala/math/Numeric$DoubleIsFractional.class
+++ w/scala/math/Numeric$DoubleIsFractional.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //DoubleIsFractional=class scala/math/Numeric$DoubleI
 public abstract #= # of #; //DoubleIsConflicted=class scala/math/Numeric$DoubleIsConflicted of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public interface scala.math.Numeric$DoubleIsFractional extends scala.math.Numeric$DoubleIsConflicted,scala.math.Fractional,scala.ScalaObject{
+public interface scala.math.Numeric$DoubleIsFractional extends scala.math.Numeric$DoubleIsConflicted,scala.math.Fractional{
 public abstract double div(double, double);
   Signature: (DD)D
 
diff --git c/scala/math/Numeric$FloatAsIfIntegral$.class w/scala/math/Numeric$FloatAsIfIntegral$.class
index 628c059800..e43991aeb2 100644
--- c/scala/math/Numeric$FloatAsIfIntegral$.class
+++ w/scala/math/Numeric$FloatAsIfIntegral$.class
@@ -11,7 +11,7 @@ public abstract #= # of #; //FloatAsIfIntegral$class=class scala/math/Numeric$Fl
 public abstract #= # of #; //FloatIsConflicted$class=class scala/math/Numeric$FloatIsConflicted$class of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public final class scala.math.Numeric$FloatAsIfIntegral$ extends java.lang.Object implements scala.math.Numeric$FloatAsIfIntegral,scala.math.Ordering$FloatOrdering,scala.ScalaObject{
+public final class scala.math.Numeric$FloatAsIfIntegral$ extends java.lang.Object implements scala.math.Numeric$FloatAsIfIntegral,scala.math.Ordering$FloatOrdering{
 public static final scala.math.Numeric$FloatAsIfIntegral$ MODULE$;
   Signature: Lscala/math/Numeric$FloatAsIfIntegral$;
 
diff --git c/scala/math/Numeric$FloatAsIfIntegral.class w/scala/math/Numeric$FloatAsIfIntegral.class
index e70d7f0902..05f8a00496 100644
--- c/scala/math/Numeric$FloatAsIfIntegral.class
+++ w/scala/math/Numeric$FloatAsIfIntegral.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //FloatAsIfIntegral=class scala/math/Numeric$FloatAsI
 public abstract #= # of #; //FloatIsConflicted=class scala/math/Numeric$FloatIsConflicted of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public interface scala.math.Numeric$FloatAsIfIntegral extends scala.math.Numeric$FloatIsConflicted,scala.math.Integral,scala.ScalaObject{
+public interface scala.math.Numeric$FloatAsIfIntegral extends scala.math.Numeric$FloatIsConflicted,scala.math.Integral{
 public abstract float quot(float, float);
   Signature: (FF)F
 
diff --git c/scala/math/Numeric$FloatIsConflicted.class w/scala/math/Numeric$FloatIsConflicted.class
index a52b9a5dba..a5f44b725a 100644
--- c/scala/math/Numeric$FloatIsConflicted.class
+++ w/scala/math/Numeric$FloatIsConflicted.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //FloatIsConflicted=class scala/math/Numeric$FloatIsConflicted of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public interface scala.math.Numeric$FloatIsConflicted extends scala.math.Numeric,scala.ScalaObject{
+public interface scala.math.Numeric$FloatIsConflicted extends scala.math.Numeric{
 public abstract float plus(float, float);
   Signature: (FF)F
 
diff --git c/scala/math/Numeric$FloatIsFractional$.class w/scala/math/Numeric$FloatIsFractional$.class
index a99a5cb007..ce7f83f4b4 100644
--- c/scala/math/Numeric$FloatIsFractional$.class
+++ w/scala/math/Numeric$FloatIsFractional$.class
@@ -11,7 +11,7 @@ public abstract #= # of #; //FloatIsFractional$class=class scala/math/Numeric$Fl
 public abstract #= # of #; //FloatIsConflicted$class=class scala/math/Numeric$FloatIsConflicted$class of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public final class scala.math.Numeric$FloatIsFractional$ extends java.lang.Object implements scala.math.Numeric$FloatIsFractional,scala.math.Ordering$FloatOrdering,scala.ScalaObject{
+public final class scala.math.Numeric$FloatIsFractional$ extends java.lang.Object implements scala.math.Numeric$FloatIsFractional,scala.math.Ordering$FloatOrdering{
 public static final scala.math.Numeric$FloatIsFractional$ MODULE$;
   Signature: Lscala/math/Numeric$FloatIsFractional$;
 
diff --git c/scala/math/Numeric$FloatIsFractional.class w/scala/math/Numeric$FloatIsFractional.class
index ee543b1efa..232d3b4a57 100644
--- c/scala/math/Numeric$FloatIsFractional.class
+++ w/scala/math/Numeric$FloatIsFractional.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //FloatIsFractional=class scala/math/Numeric$FloatIsF
 public abstract #= # of #; //FloatIsConflicted=class scala/math/Numeric$FloatIsConflicted of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public interface scala.math.Numeric$FloatIsFractional extends scala.math.Numeric$FloatIsConflicted,scala.math.Fractional,scala.ScalaObject{
+public interface scala.math.Numeric$FloatIsFractional extends scala.math.Numeric$FloatIsConflicted,scala.math.Fractional{
 public abstract float div(float, float);
   Signature: (FF)F
 
diff --git c/scala/math/Numeric$Implicits$.class w/scala/math/Numeric$Implicits$.class
index d5e841d356..9eb3efe060 100644
--- c/scala/math/Numeric$Implicits$.class
+++ w/scala/math/Numeric$Implicits$.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //ExtraImplicits=class scala/math/Numeric$ExtraImplic
 public abstract #= # of #; //ExtraImplicits$class=class scala/math/Numeric$ExtraImplicits$class of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public final class scala.math.Numeric$Implicits$ extends java.lang.Object implements scala.math.Numeric$ExtraImplicits,scala.ScalaObject{
+public final class scala.math.Numeric$Implicits$ extends java.lang.Object implements scala.math.Numeric$ExtraImplicits{
 public static final scala.math.Numeric$Implicits$ MODULE$;
   Signature: Lscala/math/Numeric$Implicits$;
 
diff --git c/scala/math/Numeric$IntIsIntegral$.class w/scala/math/Numeric$IntIsIntegral$.class
index cab1bdd000..249ed6894a 100644
--- c/scala/math/Numeric$IntIsIntegral$.class
+++ w/scala/math/Numeric$IntIsIntegral$.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //IntOrdering$class=class scala/math/Ordering$IntOrde
 public abstract #= # of #; //IntIsIntegral$class=class scala/math/Numeric$IntIsIntegral$class of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public final class scala.math.Numeric$IntIsIntegral$ extends java.lang.Object implements scala.math.Numeric$IntIsIntegral,scala.math.Ordering$IntOrdering,scala.ScalaObject{
+public final class scala.math.Numeric$IntIsIntegral$ extends java.lang.Object implements scala.math.Numeric$IntIsIntegral,scala.math.Ordering$IntOrdering{
 public static final scala.math.Numeric$IntIsIntegral$ MODULE$;
   Signature: Lscala/math/Numeric$IntIsIntegral$;
 
diff --git c/scala/math/Numeric$IntIsIntegral.class w/scala/math/Numeric$IntIsIntegral.class
index 45c4b0ac1f..e54c0b530a 100644
--- c/scala/math/Numeric$IntIsIntegral.class
+++ w/scala/math/Numeric$IntIsIntegral.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //IntIsIntegral=class scala/math/Numeric$IntIsIntegral of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public interface scala.math.Numeric$IntIsIntegral extends scala.math.Integral,scala.ScalaObject{
+public interface scala.math.Numeric$IntIsIntegral extends scala.math.Integral{
 public abstract int plus(int, int);
   Signature: (II)I
 
diff --git c/scala/math/Numeric$LongIsIntegral$.class w/scala/math/Numeric$LongIsIntegral$.class
index 9178e4469c..df5ee53d72 100644
--- c/scala/math/Numeric$LongIsIntegral$.class
+++ w/scala/math/Numeric$LongIsIntegral$.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //LongOrdering$class=class scala/math/Ordering$LongOr
 public abstract #= # of #; //LongIsIntegral$class=class scala/math/Numeric$LongIsIntegral$class of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public final class scala.math.Numeric$LongIsIntegral$ extends java.lang.Object implements scala.math.Numeric$LongIsIntegral,scala.math.Ordering$LongOrdering,scala.ScalaObject{
+public final class scala.math.Numeric$LongIsIntegral$ extends java.lang.Object implements scala.math.Numeric$LongIsIntegral,scala.math.Ordering$LongOrdering{
 public static final scala.math.Numeric$LongIsIntegral$ MODULE$;
   Signature: Lscala/math/Numeric$LongIsIntegral$;
 
diff --git c/scala/math/Numeric$LongIsIntegral.class w/scala/math/Numeric$LongIsIntegral.class
index 4ded909d10..ae1c290bce 100644
--- c/scala/math/Numeric$LongIsIntegral.class
+++ w/scala/math/Numeric$LongIsIntegral.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //LongIsIntegral=class scala/math/Numeric$LongIsIntegral of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public interface scala.math.Numeric$LongIsIntegral extends scala.math.Integral,scala.ScalaObject{
+public interface scala.math.Numeric$LongIsIntegral extends scala.math.Integral{
 public abstract long plus(long, long);
   Signature: (JJ)J
 
diff --git c/scala/math/Numeric$ShortIsIntegral$.class w/scala/math/Numeric$ShortIsIntegral$.class
index 3272f07286..684c367706 100644
--- c/scala/math/Numeric$ShortIsIntegral$.class
+++ w/scala/math/Numeric$ShortIsIntegral$.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //ShortOrdering$class=class scala/math/Ordering$Short
 public abstract #= # of #; //ShortIsIntegral$class=class scala/math/Numeric$ShortIsIntegral$class of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public final class scala.math.Numeric$ShortIsIntegral$ extends java.lang.Object implements scala.math.Numeric$ShortIsIntegral,scala.math.Ordering$ShortOrdering,scala.ScalaObject{
+public final class scala.math.Numeric$ShortIsIntegral$ extends java.lang.Object implements scala.math.Numeric$ShortIsIntegral,scala.math.Ordering$ShortOrdering{
 public static final scala.math.Numeric$ShortIsIntegral$ MODULE$;
   Signature: Lscala/math/Numeric$ShortIsIntegral$;
 
diff --git c/scala/math/Numeric$ShortIsIntegral.class w/scala/math/Numeric$ShortIsIntegral.class
index bed578decf..1289a9747a 100644
--- c/scala/math/Numeric$ShortIsIntegral.class
+++ w/scala/math/Numeric$ShortIsIntegral.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //ShortIsIntegral=class scala/math/Numeric$ShortIsIntegral of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public interface scala.math.Numeric$ShortIsIntegral extends scala.math.Integral,scala.ScalaObject{
+public interface scala.math.Numeric$ShortIsIntegral extends scala.math.Integral{
 public abstract short plus(short, short);
   Signature: (SS)S
 
diff --git c/scala/math/Numeric.class w/scala/math/Numeric.class
index fd538e5e5d..4b9b66bbbc 100644
--- c/scala/math/Numeric.class
+++ w/scala/math/Numeric.class
@@ -47,7 +47,7 @@ public abstract #= # of #; //BigDecimalIsConflicted$class=class scala/math/Numer
 public abstract #= # of #; //BigDecimalIsFractional$class=class scala/math/Numeric$BigDecimalIsFractional$class of class scala/math/Numeric
 
 Compiled from "Numeric.scala"
-public interface scala.math.Numeric extends scala.math.Ordering,scala.ScalaObject{
+public interface scala.math.Numeric extends scala.math.Ordering{
 public abstract java.lang.Object plus(java.lang.Object, java.lang.Object);
   Signature: (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git c/scala/math/Ordering$.class w/scala/math/Ordering$.class
index 148a879a25..1354ab425d 100644
--- c/scala/math/Ordering$.class
+++ w/scala/math/Ordering$.class
@@ -43,7 +43,7 @@ public abstract #= # of #; //BooleanOrdering$class=class scala/math/Ordering$Boo
 public abstract #= # of #; //BigDecimalOrdering$class=class scala/math/Ordering$BigDecimalOrdering$class of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public final class scala.math.Ordering$ extends java.lang.Object implements scala.math.LowPriorityOrderingImplicits,scala.ScalaObject,scala.Serializable{
+public final class scala.math.Ordering$ extends java.lang.Object implements scala.math.LowPriorityOrderingImplicits,scala.Serializable{
 public static final scala.math.Ordering$ MODULE$;
   Signature: Lscala/math/Ordering$;
 
diff --git c/scala/math/Ordering$BigDecimal$.class w/scala/math/Ordering$BigDecimal$.class
index 7253778c16..a2114a5ce4 100644
--- c/scala/math/Ordering$BigDecimal$.class
+++ w/scala/math/Ordering$BigDecimal$.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //BigDecimalOrdering=class scala/math/Ordering$BigDec
 public abstract #= # of #; //BigDecimalOrdering$class=class scala/math/Ordering$BigDecimalOrdering$class of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public final class scala.math.Ordering$BigDecimal$ extends java.lang.Object implements scala.math.Ordering$BigDecimalOrdering,scala.ScalaObject{
+public final class scala.math.Ordering$BigDecimal$ extends java.lang.Object implements scala.math.Ordering$BigDecimalOrdering{
 public static final scala.math.Ordering$BigDecimal$ MODULE$;
   Signature: Lscala/math/Ordering$BigDecimal$;
 
diff --git c/scala/math/Ordering$BigDecimalOrdering.class w/scala/math/Ordering$BigDecimalOrdering.class
index 9382045620..c4b6dfefa3 100644
--- c/scala/math/Ordering$BigDecimalOrdering.class
+++ w/scala/math/Ordering$BigDecimalOrdering.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //BigDecimalOrdering=class scala/math/Ordering$BigDecimalOrdering of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public interface scala.math.Ordering$BigDecimalOrdering extends scala.math.Ordering,scala.ScalaObject{
+public interface scala.math.Ordering$BigDecimalOrdering extends scala.math.Ordering{
 public abstract int compare(scala.math.BigDecimal, scala.math.BigDecimal);
   Signature: (Lscala/math/BigDecimal;Lscala/math/BigDecimal;)I
 
diff --git c/scala/math/Ordering$BigInt$.class w/scala/math/Ordering$BigInt$.class
index 9394387804..65a5f00971 100644
--- c/scala/math/Ordering$BigInt$.class
+++ w/scala/math/Ordering$BigInt$.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //BigIntOrdering=class scala/math/Ordering$BigIntOrde
 public abstract #= # of #; //BigIntOrdering$class=class scala/math/Ordering$BigIntOrdering$class of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public final class scala.math.Ordering$BigInt$ extends java.lang.Object implements scala.math.Ordering$BigIntOrdering,scala.ScalaObject{
+public final class scala.math.Ordering$BigInt$ extends java.lang.Object implements scala.math.Ordering$BigIntOrdering{
 public static final scala.math.Ordering$BigInt$ MODULE$;
   Signature: Lscala/math/Ordering$BigInt$;
 
diff --git c/scala/math/Ordering$BigIntOrdering.class w/scala/math/Ordering$BigIntOrdering.class
index f449419312..d66e636006 100644
--- c/scala/math/Ordering$BigIntOrdering.class
+++ w/scala/math/Ordering$BigIntOrdering.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //BigIntOrdering=class scala/math/Ordering$BigIntOrdering of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public interface scala.math.Ordering$BigIntOrdering extends scala.math.Ordering,scala.ScalaObject{
+public interface scala.math.Ordering$BigIntOrdering extends scala.math.Ordering{
 public abstract int compare(scala.math.BigInt, scala.math.BigInt);
   Signature: (Lscala/math/BigInt;Lscala/math/BigInt;)I
 
diff --git c/scala/math/Ordering$Boolean$.class w/scala/math/Ordering$Boolean$.class
index 2e732a5fe6..339cb18544 100644
--- c/scala/math/Ordering$Boolean$.class
+++ w/scala/math/Ordering$Boolean$.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //BooleanOrdering=class scala/math/Ordering$BooleanOr
 public abstract #= # of #; //BooleanOrdering$class=class scala/math/Ordering$BooleanOrdering$class of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public final class scala.math.Ordering$Boolean$ extends java.lang.Object implements scala.math.Ordering$BooleanOrdering,scala.ScalaObject{
+public final class scala.math.Ordering$Boolean$ extends java.lang.Object implements scala.math.Ordering$BooleanOrdering{
 public static final scala.math.Ordering$Boolean$ MODULE$;
   Signature: Lscala/math/Ordering$Boolean$;
 
diff --git c/scala/math/Ordering$BooleanOrdering.class w/scala/math/Ordering$BooleanOrdering.class
index cb4664d4cd..9312e5f6e1 100644
--- c/scala/math/Ordering$BooleanOrdering.class
+++ w/scala/math/Ordering$BooleanOrdering.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //BooleanOrdering=class scala/math/Ordering$BooleanOrdering of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public interface scala.math.Ordering$BooleanOrdering extends scala.math.Ordering,scala.ScalaObject{
+public interface scala.math.Ordering$BooleanOrdering extends scala.math.Ordering{
 public abstract int compare(boolean, boolean);
   Signature: (ZZ)I
 
diff --git c/scala/math/Ordering$Byte$.class w/scala/math/Ordering$Byte$.class
index 1d3b32da11..9e7b0397a9 100644
--- c/scala/math/Ordering$Byte$.class
+++ w/scala/math/Ordering$Byte$.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //ByteOrdering=class scala/math/Ordering$ByteOrdering
 public abstract #= # of #; //ByteOrdering$class=class scala/math/Ordering$ByteOrdering$class of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public final class scala.math.Ordering$Byte$ extends java.lang.Object implements scala.math.Ordering$ByteOrdering,scala.ScalaObject{
+public final class scala.math.Ordering$Byte$ extends java.lang.Object implements scala.math.Ordering$ByteOrdering{
 public static final scala.math.Ordering$Byte$ MODULE$;
   Signature: Lscala/math/Ordering$Byte$;
 
diff --git c/scala/math/Ordering$ByteOrdering.class w/scala/math/Ordering$ByteOrdering.class
index 39d1fa5a11..0763b31f09 100644
--- c/scala/math/Ordering$ByteOrdering.class
+++ w/scala/math/Ordering$ByteOrdering.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //ByteOrdering=class scala/math/Ordering$ByteOrdering of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public interface scala.math.Ordering$ByteOrdering extends scala.math.Ordering,scala.ScalaObject{
+public interface scala.math.Ordering$ByteOrdering extends scala.math.Ordering{
 public abstract int compare(byte, byte);
   Signature: (BB)I
 
diff --git c/scala/math/Ordering$Char$.class w/scala/math/Ordering$Char$.class
index e20a83e3d1..1ed3b301e5 100644
--- c/scala/math/Ordering$Char$.class
+++ w/scala/math/Ordering$Char$.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //CharOrdering=class scala/math/Ordering$CharOrdering
 public abstract #= # of #; //CharOrdering$class=class scala/math/Ordering$CharOrdering$class of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public final class scala.math.Ordering$Char$ extends java.lang.Object implements scala.math.Ordering$CharOrdering,scala.ScalaObject{
+public final class scala.math.Ordering$Char$ extends java.lang.Object implements scala.math.Ordering$CharOrdering{
 public static final scala.math.Ordering$Char$ MODULE$;
   Signature: Lscala/math/Ordering$Char$;
 
diff --git c/scala/math/Ordering$CharOrdering.class w/scala/math/Ordering$CharOrdering.class
index b539040d69..f7a7ef610c 100644
--- c/scala/math/Ordering$CharOrdering.class
+++ w/scala/math/Ordering$CharOrdering.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //CharOrdering=class scala/math/Ordering$CharOrdering of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public interface scala.math.Ordering$CharOrdering extends scala.math.Ordering,scala.ScalaObject{
+public interface scala.math.Ordering$CharOrdering extends scala.math.Ordering{
 public abstract int compare(char, char);
   Signature: (CC)I
 
diff --git c/scala/math/Ordering$Double$.class w/scala/math/Ordering$Double$.class
index 1491f78bac..b4af64ca23 100644
--- c/scala/math/Ordering$Double$.class
+++ w/scala/math/Ordering$Double$.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //DoubleOrdering=class scala/math/Ordering$DoubleOrde
 public abstract #= # of #; //DoubleOrdering$class=class scala/math/Ordering$DoubleOrdering$class of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public final class scala.math.Ordering$Double$ extends java.lang.Object implements scala.math.Ordering$DoubleOrdering,scala.ScalaObject{
+public final class scala.math.Ordering$Double$ extends java.lang.Object implements scala.math.Ordering$DoubleOrdering{
 public static final scala.math.Ordering$Double$ MODULE$;
   Signature: Lscala/math/Ordering$Double$;
 
diff --git c/scala/math/Ordering$DoubleOrdering.class w/scala/math/Ordering$DoubleOrdering.class
index b5150a2923..02f521bb60 100644
--- c/scala/math/Ordering$DoubleOrdering.class
+++ w/scala/math/Ordering$DoubleOrdering.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //DoubleOrdering=class scala/math/Ordering$DoubleOrdering of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public interface scala.math.Ordering$DoubleOrdering extends scala.math.Ordering,scala.ScalaObject{
+public interface scala.math.Ordering$DoubleOrdering extends scala.math.Ordering{
 public abstract int compare(double, double);
   Signature: (DD)I
 
diff --git c/scala/math/Ordering$Float$.class w/scala/math/Ordering$Float$.class
index 63796b076a..390b0174c0 100644
--- c/scala/math/Ordering$Float$.class
+++ w/scala/math/Ordering$Float$.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //FloatOrdering=class scala/math/Ordering$FloatOrderi
 public abstract #= # of #; //FloatOrdering$class=class scala/math/Ordering$FloatOrdering$class of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public final class scala.math.Ordering$Float$ extends java.lang.Object implements scala.math.Ordering$FloatOrdering,scala.ScalaObject{
+public final class scala.math.Ordering$Float$ extends java.lang.Object implements scala.math.Ordering$FloatOrdering{
 public static final scala.math.Ordering$Float$ MODULE$;
   Signature: Lscala/math/Ordering$Float$;
 
diff --git c/scala/math/Ordering$FloatOrdering.class w/scala/math/Ordering$FloatOrdering.class
index 1f9178bce2..7dc7032637 100644
--- c/scala/math/Ordering$FloatOrdering.class
+++ w/scala/math/Ordering$FloatOrdering.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //FloatOrdering=class scala/math/Ordering$FloatOrdering of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public interface scala.math.Ordering$FloatOrdering extends scala.math.Ordering,scala.ScalaObject{
+public interface scala.math.Ordering$FloatOrdering extends scala.math.Ordering{
 public abstract int compare(float, float);
   Signature: (FF)I
 
diff --git c/scala/math/Ordering$Implicits$.class w/scala/math/Ordering$Implicits$.class
index d2ba4234a3..42dd426147 100644
--- c/scala/math/Ordering$Implicits$.class
+++ w/scala/math/Ordering$Implicits$.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //ExtraImplicits=class scala/math/Ordering$ExtraImpli
 public abstract #= # of #; //ExtraImplicits$class=class scala/math/Ordering$ExtraImplicits$class of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public final class scala.math.Ordering$Implicits$ extends java.lang.Object implements scala.math.Ordering$ExtraImplicits,scala.ScalaObject{
+public final class scala.math.Ordering$Implicits$ extends java.lang.Object implements scala.math.Ordering$ExtraImplicits{
 public static final scala.math.Ordering$Implicits$ MODULE$;
   Signature: Lscala/math/Ordering$Implicits$;
 
diff --git c/scala/math/Ordering$Int$.class w/scala/math/Ordering$Int$.class
index 7540394b95..896eb5ee5b 100644
--- c/scala/math/Ordering$Int$.class
+++ w/scala/math/Ordering$Int$.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //IntOrdering=class scala/math/Ordering$IntOrdering o
 public abstract #= # of #; //IntOrdering$class=class scala/math/Ordering$IntOrdering$class of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public final class scala.math.Ordering$Int$ extends java.lang.Object implements scala.math.Ordering$IntOrdering,scala.ScalaObject{
+public final class scala.math.Ordering$Int$ extends java.lang.Object implements scala.math.Ordering$IntOrdering{
 public static final scala.math.Ordering$Int$ MODULE$;
   Signature: Lscala/math/Ordering$Int$;
 
diff --git c/scala/math/Ordering$IntOrdering.class w/scala/math/Ordering$IntOrdering.class
index 2a25da48f4..1036d851a3 100644
--- c/scala/math/Ordering$IntOrdering.class
+++ w/scala/math/Ordering$IntOrdering.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //IntOrdering=class scala/math/Ordering$IntOrdering of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public interface scala.math.Ordering$IntOrdering extends scala.math.Ordering,scala.ScalaObject{
+public interface scala.math.Ordering$IntOrdering extends scala.math.Ordering{
 public abstract int compare(int, int);
   Signature: (II)I
 
diff --git c/scala/math/Ordering$Long$.class w/scala/math/Ordering$Long$.class
index 190444aba4..6954eb8f86 100644
--- c/scala/math/Ordering$Long$.class
+++ w/scala/math/Ordering$Long$.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //LongOrdering=class scala/math/Ordering$LongOrdering
 public abstract #= # of #; //LongOrdering$class=class scala/math/Ordering$LongOrdering$class of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public final class scala.math.Ordering$Long$ extends java.lang.Object implements scala.math.Ordering$LongOrdering,scala.ScalaObject{
+public final class scala.math.Ordering$Long$ extends java.lang.Object implements scala.math.Ordering$LongOrdering{
 public static final scala.math.Ordering$Long$ MODULE$;
   Signature: Lscala/math/Ordering$Long$;
 
diff --git c/scala/math/Ordering$LongOrdering.class w/scala/math/Ordering$LongOrdering.class
index ea19115710..311af76279 100644
--- c/scala/math/Ordering$LongOrdering.class
+++ w/scala/math/Ordering$LongOrdering.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //LongOrdering=class scala/math/Ordering$LongOrdering of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public interface scala.math.Ordering$LongOrdering extends scala.math.Ordering,scala.ScalaObject{
+public interface scala.math.Ordering$LongOrdering extends scala.math.Ordering{
 public abstract int compare(long, long);
   Signature: (JJ)I
 
diff --git c/scala/math/Ordering$OptionOrdering.class w/scala/math/Ordering$OptionOrdering.class
index 0efdd6ecbf..9acd86bad2 100644
--- c/scala/math/Ordering$OptionOrdering.class
+++ w/scala/math/Ordering$OptionOrdering.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //OptionOrdering=class scala/math/Ordering$OptionOrdering of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public interface scala.math.Ordering$OptionOrdering extends scala.math.Ordering,scala.ScalaObject{
+public interface scala.math.Ordering$OptionOrdering extends scala.math.Ordering{
 public abstract scala.math.Ordering optionOrdering();
   Signature: ()Lscala/math/Ordering;
 
diff --git c/scala/math/Ordering$Short$.class w/scala/math/Ordering$Short$.class
index 470b9c0947..9a01757a3d 100644
--- c/scala/math/Ordering$Short$.class
+++ w/scala/math/Ordering$Short$.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //ShortOrdering=class scala/math/Ordering$ShortOrderi
 public abstract #= # of #; //ShortOrdering$class=class scala/math/Ordering$ShortOrdering$class of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public final class scala.math.Ordering$Short$ extends java.lang.Object implements scala.math.Ordering$ShortOrdering,scala.ScalaObject{
+public final class scala.math.Ordering$Short$ extends java.lang.Object implements scala.math.Ordering$ShortOrdering{
 public static final scala.math.Ordering$Short$ MODULE$;
   Signature: Lscala/math/Ordering$Short$;
 
diff --git c/scala/math/Ordering$ShortOrdering.class w/scala/math/Ordering$ShortOrdering.class
index 5da32f1285..2fec5db015 100644
--- c/scala/math/Ordering$ShortOrdering.class
+++ w/scala/math/Ordering$ShortOrdering.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //ShortOrdering=class scala/math/Ordering$ShortOrdering of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public interface scala.math.Ordering$ShortOrdering extends scala.math.Ordering,scala.ScalaObject{
+public interface scala.math.Ordering$ShortOrdering extends scala.math.Ordering{
 public abstract int compare(short, short);
   Signature: (SS)I
 
diff --git c/scala/math/Ordering$String$.class w/scala/math/Ordering$String$.class
index 541f759ef7..c24b17ff72 100644
--- c/scala/math/Ordering$String$.class
+++ w/scala/math/Ordering$String$.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //StringOrdering=class scala/math/Ordering$StringOrde
 public abstract #= # of #; //StringOrdering$class=class scala/math/Ordering$StringOrdering$class of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public final class scala.math.Ordering$String$ extends java.lang.Object implements scala.math.Ordering$StringOrdering,scala.ScalaObject{
+public final class scala.math.Ordering$String$ extends java.lang.Object implements scala.math.Ordering$StringOrdering{
 public static final scala.math.Ordering$String$ MODULE$;
   Signature: Lscala/math/Ordering$String$;
 
diff --git c/scala/math/Ordering$StringOrdering.class w/scala/math/Ordering$StringOrdering.class
index 78992a56ff..a8c46fc92e 100644
--- c/scala/math/Ordering$StringOrdering.class
+++ w/scala/math/Ordering$StringOrdering.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //StringOrdering=class scala/math/Ordering$StringOrdering of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public interface scala.math.Ordering$StringOrdering extends scala.math.Ordering,scala.ScalaObject{
+public interface scala.math.Ordering$StringOrdering extends scala.math.Ordering{
 public abstract int compare(java.lang.String, java.lang.String);
   Signature: (Ljava/lang/String;Ljava/lang/String;)I
 
diff --git c/scala/math/Ordering$Unit$.class w/scala/math/Ordering$Unit$.class
index a01aaacd2f..c039547d95 100644
--- c/scala/math/Ordering$Unit$.class
+++ w/scala/math/Ordering$Unit$.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //UnitOrdering=class scala/math/Ordering$UnitOrdering
 public abstract #= # of #; //UnitOrdering$class=class scala/math/Ordering$UnitOrdering$class of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public final class scala.math.Ordering$Unit$ extends java.lang.Object implements scala.math.Ordering$UnitOrdering,scala.ScalaObject{
+public final class scala.math.Ordering$Unit$ extends java.lang.Object implements scala.math.Ordering$UnitOrdering{
 public static final scala.math.Ordering$Unit$ MODULE$;
   Signature: Lscala/math/Ordering$Unit$;
 
diff --git c/scala/math/Ordering$UnitOrdering.class w/scala/math/Ordering$UnitOrdering.class
index 6948a731cf..b838fee232 100644
--- c/scala/math/Ordering$UnitOrdering.class
+++ w/scala/math/Ordering$UnitOrdering.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //UnitOrdering=class scala/math/Ordering$UnitOrdering of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public interface scala.math.Ordering$UnitOrdering extends scala.math.Ordering,scala.ScalaObject{
+public interface scala.math.Ordering$UnitOrdering extends scala.math.Ordering{
 public abstract int compare(scala.runtime.BoxedUnit, scala.runtime.BoxedUnit);
   Signature: (Lscala/runtime/BoxedUnit;Lscala/runtime/BoxedUnit;)I
 
diff --git c/scala/math/Ordering.class w/scala/math/Ordering.class
index 67a2532698..ac1364670a 100644
--- c/scala/math/Ordering.class
+++ w/scala/math/Ordering.class
@@ -43,7 +43,7 @@ public abstract #= # of #; //BooleanOrdering$class=class scala/math/Ordering$Boo
 public abstract #= # of #; //BigDecimalOrdering$class=class scala/math/Ordering$BigDecimalOrdering$class of class scala/math/Ordering
 
 Compiled from "Ordering.scala"
-public interface scala.math.Ordering extends java.util.Comparator,scala.math.PartialOrdering,scala.Serializable,scala.ScalaObject{
+public interface scala.math.Ordering extends java.util.Comparator,scala.math.PartialOrdering,scala.Serializable{
 public abstract scala.Some tryCompare(java.lang.Object, java.lang.Object);
   Signature: (Ljava/lang/Object;Ljava/lang/Object;)Lscala/Some;
 
diff --git c/scala/ref/PhantomReference.class w/scala/ref/PhantomReference.class
index bb6038de13..779e5a0d80 100644
--- c/scala/ref/PhantomReference.class
+++ w/scala/ref/PhantomReference.class
@@ -1,6 +1,6 @@
 
 Compiled from "PhantomReference.scala"
-public class scala.ref.PhantomReference extends java.lang.Object implements scala.ref.ReferenceWrapper,scala.ScalaObject{
+public class scala.ref.PhantomReference extends java.lang.Object implements scala.ref.ReferenceWrapper{
 private final java.lang.ref.PhantomReference underlying;
   Signature: Ljava/lang/ref/PhantomReference;
 
diff --git c/scala/ref/Reference.class w/scala/ref/Reference.class
index a0dd6d147f..843ced7a06 100644
diff --git c/scala/ref/ReferenceWrapper.class w/scala/ref/ReferenceWrapper.class
index f88b4a52c7..c7570e5e4d 100644
--- c/scala/ref/ReferenceWrapper.class
+++ w/scala/ref/ReferenceWrapper.class
@@ -1,6 +1,6 @@
 
 Compiled from "ReferenceWrapper.scala"
-public interface scala.ref.ReferenceWrapper extends scala.ref.Reference,scala.Proxy,scala.ScalaObject{
+public interface scala.ref.ReferenceWrapper extends scala.ref.Reference,scala.Proxy{
 public abstract java.lang.ref.Reference underlying();
   Signature: ()Ljava/lang/ref/Reference;
 
diff --git c/scala/ref/SoftReference.class w/scala/ref/SoftReference.class
index 202a933b2f..2b7eb27583 100644
--- c/scala/ref/SoftReference.class
+++ w/scala/ref/SoftReference.class
@@ -1,6 +1,6 @@
 
 Compiled from "SoftReference.scala"
-public class scala.ref.SoftReference extends java.lang.Object implements scala.ref.ReferenceWrapper,scala.ScalaObject{
+public class scala.ref.SoftReference extends java.lang.Object implements scala.ref.ReferenceWrapper{
 private final java.lang.ref.SoftReference underlying;
   Signature: Ljava/lang/ref/SoftReference;
 
diff --git c/scala/ref/WeakReference.class w/scala/ref/WeakReference.class
index a12c6ee900..ee39a2fb1a 100644
--- c/scala/ref/WeakReference.class
+++ w/scala/ref/WeakReference.class
@@ -1,6 +1,6 @@
 
 Compiled from "WeakReference.scala"
-public class scala.ref.WeakReference extends java.lang.Object implements scala.ref.ReferenceWrapper,scala.ScalaObject{
+public class scala.ref.WeakReference extends java.lang.Object implements scala.ref.ReferenceWrapper{
 private final java.lang.ref.WeakReference underlying;
   Signature: Ljava/lang/ref/WeakReference;
 
diff --git c/scala/reflect/AnyValManifest.class w/scala/reflect/AnyValManifest.class
index 0635b4874c..93be91b28c 100644
--- c/scala/reflect/AnyValManifest.class
+++ w/scala/reflect/AnyValManifest.class
@@ -1,6 +1,6 @@
 
 Compiled from "Manifest.scala"
-public interface scala.reflect.AnyValManifest extends scala.reflect.Manifest,scala.Equals,scala.ScalaObject{
+public interface scala.reflect.AnyValManifest extends scala.reflect.Manifest{
 public abstract boolean $less$colon$less(scala.reflect.ClassManifest);
   Signature: (Lscala/reflect/ClassManifest;)Z
 
diff --git c/scala/reflect/ClassManifest.class w/scala/reflect/ClassManifest.class
index 78d432c0c7..1c89f24b2e 100644
--- c/scala/reflect/ClassManifest.class
+++ w/scala/reflect/ClassManifest.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //AbsType=class scala/reflect/api/Types$AbsType of class scala/reflect/api/Types
 
 Compiled from "ClassManifest.scala"
-public interface scala.reflect.ClassManifest extends scala.reflect.OptManifest,scala.Equals,scala.Serializable,scala.ScalaObject{
+public interface scala.reflect.ClassManifest extends scala.reflect.OptManifest,scala.Equals,scala.ScalaObject{
 public abstract java.lang.Class erasure();
   Signature: ()Ljava/lang/Class;
 
diff --git c/scala/reflect/ClassTypeManifest.class w/scala/reflect/ClassTypeManifest.class
index e99b07e5e4..e7ac21918b 100644
--- c/scala/reflect/ClassTypeManifest.class
+++ w/scala/reflect/ClassTypeManifest.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //AbsType=class scala/reflect/api/Types$AbsType of class scala/reflect/api/Types
 
 Compiled from "ClassManifest.scala"
-public class scala.reflect.ClassTypeManifest extends java.lang.Object implements scala.reflect.ClassManifest,scala.ScalaObject{
+public class scala.reflect.ClassTypeManifest extends java.lang.Object implements scala.reflect.ClassManifest{
 private final scala.Option prefix;
   Signature: Lscala/Option;
 
diff --git c/scala/reflect/Manifest$ClassTypeManifest.class w/scala/reflect/Manifest$ClassTypeManifest.class
index 6aec68c60f..0e9371b626 100644
--- c/scala/reflect/Manifest$ClassTypeManifest.class
+++ w/scala/reflect/Manifest$ClassTypeManifest.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //AbsSymbol=class scala/reflect/api/Symbols$AbsSymbol
 public #= # of #; //ClassTypeManifest=class scala/reflect/Manifest$ClassTypeManifest of class scala/reflect/Manifest
 
 Compiled from "Manifest.scala"
-public class scala.reflect.Manifest$ClassTypeManifest extends java.lang.Object implements scala.reflect.Manifest,scala.ScalaObject{
+public class scala.reflect.Manifest$ClassTypeManifest extends java.lang.Object implements scala.reflect.Manifest{
 private final scala.Option prefix;
   Signature: Lscala/Option;
 
diff --git c/scala/reflect/Manifest$SingletonTypeManifest.class w/scala/reflect/Manifest$SingletonTypeManifest.class
index 8132d404da..83abf4e392 100644
--- c/scala/reflect/Manifest$SingletonTypeManifest.class
+++ w/scala/reflect/Manifest$SingletonTypeManifest.class
@@ -6,7 +6,7 @@ public #= # of #; //SingletonTypeManifest=class scala/reflect/Manifest$Singleton
 public abstract #= # of #; //InstanceRefSymbolExtractor=class scala/reflect/api/RuntimeTypes$InstanceRefSymbolExtractor of class scala/reflect/api/RuntimeTypes
 
 Compiled from "Manifest.scala"
-public class scala.reflect.Manifest$SingletonTypeManifest extends java.lang.Object implements scala.reflect.Manifest,scala.ScalaObject{
+public class scala.reflect.Manifest$SingletonTypeManifest extends java.lang.Object implements scala.reflect.Manifest{
 private final java.lang.Object value;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/reflect/Manifest.class w/scala/reflect/Manifest.class
index 61d0ca77b7..144f8a555f 100644
--- c/scala/reflect/Manifest.class
+++ w/scala/reflect/Manifest.class
@@ -3,7 +3,7 @@ public #= # of #; //ClassTypeManifest=class scala/reflect/Manifest$ClassTypeMani
 public #= # of #; //SingletonTypeManifest=class scala/reflect/Manifest$SingletonTypeManifest of class scala/reflect/Manifest
 
 Compiled from "Manifest.scala"
-public interface scala.reflect.Manifest extends scala.reflect.ClassManifest,scala.Equals,scala.ScalaObject{
+public interface scala.reflect.Manifest extends scala.reflect.ClassManifest{
 public abstract scala.collection.immutable.List typeArguments();
   Signature: ()Lscala/collection/immutable/List;
 
diff --git c/scala/reflect/NoManifest$.class w/scala/reflect/NoManifest$.class
index 64c36b1510..71653c6d3e 100644
--- c/scala/reflect/NoManifest$.class
+++ w/scala/reflect/NoManifest$.class
@@ -1,6 +1,6 @@
 
 Compiled from "NoManifest.scala"
-public final class scala.reflect.NoManifest$ extends java.lang.Object implements scala.reflect.OptManifest,scala.Serializable,scala.ScalaObject{
+public final class scala.reflect.NoManifest$ extends java.lang.Object implements scala.reflect.OptManifest,scala.ScalaObject{
 public static final scala.reflect.NoManifest$ MODULE$;
   Signature: Lscala/reflect/NoManifest$;
 
diff --git c/scala/reflect/api/TreePrinters$RawTreePrinter.class w/scala/reflect/api/TreePrinters$RawTreePrinter.class
index 567a40df67..113b5546b3 100644
--- c/scala/reflect/api/TreePrinters$RawTreePrinter.class
+++ w/scala/reflect/api/TreePrinters$RawTreePrinter.class
@@ -4,7 +4,7 @@ public #= # of #; //RawTreePrinter=class scala/reflect/api/TreePrinters$RawTreeP
 public abstract #= # of #; //TreePrinter$class=class scala/reflect/api/TreePrinters$TreePrinter$class of class scala/reflect/api/TreePrinters
 
 Compiled from "TreePrinters.scala"
-public class scala.reflect.api.TreePrinters$RawTreePrinter extends java.lang.Object implements scala.reflect.api.TreePrinters$TreePrinter,scala.ScalaObject{
+public class scala.reflect.api.TreePrinters$RawTreePrinter extends java.lang.Object implements scala.reflect.api.TreePrinters$TreePrinter{
 public final java.io.PrintWriter scala$reflect$api$TreePrinters$RawTreePrinter$$out;
   Signature: Ljava/io/PrintWriter;
 
diff --git c/scala/reflect/api/Trees$Alternative.class w/scala/reflect/api/Trees$Alternative.class
index 4ffc948d76..ceca077bc6 100644
--- c/scala/reflect/api/Trees$Alternative.class
+++ w/scala/reflect/api/Trees$Alternative.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //TermTree=class scala/reflect/api/Trees$TermTree of
 public #= # of #; //Alternative=class scala/reflect/api/Trees$Alternative of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$Alternative extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$Alternative extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.Product,scala.Serializable{
 private final scala.collection.immutable.List trees;
   Signature: Lscala/collection/immutable/List;
 
diff --git c/scala/reflect/api/Trees$Annotated.class w/scala/reflect/api/Trees$Annotated.class
index bd63fb37e2..bd37afc3ff 100644
--- c/scala/reflect/api/Trees$Annotated.class
+++ w/scala/reflect/api/Trees$Annotated.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Tree=class scala/reflect/api/Trees$Tree of class sc
 public #= # of #; //Annotated=class scala/reflect/api/Trees$Annotated of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$Annotated extends scala.reflect.api.Trees$Tree implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$Annotated extends scala.reflect.api.Trees$Tree implements scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree annot;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$AppliedTypeTree.class w/scala/reflect/api/Trees$AppliedTypeTree.class
index 6844e69ec4..7723c5dc23 100644
--- c/scala/reflect/api/Trees$AppliedTypeTree.class
+++ w/scala/reflect/api/Trees$AppliedTypeTree.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //AbsSymbol=class scala/reflect/api/Symbols$AbsSymbol
 public #= # of #; //AppliedTypeTree=class scala/reflect/api/Trees$AppliedTypeTree of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$AppliedTypeTree extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TypTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$AppliedTypeTree extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TypTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree tpt;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$Apply.class w/scala/reflect/api/Trees$Apply.class
index 0ad906d592..d9b0cd9f93 100644
--- c/scala/reflect/api/Trees$Apply.class
+++ w/scala/reflect/api/Trees$Apply.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //AbsSymbol=class scala/reflect/api/Symbols$AbsSymbol
 public abstract #= # of #; //GenericApply=class scala/reflect/api/Trees$GenericApply of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$Apply extends scala.reflect.api.Trees$GenericApply implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$Apply extends scala.reflect.api.Trees$GenericApply implements scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree fun;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$ApplyDynamic.class w/scala/reflect/api/Trees$ApplyDynamic.class
index 29f727f694..366f2c04c6 100644
--- c/scala/reflect/api/Trees$ApplyDynamic.class
+++ w/scala/reflect/api/Trees$ApplyDynamic.class
@@ -7,7 +7,7 @@ public #= # of #; //ApplyDynamic=class scala/reflect/api/Trees$ApplyDynamic of c
 public abstract #= # of #; //SymTree$class=class scala/reflect/api/Trees$SymTree$class of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$ApplyDynamic extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.reflect.api.Trees$SymTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$ApplyDynamic extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.reflect.api.Trees$SymTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree qual;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$ArrayValue.class w/scala/reflect/api/Trees$ArrayValue.class
index 6d208a9f95..7e134eca58 100644
--- c/scala/reflect/api/Trees$ArrayValue.class
+++ w/scala/reflect/api/Trees$ArrayValue.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //TermTree=class scala/reflect/api/Trees$TermTree of
 public #= # of #; //ArrayValue=class scala/reflect/api/Trees$ArrayValue of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$ArrayValue extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$ArrayValue extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree elemtpt;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$Assign.class w/scala/reflect/api/Trees$Assign.class
index 4594b34619..574033c307 100644
--- c/scala/reflect/api/Trees$Assign.class
+++ w/scala/reflect/api/Trees$Assign.class
@@ -4,7 +4,7 @@ public #= # of #; //Assign=class scala/reflect/api/Trees$Assign of class scala/r
 public abstract #= # of #; //TermTree=class scala/reflect/api/Trees$TermTree of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$Assign extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$Assign extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree lhs;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$Bind.class w/scala/reflect/api/Trees$Bind.class
index 7d76993d49..22b9449d0b 100644
--- c/scala/reflect/api/Trees$Bind.class
+++ w/scala/reflect/api/Trees$Bind.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //DefTree=class scala/reflect/api/Trees$DefTree of cl
 public abstract #= # of #; //AbsName=class scala/reflect/api/Names$AbsName of class scala/reflect/api/Names
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$Bind extends scala.reflect.api.Trees$DefTree implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$Bind extends scala.reflect.api.Trees$DefTree implements scala.Product,scala.Serializable{
 private final scala.reflect.api.Names$AbsName name;
   Signature: Lscala/reflect/api/Names$AbsName;
 
diff --git c/scala/reflect/api/Trees$Block.class w/scala/reflect/api/Trees$Block.class
index 54af0fbb10..2081048957 100644
--- c/scala/reflect/api/Trees$Block.class
+++ w/scala/reflect/api/Trees$Block.class
@@ -4,7 +4,7 @@ public #= # of #; //Block=class scala/reflect/api/Trees$Block of class scala/ref
 public abstract #= # of #; //TermTree=class scala/reflect/api/Trees$TermTree of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$Block extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$Block extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.Product,scala.Serializable{
 private final scala.collection.immutable.List stats;
   Signature: Lscala/collection/immutable/List;
 
diff --git c/scala/reflect/api/Trees$CaseDef.class w/scala/reflect/api/Trees$CaseDef.class
index c5f6d956a7..3913cb77aa 100644
--- c/scala/reflect/api/Trees$CaseDef.class
+++ w/scala/reflect/api/Trees$CaseDef.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Tree=class scala/reflect/api/Trees$Tree of class sc
 public #= # of #; //CaseDef=class scala/reflect/api/Trees$CaseDef of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$CaseDef extends scala.reflect.api.Trees$Tree implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$CaseDef extends scala.reflect.api.Trees$Tree implements scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree pat;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$ClassDef.class w/scala/reflect/api/Trees$ClassDef.class
index 0267e7b46d..7f61e198f0 100644
--- c/scala/reflect/api/Trees$ClassDef.class
+++ w/scala/reflect/api/Trees$ClassDef.class
@@ -6,7 +6,7 @@ public #= # of #; //Template=class scala/reflect/api/Trees$Template of class sca
 public abstract #= # of #; //AbsModifiers=class scala/reflect/api/Trees$AbsModifiers of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$ClassDef extends scala.reflect.api.Trees$ImplDef implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$ClassDef extends scala.reflect.api.Trees$ImplDef implements scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$AbsModifiers mods;
   Signature: Lscala/reflect/api/Trees$AbsModifiers;
 
diff --git c/scala/reflect/api/Trees$CompoundTypeTree.class w/scala/reflect/api/Trees$CompoundTypeTree.class
index 18383c2979..02101ce851 100644
--- c/scala/reflect/api/Trees$CompoundTypeTree.class
+++ w/scala/reflect/api/Trees$CompoundTypeTree.class
@@ -5,7 +5,7 @@ public #= # of #; //Template=class scala/reflect/api/Trees$Template of class sca
 public #= # of #; //CompoundTypeTree=class scala/reflect/api/Trees$CompoundTypeTree of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$CompoundTypeTree extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TypTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$CompoundTypeTree extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TypTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Template templ;
   Signature: Lscala/reflect/api/Trees$Template;
 
diff --git c/scala/reflect/api/Trees$DefDef.class w/scala/reflect/api/Trees$DefDef.class
index 97264683ba..61504ed37f 100644
--- c/scala/reflect/api/Trees$DefDef.class
+++ w/scala/reflect/api/Trees$DefDef.class
@@ -6,7 +6,7 @@ public abstract #= # of #; //ValOrDefDef=class scala/reflect/api/Trees$ValOrDefD
 public abstract #= # of #; //AbsModifiers=class scala/reflect/api/Trees$AbsModifiers of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$DefDef extends scala.reflect.api.Trees$ValOrDefDef implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$DefDef extends scala.reflect.api.Trees$ValOrDefDef implements scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$AbsModifiers mods;
   Signature: Lscala/reflect/api/Trees$AbsModifiers;
 
diff --git c/scala/reflect/api/Trees$DefTree.class w/scala/reflect/api/Trees$DefTree.class
index 23badadfa9..8ee24c3ac4 100644
--- c/scala/reflect/api/Trees$DefTree.class
+++ w/scala/reflect/api/Trees$DefTree.class
@@ -7,7 +7,7 @@ public abstract #= # of #; //AbsSymbol=class scala/reflect/api/Symbols$AbsSymbol
 public abstract #= # of #; //SymTree$class=class scala/reflect/api/Trees$SymTree$class of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public abstract class scala.reflect.api.Trees$DefTree extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$SymTree,scala.ScalaObject{
+public abstract class scala.reflect.api.Trees$DefTree extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$SymTree{
 private scala.reflect.api.Symbols$AbsSymbol symbol;
   Signature: Lscala/reflect/api/Symbols$AbsSymbol;
 
diff --git c/scala/reflect/api/Trees$EmptyTree$.class w/scala/reflect/api/Trees$EmptyTree$.class
index 1a77a9edb0..28ef67139c 100644
--- c/scala/reflect/api/Trees$EmptyTree$.class
+++ w/scala/reflect/api/Trees$EmptyTree$.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //TermTree=class scala/reflect/api/Trees$TermTree of
 public final #= # of #; //EmptyTree$=class scala/reflect/api/Trees$EmptyTree$ of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public final class scala.reflect.api.Trees$EmptyTree$ extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.reflect.api.Trees$EmptyTree$ extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.Product,scala.Serializable{
 public void tpe_$eq(scala.reflect.api.Types$AbsType);
   Signature: (Lscala/reflect/api/Types$AbsType;)V
   Code:
diff --git c/scala/reflect/api/Trees$ExistentialTypeTree.class w/scala/reflect/api/Trees$ExistentialTypeTree.class
index 8e0a353d92..49e8bbb789 100644
--- c/scala/reflect/api/Trees$ExistentialTypeTree.class
+++ w/scala/reflect/api/Trees$ExistentialTypeTree.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //TypTree=class scala/reflect/api/Trees$TypTree of cl
 public #= # of #; //ExistentialTypeTree=class scala/reflect/api/Trees$ExistentialTypeTree of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$ExistentialTypeTree extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TypTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$ExistentialTypeTree extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TypTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree tpt;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$Function.class w/scala/reflect/api/Trees$Function.class
index 9ce5c26bfc..608891ef08 100644
--- c/scala/reflect/api/Trees$Function.class
+++ w/scala/reflect/api/Trees$Function.class
@@ -7,7 +7,7 @@ public abstract #= # of #; //AbsSymbol=class scala/reflect/api/Symbols$AbsSymbol
 public abstract #= # of #; //SymTree$class=class scala/reflect/api/Trees$SymTree$class of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$Function extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.reflect.api.Trees$SymTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$Function extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.reflect.api.Trees$SymTree,scala.Product,scala.Serializable{
 private final scala.collection.immutable.List vparams;
   Signature: Lscala/collection/immutable/List;
 
diff --git c/scala/reflect/api/Trees$Ident.class w/scala/reflect/api/Trees$Ident.class
index 1a198781b2..54c9ab3663 100644
--- c/scala/reflect/api/Trees$Ident.class
+++ w/scala/reflect/api/Trees$Ident.class
@@ -8,7 +8,7 @@ public abstract #= # of #; //AbsSymbol=class scala/reflect/api/Symbols$AbsSymbol
 public abstract #= # of #; //SymTree$class=class scala/reflect/api/Trees$SymTree$class of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$Ident extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$RefTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$Ident extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$RefTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Names$AbsName name;
   Signature: Lscala/reflect/api/Names$AbsName;
 
diff --git c/scala/reflect/api/Trees$If.class w/scala/reflect/api/Trees$If.class
index 661ca2e40f..a7c1fb9486 100644
--- c/scala/reflect/api/Trees$If.class
+++ w/scala/reflect/api/Trees$If.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Tree=class scala/reflect/api/Trees$Tree of class sc
 public abstract #= # of #; //TermTree=class scala/reflect/api/Trees$TermTree of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$If extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$If extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree cond;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$Import.class w/scala/reflect/api/Trees$Import.class
index 8f59e1ec19..2448797802 100644
--- c/scala/reflect/api/Trees$Import.class
+++ w/scala/reflect/api/Trees$Import.class
@@ -6,7 +6,7 @@ public abstract #= # of #; //AbsSymbol=class scala/reflect/api/Symbols$AbsSymbol
 public abstract #= # of #; //SymTree$class=class scala/reflect/api/Trees$SymTree$class of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$Import extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$SymTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$Import extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$SymTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree expr;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$ImportSelector.class w/scala/reflect/api/Trees$ImportSelector.class
index cc30500e53..e083a98056 100644
--- c/scala/reflect/api/Trees$ImportSelector.class
+++ w/scala/reflect/api/Trees$ImportSelector.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //AbsName=class scala/reflect/api/Names$AbsName of cl
 public #= # of #; //ImportSelector=class scala/reflect/api/Trees$ImportSelector of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$ImportSelector extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$ImportSelector extends java.lang.Object implements scala.Product,scala.Serializable{
 private final scala.reflect.api.Names$AbsName name;
   Signature: Lscala/reflect/api/Names$AbsName;
 
diff --git c/scala/reflect/api/Trees$LabelDef.class w/scala/reflect/api/Trees$LabelDef.class
index 1ea957a0fd..0b989c95c8 100644
--- c/scala/reflect/api/Trees$LabelDef.class
+++ w/scala/reflect/api/Trees$LabelDef.class
@@ -6,7 +6,7 @@ public #= # of #; //LabelDef=class scala/reflect/api/Trees$LabelDef of class sca
 public abstract #= # of #; //TermTree=class scala/reflect/api/Trees$TermTree of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$LabelDef extends scala.reflect.api.Trees$DefTree implements scala.reflect.api.Trees$TermTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$LabelDef extends scala.reflect.api.Trees$DefTree implements scala.reflect.api.Trees$TermTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Names$AbsName name;
   Signature: Lscala/reflect/api/Names$AbsName;
 
diff --git c/scala/reflect/api/Trees$Literal.class w/scala/reflect/api/Trees$Literal.class
index f329888108..98bc929148 100644
--- c/scala/reflect/api/Trees$Literal.class
+++ w/scala/reflect/api/Trees$Literal.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //TermTree=class scala/reflect/api/Trees$TermTree of
 public abstract #= # of #; //AbsConstant=class scala/reflect/api/Constants$AbsConstant of class scala/reflect/api/Constants
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$Literal extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$Literal extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Constants$AbsConstant value;
   Signature: Lscala/reflect/api/Constants$AbsConstant;
 
diff --git c/scala/reflect/api/Trees$Match.class w/scala/reflect/api/Trees$Match.class
index 019abb264d..00be61f050 100644
--- c/scala/reflect/api/Trees$Match.class
+++ w/scala/reflect/api/Trees$Match.class
@@ -4,7 +4,7 @@ public #= # of #; //Match=class scala/reflect/api/Trees$Match of class scala/ref
 public abstract #= # of #; //TermTree=class scala/reflect/api/Trees$TermTree of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$Match extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$Match extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree selector;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$ModuleDef.class w/scala/reflect/api/Trees$ModuleDef.class
index cbbdaae672..7f88974de1 100644
--- c/scala/reflect/api/Trees$ModuleDef.class
+++ w/scala/reflect/api/Trees$ModuleDef.class
@@ -6,7 +6,7 @@ public #= # of #; //ModuleDef=class scala/reflect/api/Trees$ModuleDef of class s
 public abstract #= # of #; //AbsModifiers=class scala/reflect/api/Trees$AbsModifiers of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$ModuleDef extends scala.reflect.api.Trees$ImplDef implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$ModuleDef extends scala.reflect.api.Trees$ImplDef implements scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$AbsModifiers mods;
   Signature: Lscala/reflect/api/Trees$AbsModifiers;
 
diff --git c/scala/reflect/api/Trees$New.class w/scala/reflect/api/Trees$New.class
index 834293391b..32464fdc51 100644
--- c/scala/reflect/api/Trees$New.class
+++ w/scala/reflect/api/Trees$New.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Tree=class scala/reflect/api/Trees$Tree of class sc
 public abstract #= # of #; //TermTree=class scala/reflect/api/Trees$TermTree of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$New extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$New extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree tpt;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$PackageDef.class w/scala/reflect/api/Trees$PackageDef.class
index 503a7b74d8..08d676df19 100644
--- c/scala/reflect/api/Trees$PackageDef.class
+++ w/scala/reflect/api/Trees$PackageDef.class
@@ -6,7 +6,7 @@ public #= # of #; //PackageDef=class scala/reflect/api/Trees$PackageDef of class
 public abstract #= # of #; //AbsModifiers=class scala/reflect/api/Trees$AbsModifiers of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$PackageDef extends scala.reflect.api.Trees$MemberDef implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$PackageDef extends scala.reflect.api.Trees$MemberDef implements scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$RefTree pid;
   Signature: Lscala/reflect/api/Trees$RefTree;
 
diff --git c/scala/reflect/api/Trees$Return.class w/scala/reflect/api/Trees$Return.class
index a3ff198194..813058901b 100644
--- c/scala/reflect/api/Trees$Return.class
+++ w/scala/reflect/api/Trees$Return.class
@@ -7,7 +7,7 @@ public abstract #= # of #; //AbsSymbol=class scala/reflect/api/Symbols$AbsSymbol
 public abstract #= # of #; //SymTree$class=class scala/reflect/api/Trees$SymTree$class of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$Return extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.reflect.api.Trees$SymTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$Return extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.reflect.api.Trees$SymTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree expr;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$Select.class w/scala/reflect/api/Trees$Select.class
index 38add41110..81b9cfe131 100644
--- c/scala/reflect/api/Trees$Select.class
+++ w/scala/reflect/api/Trees$Select.class
@@ -8,7 +8,7 @@ public abstract #= # of #; //AbsSymbol=class scala/reflect/api/Symbols$AbsSymbol
 public abstract #= # of #; //SymTree$class=class scala/reflect/api/Trees$SymTree$class of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$Select extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$RefTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$Select extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$RefTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree qualifier;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$SelectFromTypeTree.class w/scala/reflect/api/Trees$SelectFromTypeTree.class
index d171505967..b53215080d 100644
--- c/scala/reflect/api/Trees$SelectFromTypeTree.class
+++ w/scala/reflect/api/Trees$SelectFromTypeTree.class
@@ -9,7 +9,7 @@ public abstract #= # of #; //SymTree$class=class scala/reflect/api/Trees$SymTree
 public #= # of #; //SelectFromTypeTree=class scala/reflect/api/Trees$SelectFromTypeTree of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$SelectFromTypeTree extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TypTree,scala.reflect.api.Trees$RefTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$SelectFromTypeTree extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TypTree,scala.reflect.api.Trees$RefTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree qualifier;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$SingletonTypeTree.class w/scala/reflect/api/Trees$SingletonTypeTree.class
index 72388dc472..1c871592be 100644
--- c/scala/reflect/api/Trees$SingletonTypeTree.class
+++ w/scala/reflect/api/Trees$SingletonTypeTree.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //TypTree=class scala/reflect/api/Trees$TypTree of cl
 public #= # of #; //SingletonTypeTree=class scala/reflect/api/Trees$SingletonTypeTree of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$SingletonTypeTree extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TypTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$SingletonTypeTree extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TypTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree ref;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$Star.class w/scala/reflect/api/Trees$Star.class
index 95a0bfe3bf..1a4504c9bc 100644
--- c/scala/reflect/api/Trees$Star.class
+++ w/scala/reflect/api/Trees$Star.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Tree=class scala/reflect/api/Trees$Tree of class sc
 public abstract #= # of #; //TermTree=class scala/reflect/api/Trees$TermTree of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$Star extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$Star extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree elem;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$Super.class w/scala/reflect/api/Trees$Super.class
index e385a7a97f..5b6c377d42 100644
--- c/scala/reflect/api/Trees$Super.class
+++ w/scala/reflect/api/Trees$Super.class
@@ -6,7 +6,7 @@ public abstract #= # of #; //TermTree=class scala/reflect/api/Trees$TermTree of
 public abstract #= # of #; //AbsSymbol=class scala/reflect/api/Symbols$AbsSymbol of class scala/reflect/api/Symbols
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$Super extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$Super extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree qual;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$Template.class w/scala/reflect/api/Trees$Template.class
index d08aa73e5a..1b9c61b8e5 100644
--- c/scala/reflect/api/Trees$Template.class
+++ w/scala/reflect/api/Trees$Template.class
@@ -7,7 +7,7 @@ public abstract #= # of #; //AbsSymbol=class scala/reflect/api/Symbols$AbsSymbol
 public abstract #= # of #; //SymTree$class=class scala/reflect/api/Trees$SymTree$class of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$Template extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$SymTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$Template extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$SymTree,scala.Product,scala.Serializable{
 private final scala.collection.immutable.List parents;
   Signature: Lscala/collection/immutable/List;
 
diff --git c/scala/reflect/api/Trees$This.class w/scala/reflect/api/Trees$This.class
index c57d621760..4110f13a2b 100644
--- c/scala/reflect/api/Trees$This.class
+++ w/scala/reflect/api/Trees$This.class
@@ -8,7 +8,7 @@ public abstract #= # of #; //AbsSymbol=class scala/reflect/api/Symbols$AbsSymbol
 public abstract #= # of #; //SymTree$class=class scala/reflect/api/Trees$SymTree$class of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$This extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.reflect.api.Trees$SymTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$This extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.reflect.api.Trees$SymTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Names$AbsName qual;
   Signature: Lscala/reflect/api/Names$AbsName;
 
diff --git c/scala/reflect/api/Trees$Throw.class w/scala/reflect/api/Trees$Throw.class
index 098c58371f..b4ffd83421 100644
--- c/scala/reflect/api/Trees$Throw.class
+++ w/scala/reflect/api/Trees$Throw.class
@@ -4,7 +4,7 @@ public #= # of #; //Throw=class scala/reflect/api/Trees$Throw of class scala/ref
 public abstract #= # of #; //TermTree=class scala/reflect/api/Trees$TermTree of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$Throw extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$Throw extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree expr;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$Tree.class w/scala/reflect/api/Trees$Tree.class
index 0449e6c78b..90126addb8 100644
--- c/scala/reflect/api/Trees$Tree.class
+++ w/scala/reflect/api/Trees$Tree.class
@@ -16,7 +16,7 @@ public #= # of #; //FilterTreeTraverser=class scala/reflect/api/Trees$FilterTree
 public #= # of #; //ForeachTreeTraverser=class scala/reflect/api/Trees$ForeachTreeTraverser of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public abstract class scala.reflect.api.Trees$Tree extends java.lang.Object implements scala.Product,scala.ScalaObject{
+public abstract class scala.reflect.api.Trees$Tree extends java.lang.Object implements scala.Product{
 private final int id;
   Signature: I
 
diff --git c/scala/reflect/api/Trees$Try.class w/scala/reflect/api/Trees$Try.class
index 0906f6f316..89998dffc3 100644
--- c/scala/reflect/api/Trees$Try.class
+++ w/scala/reflect/api/Trees$Try.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Tree=class scala/reflect/api/Trees$Tree of class sc
 public abstract #= # of #; //TermTree=class scala/reflect/api/Trees$TermTree of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$Try extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$Try extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree block;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$TypeApply.class w/scala/reflect/api/Trees$TypeApply.class
index 4bb4c37d8e..9a0a8f2006 100644
--- c/scala/reflect/api/Trees$TypeApply.class
+++ w/scala/reflect/api/Trees$TypeApply.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //AbsSymbol=class scala/reflect/api/Symbols$AbsSymbol
 public abstract #= # of #; //GenericApply=class scala/reflect/api/Trees$GenericApply of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$TypeApply extends scala.reflect.api.Trees$GenericApply implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$TypeApply extends scala.reflect.api.Trees$GenericApply implements scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree fun;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$TypeBoundsTree.class w/scala/reflect/api/Trees$TypeBoundsTree.class
index f8ddcccb58..b2eab0ece2 100644
--- c/scala/reflect/api/Trees$TypeBoundsTree.class
+++ w/scala/reflect/api/Trees$TypeBoundsTree.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //TypTree=class scala/reflect/api/Trees$TypTree of cl
 public #= # of #; //TypeBoundsTree=class scala/reflect/api/Trees$TypeBoundsTree of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$TypeBoundsTree extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TypTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$TypeBoundsTree extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TypTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree lo;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$TypeDef.class w/scala/reflect/api/Trees$TypeDef.class
index d87bd7ed8c..d2e196cbb5 100644
--- c/scala/reflect/api/Trees$TypeDef.class
+++ w/scala/reflect/api/Trees$TypeDef.class
@@ -6,7 +6,7 @@ public abstract #= # of #; //MemberDef=class scala/reflect/api/Trees$MemberDef o
 public abstract #= # of #; //AbsModifiers=class scala/reflect/api/Trees$AbsModifiers of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$TypeDef extends scala.reflect.api.Trees$MemberDef implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$TypeDef extends scala.reflect.api.Trees$MemberDef implements scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$AbsModifiers mods;
   Signature: Lscala/reflect/api/Trees$AbsModifiers;
 
diff --git c/scala/reflect/api/Trees$TypeTree.class w/scala/reflect/api/Trees$TypeTree.class
index ebf4ce15ec..fcf216958e 100644
--- c/scala/reflect/api/Trees$TypeTree.class
+++ w/scala/reflect/api/Trees$TypeTree.class
@@ -6,7 +6,7 @@ public #= # of #; //TypeTree=class scala/reflect/api/Trees$TypeTree of class sca
 public abstract #= # of #; //AbsSymbol=class scala/reflect/api/Symbols$AbsSymbol of class scala/reflect/api/Symbols
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$TypeTree extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TypTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$TypeTree extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TypTree,scala.Product,scala.Serializable{
 private scala.reflect.api.Trees$Tree orig;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$Typed.class w/scala/reflect/api/Trees$Typed.class
index d9f8590df1..3e6a413740 100644
--- c/scala/reflect/api/Trees$Typed.class
+++ w/scala/reflect/api/Trees$Typed.class
@@ -4,7 +4,7 @@ public #= # of #; //Typed=class scala/reflect/api/Trees$Typed of class scala/ref
 public abstract #= # of #; //TermTree=class scala/reflect/api/Trees$TermTree of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$Typed extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$Typed extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree expr;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$UnApply.class w/scala/reflect/api/Trees$UnApply.class
index 1c15e53ecf..8cca8ef046 100644
--- c/scala/reflect/api/Trees$UnApply.class
+++ w/scala/reflect/api/Trees$UnApply.class
@@ -4,7 +4,7 @@ public #= # of #; //UnApply=class scala/reflect/api/Trees$UnApply of class scala
 public abstract #= # of #; //TermTree=class scala/reflect/api/Trees$TermTree of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$UnApply extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$UnApply extends scala.reflect.api.Trees$Tree implements scala.reflect.api.Trees$TermTree,scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$Tree fun;
   Signature: Lscala/reflect/api/Trees$Tree;
 
diff --git c/scala/reflect/api/Trees$ValDef.class w/scala/reflect/api/Trees$ValDef.class
index 17488e22ff..ca2b465968 100644
--- c/scala/reflect/api/Trees$ValDef.class
+++ w/scala/reflect/api/Trees$ValDef.class
@@ -6,7 +6,7 @@ public abstract #= # of #; //ValOrDefDef=class scala/reflect/api/Trees$ValOrDefD
 public abstract #= # of #; //AbsModifiers=class scala/reflect/api/Trees$AbsModifiers of class scala/reflect/api/Trees
 
 Compiled from "Trees.scala"
-public class scala.reflect.api.Trees$ValDef extends scala.reflect.api.Trees$ValOrDefDef implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.reflect.api.Trees$ValDef extends scala.reflect.api.Trees$ValOrDefDef implements scala.Product,scala.Serializable{
 private final scala.reflect.api.Trees$AbsModifiers mods;
   Signature: Lscala/reflect/api/Trees$AbsModifiers;
 
diff --git c/scala/reflect/api/Universe.class w/scala/reflect/api/Universe.class
index 91074ddd17..74dd6b8109 100644
--- c/scala/reflect/api/Universe.class
+++ w/scala/reflect/api/Universe.class
@@ -54,7 +54,7 @@ public final #= # of #; //SelectFromTypeTree$=class scala/reflect/api/Trees$Sele
 public final #= # of #; //ExistentialTypeTree$=class scala/reflect/api/Trees$ExistentialTypeTree$ of class scala/reflect/api/Trees
 
 Compiled from "Universe.scala"
-public abstract class scala.reflect.api.Universe extends java.lang.Object implements scala.reflect.api.Symbols,scala.reflect.api.Types,scala.reflect.api.Constants,scala.reflect.api.Scopes,scala.reflect.api.Names,scala.reflect.api.Trees,scala.reflect.api.Positions,scala.reflect.api.TreePrinters,scala.reflect.api.AnnotationInfos,scala.reflect.api.StandardDefinitions,scala.ScalaObject{
+public abstract class scala.reflect.api.Universe extends java.lang.Object implements scala.reflect.api.Symbols,scala.reflect.api.Types,scala.reflect.api.Constants,scala.reflect.api.Scopes,scala.reflect.api.Names,scala.reflect.api.Trees,scala.reflect.api.Positions,scala.reflect.api.TreePrinters,scala.reflect.api.AnnotationInfos,scala.reflect.api.StandardDefinitions{
 private int nodeCount;
   Signature: I
 
diff --git c/scala/runtime/AbstractFunction0.class w/scala/runtime/AbstractFunction0.class
index 948eb9f86c..5ab4f12c81 100644
diff --git c/scala/runtime/AbstractFunction1.class w/scala/runtime/AbstractFunction1.class
index addc8e23e2..4ba843bc84 100644
--- c/scala/runtime/AbstractFunction1.class
+++ w/scala/runtime/AbstractFunction1.class
@@ -1,6 +1,6 @@
 
 Compiled from "AbstractFunction1.scala"
-public abstract class scala.runtime.AbstractFunction1 extends java.lang.Object implements scala.Function1,scala.ScalaObject{
+public abstract class scala.runtime.AbstractFunction1 extends java.lang.Object implements scala.Function1{
 public boolean apply$mcZD$sp(double);
   Signature: (D)Z
   Code:
diff --git c/scala/runtime/AbstractFunction10.class w/scala/runtime/AbstractFunction10.class
index b82d68038c..caaebb6b0c 100644
diff --git c/scala/runtime/AbstractFunction11.class w/scala/runtime/AbstractFunction11.class
index f1f803cdef..78cdf7ba69 100644
--- c/scala/runtime/AbstractFunction11.class
+++ w/scala/runtime/AbstractFunction11.class
@@ -1,6 +1,6 @@
 
 Compiled from "AbstractFunction11.scala"
-public abstract class scala.runtime.AbstractFunction11 extends java.lang.Object implements scala.Function11,scala.ScalaObject{
+public abstract class scala.runtime.AbstractFunction11 extends java.lang.Object implements scala.Function11{
 public scala.Function1 curried();
   Signature: ()Lscala/Function1;
   Code:
diff --git c/scala/runtime/AbstractFunction12.class w/scala/runtime/AbstractFunction12.class
index a92e78ac3b..2cd1bb7b16 100644
--- c/scala/runtime/AbstractFunction12.class
+++ w/scala/runtime/AbstractFunction12.class
@@ -1,6 +1,6 @@
 
 Compiled from "AbstractFunction12.scala"
-public abstract class scala.runtime.AbstractFunction12 extends java.lang.Object implements scala.Function12,scala.ScalaObject{
+public abstract class scala.runtime.AbstractFunction12 extends java.lang.Object implements scala.Function12{
 public scala.Function1 curried();
   Signature: ()Lscala/Function1;
   Code:
diff --git c/scala/runtime/AbstractFunction13.class w/scala/runtime/AbstractFunction13.class
index e99a531693..3375f88cd6 100644
--- c/scala/runtime/AbstractFunction13.class
+++ w/scala/runtime/AbstractFunction13.class
@@ -1,6 +1,6 @@
 
 Compiled from "AbstractFunction13.scala"
-public abstract class scala.runtime.AbstractFunction13 extends java.lang.Object implements scala.Function13,scala.ScalaObject{
+public abstract class scala.runtime.AbstractFunction13 extends java.lang.Object implements scala.Function13{
 public scala.Function1 curried();
   Signature: ()Lscala/Function1;
   Code:
diff --git c/scala/runtime/AbstractFunction14.class w/scala/runtime/AbstractFunction14.class
index 05492256b2..cf2caf5431 100644
--- c/scala/runtime/AbstractFunction14.class
+++ w/scala/runtime/AbstractFunction14.class
@@ -1,6 +1,6 @@
 
 Compiled from "AbstractFunction14.scala"
-public abstract class scala.runtime.AbstractFunction14 extends java.lang.Object implements scala.Function14,scala.ScalaObject{
+public abstract class scala.runtime.AbstractFunction14 extends java.lang.Object implements scala.Function14{
 public scala.Function1 curried();
   Signature: ()Lscala/Function1;
   Code:
diff --git c/scala/runtime/AbstractFunction15.class w/scala/runtime/AbstractFunction15.class
index d181aa849d..e0795ea224 100644
--- c/scala/runtime/AbstractFunction15.class
+++ w/scala/runtime/AbstractFunction15.class
@@ -1,6 +1,6 @@
 
 Compiled from "AbstractFunction15.scala"
-public abstract class scala.runtime.AbstractFunction15 extends java.lang.Object implements scala.Function15,scala.ScalaObject{
+public abstract class scala.runtime.AbstractFunction15 extends java.lang.Object implements scala.Function15{
 public scala.Function1 curried();
   Signature: ()Lscala/Function1;
   Code:
diff --git c/scala/runtime/AbstractFunction16.class w/scala/runtime/AbstractFunction16.class
index 4bd2c81253..dbe4a89af4 100644
--- c/scala/runtime/AbstractFunction16.class
+++ w/scala/runtime/AbstractFunction16.class
@@ -1,6 +1,6 @@
 
 Compiled from "AbstractFunction16.scala"
-public abstract class scala.runtime.AbstractFunction16 extends java.lang.Object implements scala.Function16,scala.ScalaObject{
+public abstract class scala.runtime.AbstractFunction16 extends java.lang.Object implements scala.Function16{
 public scala.Function1 curried();
   Signature: ()Lscala/Function1;
   Code:
diff --git c/scala/runtime/AbstractFunction17.class w/scala/runtime/AbstractFunction17.class
index bb8c12f9b3..f266226fdc 100644
--- c/scala/runtime/AbstractFunction17.class
+++ w/scala/runtime/AbstractFunction17.class
@@ -1,6 +1,6 @@
 
 Compiled from "AbstractFunction17.scala"
-public abstract class scala.runtime.AbstractFunction17 extends java.lang.Object implements scala.Function17,scala.ScalaObject{
+public abstract class scala.runtime.AbstractFunction17 extends java.lang.Object implements scala.Function17{
 public scala.Function1 curried();
   Signature: ()Lscala/Function1;
   Code:
diff --git c/scala/runtime/AbstractFunction18.class w/scala/runtime/AbstractFunction18.class
index 3302b37225..f9736f1a94 100644
--- c/scala/runtime/AbstractFunction18.class
+++ w/scala/runtime/AbstractFunction18.class
@@ -1,6 +1,6 @@
 
 Compiled from "AbstractFunction18.scala"
-public abstract class scala.runtime.AbstractFunction18 extends java.lang.Object implements scala.Function18,scala.ScalaObject{
+public abstract class scala.runtime.AbstractFunction18 extends java.lang.Object implements scala.Function18{
 public scala.Function1 curried();
   Signature: ()Lscala/Function1;
   Code:
diff --git c/scala/runtime/AbstractFunction19.class w/scala/runtime/AbstractFunction19.class
index 9451f2253b..87eff6dc4d 100644
--- c/scala/runtime/AbstractFunction19.class
+++ w/scala/runtime/AbstractFunction19.class
@@ -1,6 +1,6 @@
 
 Compiled from "AbstractFunction19.scala"
-public abstract class scala.runtime.AbstractFunction19 extends java.lang.Object implements scala.Function19,scala.ScalaObject{
+public abstract class scala.runtime.AbstractFunction19 extends java.lang.Object implements scala.Function19{
 public scala.Function1 curried();
   Signature: ()Lscala/Function1;
   Code:
diff --git c/scala/runtime/AbstractFunction2.class w/scala/runtime/AbstractFunction2.class
index 9ee62637e6..3f6d41d520 100644
--- c/scala/runtime/AbstractFunction2.class
+++ w/scala/runtime/AbstractFunction2.class
@@ -1,6 +1,6 @@
 
 Compiled from "AbstractFunction2.scala"
-public abstract class scala.runtime.AbstractFunction2 extends java.lang.Object implements scala.Function2,scala.ScalaObject{
+public abstract class scala.runtime.AbstractFunction2 extends java.lang.Object implements scala.Function2{
 public boolean apply$mcZDD$sp(double, double);
   Signature: (DD)Z
   Code:
diff --git c/scala/runtime/AbstractFunction20.class w/scala/runtime/AbstractFunction20.class
index b15d1b29db..bcfbe9e1b6 100644
diff --git c/scala/runtime/AbstractFunction21.class w/scala/runtime/AbstractFunction21.class
index 8ee5a0c4b1..371d16a340 100644
--- c/scala/runtime/AbstractFunction21.class
+++ w/scala/runtime/AbstractFunction21.class
@@ -1,6 +1,6 @@
 
 Compiled from "AbstractFunction21.scala"
-public abstract class scala.runtime.AbstractFunction21 extends java.lang.Object implements scala.Function21,scala.ScalaObject{
+public abstract class scala.runtime.AbstractFunction21 extends java.lang.Object implements scala.Function21{
 public scala.Function1 curried();
   Signature: ()Lscala/Function1;
   Code:
diff --git c/scala/runtime/AbstractFunction22.class w/scala/runtime/AbstractFunction22.class
index 984c46e5e2..888f67806a 100644
--- c/scala/runtime/AbstractFunction22.class
+++ w/scala/runtime/AbstractFunction22.class
@@ -1,6 +1,6 @@
 
 Compiled from "AbstractFunction22.scala"
-public abstract class scala.runtime.AbstractFunction22 extends java.lang.Object implements scala.Function22,scala.ScalaObject{
+public abstract class scala.runtime.AbstractFunction22 extends java.lang.Object implements scala.Function22{
 public scala.Function1 curried();
   Signature: ()Lscala/Function1;
   Code:
diff --git c/scala/runtime/AbstractFunction3.class w/scala/runtime/AbstractFunction3.class
index 45f1dc6d2a..8a0b4f8eef 100644
--- c/scala/runtime/AbstractFunction3.class
+++ w/scala/runtime/AbstractFunction3.class
@@ -1,6 +1,6 @@
 
 Compiled from "AbstractFunction3.scala"
-public abstract class scala.runtime.AbstractFunction3 extends java.lang.Object implements scala.Function3,scala.ScalaObject{
+public abstract class scala.runtime.AbstractFunction3 extends java.lang.Object implements scala.Function3{
 public scala.Function1 curried();
   Signature: ()Lscala/Function1;
   Code:
diff --git c/scala/runtime/AbstractFunction4.class w/scala/runtime/AbstractFunction4.class
index c2a6365ce7..87bced3153 100644
--- c/scala/runtime/AbstractFunction4.class
+++ w/scala/runtime/AbstractFunction4.class
@@ -1,6 +1,6 @@
 
 Compiled from "AbstractFunction4.scala"
-public abstract class scala.runtime.AbstractFunction4 extends java.lang.Object implements scala.Function4,scala.ScalaObject{
+public abstract class scala.runtime.AbstractFunction4 extends java.lang.Object implements scala.Function4{
 public scala.Function1 curried();
   Signature: ()Lscala/Function1;
   Code:
diff --git c/scala/runtime/AbstractFunction5.class w/scala/runtime/AbstractFunction5.class
index 463be42086..65548608a1 100644
--- c/scala/runtime/AbstractFunction5.class
+++ w/scala/runtime/AbstractFunction5.class
@@ -1,6 +1,6 @@
 
 Compiled from "AbstractFunction5.scala"
-public abstract class scala.runtime.AbstractFunction5 extends java.lang.Object implements scala.Function5,scala.ScalaObject{
+public abstract class scala.runtime.AbstractFunction5 extends java.lang.Object implements scala.Function5{
 public scala.Function1 curried();
   Signature: ()Lscala/Function1;
   Code:
diff --git c/scala/runtime/AbstractFunction6.class w/scala/runtime/AbstractFunction6.class
index ec69eeb35f..94986101a0 100644
--- c/scala/runtime/AbstractFunction6.class
+++ w/scala/runtime/AbstractFunction6.class
@@ -1,6 +1,6 @@
 
 Compiled from "AbstractFunction6.scala"
-public abstract class scala.runtime.AbstractFunction6 extends java.lang.Object implements scala.Function6,scala.ScalaObject{
+public abstract class scala.runtime.AbstractFunction6 extends java.lang.Object implements scala.Function6{
 public scala.Function1 curried();
   Signature: ()Lscala/Function1;
   Code:
diff --git c/scala/runtime/AbstractFunction7.class w/scala/runtime/AbstractFunction7.class
index aadc103d8a..0e5481e7be 100644
--- c/scala/runtime/AbstractFunction7.class
+++ w/scala/runtime/AbstractFunction7.class
@@ -1,6 +1,6 @@
 
 Compiled from "AbstractFunction7.scala"
-public abstract class scala.runtime.AbstractFunction7 extends java.lang.Object implements scala.Function7,scala.ScalaObject{
+public abstract class scala.runtime.AbstractFunction7 extends java.lang.Object implements scala.Function7{
 public scala.Function1 curried();
   Signature: ()Lscala/Function1;
   Code:
diff --git c/scala/runtime/AbstractFunction8.class w/scala/runtime/AbstractFunction8.class
index fc2e21dc40..96f1a05370 100644
--- c/scala/runtime/AbstractFunction8.class
+++ w/scala/runtime/AbstractFunction8.class
@@ -1,6 +1,6 @@
 
 Compiled from "AbstractFunction8.scala"
-public abstract class scala.runtime.AbstractFunction8 extends java.lang.Object implements scala.Function8,scala.ScalaObject{
+public abstract class scala.runtime.AbstractFunction8 extends java.lang.Object implements scala.Function8{
 public scala.Function1 curried();
   Signature: ()Lscala/Function1;
   Code:
diff --git c/scala/runtime/AbstractFunction9.class w/scala/runtime/AbstractFunction9.class
index a58110811a..23ba8f8410 100644
--- c/scala/runtime/AbstractFunction9.class
+++ w/scala/runtime/AbstractFunction9.class
@@ -1,6 +1,6 @@
 
 Compiled from "AbstractFunction9.scala"
-public abstract class scala.runtime.AbstractFunction9 extends java.lang.Object implements scala.Function9,scala.ScalaObject{
+public abstract class scala.runtime.AbstractFunction9 extends java.lang.Object implements scala.Function9{
 public scala.Function1 curried();
   Signature: ()Lscala/Function1;
   Code:
diff --git c/scala/runtime/AbstractPartialFunction.class w/scala/runtime/AbstractPartialFunction.class
index 47ff62c408..55fba396de 100644
--- c/scala/runtime/AbstractPartialFunction.class
+++ w/scala/runtime/AbstractPartialFunction.class
@@ -1,6 +1,6 @@
 
 Compiled from "AbstractPartialFunction.scala"
-public abstract class scala.runtime.AbstractPartialFunction extends scala.runtime.AbstractFunction1 implements scala.PartialFunction,java.lang.Cloneable,scala.ScalaObject{
+public abstract class scala.runtime.AbstractPartialFunction extends scala.runtime.AbstractFunction1 implements scala.PartialFunction,java.lang.Cloneable{
 private scala.PartialFunction fallBackField;
   Signature: Lscala/PartialFunction;
 
diff --git c/scala/runtime/FractionalProxy.class w/scala/runtime/FractionalProxy.class
index 0d5968136c..61b84e7e49 100644
--- c/scala/runtime/FractionalProxy.class
+++ w/scala/runtime/FractionalProxy.class
@@ -5,7 +5,7 @@ public #= # of #; //Exclusive=class scala/collection/immutable/NumericRange$Excl
 public #= # of #; //Inclusive=class scala/collection/immutable/NumericRange$Inclusive of class scala/collection/immutable/NumericRange
 
 Compiled from "ScalaNumberProxy.scala"
-public abstract class scala.runtime.FractionalProxy extends scala.runtime.ScalaNumberProxy implements scala.runtime.RangedProxy,scala.ScalaObject{
+public abstract class scala.runtime.FractionalProxy extends scala.runtime.ScalaNumberProxy implements scala.runtime.RangedProxy{
 private final scala.math.Fractional evidence$#;
   Signature: Lscala/math/Fractional;
 
diff --git c/scala/runtime/IntegralProxy.class w/scala/runtime/IntegralProxy.class
index aabc5368fa..acaae1d15c 100644
--- c/scala/runtime/IntegralProxy.class
+++ w/scala/runtime/IntegralProxy.class
@@ -4,7 +4,7 @@ public #= # of #; //Exclusive=class scala/collection/immutable/NumericRange$Excl
 public #= # of #; //Inclusive=class scala/collection/immutable/NumericRange$Inclusive of class scala/collection/immutable/NumericRange
 
 Compiled from "ScalaNumberProxy.scala"
-public abstract class scala.runtime.IntegralProxy extends scala.runtime.ScalaWholeNumberProxy implements scala.runtime.RangedProxy,scala.ScalaObject{
+public abstract class scala.runtime.IntegralProxy extends scala.runtime.ScalaWholeNumberProxy implements scala.runtime.RangedProxy{
 private final scala.math.Integral evidence$#;
   Signature: Lscala/math/Integral;
 
diff --git c/scala/runtime/NonLocalReturnControl.class w/scala/runtime/NonLocalReturnControl.class
index a972d7321b..19650284f4 100644
--- c/scala/runtime/NonLocalReturnControl.class
+++ w/scala/runtime/NonLocalReturnControl.class
@@ -1,6 +1,6 @@
 
 Compiled from "NonLocalReturnControl.scala"
-public class scala.runtime.NonLocalReturnControl extends java.lang.Throwable implements scala.util.control.ControlThrowable,scala.ScalaObject{
+public class scala.runtime.NonLocalReturnControl extends java.lang.Throwable implements scala.util.control.ControlThrowable{
 private final java.lang.Object key;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/runtime/OrderedProxy.class w/scala/runtime/OrderedProxy.class
index 3104099869..32efe70f66 100644
--- c/scala/runtime/OrderedProxy.class
+++ w/scala/runtime/OrderedProxy.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //Typed=class scala/Proxy$Typed of class scala/Proxy
 
 Compiled from "ScalaNumberProxy.scala"
-public interface scala.runtime.OrderedProxy extends scala.Proxy$Typed,scala.math.Ordered,scala.ScalaObject{
+public interface scala.runtime.OrderedProxy extends scala.Proxy$Typed,scala.math.Ordered{
 public abstract scala.math.Ordering ord();
   Signature: ()Lscala/math/Ordering;
 
diff --git c/scala/runtime/RichBoolean.class w/scala/runtime/RichBoolean.class
index 8f5caa1858..c9dcf6097c 100644
--- c/scala/runtime/RichBoolean.class
+++ w/scala/runtime/RichBoolean.class
@@ -2,7 +2,7 @@ InnerClasses:
 public final #= # of #; //Boolean$=class scala/math/Ordering$Boolean$ of class scala/math/Ordering
 
 Compiled from "RichBoolean.scala"
-public final class scala.runtime.RichBoolean extends java.lang.Object implements scala.runtime.OrderedProxy,scala.ScalaObject{
+public final class scala.runtime.RichBoolean extends java.lang.Object implements scala.runtime.OrderedProxy{
 private final boolean self;
   Signature: Z
 
diff --git c/scala/runtime/RichInt.class w/scala/runtime/RichInt.class
index b0445bc993..520f5ba296 100644
--- c/scala/runtime/RichInt.class
+++ w/scala/runtime/RichInt.class
@@ -3,7 +3,7 @@ public #= # of #; //Inclusive=class scala/collection/immutable/Range$Inclusive o
 public final #= # of #; //IntIsIntegral$=class scala/math/Numeric$IntIsIntegral$ of class scala/math/Numeric
 
 Compiled from "RichInt.scala"
-public final class scala.runtime.RichInt extends scala.runtime.ScalaNumberProxy implements scala.runtime.RangedProxy,scala.ScalaObject{
+public final class scala.runtime.RichInt extends scala.runtime.ScalaNumberProxy implements scala.runtime.RangedProxy{
 private final int self;
   Signature: I
 
diff --git c/scala/runtime/ScalaNumberProxy.class w/scala/runtime/ScalaNumberProxy.class
index f5b245f447..ec2ae33926 100644
--- c/scala/runtime/ScalaNumberProxy.class
+++ w/scala/runtime/ScalaNumberProxy.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //Typed=class scala/Proxy$Typed of class scala/Proxy
 
 Compiled from "ScalaNumberProxy.scala"
-public abstract class scala.runtime.ScalaNumberProxy extends scala.math.ScalaNumber implements scala.math.ScalaNumericConversions,scala.Proxy$Typed,scala.runtime.OrderedProxy,scala.ScalaObject{
+public abstract class scala.runtime.ScalaNumberProxy extends scala.math.ScalaNumber implements scala.math.ScalaNumericConversions,scala.runtime.OrderedProxy{
 private final scala.math.Numeric num;
   Signature: Lscala/math/Numeric;
 
diff --git c/scala/sys/SystemProperties.class w/scala/sys/SystemProperties.class
index b0f0e833f3..8c924f8822 100644
--- c/scala/sys/SystemProperties.class
+++ w/scala/sys/SystemProperties.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "SystemProperties.scala"
-public class scala.sys.SystemProperties extends scala.collection.mutable.AbstractMap implements scala.collection.mutable.Map,scala.ScalaObject{
+public class scala.sys.SystemProperties extends scala.collection.mutable.AbstractMap implements scala.collection.mutable.Map{
 public static scala.sys.Prop traceSourcePath();
   Signature: ()Lscala/sys/Prop;
   Code:
diff --git c/scala/sys/process/Process$.class w/scala/sys/process/Process$.class
index b06439c470..3e8ac1bcf0 100644
--- c/scala/sys/process/Process$.class
+++ w/scala/sys/process/Process$.class
@@ -6,7 +6,7 @@ public abstract #= # of #; //URLBuilder=class scala/sys/process/ProcessBuilder$U
 public abstract #= # of #; //FileBuilder=class scala/sys/process/ProcessBuilder$FileBuilder of class scala/sys/process/ProcessBuilder
 
 Compiled from "Process.scala"
-public final class scala.sys.process.Process$ extends java.lang.Object implements scala.sys.process.ProcessImpl,scala.sys.process.ProcessCreation,scala.ScalaObject{
+public final class scala.sys.process.Process$ extends java.lang.Object implements scala.sys.process.ProcessImpl,scala.sys.process.ProcessCreation{
 public static final scala.sys.process.Process$ MODULE$;
   Signature: Lscala/sys/process/Process$;
 
diff --git c/scala/sys/process/ProcessBuilder$.class w/scala/sys/process/ProcessBuilder$.class
index 9ccb1a9553..37a68af459 100644
--- c/scala/sys/process/ProcessBuilder$.class
+++ w/scala/sys/process/ProcessBuilder$.class
@@ -7,7 +7,7 @@ public abstract #= # of #; //FileBuilder=class scala/sys/process/ProcessBuilder$
 public abstract #= # of #; //Source$class=class scala/sys/process/ProcessBuilder$Source$class of class scala/sys/process/ProcessBuilder
 
 Compiled from "ProcessBuilder.scala"
-public final class scala.sys.process.ProcessBuilder$ extends java.lang.Object implements scala.sys.process.ProcessBuilderImpl,scala.ScalaObject{
+public final class scala.sys.process.ProcessBuilder$ extends java.lang.Object implements scala.sys.process.ProcessBuilderImpl{
 public static final scala.sys.process.ProcessBuilder$ MODULE$;
   Signature: Lscala/sys/process/ProcessBuilder$;
 
diff --git c/scala/sys/process/ProcessBuilderImpl$AbstractBuilder.class w/scala/sys/process/ProcessBuilderImpl$AbstractBuilder.class
index 0def7b23b0..8c36e461b4 100644
--- c/scala/sys/process/ProcessBuilderImpl$AbstractBuilder.class
+++ w/scala/sys/process/ProcessBuilderImpl$AbstractBuilder.class
@@ -14,7 +14,7 @@ public abstract #= # of #; //AbstractBuilder=class scala/sys/process/ProcessBuil
 public #= # of #; //SequenceBuilder=class scala/sys/process/ProcessBuilderImpl$SequenceBuilder of class scala/sys/process/ProcessBuilderImpl
 
 Compiled from "ProcessBuilderImpl.scala"
-public abstract class scala.sys.process.ProcessBuilderImpl$AbstractBuilder extends java.lang.Object implements scala.sys.process.ProcessBuilder,scala.sys.process.ProcessBuilder$Sink,scala.sys.process.ProcessBuilder$Source,scala.ScalaObject{
+public abstract class scala.sys.process.ProcessBuilderImpl$AbstractBuilder extends java.lang.Object implements scala.sys.process.ProcessBuilder{
 public final scala.sys.process.ProcessBuilder$ $outer;
   Signature: Lscala/sys/process/ProcessBuilder$;
 
diff --git c/scala/sys/process/ProcessBuilderImpl$FileImpl.class w/scala/sys/process/ProcessBuilderImpl$FileImpl.class
index b40ebee82f..cd55e23281 100644
--- c/scala/sys/process/ProcessBuilderImpl$FileImpl.class
+++ w/scala/sys/process/ProcessBuilderImpl$FileImpl.class
@@ -12,7 +12,7 @@ public #= # of #; //PipedBuilder=class scala/sys/process/ProcessBuilderImpl$Pipe
 public #= # of #; //IStreamBuilder=class scala/sys/process/ProcessBuilderImpl$IStreamBuilder of class scala/sys/process/ProcessBuilderImpl
 
 Compiled from "ProcessBuilderImpl.scala"
-public class scala.sys.process.ProcessBuilderImpl$FileImpl extends java.lang.Object implements scala.sys.process.ProcessBuilder$FileBuilder,scala.sys.process.ProcessBuilder$Sink,scala.sys.process.ProcessBuilder$Source,scala.ScalaObject{
+public class scala.sys.process.ProcessBuilderImpl$FileImpl extends java.lang.Object implements scala.sys.process.ProcessBuilder$FileBuilder{
 private final java.io.File base;
   Signature: Ljava/io/File;
 
diff --git c/scala/sys/process/ProcessBuilderImpl$URLImpl.class w/scala/sys/process/ProcessBuilderImpl$URLImpl.class
index 1f2cecf8b6..f35b87db72 100644
--- c/scala/sys/process/ProcessBuilderImpl$URLImpl.class
+++ w/scala/sys/process/ProcessBuilderImpl$URLImpl.class
@@ -6,7 +6,7 @@ public abstract #= # of #; //Source$class=class scala/sys/process/ProcessBuilder
 public #= # of #; //URLInput=class scala/sys/process/ProcessBuilderImpl$URLInput of class scala/sys/process/ProcessBuilderImpl
 
 Compiled from "ProcessBuilderImpl.scala"
-public class scala.sys.process.ProcessBuilderImpl$URLImpl extends java.lang.Object implements scala.sys.process.ProcessBuilder$URLBuilder,scala.sys.process.ProcessBuilder$Source,scala.ScalaObject{
+public class scala.sys.process.ProcessBuilderImpl$URLImpl extends java.lang.Object implements scala.sys.process.ProcessBuilder$URLBuilder{
 private final java.net.URL url;
   Signature: Ljava/net/URL;
 
diff --git c/scala/sys/process/package$.class w/scala/sys/process/package$.class
index 51a7ce28dc..1879d85399 100644
--- c/scala/sys/process/package$.class
+++ w/scala/sys/process/package$.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //URLBuilder=class scala/sys/process/ProcessBuilder$U
 public abstract #= # of #; //FileBuilder=class scala/sys/process/ProcessBuilder$FileBuilder of class scala/sys/process/ProcessBuilder
 
 Compiled from "package.scala"
-public final class scala.sys.process.package$ extends java.lang.Object implements scala.sys.process.ProcessImplicits,scala.ScalaObject{
+public final class scala.sys.process.package$ extends java.lang.Object implements scala.sys.process.ProcessImplicits{
 public static final scala.sys.process.package$ MODULE$;
   Signature: Lscala/sys/process/package$;
 
diff --git c/scala/text/DocBreak$.class w/scala/text/DocBreak$.class
index 01621c1b5d..0e07aeb099 100644
--- c/scala/text/DocBreak$.class
+++ w/scala/text/DocBreak$.class
@@ -1,6 +1,6 @@
 
 Compiled from "Document.scala"
-public final class scala.text.DocBreak$ extends scala.text.Document implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.text.DocBreak$ extends scala.text.Document implements scala.Product,scala.Serializable{
 public static final scala.text.DocBreak$ MODULE$;
   Signature: Lscala/text/DocBreak$;
 
diff --git c/scala/text/DocCons.class w/scala/text/DocCons.class
index 7472647d68..1d571c2a49 100644
--- c/scala/text/DocCons.class
+++ w/scala/text/DocCons.class
@@ -1,6 +1,6 @@
 
 Compiled from "Document.scala"
-public class scala.text.DocCons extends scala.text.Document implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.text.DocCons extends scala.text.Document implements scala.Product,scala.Serializable{
 private final scala.text.Document hd;
   Signature: Lscala/text/Document;
 
diff --git c/scala/text/DocGroup.class w/scala/text/DocGroup.class
index 6068f9cc9f..b1cccc6780 100644
--- c/scala/text/DocGroup.class
+++ w/scala/text/DocGroup.class
@@ -1,6 +1,6 @@
 
 Compiled from "Document.scala"
-public class scala.text.DocGroup extends scala.text.Document implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.text.DocGroup extends scala.text.Document implements scala.Product,scala.Serializable{
 private final scala.text.Document doc;
   Signature: Lscala/text/Document;
 
diff --git c/scala/text/DocNest.class w/scala/text/DocNest.class
index d3d72acd79..c1930c0e0b 100644
--- c/scala/text/DocNest.class
+++ w/scala/text/DocNest.class
@@ -1,6 +1,6 @@
 
 Compiled from "Document.scala"
-public class scala.text.DocNest extends scala.text.Document implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.text.DocNest extends scala.text.Document implements scala.Product,scala.Serializable{
 private final int indent;
   Signature: I
 
diff --git c/scala/text/DocNil$.class w/scala/text/DocNil$.class
index 9afb47faff..4776161cb4 100644
--- c/scala/text/DocNil$.class
+++ w/scala/text/DocNil$.class
@@ -1,6 +1,6 @@
 
 Compiled from "Document.scala"
-public final class scala.text.DocNil$ extends scala.text.Document implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.text.DocNil$ extends scala.text.Document implements scala.Product,scala.Serializable{
 public static final scala.text.DocNil$ MODULE$;
   Signature: Lscala/text/DocNil$;
 
diff --git c/scala/text/DocText.class w/scala/text/DocText.class
index a343fb6ab6..866adc5eab 100644
--- c/scala/text/DocText.class
+++ w/scala/text/DocText.class
@@ -1,6 +1,6 @@
 
 Compiled from "Document.scala"
-public class scala.text.DocText extends scala.text.Document implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.text.DocText extends scala.text.Document implements scala.Product,scala.Serializable{
 private final java.lang.String txt;
   Signature: Ljava/lang/String;
 
diff --git c/scala/util/MurmurHash.class w/scala/util/MurmurHash.class
index 6e9984a7cc..4f482e86a6 100644
--- c/scala/util/MurmurHash.class
+++ w/scala/util/MurmurHash.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "MurmurHash.scala"
-public class scala.util.MurmurHash extends java.lang.Object implements scala.Function1,scala.ScalaObject{
+public class scala.util.MurmurHash extends java.lang.Object implements scala.Function1{
 private final int seed;
   Signature: I
 
diff --git c/scala/util/Properties$.class w/scala/util/Properties$.class
index a3711a8873..3b13b77101 100644
--- c/scala/util/Properties$.class
+++ w/scala/util/Properties$.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //Name=class java/util/jar/Attributes$Name of class java/util/jar/Attributes
 
 Compiled from "Properties.scala"
-public final class scala.util.Properties$ extends java.lang.Object implements scala.util.PropertiesTrait,scala.ScalaObject{
+public final class scala.util.Properties$ extends java.lang.Object implements scala.util.PropertiesTrait{
 public static final scala.util.Properties$ MODULE$;
   Signature: Lscala/util/Properties$;
 
diff --git c/scala/util/control/BreakControl.class w/scala/util/control/BreakControl.class
index a1aff0afe6..fb2be06b11 100644
--- c/scala/util/control/BreakControl.class
+++ w/scala/util/control/BreakControl.class
@@ -1,6 +1,6 @@
 
 Compiled from "Breaks.scala"
-public class scala.util.control.BreakControl extends java.lang.Throwable implements scala.util.control.ControlThrowable,scala.ScalaObject{
+public class scala.util.control.BreakControl extends java.lang.Throwable implements scala.util.control.ControlThrowable{
 public java.lang.Throwable scala$util$control$NoStackTrace$$super$fillInStackTrace();
   Signature: ()Ljava/lang/Throwable;
   Code:
diff --git c/scala/util/control/Exception$Catch.class w/scala/util/control/Exception$Catch.class
index f4e2c294a7..2fdbc90fb6 100644
--- c/scala/util/control/Exception$Catch.class
+++ w/scala/util/control/Exception$Catch.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //Described=class scala/util/control/Exception$Descri
 public abstract #= # of #; //Described$class=class scala/util/control/Exception$Described$class of class scala/util/control/Exception
 
 Compiled from "Exception.scala"
-public class scala.util.control.Exception$Catch extends java.lang.Object implements scala.util.control.Exception$Described,scala.ScalaObject{
+public class scala.util.control.Exception$Catch extends java.lang.Object implements scala.util.control.Exception$Described{
 private final scala.PartialFunction pf;
   Signature: Lscala/PartialFunction;
 
diff --git c/scala/util/control/Exception$Finally.class w/scala/util/control/Exception$Finally.class
index 7b809b20c2..ae07696f22 100644
--- c/scala/util/control/Exception$Finally.class
+++ w/scala/util/control/Exception$Finally.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Described=class scala/util/control/Exception$Descri
 public abstract #= # of #; //Described$class=class scala/util/control/Exception$Described$class of class scala/util/control/Exception
 
 Compiled from "Exception.scala"
-public class scala.util.control.Exception$Finally extends java.lang.Object implements scala.util.control.Exception$Described,scala.ScalaObject{
+public class scala.util.control.Exception$Finally extends java.lang.Object implements scala.util.control.Exception$Described{
 
 private final java.lang.String name;
   Signature: Ljava/lang/String;
diff --git c/scala/util/control/TailCalls$Call.class w/scala/util/control/TailCalls$Call.class
index 3dbe0bb403..c957e1a1fa 100644
--- c/scala/util/control/TailCalls$Call.class
+++ w/scala/util/control/TailCalls$Call.class
@@ -3,7 +3,7 @@ public #= # of #; //Call=class scala/util/control/TailCalls$Call of class scala/
 public abstract #= # of #; //TailRec=class scala/util/control/TailCalls$TailRec of class scala/util/control/TailCalls
 
 Compiled from "TailCalls.scala"
-public class scala.util.control.TailCalls$Call extends scala.util.control.TailCalls$TailRec implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.control.TailCalls$Call extends scala.util.control.TailCalls$TailRec implements scala.Product,scala.Serializable{
 
   Code:
 #:	areturn
diff --git c/scala/util/control/TailCalls$Done.class w/scala/util/control/TailCalls$Done.class
index 7e6aa3c9c4..21a5af112c 100644
--- c/scala/util/control/TailCalls$Done.class
+++ w/scala/util/control/TailCalls$Done.class
@@ -3,7 +3,7 @@ public #= # of #; //Done=class scala/util/control/TailCalls$Done of class scala/
 public abstract #= # of #; //TailRec=class scala/util/control/TailCalls$TailRec of class scala/util/control/TailCalls
 
 Compiled from "TailCalls.scala"
-public class scala.util.control.TailCalls$Done extends scala.util.control.TailCalls$TailRec implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.control.TailCalls$Done extends scala.util.control.TailCalls$TailRec implements scala.Product,scala.Serializable{
 private final java.lang.Object result;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/util/grammar/AnyHedgeRHS$.class w/scala/util/grammar/AnyHedgeRHS$.class
index eff8e58f93..03c9155a3a 100644
--- c/scala/util/grammar/AnyHedgeRHS$.class
+++ w/scala/util/grammar/AnyHedgeRHS$.class
@@ -1,6 +1,6 @@
 
 Compiled from "HedgeRHS.scala"
-public final class scala.util.grammar.AnyHedgeRHS$ extends scala.util.grammar.HedgeRHS implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.util.grammar.AnyHedgeRHS$ extends scala.util.grammar.HedgeRHS implements scala.Product,scala.Serializable{
 public static final scala.util.grammar.AnyHedgeRHS$ MODULE$;
   Signature: Lscala/util/grammar/AnyHedgeRHS$;
 
diff --git c/scala/util/grammar/AnyTreeRHS$.class w/scala/util/grammar/AnyTreeRHS$.class
index fa33f1ec05..83689ae1c1 100644
--- c/scala/util/grammar/AnyTreeRHS$.class
+++ w/scala/util/grammar/AnyTreeRHS$.class
@@ -1,6 +1,6 @@
 
 Compiled from "TreeRHS.scala"
-public final class scala.util.grammar.AnyTreeRHS$ extends scala.util.grammar.TreeRHS implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.util.grammar.AnyTreeRHS$ extends scala.util.grammar.TreeRHS implements scala.Product,scala.Serializable{
 public static final scala.util.grammar.AnyTreeRHS$ MODULE$;
   Signature: Lscala/util/grammar/AnyTreeRHS$;
 
diff --git c/scala/util/grammar/ConsRHS.class w/scala/util/grammar/ConsRHS.class
index 1819e86c13..c1bf64f2aa 100644
--- c/scala/util/grammar/ConsRHS.class
+++ w/scala/util/grammar/ConsRHS.class
@@ -1,6 +1,6 @@
 
 Compiled from "HedgeRHS.scala"
-public class scala.util.grammar.ConsRHS extends scala.util.grammar.HedgeRHS implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.grammar.ConsRHS extends scala.util.grammar.HedgeRHS implements scala.Product,scala.Serializable{
 private final int tnt;
   Signature: I
 
diff --git c/scala/util/grammar/EmptyHedgeRHS$.class w/scala/util/grammar/EmptyHedgeRHS$.class
index 20d34a2835..08a1aea391 100644
--- c/scala/util/grammar/EmptyHedgeRHS$.class
+++ w/scala/util/grammar/EmptyHedgeRHS$.class
@@ -1,6 +1,6 @@
 
 Compiled from "HedgeRHS.scala"
-public final class scala.util.grammar.EmptyHedgeRHS$ extends scala.util.grammar.HedgeRHS implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.util.grammar.EmptyHedgeRHS$ extends scala.util.grammar.HedgeRHS implements scala.Product,scala.Serializable{
 public static final scala.util.grammar.EmptyHedgeRHS$ MODULE$;
   Signature: Lscala/util/grammar/EmptyHedgeRHS$;
 
diff --git c/scala/util/grammar/LabelledRHS.class w/scala/util/grammar/LabelledRHS.class
index 4545a0a034..e8b412c0dd 100644
--- c/scala/util/grammar/LabelledRHS.class
+++ w/scala/util/grammar/LabelledRHS.class
@@ -1,6 +1,6 @@
 
 Compiled from "TreeRHS.scala"
-public class scala.util.grammar.LabelledRHS extends scala.util.grammar.TreeRHS implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.grammar.LabelledRHS extends scala.util.grammar.TreeRHS implements scala.Product,scala.Serializable{
 private final java.lang.Object label;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/util/logging/ConsoleLogger.class w/scala/util/logging/ConsoleLogger.class
index 966bd34cfd..a4ea913c21 100644
--- c/scala/util/logging/ConsoleLogger.class
+++ w/scala/util/logging/ConsoleLogger.class
@@ -1,6 +1,6 @@
 
 Compiled from "ConsoleLogger.scala"
-public interface scala.util.logging.ConsoleLogger extends scala.util.logging.Logged,scala.ScalaObject{
+public interface scala.util.logging.ConsoleLogger extends scala.util.logging.Logged{
 public abstract void log(java.lang.String);
   Signature: (Ljava/lang/String;)V
 
diff --git c/scala/util/matching/Regex$Match.class w/scala/util/matching/Regex$Match.class
index adaefbfb98..c640a27924 100644
--- c/scala/util/matching/Regex$Match.class
+++ w/scala/util/matching/Regex$Match.class
@@ -5,7 +5,7 @@ public #= # of #; //Inclusive=class scala/collection/immutable/Range$Inclusive o
 public abstract #= # of #; //MatchData$class=class scala/util/matching/Regex$MatchData$class of class scala/util/matching/Regex
 
 Compiled from "Regex.scala"
-public class scala.util.matching.Regex$Match extends java.lang.Object implements scala.util.matching.Regex$MatchData,scala.ScalaObject{
+public class scala.util.matching.Regex$Match extends java.lang.Object implements scala.util.matching.Regex$MatchData{
 private final java.lang.CharSequence source;
   Signature: Ljava/lang/CharSequence;
 
diff --git c/scala/util/matching/Regex$MatchIterator.class w/scala/util/matching/Regex$MatchIterator.class
index 79f4973c0d..aa6e86f612 100644
--- c/scala/util/matching/Regex$MatchIterator.class
+++ w/scala/util/matching/Regex$MatchIterator.class
@@ -4,7 +4,7 @@ public #= # of #; //MatchIterator=class scala/util/matching/Regex$MatchIterator
 public abstract #= # of #; //MatchData$class=class scala/util/matching/Regex$MatchData$class of class scala/util/matching/Regex
 
 Compiled from "Regex.scala"
-public class scala.util.matching.Regex$MatchIterator extends scala.collection.AbstractIterator implements scala.collection.Iterator,scala.util.matching.Regex$MatchData,scala.ScalaObject{
+public class scala.util.matching.Regex$MatchIterator extends scala.collection.AbstractIterator implements scala.collection.Iterator,scala.util.matching.Regex$MatchData{
 private final java.lang.CharSequence source;
   Signature: Ljava/lang/CharSequence;
 
diff --git c/scala/util/parsing/ast/AbstractSyntax$NameElement.class w/scala/util/parsing/ast/AbstractSyntax$NameElement.class
index 3894c2f278..e47e429806 100644
--- c/scala/util/parsing/ast/AbstractSyntax$NameElement.class
+++ w/scala/util/parsing/ast/AbstractSyntax$NameElement.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Element=class scala/util/parsing/ast/AbstractSyntax
 public abstract #= # of #; //NameElement=class scala/util/parsing/ast/AbstractSyntax$NameElement of class scala/util/parsing/ast/AbstractSyntax
 
 Compiled from "AbstractSyntax.scala"
-public interface scala.util.parsing.ast.AbstractSyntax$NameElement extends scala.util.parsing.ast.AbstractSyntax$Element,scala.ScalaObject{
+public interface scala.util.parsing.ast.AbstractSyntax$NameElement extends scala.util.parsing.ast.AbstractSyntax$Element{
 public abstract java.lang.String name();
   Signature: ()Ljava/lang/String;
 
diff --git c/scala/util/parsing/ast/Binders$BoundElement.class w/scala/util/parsing/ast/Binders$BoundElement.class
index 9df1d3bbe2..8c5224cf4e 100644
--- c/scala/util/parsing/ast/Binders$BoundElement.class
+++ w/scala/util/parsing/ast/Binders$BoundElement.class
@@ -7,7 +7,7 @@ public abstract #= # of #; //NameElement=class scala/util/parsing/ast/AbstractSy
 public abstract #= # of #; //NameElement$class=class scala/util/parsing/ast/AbstractSyntax$NameElement$class of class scala/util/parsing/ast/AbstractSyntax
 
 Compiled from "Binders.scala"
-public class scala.util.parsing.ast.Binders$BoundElement extends java.lang.Object implements scala.util.parsing.ast.AbstractSyntax$NameElement,scala.Proxy,scala.util.parsing.ast.Binders$BindingSensitive,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.parsing.ast.Binders$BoundElement extends java.lang.Object implements scala.util.parsing.ast.AbstractSyntax$NameElement,scala.Proxy,scala.util.parsing.ast.Binders$BindingSensitive,scala.Product,scala.Serializable{
 private final scala.util.parsing.ast.AbstractSyntax$NameElement el;
   Signature: Lscala/util/parsing/ast/AbstractSyntax$NameElement;
 
diff --git c/scala/util/parsing/ast/Binders$Scope.class w/scala/util/parsing/ast/Binders$Scope.class
index f5ff796067..ad04266d79 100644
--- c/scala/util/parsing/ast/Binders$Scope.class
+++ w/scala/util/parsing/ast/Binders$Scope.class
@@ -6,7 +6,7 @@ public abstract #= # of #; //Element=class scala/util/parsing/ast/AbstractSyntax
 public abstract #= # of #; //NameElement=class scala/util/parsing/ast/AbstractSyntax$NameElement of class scala/util/parsing/ast/AbstractSyntax
 
 Compiled from "Binders.scala"
-public class scala.util.parsing.ast.Binders$Scope extends scala.collection.AbstractIterable implements scala.collection.Iterable,scala.ScalaObject{
+public class scala.util.parsing.ast.Binders$Scope extends scala.collection.AbstractIterable implements scala.collection.Iterable{
 private final scala.collection.mutable.Map substitution;
   Signature: Lscala/collection/mutable/Map;
 
diff --git c/scala/util/parsing/ast/Binders$UnboundElement.class w/scala/util/parsing/ast/Binders$UnboundElement.class
index b260010532..a5c26b741e 100644
--- c/scala/util/parsing/ast/Binders$UnboundElement.class
+++ w/scala/util/parsing/ast/Binders$UnboundElement.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //NameElement=class scala/util/parsing/ast/AbstractSy
 public abstract #= # of #; //NameElement$class=class scala/util/parsing/ast/AbstractSyntax$NameElement$class of class scala/util/parsing/ast/AbstractSyntax
 
 Compiled from "Binders.scala"
-public class scala.util.parsing.ast.Binders$UnboundElement extends java.lang.Object implements scala.util.parsing.ast.AbstractSyntax$NameElement,scala.ScalaObject{
+public class scala.util.parsing.ast.Binders$UnboundElement extends java.lang.Object implements scala.util.parsing.ast.AbstractSyntax$NameElement{
 private final scala.util.parsing.ast.AbstractSyntax$NameElement el;
   Signature: Lscala/util/parsing/ast/AbstractSyntax$NameElement;
 
diff --git c/scala/util/parsing/ast/Binders$UnderBinder.class w/scala/util/parsing/ast/Binders$UnderBinder.class
index cfd4f3ce8f..d23121294b 100644
--- c/scala/util/parsing/ast/Binders$UnderBinder.class
+++ w/scala/util/parsing/ast/Binders$UnderBinder.class
@@ -7,7 +7,7 @@ public abstract #= # of #; //Element=class scala/util/parsing/ast/AbstractSyntax
 public abstract #= # of #; //BindingSensitive=class scala/util/parsing/ast/Binders$BindingSensitive of class scala/util/parsing/ast/Binders
 
 Compiled from "Binders.scala"
-public class scala.util.parsing.ast.Binders$UnderBinder extends java.lang.Object implements scala.util.parsing.ast.AbstractSyntax$Element,scala.util.parsing.ast.Binders$BindingSensitive,scala.ScalaObject{
+public class scala.util.parsing.ast.Binders$UnderBinder extends java.lang.Object implements scala.util.parsing.ast.AbstractSyntax$Element,scala.util.parsing.ast.Binders$BindingSensitive{
 private final scala.util.parsing.ast.Binders$Scope scope;
   Signature: Lscala/util/parsing/ast/Binders$Scope;
 
diff --git c/scala/util/parsing/ast/Binders.class w/scala/util/parsing/ast/Binders.class
index 4b339a3a4b..986e018b05 100644
--- c/scala/util/parsing/ast/Binders.class
+++ w/scala/util/parsing/ast/Binders.class
@@ -14,7 +14,7 @@ public abstract #= # of #; //BindingSensitive=class scala/util/parsing/ast/Binde
 public abstract #= # of #; //NameElement=class scala/util/parsing/ast/AbstractSyntax$NameElement of class scala/util/parsing/ast/AbstractSyntax
 
 Compiled from "Binders.scala"
-public interface scala.util.parsing.ast.Binders extends scala.util.parsing.ast.AbstractSyntax,scala.util.parsing.ast.Mappable,scala.ScalaObject{
+public interface scala.util.parsing.ast.Binders extends scala.util.parsing.ast.AbstractSyntax,scala.util.parsing.ast.Mappable{
 public abstract scala.util.parsing.ast.Binders$BoundElement$ BoundElement();
   Signature: ()Lscala/util/parsing/ast/Binders$BoundElement$;
 
diff --git c/scala/util/parsing/combinator/JavaTokenParsers.class w/scala/util/parsing/combinator/JavaTokenParsers.class
index 52cfadede5..e73d362d81 100644
--- c/scala/util/parsing/combinator/JavaTokenParsers.class
+++ w/scala/util/parsing/combinator/JavaTokenParsers.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //Parser=class scala/util/parsing/combinator/Parsers$Parser of class scala/util/parsing/combinator/Parsers
 
 Compiled from "JavaTokenParsers.scala"
-public interface scala.util.parsing.combinator.JavaTokenParsers extends scala.util.parsing.combinator.RegexParsers,scala.ScalaObject{
+public interface scala.util.parsing.combinator.JavaTokenParsers extends scala.util.parsing.combinator.RegexParsers{
 public abstract scala.util.parsing.combinator.Parsers$Parser ident();
   Signature: ()Lscala/util/parsing/combinator/Parsers$Parser;
 
diff --git c/scala/util/parsing/combinator/PackratParsers$Head.class w/scala/util/parsing/combinator/PackratParsers$Head.class
index 3aa6fbfa15..e509f00d05 100644
--- c/scala/util/parsing/combinator/PackratParsers$Head.class
+++ w/scala/util/parsing/combinator/PackratParsers$Head.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Parser=class scala/util/parsing/combinator/Parsers$
 public #= # of #; //Head=class scala/util/parsing/combinator/PackratParsers$Head of class scala/util/parsing/combinator/PackratParsers
 
 Compiled from "PackratParsers.scala"
-public class scala.util.parsing.combinator.PackratParsers$Head extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.parsing.combinator.PackratParsers$Head extends java.lang.Object implements scala.Product,scala.Serializable{
 private scala.util.parsing.combinator.Parsers$Parser headParser;
   Signature: Lscala/util/parsing/combinator/Parsers$Parser;
 
diff --git c/scala/util/parsing/combinator/PackratParsers$LR.class w/scala/util/parsing/combinator/PackratParsers$LR.class
index 4fa2330478..0c01ef48c6 100644
--- c/scala/util/parsing/combinator/PackratParsers$LR.class
+++ w/scala/util/parsing/combinator/PackratParsers$LR.class
@@ -4,7 +4,7 @@ public #= # of #; //LR=class scala/util/parsing/combinator/PackratParsers$LR of
 public abstract #= # of #; //ParseResult=class scala/util/parsing/combinator/Parsers$ParseResult of class scala/util/parsing/combinator/Parsers
 
 Compiled from "PackratParsers.scala"
-public class scala.util.parsing.combinator.PackratParsers$LR extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.parsing.combinator.PackratParsers$LR extends java.lang.Object implements scala.Product,scala.Serializable{
 private scala.util.parsing.combinator.Parsers$ParseResult seed;
   Signature: Lscala/util/parsing/combinator/Parsers$ParseResult;
 
diff --git c/scala/util/parsing/combinator/PackratParsers$MemoEntry.class w/scala/util/parsing/combinator/PackratParsers$MemoEntry.class
index 5f552a23b8..b6f03c2e96 100644
--- c/scala/util/parsing/combinator/PackratParsers$MemoEntry.class
+++ w/scala/util/parsing/combinator/PackratParsers$MemoEntry.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //ParseResult=class scala/util/parsing/combinator/Par
 public #= # of #; //MemoEntry=class scala/util/parsing/combinator/PackratParsers$MemoEntry of class scala/util/parsing/combinator/PackratParsers
 
 Compiled from "PackratParsers.scala"
-public class scala.util.parsing.combinator.PackratParsers$MemoEntry extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.parsing.combinator.PackratParsers$MemoEntry extends java.lang.Object implements scala.Product,scala.Serializable{
 private scala.Either r;
   Signature: Lscala/Either;
 
diff --git c/scala/util/parsing/combinator/PackratParsers.class w/scala/util/parsing/combinator/PackratParsers.class
index 4ffe162849..1a81fde829 100644
--- c/scala/util/parsing/combinator/PackratParsers.class
+++ w/scala/util/parsing/combinator/PackratParsers.class
@@ -10,7 +10,7 @@ public abstract #= # of #; //PackratParser=class scala/util/parsing/combinator/P
 public #= # of #; //PackratReader=class scala/util/parsing/combinator/PackratParsers$PackratReader of class scala/util/parsing/combinator/PackratParsers
 
 Compiled from "PackratParsers.scala"
-public interface scala.util.parsing.combinator.PackratParsers extends scala.util.parsing.combinator.Parsers,scala.ScalaObject{
+public interface scala.util.parsing.combinator.PackratParsers extends scala.util.parsing.combinator.Parsers{
 public abstract scala.util.parsing.combinator.Parsers$Parser scala$util$parsing$combinator$PackratParsers$$super$phrase(scala.util.parsing.combinator.Parsers$Parser);
   Signature: (Lscala/util/parsing/combinator/Parsers$Parser;)Lscala/util/parsing/combinator/Parsers$Parser;
 
diff --git c/scala/util/parsing/combinator/Parsers$$tilde.class w/scala/util/parsing/combinator/Parsers$$tilde.class
index 6f71e6191b..a912ac83b6 100644
--- c/scala/util/parsing/combinator/Parsers$$tilde.class
+++ w/scala/util/parsing/combinator/Parsers$$tilde.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //$tilde=class scala/util/parsing/combinator/Parsers$$tilde of class scala/util/parsing/combinator/Parsers
 
 Compiled from "Parsers.scala"
-public class scala.util.parsing.combinator.Parsers$$tilde extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.parsing.combinator.Parsers$$tilde extends java.lang.Object implements scala.Product,scala.Serializable{
 private final java.lang.Object _1;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/util/parsing/combinator/Parsers$Error.class w/scala/util/parsing/combinator/Parsers$Error.class
index 86dd444992..4ba66fa7ae 100644
--- c/scala/util/parsing/combinator/Parsers$Error.class
+++ w/scala/util/parsing/combinator/Parsers$Error.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //NoSuccess=class scala/util/parsing/combinator/Parse
 public abstract #= # of #; //ParseResult=class scala/util/parsing/combinator/Parsers$ParseResult of class scala/util/parsing/combinator/Parsers
 
 Compiled from "Parsers.scala"
-public class scala.util.parsing.combinator.Parsers$Error extends scala.util.parsing.combinator.Parsers$NoSuccess implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.parsing.combinator.Parsers$Error extends scala.util.parsing.combinator.Parsers$NoSuccess implements scala.Product,scala.Serializable{
 public java.lang.String msg();
   Signature: ()Ljava/lang/String;
   Code:
diff --git c/scala/util/parsing/combinator/Parsers$Failure.class w/scala/util/parsing/combinator/Parsers$Failure.class
index 5a6bbc3404..500f06563b 100644
--- c/scala/util/parsing/combinator/Parsers$Failure.class
+++ w/scala/util/parsing/combinator/Parsers$Failure.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //NoSuccess=class scala/util/parsing/combinator/Parse
 public abstract #= # of #; //ParseResult=class scala/util/parsing/combinator/Parsers$ParseResult of class scala/util/parsing/combinator/Parsers
 
 Compiled from "Parsers.scala"
-public class scala.util.parsing.combinator.Parsers$Failure extends scala.util.parsing.combinator.Parsers$NoSuccess implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.parsing.combinator.Parsers$Failure extends scala.util.parsing.combinator.Parsers$NoSuccess implements scala.Product,scala.Serializable{
 public java.lang.String msg();
   Signature: ()Ljava/lang/String;
   Code:
diff --git c/scala/util/parsing/combinator/Parsers$Parser.class w/scala/util/parsing/combinator/Parsers$Parser.class
index eef8e40fc7..7429c760ae 100644
--- c/scala/util/parsing/combinator/Parsers$Parser.class
+++ w/scala/util/parsing/combinator/Parsers$Parser.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //OnceParser=class scala/util/parsing/combinator/Pars
 public abstract #= # of #; //ParseResult=class scala/util/parsing/combinator/Parsers$ParseResult of class scala/util/parsing/combinator/Parsers
 
 Compiled from "Parsers.scala"
-public abstract class scala.util.parsing.combinator.Parsers$Parser extends java.lang.Object implements scala.Function1,scala.ScalaObject{
+public abstract class scala.util.parsing.combinator.Parsers$Parser extends java.lang.Object implements scala.Function1{
 private java.lang.String name;
   Signature: Ljava/lang/String;
 
diff --git c/scala/util/parsing/combinator/Parsers$Success.class w/scala/util/parsing/combinator/Parsers$Success.class
index f77921d240..1783fd8a2a 100644
--- c/scala/util/parsing/combinator/Parsers$Success.class
+++ w/scala/util/parsing/combinator/Parsers$Success.class
@@ -4,7 +4,7 @@ public #= # of #; //Failure=class scala/util/parsing/combinator/Parsers$Failure
 public abstract #= # of #; //ParseResult=class scala/util/parsing/combinator/Parsers$ParseResult of class scala/util/parsing/combinator/Parsers
 
 Compiled from "Parsers.scala"
-public class scala.util.parsing.combinator.Parsers$Success extends scala.util.parsing.combinator.Parsers$ParseResult implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.parsing.combinator.Parsers$Success extends scala.util.parsing.combinator.Parsers$ParseResult implements scala.Product,scala.Serializable{
 private final java.lang.Object result;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/util/parsing/combinator/RegexParsers.class w/scala/util/parsing/combinator/RegexParsers.class
index 58c4116a83..630025f501 100644
--- c/scala/util/parsing/combinator/RegexParsers.class
+++ w/scala/util/parsing/combinator/RegexParsers.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Parser=class scala/util/parsing/combinator/Parsers$
 public abstract #= # of #; //ParseResult=class scala/util/parsing/combinator/Parsers$ParseResult of class scala/util/parsing/combinator/Parsers
 
 Compiled from "RegexParsers.scala"
-public interface scala.util.parsing.combinator.RegexParsers extends scala.util.parsing.combinator.Parsers,scala.ScalaObject{
+public interface scala.util.parsing.combinator.RegexParsers extends scala.util.parsing.combinator.Parsers{
 public abstract void scala$util$parsing$combinator$RegexParsers$_setter_$whiteSpace_$eq(scala.util.matching.Regex);
   Signature: (Lscala/util/matching/Regex;)V
 
diff --git c/scala/util/parsing/combinator/lexical/Lexical.class w/scala/util/parsing/combinator/lexical/Lexical.class
index c76383d210..fd5a103fb0 100644
--- c/scala/util/parsing/combinator/lexical/Lexical.class
+++ w/scala/util/parsing/combinator/lexical/Lexical.class
@@ -12,7 +12,7 @@ public final #= # of #; //NoSuccess$=class scala/util/parsing/combinator/Parsers
 public abstract #= # of #; //OnceParser=class scala/util/parsing/combinator/Parsers$OnceParser of class scala/util/parsing/combinator/Parsers
 
 Compiled from "Lexical.scala"
-public abstract class scala.util.parsing.combinator.lexical.Lexical extends java.lang.Object implements scala.util.parsing.combinator.lexical.Scanners,scala.util.parsing.combinator.token.Tokens,scala.ScalaObject{
+public abstract class scala.util.parsing.combinator.lexical.Lexical extends java.lang.Object implements scala.util.parsing.combinator.lexical.Scanners,scala.util.parsing.combinator.token.Tokens{
 private scala.util.parsing.combinator.Parsers$NoSuccess lastNoSuccess;
   Signature: Lscala/util/parsing/combinator/Parsers$NoSuccess;
 
diff --git c/scala/util/parsing/combinator/lexical/Scanners.class w/scala/util/parsing/combinator/lexical/Scanners.class
index 874eeba942..8dc65df292 100644
--- c/scala/util/parsing/combinator/lexical/Scanners.class
+++ w/scala/util/parsing/combinator/lexical/Scanners.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Parser=class scala/util/parsing/combinator/Parsers$
 public #= # of #; //Scanner=class scala/util/parsing/combinator/lexical/Scanners$Scanner of class scala/util/parsing/combinator/lexical/Scanners
 
 Compiled from "Scanners.scala"
-public interface scala.util.parsing.combinator.lexical.Scanners extends scala.util.parsing.combinator.Parsers,scala.ScalaObject{
+public interface scala.util.parsing.combinator.lexical.Scanners extends scala.util.parsing.combinator.Parsers{
 public abstract java.lang.Object errorToken(java.lang.String);
   Signature: (Ljava/lang/String;)Ljava/lang/Object;
 
diff --git c/scala/util/parsing/combinator/lexical/StdLexical.class w/scala/util/parsing/combinator/lexical/StdLexical.class
index f25157ef33..736a5db65e 100644
--- c/scala/util/parsing/combinator/lexical/StdLexical.class
+++ w/scala/util/parsing/combinator/lexical/StdLexical.class
@@ -11,7 +11,7 @@ public #= # of #; //Identifier=class scala/util/parsing/combinator/token/StdToke
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "StdLexical.scala"
-public class scala.util.parsing.combinator.lexical.StdLexical extends scala.util.parsing.combinator.lexical.Lexical implements scala.util.parsing.combinator.token.StdTokens,scala.ScalaObject{
+public class scala.util.parsing.combinator.lexical.StdLexical extends scala.util.parsing.combinator.lexical.Lexical implements scala.util.parsing.combinator.token.StdTokens{
 private final scala.collection.mutable.HashSet reserved;
   Signature: Lscala/collection/mutable/HashSet;
 
diff --git c/scala/util/parsing/combinator/syntactical/StandardTokenParsers.class w/scala/util/parsing/combinator/syntactical/StandardTokenParsers.class
index 82b5bdd27a..96fe32fe00 100644
--- c/scala/util/parsing/combinator/syntactical/StandardTokenParsers.class
+++ w/scala/util/parsing/combinator/syntactical/StandardTokenParsers.class
@@ -9,7 +9,7 @@ public final #= # of #; //NoSuccess$=class scala/util/parsing/combinator/Parsers
 public abstract #= # of #; //OnceParser=class scala/util/parsing/combinator/Parsers$OnceParser of class scala/util/parsing/combinator/Parsers
 
 Compiled from "StandardTokenParsers.scala"
-public class scala.util.parsing.combinator.syntactical.StandardTokenParsers extends java.lang.Object implements scala.util.parsing.combinator.syntactical.StdTokenParsers,scala.ScalaObject{
+public class scala.util.parsing.combinator.syntactical.StandardTokenParsers extends java.lang.Object implements scala.util.parsing.combinator.syntactical.StdTokenParsers{
 private final scala.util.parsing.combinator.lexical.StdLexical lexical;
   Signature: Lscala/util/parsing/combinator/lexical/StdLexical;
 
diff --git c/scala/util/parsing/combinator/syntactical/StdTokenParsers.class w/scala/util/parsing/combinator/syntactical/StdTokenParsers.class
index aa00ce5959..9c93626b57 100644
--- c/scala/util/parsing/combinator/syntactical/StdTokenParsers.class
+++ w/scala/util/parsing/combinator/syntactical/StdTokenParsers.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //Parser=class scala/util/parsing/combinator/Parsers$Parser of class scala/util/parsing/combinator/Parsers
 
 Compiled from "StdTokenParsers.scala"
-public interface scala.util.parsing.combinator.syntactical.StdTokenParsers extends scala.util.parsing.combinator.syntactical.TokenParsers,scala.ScalaObject{
+public interface scala.util.parsing.combinator.syntactical.StdTokenParsers extends scala.util.parsing.combinator.syntactical.TokenParsers{
 public abstract void scala$util$parsing$combinator$syntactical$StdTokenParsers$_setter_$keywordCache_$eq(scala.collection.mutable.HashMap);
   Signature: (Lscala/collection/mutable/HashMap;)V
 
diff --git c/scala/util/parsing/combinator/testing/Ident.class w/scala/util/parsing/combinator/testing/Ident.class
index 7bd4803cc8..e52fec2aa8 100644
--- c/scala/util/parsing/combinator/testing/Ident.class
+++ w/scala/util/parsing/combinator/testing/Ident.class
@@ -1,6 +1,6 @@
 
 Compiled from "RegexTest.scala"
-public class scala.util.parsing.combinator.testing.Ident extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.parsing.combinator.testing.Ident extends java.lang.Object implements scala.Product,scala.Serializable{
 private final java.lang.String s;
   Signature: Ljava/lang/String;
 
diff --git c/scala/util/parsing/combinator/testing/Number.class w/scala/util/parsing/combinator/testing/Number.class
index 4b82959670..30d21c21cd 100644
--- c/scala/util/parsing/combinator/testing/Number.class
+++ w/scala/util/parsing/combinator/testing/Number.class
@@ -1,6 +1,6 @@
 
 Compiled from "RegexTest.scala"
-public class scala.util.parsing.combinator.testing.Number extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.parsing.combinator.testing.Number extends java.lang.Object implements scala.Product,scala.Serializable{
 private final int n;
   Signature: I
 
diff --git c/scala/util/parsing/combinator/testing/RegexTest$.class w/scala/util/parsing/combinator/testing/RegexTest$.class
index 25db989af8..aba92c0e79 100644
--- c/scala/util/parsing/combinator/testing/RegexTest$.class
+++ w/scala/util/parsing/combinator/testing/RegexTest$.class
@@ -10,7 +10,7 @@ public abstract #= # of #; //OnceParser=class scala/util/parsing/combinator/Pars
 public abstract #= # of #; //ParseResult=class scala/util/parsing/combinator/Parsers$ParseResult of class scala/util/parsing/combinator/Parsers
 
 Compiled from "RegexTest.scala"
-public final class scala.util.parsing.combinator.testing.RegexTest$ extends java.lang.Object implements scala.util.parsing.combinator.RegexParsers,scala.ScalaObject{
+public final class scala.util.parsing.combinator.testing.RegexTest$ extends java.lang.Object implements scala.util.parsing.combinator.RegexParsers{
 public static final scala.util.parsing.combinator.testing.RegexTest$ MODULE$;
   Signature: Lscala/util/parsing/combinator/testing/RegexTest$;
 
diff --git c/scala/util/parsing/combinator/testing/Str.class w/scala/util/parsing/combinator/testing/Str.class
index bc748b8b21..d83a1eb566 100644
--- c/scala/util/parsing/combinator/testing/Str.class
+++ w/scala/util/parsing/combinator/testing/Str.class
@@ -1,6 +1,6 @@
 
 Compiled from "RegexTest.scala"
-public class scala.util.parsing.combinator.testing.Str extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.parsing.combinator.testing.Str extends java.lang.Object implements scala.Product,scala.Serializable{
 private final java.lang.String s;
   Signature: Ljava/lang/String;
 
diff --git c/scala/util/parsing/combinator/token/StdTokens$Identifier.class w/scala/util/parsing/combinator/token/StdTokens$Identifier.class
index f30e1cc9c8..311526d14d 100644
--- c/scala/util/parsing/combinator/token/StdTokens$Identifier.class
+++ w/scala/util/parsing/combinator/token/StdTokens$Identifier.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Token=class scala/util/parsing/combinator/token/Tok
 public #= # of #; //Identifier=class scala/util/parsing/combinator/token/StdTokens$Identifier of class scala/util/parsing/combinator/token/StdTokens
 
 Compiled from "StdTokens.scala"
-public class scala.util.parsing.combinator.token.StdTokens$Identifier extends scala.util.parsing.combinator.token.Tokens$Token implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.parsing.combinator.token.StdTokens$Identifier extends scala.util.parsing.combinator.token.Tokens$Token implements scala.Product,scala.Serializable{
 private final java.lang.String chars;
   Signature: Ljava/lang/String;
 
diff --git c/scala/util/parsing/combinator/token/StdTokens$Keyword.class w/scala/util/parsing/combinator/token/StdTokens$Keyword.class
index dcb9791ae0..ad3706bf15 100644
--- c/scala/util/parsing/combinator/token/StdTokens$Keyword.class
+++ w/scala/util/parsing/combinator/token/StdTokens$Keyword.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Token=class scala/util/parsing/combinator/token/Tok
 public #= # of #; //Keyword=class scala/util/parsing/combinator/token/StdTokens$Keyword of class scala/util/parsing/combinator/token/StdTokens
 
 Compiled from "StdTokens.scala"
-public class scala.util.parsing.combinator.token.StdTokens$Keyword extends scala.util.parsing.combinator.token.Tokens$Token implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.parsing.combinator.token.StdTokens$Keyword extends scala.util.parsing.combinator.token.Tokens$Token implements scala.Product,scala.Serializable{
 private final java.lang.String chars;
   Signature: Ljava/lang/String;
 
diff --git c/scala/util/parsing/combinator/token/StdTokens$NumericLit.class w/scala/util/parsing/combinator/token/StdTokens$NumericLit.class
index b6f4a0dc6e..6201b402ab 100644
--- c/scala/util/parsing/combinator/token/StdTokens$NumericLit.class
+++ w/scala/util/parsing/combinator/token/StdTokens$NumericLit.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Token=class scala/util/parsing/combinator/token/Tok
 public #= # of #; //NumericLit=class scala/util/parsing/combinator/token/StdTokens$NumericLit of class scala/util/parsing/combinator/token/StdTokens
 
 Compiled from "StdTokens.scala"
-public class scala.util.parsing.combinator.token.StdTokens$NumericLit extends scala.util.parsing.combinator.token.Tokens$Token implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.parsing.combinator.token.StdTokens$NumericLit extends scala.util.parsing.combinator.token.Tokens$Token implements scala.Product,scala.Serializable{
 private final java.lang.String chars;
   Signature: Ljava/lang/String;
 
diff --git c/scala/util/parsing/combinator/token/StdTokens$StringLit.class w/scala/util/parsing/combinator/token/StdTokens$StringLit.class
index 5364deab8d..9aa99275af 100644
--- c/scala/util/parsing/combinator/token/StdTokens$StringLit.class
+++ w/scala/util/parsing/combinator/token/StdTokens$StringLit.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Token=class scala/util/parsing/combinator/token/Tok
 public #= # of #; //StringLit=class scala/util/parsing/combinator/token/StdTokens$StringLit of class scala/util/parsing/combinator/token/StdTokens
 
 Compiled from "StdTokens.scala"
-public class scala.util.parsing.combinator.token.StdTokens$StringLit extends scala.util.parsing.combinator.token.Tokens$Token implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.parsing.combinator.token.StdTokens$StringLit extends scala.util.parsing.combinator.token.Tokens$Token implements scala.Product,scala.Serializable{
 private final java.lang.String chars;
   Signature: Ljava/lang/String;
 
diff --git c/scala/util/parsing/combinator/token/StdTokens.class w/scala/util/parsing/combinator/token/StdTokens.class
index 8be48ac12c..2bca2e7666 100644
--- c/scala/util/parsing/combinator/token/StdTokens.class
+++ w/scala/util/parsing/combinator/token/StdTokens.class
@@ -9,7 +9,7 @@ public #= # of #; //NumericLit=class scala/util/parsing/combinator/token/StdToke
 public #= # of #; //Identifier=class scala/util/parsing/combinator/token/StdTokens$Identifier of class scala/util/parsing/combinator/token/StdTokens
 
 Compiled from "StdTokens.scala"
-public interface scala.util.parsing.combinator.token.StdTokens extends scala.util.parsing.combinator.token.Tokens,scala.ScalaObject{
+public interface scala.util.parsing.combinator.token.StdTokens extends scala.util.parsing.combinator.token.Tokens{
 public abstract scala.util.parsing.combinator.token.StdTokens$Keyword$ Keyword();
   Signature: ()Lscala/util/parsing/combinator/token/StdTokens$Keyword$;
 
diff --git c/scala/util/parsing/combinator/token/Tokens$EOF$.class w/scala/util/parsing/combinator/token/Tokens$EOF$.class
index 99ab366ab4..5d64071365 100644
--- c/scala/util/parsing/combinator/token/Tokens$EOF$.class
+++ w/scala/util/parsing/combinator/token/Tokens$EOF$.class
@@ -3,7 +3,7 @@ public final #= # of #; //EOF$=class scala/util/parsing/combinator/token/Tokens$
 public abstract #= # of #; //Token=class scala/util/parsing/combinator/token/Tokens$Token of class scala/util/parsing/combinator/token/Tokens
 
 Compiled from "Tokens.scala"
-public final class scala.util.parsing.combinator.token.Tokens$EOF$ extends scala.util.parsing.combinator.token.Tokens$Token implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.util.parsing.combinator.token.Tokens$EOF$ extends scala.util.parsing.combinator.token.Tokens$Token implements scala.Product,scala.Serializable{
 public java.lang.String chars();
   Signature: ()Ljava/lang/String;
   Code:
diff --git c/scala/util/parsing/combinator/token/Tokens$ErrorToken.class w/scala/util/parsing/combinator/token/Tokens$ErrorToken.class
index a848f19a17..64508df3ce 100644
--- c/scala/util/parsing/combinator/token/Tokens$ErrorToken.class
+++ w/scala/util/parsing/combinator/token/Tokens$ErrorToken.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Token=class scala/util/parsing/combinator/token/Tok
 public #= # of #; //ErrorToken=class scala/util/parsing/combinator/token/Tokens$ErrorToken of class scala/util/parsing/combinator/token/Tokens
 
 Compiled from "Tokens.scala"
-public class scala.util.parsing.combinator.token.Tokens$ErrorToken extends scala.util.parsing.combinator.token.Tokens$Token implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.parsing.combinator.token.Tokens$ErrorToken extends scala.util.parsing.combinator.token.Tokens$Token implements scala.Product,scala.Serializable{
 private final java.lang.String msg;
   Signature: Ljava/lang/String;
 
diff --git c/scala/util/parsing/input/NoPosition$.class w/scala/util/parsing/input/NoPosition$.class
index ac6a484df7..cf78d871aa 100644
--- c/scala/util/parsing/input/NoPosition$.class
+++ w/scala/util/parsing/input/NoPosition$.class
@@ -1,6 +1,6 @@
 
 Compiled from "NoPosition.scala"
-public final class scala.util.parsing.input.NoPosition$ extends java.lang.Object implements scala.util.parsing.input.Position,scala.ScalaObject{
+public final class scala.util.parsing.input.NoPosition$ extends java.lang.Object implements scala.util.parsing.input.Position{
 public static final scala.util.parsing.input.NoPosition$ MODULE$;
   Signature: Lscala/util/parsing/input/NoPosition$;
 
diff --git c/scala/util/parsing/input/OffsetPosition.class w/scala/util/parsing/input/OffsetPosition.class
index 3708f1589b..3a15e26f58 100644
--- c/scala/util/parsing/input/OffsetPosition.class
+++ w/scala/util/parsing/input/OffsetPosition.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "OffsetPosition.scala"
-public class scala.util.parsing.input.OffsetPosition extends java.lang.Object implements scala.util.parsing.input.Position,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.parsing.input.OffsetPosition extends java.lang.Object implements scala.util.parsing.input.Position,scala.Product,scala.Serializable{
 private final java.lang.CharSequence source;
   Signature: Ljava/lang/CharSequence;
 
diff --git c/scala/util/parsing/json/JSONArray.class w/scala/util/parsing/json/JSONArray.class
index 04ff86ae5f..bd814b21e6 100644
--- c/scala/util/parsing/json/JSONArray.class
+++ w/scala/util/parsing/json/JSONArray.class
@@ -1,6 +1,6 @@
 
 Compiled from "Parser.scala"
-public class scala.util.parsing.json.JSONArray extends scala.util.parsing.json.JSONType implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.parsing.json.JSONArray extends scala.util.parsing.json.JSONType implements scala.Product,scala.Serializable{
 private final scala.collection.immutable.List list;
   Signature: Lscala/collection/immutable/List;
 
diff --git c/scala/util/parsing/json/JSONObject.class w/scala/util/parsing/json/JSONObject.class
index 93119f8275..ad6e68e3bd 100644
--- c/scala/util/parsing/json/JSONObject.class
+++ w/scala/util/parsing/json/JSONObject.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "Parser.scala"
-public class scala.util.parsing.json.JSONObject extends scala.util.parsing.json.JSONType implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.parsing.json.JSONObject extends scala.util.parsing.json.JSONType implements scala.Product,scala.Serializable{
 private final scala.collection.immutable.Map obj;
   Signature: Lscala/collection/immutable/Map;
 
diff --git c/scala/util/parsing/json/Lexer.class w/scala/util/parsing/json/Lexer.class
index ff13f74707..baa594f24d 100644
--- c/scala/util/parsing/json/Lexer.class
+++ w/scala/util/parsing/json/Lexer.class
@@ -6,7 +6,7 @@ public #= # of #; //ErrorToken=class scala/util/parsing/combinator/token/Tokens$
 public final #= # of #; //StringLit$=class scala/util/parsing/combinator/token/StdTokens$StringLit$ of class scala/util/parsing/combinator/token/StdTokens
 
 Compiled from "Lexer.scala"
-public class scala.util.parsing.json.Lexer extends scala.util.parsing.combinator.lexical.StdLexical implements scala.util.parsing.combinator.ImplicitConversions,scala.ScalaObject{
+public class scala.util.parsing.json.Lexer extends scala.util.parsing.combinator.lexical.StdLexical implements scala.util.parsing.combinator.ImplicitConversions{
 private final scala.collection.immutable.Set hexDigits;
   Signature: Lscala/collection/immutable/Set;
 
diff --git c/scala/util/parsing/json/Parser.class w/scala/util/parsing/json/Parser.class
index 9ac8d62ee5..e235a6aad4 100644
--- c/scala/util/parsing/json/Parser.class
+++ w/scala/util/parsing/json/Parser.class
@@ -9,7 +9,7 @@ public final #= # of #; //NoSuccess$=class scala/util/parsing/combinator/Parsers
 public abstract #= # of #; //OnceParser=class scala/util/parsing/combinator/Parsers$OnceParser of class scala/util/parsing/combinator/Parsers
 
 Compiled from "Parser.scala"
-public class scala.util.parsing.json.Parser extends java.lang.Object implements scala.util.parsing.combinator.syntactical.StdTokenParsers,scala.util.parsing.combinator.ImplicitConversions,scala.ScalaObject{
+public class scala.util.parsing.json.Parser extends java.lang.Object implements scala.util.parsing.combinator.syntactical.StdTokenParsers,scala.util.parsing.combinator.ImplicitConversions{
 private final scala.util.parsing.json.Lexer lexical;
   Signature: Lscala/util/parsing/json/Lexer;
 
diff --git c/scala/util/regexp/Base$Eps$.class w/scala/util/regexp/Base$Eps$.class
index 48e831a542..a515d4b206 100644
--- c/scala/util/regexp/Base$Eps$.class
+++ w/scala/util/regexp/Base$Eps$.class
@@ -3,7 +3,7 @@ public final #= # of #; //Eps$=class scala/util/regexp/Base$Eps$ of class scala/
 public abstract #= # of #; //RegExp=class scala/util/regexp/Base$RegExp of class scala/util/regexp/Base
 
 Compiled from "Base.scala"
-public final class scala.util.regexp.Base$Eps$ extends scala.util.regexp.Base$RegExp implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.util.regexp.Base$Eps$ extends scala.util.regexp.Base$RegExp implements scala.Product,scala.Serializable{
 private final boolean isNullable;
   Signature: Z
 
diff --git c/scala/util/regexp/Base$Star.class w/scala/util/regexp/Base$Star.class
index c49bb40269..8b3c30bb88 100644
--- c/scala/util/regexp/Base$Star.class
+++ w/scala/util/regexp/Base$Star.class
@@ -3,7 +3,7 @@ public #= # of #; //Star=class scala/util/regexp/Base$Star of class scala/util/r
 public abstract #= # of #; //RegExp=class scala/util/regexp/Base$RegExp of class scala/util/regexp/Base
 
 Compiled from "Base.scala"
-public class scala.util.regexp.Base$Star extends scala.util.regexp.Base$RegExp implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.regexp.Base$Star extends scala.util.regexp.Base$RegExp implements scala.Product,scala.Serializable{
 private final scala.util.regexp.Base$RegExp r;
   Signature: Lscala/util/regexp/Base$RegExp;
 
diff --git c/scala/util/regexp/PointedHedgeExp$Node.class w/scala/util/regexp/PointedHedgeExp$Node.class
index 404ac7b3db..5f10d6e712 100644
--- c/scala/util/regexp/PointedHedgeExp$Node.class
+++ w/scala/util/regexp/PointedHedgeExp$Node.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //RegExp=class scala/util/regexp/Base$RegExp of class
 public #= # of #; //Node=class scala/util/regexp/PointedHedgeExp$Node of class scala/util/regexp/PointedHedgeExp
 
 Compiled from "PointedHedgeExp.scala"
-public class scala.util.regexp.PointedHedgeExp$Node extends scala.util.regexp.Base$RegExp implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.regexp.PointedHedgeExp$Node extends scala.util.regexp.Base$RegExp implements scala.Product,scala.Serializable{
 private final java.lang.Object label;
   Signature: Ljava/lang/Object;
 
diff --git c/scala/util/regexp/PointedHedgeExp$Point$.class w/scala/util/regexp/PointedHedgeExp$Point$.class
index 515ed95ffe..10f4b14958 100644
--- c/scala/util/regexp/PointedHedgeExp$Point$.class
+++ w/scala/util/regexp/PointedHedgeExp$Point$.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //RegExp=class scala/util/regexp/Base$RegExp of class
 public final #= # of #; //Point$=class scala/util/regexp/PointedHedgeExp$Point$ of class scala/util/regexp/PointedHedgeExp
 
 Compiled from "PointedHedgeExp.scala"
-public final class scala.util.regexp.PointedHedgeExp$Point$ extends scala.util.regexp.Base$RegExp implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.util.regexp.PointedHedgeExp$Point$ extends scala.util.regexp.Base$RegExp implements scala.Product,scala.Serializable{
 private final boolean isNullable;
   Signature: Z
 
diff --git c/scala/util/regexp/PointedHedgeExp$TopIter.class w/scala/util/regexp/PointedHedgeExp$TopIter.class
index 834b526f73..c72a3f524c 100644
--- c/scala/util/regexp/PointedHedgeExp$TopIter.class
+++ w/scala/util/regexp/PointedHedgeExp$TopIter.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //RegExp=class scala/util/regexp/Base$RegExp of class
 public #= # of #; //TopIter=class scala/util/regexp/PointedHedgeExp$TopIter of class scala/util/regexp/PointedHedgeExp
 
 Compiled from "PointedHedgeExp.scala"
-public class scala.util.regexp.PointedHedgeExp$TopIter extends scala.util.regexp.Base$RegExp implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.regexp.PointedHedgeExp$TopIter extends scala.util.regexp.Base$RegExp implements scala.Product,scala.Serializable{
 private final scala.util.regexp.Base$RegExp r1;
   Signature: Lscala/util/regexp/Base$RegExp;
 
diff --git c/scala/util/regexp/WordExp$Letter.class w/scala/util/regexp/WordExp$Letter.class
index d58730058c..3ae4372a7e 100644
--- c/scala/util/regexp/WordExp$Letter.class
+++ w/scala/util/regexp/WordExp$Letter.class
@@ -4,7 +4,7 @@ public abstract #= # of #; //Label=class scala/util/regexp/WordExp$Label of clas
 public #= # of #; //Letter=class scala/util/regexp/WordExp$Letter of class scala/util/regexp/WordExp
 
 Compiled from "WordExp.scala"
-public class scala.util.regexp.WordExp$Letter extends scala.util.regexp.Base$RegExp implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.regexp.WordExp$Letter extends scala.util.regexp.Base$RegExp implements scala.Product,scala.Serializable{
 private final scala.util.regexp.WordExp$Label a;
   Signature: Lscala/util/regexp/WordExp$Label;
 
diff --git c/scala/util/regexp/WordExp$Wildcard.class w/scala/util/regexp/WordExp$Wildcard.class
index 17e4184c10..585be3379c 100644
--- c/scala/util/regexp/WordExp$Wildcard.class
+++ w/scala/util/regexp/WordExp$Wildcard.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //RegExp=class scala/util/regexp/Base$RegExp of class
 public #= # of #; //Wildcard=class scala/util/regexp/WordExp$Wildcard of class scala/util/regexp/WordExp
 
 Compiled from "WordExp.scala"
-public class scala.util.regexp.WordExp$Wildcard extends scala.util.regexp.Base$RegExp implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.util.regexp.WordExp$Wildcard extends scala.util.regexp.Base$RegExp implements scala.Product,scala.Serializable{
 private final boolean isNullable;
   Signature: Z
 
diff --git c/scala/xml/Comment.class w/scala/xml/Comment.class
index 71c0eb47f5..727d2e2cfc 100644
--- c/scala/xml/Comment.class
+++ w/scala/xml/Comment.class
@@ -1,6 +1,6 @@
 
 Compiled from "Comment.scala"
-public class scala.xml.Comment extends scala.xml.SpecialNode implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.Comment extends scala.xml.SpecialNode implements scala.Product,scala.Serializable{
 private final java.lang.String commentText;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/EntityRef.class w/scala/xml/EntityRef.class
index b161eb832c..e418c2aba0 100644
--- c/scala/xml/EntityRef.class
+++ w/scala/xml/EntityRef.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "EntityRef.scala"
-public class scala.xml.EntityRef extends scala.xml.SpecialNode implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.EntityRef extends scala.xml.SpecialNode implements scala.Product,scala.Serializable{
 private final java.lang.String entityName;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/Group.class w/scala/xml/Group.class
index 676804a26c..e26ee333e4 100644
--- c/scala/xml/Group.class
+++ w/scala/xml/Group.class
@@ -1,6 +1,6 @@
 
 Compiled from "Group.scala"
-public final class scala.xml.Group extends scala.xml.Node implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.xml.Group extends scala.xml.Node implements scala.Product,scala.Serializable{
 private final scala.collection.Seq nodes;
   Signature: Lscala/collection/Seq;
 
diff --git c/scala/xml/MalformedAttributeException.class w/scala/xml/MalformedAttributeException.class
index dd387e89d6..d02ccf4786 100644
--- c/scala/xml/MalformedAttributeException.class
+++ w/scala/xml/MalformedAttributeException.class
@@ -1,6 +1,6 @@
 
 Compiled from "MalformedAttributeException.scala"
-public class scala.xml.MalformedAttributeException extends java.lang.RuntimeException implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.MalformedAttributeException extends java.lang.RuntimeException implements scala.Product,scala.Serializable{
 private final java.lang.String msg;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/MetaData.class w/scala/xml/MetaData.class
index 5106b4d0f4..22f866641b 100644
--- c/scala/xml/MetaData.class
+++ w/scala/xml/MetaData.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "MetaData.scala"
-public abstract class scala.xml.MetaData extends scala.collection.AbstractIterable implements scala.collection.Iterable,scala.xml.Equality,scala.Serializable,scala.ScalaObject{
+public abstract class scala.xml.MetaData extends scala.collection.AbstractIterable implements scala.collection.Iterable,scala.xml.Equality,scala.Serializable{
 public static scala.xml.MetaData update(scala.xml.MetaData, scala.xml.NamespaceBinding, scala.xml.MetaData);
   Signature: (Lscala/xml/MetaData;Lscala/xml/NamespaceBinding;Lscala/xml/MetaData;)Lscala/xml/MetaData;
   Code:
diff --git c/scala/xml/NamespaceBinding.class w/scala/xml/NamespaceBinding.class
index 2d0fe35b16..aac8071308 100644
--- c/scala/xml/NamespaceBinding.class
+++ w/scala/xml/NamespaceBinding.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "NamespaceBinding.scala"
-public class scala.xml.NamespaceBinding extends java.lang.Object implements scala.xml.Equality,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.NamespaceBinding extends java.lang.Object implements scala.xml.Equality,scala.Product,scala.Serializable{
 public static final long serialVersionUID;
   Signature: J
 
diff --git c/scala/xml/NodeSeq.class w/scala/xml/NodeSeq.class
index be06c28d1f..26cd9a299e 100644
--- c/scala/xml/NodeSeq.class
+++ w/scala/xml/NodeSeq.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "NodeSeq.scala"
-public abstract class scala.xml.NodeSeq extends scala.collection.AbstractSeq implements scala.collection.immutable.Seq,scala.collection.SeqLike,scala.xml.Equality,scala.ScalaObject{
+public abstract class scala.xml.NodeSeq extends scala.collection.AbstractSeq implements scala.collection.immutable.Seq,scala.xml.Equality{
 public static scala.xml.NodeSeq seqToNodeSeq(scala.collection.Seq);
   Signature: (Lscala/collection/Seq;)Lscala/xml/NodeSeq;
   Code:
diff --git c/scala/xml/Null$.class w/scala/xml/Null$.class
index 4a6c207a1c..2e7704fbb6 100644
--- c/scala/xml/Null$.class
+++ w/scala/xml/Null$.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "Null.scala"
-public final class scala.xml.Null$ extends scala.xml.MetaData implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.xml.Null$ extends scala.xml.MetaData implements scala.Product,scala.Serializable{
 public static final scala.xml.Null$ MODULE$;
   Signature: Lscala/xml/Null$;
 
diff --git c/scala/xml/PrefixedAttribute.class w/scala/xml/PrefixedAttribute.class
index bd69011112..02c8c58b9d 100644
--- c/scala/xml/PrefixedAttribute.class
+++ w/scala/xml/PrefixedAttribute.class
@@ -1,6 +1,6 @@
 
 Compiled from "PrefixedAttribute.scala"
-public class scala.xml.PrefixedAttribute extends scala.xml.MetaData implements scala.xml.Attribute,scala.ScalaObject{
+public class scala.xml.PrefixedAttribute extends scala.xml.MetaData implements scala.xml.Attribute{
 private final java.lang.String pre;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/PrettyPrinter$Box.class w/scala/xml/PrettyPrinter$Box.class
index f2942dcaf3..be76ea35aa 100644
--- c/scala/xml/PrettyPrinter$Box.class
+++ w/scala/xml/PrettyPrinter$Box.class
@@ -3,7 +3,7 @@ public #= # of #; //Box=class scala/xml/PrettyPrinter$Box of class scala/xml/Pre
 public #= # of #; //Item=class scala/xml/PrettyPrinter$Item of class scala/xml/PrettyPrinter
 
 Compiled from "PrettyPrinter.scala"
-public class scala.xml.PrettyPrinter$Box extends scala.xml.PrettyPrinter$Item implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.PrettyPrinter$Box extends scala.xml.PrettyPrinter$Item implements scala.Product,scala.Serializable{
 private final int col;
   Signature: I
 
diff --git c/scala/xml/PrettyPrinter$Break$.class w/scala/xml/PrettyPrinter$Break$.class
index 83e28c91d6..799a1363ed 100644
--- c/scala/xml/PrettyPrinter$Break$.class
+++ w/scala/xml/PrettyPrinter$Break$.class
@@ -3,7 +3,7 @@ public #= # of #; //Item=class scala/xml/PrettyPrinter$Item of class scala/xml/P
 public final #= # of #; //Break$=class scala/xml/PrettyPrinter$Break$ of class scala/xml/PrettyPrinter
 
 Compiled from "PrettyPrinter.scala"
-public final class scala.xml.PrettyPrinter$Break$ extends scala.xml.PrettyPrinter$Item implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.xml.PrettyPrinter$Break$ extends scala.xml.PrettyPrinter$Item implements scala.Product,scala.Serializable{
 public java.lang.String toString();
   Signature: ()Ljava/lang/String;
   Code:
diff --git c/scala/xml/PrettyPrinter$Para.class w/scala/xml/PrettyPrinter$Para.class
index 0a7b6fcce8..b36d42231a 100644
--- c/scala/xml/PrettyPrinter$Para.class
+++ w/scala/xml/PrettyPrinter$Para.class
@@ -3,7 +3,7 @@ public #= # of #; //Para=class scala/xml/PrettyPrinter$Para of class scala/xml/P
 public #= # of #; //Item=class scala/xml/PrettyPrinter$Item of class scala/xml/PrettyPrinter
 
 Compiled from "PrettyPrinter.scala"
-public class scala.xml.PrettyPrinter$Para extends scala.xml.PrettyPrinter$Item implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.PrettyPrinter$Para extends scala.xml.PrettyPrinter$Item implements scala.Product,scala.Serializable{
 private final java.lang.String s;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/ProcInstr.class w/scala/xml/ProcInstr.class
index 4b0f57ed85..b0ba4ac998 100644
--- c/scala/xml/ProcInstr.class
+++ w/scala/xml/ProcInstr.class
@@ -1,6 +1,6 @@
 
 Compiled from "ProcInstr.scala"
-public class scala.xml.ProcInstr extends scala.xml.SpecialNode implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.ProcInstr extends scala.xml.SpecialNode implements scala.Product,scala.Serializable{
 private final java.lang.String target;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/UnprefixedAttribute.class w/scala/xml/UnprefixedAttribute.class
index 22a3281b76..fff5d99f80 100644
--- c/scala/xml/UnprefixedAttribute.class
+++ w/scala/xml/UnprefixedAttribute.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "UnprefixedAttribute.scala"
-public class scala.xml.UnprefixedAttribute extends scala.xml.MetaData implements scala.xml.Attribute,scala.ScalaObject{
+public class scala.xml.UnprefixedAttribute extends scala.xml.MetaData implements scala.xml.Attribute{
 private final java.lang.String key;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/Utility$.class w/scala/xml/Utility$.class
index 1e0ddcbfeb..89c45b1935 100644
--- c/scala/xml/Utility$.class
+++ w/scala/xml/Utility$.class
@@ -3,7 +3,7 @@ public final #= # of #; //Escapes$=class scala/xml/Utility$Escapes$ of class sca
 public abstract #= # of #; //$less$colon$less=class scala/Predef$$less$colon$less of class scala/Predef
 
 Compiled from "Utility.scala"
-public final class scala.xml.Utility$ extends java.lang.Object implements scala.xml.parsing.TokenTests,scala.ScalaObject{
+public final class scala.xml.Utility$ extends java.lang.Object implements scala.xml.parsing.TokenTests{
 public static final scala.xml.Utility$ MODULE$;
   Signature: Lscala/xml/Utility$;
 
diff --git c/scala/xml/XML$.class w/scala/xml/XML$.class
index ae0cfdab10..1ce1fae4a9 100644
--- c/scala/xml/XML$.class
+++ w/scala/xml/XML$.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //Catch=class scala/util/control/Exception$Catch of class scala/util/control/Exception
 
 Compiled from "XML.scala"
-public final class scala.xml.XML$ extends java.lang.Object implements scala.xml.factory.XMLLoader,scala.ScalaObject{
+public final class scala.xml.XML$ extends java.lang.Object implements scala.xml.factory.XMLLoader{
 public static final scala.xml.XML$ MODULE$;
   Signature: Lscala/xml/XML$;
 
diff --git c/scala/xml/dtd/ANY$.class w/scala/xml/dtd/ANY$.class
index 2d3848dede..05feea08ab 100644
--- c/scala/xml/dtd/ANY$.class
+++ w/scala/xml/dtd/ANY$.class
@@ -1,6 +1,6 @@
 
 Compiled from "ContentModel.scala"
-public final class scala.xml.dtd.ANY$ extends scala.xml.dtd.ContentModel implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.xml.dtd.ANY$ extends scala.xml.dtd.ContentModel implements scala.Product,scala.Serializable{
 public static final scala.xml.dtd.ANY$ MODULE$;
   Signature: Lscala/xml/dtd/ANY$;
 
diff --git c/scala/xml/dtd/AttListDecl.class w/scala/xml/dtd/AttListDecl.class
index 15f798793f..908b7e8c8d 100644
--- c/scala/xml/dtd/AttListDecl.class
+++ w/scala/xml/dtd/AttListDecl.class
@@ -1,6 +1,6 @@
 
 Compiled from "Decl.scala"
-public class scala.xml.dtd.AttListDecl extends scala.xml.dtd.MarkupDecl implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.dtd.AttListDecl extends scala.xml.dtd.MarkupDecl implements scala.Product,scala.Serializable{
 private final java.lang.String name;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/dtd/AttrDecl.class w/scala/xml/dtd/AttrDecl.class
index 1b49c1aefb..28a4108103 100644
--- c/scala/xml/dtd/AttrDecl.class
+++ w/scala/xml/dtd/AttrDecl.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "Decl.scala"
-public class scala.xml.dtd.AttrDecl extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.dtd.AttrDecl extends java.lang.Object implements scala.Product,scala.Serializable{
 private final java.lang.String name;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/dtd/ContentModel$ElemName.class w/scala/xml/dtd/ContentModel$ElemName.class
index 887edf1c76..46092a49f8 100644
--- c/scala/xml/dtd/ContentModel$ElemName.class
+++ w/scala/xml/dtd/ContentModel$ElemName.class
@@ -3,7 +3,7 @@ public abstract #= # of #; //Label=class scala/util/regexp/WordExp$Label of clas
 public #= # of #; //ElemName=class scala/xml/dtd/ContentModel$ElemName of class scala/xml/dtd/ContentModel
 
 Compiled from "ContentModel.scala"
-public class scala.xml.dtd.ContentModel$ElemName extends scala.util.regexp.WordExp$Label implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.dtd.ContentModel$ElemName extends scala.util.regexp.WordExp$Label implements scala.Product,scala.Serializable{
 private final java.lang.String name;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/dtd/DEFAULT.class w/scala/xml/dtd/DEFAULT.class
index cae807b48c..664d4b382d 100644
--- c/scala/xml/dtd/DEFAULT.class
+++ w/scala/xml/dtd/DEFAULT.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "Decl.scala"
-public class scala.xml.dtd.DEFAULT extends scala.xml.dtd.DefaultDecl implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.dtd.DEFAULT extends scala.xml.dtd.DefaultDecl implements scala.Product,scala.Serializable{
 private final boolean fixed;
   Signature: Z
 
diff --git c/scala/xml/dtd/DocType.class w/scala/xml/dtd/DocType.class
index d271ab1178..dfc6d30cb5 100644
--- c/scala/xml/dtd/DocType.class
+++ w/scala/xml/dtd/DocType.class
@@ -1,6 +1,6 @@
 
 Compiled from "DocType.scala"
-public class scala.xml.dtd.DocType extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.dtd.DocType extends java.lang.Object implements scala.Product,scala.Serializable{
 private final java.lang.String name;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/dtd/ELEMENTS.class w/scala/xml/dtd/ELEMENTS.class
index 310cbf883a..1703d8768a 100644
--- c/scala/xml/dtd/ELEMENTS.class
+++ w/scala/xml/dtd/ELEMENTS.class
@@ -2,7 +2,7 @@ InnerClasses:
 public abstract #= # of #; //RegExp=class scala/util/regexp/Base$RegExp of class scala/util/regexp/Base
 
 Compiled from "ContentModel.scala"
-public class scala.xml.dtd.ELEMENTS extends scala.xml.dtd.DFAContentModel implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.dtd.ELEMENTS extends scala.xml.dtd.DFAContentModel implements scala.Product,scala.Serializable{
 private final scala.util.regexp.Base$RegExp r;
   Signature: Lscala/util/regexp/Base$RegExp;
 
diff --git c/scala/xml/dtd/EMPTY$.class w/scala/xml/dtd/EMPTY$.class
index 63c0439dda..04e805918c 100644
--- c/scala/xml/dtd/EMPTY$.class
+++ w/scala/xml/dtd/EMPTY$.class
@@ -1,6 +1,6 @@
 
 Compiled from "ContentModel.scala"
-public final class scala.xml.dtd.EMPTY$ extends scala.xml.dtd.ContentModel implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.xml.dtd.EMPTY$ extends scala.xml.dtd.ContentModel implements scala.Product,scala.Serializable{
 public static final scala.xml.dtd.EMPTY$ MODULE$;
   Signature: Lscala/xml/dtd/EMPTY$;
 
diff --git c/scala/xml/dtd/ElemDecl.class w/scala/xml/dtd/ElemDecl.class
index ce417789ef..4bebcbf942 100644
--- c/scala/xml/dtd/ElemDecl.class
+++ w/scala/xml/dtd/ElemDecl.class
@@ -1,6 +1,6 @@
 
 Compiled from "Decl.scala"
-public class scala.xml.dtd.ElemDecl extends scala.xml.dtd.MarkupDecl implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.dtd.ElemDecl extends scala.xml.dtd.MarkupDecl implements scala.Product,scala.Serializable{
 private final java.lang.String name;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/dtd/ElementValidator.class w/scala/xml/dtd/ElementValidator.class
index f6728534a2..afb75a9232 100644
--- c/scala/xml/dtd/ElementValidator.class
+++ w/scala/xml/dtd/ElementValidator.class
@@ -5,7 +5,7 @@ public abstract #= # of #; //RegExp=class scala/util/regexp/Base$RegExp of class
 public final #= # of #; //Translator$=class scala/xml/dtd/ContentModel$Translator$ of class scala/xml/dtd/ContentModel
 
 Compiled from "ElementValidator.scala"
-public class scala.xml.dtd.ElementValidator extends java.lang.Object implements scala.Function1,scala.ScalaObject{
+public class scala.xml.dtd.ElementValidator extends java.lang.Object implements scala.Function1{
 private scala.collection.immutable.List scala$xml$dtd$ElementValidator$$exc;
   Signature: Lscala/collection/immutable/List;
 
diff --git c/scala/xml/dtd/ExtDef.class w/scala/xml/dtd/ExtDef.class
index 65a2abcaf8..555867d4e0 100644
--- c/scala/xml/dtd/ExtDef.class
+++ w/scala/xml/dtd/ExtDef.class
@@ -1,6 +1,6 @@
 
 Compiled from "Decl.scala"
-public class scala.xml.dtd.ExtDef extends scala.xml.dtd.EntityDef implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.dtd.ExtDef extends scala.xml.dtd.EntityDef implements scala.Product,scala.Serializable{
 private final scala.xml.dtd.ExternalID extID;
   Signature: Lscala/xml/dtd/ExternalID;
 
diff --git c/scala/xml/dtd/ExternalID.class w/scala/xml/dtd/ExternalID.class
index a55d9d0868..b4f322bb25 100644
--- c/scala/xml/dtd/ExternalID.class
+++ w/scala/xml/dtd/ExternalID.class
@@ -1,6 +1,6 @@
 
 Compiled from "ExternalID.scala"
-public abstract class scala.xml.dtd.ExternalID extends java.lang.Object implements scala.xml.parsing.TokenTests,scala.ScalaObject{
+public abstract class scala.xml.dtd.ExternalID extends java.lang.Object implements scala.xml.parsing.TokenTests{
 public final boolean isSpace(char);
   Signature: (C)Z
   Code:
diff --git c/scala/xml/dtd/IMPLIED$.class w/scala/xml/dtd/IMPLIED$.class
index 490cd470d8..683b821aee 100644
--- c/scala/xml/dtd/IMPLIED$.class
+++ w/scala/xml/dtd/IMPLIED$.class
@@ -1,6 +1,6 @@
 
 Compiled from "Decl.scala"
-public final class scala.xml.dtd.IMPLIED$ extends scala.xml.dtd.DefaultDecl implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.xml.dtd.IMPLIED$ extends scala.xml.dtd.DefaultDecl implements scala.Product,scala.Serializable{
 public static final scala.xml.dtd.IMPLIED$ MODULE$;
   Signature: Lscala/xml/dtd/IMPLIED$;
 
diff --git c/scala/xml/dtd/IntDef.class w/scala/xml/dtd/IntDef.class
index 7414168b66..ae5af2acc3 100644
--- c/scala/xml/dtd/IntDef.class
+++ w/scala/xml/dtd/IntDef.class
@@ -1,6 +1,6 @@
 
 Compiled from "Decl.scala"
-public class scala.xml.dtd.IntDef extends scala.xml.dtd.EntityDef implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.dtd.IntDef extends scala.xml.dtd.EntityDef implements scala.Product,scala.Serializable{
 private final java.lang.String value;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/dtd/MIXED.class w/scala/xml/dtd/MIXED.class
index c5496c8201..9a908d2747 100644
--- c/scala/xml/dtd/MIXED.class
+++ w/scala/xml/dtd/MIXED.class
@@ -4,7 +4,7 @@ public final #= # of #; //Alt$=class scala/util/regexp/Base$Alt$ of class scala/
 public abstract #= # of #; //RegExp=class scala/util/regexp/Base$RegExp of class scala/util/regexp/Base
 
 Compiled from "ContentModel.scala"
-public class scala.xml.dtd.MIXED extends scala.xml.dtd.DFAContentModel implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.dtd.MIXED extends scala.xml.dtd.DFAContentModel implements scala.Product,scala.Serializable{
 private final scala.util.regexp.Base$RegExp r;
   Signature: Lscala/util/regexp/Base$RegExp;
 
diff --git c/scala/xml/dtd/NotationDecl.class w/scala/xml/dtd/NotationDecl.class
index f74ff3ab6a..41fc5554c3 100644
--- c/scala/xml/dtd/NotationDecl.class
+++ w/scala/xml/dtd/NotationDecl.class
@@ -1,6 +1,6 @@
 
 Compiled from "Decl.scala"
-public class scala.xml.dtd.NotationDecl extends scala.xml.dtd.MarkupDecl implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.dtd.NotationDecl extends scala.xml.dtd.MarkupDecl implements scala.Product,scala.Serializable{
 private final java.lang.String name;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/dtd/PCDATA$.class w/scala/xml/dtd/PCDATA$.class
index b68c18721b..3bef2cea7b 100644
--- c/scala/xml/dtd/PCDATA$.class
+++ w/scala/xml/dtd/PCDATA$.class
@@ -1,6 +1,6 @@
 
 Compiled from "ContentModel.scala"
-public final class scala.xml.dtd.PCDATA$ extends scala.xml.dtd.ContentModel implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.xml.dtd.PCDATA$ extends scala.xml.dtd.ContentModel implements scala.Product,scala.Serializable{
 public static final scala.xml.dtd.PCDATA$ MODULE$;
   Signature: Lscala/xml/dtd/PCDATA$;
 
diff --git c/scala/xml/dtd/PEReference.class w/scala/xml/dtd/PEReference.class
index 33f33b028d..f7e0147f53 100644
--- c/scala/xml/dtd/PEReference.class
+++ w/scala/xml/dtd/PEReference.class
@@ -1,6 +1,6 @@
 
 Compiled from "Decl.scala"
-public class scala.xml.dtd.PEReference extends scala.xml.dtd.MarkupDecl implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.dtd.PEReference extends scala.xml.dtd.MarkupDecl implements scala.Product,scala.Serializable{
 private final java.lang.String ent;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/dtd/ParameterEntityDecl.class w/scala/xml/dtd/ParameterEntityDecl.class
index 32907677f7..4d607fa086 100644
--- c/scala/xml/dtd/ParameterEntityDecl.class
+++ w/scala/xml/dtd/ParameterEntityDecl.class
@@ -1,6 +1,6 @@
 
 Compiled from "Decl.scala"
-public class scala.xml.dtd.ParameterEntityDecl extends scala.xml.dtd.EntityDecl implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.dtd.ParameterEntityDecl extends scala.xml.dtd.EntityDecl implements scala.Product,scala.Serializable{
 private final java.lang.String name;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/dtd/ParsedEntityDecl.class w/scala/xml/dtd/ParsedEntityDecl.class
index cb0df32d70..a6d82bb65c 100644
--- c/scala/xml/dtd/ParsedEntityDecl.class
+++ w/scala/xml/dtd/ParsedEntityDecl.class
@@ -1,6 +1,6 @@
 
 Compiled from "Decl.scala"
-public class scala.xml.dtd.ParsedEntityDecl extends scala.xml.dtd.EntityDecl implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.dtd.ParsedEntityDecl extends scala.xml.dtd.EntityDecl implements scala.Product,scala.Serializable{
 private final java.lang.String name;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/dtd/PublicID.class w/scala/xml/dtd/PublicID.class
index a0ad0e72ee..bea3b13536 100644
--- c/scala/xml/dtd/PublicID.class
+++ w/scala/xml/dtd/PublicID.class
@@ -1,6 +1,6 @@
 
 Compiled from "ExternalID.scala"
-public class scala.xml.dtd.PublicID extends scala.xml.dtd.ExternalID implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.dtd.PublicID extends scala.xml.dtd.ExternalID implements scala.Product,scala.Serializable{
 private final java.lang.String publicId;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/dtd/REQUIRED$.class w/scala/xml/dtd/REQUIRED$.class
index 3585b079b9..9ead2b3d17 100644
--- c/scala/xml/dtd/REQUIRED$.class
+++ w/scala/xml/dtd/REQUIRED$.class
@@ -1,6 +1,6 @@
 
 Compiled from "Decl.scala"
-public final class scala.xml.dtd.REQUIRED$ extends scala.xml.dtd.DefaultDecl implements scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.xml.dtd.REQUIRED$ extends scala.xml.dtd.DefaultDecl implements scala.Product,scala.Serializable{
 public static final scala.xml.dtd.REQUIRED$ MODULE$;
   Signature: Lscala/xml/dtd/REQUIRED$;
 
diff --git c/scala/xml/dtd/Scanner.class w/scala/xml/dtd/Scanner.class
index 5a26c8e528..446400b8f3 100644
--- c/scala/xml/dtd/Scanner.class
+++ w/scala/xml/dtd/Scanner.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "Scanner.scala"
-public class scala.xml.dtd.Scanner extends scala.xml.dtd.Tokens implements scala.xml.parsing.TokenTests,scala.ScalaObject{
+public class scala.xml.dtd.Scanner extends scala.xml.dtd.Tokens implements scala.xml.parsing.TokenTests{
 private final char ENDCH;
   Signature: C
 
diff --git c/scala/xml/dtd/SystemID.class w/scala/xml/dtd/SystemID.class
index 0ce257242c..5afb06ce9e 100644
--- c/scala/xml/dtd/SystemID.class
+++ w/scala/xml/dtd/SystemID.class
@@ -1,6 +1,6 @@
 
 Compiled from "ExternalID.scala"
-public class scala.xml.dtd.SystemID extends scala.xml.dtd.ExternalID implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.dtd.SystemID extends scala.xml.dtd.ExternalID implements scala.Product,scala.Serializable{
 private final java.lang.String systemId;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/dtd/UnparsedEntityDecl.class w/scala/xml/dtd/UnparsedEntityDecl.class
index 1617050413..2ad1fb629e 100644
--- c/scala/xml/dtd/UnparsedEntityDecl.class
+++ w/scala/xml/dtd/UnparsedEntityDecl.class
@@ -1,6 +1,6 @@
 
 Compiled from "Decl.scala"
-public class scala.xml.dtd.UnparsedEntityDecl extends scala.xml.dtd.EntityDecl implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.dtd.UnparsedEntityDecl extends scala.xml.dtd.EntityDecl implements scala.Product,scala.Serializable{
 private final java.lang.String name;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/dtd/ValidationException.class w/scala/xml/dtd/ValidationException.class
index 141948bdab..53f2cb78bb 100644
--- c/scala/xml/dtd/ValidationException.class
+++ w/scala/xml/dtd/ValidationException.class
@@ -1,6 +1,6 @@
 
 Compiled from "ValidationException.scala"
-public class scala.xml.dtd.ValidationException extends java.lang.Exception implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.dtd.ValidationException extends java.lang.Exception implements scala.Product,scala.Serializable{
 private final java.lang.String e;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/factory/LoggedNodeFactory.class w/scala/xml/factory/LoggedNodeFactory.class
index 233bbb0de8..d8bac5de3d 100644
--- c/scala/xml/factory/LoggedNodeFactory.class
+++ w/scala/xml/factory/LoggedNodeFactory.class
@@ -1,6 +1,6 @@
 
 Compiled from "LoggedNodeFactory.scala"
-public interface scala.xml.factory.LoggedNodeFactory extends scala.xml.factory.NodeFactory,scala.util.logging.Logged,scala.ScalaObject{
+public interface scala.xml.factory.LoggedNodeFactory extends scala.xml.factory.NodeFactory,scala.util.logging.Logged{
 public abstract void scala$xml$factory$LoggedNodeFactory$_setter_$logNode_$eq(boolean);
   Signature: (Z)V
 
diff --git c/scala/xml/parsing/ConstructingParser.class w/scala/xml/parsing/ConstructingParser.class
index 4e1cc7e363..66ea436447 100644
--- c/scala/xml/parsing/ConstructingParser.class
+++ w/scala/xml/parsing/ConstructingParser.class
@@ -1,6 +1,6 @@
 
 Compiled from "ConstructingParser.scala"
-public class scala.xml.parsing.ConstructingParser extends scala.xml.parsing.ConstructingHandler implements scala.xml.parsing.ExternalSources,scala.xml.parsing.MarkupParser,scala.ScalaObject{
+public class scala.xml.parsing.ConstructingParser extends scala.xml.parsing.ConstructingHandler implements scala.xml.parsing.ExternalSources,scala.xml.parsing.MarkupParser{
 private final scala.io.Source input;
   Signature: Lscala/io/Source;
 
diff --git c/scala/xml/parsing/FactoryAdapter.class w/scala/xml/parsing/FactoryAdapter.class
index c3cbfba5a6..ccc4052ea9 100644
--- c/scala/xml/parsing/FactoryAdapter.class
+++ w/scala/xml/parsing/FactoryAdapter.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "FactoryAdapter.scala"
-public abstract class scala.xml.parsing.FactoryAdapter extends org.xml.sax.helpers.DefaultHandler implements scala.xml.factory.XMLLoader,scala.ScalaObject{
+public abstract class scala.xml.parsing.FactoryAdapter extends org.xml.sax.helpers.DefaultHandler implements scala.xml.factory.XMLLoader{
 private scala.xml.Node rootElem;
   Signature: Lscala/xml/Node;
 
diff --git c/scala/xml/parsing/FatalError.class w/scala/xml/parsing/FatalError.class
index 192d72595a..a4feea0188 100644
--- c/scala/xml/parsing/FatalError.class
+++ w/scala/xml/parsing/FatalError.class
@@ -1,6 +1,6 @@
 
 Compiled from "FatalError.scala"
-public class scala.xml.parsing.FatalError extends java.lang.RuntimeException implements scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.parsing.FatalError extends java.lang.RuntimeException implements scala.Product,scala.Serializable{
 private final java.lang.String msg;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/parsing/MarkupHandler.class w/scala/xml/parsing/MarkupHandler.class
index 77f35d9738..d073dbf803 100644
--- c/scala/xml/parsing/MarkupHandler.class
+++ w/scala/xml/parsing/MarkupHandler.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "MarkupHandler.scala"
-public abstract class scala.xml.parsing.MarkupHandler extends java.lang.Object implements scala.util.logging.Logged,scala.ScalaObject{
+public abstract class scala.xml.parsing.MarkupHandler extends java.lang.Object implements scala.util.logging.Logged{
 private final boolean isValidating;
   Signature: Z
 
diff --git c/scala/xml/parsing/MarkupParser.class w/scala/xml/parsing/MarkupParser.class
index 73be511612..ab271776d3 100644
--- c/scala/xml/parsing/MarkupParser.class
+++ w/scala/xml/parsing/MarkupParser.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //WithLookAhead=class scala/xml/parsing/MarkupParser$WithLookAhead of class scala/xml/parsing/MarkupParser
 
 Compiled from "MarkupParser.scala"
-public interface scala.xml.parsing.MarkupParser extends scala.xml.parsing.MarkupParserCommon,scala.xml.parsing.TokenTests,scala.ScalaObject{
+public interface scala.xml.parsing.MarkupParser extends scala.xml.parsing.MarkupParserCommon{
 public abstract void scala$xml$parsing$MarkupParser$_setter_$scala$xml$parsing$MarkupParser$$handle_$eq(scala.xml.parsing.MarkupHandler);
   Signature: (Lscala/xml/parsing/MarkupHandler;)V
 
diff --git c/scala/xml/parsing/MarkupParserCommon.class w/scala/xml/parsing/MarkupParserCommon.class
index ebc3f124bf..44a0f076df 100644
--- c/scala/xml/parsing/MarkupParserCommon.class
+++ w/scala/xml/parsing/MarkupParserCommon.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "MarkupParserCommon.scala"
-public interface scala.xml.parsing.MarkupParserCommon extends scala.xml.parsing.TokenTests,scala.ScalaObject{
+public interface scala.xml.parsing.MarkupParserCommon extends scala.xml.parsing.TokenTests{
 public abstract scala.runtime.Nothing$ unreachable();
   Signature: ()Lscala/runtime/Nothing$;
 
diff --git c/scala/xml/parsing/NoBindingFactoryAdapter.class w/scala/xml/parsing/NoBindingFactoryAdapter.class
index 8d278a66b0..25cadaeb0e 100644
--- c/scala/xml/parsing/NoBindingFactoryAdapter.class
+++ w/scala/xml/parsing/NoBindingFactoryAdapter.class
@@ -1,6 +1,6 @@
 
 Compiled from "NoBindingFactoryAdapter.scala"
-public class scala.xml.parsing.NoBindingFactoryAdapter extends scala.xml.parsing.FactoryAdapter implements scala.xml.factory.NodeFactory,scala.ScalaObject{
+public class scala.xml.parsing.NoBindingFactoryAdapter extends scala.xml.parsing.FactoryAdapter implements scala.xml.factory.NodeFactory{
 private final boolean ignoreComments;
   Signature: Z
 
diff --git c/scala/xml/parsing/ValidatingMarkupHandler.class w/scala/xml/parsing/ValidatingMarkupHandler.class
index d3ace847fb..9fd97d7306 100644
--- c/scala/xml/parsing/ValidatingMarkupHandler.class
+++ w/scala/xml/parsing/ValidatingMarkupHandler.class
@@ -2,7 +2,7 @@ InnerClasses:
 public #= # of #; //ElemName=class scala/xml/dtd/ContentModel$ElemName of class scala/xml/dtd/ContentModel
 
 Compiled from "ValidatingMarkupHandler.scala"
-public abstract class scala.xml.parsing.ValidatingMarkupHandler extends scala.xml.parsing.MarkupHandler implements scala.util.logging.Logged,scala.ScalaObject{
+public abstract class scala.xml.parsing.ValidatingMarkupHandler extends scala.xml.parsing.MarkupHandler implements scala.util.logging.Logged{
 private java.lang.String rootLabel;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/parsing/XhtmlParser.class w/scala/xml/parsing/XhtmlParser.class
index ae609c3f58..2b8c09c62f 100644
--- c/scala/xml/parsing/XhtmlParser.class
+++ w/scala/xml/parsing/XhtmlParser.class
@@ -1,6 +1,6 @@
 
 Compiled from "XhtmlParser.scala"
-public class scala.xml.parsing.XhtmlParser extends scala.xml.parsing.ConstructingHandler implements scala.xml.parsing.MarkupParser,scala.xml.parsing.ExternalSources,scala.ScalaObject{
+public class scala.xml.parsing.XhtmlParser extends scala.xml.parsing.ConstructingHandler implements scala.xml.parsing.MarkupParser,scala.xml.parsing.ExternalSources{
 private final scala.io.Source input;
   Signature: Lscala/io/Source;
 
diff --git c/scala/xml/persistent/CachedFileStorage.class w/scala/xml/persistent/CachedFileStorage.class
index 11fbabcf93..4edecdb229 100644
--- c/scala/xml/persistent/CachedFileStorage.class
+++ w/scala/xml/persistent/CachedFileStorage.class
@@ -1,6 +1,6 @@
 
 Compiled from "CachedFileStorage.scala"
-public abstract class scala.xml.persistent.CachedFileStorage extends java.lang.Thread implements scala.util.logging.Logged,scala.ScalaObject{
+public abstract class scala.xml.persistent.CachedFileStorage extends java.lang.Thread implements scala.util.logging.Logged{
 private final java.io.File file1;
   Signature: Ljava/io/File;
 
diff --git c/scala/xml/persistent/Index.class w/scala/xml/persistent/Index.class
index 4f519d54ca..4700efd122 100644
--- c/scala/xml/persistent/Index.class
+++ w/scala/xml/persistent/Index.class
@@ -1,6 +1,6 @@
 
 Compiled from "Index.scala"
-public abstract class scala.xml.persistent.Index extends java.lang.Object implements scala.Function1,scala.ScalaObject{
+public abstract class scala.xml.persistent.Index extends java.lang.Object implements scala.Function1{
 public boolean apply$mcZD$sp(double);
   Signature: (D)Z
   Code:
diff --git c/scala/xml/pull/EvComment.class w/scala/xml/pull/EvComment.class
index e82fa5f440..e0866437bc 100644
--- c/scala/xml/pull/EvComment.class
+++ w/scala/xml/pull/EvComment.class
@@ -1,6 +1,6 @@
 
 Compiled from "XMLEvent.scala"
-public class scala.xml.pull.EvComment extends java.lang.Object implements scala.xml.pull.XMLEvent,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.pull.EvComment extends java.lang.Object implements scala.xml.pull.XMLEvent,scala.Product,scala.Serializable{
 private final java.lang.String text;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/pull/EvElemEnd.class w/scala/xml/pull/EvElemEnd.class
index b9437519d1..f295a98ef6 100644
--- c/scala/xml/pull/EvElemEnd.class
+++ w/scala/xml/pull/EvElemEnd.class
@@ -1,6 +1,6 @@
 
 Compiled from "XMLEvent.scala"
-public class scala.xml.pull.EvElemEnd extends java.lang.Object implements scala.xml.pull.XMLEvent,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.pull.EvElemEnd extends java.lang.Object implements scala.xml.pull.XMLEvent,scala.Product,scala.Serializable{
 private final java.lang.String pre;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/pull/EvElemStart.class w/scala/xml/pull/EvElemStart.class
index 59b5a8c123..1fb5502296 100644
--- c/scala/xml/pull/EvElemStart.class
+++ w/scala/xml/pull/EvElemStart.class
@@ -1,6 +1,6 @@
 
 Compiled from "XMLEvent.scala"
-public class scala.xml.pull.EvElemStart extends java.lang.Object implements scala.xml.pull.XMLEvent,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.pull.EvElemStart extends java.lang.Object implements scala.xml.pull.XMLEvent,scala.Product,scala.Serializable{
 private final java.lang.String pre;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/pull/EvEntityRef.class w/scala/xml/pull/EvEntityRef.class
index 1b6280bca4..b5d57c74dc 100644
--- c/scala/xml/pull/EvEntityRef.class
+++ w/scala/xml/pull/EvEntityRef.class
@@ -1,6 +1,6 @@
 
 Compiled from "XMLEvent.scala"
-public class scala.xml.pull.EvEntityRef extends java.lang.Object implements scala.xml.pull.XMLEvent,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.pull.EvEntityRef extends java.lang.Object implements scala.xml.pull.XMLEvent,scala.Product,scala.Serializable{
 private final java.lang.String entity;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/pull/EvProcInstr.class w/scala/xml/pull/EvProcInstr.class
index 880313b370..de1802d9aa 100644
--- c/scala/xml/pull/EvProcInstr.class
+++ w/scala/xml/pull/EvProcInstr.class
@@ -1,6 +1,6 @@
 
 Compiled from "XMLEvent.scala"
-public class scala.xml.pull.EvProcInstr extends java.lang.Object implements scala.xml.pull.XMLEvent,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.pull.EvProcInstr extends java.lang.Object implements scala.xml.pull.XMLEvent,scala.Product,scala.Serializable{
 private final java.lang.String target;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/pull/EvText.class w/scala/xml/pull/EvText.class
index 1a7a91535e..3d38f37cd9 100644
--- c/scala/xml/pull/EvText.class
+++ w/scala/xml/pull/EvText.class
@@ -1,6 +1,6 @@
 
 Compiled from "XMLEvent.scala"
-public class scala.xml.pull.EvText extends java.lang.Object implements scala.xml.pull.XMLEvent,scala.ScalaObject,scala.Product,scala.Serializable{
+public class scala.xml.pull.EvText extends java.lang.Object implements scala.xml.pull.XMLEvent,scala.Product,scala.Serializable{
 private final java.lang.String text;
   Signature: Ljava/lang/String;
 
diff --git c/scala/xml/pull/ProducerConsumerIterator.class w/scala/xml/pull/ProducerConsumerIterator.class
index 0c588cd2f0..de2f946458 100644
--- c/scala/xml/pull/ProducerConsumerIterator.class
+++ w/scala/xml/pull/ProducerConsumerIterator.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "XMLEventReader.scala"
-public interface scala.xml.pull.ProducerConsumerIterator extends scala.collection.Iterator,scala.ScalaObject{
+public interface scala.xml.pull.ProducerConsumerIterator extends scala.collection.Iterator{
 public abstract void scala$xml$pull$ProducerConsumerIterator$_setter_$MaxQueueSize_$eq(int);
   Signature: (I)V
 
diff --git c/scala/xml/pull/XMLEventReader$POISON$.class w/scala/xml/pull/XMLEventReader$POISON$.class
index 18f3a22b17..e4d6a81fa1 100644
--- c/scala/xml/pull/XMLEventReader$POISON$.class
+++ w/scala/xml/pull/XMLEventReader$POISON$.class
@@ -2,7 +2,7 @@ InnerClasses:
 public final #= # of #; //POISON$=class scala/xml/pull/XMLEventReader$POISON$ of class scala/xml/pull/XMLEventReader
 
 Compiled from "XMLEventReader.scala"
-public final class scala.xml.pull.XMLEventReader$POISON$ extends java.lang.Object implements scala.xml.pull.XMLEvent,scala.ScalaObject,scala.Product,scala.Serializable{
+public final class scala.xml.pull.XMLEventReader$POISON$ extends java.lang.Object implements scala.xml.pull.XMLEvent,scala.Product,scala.Serializable{
 private final scala.xml.pull.XMLEventReader $outer;
   Signature: Lscala/xml/pull/XMLEventReader;
 
diff --git c/scala/xml/pull/XMLEventReader$Parser.class w/scala/xml/pull/XMLEventReader$Parser.class
index 8181a71c6f..e1cb8dc405 100644
--- c/scala/xml/pull/XMLEventReader$Parser.class
+++ w/scala/xml/pull/XMLEventReader$Parser.class
@@ -3,7 +3,7 @@ public #= # of #; //Parser=class scala/xml/pull/XMLEventReader$Parser of class s
 public final #= # of #; //POISON$=class scala/xml/pull/XMLEventReader$POISON$ of class scala/xml/pull/XMLEventReader
 
 Compiled from "XMLEventReader.scala"
-public class scala.xml.pull.XMLEventReader$Parser extends scala.xml.parsing.MarkupHandler implements scala.xml.parsing.MarkupParser,scala.xml.parsing.ExternalSources,java.lang.Runnable,scala.ScalaObject{
+public class scala.xml.pull.XMLEventReader$Parser extends scala.xml.parsing.MarkupHandler implements scala.xml.parsing.MarkupParser,scala.xml.parsing.ExternalSources,java.lang.Runnable{
 private final scala.io.Source input;
   Signature: Lscala/io/Source;
 
diff --git c/scala/xml/pull/XMLEventReader.class w/scala/xml/pull/XMLEventReader.class
index 0677f3c17d..0fadeb1e9a 100644
--- c/scala/xml/pull/XMLEventReader.class
+++ w/scala/xml/pull/XMLEventReader.class
@@ -3,7 +3,7 @@ public final #= # of #; //POISON$=class scala/xml/pull/XMLEventReader$POISON$ of
 public #= # of #; //Parser=class scala/xml/pull/XMLEventReader$Parser of class scala/xml/pull/XMLEventReader
 
 Compiled from "XMLEventReader.scala"
-public class scala.xml.pull.XMLEventReader extends scala.collection.AbstractIterator implements scala.xml.pull.ProducerConsumerIterator,scala.ScalaObject{
+public class scala.xml.pull.XMLEventReader extends scala.collection.AbstractIterator implements scala.xml.pull.ProducerConsumerIterator{
 private final boolean preserveWS;
   Signature: Z
 
diff --git c/scala/xml/transform/BasicTransformer.class w/scala/xml/transform/BasicTransformer.class
index 4db5376c0d..670dd81613 100644
--- c/scala/xml/transform/BasicTransformer.class
+++ w/scala/xml/transform/BasicTransformer.class
@@ -1,7 +1,7 @@
 InnerClasses:
 
 Compiled from "BasicTransformer.scala"
-public abstract class scala.xml.transform.BasicTransformer extends java.lang.Object implements scala.Function1,scala.ScalaObject{
+public abstract class scala.xml.transform.BasicTransformer extends java.lang.Object implements scala.Function1{
 public boolean apply$mcZD$sp(double);
   Signature: (D)Z
   Code:
