diff --git a/main/src/main/scala/sbt/internal/CrossJava.scala b/main/src/main/scala/sbt/internal/CrossJava.scala
index e23e79ffc..8e6a2d58d 100644
--- a/main/src/main/scala/sbt/internal/CrossJava.scala
+++ b/main/src/main/scala/sbt/internal/CrossJava.scala
@@ -74,12 +74,12 @@ private[sbt] object CrossJava {
         val ds =
           if (!first.contains(".") && first.contains("u")) splitDot(first.replaceFirst("u", ".0."))
           else splitDot(first)
-        val nums = ds.takeWhile(
-          _ match {
+        val nums = ds
+          .takeWhile {
             case Num(_) => true
             case _      => false
           }
-        ) map { _.toLong }
+          .map { _.toLong }
         if (nums.isEmpty) {
           sys.error(s"Invalid SDKMAN Java version: $version")
         }
diff --git a/protocol/src/main/scala/sbt/protocol/ServerSessionImpl.scala b/protocol/src/main/scala/sbt/protocol/ServerSessionImpl.scala
index bd20bd0e1..02c6ff805 100644
--- a/protocol/src/main/scala/sbt/protocol/ServerSessionImpl.scala
+++ b/protocol/src/main/scala/sbt/protocol/ServerSessionImpl.scala
@@ -104,7 +104,7 @@ private[sbt] class ServerSessionImpl(
                 .deserializeJsonMessage(frame)
                 .fold(
                   errorDesc => onInvalidFrame(frame, errorDesc),
-                  _ match {
+                  {
                     case msg: JsonRpcRequestMessage      => onRequest(msg)
                     case msg: JsonRpcResponseMessage     => onResponse(msg)
                     case msg: JsonRpcNotificationMessage => onNotification(msg)