Replace map { ... }.filterNotNull() with mapNotNull { ... }

compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForExplicitDeclaration.kt

@@ -365,13 +365,13 @@ public open class KtLightClassForExplicitDeclaration(
     override fun toString() = "${KtLightClass::class.java.simpleName}:$classFqName"
 
     override fun getOwnInnerClasses(): List<PsiClass> {
-        val result = ArrayList<PsiClass?>()
-        classOrObject.declarations.filterIsInstance<KtClassOrObject>().mapTo(result) { create(it) }
+        val result = ArrayList<PsiClass>()
+        classOrObject.declarations.filterIsInstance<KtClassOrObject>().mapNotNullTo(result) { create(it) }
 
         if (classOrObject.hasInterfaceDefaultImpls) {
             result.add(KtLightClassForInterfaceDefaultImpls(classFqName.defaultImplsChild(), classOrObject))
         }
-        return result.filterNotNull()
+        return result
     }
 
     override fun getUseScope(): SearchScope = getOrigin().useScope

compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt

@@ -327,14 +327,17 @@ public object LightClassUtil {
                                              public val setter: PsiMethod?,
                                              public val backingField: PsiField?,
                                              additionalAccessors: List<PsiMethod>) : Iterable<PsiMethod> {
-        private val allMethods = arrayListOf<PsiMethod>()
-        val allDeclarations = arrayListOf<PsiNamedElement>()
+        private val allMethods: List<PsiMethod>
+        val allDeclarations: List<PsiNamedElement>
 
         init {
-            listOf(getter, setter).filterNotNullTo(allMethods)
-            listOf<PsiNamedElement?>(getter, setter, backingField).filterNotNullTo(allDeclarations)
-            allDeclarations.addAll(additionalAccessors)
+            allMethods = arrayListOf<PsiMethod>()
+            arrayOf(getter, setter).filterNotNullTo(allMethods)
             additionalAccessors.filterIsInstanceTo<PsiMethod, MutableList<PsiMethod>>(allMethods)
+
+            allDeclarations = arrayListOf<PsiNamedElement>()
+            arrayOf<PsiNamedElement?>(getter, setter, backingField).filterNotNullTo(allDeclarations)
+            allDeclarations.addAll(additionalAccessors)
         }
 
         override fun iterator(): Iterator<PsiMethod> = allMethods.iterator()