diff --git a/main-actions/src/main/scala/sbt/ForkTests.scala b/main-actions/src/main/scala/sbt/ForkTests.scala
index 4299f54ac..9934eca97 100755
--- a/main-actions/src/main/scala/sbt/ForkTests.scala
+++ b/main-actions/src/main/scala/sbt/ForkTests.scala
@@ -87,15 +87,14 @@ private[sbt] object ForkTests {
             val config = new ForkConfiguration(ConsoleAppender.formatEnabledInEnv, parallel)
             os.writeObject(config)
 
-            val taskdefs = opts.tests.map(
-              t =>
-                new TaskDef(
-                  t.name,
-                  forkFingerprint(t.fingerprint),
-                  t.explicitlySpecified,
-                  t.selectors
+            val taskdefs = opts.tests.map { t =>
+              new TaskDef(
+                t.name,
+                forkFingerprint(t.fingerprint),
+                t.explicitlySpecified,
+                t.selectors
               )
-            )
+            }
             os.writeObject(taskdefs.toArray)
 
             os.writeInt(runners.size)
diff --git a/main-actions/src/main/scala/sbt/Package.scala b/main-actions/src/main/scala/sbt/Package.scala
index 8ecb1ccf7..e0c29e95c 100644
--- a/main-actions/src/main/scala/sbt/Package.scala
+++ b/main-actions/src/main/scala/sbt/Package.scala
@@ -67,11 +67,9 @@ object Package {
     }
     setVersion(main)
 
+    type Inputs = Map[File, String] :+: FilesInfo[ModifiedFileInfo] :+: Manifest :+: HNil
     val cachedMakeJar = inputChanged(cacheStoreFactory make "inputs") {
-      (
-          inChanged,
-          inputs: Map[File, String] :+: FilesInfo[ModifiedFileInfo] :+: Manifest :+: HNil
-      ) =>
+      (inChanged, inputs: Inputs) =>
         import exists.format
         val sources :+: _ :+: manifest :+: HNil = inputs
         inputChanged(cacheStoreFactory make "output") { (outChanged, jar: PlainFileInfo) =>
diff --git a/main-actions/src/main/scala/sbt/RawCompileLike.scala b/main-actions/src/main/scala/sbt/RawCompileLike.scala
index cc4c0fe80..c19d55a26 100644
--- a/main-actions/src/main/scala/sbt/RawCompileLike.scala
+++ b/main-actions/src/main/scala/sbt/RawCompileLike.scala
@@ -54,9 +54,8 @@ object RawCompileLike {
   ): Gen =
     (sources, classpath, outputDirectory, options, maxErrors, log) => {
       type Inputs =
-        FilesInfo[HashFileInfo] :+: FilesInfo[ModifiedFileInfo] :+: Seq[File] :+: File :+: Seq[
-          String
-        ] :+: Int :+: HNil
+        FilesInfo[HashFileInfo] :+: FilesInfo[ModifiedFileInfo] :+: Seq[File] :+: File :+:
+          Seq[String] :+: Int :+: HNil
       val inputs
         : Inputs = hash(sources.toSet ++ optionFiles(options, fileInputOpts)) :+: lastModified(
         classpath.toSet