diff --git a/platform/polySymbols/testFramework/com/intellij/polySymbols/testFramework/query/PolySymbolsRegistryTestUtil.kt b/platform/polySymbols/testFramework/com/intellij/polySymbols/testFramework/query/PolySymbolsRegistryTestUtil.kt
index 607a1283533e..1cc5725cc002 100644
--- a/platform/polySymbols/testFramework/com/intellij/polySymbols/testFramework/query/PolySymbolsRegistryTestUtil.kt
+++ b/platform/polySymbols/testFramework/com/intellij/polySymbols/testFramework/query/PolySymbolsRegistryTestUtil.kt
@@ -38,8 +38,9 @@ fun printCodeCompletionItems(items: List<PolySymbolCodeCompletionItem>,
 
 fun printMatches(matches: List<PolySymbol>, printer: DebugOutputPrinter = PolySymbolsDebugOutputPrinter()): String =
   printer.printValue(
-    matches
-      .sortedWith(Comparator
-                    .comparing<PolySymbol, PolySymbol.Priority?> { it.priority ?: PolySymbol.Priority.NORMAL }
-                    .thenComparing(Function { it.name })
-                    .thenComparing(Function { it.origin.library ?: "" })))
\ No newline at end of file
+    matches.sortedWith(
+      compareBy<PolySymbol> { it.priority ?: PolySymbol.Priority.NORMAL }
+        .thenBy { it.name }
+        .thenBy { it.origin.library ?: "" }
+    )
+  )
\ No newline at end of file
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.kt
index 348a96309d7f..97817feb1b96 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.kt
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.kt
@@ -10,7 +10,6 @@ import com.intellij.openapi.roots.ProjectRootManager
 import com.intellij.openapi.util.Comparing
 import com.intellij.openapi.util.Key
 import com.intellij.openapi.util.NlsSafe
-import com.intellij.openapi.util.Pair
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.openapi.vfs.LocalFileSystem
@@ -314,7 +313,7 @@ object MavenDomUtil {
       }
     }
 
-    return Pair.create<String?, Int?>(tagName, index)
+    return tagName to index
   }
 
   private fun getIndexedTag(parent: XmlTag, index: Int?): XmlTag? {
@@ -367,7 +366,7 @@ object MavenDomUtil {
         set = mutableSetOf<VirtualFile?>()
       }
 
-      cachedValue = Pair.create<Long?, MutableSet<VirtualFile?>?>(VirtualFileManager.getInstance().getModificationCount(), set)
+      cachedValue = VirtualFileManager.getInstance().getModificationCount() to set
       mavenProject.putCachedValue<Pair<Long?, MutableSet<VirtualFile?>?>?>(FILTERED_RESOURCES_ROOTS_KEY, cachedValue)
     }
 
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.kt
index d67f0c4188ab..3774ddd0b4ae 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.kt
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.kt
@@ -908,7 +908,7 @@ object MavenUtil {
 
 
     if (list.size > 1) {
-      list.sortWith(Comparator.comparing<Path?, String?>(java.util.function.Function { obj: Path? -> obj.toString() }))
+      list.sortBy { obj: Path? -> obj.toString() }
     }
 
     val file = brewDir?.resolve(list.get(0).toString() + "/libexec")
diff --git a/python/build/src/org/jetbrains/intellij/build/pycharm/sdks/PythonUpdater.kt b/python/build/src/org/jetbrains/intellij/build/pycharm/sdks/PythonUpdater.kt
index 9711b627c092..8653cc965ba6 100644
--- a/python/build/src/org/jetbrains/intellij/build/pycharm/sdks/PythonUpdater.kt
+++ b/python/build/src/org/jetbrains/intellij/build/pycharm/sdks/PythonUpdater.kt
@@ -117,7 +117,7 @@ class PythonUpdater {
 
     fun getLangLevelReleases(languageLevel: LanguageLevel): Map<String, List<TrackedResource>> {
       val remoteVersionsSortedDesc = remoteVersions[languageLevel]!!
-        .sortedWith(Comparator.comparing<String?, Version?> { Version.parseVersion(it) }.reversed())
+        .sortedWith(compareByDescending { Version.parseVersion(it) })
 
       val resolvedResources = mutableMapOf<TrackedResource, String>()
       for (version in remoteVersionsSortedDesc) {