diff --git a/uast/uast-common/src/org/jetbrains/uast/analysis/UastAnalysisPlugin.kt b/uast/uast-common/src/org/jetbrains/uast/analysis/UastAnalysisPlugin.kt
index 54712d87022b..a811acc01d47 100644
--- a/uast/uast-common/src/org/jetbrains/uast/analysis/UastAnalysisPlugin.kt
+++ b/uast/uast-common/src/org/jetbrains/uast/analysis/UastAnalysisPlugin.kt
@@ -18,7 +18,7 @@ interface UastAnalysisPlugin {
 
   val language: Language
 
-  fun <T : Any> getExpressionFact(expression: UExpression, fact: UExpressionFact<T>): T?
+  fun <T : Any> UExpression.getExpressionFact(fact: UExpressionFact<T>): T?
 }
 
 sealed class UExpressionFact<T : Any> {
diff --git a/uast/uast-common/src/org/jetbrains/uast/analysis/analysis.kt b/uast/uast-common/src/org/jetbrains/uast/analysis/analysis.kt
deleted file mode 100644
index 72503b02c173..000000000000
--- a/uast/uast-common/src/org/jetbrains/uast/analysis/analysis.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.uast.analysis
-
-import org.jetbrains.uast.UExpression
-import org.jetbrains.uast.getLanguagePlugin
-
-fun <T : Any> UExpression.getExpressionFact(fact: UExpressionFact<T>): T? =
-  this.getLanguagePlugin().analysisPlugin?.getExpressionFact(this, fact)
-
-fun UExpression.canBeAnalyzedByUast() = this.getLanguagePlugin().analysisPlugin != null
\ No newline at end of file
diff --git a/uast/uast-java/src/org/jetbrains/uast/java/analysis/JavaUastAnalysisPlugin.kt b/uast/uast-java/src/org/jetbrains/uast/java/analysis/JavaUastAnalysisPlugin.kt
index bb8a55365e9f..3a7c9a642e7b 100644
--- a/uast/uast-java/src/org/jetbrains/uast/java/analysis/JavaUastAnalysisPlugin.kt
+++ b/uast/uast-java/src/org/jetbrains/uast/java/analysis/JavaUastAnalysisPlugin.kt
@@ -12,10 +12,10 @@ import org.jetbrains.uast.analysis.UNullability
 import org.jetbrains.uast.analysis.UastAnalysisPlugin
 
 class JavaUastAnalysisPlugin : UastAnalysisPlugin {
-  override fun <T : Any> getExpressionFact(expression: UExpression, fact: UExpressionFact<T>): T? {
+  override fun <T : Any> UExpression.getExpressionFact(fact: UExpressionFact<T>): T? {
     when (fact) {
       is UExpressionFact.UNullabilityFact -> {
-        val psiExpression = expression.sourcePsi as? PsiExpression ?: return null
+        val psiExpression = sourcePsi as? PsiExpression ?: return null
         val nullability = CommonDataflow.getExpressionFact(psiExpression, DfaFactType.NULLABILITY)?.toUNullability()
                           ?: UNullability.UNKNOWN