diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala
index e30a547a3..de657f97d 100644
--- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala
+++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala
@@ -646,7 +646,7 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine {
               val next: (String, String) = loop(loop.indexOf(moduleWithMostCallers) + 1)
               // remove the module with most callers as the caller of next.
               // so, A -> C, B -> C, and C -> A. C has the most callers, and C -> A will be removed.
-              allModules2 foreach {
+              allModules2 foreachEntry {
                 case (k: (String, String), oars0) if k == next =>
                   val oars: Vector[OrganizationArtifactReport] = oars0 map { oar =>
                     val mrs = oar.modules map { mr =>
diff --git a/main/src/main/scala/sbt/Cross.scala b/main/src/main/scala/sbt/Cross.scala
index 44568f4ae..3bc838184 100644
--- a/main/src/main/scala/sbt/Cross.scala
+++ b/main/src/main/scala/sbt/Cross.scala
@@ -306,7 +306,7 @@ object Cross {
       } else {
         included
           .groupBy(_._2)
-          .foreach { (selectedVersion, projects) =>
+          .foreachEntry { (selectedVersion, projects) =>
             state.log.info(
               s"Setting Scala version to $selectedVersion on ${projects.size} projects."
             )
diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 9e615c1bf..3396cfcb1 100644
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -1549,7 +1549,7 @@ object Defaults extends BuildCommon {
     }
     val output = Tests.foldTasks(groupTasks, config.parallel)
     val result = output map { out =>
-      out.events.foreach { (suite, e) =>
+      out.events.foreachEntry { (suite, e) =>
         if (
           strategy != ClassLoaderLayeringStrategy.Flat ||
           strategy != ClassLoaderLayeringStrategy.ScalaLibrary
@@ -2185,7 +2185,7 @@ object Defaults extends BuildCommon {
     val map = managedFileStampCache.value
     val analysis = analysisResult.analysis
     import scala.jdk.CollectionConverters.*
-    analysis.readStamps.getAllProductStamps.asScala.foreach { case (f: VirtualFileRef, s) =>
+    analysis.readStamps.getAllProductStamps.asScala.foreachEntry { case (f: VirtualFileRef, s) =>
       map.put(c.toPath(f), sbt.nio.FileStamp.fromZincStamp(s))
     }
     analysis