     } test-value-numbering
 ] unit-test
 
-[
-    {
-        T{ ##load-immediate f V int-regs 2 8 }
-        T{ ##peek f V int-regs 3 D 0 }
-        T{ ##slot-imm f V int-regs 4 V int-regs 3 1 3 }
-        T{ ##replace f V int-regs 4 D 0 }
-    }
-] [
-    {
-        T{ ##load-immediate f V int-regs 2 8 }
-        T{ ##peek f V int-regs 3 D 0 }
-        T{ ##slot-imm f V int-regs 4 V int-regs 3 1 3 }
-        T{ ##replace f V int-regs 4 D 0 }
-    } test-value-numbering
-] unit-test
-
-[ t ] [
-    {
-        T{ ##peek f V int-regs 1 D 0 }
-        T{ ##dispatch f V int-regs 1 V int-regs 2 }
-    } dup test-value-numbering =
-] unit-test
-
-[ t ] [
-    {
-        T{ ##peek f V int-regs 16 D 0 }
-        T{ ##peek f V int-regs 17 D -1 }
-        T{ ##sar-imm f V int-regs 18 V int-regs 17 3 }
-        T{ ##add-imm f V int-regs 19 V int-regs 16 13 }
-        T{ ##add f V int-regs 21 V int-regs 18 V int-regs 19 }
-        T{ ##alien-unsigned-1 f V int-regs 22 V int-regs 21 }
-        T{ ##shl-imm f V int-regs 23 V int-regs 22 3 }
-        T{ ##replace f V int-regs 23 D 0 }
-    } dup test-value-numbering =
-] unit-test
-
-[
-    {
-        T{ ##peek f V int-regs 1 D 0 }
-        T{ ##shl-imm f V int-regs 2 V int-regs 1 3 }
-        T{ ##shr-imm f V int-regs 3 V int-regs 2 3 }
-        T{ ##replace f V int-regs 1 D 0 }
-    }
-] [
-    {
-        T{ ##peek f V int-regs 1 D 0 }
-        T{ ##mul-imm f V int-regs 2 V int-regs 1 8 }
-        T{ ##shr-imm f V int-regs 3 V int-regs 2 3 }
-        T{ ##replace f V int-regs 3 D 0 }
-    } test-value-numbering
-] unit-test
-
+! Compare propagation
 [
     {
         T{ ##load-reference f V int-regs 1 + }

    } test-value-numbering trim-temps
] unit-test

[
    {
        T{ ##copy f V int-regs 48 V int-regs 45 }
        T{ ##compare-imm-branch f V int-regs 45 7 cc/= }
    }
] [
    { V int-regs 45 } init-value-numbering
    {
        T{ ##copy f V int-regs 48 V int-regs 45 }
        T{ ##compare-imm-branch f V int-regs 48 7 cc/= }
    } value-numbering-step
] unit-test

    { } init-value-numbering
    value-numbering-step ;

! Copy propagation
[
    {
        T{ ##peek f V int-regs 45 D 1 }
