diff --git a/.travis.yml b/.travis.yml
index 0122f29..1baf295 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,4 +14,4 @@ jdk:
   - oraclejdk8
 notifications:
   email:
-    - jason.zaugg@typesafe.com
+    - jason.zaugg@lightbend.com
diff --git a/LICENSE b/LICENSE
index ce51bda..6fdcc0c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
-Copyright (c) 2002-2013 EPFL
-Copyright (c) 2011-2013 Typesafe, Inc.
+Copyright (c) 2002-2017 EPFL
+Copyright (c) 2011-2017 Lightbend, Inc.
 
 All rights reserved.
 
diff --git a/build.sbt b/build.sbt
index 42b2e56..9bd553c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,7 @@
 import ScalaModulePlugin._
 
 scalaVersionsByJvm in ThisBuild := Map(
-  8 -> List("2.12.0", "2.11.8", "2.13.0-M1").map(_ -> true)
+  8 -> List("2.12.2", "2.11.11", "2.13.0-M1").map(_ -> true)
 )
 
 val disableDocs = sys.props("nodocs") == "true"
@@ -23,7 +23,8 @@ def osgiExport(scalaVersion: String, version: String) = {
 
 lazy val commonSettings = Seq(
   organization := "org.scala-lang.modules",
-  version := "0.9.0-SNAPSHOT"
+  version := "0.9.0-SNAPSHOT",
+  scalacOptions ++= Seq("-feature", "-deprecation", "-unchecked")
 )
 
 lazy val fnGen = (project in file("fnGen")).
@@ -68,9 +69,10 @@ lazy val root = (project in file(".")).
       (out ** "*.scala").get
     }.taskValue,
 
-    sourceGenerators in Compile <+= (sourceManaged in Compile, scalaVersion) map { (dir, v) =>
+    sourceGenerators in Compile += Def.task {
+      val dir = (sourceManaged in Compile).value
       val write = jwrite(dir) _
-      if(v.startsWith("2.11.")) {
+      if(scalaVersion.value.startsWith("2.11.")) {
         Seq(write("JFunction", CodeGen.factory)) ++
           (0 to 22).map(n => write("JFunction" + n, CodeGen.fN(n))) ++
           (0 to 22).map(n => write("JProcedure" + n, CodeGen.pN(n))) ++
@@ -79,11 +81,11 @@ lazy val root = (project in file(".")).
           CodeGen.specializedF2.map(write.tupled) ++
           CodeGen.packageDummy.map((jwrite(dir, "java/runtime/java8") _).tupled)
       } else CodeGen.create212.map(write.tupled)
-    },
+    }.taskValue,
 
-    sourceGenerators in Test <+= sourceManaged in Test map { dir =>
-      Seq(jwrite(dir)("TestApi", CodeGen.testApi))
-    },
+    sourceGenerators in Test += Def.task {
+      Seq(jwrite((sourceManaged in Test).value)("TestApi", CodeGen.testApi))
+    }.taskValue,
 
     initialize := {
       // Run previously configured inialization...
@@ -103,14 +105,16 @@ lazy val root = (project in file(".")).
   ).
   settings(
     (inConfig(JavaDoc)(Defaults.configSettings) ++ (if (disableDocs) Nil else Seq(
-      packageDoc in Compile <<= packageDoc in JavaDoc,
-      sources in JavaDoc <<= (target, compile in Compile, sources in Compile) map {(t, c, s) =>
-        val allJavaSources = (t / "java" ** "*.java").get ++ s.filter(_.getName.endsWith(".java"))
+      packageDoc in Compile := (packageDoc in JavaDoc).value,
+      sources in JavaDoc := {
+        val allJavaSources =
+          (target.value / "java" ** "*.java").get ++
+            (sources in Compile).value.filter(_.getName.endsWith(".java"))
         allJavaSources.filterNot(_.getName.contains("FuturesConvertersImpl.java")) // this file triggers bugs in genjavadoc
       },
       javacOptions in JavaDoc := Seq(),
       artifactName in packageDoc in JavaDoc := ((sv, mod, art) => "" + mod.name + "_" + sv.binary + "-" + mod.revision + "-javadoc.jar"),
-      libraryDependencies += compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.10" cross CrossVersion.fullMapped { case "2.12.0" => "2.12.0-RC1" case x => x}),
+      libraryDependencies += compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.10" cross CrossVersion.full),
       scalacOptions in Compile += "-P:genjavadoc:out=" + (target.value / "java")
     ))): _*
   ).
diff --git a/fnGen/WrapFnGen.scala b/fnGen/WrapFnGen.scala
index 46779bc..46d79f3 100644
--- a/fnGen/WrapFnGen.scala
+++ b/fnGen/WrapFnGen.scala
@@ -14,7 +14,6 @@ object WrapFnGen {
   val packaging = "package scala.compat.java8"
 
   import scala.tools.nsc._
-  import scala.reflect.internal._
   val settings = new Settings(msg => sys.error(msg))
   settings.usejavacp.value = true
   val compiler = new Global(settings)
@@ -59,12 +58,12 @@ object WrapFnGen {
   }
 
   implicit class SplitMyLinesAndStuff(s: String) {
-    def toVec = s.linesIterator.toVector
+    def toVec = s.lines.toVector
     def nonBlank = s.trim.length > 0
   }
 
   implicit class TreeToText(t: Tree) {
-    def text = showCode(t).replace("$", "").linesIterator.toVector
+    def text = showCode(t).replace("$", "").lines.toVector
   }
 
   case class Prioritized(lines: Vector[String], priority: Int) {
@@ -253,7 +252,6 @@ object WrapFnGen {
             q"""@inline implicit def $s2jImpN[..$scalafnTdefs](sf: $scalaType[..$scalafnTnames])(implicit ..$evs): $s2jValCN[..$tnParams] =
               new $s2jValCN[..$tnParams](sf.asInstanceOf[$scalaType[..$scalaTargs]])
             """
-          val depth = numberedA.size
           (tree, tdParams.length)
         }
 
@@ -290,7 +288,7 @@ object WrapFnGen {
   def sameText(f: java.io.File, text: String): Boolean = {
     val x = scala.io.Source.fromFile(f)
     val lines = try { x.getLines.toVector } finally { x.close }
-    lines.iterator.filter(_.nonBlank) == text.linesIterator.filter(_.nonBlank)
+    lines.iterator.filter(_.nonBlank) == text.lines.filter(_.nonBlank)
   }
 
   def write(f: java.io.File, text: String) {
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 293445d..36ce0ab 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1 +1,3 @@
+scalacOptions += "-Xfatal-warnings"
+
 addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.8")
diff --git a/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveDoubleWrapper.java b/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveDoubleWrapper.java
index 7c27293..f863b8c 100644
--- a/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveDoubleWrapper.java
+++ b/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveDoubleWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2015 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.compat.java8.wrappers;
 
diff --git a/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveIntWrapper.java b/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveIntWrapper.java
index 330a41c..10c5cf0 100644
--- a/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveIntWrapper.java
+++ b/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveIntWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2015 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.compat.java8.wrappers;
 
diff --git a/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveLongWrapper.java b/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveLongWrapper.java
index 9adff5f..2cf799d 100644
--- a/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveLongWrapper.java
+++ b/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveLongWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2015 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.compat.java8.wrappers;
 
diff --git a/src/main/scala/scala/compat/java8/FutureConverters.scala b/src/main/scala/scala/compat/java8/FutureConverters.scala
index c065e49..99f019a 100644
--- a/src/main/scala/scala/compat/java8/FutureConverters.scala
+++ b/src/main/scala/scala/compat/java8/FutureConverters.scala
@@ -1,13 +1,14 @@
 /*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2015 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.compat.java8
 
+import scala.language.implicitConversions
+
 import scala.concurrent.java8.FuturesConvertersImpl._
-import scala.concurrent.{ Future, Promise, ExecutionContext, ExecutionContextExecutorService, ExecutionContextExecutor, impl }
-import java.util.concurrent.{ CompletionStage, Executor, ExecutorService, CompletableFuture }
-import scala.util.{ Try, Success, Failure }
-import java.util.function.{ BiConsumer, Function ⇒ JF, Consumer, BiFunction }
+import scala.concurrent.{ Future, Promise, ExecutionContext, ExecutionContextExecutorService, ExecutionContextExecutor }
+import java.util.concurrent.{ CompletionStage, Executor, ExecutorService }
+import java.util.function.Consumer
 
 /**
  * This class contains static methods which convert between Java CompletionStage
diff --git a/src/main/scala/scala/compat/java8/OptionConverters.scala b/src/main/scala/scala/compat/java8/OptionConverters.scala
index b99529a..75b7915 100644
--- a/src/main/scala/scala/compat/java8/OptionConverters.scala
+++ b/src/main/scala/scala/compat/java8/OptionConverters.scala
@@ -1,9 +1,8 @@
 /*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2015 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.compat.java8
 
-import language.implicitConversions
 import java.util.{Optional, OptionalDouble, OptionalInt, OptionalLong}
 
 /** This class enables bidirectional conversion between `scala.Option` and the
diff --git a/src/main/scala/scala/compat/java8/PrimitiveIteratorConversions.scala b/src/main/scala/scala/compat/java8/PrimitiveIteratorConversions.scala
index da991c2..9210010 100644
--- a/src/main/scala/scala/compat/java8/PrimitiveIteratorConversions.scala
+++ b/src/main/scala/scala/compat/java8/PrimitiveIteratorConversions.scala
@@ -1,9 +1,8 @@
 /*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2015 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.compat.java8
 
-import language.implicitConversions
 import java.util.{ Iterator => JIterator, PrimitiveIterator }
 
 /** This class enables conversion from `scala.Iterator` to the set of
diff --git a/src/main/scala/scala/compat/java8/StreamConverters.scala b/src/main/scala/scala/compat/java8/StreamConverters.scala
index c6334a2..80f7077 100644
--- a/src/main/scala/scala/compat/java8/StreamConverters.scala
+++ b/src/main/scala/scala/compat/java8/StreamConverters.scala
@@ -1,6 +1,6 @@
 package scala.compat.java8
 
-import language.implicitConversions
+import scala.language.higherKinds
 
 import java.util.stream._
 import scala.compat.java8.collectionImpl._
diff --git a/src/main/scala/scala/compat/java8/collectionImpl/Accumulator.scala b/src/main/scala/scala/compat/java8/collectionImpl/Accumulator.scala
index e67ca79..4f1eeb8 100644
--- a/src/main/scala/scala/compat/java8/collectionImpl/Accumulator.scala
+++ b/src/main/scala/scala/compat/java8/collectionImpl/Accumulator.scala
@@ -1,5 +1,7 @@
 package scala.compat.java8.collectionImpl
 
+import scala.language.higherKinds
+
 /** An `Accumulator` is a low-level collection specialized for gathering
   * elements in parallel and then joining them in order by merging Accumulators.
   * Accumulators can contain more than `Int.MaxValue` elements.
@@ -232,7 +234,7 @@ private[java8] class AccumulatorStepper[A](private val acc: Accumulator[A]) exte
   private var n = if (acc.hIndex > 0) acc.cumulative(0) else acc.index
   private var N = acc.totalSize
   
-  private def duplicateSelf(limit: Long = N): AccumulatorStepper[A] = {
+  private def duplicateSelf(limit: Long): AccumulatorStepper[A] = {
     val ans = new AccumulatorStepper(acc)
     ans.h = h
     ans.i = i
@@ -249,7 +251,7 @@ private[java8] class AccumulatorStepper[A](private val acc: Accumulator[A]) exte
     i = 0
   }
   
-  def characteristics = ORDERED | SIZED | SUBSIZED
+  def characteristics() = ORDERED | SIZED | SUBSIZED
   
   def estimateSize = N
 
diff --git a/src/main/scala/scala/compat/java8/collectionImpl/DoubleAccumulator.scala b/src/main/scala/scala/compat/java8/collectionImpl/DoubleAccumulator.scala
index 07d6b42..65fabe6 100644
--- a/src/main/scala/scala/compat/java8/collectionImpl/DoubleAccumulator.scala
+++ b/src/main/scala/scala/compat/java8/collectionImpl/DoubleAccumulator.scala
@@ -1,5 +1,7 @@
 package scala.compat.java8.collectionImpl
 
+import scala.language.higherKinds
+
 /** A `DoubleAccumulator` is a low-level collection specialized for gathering
   * elements in parallel and then joining them in order by merging them.
   * This is a manually specialized variant of `Accumulator` with no actual
@@ -229,7 +231,7 @@ private[java8] class DoubleAccumulatorStepper(private val acc: DoubleAccumulator
   private var n = if (acc.hIndex > 0) acc.cumulative(0) else acc.index
   private var N = acc.totalSize
   
-  private def duplicateSelf(limit: Long = N): DoubleAccumulatorStepper = {
+  private def duplicateSelf(limit: Long): DoubleAccumulatorStepper = {
     val ans = new DoubleAccumulatorStepper(acc)
     ans.h = h
     ans.i = i
@@ -246,7 +248,7 @@ private[java8] class DoubleAccumulatorStepper(private val acc: DoubleAccumulator
     i = 0
   }
     
-  def characteristics = ORDERED | SIZED | SUBSIZED | NONNULL
+  def characteristics() = ORDERED | SIZED | SUBSIZED | NONNULL
   
   def estimateSize = N
 
diff --git a/src/main/scala/scala/compat/java8/collectionImpl/IntAccumulator.scala b/src/main/scala/scala/compat/java8/collectionImpl/IntAccumulator.scala
index 0747deb..129ed9b 100644
--- a/src/main/scala/scala/compat/java8/collectionImpl/IntAccumulator.scala
+++ b/src/main/scala/scala/compat/java8/collectionImpl/IntAccumulator.scala
@@ -1,5 +1,7 @@
 package scala.compat.java8.collectionImpl
 
+import scala.language.higherKinds
+
 /** A `IntAccumulator` is a low-level collection specialized for gathering
   * elements in parallel and then joining them in order by merging them.
   * This is a manually specialized variant of `Accumulator` with no actual
@@ -236,7 +238,7 @@ private[java8] class IntAccumulatorStepper(private val acc: IntAccumulator) exte
   private var n = if (acc.hIndex > 0) acc.cumulative(0) else acc.index
   private var N = acc.totalSize
   
-  private def duplicateSelf(limit: Long = N): IntAccumulatorStepper = {
+  private def duplicateSelf(limit: Long): IntAccumulatorStepper = {
     val ans = new IntAccumulatorStepper(acc)
     ans.h = h
     ans.i = i
@@ -253,7 +255,7 @@ private[java8] class IntAccumulatorStepper(private val acc: IntAccumulator) exte
     i = 0
   }
   
-  def characteristics = ORDERED | SIZED | SUBSIZED | NONNULL
+  def characteristics() = ORDERED | SIZED | SUBSIZED | NONNULL
   
   def estimateSize = N
 
diff --git a/src/main/scala/scala/compat/java8/collectionImpl/LongAccumulator.scala b/src/main/scala/scala/compat/java8/collectionImpl/LongAccumulator.scala
index 285d275..1c4bdd3 100644
--- a/src/main/scala/scala/compat/java8/collectionImpl/LongAccumulator.scala
+++ b/src/main/scala/scala/compat/java8/collectionImpl/LongAccumulator.scala
@@ -1,5 +1,7 @@
 package scala.compat.java8.collectionImpl
 
+import scala.language.higherKinds
+
 /** A `LongAccumulator` is a low-level collection specialized for gathering
   * elements in parallel and then joining them in order by merging them.
   * This is a manually specialized variant of `Accumulator` with no actual
@@ -230,7 +232,7 @@ private[java8] class LongAccumulatorStepper(private val acc: LongAccumulator) ex
   private var n = if (acc.hIndex > 0) acc.cumulative(0) else acc.index
   private var N = acc.totalSize
   
-  private def duplicateSelf(limit: Long = N): LongAccumulatorStepper = {
+  private def duplicateSelf(limit: Long): LongAccumulatorStepper = {
     val ans = new LongAccumulatorStepper(acc)
     ans.h = h
     ans.i = i
@@ -247,7 +249,7 @@ private[java8] class LongAccumulatorStepper(private val acc: LongAccumulator) ex
     i = 0
   }
   
-  def characteristics = ORDERED | SIZED | SUBSIZED | NONNULL
+  def characteristics() = ORDERED | SIZED | SUBSIZED | NONNULL
   
   def estimateSize = N
 
diff --git a/src/main/scala/scala/compat/java8/collectionImpl/Stepper.scala b/src/main/scala/scala/compat/java8/collectionImpl/Stepper.scala
index aa9d6cd..a78d1f5 100644
--- a/src/main/scala/scala/compat/java8/collectionImpl/Stepper.scala
+++ b/src/main/scala/scala/compat/java8/collectionImpl/Stepper.scala
@@ -1,5 +1,7 @@
 package scala.compat.java8.collectionImpl
 
+import scala.language.higherKinds
+
 import java.util.Spliterator
 
 /** A Stepper is a specialized collection that can step through its
@@ -66,7 +68,7 @@ trait StepperLike[@specialized(Double, Int, Long) A, +CC] { self: CC =>
     * guaranteed to be any safer than modification of any generic mutable collection, and if the underlying collection is ordered by
     * virtue of sorting, `Stepper` will not keep track of that fact.
     */
-  def characteristics: Int
+  def characteristics(): Int
 
   /** Returns the size of the collection, if known exactly, or `-1` if not. */
   def knownSize: Long
diff --git a/src/main/scala/scala/compat/java8/converterImpl/Accumulates.scala b/src/main/scala/scala/compat/java8/converterImpl/Accumulates.scala
index 2affeb9..cb3c963 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/Accumulates.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/Accumulates.scala
@@ -1,9 +1,6 @@
 package scala.compat.java8.converterImpl
 
-import language.implicitConversions
-
 import scala.compat.java8.collectionImpl._
-import scala.compat.java8.runtime._
 
 trait AccumulatesFromStepper[@specialized(Double, Int, Long) A, Acc <: AccumulatorLike[A, Acc]] {
   def apply(stepper: Stepper[A]): Acc
diff --git a/src/main/scala/scala/compat/java8/converterImpl/MakesSteppers.scala b/src/main/scala/scala/compat/java8/converterImpl/MakesSteppers.scala
index 017f2cd..e194de9 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/MakesSteppers.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/MakesSteppers.scala
@@ -1,9 +1,6 @@
 package scala.compat.java8.converterImpl
 
-import language.implicitConversions
-
 import scala.compat.java8.collectionImpl._
-import scala.compat.java8.runtime._
 
 trait MakesStepper[T, +Extra] extends Any {
   /** Generates a fresh stepper of type `S` for element type `T` */
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepConverters.scala b/src/main/scala/scala/compat/java8/converterImpl/StepConverters.scala
index 566c17c..7fbf363 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepConverters.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepConverters.scala
@@ -2,11 +2,6 @@ package scala.compat.java8.converterImpl
 
 import language.implicitConversions
 
-import scala.compat.java8.collectionImpl._
-import scala.compat.java8.runtime._
-
-import Stepper._
-
 trait Priority3StepConverters {
   implicit def richIterableCanStep[A](underlying: Iterable[A]) = new RichIterableCanStep(underlying)
   implicit def richMapCanStep[K, V](underlying: collection.Map[K, V]) = new RichMapCanStep[K, V](underlying)
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsArray.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsArray.scala
index ef75eb6..c9d21cf 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepsArray.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepsArray.scala
@@ -1,10 +1,8 @@
 package scala.compat.java8.converterImpl
 
-import language.implicitConversions
 import scala.annotation.switch
 
 import scala.compat.java8.collectionImpl._
-import scala.compat.java8.runtime._
 
 import Stepper._
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsBitSet.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsBitSet.scala
index b6f698a..8b0a49c 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepsBitSet.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepsBitSet.scala
@@ -1,7 +1,5 @@
 package scala.compat.java8.converterImpl
 
-import language.implicitConversions
-
 import scala.compat.java8.collectionImpl._
 import scala.compat.java8.runtime._
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsFlatHashTable.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsFlatHashTable.scala
index ec30008..8661105 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepsFlatHashTable.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepsFlatHashTable.scala
@@ -1,6 +1,5 @@
 package scala.compat.java8.converterImpl
 
-import language.implicitConversions
 import scala.annotation.switch
 
 import scala.compat.java8.collectionImpl._
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsHashTable.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsHashTable.scala
index dde431e..f4869d6 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepsHashTable.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepsHashTable.scala
@@ -1,6 +1,5 @@
 package scala.compat.java8.converterImpl
 
-import language.implicitConversions
 import scala.annotation.switch
 
 import scala.compat.java8.collectionImpl._
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsImmHashMap.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsImmHashMap.scala
index d6a5b0e..4875a4a 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepsImmHashMap.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepsImmHashMap.scala
@@ -1,10 +1,8 @@
 package scala.compat.java8.converterImpl
 
-import language.implicitConversions
 import scala.annotation.switch
 
 import scala.compat.java8.collectionImpl._
-import scala.compat.java8.runtime._
 
 import Stepper._
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsImmHashSet.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsImmHashSet.scala
index abde687..84e0aff 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepsImmHashSet.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepsImmHashSet.scala
@@ -1,12 +1,8 @@
 package scala.compat.java8.converterImpl
 
-import language.implicitConversions
 import scala.annotation.switch
 
 import scala.compat.java8.collectionImpl._
-import scala.compat.java8.runtime._
-
-import Stepper._
 
 /////////////////////////////
 // Stepper implementations //
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsIndexedSeq.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsIndexedSeq.scala
index e36fab0..1065f0d 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepsIndexedSeq.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepsIndexedSeq.scala
@@ -1,10 +1,8 @@
 package scala.compat.java8.converterImpl
 
-import language.implicitConversions
 import scala.annotation.switch
 
 import scala.compat.java8.collectionImpl._
-import scala.compat.java8.runtime._
 
 import Stepper._
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsIterable.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsIterable.scala
index dd8d6a3..b0d63e9 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepsIterable.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepsIterable.scala
@@ -1,12 +1,8 @@
 package scala.compat.java8.converterImpl
 
-import language.implicitConversions
 import scala.annotation.switch
 
 import scala.compat.java8.collectionImpl._
-import scala.compat.java8.runtime._
-
-import Stepper._
 
 // Iterables just defer to iterator unless they can pattern match something better.
 // TODO: implement pattern matching!
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsIterator.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsIterator.scala
index 02f58cd..d3b244f 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepsIterator.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepsIterator.scala
@@ -1,12 +1,8 @@
 package scala.compat.java8.converterImpl
 
-import language.implicitConversions
 import scala.annotation.switch
 
 import scala.compat.java8.collectionImpl._
-import scala.compat.java8.runtime._
-
-import Stepper._
 
 /////////////////////////////
 // Stepper implementations //
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsLikeGapped.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsLikeGapped.scala
index f70b8b2..6f74880 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepsLikeGapped.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepsLikeGapped.scala
@@ -1,7 +1,5 @@
 package scala.compat.java8.converterImpl
 
-import annotation.tailrec
-
 import scala.compat.java8.collectionImpl._
 import Stepper._
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsLikeImmHashMap.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsLikeImmHashMap.scala
index 6f4d0c9..de4cdf1 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepsLikeImmHashMap.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepsLikeImmHashMap.scala
@@ -1,7 +1,5 @@
 package scala.compat.java8.converterImpl
 
-import java.util.Spliterator
-
 import scala.compat.java8.collectionImpl._
 import Stepper._
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsLikeIndexed.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsLikeIndexed.scala
index d0b7419..ed5abfa 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepsLikeIndexed.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepsLikeIndexed.scala
@@ -1,7 +1,5 @@
 package scala.compat.java8.converterImpl
 
-import java.util.Spliterator
-
 import scala.compat.java8.collectionImpl._
 import Stepper._
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsLikeIterator.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsLikeIterator.scala
index 116e921..02a05c7 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepsLikeIterator.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepsLikeIterator.scala
@@ -1,7 +1,5 @@
 package scala.compat.java8.converterImpl
 
-import java.util.Spliterator
-
 import scala.compat.java8.collectionImpl._
 import Stepper._
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsLikeSliced.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsLikeSliced.scala
index 83609eb..8de1df0 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepsLikeSliced.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepsLikeSliced.scala
@@ -1,7 +1,5 @@
 package scala.compat.java8.converterImpl
 
-import java.util.Spliterator
-
 import scala.compat.java8.collectionImpl._
 import Stepper._
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsLikeTrieIterator.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsLikeTrieIterator.scala
index 6565dd8..eeda5b9 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepsLikeTrieIterator.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepsLikeTrieIterator.scala
@@ -1,7 +1,5 @@
 package scala.compat.java8.converterImpl
 
-import java.util.Spliterator
-
 import scala.compat.java8.collectionImpl._
 import Stepper._
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsLinearSeq.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsLinearSeq.scala
index 892bed5..4c18398 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepsLinearSeq.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepsLinearSeq.scala
@@ -1,10 +1,8 @@
 package scala.compat.java8.converterImpl
 
-import language.implicitConversions
 import scala.annotation.switch
 
 import scala.compat.java8.collectionImpl._
-import scala.compat.java8.runtime._
 
 import Stepper._
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsMap.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsMap.scala
index 3a1f49c..1bf71fa 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepsMap.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepsMap.scala
@@ -1,12 +1,8 @@
 package scala.compat.java8.converterImpl
 
-import language.implicitConversions
 import scala.annotation.switch
 
 import scala.compat.java8.collectionImpl._
-import scala.compat.java8.runtime._
-
-import Stepper._
 
 // Generic maps defer to the iterator steppers if a more precise type cannot be found via pattern matching
 // TODO: implement pattern matching
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsRange.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsRange.scala
index 63505c8..d364ed2 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepsRange.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepsRange.scala
@@ -1,10 +1,8 @@
 package scala.compat.java8.converterImpl
 
-import language.implicitConversions
 import scala.annotation.switch
 
 import scala.compat.java8.collectionImpl._
-import scala.compat.java8.runtime._
 
 import Stepper._
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsString.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsString.scala
index c8c7ad6..66101a1 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepsString.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepsString.scala
@@ -1,9 +1,6 @@
 package scala.compat.java8.converterImpl
 
-import language.implicitConversions
-
 import scala.compat.java8.collectionImpl._
-import scala.compat.java8.runtime._
 
 import Stepper._
 
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsVector.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsVector.scala
index ad54503..efbaa2d 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepsVector.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepsVector.scala
@@ -1,6 +1,5 @@
 package scala.compat.java8.converterImpl
 
-import language.implicitConversions
 import scala.annotation.switch
 
 import scala.compat.java8.collectionImpl._
diff --git a/src/main/scala/scala/compat/java8/converterImpl/StepsWithTail.scala b/src/main/scala/scala/compat/java8/converterImpl/StepsWithTail.scala
index 0fcc12b..f9977d7 100644
--- a/src/main/scala/scala/compat/java8/converterImpl/StepsWithTail.scala
+++ b/src/main/scala/scala/compat/java8/converterImpl/StepsWithTail.scala
@@ -1,6 +1,5 @@
 package scala.compat.java8.converterImpl
 
-import java.util.Spliterator
 import scala.compat.java8.collectionImpl._
 import Stepper._
 
diff --git a/src/main/scala/scala/concurrent/java8/FutureConvertersImpl.scala b/src/main/scala/scala/concurrent/java8/FutureConvertersImpl.scala
index edc8723..0c5bf49 100644
--- a/src/main/scala/scala/concurrent/java8/FutureConvertersImpl.scala
+++ b/src/main/scala/scala/concurrent/java8/FutureConvertersImpl.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2015 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.concurrent.java8
 
diff --git a/src/test/java/scala/compat/java8/BoxingTest.java b/src/test/java/scala/compat/java8/BoxingTest.java
index 94b05ff..c093631 100644
--- a/src/test/java/scala/compat/java8/BoxingTest.java
+++ b/src/test/java/scala/compat/java8/BoxingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2015 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.compat.java8;
 
diff --git a/src/test/java/scala/compat/java8/FutureConvertersTest.java b/src/test/java/scala/compat/java8/FutureConvertersTest.java
index a87a6b8..8022499 100644
--- a/src/test/java/scala/compat/java8/FutureConvertersTest.java
+++ b/src/test/java/scala/compat/java8/FutureConvertersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2015 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.compat.java8;
 
diff --git a/src/test/java/scala/compat/java8/LambdaTest.java b/src/test/java/scala/compat/java8/LambdaTest.java
index 36634c4..7992f03 100644
--- a/src/test/java/scala/compat/java8/LambdaTest.java
+++ b/src/test/java/scala/compat/java8/LambdaTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2015 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.compat.java8;
 
diff --git a/src/test/java/scala/compat/java8/OptionConvertersTest.scala b/src/test/java/scala/compat/java8/OptionConvertersTest.scala
index 0b857c3..4c21bb5 100644
--- a/src/test/java/scala/compat/java8/OptionConvertersTest.scala
+++ b/src/test/java/scala/compat/java8/OptionConvertersTest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2015 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.compat.java8
 
diff --git a/src/test/java/scala/compat/java8/SpecializedTest.scala b/src/test/java/scala/compat/java8/SpecializedTest.scala
index e6b3239..cc7f2f4 100644
--- a/src/test/java/scala/compat/java8/SpecializedTest.scala
+++ b/src/test/java/scala/compat/java8/SpecializedTest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2015 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.compat.java8
 
diff --git a/src/test/java/scala/compat/java8/SpecializedTestSupport.java b/src/test/java/scala/compat/java8/SpecializedTestSupport.java
index c7e4386..274926f 100644
--- a/src/test/java/scala/compat/java8/SpecializedTestSupport.java
+++ b/src/test/java/scala/compat/java8/SpecializedTestSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2015 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.compat.java8;
 
diff --git a/src/test/java/scala/compat/java8/StreamConvertersExampleTest.java b/src/test/java/scala/compat/java8/StreamConvertersExampleTest.java
index da16655..33b1800 100644
--- a/src/test/java/scala/compat/java8/StreamConvertersExampleTest.java
+++ b/src/test/java/scala/compat/java8/StreamConvertersExampleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2016 Lightbend Inc. <http://www.lightbend.com>
  */
 
 import org.junit.Test;
diff --git a/src/test/scala/scala/compat/java8/FunctionConvertersTest.scala b/src/test/scala/scala/compat/java8/FunctionConvertersTest.scala
index 7e8f76d..d226ec6 100644
--- a/src/test/scala/scala/compat/java8/FunctionConvertersTest.scala
+++ b/src/test/scala/scala/compat/java8/FunctionConvertersTest.scala
@@ -33,8 +33,8 @@ class FunctionConvertersTest {
     val bic2 = new BiConsumer[Int, Long]{ def accept(i: Int, l: Long) { save((i,l)) } }
     val sbic = (s: String, f: File) => { save((s,f)); () }
     val zbic = (i: Int, l: Long) => { save((i,l)); () }
-    def jbic[A, B](bic: BiConsumer[A, B])(a: A, b: B) = { bic.accept(a,b); recall == (a,b) }
-    def fbic[A, B](f: (A,B) => Unit)(a: A, b: B) = { f(a,b); recall == (a,b) }
+    def jbic[A, B](bic: BiConsumer[A, B])(a: A, b: B) = { bic.accept(a,b); recall == ((a,b)) }
+    def fbic[A, B](f: (A,B) => Unit)(a: A, b: B) = { f(a,b); recall == ((a,b)) }
     assert(jbic(asJavaBiConsumer(sbic))(str, fyl))
     assert(jbic(asJavaBiConsumer(zbic))(num, nmm))
     assert(jbic(sbic.asJava)(str, fyl))
@@ -48,7 +48,7 @@ class FunctionConvertersTest {
 
   // BiFunction tests; conceptually narrows to any of the Bi functions or to ObjLongConsumer etc
   @Test
-  def test_BiFunction {
+  def test_BiFunction() {
     val bif1 = new BiFunction[String, File, (String, File)]{ def apply(s: String, f: File) = (s,f) }
     val bif2 = new BiFunction[Int, Long, Double]{ def apply(i: Int, l: Long) = i.toDouble*l }
     val sbif = (s: String, f: File) => (s,f)
@@ -67,7 +67,7 @@ class FunctionConvertersTest {
 
   // BinaryOperator tests; actually widens to BiFunction and conceptually narrows to IntBinaryOperator etc.
   @Test
-  def test_BinaryOperator {
+  def test_BinaryOperator() {
     val bop1 = new BinaryOperator[String]{ def apply(s: String, t: String) = s + t }
     val bop2 = new BinaryOperator[Int]{ def apply(i: Int, j: Int) = i + j }
     val sbop = (s: String, t: String) => s + t
@@ -86,7 +86,7 @@ class FunctionConvertersTest {
 
   // BiPredicate tests; conceptually widens to BiFunction.  Does not narrow (no IntBiPredicate or the like).
   @Test
-  def test_BiPredicate {
+  def test_BiPredicate() {
     val bip1 = new BiPredicate[String, File]{ def test(s: String, f: File) = s == f.getName }
     val bip2 = new BiPredicate[Int, Long]{ def test(i: Int, l: Long) = i == l }
     val sbip = (s: String, f: File) => s == f.getName
@@ -105,7 +105,7 @@ class FunctionConvertersTest {
 
   // BooleanSupplier tests; conceptually widens to Supplier and Function.
   @Test
-  def test_BooleanSupplier {
+  def test_BooleanSupplier() {
     val bsup = new BooleanSupplier{ def getAsBoolean = true }
     val sbup = () => true
     def foo(bs: BooleanSupplier) = bs.getAsBoolean
@@ -119,7 +119,7 @@ class FunctionConvertersTest {
 
   // Consumer tests; conceptually widens to Function and narrows to IntConsumer etc.
   @Test
-  def test_Consumer {
+  def test_Consumer() {
     val con1 = new Consumer[String]{ def accept(s: String) { save(s) } }
     val con2 = new Consumer[Int]{ def accept(i: Int) { save(i) } }
     val scon = (s: String) => { save(s); () }
@@ -138,7 +138,7 @@ class FunctionConvertersTest {
 
   // DoubleBinaryOperator tests; conceptually widens to BinaryOperator, ToDoubleBiFunction, and BiFunction
   @Test
-  def test_DoubleBinaryOperator {
+  def test_DoubleBinaryOperator() {
     val dbop = new DoubleBinaryOperator{ def applyAsDouble(a: Double, b: Double) = a*b }
     val sdbo = (a: Double, b: Double) => a*b
     def foo(dbo: DoubleBinaryOperator)(a: Double, b: Double) = dbo.applyAsDouble(a,b)
@@ -152,7 +152,7 @@ class FunctionConvertersTest {
 
   // DoubleConsumer tests; conceptually widens to Consumer and Function
   @Test
-  def test_DoubleConsumer {
+  def test_DoubleConsumer() {
     val dcon = new DoubleConsumer{ def accept(value: Double) { save(value) } }
     val sdco = (d: Double) => { save(d); () }
     def jf(dc: DoubleConsumer)(d: Double) = { dc.accept(d); recall == d }
@@ -165,7 +165,7 @@ class FunctionConvertersTest {
 
   // DoubleFunction tests; conceptually widens to Function, narrows to DoubleUnaryOperator and DoubleToIntFunction etc.
   @Test
-  def test_DoubleFunction {
+  def test_DoubleFunction() {
     val dfn1 = new DoubleFunction[String]{ def apply(value: Double) = f"$value%.3f" }
     val dfn2 = new DoubleFunction[Int]{ def apply(value: Double) = math.ceil(value).toInt }
     val sdfn = (d: Double) => f"$d%.3f"
@@ -184,7 +184,7 @@ class FunctionConvertersTest {
 
   // DoublePredicate tests; conceptually widens to DoubleFunction, Predicate, and Function
   @Test
-  def test_DoublePredicate {
+  def test_DoublePredicate() {
     val dprd = new DoublePredicate{ def test(value: Double) = value > 0 }
     val sdpr = (d: Double) => d > 0
     def foo(dp: DoublePredicate)(d: Double) = dp.test(d)
@@ -198,7 +198,7 @@ class FunctionConvertersTest {
 
   // DoubleSupplier tests; conceptually widens to Supplier and Function
   @Test
-  def test_DoubleSupplier {
+  def test_DoubleSupplier() {
     val dsup = new DoubleSupplier{ def getAsDouble = 22.0/7 }
     val sdsu = () => 22.0/7
     def foo(ds: DoubleSupplier) = ds.getAsDouble
@@ -212,7 +212,7 @@ class FunctionConvertersTest {
 
   // DoubleToIntFunction tests; conceptually widens to DoubleFunction and Function
   @Test
-  def test_DoubleToIntFunction {
+  def test_DoubleToIntFunction() {
     val d2if = new DoubleToIntFunction{ def applyAsInt(value: Double) = math.ceil(value).toInt }
     val sd2i = (d: Double) => math.ceil(d).toInt
     def foo(di: DoubleToIntFunction)(d: Double) = di.applyAsInt(d)
@@ -226,7 +226,7 @@ class FunctionConvertersTest {
 
   // DoubleToLongFunction tests; conceptually widens to DoubleFunction and Function
   @Test
-  def test_DoubleToLongFunction {
+  def test_DoubleToLongFunction() {
     val d2lf = new DoubleToLongFunction{ def applyAsLong(value: Double) = java.lang.Double.doubleToRawLongBits(value) }
     val sd2l = (d: Double) => java.lang.Double.doubleToRawLongBits(d)
     def foo(dl: DoubleToLongFunction)(d: Double) = dl.applyAsLong(d)
@@ -240,7 +240,7 @@ class FunctionConvertersTest {
 
   // DoubleUnaryOperator tests; conceptually widens to DoubleFunction and ToDoubleFunction and Function
   @Test
-  def test_DoubleUnaryOperator {
+  def test_DoubleUnaryOperator() {
     val duop = new DoubleUnaryOperator{ def applyAsDouble(value: Double) = 1.0 - value }
     val sduo = (d: Double) => 1.0 - d
     def foo(du: DoubleUnaryOperator)(d: Double) = du.applyAsDouble(d)
@@ -254,7 +254,7 @@ class FunctionConvertersTest {
 
   // Function tests; conceptually narrows to everything except BiFunction and its conceptual subclasses
   @Test
-  def test_Function {
+  def test_Function() {
     val fun1 = new Function[String, File]{ def apply(s: String): File = new File(s) }
     val fun2 = new Function[Int, Long]{ def apply(i: Int): Long = ((i.toLong)<<32) | i }
     def sfun = (s: String) => new File(s)
@@ -283,7 +283,7 @@ class FunctionConvertersTest {
 
   // IntBinaryOperator tests; conceptually widens to BinaryOperator, ToIntBiFunction, and BiFunction
   @Test
-  def test_IntBinaryOperator {
+  def test_IntBinaryOperator() {
     val ibop = new IntBinaryOperator{ def applyAsInt(a: Int, b: Int) = a ^ b }
     val sibo = (i: Int, j: Int) => i ^ j
     def foo(ibo: IntBinaryOperator)(a: Int, b: Int) = ibo.applyAsInt(a,b)
@@ -297,7 +297,7 @@ class FunctionConvertersTest {
 
   // IntConsumer tests; conceptually widens to Consumer and Function
   @Test
-  def test_IntConsumer {
+  def test_IntConsumer() {
     val icon = new IntConsumer{ def accept(i: Int) { save(i) } }
     val sico = (i: Int) => { save(i); () }
     def jf(ic: IntConsumer)(d: Int) = { ic.accept(d); recall == d }
@@ -310,7 +310,7 @@ class FunctionConvertersTest {
 
   // IntFunction tests; conceptually widens to Function
   @Test
-  def test_IntFunction {
+  def test_IntFunction() {
     val ifn1 = new IntFunction[String]{ def apply(i: Int) = "!"*i }
     val ifn2 = new IntFunction[Long]{ def apply(i: Int) = ((i.toLong) << 32) | i }
     val sifn = (i: Int) => "!"*i
@@ -329,7 +329,7 @@ class FunctionConvertersTest {
 
   // IntPredicate tests; conceptually widens to IntFunction, Predicate, and Function
   @Test
-  def test_IntPredicate {
+  def test_IntPredicate() {
     val iprd = new IntPredicate{ def test(i: Int) = i < 0 }
     val sipr = (i: Int) => i < 0
     def foo(ip: IntPredicate)(d: Int) = ip.test(d)
@@ -343,7 +343,7 @@ class FunctionConvertersTest {
 
   // IntSupplier tests; conceptually widens to Supplier and Function
   @Test
-  def test_IntSupplier {
+  def test_IntSupplier() {
     val isup = new IntSupplier{ def getAsInt = 42 }
     val sisu = () => 42
     def foo(ds: IntSupplier) = ds.getAsInt
@@ -357,7 +357,7 @@ class FunctionConvertersTest {
 
   // IntToDoubleFunction tests; conceptually widens to ToDoubleFunction, IntFunction, and Function
   @Test
-  def test_IntToDoubleFunction {
+  def test_IntToDoubleFunction() {
     val i2df = new IntToDoubleFunction{ def applyAsDouble(i: Int) = i + 0.1*i }
     def si2d = (i: Int) => i + 0.1*i
     def foo(id: IntToDoubleFunction)(i: Int) = id.applyAsDouble(i)
@@ -371,7 +371,7 @@ class FunctionConvertersTest {
 
   // IntToLongFunction tests; conceptually widens to ToLongFunction, IntFunction, and Function
   @Test
-  def test_IntToLongFunction {
+  def test_IntToLongFunction() {
     val i2lf = new IntToLongFunction { def applyAsLong(i: Int) = (i.toLong << 32) | i }
     val si2l = (i: Int) => (i.toLong << 32) | i
     def foo(il: IntToLongFunction)(d: Int) = il.applyAsLong(d)
@@ -385,7 +385,7 @@ class FunctionConvertersTest {
 
   // IntUnaryOperator tests; conceptually widens to ToIntFunction, IntFunction, and Function
   @Test
-  def test_IntUnaryOperator {
+  def test_IntUnaryOperator() {
     val iuop = new IntUnaryOperator{ def applyAsInt(i: Int) = ~i }
     val siuo = (i: Int) => ~i
     def foo(iu: IntUnaryOperator)(d: Int) = iu.applyAsInt(d)
@@ -399,7 +399,7 @@ class FunctionConvertersTest {
 
   // LongBinaryOperator tests; conceptually widens to ToLongFunction, LongFunction, and Function
   @Test
-  def test_LongBinaryOperator{
+  def test_LongBinaryOperator() {
     val lbop = new LongBinaryOperator{ def applyAsLong(a: Long, b: Long) = a | b }
     val slbo = (a: Long, b: Long) => a | b
     def foo(lbo: LongBinaryOperator)(a: Long, b: Long) = lbo.applyAsLong(a,b)
@@ -413,7 +413,7 @@ class FunctionConvertersTest {
 
   // LongConsumer tests; conceptually widens to Consumer and Function
   @Test
-  def test_LongConsumer {
+  def test_LongConsumer() {
     val lcon = new LongConsumer{ def accept(l: Long) { save(l) } }
     val slco = (l: Long) => { save(l); () }
     def jf(lc: LongConsumer)(d: Long) = { lc.accept(d); recall == d }
@@ -426,7 +426,7 @@ class FunctionConvertersTest {
 
   // LongFunction tests; conceptually widens to Function
   @Test
-  def test_LongFunction {
+  def test_LongFunction() {
     val lfn1 = new LongFunction[String]{ def apply(l: Long) = l.toString }
     val lfn2 = new LongFunction[Int]{ def apply(l: Long) = (l & 0xFFFFFF).toInt }
     val slfn = (l: Long) => l.toString
@@ -445,7 +445,7 @@ class FunctionConvertersTest {
 
   // LongPredicate tests; conceptually widens to LongFunction and Predicate and Function
   @Test
-  def test_LongPredicate {
+  def test_LongPredicate() {
     val lprd = new LongPredicate{ def test(l: Long) = l < 1 }
     val slpr = (l: Long) => l < 1
     def foo(lp: LongPredicate)(d: Long) = lp.test(d)
@@ -459,7 +459,7 @@ class FunctionConvertersTest {
 
   // LongSupplier tests; conceptually widens to ToLongFunction and Supplier and Function
   @Test
-  def test_LongSupplier {
+  def test_LongSupplier() {
     val lsup = new LongSupplier{ def getAsLong = 1000000000000L }
     val slsu = () => 1000000000000L
     def foo(ls: LongSupplier) = ls.getAsLong
@@ -473,7 +473,7 @@ class FunctionConvertersTest {
 
   // LongToDoubleFunction tests; conceptually widens to ToDoubleFunction, LongFunction, and Function
   @Test
-  def test_LongToDoubleFunction {
+  def test_LongToDoubleFunction() {
     val l2df = new LongToDoubleFunction{ def applyAsDouble(l: Long) = l + 1e-4*l }
     def sl2d = (l: Long) => l + 1e-4*l
     def foo(ld: LongToDoubleFunction)(l: Long) = ld.applyAsDouble(l)
@@ -487,7 +487,7 @@ class FunctionConvertersTest {
 
   // LongToIntFunction tests; conceptually widens to ToIntFunction, LongFunction, and Function
   @Test
-  def test_LongToIntFunction {
+  def test_LongToIntFunction() {
     val l2if = new LongToIntFunction{ def applyAsInt(l :Long) = (l & 0xFFFFFF).toInt }
     val sl2i = (l: Long) => (l & 0xFFFFFF).toInt
     def foo(li: LongToIntFunction)(l: Long) = li.applyAsInt(l)
@@ -501,7 +501,7 @@ class FunctionConvertersTest {
 
   // LongUnaryOperator tests; conceptually widens to LongFunction, ToLongFunction, and Function
   @Test
-  def test_LongUnaryOperator {
+  def test_LongUnaryOperator() {
     val luop = new LongUnaryOperator{ def applyAsLong(l: Long) = -l }
     val sluo = (l: Long) => -l
     def foo(du: LongUnaryOperator)(l: Long) = du.applyAsLong(l)
@@ -515,7 +515,7 @@ class FunctionConvertersTest {
 
   // ObjDoubleConsumer tests; conceptually widens to Consumer and BiFunction
   @Test
-  def test_ObjDoubleConsumer {
+  def test_ObjDoubleConsumer() {
     val odc1 = new ObjDoubleConsumer[String]{ def accept(s: String, d: Double) { save((s,d)) } }
     val odc2 = new ObjDoubleConsumer[Int]{ def accept(i: Int, d: Double) { save((i,d)) } }
     val sodc = (s: String, d: Double) => { save((s,d)); () }
@@ -540,7 +540,7 @@ class FunctionConvertersTest {
 
   // ObjIntConsumer tests; conceptually widens to Consumer and BiFunction
   @Test
-  def test_ObjIntConsumer {
+  def test_ObjIntConsumer() {
     val oic1 = new ObjIntConsumer[String]{ def accept(s: String, i: Int) { save((s,i)) } }
     val oic2 = new ObjIntConsumer[Int]{ def accept(j: Int, i: Int) { save((j,i)) } }
     val soic = (s: String, i: Int) => { save((s,i)); () }
@@ -565,7 +565,7 @@ class FunctionConvertersTest {
 
   // ObjLongConsumer tests; conceptually widens to Consumer and BiFunction
   @Test
-  def test_ObjLongConsumer {
+  def test_ObjLongConsumer() {
     val olc1 = new ObjLongConsumer[String]{ def accept(s: String, l: Long) { save((s,l)) } }
     val olc2 = new ObjLongConsumer[Int]{ def accept(i: Int, l: Long) { save((i,l)) } }
     val solc = (s: String, l: Long) => { save((s,l)); () }
@@ -590,7 +590,7 @@ class FunctionConvertersTest {
 
   // Predicate tests; conceptually widens to Function and narrows to IntPredicate etc.
   @Test
-  def test_Predicate {
+  def test_Predicate() {
     val prd1 = new Predicate[String]{ def test(s: String) = s.isEmpty }
     val prd2 = new Predicate[Int]{ def test(i: Int) = i < 0 }
     def sprd = (s: String) => s.isEmpty
@@ -612,7 +612,7 @@ class FunctionConvertersTest {
 
   // Supplier tests; conceptually widens to Function and narrows to IntSupplier etc.
   @Test
-  def test_Supplier {
+  def test_Supplier() {
     val sup1 = new Supplier[String]{ def get = "halibut" }
     val sup2 = new Supplier[Int]{ def get = 17 }
     val ssup = () => "halibut"
@@ -636,7 +636,7 @@ class FunctionConvertersTest {
 
   // ToDoubleBiFunction tests; conceptually widens to BiFunction and narrows to DoubleBinaryOperator
   @Test
-  def test_ToDoubleBiFunction {
+  def test_ToDoubleBiFunction() {
     {
       val bfd1 = new ToDoubleBiFunction[String, File]{ def applyAsDouble(s: String, f: File) = s.length.toDouble * f.getName.length }
       val sbfd = (s: String, f: File) => s.length.toDouble * f.getName.length
@@ -666,7 +666,7 @@ class FunctionConvertersTest {
 
   // ToDoubleFunction tests; conceptually widens to Function and narrows to DoubleUnaryOperator, IntToDoubleFunction, etc.
   @Test
-  def test_ToDoubleFunction {
+  def test_ToDoubleFunction() {
     {
       val fnd1 = new ToDoubleFunction[String]{ def applyAsDouble(s: String) = s.length / (s.headOption.getOrElse(0: Char)+1).toDouble }
       val sfnd = (s: String) => s.length / (s.headOption.getOrElse(0: Char)+1).toDouble
@@ -694,7 +694,7 @@ class FunctionConvertersTest {
 
   // ToIntBiFunction tests; conceptually widens to BiFunction and narrows to IntBinaryOperator
   @Test
-  def test_ToIntBiFunction {
+  def test_ToIntBiFunction() {
     {
       val bfi1 = new ToIntBiFunction[String, File]{ def applyAsInt(s: String, f: File) = s.length + f.getName.length }
       val sbfi = (s: String, f: File) => s.length.toInt + f.getName.length
@@ -723,7 +723,7 @@ class FunctionConvertersTest {
 
   // ToIntFunction tests; conceptually widens to Function and narrows to IntUnaryOperator, etc..
   @Test
-  def test_ToIntFunction {
+  def test_ToIntFunction() {
     {
       val fni1 = new ToIntFunction[String]{ def applyAsInt(s: String) = s.length }
       val sfni = (s: String) => s.length
@@ -751,7 +751,7 @@ class FunctionConvertersTest {
 
   // ToLongBiFunction tests; conceptually widens to BiFunction and narrows to LongBinaryOperator
   @Test
-  def test_ToLongBiFunction{
+  def test_ToLongBiFunction() {
     {
       val bfl1 = new ToLongBiFunction[String, File]{ def applyAsLong(s: String, f: File) = s.length * f.getName.length }
       val sbfl = (s: String, f: File) => s.length.toLong * f.getName.length
@@ -780,7 +780,7 @@ class FunctionConvertersTest {
 
   // ToLongFunction tests; conceptually widens to Function and narrows to LongUnaryOperator, LongToIntFunction etc..
   @Test
-  def test_ToLongFunction {
+  def test_ToLongFunction() {
     {
       val fnl1 = new ToLongFunction[String]{ def applyAsLong(s: String) = s.length.toLong << 16 }
       val sfnl = (s: String) => s.length.toLong << 16
@@ -808,7 +808,7 @@ class FunctionConvertersTest {
 
   // UnaryOperator tests; actually widens to Function and conceptually narrows to IntUnaryOperator etc..
   @Test
-  def test_UnaryOperator {
+  def test_UnaryOperator() {
     {
       val uop1 = new UnaryOperator[String]{ def apply(s: String) = s.toUpperCase }
       val suop = (s: String) => s.toUpperCase
diff --git a/src/test/scala/scala/compat/java8/StepConvertersTest.scala b/src/test/scala/scala/compat/java8/StepConvertersTest.scala
index d061913..0add1f9 100644
--- a/src/test/scala/scala/compat/java8/StepConvertersTest.scala
+++ b/src/test/scala/scala/compat/java8/StepConvertersTest.scala
@@ -588,7 +588,6 @@ class StepConvertersTest {
     implicit val spec = SpecCheck(_.isInstanceOf[IntStepper], x => s"$x should be an IntStepper")
 
     good( ci.NumericRange(277: Short, 279: Short, 1: Short).stepper )
-    _eh_( ci.PagedSeq.fromLines(Array("salmon").iterator).stepper )
     good( ("salmon": ci.StringOps).stepper )
     good( ("salmon": ci.WrappedString).stepper )
   }
diff --git a/src/test/scala/scala/compat/java8/StreamConvertersTest.scala b/src/test/scala/scala/compat/java8/StreamConvertersTest.scala
index 26ca38c..d3131a6 100644
--- a/src/test/scala/scala/compat/java8/StreamConvertersTest.scala
+++ b/src/test/scala/scala/compat/java8/StreamConvertersTest.scala
@@ -1,5 +1,7 @@
 package scala.compat.java8
 
+import scala.language.higherKinds
+
 import org.junit.Test
 import org.junit.Assert._