diff --git a/buildfile/src/main/scala/sbt/internal/parser/SbtParser.scala b/buildfile/src/main/scala/sbt/internal/parser/SbtParser.scala
index bd7f9fbf3..63fe498b0 100644
--- a/buildfile/src/main/scala/sbt/internal/parser/SbtParser.scala
+++ b/buildfile/src/main/scala/sbt/internal/parser/SbtParser.scala
@@ -258,7 +258,7 @@ private[sbt] case class SbtParser(
                       |$code
                       |}""".stripMargin
     val fileName = path.id
-    val reporterId = s"$fileName-${Random.nextInt}"
+    val reporterId = s"$fileName-${Random.nextInt()}"
     val sourceFile = SourceFile(
       VirtualFile(reporterId, wrapCode.getBytes(StandardCharsets.UTF_8)),
       scala.io.Codec.UTF8
diff --git a/buildfile/src/test/scala/sbt/internal/parser/SbtParserErrorSpec.scala b/buildfile/src/test/scala/sbt/internal/parser/SbtParserErrorSpec.scala
index 827260e8a..e8cc39b05 100644
--- a/buildfile/src/test/scala/sbt/internal/parser/SbtParserErrorSpec.scala
+++ b/buildfile/src/test/scala/sbt/internal/parser/SbtParserErrorSpec.scala
@@ -29,7 +29,7 @@ object SbtParserErrorSpec extends AbstractSpec {
       print(s"Processing ${file.getFileName}: ")
 
       val vf = converter.toVirtualFile(file)
-      val buildSbt = Source.fromFile(file.toUri).getLines.toSeq
+      val buildSbt = Source.fromFile(file.toUri).getLines().toSeq
       val message = interceptMessageException(SbtParser(vf, buildSbt))
       println(message)
       assert(message.contains(file.getFileName.toString))
diff --git a/launcher-package/integration-test/src/test/scala/ShellScriptUtil.scala b/launcher-package/integration-test/src/test/scala/ShellScriptUtil.scala
index 918b00b7e..0f8e9d74f 100644
--- a/launcher-package/integration-test/src/test/scala/ShellScriptUtil.scala
+++ b/launcher-package/integration-test/src/test/scala/ShellScriptUtil.scala
@@ -172,9 +172,9 @@ trait ShellScriptUtil extends BasicTestSuite {
                 BasicIO.processFully(processLine)
               )
             )
-          if p.exitValue != 0 then
+          if p.exitValue() != 0 then
             lines.foreach(l => Console.err.println(l))
-            sys.error(s"process exit with ${p.exitValue}")
+            sys.error(s"process exit with ${p.exitValue()}")
           f(lines.toList)
           ()
         finally
diff --git a/main-actions/src/main/scala/sbt/ForkTests.scala b/main-actions/src/main/scala/sbt/ForkTests.scala
index a1380792a..b18ff55f4 100755
--- a/main-actions/src/main/scala/sbt/ForkTests.scala
+++ b/main-actions/src/main/scala/sbt/ForkTests.scala
@@ -197,7 +197,7 @@ private class React(
       case NonFatal(_)            => ()
 
   override def notifyExit(p: Process): Unit =
-    if !process.isAlive && !promise.isCompleted then
+    if !process.isAlive() && !promise.isCompleted then
       val exitCode = process.exitValue()
       if exitCode != 0 then
         promise.failure(new RuntimeException(s"Forked test process exited with code $exitCode"))
diff --git a/main-actions/src/main/scala/sbt/internal/WorkerExchange.scala b/main-actions/src/main/scala/sbt/internal/WorkerExchange.scala
index 1ec62913e..c17b949f6 100644
--- a/main-actions/src/main/scala/sbt/internal/WorkerExchange.scala
+++ b/main-actions/src/main/scala/sbt/internal/WorkerExchange.scala
@@ -110,7 +110,7 @@ class WorkerProxy(
     input.close()
     serverSocket.foreach(_.close())
   def blockForExitCode(): Int =
-    if !process.isAlive then process.exitValue()
+    if !process.isAlive() then process.exitValue()
     else Fork.blockForExitCode(process)
 
   /** print a line into stdin of the worker process. */
diff --git a/main/src/main/scala/sbt/internal/AbstractTaskExecuteProgress.scala b/main/src/main/scala/sbt/internal/AbstractTaskExecuteProgress.scala
index 00163a4b6..284c9f273 100644
--- a/main/src/main/scala/sbt/internal/AbstractTaskExecuteProgress.scala
+++ b/main/src/main/scala/sbt/internal/AbstractTaskExecuteProgress.scala
@@ -68,7 +68,7 @@ private[sbt] abstract class AbstractTaskExecuteProgress(
     timings.forEach { (task, timing) =>
       if (timing.isActive) result += task -> (now - timing.startNanos).nanos
     }
-    result.result
+    result.result()
   }
 
   override def afterRegistered(
diff --git a/main/src/main/scala/sbt/internal/CommandExchange.scala b/main/src/main/scala/sbt/internal/CommandExchange.scala
index f8e441522..c1877a944 100644
--- a/main/src/main/scala/sbt/internal/CommandExchange.scala
+++ b/main/src/main/scala/sbt/internal/CommandExchange.scala
@@ -100,7 +100,7 @@ private[sbt] final class CommandExchange {
           Option(deadline match {
             case Some(d: Deadline) =>
               commandQueue.poll(d.timeLeft.toMillis + 1, TimeUnit.MILLISECONDS) match {
-                case null if idleDeadline.fold(false)(_.isOverdue) =>
+                case null if idleDeadline.fold(false)(_.isOverdue()) =>
                   state.foreach { s =>
                     s.get(BasicKeys.serverIdleTimeout) match {
                       case Some(Some(d)) => s.log.info(s"sbt idle timeout of $d expired")
diff --git a/main/src/main/scala/sbt/internal/Continuous.scala b/main/src/main/scala/sbt/internal/Continuous.scala
index e9573a12a..96ac9de35 100644
--- a/main/src/main/scala/sbt/internal/Continuous.scala
+++ b/main/src/main/scala/sbt/internal/Continuous.scala
@@ -501,7 +501,7 @@ private[sbt] object Continuous {
              * increase in latency.
              */
             @tailrec def aggregate(res: Seq[Event]): Seq[Event] =
-              if (limit.isOverdue) res
+              if (limit.isOverdue()) res
               else {
                 monitor.poll(antiEntropyPollPeriod) match {
                   case s if s.nonEmpty => aggregate(res ++ s)
diff --git a/main/src/main/scala/sbt/internal/DefaultBackgroundJobService.scala b/main/src/main/scala/sbt/internal/DefaultBackgroundJobService.scala
index 188be4e24..45cb3038d 100644
--- a/main/src/main/scala/sbt/internal/DefaultBackgroundJobService.scala
+++ b/main/src/main/scala/sbt/internal/DefaultBackgroundJobService.scala
@@ -194,7 +194,7 @@ private[sbt] abstract class AbstractBackgroundJobService extends BackgroundJobSe
   override final def close(): Unit = shutdown()
   override def shutdown(): Unit = {
     val deadline = 10.seconds.fromNow
-    while (jobSet.nonEmpty && !deadline.isOverdue) {
+    while (jobSet.nonEmpty && !deadline.isOverdue()) {
       jobSet.headOption.foreach { case handle: ThreadJobHandle @unchecked =>
         if (handle.job.isRunning()) {
           handle.job.shutdown()
diff --git a/main/src/main/scala/sbt/internal/TaskProgress.scala b/main/src/main/scala/sbt/internal/TaskProgress.scala
index e7d0ba8df..60999dd74 100644
--- a/main/src/main/scala/sbt/internal/TaskProgress.scala
+++ b/main/src/main/scala/sbt/internal/TaskProgress.scala
@@ -86,7 +86,7 @@ private[sbt] class TaskProgress(
 
   private def doReport(): Unit = {
     val runnable: Runnable = () => {
-      if (nextReport.get.isOverdue) {
+      if (nextReport.get.isOverdue()) {
         report()
       }
     }
diff --git a/main/src/main/scala/sbt/internal/server/Definition.scala b/main/src/main/scala/sbt/internal/server/Definition.scala
index fd770d9a9..0521d580b 100644
--- a/main/src/main/scala/sbt/internal/server/Definition.scala
+++ b/main/src/main/scala/sbt/internal/server/Definition.scala
@@ -219,7 +219,7 @@ private[sbt] object Definition {
   }
 
   private[sbt] def getAnalyses: Future[Seq[Analysis]] = {
-    val result = Promise[Seq[Analysis]]
+    val result = Promise[Seq[Analysis]]()
 
     new Thread("sbt-get-analysis-thread") {
       setDaemon(true)
diff --git a/main/src/main/scala/sbt/internal/server/NetworkChannel.scala b/main/src/main/scala/sbt/internal/server/NetworkChannel.scala
index c97a2c255..6a37d351e 100644
--- a/main/src/main/scala/sbt/internal/server/NetworkChannel.scala
+++ b/main/src/main/scala/sbt/internal/server/NetworkChannel.scala
@@ -765,7 +765,7 @@ final class NetworkChannel(
     private def empty = TerminalPropertiesResponse(0, 0, false, false, false, false)
     def getProperties(block: Boolean): Unit = {
       if (alive.get) {
-        if (!pending.get && Option(lastUpdate.get).fold(true)(d => (d + 1.second).isOverdue)) {
+        if (!pending.get && Option(lastUpdate.get).fold(true)(d => (d + 1.second).isOverdue())) {
           pending.set(true)
           val queue = VirtualTerminal.sendTerminalPropertiesQuery(term.name, jsonRpcRequest)
           val update: Runnable = () => {
diff --git a/main/src/main/scala/sbt/nio/Settings.scala b/main/src/main/scala/sbt/nio/Settings.scala
index 7ca7bbd12..e08b9787a 100644
--- a/main/src/main/scala/sbt/nio/Settings.scala
+++ b/main/src/main/scala/sbt/nio/Settings.scala
@@ -245,7 +245,7 @@ private[sbt] object Settings {
     val created = createdBuilder.result()
     val modified = modifiedBuilder.result()
     if (created.isEmpty && deleted.isEmpty && modified.isEmpty) {
-      FileChanges.unmodified(unmodifiedBuilder.result)
+      FileChanges.unmodified(unmodifiedBuilder.result())
     } else {
       FileChanges(created, deleted, modified, unmodified)
     }
diff --git a/scripted-sbt/src/main/scala/sbt/scriptedtest/SbtHandler.scala b/scripted-sbt/src/main/scala/sbt/scriptedtest/SbtHandler.scala
index d8c145399..0a55cd8fd 100644
--- a/scripted-sbt/src/main/scala/sbt/scriptedtest/SbtHandler.scala
+++ b/scripted-sbt/src/main/scala/sbt/scriptedtest/SbtHandler.scala
@@ -67,7 +67,7 @@ final class SbtHandler(remoteSbtCreator: RemoteSbtCreator) extends StatementHand
       } catch {
         case _: IOException => process.destroy()
       } finally {
-        if (process.isAlive) process.destroy()
+        if (process.isAlive()) process.destroy()
         RunningProcesses.remove(process)
       }
   }
diff --git a/server-test/src/test/scala/testpkg/ChannelCursorTest.scala b/server-test/src/test/scala/testpkg/ChannelCursorTest.scala
index 6656d80f8..07c67956b 100644
--- a/server-test/src/test/scala/testpkg/ChannelCursorTest.scala
+++ b/server-test/src/test/scala/testpkg/ChannelCursorTest.scala
@@ -78,7 +78,7 @@ class ChannelCursorTest extends AbstractServerTest {
     @tailrec def impl(): Boolean =
       lines.poll(deadline.timeLeft.toMillis, TimeUnit.MILLISECONDS) match {
         case null => false
-        case s    => if (!f(s) && !deadline.isOverdue) impl() else !deadline.isOverdue()
+        case s    => if (!f(s) && !deadline.isOverdue()) impl() else !deadline.isOverdue()
       }
     impl()
   }
diff --git a/server-test/src/test/scala/testpkg/TestServer.scala b/server-test/src/test/scala/testpkg/TestServer.scala
index fec7c578b..0235f73ed 100644
--- a/server-test/src/test/scala/testpkg/TestServer.scala
+++ b/server-test/src/test/scala/testpkg/TestServer.scala
@@ -192,15 +192,15 @@ case class TestServer(
     hostLog(s"wait $duration until the server is ready to respond")
     val deadline = duration.fromNow
     var nextLog = 10.seconds.fromNow
-    while (portfileIsEmpty() && !deadline.isOverdue && process.isAlive) {
-      if (nextLog.isOverdue) {
+    while (portfileIsEmpty() && !deadline.isOverdue() && process.isAlive()) {
+      if (nextLog.isOverdue()) {
         hostLog("waiting for the server...")
         nextLog = 10.seconds.fromNow
       }
       Thread.sleep(10) // Don't spam the portfile
     }
-    if (deadline.isOverdue) sys.error(s"Timeout. $portfile is not found.")
-    if (!process.isAlive) sys.error(s"Server unexpectedly terminated.")
+    if (deadline.isOverdue()) sys.error(s"Timeout. $portfile is not found.")
+    if (!process.isAlive()) sys.error(s"Server unexpectedly terminated.")
   }
   waitForPortfile(1.minute)
 
@@ -254,18 +254,18 @@ case class TestServer(
         """{ "jsonrpc": "2.0", "id": 9, "method": "sbt/exec", "params": { "commandLine": "shutdown" } }"""
       )
       val deadline = 5.seconds.fromNow
-      while (!deadline.isOverdue && process.isAlive) {
+      while (!deadline.isOverdue() && process.isAlive()) {
         Thread.sleep(10)
       }
       // We gave the server a chance to exit but it didn't within a reasonable time frame.
-      if (deadline.isOverdue && process.isAlive) {
+      if (deadline.isOverdue() && process.isAlive()) {
         process.destroy()
         val newDeadline = 10.seconds.fromNow
-        while (!newDeadline.isOverdue && process.isAlive) {
+        while (!newDeadline.isOverdue() && process.isAlive()) {
           Thread.sleep(10)
         }
       }
-      if (process.isAlive) throw new IllegalStateException(s"process $process failed to exit")
+      if (process.isAlive()) throw new IllegalStateException(s"process $process failed to exit")
     } finally {
       readThread.interrupt()
       /*
@@ -309,7 +309,7 @@ case class TestServer(
     @tailrec def impl(): Boolean =
       lines.poll(deadline.timeLeft.toMillis, TimeUnit.MILLISECONDS) match {
         case null => false
-        case s    => if (!f(s) && !deadline.isOverdue) impl() else !deadline.isOverdue()
+        case s    => if (!f(s) && !deadline.isOverdue()) impl() else !deadline.isOverdue()
       }
     impl()
   }
@@ -336,7 +336,7 @@ case class TestServer(
             case Success(value) =>
               value
             case Failure(exception) =>
-              if (deadline.isOverdue) {
+              if (deadline.isOverdue()) {
                 val ex = new TimeoutException()
                 ex.initCause(exception)
                 throw ex
@@ -357,8 +357,8 @@ case class TestServer(
         case s =>
           val s1 = s
           val correctId = s1.contains("\"id\":\"" + id + "\"")
-          if (!correctId && !deadline.isOverdue) impl()
-          else if (deadline.isOverdue)
+          if (!correctId && !deadline.isOverdue()) impl()
+          else if (deadline.isOverdue())
             throw new TimeoutException()
           else s
       }
diff --git a/tasks-standard/src/test/scala/Test.scala b/tasks-standard/src/test/scala/Test.scala
index b4f2fffca..7f916bcb8 100644
--- a/tasks-standard/src/test/scala/Test.scala
+++ b/tasks-standard/src/test/scala/Test.scala
@@ -45,7 +45,9 @@ object Test extends std.TaskExtra:
   lazy val d3 = t3(a, b, c).flatMapR(f3)
 
   def d4(i: Int): Task[Int] = nop flatMap { _ =>
-    val x = math.random; if (x < 0.01) task(i); else d4(i + 1)
+    val x = math.random()
+    if (x < 0.01) task(i)
+    else d4(i + 1)
   }
 
   def go(): Unit = {
diff --git a/util-collection/src/main/scala/sbt/internal/util/Settings.scala b/util-collection/src/main/scala/sbt/internal/util/Settings.scala
index e75031531..3205b157c 100644
--- a/util-collection/src/main/scala/sbt/internal/util/Settings.scala
+++ b/util-collection/src/main/scala/sbt/internal/util/Settings.scala
@@ -66,17 +66,19 @@ trait Init:
     def values: Iterable[Any] = data.values
 
     def get[A](key: ScopedKey[A]): Option[A] =
-      delegates(key).flatMap(data.get).nextOption.asInstanceOf[Option[A]]
+      delegates(key).flatMap(data.get).nextOption().asInstanceOf[Option[A]]
 
     def definingKey[A](key: ScopedKey[A]): Option[ScopedKey[A]] =
       delegates(key).find(data.contains)
 
     def getKeyValue[A](key: ScopedKey[A]): Option[(ScopedKey[A], A)] =
-      delegates(key).flatMap { k =>
-        data.get(k) match
-          case None    => None
-          case Some(v) => Some(k -> v.asInstanceOf[A])
-      }.nextOption
+      delegates(key)
+        .flatMap { k =>
+          data.get(k) match
+            case None    => None
+            case Some(v) => Some(k -> v.asInstanceOf[A])
+        }
+        .nextOption()
 
     def getDirect[A](key: ScopedKey[A]): Option[A] = data.get(key).asInstanceOf[Option[A]]