diff --git a/compiler/testData/ir/irText/expressions/primitiveComparisons.txt b/compiler/testData/ir/irText/expressions/primitiveComparisons.txt
index 6ac3f6799de..dda66849909 100644
--- a/compiler/testData/ir/irText/expressions/primitiveComparisons.txt
+++ b/compiler/testData/ir/irText/expressions/primitiveComparisons.txt
@@ -5,80 +5,80 @@ FILE fqName:<root> fileName:/primitiveComparisons.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun btest1 (a: kotlin.Byte, b: kotlin.Byte): kotlin.Boolean declared in <root>'
         CALL 'public final fun greater (arg0: kotlin.Int, arg1: kotlin.Int): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=GT
-          arg0: TYPE_OP type=kotlin.Int origin=IMPLICIT_CAST typeOperand=kotlin.Int
-            GET_VAR 'a: kotlin.Byte declared in <root>.btest1' type=kotlin.Byte origin=null
-          arg1: TYPE_OP type=kotlin.Int origin=IMPLICIT_CAST typeOperand=kotlin.Int
-            GET_VAR 'b: kotlin.Byte declared in <root>.btest1' type=kotlin.Byte origin=null
+          arg0: CALL 'public open fun toInt (): kotlin.Int declared in kotlin.Byte' type=kotlin.Int origin=null
+            $this: GET_VAR 'a: kotlin.Byte declared in <root>.btest1' type=kotlin.Byte origin=null
+          arg1: CALL 'public open fun toInt (): kotlin.Int declared in kotlin.Byte' type=kotlin.Int origin=null
+            $this: GET_VAR 'b: kotlin.Byte declared in <root>.btest1' type=kotlin.Byte origin=null
   FUN name:btest2 visibility:public modality:FINAL <> (a:kotlin.Byte, b:kotlin.Byte) returnType:kotlin.Boolean
     VALUE_PARAMETER name:a index:0 type:kotlin.Byte
     VALUE_PARAMETER name:b index:1 type:kotlin.Byte
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun btest2 (a: kotlin.Byte, b: kotlin.Byte): kotlin.Boolean declared in <root>'
         CALL 'public final fun less (arg0: kotlin.Int, arg1: kotlin.Int): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=LT
-          arg0: TYPE_OP type=kotlin.Int origin=IMPLICIT_CAST typeOperand=kotlin.Int
-            GET_VAR 'a: kotlin.Byte declared in <root>.btest2' type=kotlin.Byte origin=null
-          arg1: TYPE_OP type=kotlin.Int origin=IMPLICIT_CAST typeOperand=kotlin.Int
-            GET_VAR 'b: kotlin.Byte declared in <root>.btest2' type=kotlin.Byte origin=null
+          arg0: CALL 'public open fun toInt (): kotlin.Int declared in kotlin.Byte' type=kotlin.Int origin=null
+            $this: GET_VAR 'a: kotlin.Byte declared in <root>.btest2' type=kotlin.Byte origin=null
+          arg1: CALL 'public open fun toInt (): kotlin.Int declared in kotlin.Byte' type=kotlin.Int origin=null
+            $this: GET_VAR 'b: kotlin.Byte declared in <root>.btest2' type=kotlin.Byte origin=null
   FUN name:btest3 visibility:public modality:FINAL <> (a:kotlin.Byte, b:kotlin.Byte) returnType:kotlin.Boolean
     VALUE_PARAMETER name:a index:0 type:kotlin.Byte
     VALUE_PARAMETER name:b index:1 type:kotlin.Byte
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun btest3 (a: kotlin.Byte, b: kotlin.Byte): kotlin.Boolean declared in <root>'
         CALL 'public final fun greaterOrEqual (arg0: kotlin.Int, arg1: kotlin.Int): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=GTEQ
-          arg0: TYPE_OP type=kotlin.Int origin=IMPLICIT_CAST typeOperand=kotlin.Int
-            GET_VAR 'a: kotlin.Byte declared in <root>.btest3' type=kotlin.Byte origin=null
-          arg1: TYPE_OP type=kotlin.Int origin=IMPLICIT_CAST typeOperand=kotlin.Int
-            GET_VAR 'b: kotlin.Byte declared in <root>.btest3' type=kotlin.Byte origin=null
+          arg0: CALL 'public open fun toInt (): kotlin.Int declared in kotlin.Byte' type=kotlin.Int origin=null
+            $this: GET_VAR 'a: kotlin.Byte declared in <root>.btest3' type=kotlin.Byte origin=null
+          arg1: CALL 'public open fun toInt (): kotlin.Int declared in kotlin.Byte' type=kotlin.Int origin=null
+            $this: GET_VAR 'b: kotlin.Byte declared in <root>.btest3' type=kotlin.Byte origin=null
   FUN name:btest4 visibility:public modality:FINAL <> (a:kotlin.Byte, b:kotlin.Byte) returnType:kotlin.Boolean
     VALUE_PARAMETER name:a index:0 type:kotlin.Byte
     VALUE_PARAMETER name:b index:1 type:kotlin.Byte
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun btest4 (a: kotlin.Byte, b: kotlin.Byte): kotlin.Boolean declared in <root>'
         CALL 'public final fun lessOrEqual (arg0: kotlin.Int, arg1: kotlin.Int): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=LTEQ
-          arg0: TYPE_OP type=kotlin.Int origin=IMPLICIT_CAST typeOperand=kotlin.Int
-            GET_VAR 'a: kotlin.Byte declared in <root>.btest4' type=kotlin.Byte origin=null
-          arg1: TYPE_OP type=kotlin.Int origin=IMPLICIT_CAST typeOperand=kotlin.Int
-            GET_VAR 'b: kotlin.Byte declared in <root>.btest4' type=kotlin.Byte origin=null
+          arg0: CALL 'public open fun toInt (): kotlin.Int declared in kotlin.Byte' type=kotlin.Int origin=null
+            $this: GET_VAR 'a: kotlin.Byte declared in <root>.btest4' type=kotlin.Byte origin=null
+          arg1: CALL 'public open fun toInt (): kotlin.Int declared in kotlin.Byte' type=kotlin.Int origin=null
+            $this: GET_VAR 'b: kotlin.Byte declared in <root>.btest4' type=kotlin.Byte origin=null
   FUN name:stest1 visibility:public modality:FINAL <> (a:kotlin.Short, b:kotlin.Short) returnType:kotlin.Boolean
     VALUE_PARAMETER name:a index:0 type:kotlin.Short
     VALUE_PARAMETER name:b index:1 type:kotlin.Short
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun stest1 (a: kotlin.Short, b: kotlin.Short): kotlin.Boolean declared in <root>'
         CALL 'public final fun greater (arg0: kotlin.Int, arg1: kotlin.Int): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=GT
-          arg0: TYPE_OP type=kotlin.Int origin=IMPLICIT_CAST typeOperand=kotlin.Int
-            GET_VAR 'a: kotlin.Short declared in <root>.stest1' type=kotlin.Short origin=null
-          arg1: TYPE_OP type=kotlin.Int origin=IMPLICIT_CAST typeOperand=kotlin.Int
-            GET_VAR 'b: kotlin.Short declared in <root>.stest1' type=kotlin.Short origin=null
+          arg0: CALL 'public open fun toInt (): kotlin.Int declared in kotlin.Short' type=kotlin.Int origin=null
+            $this: GET_VAR 'a: kotlin.Short declared in <root>.stest1' type=kotlin.Short origin=null
+          arg1: CALL 'public open fun toInt (): kotlin.Int declared in kotlin.Short' type=kotlin.Int origin=null
+            $this: GET_VAR 'b: kotlin.Short declared in <root>.stest1' type=kotlin.Short origin=null
   FUN name:stest2 visibility:public modality:FINAL <> (a:kotlin.Short, b:kotlin.Short) returnType:kotlin.Boolean
     VALUE_PARAMETER name:a index:0 type:kotlin.Short
     VALUE_PARAMETER name:b index:1 type:kotlin.Short
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun stest2 (a: kotlin.Short, b: kotlin.Short): kotlin.Boolean declared in <root>'
         CALL 'public final fun less (arg0: kotlin.Int, arg1: kotlin.Int): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=LT
-          arg0: TYPE_OP type=kotlin.Int origin=IMPLICIT_CAST typeOperand=kotlin.Int
-            GET_VAR 'a: kotlin.Short declared in <root>.stest2' type=kotlin.Short origin=null
-          arg1: TYPE_OP type=kotlin.Int origin=IMPLICIT_CAST typeOperand=kotlin.Int
-            GET_VAR 'b: kotlin.Short declared in <root>.stest2' type=kotlin.Short origin=null
+          arg0: CALL 'public open fun toInt (): kotlin.Int declared in kotlin.Short' type=kotlin.Int origin=null
+            $this: GET_VAR 'a: kotlin.Short declared in <root>.stest2' type=kotlin.Short origin=null
+          arg1: CALL 'public open fun toInt (): kotlin.Int declared in kotlin.Short' type=kotlin.Int origin=null
+            $this: GET_VAR 'b: kotlin.Short declared in <root>.stest2' type=kotlin.Short origin=null
   FUN name:stest3 visibility:public modality:FINAL <> (a:kotlin.Short, b:kotlin.Short) returnType:kotlin.Boolean
     VALUE_PARAMETER name:a index:0 type:kotlin.Short
     VALUE_PARAMETER name:b index:1 type:kotlin.Short
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun stest3 (a: kotlin.Short, b: kotlin.Short): kotlin.Boolean declared in <root>'
         CALL 'public final fun greaterOrEqual (arg0: kotlin.Int, arg1: kotlin.Int): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=GTEQ
-          arg0: TYPE_OP type=kotlin.Int origin=IMPLICIT_CAST typeOperand=kotlin.Int
-            GET_VAR 'a: kotlin.Short declared in <root>.stest3' type=kotlin.Short origin=null
-          arg1: TYPE_OP type=kotlin.Int origin=IMPLICIT_CAST typeOperand=kotlin.Int
-            GET_VAR 'b: kotlin.Short declared in <root>.stest3' type=kotlin.Short origin=null
+          arg0: CALL 'public open fun toInt (): kotlin.Int declared in kotlin.Short' type=kotlin.Int origin=null
+            $this: GET_VAR 'a: kotlin.Short declared in <root>.stest3' type=kotlin.Short origin=null
+          arg1: CALL 'public open fun toInt (): kotlin.Int declared in kotlin.Short' type=kotlin.Int origin=null
+            $this: GET_VAR 'b: kotlin.Short declared in <root>.stest3' type=kotlin.Short origin=null
   FUN name:stest4 visibility:public modality:FINAL <> (a:kotlin.Short, b:kotlin.Short) returnType:kotlin.Boolean
     VALUE_PARAMETER name:a index:0 type:kotlin.Short
     VALUE_PARAMETER name:b index:1 type:kotlin.Short
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun stest4 (a: kotlin.Short, b: kotlin.Short): kotlin.Boolean declared in <root>'
         CALL 'public final fun lessOrEqual (arg0: kotlin.Int, arg1: kotlin.Int): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=LTEQ
-          arg0: TYPE_OP type=kotlin.Int origin=IMPLICIT_CAST typeOperand=kotlin.Int
-            GET_VAR 'a: kotlin.Short declared in <root>.stest4' type=kotlin.Short origin=null
-          arg1: TYPE_OP type=kotlin.Int origin=IMPLICIT_CAST typeOperand=kotlin.Int
-            GET_VAR 'b: kotlin.Short declared in <root>.stest4' type=kotlin.Short origin=null
+          arg0: CALL 'public open fun toInt (): kotlin.Int declared in kotlin.Short' type=kotlin.Int origin=null
+            $this: GET_VAR 'a: kotlin.Short declared in <root>.stest4' type=kotlin.Short origin=null
+          arg1: CALL 'public open fun toInt (): kotlin.Int declared in kotlin.Short' type=kotlin.Int origin=null
+            $this: GET_VAR 'b: kotlin.Short declared in <root>.stest4' type=kotlin.Short origin=null
   FUN name:itest1 visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:kotlin.Boolean
     VALUE_PARAMETER name:a index:0 type:kotlin.Int
     VALUE_PARAMETER name:b index:1 type:kotlin.Int