diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/operation/CompareToBOIF.kt b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/operation/CompareToBOIF.kt
index 512eb70be63..9860dc40f9b 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/operation/CompareToBOIF.kt
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/operation/CompareToBOIF.kt
@@ -67,17 +67,17 @@ object CompareToBOIF : BinaryOperationIntrinsicFactory {
     override public fun getSupportTokens(): ImmutableSet<JetToken> = OperatorConventions.COMPARISON_OPERATIONS
 
     override public fun getIntrinsic(descriptor: FunctionDescriptor): BinaryOperationIntrinsic? {
-        if (JsDescriptorUtils.isBuiltin(descriptor))
-            when {
-                COMPARE_TO_CHAR.apply(descriptor) ->
-                    return CompareToCharIntrinsic
-                CHAR_COMPARE_TO.apply(descriptor) ->
-                    return CompareCharToPrimitiveIntrinsic
-                PRIMITIVE_COMPARE_TO.apply(descriptor) ->
-                    return CompareToIntrinsic
-                else ->
-                    return CompareToFunctionIntrinsic
-            }
-        return null
+        if (!JsDescriptorUtils.isBuiltin(descriptor)) return null
+
+        return when {
+            COMPARE_TO_CHAR.apply(descriptor) ->
+                CompareToCharIntrinsic
+            CHAR_COMPARE_TO.apply(descriptor) ->
+                CompareCharToPrimitiveIntrinsic
+            PRIMITIVE_COMPARE_TO.apply(descriptor) ->
+                CompareToIntrinsic
+            else ->
+                CompareToFunctionIntrinsic
+        }
     }
 }