diff --git a/tests/compiler/duplicate-fields.optimized.wat b/tests/compiler/duplicate-fields.optimized.wat
index fbd19917c3..8b63f0ade2 100644
--- a/tests/compiler/duplicate-fields.optimized.wat
+++ b/tests/compiler/duplicate-fields.optimized.wat
@@ -56,18 +56,18 @@
   local.tee $0
   if
    local.get $0
-   call $~lib/rt/itcms/__visit
+   call $byn-split-outlined-A$~lib/rt/itcms/__visit
   end
   global.get $duplicate-fields/raz
   local.tee $0
   if
    local.get $0
-   call $~lib/rt/itcms/__visit
+   call $byn-split-outlined-A$~lib/rt/itcms/__visit
   end
   i32.const 1248
-  call $~lib/rt/itcms/__visit
+  call $byn-split-outlined-A$~lib/rt/itcms/__visit
   i32.const 1056
-  call $~lib/rt/itcms/__visit
+  call $byn-split-outlined-A$~lib/rt/itcms/__visit
   global.get $~lib/rt/itcms/pinSpace
   local.tee $1
   i32.load offset=4
@@ -238,30 +238,6 @@
   local.get $0
   i32.store offset=8
  )
- (func $~lib/rt/itcms/__visit (param $0 i32)
-  local.get $0
-  i32.eqz
-  if
-   return
-  end
-  global.get $~lib/rt/itcms/white
-  local.get $0
-  i32.const 20
-  i32.sub
-  local.tee $0
-  i32.load offset=4
-  i32.const 3
-  i32.and
-  i32.eq
-  if
-   local.get $0
-   call $~lib/rt/itcms/Object#makeGray
-   global.get $~lib/rt/itcms/visitCount
-   i32.const 1
-   i32.add
-   global.set $~lib/rt/itcms/visitCount
-  end
- )
  (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -328,11 +304,10 @@
   local.tee $2
   i32.const 16
   i32.lt_u
-  i32.const 0
   local.get $3
   i32.const 23
   i32.lt_u
-  select
+  i32.and
   i32.eqz
   if
    i32.const 0
@@ -593,11 +568,10 @@
   local.tee $2
   i32.const 16
   i32.lt_u
-  i32.const 0
   local.get $5
   i32.const 23
   i32.lt_u
-  select
+  i32.and
   i32.eqz
   if
    i32.const 0
@@ -780,8 +754,8 @@
   (local $1 i32)
   memory.size
   local.tee $1
-  i32.const 1
-  i32.lt_s
+  i32.const 0
+  i32.le_s
   if (result i32)
    i32.const 1
    local.get $1
@@ -941,7 +915,11 @@
       if
        local.get $0
        i32.load
-       call $~lib/rt/itcms/__visit
+       local.tee $2
+       if
+        local.get $2
+        call $byn-split-outlined-A$~lib/rt/itcms/__visit
+       end
        local.get $0
        i32.const 4
        i32.add
@@ -1054,7 +1032,7 @@
      local.get $0
      i32.const 4
      i32.add
-     local.tee $1
+     local.tee $0
      i32.const 17980
      i32.ge_u
      if
@@ -1064,20 +1042,20 @@
        call $~lib/rt/tlsf/initialize
       end
       global.get $~lib/rt/tlsf/ROOT
-      local.get $1
+      local.get $0
       i32.const 4
       i32.sub
-      local.set $0
-      local.get $1
+      local.set $2
+      local.get $0
       i32.const 15
       i32.and
       i32.const 1
-      local.get $1
+      local.get $0
       select
       if (result i32)
        i32.const 1
       else
-       local.get $0
+       local.get $2
        i32.load
        i32.const 1
        i32.and
@@ -1090,13 +1068,13 @@
        call $~lib/builtins/abort
        unreachable
       end
-      local.get $0
-      local.get $0
+      local.get $2
+      local.get $2
       i32.load
       i32.const 1
       i32.or
       i32.store
-      local.get $0
+      local.get $2
       call $~lib/rt/tlsf/insertBlock
      end
     end
@@ -1117,56 +1095,53 @@
  )
  (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
+  (local $3 i32)
   local.get $1
   i32.const 256
   i32.lt_u
-  if
+  if (result i32)
    local.get $1
    i32.const 4
    i32.shr_u
-   local.set $1
   else
+   i32.const 31
+   i32.const 1
+   i32.const 27
    local.get $1
-   i32.const 536870910
-   i32.lt_u
-   if
-    i32.const 1
-    i32.const 27
-    local.get $1
-    i32.clz
-    i32.sub
-    i32.shl
-    local.get $1
-    i32.add
-    i32.const 1
-    i32.sub
-    local.set $1
-   end
+   i32.clz
+   i32.sub
+   i32.shl
    local.get $1
-   i32.const 31
+   i32.add
+   i32.const 1
+   i32.sub
    local.get $1
+   local.get $1
+   i32.const 536870910
+   i32.lt_u
+   select
+   local.tee $1
    i32.clz
    i32.sub
-   local.tee $2
+   local.tee $3
+   i32.const 7
+   i32.sub
+   local.set $2
+   local.get $1
+   local.get $3
    i32.const 4
    i32.sub
    i32.shr_u
    i32.const 16
    i32.xor
-   local.set $1
-   local.get $2
-   i32.const 7
-   i32.sub
-   local.set $2
   end
-  local.get $1
+  local.tee $1
   i32.const 16
   i32.lt_u
-  i32.const 0
   local.get $2
   i32.const 23
   i32.lt_u
-  select
+  i32.and
   i32.eqz
   if
    i32.const 0
@@ -1312,7 +1287,7 @@
    call $~lib/rt/tlsf/initialize
   end
   global.get $~lib/rt/tlsf/ROOT
-  local.set $3
+  local.set $5
   local.get $0
   i32.const 16
   i32.add
@@ -1327,47 +1302,28 @@
    call $~lib/builtins/abort
    unreachable
   end
-  local.get $3
+  local.get $5
+  i32.const 12
+  local.get $2
+  i32.const 19
+  i32.add
+  i32.const -16
+  i32.and
+  i32.const 4
+  i32.sub
   local.get $2
   i32.const 12
   i32.le_u
-  if (result i32)
-   i32.const 12
-  else
-   local.get $2
-   i32.const 19
-   i32.add
-   i32.const -16
-   i32.and
-   i32.const 4
-   i32.sub
-  end
-  local.tee $5
+  select
+  local.tee $3
   call $~lib/rt/tlsf/searchBlock
   local.tee $2
   i32.eqz
   if
    memory.size
    local.tee $2
-   local.get $5
-   i32.const 536870910
-   i32.lt_u
-   if (result i32)
-    i32.const 1
-    i32.const 27
-    local.get $5
-    i32.clz
-    i32.sub
-    i32.shl
-    i32.const 1
-    i32.sub
-    local.get $5
-    i32.add
-   else
-    local.get $5
-   end
    i32.const 4
-   local.get $3
+   local.get $5
    i32.load offset=1568
    local.get $2
    i32.const 16
@@ -1376,6 +1332,21 @@
    i32.sub
    i32.ne
    i32.shl
+   i32.const 1
+   i32.const 27
+   local.get $3
+   i32.clz
+   i32.sub
+   i32.shl
+   i32.const 1
+   i32.sub
+   local.get $3
+   i32.add
+   local.get $3
+   local.get $3
+   i32.const 536870910
+   i32.lt_u
+   select
    i32.add
    i32.const 65535
    i32.add
@@ -1400,7 +1371,7 @@
      unreachable
     end
    end
-   local.get $3
+   local.get $5
    local.get $2
    i32.const 16
    i32.shl
@@ -1408,8 +1379,8 @@
    i32.const 16
    i32.shl
    call $~lib/rt/tlsf/addMemory
-   local.get $3
    local.get $5
+   local.get $3
    call $~lib/rt/tlsf/searchBlock
    local.tee $2
    i32.eqz
@@ -1426,7 +1397,7 @@
   i32.load
   i32.const -4
   i32.and
-  local.get $5
+  local.get $3
   i32.lt_u
   if
    i32.const 0
@@ -1436,13 +1407,13 @@
    call $~lib/builtins/abort
    unreachable
   end
-  local.get $3
+  local.get $5
   local.get $2
   call $~lib/rt/tlsf/removeBlock
   local.get $2
   i32.load
-  local.set $4
-  local.get $5
+  local.set $6
+  local.get $3
   i32.const 4
   i32.add
   i32.const 15
@@ -1455,40 +1426,40 @@
    call $~lib/builtins/abort
    unreachable
   end
-  local.get $4
+  local.get $6
   i32.const -4
   i32.and
-  local.get $5
+  local.get $3
   i32.sub
-  local.tee $6
+  local.tee $4
   i32.const 16
   i32.ge_u
   if
    local.get $2
-   local.get $4
+   local.get $6
    i32.const 2
    i32.and
-   local.get $5
+   local.get $3
    i32.or
    i32.store
-   local.get $5
+   local.get $3
    local.get $2
    i32.const 4
    i32.add
    i32.add
-   local.tee $4
-   local.get $6
+   local.tee $3
+   local.get $4
    i32.const 4
    i32.sub
    i32.const 1
    i32.or
    i32.store
+   local.get $5
    local.get $3
-   local.get $4
    call $~lib/rt/tlsf/insertBlock
   else
    local.get $2
-   local.get $4
+   local.get $6
    i32.const -2
    i32.and
    i32.store
@@ -1725,61 +1696,6 @@
   end
   local.get $2
  )
- (func $~lib/rt/itcms/__link (param $0 i32) (param $1 i32)
-  local.get $1
-  i32.eqz
-  if
-   return
-  end
-  local.get $0
-  i32.eqz
-  if
-   i32.const 0
-   i32.const 1120
-   i32.const 294
-   i32.const 14
-   call $~lib/builtins/abort
-   unreachable
-  end
-  global.get $~lib/rt/itcms/white
-  local.get $1
-  i32.const 20
-  i32.sub
-  local.tee $1
-  i32.load offset=4
-  i32.const 3
-  i32.and
-  i32.eq
-  if
-   local.get $0
-   i32.const 20
-   i32.sub
-   i32.load offset=4
-   i32.const 3
-   i32.and
-   local.tee $0
-   global.get $~lib/rt/itcms/white
-   i32.eqz
-   i32.eq
-   if
-    local.get $1
-    call $~lib/rt/itcms/Object#makeGray
-   else
-    global.get $~lib/rt/itcms/state
-    i32.const 1
-    i32.eq
-    i32.const 0
-    local.get $0
-    i32.const 3
-    i32.eq
-    select
-    if
-     local.get $1
-     call $~lib/rt/itcms/Object#makeGray
-    end
-   end
-  end
- )
  (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   block $folding-inner0
@@ -1814,7 +1730,7 @@
        local.tee $1
        if
         local.get $1
-        call $~lib/rt/itcms/__visit
+        call $byn-split-outlined-A$~lib/rt/itcms/__visit
        end
        br $folding-inner0
       end
@@ -1831,7 +1747,7 @@
   local.tee $0
   if
    local.get $0
-   call $~lib/rt/itcms/__visit
+   call $byn-split-outlined-A$~lib/rt/itcms/__visit
   end
  )
  (func $~start
@@ -2047,9 +1963,6 @@
    local.get $0
    i32.const 0
    i32.store
-   local.get $0
-   i32.const 0
-   call $~lib/rt/itcms/__link
    global.get $~lib/memory/__stack_pointer
    local.tee $2
    i32.const 4
@@ -2076,14 +1989,14 @@
    i32.const 0
    i32.store
    local.get $0
-   i32.const 0
-   call $~lib/rt/itcms/__link
-   local.get $0
    local.get $1
    i32.store
-   local.get $0
    local.get $1
-   call $~lib/rt/itcms/__link
+   if
+    local.get $0
+    local.get $1
+    call $byn-split-outlined-A$~lib/rt/itcms/__link
+   end
    global.get $~lib/memory/__stack_pointer
    i32.const 4
    i32.add
@@ -2094,9 +2007,12 @@
    local.get $0
    local.get $1
    i32.store
-   local.get $0
    local.get $1
-   call $~lib/rt/itcms/__link
+   if
+    local.get $0
+    local.get $1
+    call $byn-split-outlined-A$~lib/rt/itcms/__link
+   end
    global.get $~lib/memory/__stack_pointer
    i32.const 4
    i32.add
@@ -2401,4 +2317,72 @@
   call $~lib/builtins/abort
   unreachable
  )
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
+  global.get $~lib/rt/itcms/white
+  local.get $0
+  i32.const 20
+  i32.sub
+  local.tee $0
+  i32.load offset=4
+  i32.const 3
+  i32.and
+  i32.eq
+  if
+   local.get $0
+   call $~lib/rt/itcms/Object#makeGray
+   global.get $~lib/rt/itcms/visitCount
+   i32.const 1
+   i32.add
+   global.set $~lib/rt/itcms/visitCount
+  end
+ )
+ (func $byn-split-outlined-A$~lib/rt/itcms/__link (param $0 i32) (param $1 i32)
+  local.get $0
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 1120
+   i32.const 294
+   i32.const 14
+   call $~lib/builtins/abort
+   unreachable
+  end
+  global.get $~lib/rt/itcms/white
+  local.get $1
+  i32.const 20
+  i32.sub
+  local.tee $1
+  i32.load offset=4
+  i32.const 3
+  i32.and
+  i32.eq
+  if
+   local.get $0
+   i32.const 20
+   i32.sub
+   i32.load offset=4
+   i32.const 3
+   i32.and
+   local.tee $0
+   global.get $~lib/rt/itcms/white
+   i32.eqz
+   i32.eq
+   if
+    local.get $1
+    call $~lib/rt/itcms/Object#makeGray
+   else
+    global.get $~lib/rt/itcms/state
+    i32.const 1
+    i32.eq
+    local.get $0
+    i32.const 3
+    i32.eq
+    i32.and
+    if
+     local.get $1
+     call $~lib/rt/itcms/Object#makeGray
+    end
+   end
+  end
+ )
 )