From 7c995f82a138ec8bd0f790ca9c3577031ec334b8 Mon Sep 17 00:00:00 2001
From: jespergravgaard <jesper@balmangravgaard.dk>
Date: Sat, 12 Dec 2020 00:48:31 +0100
Subject: [PATCH] Added a few missing fragments. Improved fragments for if()
 where rvalue1==0. Closes #598

---
 .idea/codeStyles/Project.xml                  |   18 +
 .../cache/fragment-cache-csg65ce02.asm        |  540 +-
 .../cache/fragment-cache-mega45gs02.asm       |   54 +-
 .../fragment/cache/fragment-cache-mos6502.asm |    2 +-
 .../cache/fragment-cache-mos6502x.asm         | 9882 +++++++++--------
 .../cache/fragment-cache-wdc65c02.asm         |    2 +-
 .../mos6502-common/vbsxx_eq_0_then_la1.asm    |    2 +
 .../mos6502-common/vbsxx_neq_0_then_la1.asm   |    2 +
 .../mos6502-common/vbsyy_eq_0_then_la1.asm    |    2 +
 .../mos6502-common/vbsyy_neq_0_then_la1.asm   |    2 +
 .../AsmFragmentInstanceSpecFactory.java       |    7 +-
 src/test/ref/32bit-rols.asm                   |   27 +-
 src/test/ref/32bit-rols.log                   |  124 +-
 src/test/ref/adventofcode/2020-01.log         |   16 +-
 src/test/ref/adventofcode/2020-02.log         |   20 +-
 src/test/ref/adventofcode/2020-03.log         |   12 +-
 src/test/ref/adventofcode/2020-04.asm         |    6 +-
 src/test/ref/adventofcode/2020-04.log         |   35 +-
 src/test/ref/arrays-init-short.log            |    8 +-
 src/test/ref/atarixl-md5.asm                  |   27 +-
 src/test/ref/atarixl-md5.log                  |   96 +-
 src/test/ref/atarixl-md5b.log                 |    4 +-
 src/test/ref/atoi-1.log                       |   20 +-
 src/test/ref/bitmap-line-anim-2.log           |    8 +-
 src/test/ref/bitmap-plot-0.asm                |    4 +-
 src/test/ref/bitmap-plot-0.log                |   12 +-
 src/test/ref/bitmap-plot-1.asm                |    4 +-
 src/test/ref/bitmap-plot-1.log                |   12 +-
 src/test/ref/bitmap-plot-2.asm                |    4 +-
 src/test/ref/bitmap-plot-2.log                |   12 +-
 src/test/ref/bitmap-plot-3.log                |    8 +-
 src/test/ref/bool-not-operator-2.log          |    4 +-
 src/test/ref/c-types.log                      |    4 +-
 src/test/ref/c64dtv-gfxexplorer.log           |   16 +-
 src/test/ref/c64dtv-gfxmodes.log              |   12 +-
 src/test/ref/casting-negative.log             |   13 +-
 src/test/ref/circlechars.log                  |   12 +-
 src/test/ref/complex/bubbles64/bubbles64.asm  |    4 +-
 src/test/ref/complex/bubbles64/bubbles64.log  |   12 +-
 .../ref/complex/clearscreen/clearscreen.log   |    8 +-
 src/test/ref/complex/includes/includes-1.log  |    4 +-
 .../ref/complex/nes-balls/kickballs-2.asm     |    5 +-
 .../ref/complex/nes-balls/kickballs-2.log     |   28 +-
 .../ref/complex/nes-balls/kickballs-3.asm     |    5 +-
 .../ref/complex/nes-balls/kickballs-3.log     |   28 +-
 src/test/ref/complex/polygon/polygon.asm      |    4 +-
 src/test/ref/complex/polygon/polygon.log      |   24 +-
 src/test/ref/complex/prebob/grid-bobs.log     |   16 +-
 src/test/ref/complex/prebob/vogel-bobs.log    |   16 +-
 src/test/ref/complex/prebob/vogel-sprites.log |    8 +-
 .../ref/complex/splines/truetype-splines.log  |    8 +-
 .../complex/spritescroller/spritescroller.log |    4 +-
 src/test/ref/complex/xmega65/xmega65.log      |    4 +-
 .../ref/complex/xy-scroller/xy-scroller.asm   |   20 +-
 .../ref/complex/xy-scroller/xy-scroller.log   |   64 +-
 src/test/ref/condition-integer-0.asm          |   10 +-
 src/test/ref/condition-integer-0.log          |   34 +-
 src/test/ref/condition-integer-1.asm          |    5 +-
 src/test/ref/condition-integer-1.log          |   25 +-
 src/test/ref/condition-integer-2.asm          |    4 +-
 src/test/ref/condition-integer-2.log          |   20 +-
 src/test/ref/condition-integer-3.log          |    4 +-
 src/test/ref/condition-integer-4.asm          |   22 +-
 src/test/ref/condition-integer-4.log          |   75 +-
 src/test/ref/constants.log                    |    4 +-
 src/test/ref/cordic-atan2-16-ref.log          |    4 +-
 src/test/ref/cordic-atan2-16.log              |    4 +-
 src/test/ref/cordic-atan2-clear.log           |    4 +-
 src/test/ref/cordic-atan2.asm                 |    3 +-
 src/test/ref/cordic-atan2.log                 |   62 +-
 src/test/ref/cpu-65ce02-eightqueens.asm       |   40 +-
 src/test/ref/cpu-65ce02-eightqueens.log       |  168 +-
 src/test/ref/examples/3d/3d.log               |    4 +-
 src/test/ref/examples/3d/perspective.log      |    4 +-
 .../ref/examples/atari2600/atari2600-demo.asm |    9 +-
 .../ref/examples/atari2600/atari2600-demo.log |   29 +-
 .../examples/atari2600/atari2600-sprites.asm  |    9 +-
 .../examples/atari2600/atari2600-sprites.log  |   33 +-
 src/test/ref/examples/atarixl/conio-test.log  |   16 +-
 .../ref/examples/chargen/chargen-analysis.log |    4 +-
 src/test/ref/examples/conio/nacht-screen.asm  |    6 +-
 src/test/ref/examples/conio/nacht-screen.log  |   27 +-
 .../eightqueens/eightqueens-recursive.asm     |   64 +-
 .../eightqueens/eightqueens-recursive.log     |  214 +-
 .../ref/examples/eightqueens/eightqueens.asm  |   44 +-
 .../ref/examples/eightqueens/eightqueens.log  |  180 +-
 src/test/ref/examples/font-2x2/font-2x2.log   |    8 +-
 .../ref/examples/helloworld/helloworld.log    |    4 +-
 .../ref/examples/kernalload/kernalload.log    |    4 +-
 src/test/ref/examples/mega65/hello-mega65.log |    4 +-
 .../ref/examples/mega65/helloworld-mega65.log |    4 +-
 src/test/ref/examples/nes/nes-conio.asm       |    4 +-
 src/test/ref/examples/nes/nes-conio.log       |   44 +-
 src/test/ref/examples/nes/nes-demo.log        |   28 +-
 src/test/ref/examples/nes/nes-dxycp.log       |   16 +-
 src/test/ref/examples/plus4walk/plus4walk.log |   12 +-
 src/test/ref/fastmultiply-127.log             |    4 +-
 .../ref/function-pointer-noarg-call-10.log    |    4 +-
 .../ref/function-pointer-noarg-call-14.log    |    4 +-
 .../ref/function-pointer-noarg-call-7.log     |    4 +-
 .../ref/function-pointer-noarg-call-8.log     |    4 +-
 src/test/ref/global-label-problem.log         |    4 +-
 src/test/ref/helloworld2-inline.asm           |   12 +-
 src/test/ref/helloworld2-inline.log           |   30 +-
 src/test/ref/helloworld2.log                  |    4 +-
 src/test/ref/incrementinarray.log             |    4 +-
 src/test/ref/inline-function-print.asm        |   12 +-
 src/test/ref/inline-function-print.log        |   30 +-
 src/test/ref/inline-string-2.log              |    4 +-
 src/test/ref/inline-string.log                |    4 +-
 src/test/ref/linegen.log                      |    4 +-
 src/test/ref/local-string.log                 |    4 +-
 src/test/ref/loop-for-continue.log            |    4 +-
 .../ref/millfork-benchmarks/plasma-kc.asm     |    5 +-
 .../ref/millfork-benchmarks/plasma-kc.log     |   77 +-
 .../ref/millfork-benchmarks/romsum-kc.log     |   12 +-
 src/test/ref/multiply-16bit-const.log         |    8 +-
 src/test/ref/number-ternary-fail-2.asm        |    5 +-
 src/test/ref/number-ternary-fail-2.log        |   27 +-
 src/test/ref/number-ternary-fail-3.log        |    4 +-
 src/test/ref/number-ternary-fail.log          |    4 +-
 src/test/ref/parse-negated-struct-ref.asm     |    4 +-
 src/test/ref/parse-negated-struct-ref.log     |   12 +-
 src/test/ref/plasma-center.log                |    4 +-
 src/test/ref/plus4-kbhit.log                  |    4 +-
 src/test/ref/plus4-keyboard-test.log          |    4 +-
 src/test/ref/pointer-const.log                |    4 +-
 src/test/ref/pointer-pointer-2.log            |    4 +-
 src/test/ref/post-increment-problem-3.log     |    4 +-
 src/test/ref/post-increment-problem-4.log     |    4 +-
 src/test/ref/post-increment-problem.log       |    8 +-
 src/test/ref/primes-1000-2.log                |    8 +-
 src/test/ref/primes-1000.log                  |    8 +-
 src/test/ref/printf-1.asm                     |   14 +-
 src/test/ref/printf-1.log                     |   59 +-
 src/test/ref/printf-10.log                    |    4 +-
 src/test/ref/printf-11.log                    |    4 +-
 src/test/ref/printf-12.asm                    |   44 +-
 src/test/ref/printf-12.log                    |  172 +-
 src/test/ref/printf-13.asm                    |   58 +-
 src/test/ref/printf-13.log                    |  216 +-
 src/test/ref/printf-14.asm                    |    4 +-
 src/test/ref/printf-14.log                    |   20 +-
 src/test/ref/printf-15.log                    |    4 +-
 src/test/ref/printf-16.log                    |   12 +-
 src/test/ref/printf-2.asm                     |   44 +-
 src/test/ref/printf-2.log                     |  172 +-
 src/test/ref/printf-speed.log                 |   12 +-
 src/test/ref/printmsg.log                     |    4 +-
 src/test/ref/prng-xorshift.asm                |   40 +-
 src/test/ref/prng-xorshift.log                |  160 +-
 src/test/ref/problem-negative-word-const.log  |    4 +-
 .../procedure-callingconvention-stack-12.log  |    4 +-
 src/test/ref/processor-port-test.log          |    4 +-
 src/test/ref/rand-1.asm                       |   40 +-
 src/test/ref/rand-1.log                       |  160 +-
 src/test/ref/screen-center-angle.log          |    4 +-
 src/test/ref/screen-show-spiral-buckets.log   |    4 +-
 src/test/ref/screen-show-spiral.log           |    4 +-
 src/test/ref/semi-struct-1.log                |    4 +-
 src/test/ref/semi-struct-2.log                |    4 +-
 src/test/ref/sieve-min.log                    |    8 +-
 src/test/ref/sieve.log                        |   20 +-
 src/test/ref/sinusgen16.log                   |    4 +-
 src/test/ref/sinusgen16b.log                  |    4 +-
 src/test/ref/sinusgen8.log                    |    4 +-
 src/test/ref/sinusgen8b.log                   |    4 +-
 src/test/ref/sinusgenscale8.log               |    4 +-
 src/test/ref/stars-1.asm                      |   44 +-
 src/test/ref/stars-1.log                      |  168 +-
 src/test/ref/stars-2.asm                      |    4 +-
 src/test/ref/stars-2.log                      |   20 +-
 src/test/ref/strcpy-0.log                     |    4 +-
 .../ref/string-const-consolidation-noroot.log |    4 +-
 src/test/ref/string-const-consolidation.log   |    4 +-
 src/test/ref/string-escapes-0.log             |    4 +-
 src/test/ref/string-escapes-1.log             |    4 +-
 src/test/ref/string-escapes-2.asm             |    4 +-
 src/test/ref/string-escapes-2.log             |   12 +-
 src/test/ref/string-escapes-3.log             |    4 +-
 src/test/ref/string-escapes-4.log             |    4 +-
 src/test/ref/string-escapes-5.log             |    4 +-
 src/test/ref/strncat-0.asm                    |   10 +-
 src/test/ref/strncat-0.log                    |   44 +-
 src/test/ref/struct-11.log                    |    4 +-
 src/test/ref/struct-11b.log                   |    4 +-
 src/test/ref/struct-12.log                    |    4 +-
 src/test/ref/struct-ptr-20.log                |    4 +-
 src/test/ref/struct-ptr-22.log                |    4 +-
 src/test/ref/struct-ptr-28.log                |    4 +-
 src/test/ref/struct-ptr-31.log                |    4 +-
 src/test/ref/struct-ptr-34.log                |    4 +-
 src/test/ref/subexpr-optimize-4.asm           |    8 +-
 src/test/ref/subexpr-optimize-4.log           |   24 +-
 src/test/ref/ternary-4.asm                    |    5 +-
 src/test/ref/ternary-4.log                    |   21 +-
 src/test/ref/test-comparisons-sword.log       |    4 +-
 src/test/ref/test-comparisons-word.log        |    4 +-
 src/test/ref/test-comparisons.log             |    4 +-
 src/test/ref/test-division.log                |    4 +-
 src/test/ref/test-multiply-16bit.log          |    4 +-
 src/test/ref/test-multiply-8bit.log           |    4 +-
 src/test/ref/tod-1.log                        |    4 +-
 src/test/ref/travis1.log                      |    4 +-
 src/test/ref/var-register-zp-3.log            |    4 +-
 src/test/ref/vic20-simple.log                 |    4 +-
 206 files changed, 7505 insertions(+), 7186 deletions(-)
 create mode 100644 src/main/fragment/mos6502-common/vbsxx_eq_0_then_la1.asm
 create mode 100644 src/main/fragment/mos6502-common/vbsxx_neq_0_then_la1.asm
 create mode 100644 src/main/fragment/mos6502-common/vbsyy_eq_0_then_la1.asm
 create mode 100644 src/main/fragment/mos6502-common/vbsyy_neq_0_then_la1.asm

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index e744260b3..b849a12e3 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -4,6 +4,24 @@
       <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
       <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
     </JavaCodeStyleSettings>
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
     <codeStyleSettings language="JAVA">
       <option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
       <option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
diff --git a/src/main/fragment/cache/fragment-cache-csg65ce02.asm b/src/main/fragment/cache/fragment-cache-csg65ce02.asm
index 3d5ce8f72..1d872b48e 100644
--- a/src/main/fragment/cache/fragment-cache-csg65ce02.asm
+++ b/src/main/fragment/cache/fragment-cache-csg65ce02.asm
@@ -1,4 +1,244 @@
-//KICKC FRAGMENT CACHE 129161168d 129161348a
+//KICKC FRAGMENT CACHE 140bf2a915 140bf2c716
+//FRAGMENT vbuzz=vbuc1
+ldz #{c1}
+//FRAGMENT vbuzz_lt_vbuc1_then_la1
+cpz #{c1}
+bcc {la1}
+//FRAGMENT pbuc1_derefidx_vbuzz=vbuzz
+tza
+tax
+sta {c1},x
+//FRAGMENT vbuzz=_inc_vbuzz
+inz
+//FRAGMENT vbsz1=_deref_pbsc1
+lda {c1}
+sta {z1}
+//FRAGMENT vbsz1=_neg_vbsz2
+lda {z2}
+neg
+sta {z1}
+//FRAGMENT _deref_pbsc1=vbsz1
+lda {z1}
+sta {c1}
+//FRAGMENT vbsz1=vbsz2_ror_2
+lda {z2}
+asr
+asr
+sta {z1}
+//FRAGMENT vbsaa=_deref_pbsc1
+lda {c1}
+//FRAGMENT vbsxx=_deref_pbsc1
+ldx {c1}
+//FRAGMENT vbsz1=_neg_vbsaa
+neg
+sta {z1}
+//FRAGMENT vbsz1=_neg_vbsxx
+txa
+neg
+sta {z1}
+//FRAGMENT vbsz1=_neg_vbsyy
+tya
+neg
+sta {z1}
+//FRAGMENT vbsz1=_neg_vbszz
+tza
+neg
+sta {z1}
+//FRAGMENT vbsaa=_neg_vbsz1
+lda {z1}
+neg
+//FRAGMENT vbsaa=_neg_vbsaa
+neg
+//FRAGMENT vbsaa=_neg_vbsxx
+txa
+neg
+//FRAGMENT vbsaa=_neg_vbsyy
+tya
+neg
+//FRAGMENT vbsaa=_neg_vbszz
+tza
+neg
+//FRAGMENT vbsxx=_neg_vbsz1
+lda {z1}
+neg
+tax
+//FRAGMENT vbsxx=_neg_vbsaa
+neg
+tax
+//FRAGMENT vbsxx=_neg_vbsxx
+txa
+neg
+tax
+//FRAGMENT vbsxx=_neg_vbsyy
+tya
+neg
+tax
+//FRAGMENT vbsxx=_neg_vbszz
+tza
+neg
+tax
+//FRAGMENT vbsyy=_neg_vbsz1
+lda {z1}
+neg
+tay
+//FRAGMENT vbsyy=_neg_vbsaa
+neg
+tay
+//FRAGMENT vbsyy=_neg_vbsxx
+txa
+neg
+tay
+//FRAGMENT vbsyy=_neg_vbsyy
+tya
+neg
+tay
+//FRAGMENT vbsyy=_neg_vbszz
+tza
+neg
+tay
+//FRAGMENT vbszz=_neg_vbsz1
+lda {z1}
+neg
+taz
+//FRAGMENT vbszz=_neg_vbsaa
+neg
+taz
+//FRAGMENT vbszz=_neg_vbsxx
+txa
+neg
+taz
+//FRAGMENT vbszz=_neg_vbsyy
+tya
+neg
+taz
+//FRAGMENT vbszz=_neg_vbszz
+tza
+neg
+taz
+//FRAGMENT _deref_pbsc1=vbsaa
+sta {c1}
+//FRAGMENT vbsz1=vbsaa_ror_2
+asr
+asr
+sta {z1}
+//FRAGMENT vbsz1=vbsxx_ror_2
+txa
+asr
+asr
+sta {z1}
+//FRAGMENT vbsz1=vbsyy_ror_2
+tya
+asr
+asr
+sta {z1}
+//FRAGMENT vbsz1=vbszz_ror_2
+tza
+asr
+asr
+sta {z1}
+//FRAGMENT vbsaa=vbsz1_ror_2
+lda {z1}
+asr
+asr
+//FRAGMENT vbsaa=vbsaa_ror_2
+asr
+asr
+//FRAGMENT vbsaa=vbsxx_ror_2
+txa
+asr
+asr
+//FRAGMENT vbsaa=vbsyy_ror_2
+tya
+asr
+asr
+//FRAGMENT vbsaa=vbszz_ror_2
+tza
+asr
+asr
+//FRAGMENT vbsxx=vbsz1_ror_2
+lda {z1}
+asr
+asr
+tax
+//FRAGMENT vbsxx=vbsaa_ror_2
+asr
+asr
+tax
+//FRAGMENT vbsxx=vbsxx_ror_2
+txa
+asr
+asr
+tax
+//FRAGMENT vbsxx=vbsyy_ror_2
+tya
+asr
+asr
+tax
+//FRAGMENT vbsxx=vbszz_ror_2
+tza
+asr
+asr
+tax
+//FRAGMENT vbsyy=vbsz1_ror_2
+lda {z1}
+asr
+asr
+tay
+//FRAGMENT vbsyy=vbsaa_ror_2
+asr
+asr
+tay
+//FRAGMENT vbsyy=vbsxx_ror_2
+txa
+asr
+asr
+tay
+//FRAGMENT vbsyy=vbsyy_ror_2
+tya
+asr
+asr
+tay
+//FRAGMENT vbsyy=vbszz_ror_2
+tza
+asr
+asr
+tay
+//FRAGMENT vbszz=vbsz1_ror_2
+lda {z1}
+asr
+asr
+taz
+//FRAGMENT vbszz=vbsaa_ror_2
+asr
+asr
+taz
+//FRAGMENT vbszz=vbsxx_ror_2
+txa
+asr
+asr
+taz
+//FRAGMENT vbszz=vbsyy_ror_2
+tya
+asr
+asr
+taz
+//FRAGMENT vbszz=vbszz_ror_2
+tza
+asr
+asr
+taz
+//FRAGMENT vbsyy=_deref_pbsc1
+ldy {c1}
+//FRAGMENT vbszz=_deref_pbsc1
+lda {c1}
+taz
+//FRAGMENT _deref_pbsc1=vbsxx
+stx {c1}
+//FRAGMENT _deref_pbsc1=vbsyy
+sty {c1}
+//FRAGMENT _deref_pbsc1=vbszz
+tza
+sta {c1}
 //FRAGMENT vbuz1=vbuc1
 lda #{c1}
 sta {z1}
@@ -92,9 +332,9 @@ lda ({z2}),y
 sta {z1}
 //FRAGMENT pbuz1=_inc_pbuz1
 inw {z1}
-//FRAGMENT vbuc1_neq_vbuz1_then_la1
-lda #{c1}
-cmp {z1}
+//FRAGMENT 0_neq_vbuz1_then_la1
+lda {z1}
+cmp #0
 bne {la1}
 //FRAGMENT _deref_pbuc1=vbuc2
 lda #{c2}
@@ -120,9 +360,9 @@ beq {la1}
 ldy {z2}
 lda {c1},y
 sta {z1}
-//FRAGMENT vbuc1_eq_vbuz1_then_la1
-lda #{c1}
-cmp {z1}
+//FRAGMENT 0_eq_vbuz1_then_la1
+lda {z1}
+cmp #0
 beq {la1}
 //FRAGMENT vbuz1_eq_vbuc1_then_la1
 lda #{c1}
@@ -217,9 +457,9 @@ bpl {la1}
 //FRAGMENT vbsz1=vbsc1
 lda #{c1}
 sta {z1}
-//FRAGMENT vbsc1_neq_vbsz1_then_la1
-lda #{c1}
-cmp {z1}
+//FRAGMENT 0_neq_vbsz1_then_la1
+lda {z1}
+cmp #0
 bne {la1}
 //FRAGMENT vbuz1=vbuz2_minus_1
 ldx {z2}
@@ -290,10 +530,10 @@ sta {z1}
 lda {z1}+1
 sbc {z2}+1
 sta {z1}+1
-//FRAGMENT vbuc1_neq__deref_pbuz1_then_la1
+//FRAGMENT 0_neq__deref_pbuz1_then_la1
 ldy #0
 lda ({z1}),y
-cmp #{c1}
+cmp #0
 bne {la1}
 //FRAGMENT vwuz1=_inc_vwuz1
 inw {z1}
@@ -432,8 +672,8 @@ tay
 ldy #0
 lda ({z1}),y
 taz
-//FRAGMENT vbuc1_neq_vbuaa_then_la1
-cmp #{c1}
+//FRAGMENT 0_neq_vbuaa_then_la1
+cmp #0
 bne {la1}
 //FRAGMENT vbuz1=vbuaa
 sta {z1}
@@ -461,8 +701,8 @@ ldy {c1},x
 //FRAGMENT vbuzz=pbuc1_derefidx_vbuz1
 ldx {z1}
 ldz {c1},x
-//FRAGMENT vbuc1_eq_vbuaa_then_la1
-cmp #{c1}
+//FRAGMENT 0_eq_vbuaa_then_la1
+cmp #0
 beq {la1}
 //FRAGMENT vbuxx_eq_vbuc1_then_la1
 cpx #{c1}
@@ -624,15 +864,15 @@ lda {c1},y
 sta {z1}
 lda {c1}+1,y
 sta {z1}+1
-//FRAGMENT vbuc1_neq_vbuxx_then_la1
-cpx #{c1}
+//FRAGMENT 0_neq_vbuxx_then_la1
+cpx #0
 bne {la1}
 //FRAGMENT vbsaa=_sbyte_vwuz1
 lda {z1}
 //FRAGMENT vbsxx=_sbyte_vwuz1
 ldx {z1}
-//FRAGMENT vbuc1_eq_vbuxx_then_la1
-cpx #{c1}
+//FRAGMENT 0_eq_vbuxx_then_la1
+cpx #0
 beq {la1}
 //FRAGMENT vbsz1=vbsz2_minus_vbsaa
 eor #$ff
@@ -956,8 +1196,8 @@ taz
 //FRAGMENT vbsxx_ge_0_then_la1
 cpx #0
 bpl {la1}
-//FRAGMENT vbsc1_neq_vbsxx_then_la1
-cpx #{c1}
+//FRAGMENT 0_neq_vbsxx_then_la1
+cpx #0
 bne {la1}
 //FRAGMENT vbuz1=vbuaa_minus_1
 sec
@@ -1980,8 +2220,6 @@ cpx {z1}
 bcs {la1}
 //FRAGMENT vbuxx=vbuc1
 ldx #{c1}
-//FRAGMENT vbuzz=vbuc1
-ldz #{c1}
 //FRAGMENT vbuzz=vbuz1
 ldz {z1}
 //FRAGMENT vbuz1=vbuzz
@@ -1996,8 +2234,6 @@ inx
 ldy #{c1}
 //FRAGMENT vbuyy=_inc_vbuyy
 iny
-//FRAGMENT vbuzz=_inc_vbuzz
-inz
 //FRAGMENT vbuz1_ge_vbuxx_then_la1
 lda {z1}
 stx $ff
@@ -2054,9 +2290,6 @@ bcc {la1}
 cpy #{c1}
 bcc {la1}
 beq {la1}
-//FRAGMENT vbuzz_lt_vbuc1_then_la1
-cpz #{c1}
-bcc {la1}
 //FRAGMENT vbuzz_le_vbuc1_then_la1
 cpz #{c1}
 bcc {la1}
@@ -2108,11 +2341,11 @@ cpy {z1}
 bcs {la1}
 //FRAGMENT vbuaa=vbuc1
 lda #{c1}
-//FRAGMENT vbuc1_neq_vbuyy_then_la1
-cpy #{c1}
+//FRAGMENT 0_neq_vbuyy_then_la1
+cpy #0
 bne {la1}
-//FRAGMENT vbuc1_neq_vbuzz_then_la1
-cpz #{c1}
+//FRAGMENT 0_neq_vbuzz_then_la1
+cpz #0
 bne {la1}
 //FRAGMENT vbuyy_ge_vbuxx_then_la1
 stx $ff
@@ -2130,8 +2363,8 @@ iny
 ldz {z1}
 //FRAGMENT vbszz=_inc_vbszz
 inz
-//FRAGMENT vbuc1_eq_vbuzz_then_la1
-cpz #{c1}
+//FRAGMENT 0_eq_vbuzz_then_la1
+cpz #0
 beq {la1}
 //FRAGMENT vbuz1_neq_vbuxx_then_la1
 cpx {z1}
@@ -2221,8 +2454,8 @@ bcc {la1}
 lda {z1}
 sec
 sbc #1
-//FRAGMENT vbuc1_eq_vbuyy_then_la1
-cpy #{c1}
+//FRAGMENT 0_eq_vbuyy_then_la1
+cpy #0
 beq {la1}
 //FRAGMENT vbuyy=_deref_pbuc1
 ldy {c1}
@@ -2286,236 +2519,3 @@ sta {z1}+1
 asw {z1}
 asw {z1}
 asw {z1}
-//FRAGMENT pbuc1_derefidx_vbuzz=vbuzz
-tza
-tax
-sta {c1},x
-//FRAGMENT vbsz1=_deref_pbsc1
-lda {c1}
-sta {z1}
-//FRAGMENT vbsz1=_neg_vbsz2
-lda {z2}
-neg
-sta {z1}
-//FRAGMENT _deref_pbsc1=vbsz1
-lda {z1}
-sta {c1}
-//FRAGMENT vbsz1=vbsz2_ror_2
-lda {z2}
-asr
-asr
-sta {z1}
-//FRAGMENT vbsaa=_deref_pbsc1
-lda {c1}
-//FRAGMENT vbsxx=_deref_pbsc1
-ldx {c1}
-//FRAGMENT vbsz1=_neg_vbsaa
-neg
-sta {z1}
-//FRAGMENT vbsz1=_neg_vbsxx
-txa
-neg
-sta {z1}
-//FRAGMENT vbsz1=_neg_vbsyy
-tya
-neg
-sta {z1}
-//FRAGMENT vbsz1=_neg_vbszz
-tza
-neg
-sta {z1}
-//FRAGMENT vbsaa=_neg_vbsz1
-lda {z1}
-neg
-//FRAGMENT vbsaa=_neg_vbsaa
-neg
-//FRAGMENT vbsaa=_neg_vbsxx
-txa
-neg
-//FRAGMENT vbsaa=_neg_vbsyy
-tya
-neg
-//FRAGMENT vbsaa=_neg_vbszz
-tza
-neg
-//FRAGMENT vbsxx=_neg_vbsz1
-lda {z1}
-neg
-tax
-//FRAGMENT vbsxx=_neg_vbsaa
-neg
-tax
-//FRAGMENT vbsxx=_neg_vbsxx
-txa
-neg
-tax
-//FRAGMENT vbsxx=_neg_vbsyy
-tya
-neg
-tax
-//FRAGMENT vbsxx=_neg_vbszz
-tza
-neg
-tax
-//FRAGMENT vbsyy=_neg_vbsz1
-lda {z1}
-neg
-tay
-//FRAGMENT vbsyy=_neg_vbsaa
-neg
-tay
-//FRAGMENT vbsyy=_neg_vbsxx
-txa
-neg
-tay
-//FRAGMENT vbsyy=_neg_vbsyy
-tya
-neg
-tay
-//FRAGMENT vbsyy=_neg_vbszz
-tza
-neg
-tay
-//FRAGMENT vbszz=_neg_vbsz1
-lda {z1}
-neg
-taz
-//FRAGMENT vbszz=_neg_vbsaa
-neg
-taz
-//FRAGMENT vbszz=_neg_vbsxx
-txa
-neg
-taz
-//FRAGMENT vbszz=_neg_vbsyy
-tya
-neg
-taz
-//FRAGMENT vbszz=_neg_vbszz
-tza
-neg
-taz
-//FRAGMENT _deref_pbsc1=vbsaa
-sta {c1}
-//FRAGMENT vbsz1=vbsaa_ror_2
-asr
-asr
-sta {z1}
-//FRAGMENT vbsz1=vbsxx_ror_2
-txa
-asr
-asr
-sta {z1}
-//FRAGMENT vbsz1=vbsyy_ror_2
-tya
-asr
-asr
-sta {z1}
-//FRAGMENT vbsz1=vbszz_ror_2
-tza
-asr
-asr
-sta {z1}
-//FRAGMENT vbsaa=vbsz1_ror_2
-lda {z1}
-asr
-asr
-//FRAGMENT vbsaa=vbsaa_ror_2
-asr
-asr
-//FRAGMENT vbsaa=vbsxx_ror_2
-txa
-asr
-asr
-//FRAGMENT vbsaa=vbsyy_ror_2
-tya
-asr
-asr
-//FRAGMENT vbsaa=vbszz_ror_2
-tza
-asr
-asr
-//FRAGMENT vbsxx=vbsz1_ror_2
-lda {z1}
-asr
-asr
-tax
-//FRAGMENT vbsxx=vbsaa_ror_2
-asr
-asr
-tax
-//FRAGMENT vbsxx=vbsxx_ror_2
-txa
-asr
-asr
-tax
-//FRAGMENT vbsxx=vbsyy_ror_2
-tya
-asr
-asr
-tax
-//FRAGMENT vbsxx=vbszz_ror_2
-tza
-asr
-asr
-tax
-//FRAGMENT vbsyy=vbsz1_ror_2
-lda {z1}
-asr
-asr
-tay
-//FRAGMENT vbsyy=vbsaa_ror_2
-asr
-asr
-tay
-//FRAGMENT vbsyy=vbsxx_ror_2
-txa
-asr
-asr
-tay
-//FRAGMENT vbsyy=vbsyy_ror_2
-tya
-asr
-asr
-tay
-//FRAGMENT vbsyy=vbszz_ror_2
-tza
-asr
-asr
-tay
-//FRAGMENT vbszz=vbsz1_ror_2
-lda {z1}
-asr
-asr
-taz
-//FRAGMENT vbszz=vbsaa_ror_2
-asr
-asr
-taz
-//FRAGMENT vbszz=vbsxx_ror_2
-txa
-asr
-asr
-taz
-//FRAGMENT vbszz=vbsyy_ror_2
-tya
-asr
-asr
-taz
-//FRAGMENT vbszz=vbszz_ror_2
-tza
-asr
-asr
-taz
-//FRAGMENT vbsyy=_deref_pbsc1
-ldy {c1}
-//FRAGMENT vbszz=_deref_pbsc1
-lda {c1}
-taz
-//FRAGMENT _deref_pbsc1=vbsxx
-stx {c1}
-//FRAGMENT _deref_pbsc1=vbsyy
-sty {c1}
-//FRAGMENT _deref_pbsc1=vbszz
-tza
-sta {c1}
diff --git a/src/main/fragment/cache/fragment-cache-mega45gs02.asm b/src/main/fragment/cache/fragment-cache-mega45gs02.asm
index 3bc7bda1c..c3786ae42 100644
--- a/src/main/fragment/cache/fragment-cache-mega45gs02.asm
+++ b/src/main/fragment/cache/fragment-cache-mega45gs02.asm
@@ -1,4 +1,4 @@
-//KICKC FRAGMENT CACHE 129161168d 129161348a
+//KICKC FRAGMENT CACHE 140bf2a915 140bf2c716
 //FRAGMENT _deref_pbuc1=vbuc2
 lda #{c2}
 sta {c1}
@@ -1229,9 +1229,9 @@ lda {z2}
 sta {z1}
 lda {z2}+1
 sta {z1}+1
-//FRAGMENT vbuc1_neq_vbuz1_then_la1
-lda #{c1}
-cmp {z1}
+//FRAGMENT 0_neq_vbuz1_then_la1
+lda {z1}
+cmp #0
 bne {la1}
 //FRAGMENT pbuz1_derefidx_vbuz2=vbuz3
 lda {z3}
@@ -1313,8 +1313,8 @@ tza
 sta {z1}
 lda #0
 sta {z1}+1
-//FRAGMENT vbuc1_neq_vbuaa_then_la1
-cmp #{c1}
+//FRAGMENT 0_neq_vbuaa_then_la1
+cmp #0
 bne {la1}
 //FRAGMENT vbuz1=vbuaa
 sta {z1}
@@ -1333,18 +1333,18 @@ sta ({z1}),y
 tza
 ldz {z2}
 sta ({z1}),z
-//FRAGMENT vbuc1_neq_vbuxx_then_la1
-cpx #{c1}
+//FRAGMENT 0_neq_vbuxx_then_la1
+cpx #0
 bne {la1}
 //FRAGMENT vbuaa=vbuxx
 txa
-//FRAGMENT vbuc1_neq_vbuyy_then_la1
-cpy #{c1}
+//FRAGMENT 0_neq_vbuyy_then_la1
+cpy #0
 bne {la1}
 //FRAGMENT vbuaa=vbuyy
 tya
-//FRAGMENT vbuc1_neq_vbuzz_then_la1
-cpz #{c1}
+//FRAGMENT 0_neq_vbuzz_then_la1
+cpz #0
 bne {la1}
 //FRAGMENT vbuaa=vbuzz
 tza
@@ -2536,33 +2536,33 @@ sta {c1},x
 tay
 //FRAGMENT vbuzz=vbuaa
 taz
-//FRAGMENT vbuc1_neq_pbuc2_derefidx_vbuz1_then_la1
-lda #{c1}
+//FRAGMENT 0_neq_pbuc1_derefidx_vbuz1_then_la1
 ldy {z1}
-cmp {c2},y
+lda {c1},y
+cmp #0
 bne {la1}
 //FRAGMENT pbuc1_derefidx_vbuz1=vbuz1
 ldy {z1}
 tya
 sta {c1},y
-//FRAGMENT vbuc1_neq_pbuc2_derefidx_vbuaa_then_la1
+//FRAGMENT 0_neq_pbuc1_derefidx_vbuaa_then_la1
 tay
-lda #{c1}
-cmp {c2},y
+lda {c1},y
+cmp #0
 bne {la1}
-//FRAGMENT vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1
-lda {c2},x
-cmp #{c1}
+//FRAGMENT 0_neq_pbuc1_derefidx_vbuxx_then_la1
+lda {c1},x
+cmp #0
 bne {la1}
-//FRAGMENT vbuc1_neq_pbuc2_derefidx_vbuyy_then_la1
-lda #{c1}
-cmp {c2},y
+//FRAGMENT 0_neq_pbuc1_derefidx_vbuyy_then_la1
+lda {c1},y
+cmp #0
 bne {la1}
-//FRAGMENT vbuc1_neq_pbuc2_derefidx_vbuzz_then_la1
+//FRAGMENT 0_neq_pbuc1_derefidx_vbuzz_then_la1
 tza
 tay
-lda #{c1}
-cmp {c2},y
+lda {c1},y
+cmp #0
 bne {la1}
 //FRAGMENT pbuc1_derefidx_vbuxx=vbuxx
 txa
diff --git a/src/main/fragment/cache/fragment-cache-mos6502.asm b/src/main/fragment/cache/fragment-cache-mos6502.asm
index 4e24458db..7da2f9157 100644
--- a/src/main/fragment/cache/fragment-cache-mos6502.asm
+++ b/src/main/fragment/cache/fragment-cache-mos6502.asm
@@ -1,4 +1,4 @@
-//KICKC FRAGMENT CACHE 129161168d 129161348a
+//KICKC FRAGMENT CACHE 140bf2a915 140bf2c716
 //FRAGMENT vbuz1=vbuc1
 lda #{c1}
 sta {z1}
diff --git a/src/main/fragment/cache/fragment-cache-mos6502x.asm b/src/main/fragment/cache/fragment-cache-mos6502x.asm
index c14ecdeec..85cb501cb 100644
--- a/src/main/fragment/cache/fragment-cache-mos6502x.asm
+++ b/src/main/fragment/cache/fragment-cache-mos6502x.asm
@@ -1,4 +1,4 @@
-//KICKC FRAGMENT CACHE 129161168d 129161348a
+//KICKC FRAGMENT CACHE 140bf2a915 140bf2c716
 //FRAGMENT vbuz1=vbuc1
 lda #{c1}
 sta {z1}
@@ -350,10 +350,10 @@ bne {la1}
 lda #{c1}
 ldy #0
 sta ({z1}),y
-//FRAGMENT vbuc1_neq__deref_pbuz1_then_la1
+//FRAGMENT 0_neq__deref_pbuz1_then_la1
 ldy #0
 lda ({z1}),y
-cmp #{c1}
+cmp #0
 bne {la1}
 //FRAGMENT vbuz1=_deref_pbuz2
 ldy #0
@@ -1441,9 +1441,777 @@ tax
 sty $ff
 cpx $ff
 beq  {la1}
+//FRAGMENT vwuz1=vwuz2_plus_1
+clc
+lda {z2}
+adc #1
+sta {z1}
+lda {z2}+1
+adc #0
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz2_rol_1
+lda {z2}
+asl
+sta {z1}
+lda {z2}+1
+rol
+sta {z1}+1
+//FRAGMENT pwuz1=pwuc1_plus_vwuz2
+clc
+lda {z2}
+adc #<{c1}
+sta {z1}
+lda {z2}+1
+adc #>{c1}
+sta {z1}+1
+//FRAGMENT vwuz1=_deref_pwuz2_plus__deref_pwuz3
+ldy #0
+clc
+lda ({z2}),y
+adc ({z3}),y
+sta {z1}
+iny
+lda ({z2}),y
+adc ({z3}),y
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz2_plus__deref_pwuz3
+ldy #0
+clc
+lda {z2}
+adc ({z3}),y
+sta {z1}
+iny
+lda {z2}+1
+adc ({z3}),y
+sta {z1}+1
+//FRAGMENT vwuz1_neq_vwuc1_then_la1
+lda {z1}+1
+cmp #>{c1}
+bne {la1}
+lda {z1}
+cmp #<{c1}
+bne {la1}
+//FRAGMENT vwuz1=_deref_pwuz2
+ldy #0
+lda ({z2}),y
+sta {z1}
+iny
+lda ({z2}),y
+sta {z1}+1
+//FRAGMENT vduz1=vduz2
+lda {z2}
+sta {z1}
+lda {z2}+1
+sta {z1}+1
+lda {z2}+2
+sta {z1}+2
+lda {z2}+3
+sta {z1}+3
+//FRAGMENT vwuz1=_lo_vduz2
+lda {z2}
+sta {z1}
+lda {z2}+1
+sta {z1}+1
+//FRAGMENT pvoz1=_deref_qvoc1
+lda {c1}
+sta {z1}
+lda {c1}+1
+sta {z1}+1
+//FRAGMENT 0_neq_vbuz1_then_la1
+lda {z1}
+cmp #0
+bne {la1}
 //FRAGMENT vbuz1=_deref_pbuc1
 lda {c1}
 sta {z1}
+//FRAGMENT vduz1=_dword_vwuz2
+lda {z2}
+sta {z1}
+lda {z2}+1
+sta {z1}+1
+lda #0
+sta {z1}+2
+sta {z1}+3
+//FRAGMENT vduz1=vduc1
+lda #<{c1}
+sta {z1}
+lda #>{c1}
+sta {z1}+1
+lda #<{c1}>>$10
+sta {z1}+2
+lda #>{c1}>>$10
+sta {z1}+3
+//FRAGMENT vwuz1_neq_0_then_la1
+lda {z1}
+ora {z1}+1
+bne {la1}
+//FRAGMENT vbuz1=vwuz2_band_vbuc1
+lda #{c1}
+and {z2}
+sta {z1}
+//FRAGMENT vduz1=vduz1_plus_vduz2
+lda {z1}
+clc
+adc {z2}
+sta {z1}
+lda {z1}+1
+adc {z2}+1
+sta {z1}+1
+lda {z1}+2
+adc {z2}+2
+sta {z1}+2
+lda {z1}+3
+adc {z2}+3
+sta {z1}+3
+//FRAGMENT vwuz1=vwuz1_ror_1
+lsr {z1}+1
+ror {z1}
+//FRAGMENT vduz1=vduz1_rol_1
+asl {z1}
+rol {z1}+1
+rol {z1}+2
+rol {z1}+3
+//FRAGMENT vwuz1_le_0_then_la1
+lda {z1}
+bne !+
+lda {z1}+1
+beq {la1}
+!:
+//FRAGMENT pbuz1=pbuz2_plus_vwuz3
+lda {z2}
+clc
+adc {z3}
+sta {z1}
+lda {z2}+1
+adc {z3}+1
+sta {z1}+1
+//FRAGMENT pbuz1_neq_pbuz2_then_la1
+lda {z1}+1
+cmp {z2}+1
+bne {la1}
+lda {z1}
+cmp {z2}
+bne {la1}
+//FRAGMENT _deref_pwuc1=vbuc2
+lda #0
+sta {c1}+1
+lda #<{c2}
+sta {c1}
+//FRAGMENT vbuz1_eq_vbuc1_then_la1
+lda #{c1}
+cmp {z1}
+beq {la1}
+//FRAGMENT vbuz1=pbuc1_derefidx_(_deref_pbuc2)
+ldy {c2}
+lda {c1},y
+sta {z1}
+//FRAGMENT _deref_pwuc1=_inc__deref_pwuc1
+inc {c1}
+bne !+
+inc {c1}+1
+!:
+//FRAGMENT _deref_pwuc1_eq_vbuc2_then_la1
+lda {c1}+1
+bne !+
+lda {c1}
+cmp #{c2}
+beq {la1}
+!:
+//FRAGMENT vbuz1=_byte_vwuz2
+lda {z2}
+sta {z1}
+//FRAGMENT _deref_pbuz1=pbuc1_derefidx_vbuz2
+ldy {z2}
+lda {c1},y
+ldy #0
+sta ({z1}),y
+//FRAGMENT pbuz1=_inc_pbuz2
+clc
+lda {z2}
+adc #1
+sta {z1}
+lda {z2}+1
+adc #0
+sta {z1}+1
+//FRAGMENT vbuz1=vbuz2_rol_1
+lda {z2}
+asl
+sta {z1}
+//FRAGMENT vwuz1=pwuc1_derefidx_vbuz2
+ldy {z2}
+lda {c1},y
+sta {z1}
+lda {c1}+1,y
+sta {z1}+1
+//FRAGMENT vwuz1_ge_vwuz2_then_la1
+lda {z2}+1
+cmp {z1}+1
+bne !+
+lda {z2}
+cmp {z1}
+beq {la1}
+!:
+bcc {la1}
+//FRAGMENT 0_eq_vbuz1_then_la1
+lda {z1}
+cmp #0
+beq {la1}
+//FRAGMENT vbuz1=_byte_vduz2
+lda {z2}
+sta {z1}
+//FRAGMENT vbuz1=vbuz2_rol_2
+lda {z2}
+asl
+asl
+sta {z1}
+//FRAGMENT vduz1=pduc1_derefidx_vbuz2
+ldy {z2}
+lda {c1},y
+sta {z1}
+lda {c1}+1,y
+sta {z1}+1
+lda {c1}+2,y
+sta {z1}+2
+lda {c1}+3,y
+sta {z1}+3
+//FRAGMENT vduz1_ge_vduz2_then_la1
+lda {z1}+3
+cmp {z2}+3
+bcc !+
+bne {la1}
+lda {z1}+2
+cmp {z2}+2
+bcc !+
+bne {la1}
+lda {z1}+1
+cmp {z2}+1
+bcc !+
+bne {la1}
+lda {z1}
+cmp {z2}
+bcs {la1}
+!:
+//FRAGMENT _deref_(_deref_qbuc1)=_deref_pbuc2
+lda {c2}
+ldy {c1}
+sty $fe
+ldy {c1}+1
+sty $ff
+ldy #0
+sta ($fe),y
+//FRAGMENT _deref_pbuc1=vbuz1
+lda {z1}
+sta {c1}
+//FRAGMENT _deref_qbuc1=pbuz1
+lda {z1}
+sta {c1}
+lda {z1}+1
+sta {c1}+1
+//FRAGMENT vbuz1=vbuz2_bxor_vbuc1
+lda #{c1}
+eor {z2}
+sta {z1}
+//FRAGMENT _deref_(_deref_qbuc1)=vbuz1
+lda {z1}
+ldy {c1}
+sty $fe
+ldy {c1}+1
+sty $ff
+ldy #0
+sta ($fe),y
+//FRAGMENT _deref_pbuc1=_inc__deref_pbuc1
+inc {c1}
+//FRAGMENT _deref_pbuc1_neq_vbuc2_then_la1
+lda #{c2}
+cmp {c1}
+bne {la1}
+//FRAGMENT _deref_(_deref_qbuc1)=_deref_(_deref_qbuc1)_bxor_vbuc2
+ldy {c1}
+sty $fe
+ldy {c1}+1
+sty $ff
+ldy #0
+lda ($fe),y
+eor #{c2}
+sta ($fe),y
+//FRAGMENT pbuz1=_deref_qbuc1
+lda {c1}
+sta {z1}
+lda {c1}+1
+sta {z1}+1
+//FRAGMENT pbuz1=pbuz2_plus_vbuc1
+lda #{c1}
+clc
+adc {z2}
+sta {z1}
+lda #0
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT pvoz1=pvoz2
+lda {z2}
+sta {z1}
+lda {z2}+1
+sta {z1}+1
+//FRAGMENT pbuz1=pbuz2_plus_vwuc1
+clc
+lda {z2}
+adc #<{c1}
+sta {z1}
+lda {z2}+1
+adc #>{c1}
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz1_minus_vwuz2
+lda {z1}
+sec
+sbc {z2}
+sta {z1}
+lda {z1}+1
+sbc {z2}+1
+sta {z1}+1
+//FRAGMENT vduz1=vduz1_minus_vduz2
+lda {z1}
+sec
+sbc {z2}
+sta {z1}
+lda {z1}+1
+sbc {z2}+1
+sta {z1}+1
+lda {z1}+2
+sbc {z2}+2
+sta {z1}+2
+lda {z1}+3
+sbc {z2}+3
+sta {z1}+3
+//FRAGMENT vwuz1=_word__deref_pbuc1
+lda {c1}
+sta {z1}
+lda #0
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz2_rol_2
+lda {z2}
+asl
+sta {z1}
+lda {z2}+1
+rol
+sta {z1}+1
+asl {z1}
+rol {z1}+1
+//FRAGMENT vwuz1=vwuz2_plus_vwuz3
+lda {z2}
+clc
+adc {z3}
+sta {z1}
+lda {z2}+1
+adc {z3}+1
+sta {z1}+1
+//FRAGMENT pbuz1=_deref_qbuc1_plus_vwuz2
+clc
+lda {z2}
+adc {c1}
+sta {z1}
+lda {z2}+1
+adc {c1}+1
+sta {z1}+1
+//FRAGMENT pbuz1=pbuz2_plus__deref_pwuc1
+clc
+lda {c1}
+adc {z2}
+sta {z1}
+lda {c1}+1
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT _deref_pbuz1=_deref_pbuz2
+ldy #0
+lda ({z2}),y
+ldy #0
+sta ({z1}),y
+//FRAGMENT 0_neq_vbuaa_then_la1
+cmp #0
+bne {la1}
+//FRAGMENT vbuaa=_deref_pbuc1
+lda {c1}
+//FRAGMENT vbuxx=_deref_pbuc1
+ldx {c1}
+//FRAGMENT vbuaa=vwuz1_band_vbuc1
+lda #{c1}
+and {z1}
+//FRAGMENT vbuxx=vwuz1_band_vbuc1
+lda #{c1}
+and {z1}
+tax
+//FRAGMENT vbuyy=vwuz1_band_vbuc1
+lda #{c1}
+and {z1}
+tay
+//FRAGMENT vbuaa=pbuc1_derefidx_(_deref_pbuc2)
+ldy {c2}
+lda {c1},y
+//FRAGMENT vbuxx=pbuc1_derefidx_(_deref_pbuc2)
+ldy {c2}
+ldx {c1},y
+//FRAGMENT vbuyy=pbuc1_derefidx_(_deref_pbuc2)
+ldx {c2}
+ldy {c1},x
+//FRAGMENT vbuaa=_byte_vwuz1
+lda {z1}
+//FRAGMENT vbuxx=_byte_vwuz1
+lda {z1}
+tax
+//FRAGMENT vbuyy=_byte_vwuz1
+lda {z1}
+tay
+//FRAGMENT _deref_pbuz1=pbuc1_derefidx_vbuaa
+tay
+lda {c1},y
+ldy #0
+sta ({z1}),y
+//FRAGMENT _deref_pbuz1=pbuc1_derefidx_vbuxx
+lda {c1},x
+ldy #0
+sta ({z1}),y
+//FRAGMENT _deref_pbuz1=pbuc1_derefidx_vbuyy
+lda {c1},y
+ldy #0
+sta ({z1}),y
+//FRAGMENT vbuaa=vbuz1_rol_1
+lda {z1}
+asl
+//FRAGMENT vbuxx=vbuz1_rol_1
+lda {z1}
+asl
+tax
+//FRAGMENT vbuyy=vbuz1_rol_1
+lda {z1}
+asl
+tay
+//FRAGMENT vbuz1=vbuaa_rol_1
+asl
+sta {z1}
+//FRAGMENT vbuaa=vbuaa_rol_1
+asl
+//FRAGMENT vbuxx=vbuaa_rol_1
+asl
+tax
+//FRAGMENT vbuyy=vbuaa_rol_1
+asl
+tay
+//FRAGMENT vbuz1=vbuxx_rol_1
+txa
+asl
+sta {z1}
+//FRAGMENT vbuaa=vbuxx_rol_1
+txa
+asl
+//FRAGMENT vbuxx=vbuxx_rol_1
+txa
+asl
+tax
+//FRAGMENT vbuyy=vbuxx_rol_1
+txa
+asl
+tay
+//FRAGMENT vbuz1=vbuyy_rol_1
+tya
+asl
+sta {z1}
+//FRAGMENT vbuaa=vbuyy_rol_1
+tya
+asl
+//FRAGMENT vbuxx=vbuyy_rol_1
+tya
+asl
+tax
+//FRAGMENT vbuyy=vbuyy_rol_1
+tya
+asl
+tay
+//FRAGMENT vwuz1=pwuc1_derefidx_vbuaa
+tay
+lda {c1},y
+sta {z1}
+lda {c1}+1,y
+sta {z1}+1
+//FRAGMENT vwuz1=pwuc1_derefidx_vbuxx
+lda {c1},x
+sta {z1}
+lda {c1}+1,x
+sta {z1}+1
+//FRAGMENT vwuz1=pwuc1_derefidx_vbuyy
+lda {c1},y
+sta {z1}
+lda {c1}+1,y
+sta {z1}+1
+//FRAGMENT 0_neq_vbuxx_then_la1
+cpx #0
+bne {la1}
+//FRAGMENT 0_eq_vbuaa_then_la1
+cmp #0
+beq {la1}
+//FRAGMENT vbuaa=_byte_vduz1
+lda {z1}
+//FRAGMENT vbuxx=_byte_vduz1
+lda {z1}
+tax
+//FRAGMENT vbuyy=_byte_vduz1
+lda {z1}
+tay
+//FRAGMENT vbuz1=vbuaa_rol_2
+asl
+asl
+sta {z1}
+//FRAGMENT vbuz1=vbuxx_rol_2
+txa
+asl
+asl
+sta {z1}
+//FRAGMENT vbuz1=vbuyy_rol_2
+tya
+asl
+asl
+sta {z1}
+//FRAGMENT vbuaa=vbuz1_rol_2
+lda {z1}
+asl
+asl
+//FRAGMENT vbuaa=vbuaa_rol_2
+asl
+asl
+//FRAGMENT vbuaa=vbuxx_rol_2
+txa
+asl
+asl
+//FRAGMENT vbuaa=vbuyy_rol_2
+tya
+asl
+asl
+//FRAGMENT vbuxx=vbuz1_rol_2
+lda {z1}
+asl
+asl
+tax
+//FRAGMENT vbuxx=vbuaa_rol_2
+asl
+asl
+tax
+//FRAGMENT vbuxx=vbuxx_rol_2
+txa
+asl
+asl
+tax
+//FRAGMENT vbuxx=vbuyy_rol_2
+tya
+asl
+asl
+tax
+//FRAGMENT vbuyy=vbuz1_rol_2
+lda {z1}
+asl
+asl
+tay
+//FRAGMENT vbuyy=vbuaa_rol_2
+asl
+asl
+tay
+//FRAGMENT vbuyy=vbuxx_rol_2
+txa
+asl
+asl
+tay
+//FRAGMENT vbuyy=vbuyy_rol_2
+tya
+asl
+asl
+tay
+//FRAGMENT vduz1=pduc1_derefidx_vbuaa
+tay
+lda {c1},y
+sta {z1}
+lda {c1}+1,y
+sta {z1}+1
+lda {c1}+2,y
+sta {z1}+2
+lda {c1}+3,y
+sta {z1}+3
+//FRAGMENT vduz1=pduc1_derefidx_vbuxx
+lda {c1},x
+sta {z1}
+lda {c1}+1,x
+sta {z1}+1
+lda {c1}+2,x
+sta {z1}+2
+lda {c1}+3,x
+sta {z1}+3
+//FRAGMENT vduz1=pduc1_derefidx_vbuyy
+lda {c1},y
+sta {z1}
+lda {c1}+1,y
+sta {z1}+1
+lda {c1}+2,y
+sta {z1}+2
+lda {c1}+3,y
+sta {z1}+3
+//FRAGMENT _deref_pbuc1=vbuaa
+sta {c1}
+//FRAGMENT vbuaa=vbuz1_bxor_vbuc1
+lda #{c1}
+eor {z1}
+//FRAGMENT vbuxx=vbuz1_bxor_vbuc1
+lda #{c1}
+eor {z1}
+tax
+//FRAGMENT vbuyy=vbuz1_bxor_vbuc1
+lda #{c1}
+eor {z1}
+tay
+//FRAGMENT vbuz1=vbuxx_bxor_vbuc1
+txa
+eor #{c1}
+sta {z1}
+//FRAGMENT vbuaa=vbuxx_bxor_vbuc1
+txa
+eor #{c1}
+//FRAGMENT vbuxx=vbuxx_bxor_vbuc1
+txa
+eor #{c1}
+tax
+//FRAGMENT vbuyy=vbuxx_bxor_vbuc1
+txa
+eor #{c1}
+tay
+//FRAGMENT vbuz1=vbuyy_bxor_vbuc1
+tya
+eor #{c1}
+sta {z1}
+//FRAGMENT vbuaa=vbuyy_bxor_vbuc1
+tya
+eor #{c1}
+//FRAGMENT vbuxx=vbuyy_bxor_vbuc1
+tya
+eor #{c1}
+tax
+//FRAGMENT vbuyy=vbuyy_bxor_vbuc1
+tya
+eor #{c1}
+tay
+//FRAGMENT _deref_(_deref_qbuc1)=vbuaa
+ldy {c1}
+sty $fe
+ldy {c1}+1
+sty $ff
+ldy #0
+sta ($fe),y
+//FRAGMENT _deref_(_deref_qbuc1)=vbuxx
+txa
+ldy {c1}
+sty $fe
+ldy {c1}+1
+sty $ff
+ldy #0
+sta ($fe),y
+//FRAGMENT _deref_(_deref_qbuc1)=vbuyy
+tya
+ldy {c1}
+sty $fe
+ldy {c1}+1
+sty $ff
+ldy #0
+sta ($fe),y
+//FRAGMENT _deref_pbuc1=vbuxx
+stx {c1}
+//FRAGMENT _deref_pbuc1=vbuyy
+sty {c1}
+//FRAGMENT 0_neq_vbuyy_then_la1
+cpy #0
+bne {la1}
+//FRAGMENT 0_eq_vbuxx_then_la1
+cpx #0
+beq {la1}
+//FRAGMENT vbuyy=_deref_pbuc1
+ldy {c1}
+//FRAGMENT 0_eq_vbuyy_then_la1
+cpy #0
+beq {la1}
+//FRAGMENT vwuz1=_deref_pwuz1
+ldy #0
+lda ({z1}),y
+pha
+iny
+lda ({z1}),y
+sta {z1}+1
+pla
+sta {z1}
+//FRAGMENT pbuz1=pbuz2_plus_vwuz1
+lda {z1}
+clc
+adc {z2}
+sta {z1}
+lda {z1}+1
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT vwuz1=_deref_pwuz1_plus__deref_pwuz2
+ldy #0
+clc
+lda ({z1}),y
+adc ({z2}),y
+pha
+iny
+lda ({z1}),y
+adc ({z2}),y
+sta {z1}+1
+pla
+sta {z1}
+//FRAGMENT vwuz1=vwuz2_plus__deref_pwuz1
+ldy #0
+clc
+lda ({z1}),y
+adc {z2}
+pha
+iny
+lda ({z1}),y
+adc {z2}+1
+sta {z1}+1
+pla
+sta {z1}
+//FRAGMENT vwuz1=vwuz2_plus_vwuz1
+lda {z1}
+clc
+adc {z2}
+sta {z1}
+lda {z1}+1
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT pbuz1=_deref_qbuc1_plus_vwuz1
+clc
+lda {z1}
+adc {c1}
+sta {z1}
+lda {z1}+1
+adc {c1}+1
+sta {z1}+1
+//FRAGMENT pwuz1=pwuc1_plus_vwuz1
+clc
+lda {z1}
+adc #<{c1}
+sta {z1}
+lda {z1}+1
+adc #>{c1}
+sta {z1}+1
+//FRAGMENT pbuz1=pbuz1_plus_vwuc1
+clc
+lda {z1}
+adc #<{c1}
+sta {z1}
+lda {z1}+1
+adc #>{c1}
+sta {z1}+1
+//FRAGMENT pbuz1=pbuz1_plus__deref_pwuc1
+clc
+lda {c1}
+adc {z1}
+sta {z1}
+lda {c1}+1
+adc {z1}+1
+sta {z1}+1
 //FRAGMENT vbuz1=vbuz2_minus_1
 ldx {z2}
 dex
@@ -1462,32 +2230,11 @@ bcc {la1}
 lda {z2}
 cmp {z1}
 bcs {la1}
-//FRAGMENT vbuz1_eq_vbuc1_then_la1
-lda #{c1}
-cmp {z1}
-beq {la1}
 //FRAGMENT _deref_pbuz1_neq_vbuz2_then_la1
 ldy #0
 lda ({z1}),y
 cmp {z2}
 bne {la1}
-//FRAGMENT vwuz1=vwuz2_rol_2
-lda {z2}
-asl
-sta {z1}
-lda {z2}+1
-rol
-sta {z1}+1
-asl {z1}
-rol {z1}+1
-//FRAGMENT vwuz1=vwuz2_plus_vwuz3
-lda {z2}
-clc
-adc {z3}
-sta {z1}
-lda {z2}+1
-adc {z3}+1
-sta {z1}+1
 //FRAGMENT pbuz1=pbuc1_plus_vwuz2
 clc
 lda {z2}
@@ -1500,75 +2247,14 @@ sta {z1}+1
 lda #{c1}
 ldy {z2}
 sta ({z1}),y
-//FRAGMENT vbuc1_neq_vbuz1_then_la1
-lda #{c1}
-cmp {z1}
-bne {la1}
 //FRAGMENT vbuz1_le_vbuc1_then_la1
 lda #{c1}
 cmp {z1}
 bcs {la1}
-//FRAGMENT _deref_qbuc1=pbuz1
-lda {z1}
-sta {c1}
-lda {z1}+1
-sta {c1}+1
-//FRAGMENT vbuz1=vbuz2_rol_2
-lda {z2}
-asl
-asl
-sta {z1}
-//FRAGMENT vbuz1=vbuz2_rol_1
-lda {z2}
-asl
-sta {z1}
 //FRAGMENT pbuz1_derefidx_vbuz2=vbuz3
 lda {z3}
 ldy {z2}
 sta ({z1}),y
-//FRAGMENT vbuz1=_byte_vwuz2
-lda {z2}
-sta {z1}
-//FRAGMENT _deref_pbuz1=pbuc1_derefidx_vbuz2
-ldy {z2}
-lda {c1},y
-ldy #0
-sta ({z1}),y
-//FRAGMENT pbuz1=_inc_pbuz2
-clc
-lda {z2}
-adc #1
-sta {z1}
-lda {z2}+1
-adc #0
-sta {z1}+1
-//FRAGMENT vwuz1=pwuc1_derefidx_vbuz2
-ldy {z2}
-lda {c1},y
-sta {z1}
-lda {c1}+1,y
-sta {z1}+1
-//FRAGMENT vwuz1_ge_vwuz2_then_la1
-lda {z2}+1
-cmp {z1}+1
-bne !+
-lda {z2}
-cmp {z1}
-beq {la1}
-!:
-bcc {la1}
-//FRAGMENT vbuc1_eq_vbuz1_then_la1
-lda #{c1}
-cmp {z1}
-beq {la1}
-//FRAGMENT vwuz1=vwuz1_minus_vwuz2
-lda {z1}
-sec
-sbc {z2}
-sta {z1}
-lda {z1}+1
-sbc {z2}+1
-sta {z1}+1
 //FRAGMENT pvoz1=pvoc1
 lda #<{c1}
 sta {z1}
@@ -1582,38 +2268,6 @@ sta {z1}
 lda {z1}+1
 sbc #0
 sta {z1}+1
-//FRAGMENT pbuz1=pbuz2_plus_vwuc1
-clc
-lda {z2}
-adc #<{c1}
-sta {z1}
-lda {z2}+1
-adc #>{c1}
-sta {z1}+1
-//FRAGMENT pbuz1_neq_pbuz2_then_la1
-lda {z1}+1
-cmp {z2}+1
-bne {la1}
-lda {z1}
-cmp {z2}
-bne {la1}
-//FRAGMENT _deref_pbuz1=_deref_pbuz2
-ldy #0
-lda ({z2}),y
-ldy #0
-sta ({z1}),y
-//FRAGMENT pbuz1=pbuz2_plus_vbuc1
-lda #{c1}
-clc
-adc {z2}
-sta {z1}
-lda #0
-adc {z2}+1
-sta {z1}+1
-//FRAGMENT vbuaa=_deref_pbuc1
-lda {c1}
-//FRAGMENT vbuxx=_deref_pbuc1
-ldx {c1}
 //FRAGMENT vbuaa=vbuz1_minus_1
 lda {z1}
 sec
@@ -1722,65 +2376,10 @@ sta ({z1}),y
 //FRAGMENT pbuz1_derefidx_vbuyy=vbuc1
 lda #{c1}
 sta ({z1}),y
-//FRAGMENT vbuc1_neq_vbuaa_then_la1
-cmp #{c1}
-bne {la1}
 //FRAGMENT vbuaa_le_vbuc1_then_la1
 cmp #{c1}
 bcc {la1}
 beq {la1}
-//FRAGMENT vbuaa=vbuz1_rol_2
-lda {z1}
-asl
-asl
-//FRAGMENT vbuxx=vbuz1_rol_2
-lda {z1}
-asl
-asl
-tax
-//FRAGMENT vbuyy=vbuz1_rol_2
-lda {z1}
-asl
-asl
-tay
-//FRAGMENT vbuz1=vbuxx_rol_2
-txa
-asl
-asl
-sta {z1}
-//FRAGMENT vbuaa=vbuxx_rol_2
-txa
-asl
-asl
-//FRAGMENT vbuxx=vbuxx_rol_2
-txa
-asl
-asl
-tax
-//FRAGMENT vbuyy=vbuxx_rol_2
-txa
-asl
-asl
-tay
-//FRAGMENT vbuz1=vbuyy_rol_2
-tya
-asl
-asl
-sta {z1}
-//FRAGMENT vbuaa=vbuyy_rol_2
-tya
-asl
-asl
-//FRAGMENT vbuxx=vbuyy_rol_2
-tya
-asl
-asl
-tax
-//FRAGMENT vbuyy=vbuyy_rol_2
-tya
-asl
-asl
-tay
 //FRAGMENT vbuz1=vbuaa_plus_vbuz2
 clc
 adc {z2}
@@ -1834,58 +2433,6 @@ sty $ff
 clc
 adc $ff
 tay
-//FRAGMENT vbuz1=vbuaa_rol_1
-asl
-sta {z1}
-//FRAGMENT vbuz1=vbuxx_rol_1
-txa
-asl
-sta {z1}
-//FRAGMENT vbuz1=vbuyy_rol_1
-tya
-asl
-sta {z1}
-//FRAGMENT vbuaa=vbuz1_rol_1
-lda {z1}
-asl
-//FRAGMENT vbuaa=vbuaa_rol_1
-asl
-//FRAGMENT vbuaa=vbuxx_rol_1
-txa
-asl
-//FRAGMENT vbuaa=vbuyy_rol_1
-tya
-asl
-//FRAGMENT vbuxx=vbuz1_rol_1
-lda {z1}
-asl
-tax
-//FRAGMENT vbuxx=vbuaa_rol_1
-asl
-tax
-//FRAGMENT vbuxx=vbuxx_rol_1
-txa
-asl
-tax
-//FRAGMENT vbuxx=vbuyy_rol_1
-tya
-asl
-tax
-//FRAGMENT vbuyy=vbuz1_rol_1
-lda {z1}
-asl
-tay
-//FRAGMENT vbuyy=vbuaa_rol_1
-asl
-tay
-//FRAGMENT vbuyy=vbuxx_rol_1
-txa
-asl
-tay
-//FRAGMENT vbuyy=vbuyy_rol_1
-tya
-asl
-tay
 //FRAGMENT vbuaa_eq_vbuc1_then_la1
 cmp #{c1}
 beq {la1}
@@ -1900,49 +2447,6 @@ sta ({z1}),y
 tya
 ldy {z2}
 sta ({z1}),y
-//FRAGMENT vbuaa=_byte_vwuz1
-lda {z1}
-//FRAGMENT vbuxx=_byte_vwuz1
-lda {z1}
-tax
-//FRAGMENT vbuyy=_byte_vwuz1
-lda {z1}
-tay
-//FRAGMENT _deref_pbuz1=pbuc1_derefidx_vbuaa
-tay
-lda {c1},y
-ldy #0
-sta ({z1}),y
-//FRAGMENT _deref_pbuz1=pbuc1_derefidx_vbuxx
-lda {c1},x
-ldy #0
-sta ({z1}),y
-//FRAGMENT _deref_pbuz1=pbuc1_derefidx_vbuyy
-lda {c1},y
-ldy #0
-sta ({z1}),y
-//FRAGMENT vwuz1=pwuc1_derefidx_vbuaa
-tay
-lda {c1},y
-sta {z1}
-lda {c1}+1,y
-sta {z1}+1
-//FRAGMENT vwuz1=pwuc1_derefidx_vbuxx
-lda {c1},x
-sta {z1}
-lda {c1}+1,x
-sta {z1}+1
-//FRAGMENT vwuz1=pwuc1_derefidx_vbuyy
-lda {c1},y
-sta {z1}
-lda {c1}+1,y
-sta {z1}+1
-//FRAGMENT vbuc1_neq_vbuxx_then_la1
-cpx #{c1}
-bne {la1}
-//FRAGMENT vbuc1_eq_vbuaa_then_la1
-cmp #{c1}
-beq {la1}
 //FRAGMENT vbuxx_le_vbuc1_then_la1
 cpx #{c1}
 bcc {la1}
@@ -1954,9 +2458,6 @@ beq {la1}
 cpy #{c1}
 bcc {la1}
 beq {la1}
-//FRAGMENT vbuc1_neq_vbuyy_then_la1
-cpy #{c1}
-bne {la1}
 //FRAGMENT vbuxx=vbuz1_minus_1
 ldx {z1}
 dex
@@ -1964,26 +2465,10 @@ dex
 lda {z1}
 tay
 dey
-//FRAGMENT vbuc1_eq_vbuxx_then_la1
-cpx #{c1}
-beq {la1}
-//FRAGMENT vbuyy=_deref_pbuc1
-ldy {c1}
-//FRAGMENT vbuc1_eq_vbuyy_then_la1
-cpy #{c1}
-beq {la1}
 //FRAGMENT vbuz1=vbuz1_plus_vbuaa
 clc
 adc {z1}
 sta {z1}
-//FRAGMENT vwuz1=vwuz2_plus_vwuz1
-lda {z1}
-clc
-adc {z2}
-sta {z1}
-lda {z1}+1
-adc {z2}+1
-sta {z1}+1
 //FRAGMENT pbuz1=pbuc1_plus_vwuz1
 clc
 lda {z1}
@@ -1992,11 +2477,6 @@ sta {z1}
 lda {z1}+1
 adc #>{c1}
 sta {z1}+1
-//FRAGMENT pvoz1=_deref_qvoc1
-lda {c1}
-sta {z1}
-lda {c1}+1
-sta {z1}+1
 //FRAGMENT pbuz1_derefidx_vbuz2_neq_vbuc1_then_la1
 ldy {z2}
 lda ({z1}),y
@@ -2028,110 +2508,6 @@ sta {z1}
 bcc !+
 inc {z1}+1
 !:
-//FRAGMENT vwuz1_le_0_then_la1
-lda {z1}
-bne !+
-lda {z1}+1
-beq {la1}
-!:
-//FRAGMENT pbuz1=pbuz2_plus_vwuz3
-lda {z2}
-clc
-adc {z3}
-sta {z1}
-lda {z2}+1
-adc {z3}+1
-sta {z1}+1
-//FRAGMENT _deref_pwuc1=vbuc2
-lda #0
-sta {c1}+1
-lda #<{c2}
-sta {c1}
-//FRAGMENT vbuz1=pbuc1_derefidx_(_deref_pbuc2)
-ldy {c2}
-lda {c1},y
-sta {z1}
-//FRAGMENT _deref_pwuc1=_inc__deref_pwuc1
-inc {c1}
-bne !+
-inc {c1}+1
-!:
-//FRAGMENT _deref_pwuc1_eq_vbuc2_then_la1
-lda {c1}+1
-bne !+
-lda {c1}
-cmp #{c2}
-beq {la1}
-!:
-//FRAGMENT _deref_(_deref_qbuc1)=_deref_pbuc2
-lda {c2}
-ldy {c1}
-sty $fe
-ldy {c1}+1
-sty $ff
-ldy #0
-sta ($fe),y
-//FRAGMENT _deref_pbuc1=vbuz1
-lda {z1}
-sta {c1}
-//FRAGMENT vbuz1=vbuz2_bxor_vbuc1
-lda #{c1}
-eor {z2}
-sta {z1}
-//FRAGMENT _deref_(_deref_qbuc1)=vbuz1
-lda {z1}
-ldy {c1}
-sty $fe
-ldy {c1}+1
-sty $ff
-ldy #0
-sta ($fe),y
-//FRAGMENT _deref_pbuc1=_inc__deref_pbuc1
-inc {c1}
-//FRAGMENT _deref_pbuc1_neq_vbuc2_then_la1
-lda #{c2}
-cmp {c1}
-bne {la1}
-//FRAGMENT _deref_(_deref_qbuc1)=_deref_(_deref_qbuc1)_bxor_vbuc2
-ldy {c1}
-sty $fe
-ldy {c1}+1
-sty $ff
-ldy #0
-lda ($fe),y
-eor #{c2}
-sta ($fe),y
-//FRAGMENT pbuz1=_deref_qbuc1
-lda {c1}
-sta {z1}
-lda {c1}+1
-sta {z1}+1
-//FRAGMENT pvoz1=pvoz2
-lda {z2}
-sta {z1}
-lda {z2}+1
-sta {z1}+1
-//FRAGMENT vwuz1=_word__deref_pbuc1
-lda {c1}
-sta {z1}
-lda #0
-sta {z1}+1
-//FRAGMENT pbuz1=_deref_qbuc1_plus_vwuz2
-clc
-lda {z2}
-adc {c1}
-sta {z1}
-lda {z2}+1
-adc {c1}+1
-sta {z1}+1
-//FRAGMENT pbuz1=pbuz2_plus__deref_pwuc1
-clc
-lda {c1}
-adc {z2}
-sta {z1}
-lda {c1}+1
-adc {z2}+1
-sta {z1}+1
 //FRAGMENT pbuz1_derefidx_vbuxx_neq_vbuc1_then_la1
 txa
 tay
@@ -2193,131 +2569,20 @@ sta {z1}
 bcc !+
 inc {z1}+1
 !:
-//FRAGMENT vbuaa=pbuc1_derefidx_(_deref_pbuc2)
-ldy {c2}
-lda {c1},y
-//FRAGMENT vbuxx=pbuc1_derefidx_(_deref_pbuc2)
-ldy {c2}
-ldx {c1},y
-//FRAGMENT vbuyy=pbuc1_derefidx_(_deref_pbuc2)
-ldx {c2}
-ldy {c1},x
-//FRAGMENT _deref_pbuc1=vbuaa
-sta {c1}
-//FRAGMENT vbuaa=vbuz1_bxor_vbuc1
-lda #{c1}
-eor {z1}
-//FRAGMENT vbuxx=vbuz1_bxor_vbuc1
-lda #{c1}
-eor {z1}
-tax
-//FRAGMENT vbuyy=vbuz1_bxor_vbuc1
-lda #{c1}
-eor {z1}
-tay
-//FRAGMENT vbuz1=vbuxx_bxor_vbuc1
-txa
-eor #{c1}
-sta {z1}
-//FRAGMENT vbuaa=vbuxx_bxor_vbuc1
-txa
-eor #{c1}
-//FRAGMENT vbuxx=vbuxx_bxor_vbuc1
-txa
-eor #{c1}
-tax
-//FRAGMENT vbuyy=vbuxx_bxor_vbuc1
-txa
-eor #{c1}
-tay
-//FRAGMENT vbuz1=vbuyy_bxor_vbuc1
-tya
-eor #{c1}
-sta {z1}
-//FRAGMENT vbuaa=vbuyy_bxor_vbuc1
-tya
-eor #{c1}
-//FRAGMENT vbuxx=vbuyy_bxor_vbuc1
-tya
-eor #{c1}
-tax
-//FRAGMENT vbuyy=vbuyy_bxor_vbuc1
-tya
-eor #{c1}
-tay
-//FRAGMENT _deref_(_deref_qbuc1)=vbuaa
-ldy {c1}
-sty $fe
-ldy {c1}+1
-sty $ff
-ldy #0
-sta ($fe),y
-//FRAGMENT _deref_(_deref_qbuc1)=vbuxx
-txa
-ldy {c1}
-sty $fe
-ldy {c1}+1
-sty $ff
-ldy #0
-sta ($fe),y
-//FRAGMENT _deref_(_deref_qbuc1)=vbuyy
-tya
-ldy {c1}
-sty $fe
-ldy {c1}+1
-sty $ff
-ldy #0
-sta ($fe),y
-//FRAGMENT _deref_pbuc1=vbuxx
-stx {c1}
-//FRAGMENT _deref_pbuc1=vbuyy
-sty {c1}
-//FRAGMENT pbuz1=pbuz2_plus_vwuz1
-lda {z1}
-clc
-adc {z2}
-sta {z1}
-lda {z1}+1
-adc {z2}+1
-sta {z1}+1
-//FRAGMENT pbuz1=_deref_qbuc1_plus_vwuz1
-clc
-lda {z1}
-adc {c1}
-sta {z1}
-lda {z1}+1
-adc {c1}+1
-sta {z1}+1
-//FRAGMENT pbuz1=pbuz1_plus_vwuc1
-clc
-lda {z1}
-adc #<{c1}
-sta {z1}
-lda {z1}+1
-adc #>{c1}
-sta {z1}+1
-//FRAGMENT pbuz1=pbuz1_plus__deref_pwuc1
-clc
-lda {c1}
-adc {z1}
-sta {z1}
-lda {c1}+1
-adc {z1}+1
-sta {z1}+1
 //FRAGMENT _deref_pbuz1_neq_vbuc1_then_la1
 ldy #0
 lda ({z1}),y
 cmp #{c1}
 bne {la1}
-//FRAGMENT vbuc1_eq_pbuc2_derefidx_vbuz1_then_la1
+//FRAGMENT 0_eq_pbuc1_derefidx_vbuz1_then_la1
 ldy {z1}
-lda {c2},y
-cmp #{c1}
+lda {c1},y
+cmp #0
 beq {la1}
-//FRAGMENT vbuc1_eq__deref_pbuz1_then_la1
-lda #{c1}
+//FRAGMENT 0_eq__deref_pbuz1_then_la1
 ldy #0
-cmp ({z1}),y
+lda ({z1}),y
+cmp #0
 beq {la1}
 //FRAGMENT _deref_pbuz1_eq_vbuc1_then_la1
 lda #{c1}
@@ -2335,18 +2600,18 @@ tay
 stx $ff
 cpy $ff
 bne {la1}
-//FRAGMENT vbuc1_eq_pbuc2_derefidx_vbuaa_then_la1
+//FRAGMENT 0_eq_pbuc1_derefidx_vbuaa_then_la1
 tay
-lda {c2},y
-cmp #{c1}
+lda {c1},y
+cmp #0
 beq {la1}
-//FRAGMENT vbuc1_eq_pbuc2_derefidx_vbuxx_then_la1
-lda {c2},x
-cmp #{c1}
+//FRAGMENT 0_eq_pbuc1_derefidx_vbuxx_then_la1
+lda {c1},x
+cmp #0
 beq {la1}
-//FRAGMENT vbuc1_eq_pbuc2_derefidx_vbuyy_then_la1
-lda {c2},y
-cmp #{c1}
+//FRAGMENT 0_eq_pbuc1_derefidx_vbuyy_then_la1
+lda {c1},y
+cmp #0
 beq {la1}
 //FRAGMENT vbuaa_neq_vbuc1_then_la1
 cmp #{c1}
@@ -2400,11 +2665,11 @@ bcs {la1}
 //FRAGMENT vbuyy_ge_vbuc1_then_la1
 cpy #{c1}
 bcs {la1}
-//FRAGMENT vbuc1_neq_pbuz1_derefidx_vbuz2_then_la1
+//FRAGMENT 0_neq_pbuz1_derefidx_vbuz2_then_la1
 ldy {z2}
 lda ({z1}),y
 
-cmp #{c1}
+cmp #0
 bne {la1}
 //FRAGMENT vbuaa=pbuz1_derefidx_vbuz2
 ldy {z2}
@@ -2413,23 +2678,23 @@ lda ({z1}),y
 stx $ff
 ldy $ff
 sta ({z1}),y
-//FRAGMENT vbuc1_neq_pbuz1_derefidx_vbuaa_then_la1
+//FRAGMENT 0_neq_pbuz1_derefidx_vbuaa_then_la1
 tay
 lda ({z1}),y
 
-cmp #{c1}
+cmp #0
 bne {la1}
-//FRAGMENT vbuc1_neq_pbuz1_derefidx_vbuxx_then_la1
+//FRAGMENT 0_neq_pbuz1_derefidx_vbuxx_then_la1
 txa
 tay
 lda ({z1}),y
 
-cmp #{c1}
+cmp #0
 bne {la1}
-//FRAGMENT vbuc1_neq_pbuz1_derefidx_vbuyy_then_la1
+//FRAGMENT 0_neq_pbuz1_derefidx_vbuyy_then_la1
 lda ({z1}),y
 
-cmp #{c1}
+cmp #0
 bne {la1}
 //FRAGMENT vbuaa=pbuz1_derefidx_vbuxx
 txa
@@ -3021,21 +3286,6 @@ sta {z1}
 lda #0
 adc {z2}+1
 sta {z1}+1
-//FRAGMENT vbuz1=vbuaa_rol_2
-asl
-asl
-sta {z1}
-//FRAGMENT vbuaa=vbuaa_rol_2
-asl
-asl
-//FRAGMENT vbuxx=vbuaa_rol_2
-asl
-asl
-tax
-//FRAGMENT vbuyy=vbuaa_rol_2
-asl
-asl
-tay
 //FRAGMENT pbuz1_derefidx_vbuc1=pbuc2_derefidx_vbuxx
 lda {c2},x
 ldy #{c1}
@@ -4305,6 +4555,142 @@ lda #<{c1}
 sta {z1}
 lda #>{c1}
 sta {z1}+1
+//FRAGMENT _deref_pwsc1=vbsc2
+NO_SYNTHESIS
+//FRAGMENT _deref_pwsc1=vwuc2
+NO_SYNTHESIS
+//FRAGMENT _deref_pwsc1=vwsc2
+lda #<{c2}
+sta {c1}
+lda #>{c2}
+sta {c1}+1
+//FRAGMENT vwsz1=vbsc1
+lda #<{c1}
+sta {z1}
+lda #>{c1}
+sta {z1}+1
+//FRAGMENT pwsz1=pwsc1_plus_vwsz2
+clc
+lda {z2}
+adc #<{c1}
+sta {z1}
+lda {z2}+1
+adc #>{c1}
+sta {z1}+1
+//FRAGMENT vwsz1=_deref_pwsz2
+ldy #0
+lda ({z2}),y
+sta {z1}
+iny
+lda ({z2}),y
+sta {z1}+1
+//FRAGMENT vdsz1=vdsz2
+lda {z2}
+sta {z1}
+lda {z2}+1
+sta {z1}+1
+lda {z2}+2
+sta {z1}+2
+lda {z2}+3
+sta {z1}+3
+//FRAGMENT vwsz1=_sword_vdsz2
+lda {z2}
+sta {z1}
+lda {z2}+1
+sta {z1}+1
+//FRAGMENT vwsz1_le_vwsz2_then_la1
+lda {z2}
+cmp {z1}
+lda {z2}+1
+sbc {z1}+1
+bvc !+
+eor #$80
+!:
+bpl {la1}
+//FRAGMENT vwsz1=_inc_vwsz1
+inc {z1}
+bne !+
+inc {z1}+1
+!:
+//FRAGMENT vwsz1_neq_0_then_la1
+lda {z1}+1
+ora {z1}
+bne {la1}
+//FRAGMENT _deref_pwsz1=vwsz2
+ldy #0
+lda {z2}
+sta ({z1}),y
+iny
+lda {z2}+1
+sta ({z1}),y
+//FRAGMENT vwsz1_lt_vwsc1_then_la1
+lda {z1}
+cmp #<{c1}
+lda {z1}+1
+sbc #>{c1}
+bvc !+
+eor #$80
+!:
+bmi {la1}
+//FRAGMENT vwsz1_ge_0_then_la1
+lda {z1}+1
+bpl {la1}
+//FRAGMENT vwuz1=_hi_vduz2
+lda {z2}+2
+sta {z1}
+lda {z2}+3
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz2_minus_vwuz3
+lda {z2}
+sec
+sbc {z3}
+sta {z1}
+lda {z2}+1
+sbc {z3}+1
+sta {z1}+1
+//FRAGMENT vduz1=vduz1_sethi_vwuz2
+lda {z2}
+sta {z1}+2
+lda {z2}+1
+sta {z1}+3
+//FRAGMENT vwsz1=_neg_vwsz2
+sec
+lda #0
+sbc {z2}
+sta {z1}
+lda #0
+sbc {z2}+1
+sta {z1}+1
+//FRAGMENT vbuz1=vbuz1_bxor_vbuc1
+lda #{c1}
+eor {z1}
+sta {z1}
+//FRAGMENT vwuz1_lt_vwuz2_then_la1
+lda {z1}+1
+cmp {z2}+1
+bcc {la1}
+bne !+
+lda {z1}
+cmp {z2}
+bcc {la1}
+!:
+//FRAGMENT pwsz1=pwsc1_plus_vwsz1
+clc
+lda {z1}
+adc #<{c1}
+sta {z1}
+lda {z1}+1
+adc #>{c1}
+sta {z1}+1
+//FRAGMENT vwsz1=_deref_pwsz1
+ldy #0
+lda ({z1}),y
+pha
+iny
+lda ({z1}),y
+sta {z1}+1
+pla
+sta {z1}
 //FRAGMENT pprz1=pprz2
 lda {z2}
 sta {z1}
@@ -4353,10 +4739,10 @@ ldy {z2}
 lda {c2},y
 ldy {z1}
 sta {c1},y
-//FRAGMENT vbuc1_neq_pbuc2_derefidx_vbuz1_then_la1
-lda #{c1}
+//FRAGMENT 0_neq_pbuc1_derefidx_vbuz1_then_la1
 ldy {z1}
-cmp {c2},y
+lda {c1},y
+cmp #0
 bne {la1}
 //FRAGMENT pbuc1_derefidx_vbuz1=pbuc2_derefidx_vbuaa
 tay
@@ -4371,9 +4757,9 @@ sta {c1},y
 lda {c2},y
 ldy {z1}
 sta {c1},y
-//FRAGMENT vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1
-lda {c2},x
-cmp #{c1}
+//FRAGMENT 0_neq_pbuc1_derefidx_vbuxx_then_la1
+lda {c1},x
+cmp #0
 bne {la1}
 //FRAGMENT pbuc1_derefidx_vbuz1=pbuz2_derefidx_vbuz3
 ldx {z1}
@@ -4775,15 +5161,6 @@ ldx {c1}+1
 ldy {c1}
 //FRAGMENT vbuyy=_hi__deref_pwuc1
 ldy {c1}+1
-//FRAGMENT vwsz1_lt_vwsc1_then_la1
-lda {z1}
-cmp #<{c1}
-lda {z1}+1
-sbc #>{c1}
-bvc !+
-eor #$80
-!:
-bmi {la1}
 //FRAGMENT pbuz1=pbuz2_plus_vwsz3
 lda {z2}
 clc
@@ -4802,15 +5179,6 @@ sta {z1}
 lda #>{c1}
 sbc {z2}+1
 sta {z1}+1 
-//FRAGMENT vwsz1_le_vwsz2_then_la1
-lda {z2}
-cmp {z1}
-lda {z2}+1
-sbc {z1}+1
-bvc !+
-eor #$80
-!:
-bpl {la1}
 //FRAGMENT vwsz1=vwsz1_minus_1
 sec
 lda {z1}
@@ -4868,11 +5236,6 @@ sta {z1}
 lda #>{c1}
 sbc {z2}+1
 sta {z1}+1
-//FRAGMENT vwsz1=_inc_vwsz1
-inc {z1}
-bne !+
-inc {z1}+1
-!:
 //FRAGMENT vwsz1_gt_vwsc1_then_la1
 lda #<{c1}
 cmp {z1}
@@ -5132,28 +5495,24 @@ lda #<{c2}
 sta {c1}
 lda #>{c2}
 sta {c1}+1
-//FRAGMENT vbuc1_eq_vwuz1_then_la1
-lda #{c1}
-cmp {z1}
-bne !+
-lda {z1}+1
-bne !+
-jmp {la1}
-!:
+//FRAGMENT 0_eq_vwuz1_then_la1
+lda {z1}
+ora {z1}+1
+beq {la1}
 //FRAGMENT vwuz1=_dec_vwuz1
 lda {z1}
 bne !+
 dec {z1}+1
 !:
 dec {z1}
-//FRAGMENT vbuc1_neq_pbuc2_derefidx_vbuaa_then_la1
+//FRAGMENT 0_neq_pbuc1_derefidx_vbuaa_then_la1
 tay
-lda #{c1}
-cmp {c2},y
+lda {c1},y
+cmp #0
 bne {la1}
-//FRAGMENT vbuc1_neq_pbuc2_derefidx_vbuyy_then_la1
-lda #{c1}
-cmp {c2},y
+//FRAGMENT 0_neq_pbuc1_derefidx_vbuyy_then_la1
+lda {c1},y
+cmp #0
 bne {la1}
 //FRAGMENT _deref_pwuc1=_deref_pwuc2
 lda {c2}
@@ -5476,10 +5835,446 @@ sta {z1}
 lda {c1}+1
 adc #>{c2}
 sta {z1}+1
-//FRAGMENT vbuc1_neq__deref_pbuc2_then_la1
-lda #{c1}
-cmp {c2}
+//FRAGMENT 0_neq__deref_pbuc1_then_la1
+lda {c1}
+cmp #0
 bne {la1}
+//FRAGMENT vwuz1=vbuz2_word_vbuc1
+lda {z2}
+ldy #{c1}
+sta {z1}+1
+sty {z1}
+//FRAGMENT vwuz1=vwuz2_plus_vbuc1
+lda #{c1}
+clc
+adc {z2}
+sta {z1}
+lda #0
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT vbuz1=vbuz2_minus__deref_pbuz3
+lda {z2}
+sec
+ldy #0
+sbc ({z3}),y
+sta {z1}
+//FRAGMENT vbsz1=_inc_vbsz1
+inc {z1}
+//FRAGMENT vbsz1_neq_vbsc1_then_la1
+lda #{c1}
+cmp {z1}
+bne {la1}
+//FRAGMENT vbuz1=pbuz2_derefidx_vbuz3_rol_4
+ldy {z3}
+lda ({z2}),y
+asl
+asl
+asl
+asl
+sta {z1}
+//FRAGMENT vbuz1=pbuz2_derefidx_vbuz3_rol_1
+ldy {z3}
+lda ({z2}),y
+asl
+sta {z1}
+//FRAGMENT vwuz1=vwuz2_ror_1
+lda {z2}+1
+lsr
+sta {z1}+1
+lda {z2}
+ror
+sta {z1}
+//FRAGMENT vwuz1=_neg_vwuz1
+sec
+lda #0
+sbc {z1}
+sta {z1}
+lda #0
+sbc {z1}+1
+sta {z1}+1
+//FRAGMENT vwsz1=vwsz1_ror_1
+lda {z1}+1
+cmp #$80
+ror {z1}+1
+ror {z1}
+//FRAGMENT vwsz1=vwsz1_minus_vwsz2
+lda {z1}
+sec
+sbc {z2}
+sta {z1}
+lda {z1}+1
+sbc {z2}+1
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz1_minus_pwuc1_derefidx_vbuz2
+ldy {z2}
+sec
+lda {z1}
+sbc {c1},y
+sta {z1}
+lda {z1}+1
+sbc {c1}+1,y
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz1_plus_pwuc1_derefidx_vbuz2
+ldy {z2}
+clc
+lda {z1}
+adc {c1},y
+sta {z1}
+lda {z1}+1
+adc {c1}+1,y
+sta {z1}+1
+//FRAGMENT vwsz1=vwsz1_ror_2
+lda {z1}+1
+cmp #$80
+ror {z1}+1
+ror {z1}
+lda {z1}+1
+cmp #$80
+ror {z1}+1
+ror {z1}
+//FRAGMENT vbuz1=vbuz1_minus_2
+dec {z1}
+dec {z1}
+//FRAGMENT vwuz1=vbuaa_word_vbuc1
+ldy #{c1}
+sta {z1}+1
+sty {z1}
+//FRAGMENT vwuz1=vbuxx_word_vbuc1
+ldy #{c1}
+txa
+sta {z1}+1
+sty {z1}
+//FRAGMENT vwuz1=vbuyy_word_vbuc1
+tya
+ldy #{c1}
+sta {z1}+1
+sty {z1}
+//FRAGMENT vwuz1=vwuz1_plus_vbuaa
+clc
+adc {z1}
+sta {z1}
+bcc !+
+inc {z1}+1
+!:
+//FRAGMENT vbuz1=vbuxx_minus__deref_pbuz2
+txa
+sec
+ldy #0
+sbc ({z2}),y
+sta {z1}
+//FRAGMENT vbuaa=vbuz1_minus__deref_pbuz2
+lda {z1}
+sec
+ldy #0
+sbc ({z2}),y
+//FRAGMENT vbuaa=vbuxx_minus__deref_pbuz1
+txa
+sec
+ldy #0
+sbc ({z1}),y
+//FRAGMENT vbuxx=vbuz1_minus__deref_pbuz2
+lda {z1}
+sec
+ldy #0
+sbc ({z2}),y
+tax
+//FRAGMENT vbuxx=vbuxx_minus__deref_pbuz1
+txa
+sec
+ldy #0
+sbc ({z1}),y
+tax
+//FRAGMENT vbuyy=vbuz1_minus__deref_pbuz2
+lda {z1}
+sec
+ldy #0
+sbc ({z2}),y
+tay
+//FRAGMENT vbuyy=vbuxx_minus__deref_pbuz1
+txa
+sec
+ldy #0
+sbc ({z1}),y
+tay
+//FRAGMENT vbsxx_neq_vbsc1_then_la1
+cpx #{c1}
+bne {la1}
+//FRAGMENT vbuaa=pbuz1_derefidx_vbuz2_rol_4
+ldy {z2}
+lda ({z1}),y
+asl
+asl
+asl
+asl
+//FRAGMENT vbuxx=pbuz1_derefidx_vbuz2_rol_4
+ldy {z2}
+lda ({z1}),y
+asl
+asl
+asl
+asl
+tax
+//FRAGMENT vbuyy=pbuz1_derefidx_vbuz2_rol_4
+ldy {z2}
+lda ({z1}),y
+asl
+asl
+asl
+asl
+tay
+//FRAGMENT vbuz1=pbuz2_derefidx_vbuaa_rol_4
+tay
+lda ({z2}),y
+asl
+asl
+asl
+asl
+sta {z1}
+//FRAGMENT vbuaa=pbuz1_derefidx_vbuaa_rol_4
+tay
+lda ({z1}),y
+asl
+asl
+asl
+asl
+//FRAGMENT vbuxx=pbuz1_derefidx_vbuaa_rol_4
+tay
+lda ({z1}),y
+asl
+asl
+asl
+asl
+tax
+//FRAGMENT vbuyy=pbuz1_derefidx_vbuaa_rol_4
+tay
+lda ({z1}),y
+asl
+asl
+asl
+asl
+tay
+//FRAGMENT vbuz1=pbuz2_derefidx_vbuxx_rol_4
+txa
+tay
+lda ({z2}),y
+asl
+asl
+asl
+asl
+sta {z1}
+//FRAGMENT vbuaa=pbuz1_derefidx_vbuxx_rol_4
+txa
+tay
+lda ({z1}),y
+asl
+asl
+asl
+asl
+//FRAGMENT vbuxx=pbuz1_derefidx_vbuxx_rol_4
+txa
+tay
+lda ({z1}),y
+asl
+asl
+asl
+asl
+tax
+//FRAGMENT vbuyy=pbuz1_derefidx_vbuxx_rol_4
+txa
+tay
+lda ({z1}),y
+asl
+asl
+asl
+asl
+tay
+//FRAGMENT vbuz1=pbuz2_derefidx_vbuyy_rol_4
+lda ({z2}),y
+asl
+asl
+asl
+asl
+sta {z1}
+//FRAGMENT vbuaa=pbuz1_derefidx_vbuyy_rol_4
+lda ({z1}),y
+asl
+asl
+asl
+asl
+//FRAGMENT vbuxx=pbuz1_derefidx_vbuyy_rol_4
+lda ({z1}),y
+asl
+asl
+asl
+asl
+tax
+//FRAGMENT vbuyy=pbuz1_derefidx_vbuyy_rol_4
+lda ({z1}),y
+asl
+asl
+asl
+asl
+tay
+//FRAGMENT vbuaa=pbuz1_derefidx_vbuz2_rol_1
+ldy {z2}
+lda ({z1}),y
+asl
+//FRAGMENT vbuxx=pbuz1_derefidx_vbuz2_rol_1
+ldy {z2}
+lda ({z1}),y
+asl
+tax
+//FRAGMENT vbuyy=pbuz1_derefidx_vbuz2_rol_1
+ldy {z2}
+lda ({z1}),y
+asl
+tay
+//FRAGMENT vbuz1=pbuz2_derefidx_vbuxx_rol_1
+txa
+tay
+lda ({z2}),y
+asl
+sta {z1}
+//FRAGMENT vbuaa=pbuz1_derefidx_vbuxx_rol_1
+txa
+tay
+lda ({z1}),y
+asl
+//FRAGMENT vbuxx=pbuz1_derefidx_vbuxx_rol_1
+txa
+tay
+lda ({z1}),y
+asl
+tax
+//FRAGMENT vbuyy=pbuz1_derefidx_vbuxx_rol_1
+txa
+tay
+lda ({z1}),y
+asl
+tay
+//FRAGMENT vbuz1=pbuz2_derefidx_vbuyy_rol_1
+lda ({z2}),y
+asl
+sta {z1}
+//FRAGMENT vbuaa=pbuz1_derefidx_vbuyy_rol_1
+lda ({z1}),y
+asl
+//FRAGMENT vbuxx=pbuz1_derefidx_vbuyy_rol_1
+lda ({z1}),y
+asl
+tax
+//FRAGMENT vbuyy=pbuz1_derefidx_vbuyy_rol_1
+lda ({z1}),y
+asl
+tay
+//FRAGMENT pbuz1_derefidx_vbuxx=vbuz2
+txa
+tay
+lda {z2}
+sta ({z1}),y
+//FRAGMENT pbuz1_derefidx_vbuyy=vbuz2
+lda {z2}
+sta ({z1}),y
+//FRAGMENT vwuz1=vwuz1_minus_pwuc1_derefidx_vbuaa
+tay
+sec
+lda {z1}
+sbc {c1},y
+sta {z1}
+lda {z1}+1
+sbc {c1}+1,y
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz1_minus_pwuc1_derefidx_vbuxx
+sec
+lda {z1}
+sbc {c1},x
+sta {z1}
+lda {z1}+1
+sbc {c1}+1,x
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz1_minus_pwuc1_derefidx_vbuyy
+sec
+lda {z1}
+sbc {c1},y
+sta {z1}
+lda {z1}+1
+sbc {c1}+1,y
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz1_plus_pwuc1_derefidx_vbuaa
+tay
+clc
+lda {z1}
+adc {c1},y
+sta {z1}
+lda {z1}+1
+adc {c1}+1,y
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz1_plus_pwuc1_derefidx_vbuxx
+clc
+lda {z1}
+adc {c1},x
+sta {z1}
+lda {z1}+1
+adc {c1}+1,x
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz1_plus_pwuc1_derefidx_vbuyy
+clc
+lda {z1}
+adc {c1},y
+sta {z1}
+lda {z1}+1
+adc {c1}+1,y
+sta {z1}+1
+//FRAGMENT vbuz1_lt_vbuaa_then_la1
+cmp {z1}
+beq !+
+bcs {la1}
+!:
+//FRAGMENT vbuxx=vbuxx_minus_2
+dex
+dex
+//FRAGMENT vbuyy=vbuyy_minus_2
+dey
+dey
+//FRAGMENT vbuz1=vbuz2_bor_vbuyy
+tya
+ora {z2}
+sta {z1}
+//FRAGMENT vbuaa=vbuz1_bor_vbuyy
+tya
+ora {z1}
+//FRAGMENT vbuxx=vbuz1_bor_vbuyy
+tya
+ora {z1}
+tax
+//FRAGMENT vbuyy=vbuz1_bor_vbuyy
+tya
+ora {z1}
+tay
+//FRAGMENT pbuz1_derefidx_vbuxx=vbuyy
+stx $ff
+tya
+ldy $ff
+sta ({z1}),y
+//FRAGMENT vbuz1_lt_vbuyy_then_la1
+cpy {z1}
+beq !+
+bcs {la1}
+!:
+//FRAGMENT vbuxx_lt_vbuyy_then_la1
+sty $ff
+cpx $ff
+bcc {la1}
+//FRAGMENT pbuz1_derefidx_vbuyy=vbuaa
+sta ({z1}),y
+//FRAGMENT vwuz1=vwuz1_plus_vbuc1
+lda #{c1}
+clc
+adc {z1}
+sta {z1}
+bcc !+
+inc {z1}+1
+!:
 //FRAGMENT vbuz1_eq_vbuxx_then_la1
 cpx {z1}
 beq {la1}
@@ -5773,21 +6568,6 @@ asl
 asl
 asl
 tay
-//FRAGMENT vbuz1=vbuz2_bor_vbuyy
-tya
-ora {z2}
-sta {z1}
-//FRAGMENT vbuaa=vbuz1_bor_vbuyy
-tya
-ora {z1}
-//FRAGMENT vbuxx=vbuz1_bor_vbuyy
-tya
-ora {z1}
-tax
-//FRAGMENT vbuyy=vbuz1_bor_vbuyy
-tya
-ora {z1}
-tay
 //FRAGMENT vbuz1=vbuaa_bor_vbuz2
 ora {z2}
 sta {z1}
@@ -5829,21 +6609,11 @@ tay
 sty $ff
 ora $ff
 tay
-//FRAGMENT pbuz1_derefidx_vbuxx=vbuz2
-txa
-tay
-lda {z2}
-sta ({z1}),y
-//FRAGMENT pbuz1_derefidx_vbuyy=vbuz2
-lda {z2}
-sta ({z1}),y
 //FRAGMENT vbuz1=vbuxx_bor_vbuyy
 txa
 sty $ff
 ora $ff
 sta {z1}
-//FRAGMENT pbuz1_derefidx_vbuyy=vbuaa
-sta ({z1}),y
 //FRAGMENT vbuaa=vbuxx_bor_vbuyy
 txa
 sty $ff
@@ -5860,11 +6630,6 @@ txa
 sty $ff
 ora $ff
 tax
-//FRAGMENT pbuz1_derefidx_vbuxx=vbuyy
-stx $ff
-tya
-ldy $ff
-sta ({z1}),y
 //FRAGMENT vbuyy=vbuyy_bor_vbuxx
 txa
 sty $ff
@@ -6017,13 +6782,6 @@ bne {la1}
 lda {z1}
 cmp #<{c1}
 bne {la1}
-//FRAGMENT vwuz1_neq_vwuc1_then_la1
-lda {z1}+1
-cmp #>{c1}
-bne {la1}
-lda {z1}
-cmp #<{c1}
-bne {la1}
 //FRAGMENT vbuz1=vbuc1_bor_vbuaa
 ora #{c1}
 sta {z1}
@@ -6076,14 +6834,6 @@ tay
 tya
 ora #{c1}
 tay
-//FRAGMENT vwuz1=vwuz1_plus_vbuc1
-lda #{c1}
-clc
-adc {z1}
-sta {z1}
-bcc !+
-inc {z1}+1
-!:
 //FRAGMENT vwuz1_gt_vbuc1_then_la1
 lda {z1}+1
 bne {la1}
@@ -6219,6 +6969,346 @@ tax
 ldx #{c1}
 //FRAGMENT vbsxx=_dec_vbsxx
 dex
+//FRAGMENT vduz1=vduz2_minus_vduc1
+lda {z2}
+sec
+sbc #<{c1}
+sta {z1}
+lda {z2}+1
+sbc #>{c1}
+sta {z1}+1
+lda {z2}+2
+sbc #<{c1}>>$10
+sta {z1}+2
+lda {z2}+3
+sbc #>{c1}>>$10
+sta {z1}+3
+//FRAGMENT _deref_pduc1=vduc2
+lda #<{c2}
+sta {c1}
+lda #>{c2}
+sta {c1}+1
+lda #<{c2}>>$10
+sta {c1}+2
+lda #>{c2}>>$10
+sta {c1}+3
+//FRAGMENT vbuz1=vbuc1_minus_vbuz2
+lda #{c1}
+sec
+sbc {z2}
+sta {z1}
+//FRAGMENT vduz1=vduc1_minus__deref_pduc2
+lda #<{c1}
+sec
+sbc {c2}
+sta {z1}
+lda #>{c1}
+sbc {c2}+1
+sta {z1}+1
+lda #<{c1}>>$10
+sbc {c2}+2
+sta {z1}+2
+lda #>{c1}>>$10
+sbc {c2}+3
+sta {z1}+3
+//FRAGMENT pwuz1=pwuc1
+lda #<{c1}
+sta {z1}
+lda #>{c1}
+sta {z1}+1
+//FRAGMENT _deref_pwuz1=vwuz2
+ldy #0
+lda {z2}
+sta ({z1}),y
+iny
+lda {z2}+1
+sta ({z1}),y
+//FRAGMENT pwuz1=pwuz1_plus_vbuc1
+lda #{c1}
+clc
+adc {z1}
+sta {z1}
+bcc !+
+inc {z1}+1
+!:
+//FRAGMENT pwuz1=pwuz2
+lda {z2}
+sta {z1}
+lda {z2}+1
+sta {z1}+1
+//FRAGMENT vwuz1=pwuz2_minus_pwuc1
+lda {z2}
+sec
+sbc #<{c1}
+sta {z1}
+lda {z2}+1
+sbc #>{c1}
+sta {z1}+1
+//FRAGMENT _deref_pwuz1_le_vwuz2_then_la1
+ldy #1
+lda ({z1}),y
+cmp {z2}+1
+bne !+
+dey
+lda ({z1}),y
+cmp {z2}
+beq {la1}
+!:
+bcc {la1}
+//FRAGMENT pwuz1=pwuz1_minus_vbuc1
+sec
+lda {z1}
+sbc #{c1}
+sta {z1}
+lda {z1}+1
+sbc #0
+sta {z1}+1
+//FRAGMENT vbuz1=vbuz2_ror_1
+lda {z2}
+lsr
+sta {z1}
+//FRAGMENT pwuz1=pwuz2_plus_vbuz3
+lda {z3}
+clc
+adc {z2}
+sta {z1}
+lda #0
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT vwsz1=vwsz2_minus__deref_pwsz3
+sec
+lda {z2}
+ldy #0
+sbc ({z3}),y
+sta {z1}
+lda {z2}+1
+iny
+sbc ({z3}),y
+sta {z1}+1
+//FRAGMENT vwsz1_le_0_then_la1
+lda {z1}+1
+bmi {la1}
+bne !+
+lda {z1}
+beq {la1}
+!:
+//FRAGMENT pwuz1=pwuz2_plus_vbuc1
+lda #{c1}
+clc
+adc {z2}
+sta {z1}
+lda #0
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT pbuz1=pbuz2_plus_1
+clc
+lda {z2}
+adc #1
+sta {z1}
+lda {z2}+1
+adc #0
+sta {z1}+1
+//FRAGMENT vbuaa=vbuc1_minus_vbuz1
+lda #{c1}
+sec
+sbc {z1}
+//FRAGMENT vbuxx=vbuc1_minus_vbuz1
+lda #{c1}
+sec
+sbc {z1}
+tax
+//FRAGMENT vbuyy=vbuc1_minus_vbuz1
+lda #{c1}
+sec
+sbc {z1}
+tay
+//FRAGMENT vbuz1=vbuc1_minus_vbuaa
+eor #$ff
+sec
+adc #{c1}
+sta {z1}
+//FRAGMENT vbuaa=vbuc1_minus_vbuaa
+eor #$ff
+sec
+adc #{c1}
+//FRAGMENT vbuxx=vbuc1_minus_vbuaa
+eor #$ff
+tax
+axs #-{c1}-1
+//FRAGMENT vbuyy=vbuc1_minus_vbuaa
+eor #$ff
+sec
+adc #{c1}
+tay
+//FRAGMENT vbuz1=vbuc1_minus_vbuxx
+txa
+eor #$ff
+sec
+adc #{c1}
+sta {z1}
+//FRAGMENT vbuaa=vbuc1_minus_vbuxx
+txa
+eor #$ff
+sec
+adc #{c1}
+//FRAGMENT vbuxx=vbuc1_minus_vbuxx
+txa
+eor #$ff
+tax
+axs #-{c1}-1
+//FRAGMENT vbuyy=vbuc1_minus_vbuxx
+txa
+eor #$ff
+sec
+adc #{c1}
+tay
+//FRAGMENT vbuz1=vbuc1_minus_vbuyy
+tya
+eor #$ff
+sec
+adc #{c1}
+sta {z1}
+//FRAGMENT vbuaa=vbuc1_minus_vbuyy
+tya
+eor #$ff
+sec
+adc #{c1}
+//FRAGMENT vbuxx=vbuc1_minus_vbuyy
+tya
+eor #$ff
+tax
+axs #-{c1}-1
+//FRAGMENT vbuyy=vbuc1_minus_vbuyy
+tya
+eor #$ff
+sec
+adc #{c1}
+tay
+//FRAGMENT pbuz1_derefidx_vbuxx=vbuxx
+txa
+tay
+sta ({z1}),y
+//FRAGMENT vbuaa=vbuz1_ror_1
+lda {z1}
+lsr
+//FRAGMENT vbuxx=vbuz1_ror_1
+lda {z1}
+lsr
+tax
+//FRAGMENT vbuyy=vbuz1_ror_1
+lda {z1}
+lsr
+tay
+//FRAGMENT vbuz1=vbuaa_ror_1
+lsr
+sta {z1}
+//FRAGMENT vbuaa=vbuaa_ror_1
+lsr
+//FRAGMENT vbuxx=vbuaa_ror_1
+lsr
+tax
+//FRAGMENT vbuyy=vbuaa_ror_1
+lsr
+tay
+//FRAGMENT vbuz1=vbuxx_ror_1
+txa
+lsr
+sta {z1}
+//FRAGMENT vbuaa=vbuxx_ror_1
+txa
+lsr
+//FRAGMENT vbuyy=vbuxx_ror_1
+txa
+lsr
+tay
+//FRAGMENT vbuz1=vbuyy_ror_1
+tya
+lsr
+sta {z1}
+//FRAGMENT vbuaa=vbuyy_ror_1
+tya
+lsr
+//FRAGMENT vbuxx=vbuyy_ror_1
+tya
+lsr
+tax
+//FRAGMENT pwuz1=pwuz2_plus_vbuaa
+clc
+adc {z2}
+sta {z1}
+lda #0
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT pwuz1=pwuz2_plus_vbuxx
+txa
+clc
+adc {z2}
+sta {z1}
+lda #0
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT pwuz1=pwuz2_plus_vbuyy
+tya
+clc
+adc {z2}
+sta {z1}
+lda #0
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT vbuaa=vbuaa_plus_1
+clc
+adc #1
+//FRAGMENT vbuaa=vbuxx_plus_1
+inx
+txa
+//FRAGMENT vbuaa=vbuyy_plus_1
+iny
+tya
+//FRAGMENT vbuxx=vbuaa_plus_1
+tax
+inx
+//FRAGMENT vbuxx=vbuxx_plus_1
+inx
+//FRAGMENT vbuxx=vbuyy_plus_1
+tya
+tax
+inx
+//FRAGMENT vbuyy=vbuaa_plus_1
+tay
+iny
+//FRAGMENT vbuyy=vbuxx_plus_1
+txa
+tay
+iny
+//FRAGMENT vbuyy=vbuyy_plus_1
+iny
+//FRAGMENT vbuxx=pbuc1_derefidx_vbuxx
+lda {c1},x
+tax
+//FRAGMENT vbuxx=pbuc1_derefidx_vbuyy
+ldx {c1},y
+//FRAGMENT vwuz1=pwuz1_minus_pwuc1
+lda {z1}
+sec
+sbc #<{c1}
+sta {z1}
+lda {z1}+1
+sbc #>{c1}
+sta {z1}+1
+//FRAGMENT vduz1=vduz1_minus_vduc1
+lda {z1}
+sec
+sbc #<{c1}
+sta {z1}
+lda {z1}+1
+sbc #>{c1}
+sta {z1}+1
+lda {z1}+2
+sbc #<{c1}>>$10
+sta {z1}+2
+lda {z1}+3
+sbc #>{c1}>>$10
+sta {z1}+3
 //FRAGMENT pbuz1=_dec_pbuz1
 lda {z1}
 bne !+
@@ -6229,10 +7319,6 @@ dec {z1}
 tsx
 lda STACK_BASE+{c1},x
 sta {z1}
-//FRAGMENT vbuz1=vbuz2_ror_1
-lda {z2}
-lsr
-sta {z1}
 //FRAGMENT _stackidxbyte_vbuc1=vbuz1
 lda {z1}
 tsx
@@ -6259,50 +7345,6 @@ tax
 tsx
 lda STACK_BASE+{c1},x
 tay
-//FRAGMENT vbuz1=vbuaa_ror_1
-lsr
-sta {z1}
-//FRAGMENT vbuz1=vbuxx_ror_1
-txa
-lsr
-sta {z1}
-//FRAGMENT vbuz1=vbuyy_ror_1
-tya
-lsr
-sta {z1}
-//FRAGMENT vbuaa=vbuz1_ror_1
-lda {z1}
-lsr
-//FRAGMENT vbuaa=vbuaa_ror_1
-lsr
-//FRAGMENT vbuaa=vbuxx_ror_1
-txa
-lsr
-//FRAGMENT vbuaa=vbuyy_ror_1
-tya
-lsr
-//FRAGMENT vbuxx=vbuz1_ror_1
-lda {z1}
-lsr
-tax
-//FRAGMENT vbuxx=vbuaa_ror_1
-lsr
-tax
-//FRAGMENT vbuxx=vbuyy_ror_1
-tya
-lsr
-tax
-//FRAGMENT vbuyy=vbuz1_ror_1
-lda {z1}
-lsr
-tay
-//FRAGMENT vbuyy=vbuaa_ror_1
-lsr
-tay
-//FRAGMENT vbuyy=vbuxx_ror_1
-txa
-lsr
-tay
 //FRAGMENT _stackidxbyte_vbuc1=vbuxx
 txa
 tsx
@@ -6334,10 +7376,6 @@ tsx
 txa
 axs #-4
 txs
-//FRAGMENT vbuyy=vbuxx_plus_1
-txa
-tay
-iny
 //FRAGMENT pbuz1=_stackidxptr_vbuc1
 tsx
 lda STACK_BASE+{c1},x
@@ -6377,13 +7415,6 @@ sbc #1
 //FRAGMENT vbuxx=vbuaa_minus_1
 tax
 dex
-//FRAGMENT vbuaa=vbuaa_plus_1
-clc
-adc #1
-//FRAGMENT vbuxx=vbuxx_plus_1
-inx
-//FRAGMENT vbuyy=vbuyy_plus_1
-iny
 //FRAGMENT vbuz1=_lo_pbuz2
 lda {z2}
 sta {z1}
@@ -6539,6 +7570,67 @@ ora {z3}
 sta {z1}
 //FRAGMENT vbuyy=_hi_pbuz1
 ldy {z1}+1
+//FRAGMENT vwuz1_eq_0_then_la1
+lda {z1}
+ora {z1}+1
+beq {la1}
+//FRAGMENT vwuz1_gt_vwuz2_then_la1
+lda {z2}+1
+cmp {z1}+1
+bcc {la1}
+bne !+
+lda {z2}
+cmp {z1}
+bcc {la1}
+!:
+//FRAGMENT vwuz1_neq_vwuz2_then_la1
+lda {z1}+1
+cmp {z2}+1
+bne {la1}
+lda {z1}
+cmp {z2}
+bne {la1}
+//FRAGMENT vwuz1=vwuz2_band_vwuc1
+lda {z2}
+and #<{c1}
+sta {z1}
+lda {z2}+1
+and #>{c1}
+sta {z1}+1
+//FRAGMENT _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuz2
+ldy #0
+lda ({z1}),y
+ldy {z2}
+ora {c1},y
+ldy #0
+sta ({z1}),y
+//FRAGMENT _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuaa
+tay
+lda {c1},y
+ldy #0
+ora ({z1}),y
+ldy #0
+sta ({z1}),y
+//FRAGMENT _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx
+lda {c1},x
+ldy #0
+ora ({z1}),y
+ldy #0
+sta ({z1}),y
+//FRAGMENT _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuyy
+lda {c1},y
+ldy #0
+ora ({z1}),y
+ldy #0
+sta ({z1}),y
+//FRAGMENT pbuz1=pbuz1_plus_vwuz2
+lda {z1}
+clc
+adc {z2}
+sta {z1}
+lda {z1}+1
+adc {z2}+1
+sta {z1}+1
 //FRAGMENT pbuc1_derefidx_vbuz1_neq_0_then_la1
 ldy {z1}
 lda {c1},y
@@ -6557,395 +7649,535 @@ bne {la1}
 lda {c1},y
 cmp #0
 bne {la1}
-//FRAGMENT pbuz1_derefidx_vbuxx=vbuxx
-txa
-tay
-sta ({z1}),y
-//FRAGMENT pbuz1_derefidx_vbuz2=pbuc1_derefidx_vbuaa
-tay
-lda {c1},y
-ldy {z2}
-sta ({z1}),y
-//FRAGMENT vbuxx=pbuc1_derefidx_vbuyy
-ldx {c1},y
-//FRAGMENT vbuyy=pbuc1_derefidx_vbuxx
-ldy {c1},x
-//FRAGMENT vduz1=vduc1
-lda #<{c1}
-sta {z1}
-lda #>{c1}
-sta {z1}+1
-lda #<{c1}>>$10
-sta {z1}+2
-lda #>{c1}>>$10
-sta {z1}+3
-//FRAGMENT _stackpullbyte_1
-pla
-//FRAGMENT vduz1=_inc_vduz1
-inc {z1}
-bne !+
-inc {z1}+1
-bne !+
-inc {z1}+2
-bne !+
-inc {z1}+3
-!:
-//FRAGMENT vduz1=vduz2
+//FRAGMENT pbuz1=pbuz2_minus_vwuc1
 lda {z2}
+sec
+sbc #<{c1}
 sta {z1}
 lda {z2}+1
+sbc #>{c1}
 sta {z1}+1
-lda {z2}+2
-sta {z1}+2
-lda {z2}+3
-sta {z1}+3
-//FRAGMENT pbuc1_derefidx_vbuz1_eq_vbuz2_then_la1
-ldy {z1}
-lda {c1},y
-cmp {z2}
-beq {la1}
-//FRAGMENT vbsz1=_sbyte_vwuz2
+//FRAGMENT pssz1=pssc1_plus_vbuz2
 lda {z2}
+clc
+adc #<{c1}
 sta {z1}
-//FRAGMENT vbsz1=_inc_vbsz1
-inc {z1}
-//FRAGMENT vbsz1=vbsz2_minus_vbsz3
-lda {z2}
-sec
-sbc {z3}
-sta {z1}
-//FRAGMENT vbsc1_neq_vbsz1_then_la1
+lda #>{c1}
+adc #0
+sta {z1}+1
+//FRAGMENT vbuz1=vbuc1_rol_pbuz2_derefidx_vbuc2
+ldy #{c2}
+lda ({z2}),y
+tay
 lda #{c1}
-cmp {z1}
+cpy #0
+beq !e+
+!:
+asl
+dey
+bne !-
+!e:
+sta {z1}
+//FRAGMENT pbuz1_derefidx_vbuc1_eq_vbuc2_then_la1
+lda #{c2}
+ldy #{c1}
+cmp ({z1}),y
+beq {la1}
+//FRAGMENT pbuz1_derefidx_vbuc1_neq_vbuc2_then_la1
+ldy #{c1}
+lda ({z1}),y
+
+cmp #{c2}
 bne {la1}
-//FRAGMENT vbuz1=_byte_vduz2
+//FRAGMENT _deref_(qbuz1_derefidx_vbuc1)=vbuc2
+ldx #{c2}
+ldy #{c1}
+lda ({z1}),y
+sta !+ +1
+iny
+lda ({z1}),y
+sta !+ +2
+!: stx $ffff
+//FRAGMENT pbuc1_derefidx_(pbuz1_derefidx_vbuc2)=pbuz1_derefidx_vbuc3
+ldy #{c3}
+lda ({z1}),y
+ldy #{c2}
+pha
+lda ({z1}),y
+tay
+pla
+sta {c1},y
+//FRAGMENT vwuz1=_deref_pwuz2_ror_4
+ldy #0
+lda ({z2}),y
+sta {z1}
+iny
+lda ({z2}),y
+sta {z1}+1
+lsr {z1}+1
+ror {z1}
+lsr {z1}+1
+ror {z1}
+lsr {z1}+1
+ror {z1}
+lsr {z1}+1
+ror {z1}
+//FRAGMENT vbuz1=vbuc1_bxor_vbuz2
+lda #{c1}
+eor {z2}
+sta {z1}
+//FRAGMENT pbuc1_derefidx_vbuz1=_byte_vwuz2
+ldy {z1}
 lda {z2}
+sta {c1},y
+//FRAGMENT vwuz1=pwuz2_derefidx_vbuc1_ror_4
+ldy #{c1}
+lda ({z2}),y
 sta {z1}
-//FRAGMENT vduz1=pduc1_derefidx_vbuz2
+iny
+lda ({z2}),y
+sta {z1}+1
+lsr {z1}+1
+ror {z1}
+lsr {z1}+1
+ror {z1}
+lsr {z1}+1
+ror {z1}
+lsr {z1}+1
+ror {z1}
+//FRAGMENT _deref_pwuz1_lt_vwuc1_then_la1
+ldy #1
+lda ({z1}),y
+cmp #>{c1}
+bcc {la1}
+bne !+
+dey
+lda ({z1}),y
+cmp #<{c1}
+bcc {la1}
+!:
+//FRAGMENT _deref_pwuz1_gt_vwuc1_then_la1
+ldy #1
+lda #>{c1}
+cmp ({z1}),y
+bcc {la1}
+bne !+
+dey
+lda #<{c1}
+cmp ({z1}),y
+bcc {la1}
+!:
+//FRAGMENT pwuz1_derefidx_vbuc1_lt_vwuc2_then_la1
+ldy #{c1}
+iny
+lda ({z1}),y
+cmp #>{c2}
+bcc {la1}
+bne !+
+dey
+lda ({z1}),y
+cmp #<{c2}
+bcc {la1}
+!:
+//FRAGMENT pwuz1_derefidx_vbuc1_gt_vwuc2_then_la1
+ldy #{c1}
+iny
+lda #>{c2}
+cmp ({z1}),y
+bcc {la1}
+bne !+
+dey
+lda #<{c2}
+cmp ({z1}),y
+bcc {la1}
+!:
+//FRAGMENT vwuz1=vwuz2_ror_3
+lda {z2}+1
+lsr
+sta {z1}+1
+lda {z2}
+ror
+sta {z1}
+lsr {z1}+1
+ror {z1}
+lsr {z1}+1
+ror {z1}
+//FRAGMENT pwuz1_derefidx_vbuc1=pwuz1_derefidx_vbuc1_plus_pwuc2_derefidx_vbuz2
+ldx {z2}
+ldy #{c1}
+clc
+lda ({z1}),y
+adc {c2},x
+sta ({z1}),y
+iny
+lda ({z1}),y
+adc {c2}+1,x
+sta ({z1}),y
+//FRAGMENT _deref_pwuz1=_deref_pwuz1_plus_pwuz1_derefidx_vbuc1
+ldy #{c1}
+sty $ff
+clc
+lda ({z1}),y
+ldy #0
+adc ({z1}),y
+sta ({z1}),y
+ldy $ff
+iny
+lda ({z1}),y
+ldy #1
+adc ({z1}),y
+sta ({z1}),y
+//FRAGMENT pwuz1_derefidx_vbuc1=pwuz1_derefidx_vbuc1_plus_pwuz1_derefidx_vbuc2
+ldy #{c2}
+clc
+lda ({z1}),y
+ldy #{c1}
+adc ({z1}),y
+sta ({z1}),y
+ldy #{c2}+1
+lda ({z1}),y
+ldy #{c1}+1
+adc ({z1}),y
+sta ({z1}),y
+//FRAGMENT vbuz1=_neg_vbuz2
+lda {z2}
+eor #$ff
+clc
+adc #$01
+sta {z1}
+//FRAGMENT vbuz1=pbuz2_derefidx_vbuz3
+ldy {z3}
+lda ({z2}),y
+sta {z1}
+//FRAGMENT pbuc1_derefidx_vbuz1_neq_vbuc2_then_la1
+lda #{c2}
+ldy {z1}
+cmp {c1},y
+bne {la1}
+//FRAGMENT vwuz1=vwuz2_rol_6
+lda {z2}+1
+lsr
+sta $ff
+lda {z2}
+ror
+sta {z1}+1
+lda #0
+ror
+sta {z1}
+lsr $ff
+ror {z1}+1
+ror {z1}
+//FRAGMENT vwuz1=vbuc1_plus_vwuz2
+lda #{c1}
+clc
+adc {z2}
+sta {z1}
+lda #0
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz2_rol_4
+lda {z2}
+asl
+sta {z1}
+lda {z2}+1
+rol
+sta {z1}+1
+asl {z1}
+rol {z1}+1
+asl {z1}
+rol {z1}+1
+asl {z1}
+rol {z1}+1
+//FRAGMENT pwuc1_derefidx_vbuz1=_word_vbuz2
+lda {z2}
+ldy {z1}
+sta {c1},y
+lda #0
+sta {c1}+1,y
+//FRAGMENT pwuc1_derefidx_vbuz1=vwuc2
+ldy {z1}
+lda #<{c2}
+sta {c1},y
+lda #>{c2}
+sta {c1}+1,y
+//FRAGMENT qbuc1_derefidx_vbuz1=pbuz2
+ldy {z1}
+lda {z2}
+sta {c1},y
+lda {z2}+1
+sta {c1}+1,y
+//FRAGMENT pssz1=pssc1_plus_vbuaa
+clc
+adc #<{c1}
+sta {z1}
+lda #>{c1}
+adc #0
+sta {z1}+1
+//FRAGMENT pssz1=pssc1_plus_vbuxx
+txa
+clc
+adc #<{c1}
+sta {z1}
+lda #>{c1}
+adc #0
+sta {z1}+1
+//FRAGMENT pssz1=pssc1_plus_vbuyy
+tya
+clc
+adc #<{c1}
+sta {z1}
+lda #>{c1}
+adc #0
+sta {z1}+1
+//FRAGMENT vbuaa=vbuc1_rol_pbuz1_derefidx_vbuc2
+ldy #{c2}
+lda ({z1}),y
+tay
+lda #{c1}
+cpy #0
+beq !e+
+!:
+asl
+dey
+bne !-
+!e:
+//FRAGMENT vbuxx=vbuc1_rol_pbuz1_derefidx_vbuc2
+ldy #{c2}
+lda ({z1}),y
+tax
+lda #{c1}
+cpx #0
+beq !e+
+!:
+asl
+dex
+bne !-
+!e:
+tax
+//FRAGMENT vbuyy=vbuc1_rol_pbuz1_derefidx_vbuc2
+ldy #{c2}
+lda ({z1}),y
+tay
+lda #{c1}
+cpy #0
+beq !e+
+!:
+asl
+dey
+bne !-
+!e:
+tay
+//FRAGMENT vbuaa=vbuc1_bxor_vbuz1
+lda #{c1}
+eor {z1}
+//FRAGMENT vbuxx=vbuc1_bxor_vbuz1
+lda #{c1}
+eor {z1}
+tax
+//FRAGMENT vbuyy=vbuc1_bxor_vbuz1
+lda #{c1}
+eor {z1}
+tay
+//FRAGMENT pwuz1_derefidx_vbuc1=pwuz1_derefidx_vbuc1_plus_pwuc2_derefidx_vbuaa
+ldy #{c1}
+tax
+clc
+lda ({z1}),y
+adc {c2},x
+sta ({z1}),y
+iny
+lda ({z1}),y
+adc {c2}+1,x
+sta ({z1}),y
+//FRAGMENT pwuz1_derefidx_vbuc1=pwuz1_derefidx_vbuc1_plus_pwuc2_derefidx_vbuxx
+ldy #{c1}
+clc
+lda ({z1}),y
+adc {c2},x
+sta ({z1}),y
+iny
+lda ({z1}),y
+adc {c2}+1,x
+sta ({z1}),y
+//FRAGMENT pwuz1_derefidx_vbuc1=pwuz1_derefidx_vbuc1_plus_pwuc2_derefidx_vbuyy
+tya
+ldy #{c1}
+tax
+clc
+lda ({z1}),y
+adc {c2},x
+sta ({z1}),y
+iny
+lda ({z1}),y
+adc {c2}+1,x
+sta ({z1}),y
+//FRAGMENT vbuz1=_neg_vbuaa
+eor #$ff
+clc
+adc #$01
+sta {z1}
+//FRAGMENT vbuz1=_neg_vbuxx
+dex
+txa
+eor #$ff
+sta {z1}
+//FRAGMENT vbuaa=_neg_vbuz1
+lda {z1}
+eor #$ff
+clc
+adc #$01
+//FRAGMENT vbuaa=_neg_vbuaa
+eor #$ff
+clc
+adc #$01
+//FRAGMENT vbuaa=_neg_vbuxx
+dex
+txa
+eor #$ff
+//FRAGMENT vbuxx=_neg_vbuz1
+lda {z1}
+eor #$ff
+tax
+inx
+//FRAGMENT vbuxx=_neg_vbuaa
+eor #$ff
+tax
+inx
+//FRAGMENT vbuxx=_neg_vbuxx
+dex
+txa
+eor #$ff
+tax
+//FRAGMENT vbuyy=_neg_vbuz1
+lda {z1}
+eor #$ff
+tay
+iny
+//FRAGMENT vbuyy=_neg_vbuaa
+eor #$ff
+tay
+iny
+//FRAGMENT vbuyy=_neg_vbuxx
+txa
+eor #$ff
+tay
+iny
+//FRAGMENT vbuxx=pbuz1_derefidx_vbuz2
 ldy {z2}
-lda {c1},y
-sta {z1}
-lda {c1}+1,y
-sta {z1}+1
-lda {c1}+2,y
-sta {z1}+2
-lda {c1}+3,y
-sta {z1}+3
-//FRAGMENT vduz1_ge_vduz2_then_la1
-lda {z1}+3
-cmp {z2}+3
-bcc !+
-bne {la1}
-lda {z1}+2
-cmp {z2}+2
-bcc !+
-bne {la1}
-lda {z1}+1
-cmp {z2}+1
-bcc !+
-bne {la1}
-lda {z1}
-cmp {z2}
-bcs {la1}
-!:
-//FRAGMENT vduz1=vduz1_minus_vduz2
-lda {z1}
-sec
-sbc {z2}
-sta {z1}
-lda {z1}+1
-sbc {z2}+1
-sta {z1}+1
-lda {z1}+2
-sbc {z2}+2
-sta {z1}+2
-lda {z1}+3
-sbc {z2}+3
-sta {z1}+3
-//FRAGMENT vbuaa_le_vbuz1_then_la1
-ldy {z1}
-sta $ff
-cpy $ff
-bcs {la1}
-//FRAGMENT pbuc1_derefidx_vbuaa_eq_vbuz1_then_la1
-tay
-lda {c1},y
-cmp {z1}
-beq {la1}
-//FRAGMENT pbuc1_derefidx_vbuxx_eq_vbuz1_then_la1
-lda {c1},x
-cmp {z1}
-beq {la1}
-//FRAGMENT pbuc1_derefidx_vbuyy_eq_vbuz1_then_la1
-lda {c1},y
-cmp {z1}
-beq {la1}
-//FRAGMENT pbuc1_derefidx_vbuz1_eq_vbuaa_then_la1
-ldx {z1}
-tay
-lda {c1},x
+lda ({z1}),y
 tax
-sty $ff
-cpx $ff
-beq  {la1}
-//FRAGMENT pbuc1_derefidx_vbuaa_eq_vbuaa_then_la1
-tax
-lda {c1},x
+//FRAGMENT vbuyy=pbuz1_derefidx_vbuz2
+ldy {z2}
+lda ({z1}),y
 tay
-sty $ff
-cpx $ff
-beq  {la1}
-//FRAGMENT pbuc1_derefidx_vbuxx_eq_vbuaa_then_la1
-tay
-lda {c1},x
-tax
-sty $ff
-cpx $ff
-beq  {la1}
-//FRAGMENT pbuc1_derefidx_vbuyy_eq_vbuaa_then_la1
-tax
-lda {c1},y
-tay
-sty $ff
-cpx $ff
-beq  {la1}
-//FRAGMENT pbuc1_derefidx_vbuz1_eq_vbuxx_then_la1
-ldy {z1}
-lda {c1},y
-tay
-sty $ff
-cpx $ff
-beq  {la1}
-//FRAGMENT pbuc1_derefidx_vbuaa_eq_vbuxx_then_la1
-tay
-lda {c1},y
-tay
-sty $ff
-cpx $ff
-beq  {la1}
-//FRAGMENT pbuc1_derefidx_vbuxx_eq_vbuxx_then_la1
-lda {c1},x
-tay
-sty $ff
-cpx $ff
-beq  {la1}
-//FRAGMENT pbuc1_derefidx_vbuyy_eq_vbuxx_then_la1
-lda {c1},y
-tay
-sty $ff
-cpx $ff
-beq  {la1}
-//FRAGMENT pbuc1_derefidx_vbuz1_eq_vbuyy_then_la1
-ldx {z1}
-lda {c1},x
-tax
-sty $ff
-cpx $ff
-beq  {la1}
-//FRAGMENT pbuc1_derefidx_vbuaa_eq_vbuyy_then_la1
-tax
-lda {c1},x
-tax
-sty $ff
-cpx $ff
-beq  {la1}
-//FRAGMENT pbuc1_derefidx_vbuxx_eq_vbuyy_then_la1
-lda {c1},x
-tax
-sty $ff
-cpx $ff
-beq  {la1}
-//FRAGMENT pbuc1_derefidx_vbuyy_eq_vbuyy_then_la1
-lda {c1},y
-tax
-sty $ff
-cpx $ff
-beq  {la1}
-//FRAGMENT vbuz1_lt_vbuaa_then_la1
-cmp {z1}
-beq !+
-bcs {la1}
-!:
-//FRAGMENT vbsaa=_sbyte_vwuz1
-lda {z1}
-//FRAGMENT vbsxx=_sbyte_vwuz1
-ldx {z1}
-//FRAGMENT vbsz1=vbsz2_minus_vbsaa
-eor #$ff
-sec
-adc {z2}
-sta {z1}
-//FRAGMENT vbsz1=vbsz2_minus_vbsxx
+//FRAGMENT vbuz1=pbuz2_derefidx_vbuxx
 txa
-eor #$ff
-sec
-adc {z2}
-sta {z1}
-//FRAGMENT vbsz1=vbsz2_minus_vbsyy
-tya
-eor #$ff
-sec
-adc {z2}
-sta {z1}
-//FRAGMENT vbsxx=vbsz1_minus_vbsz2
-lda {z1}
-sec
-sbc {z2}
-tax
-//FRAGMENT vbsxx=vbsz1_minus_vbsaa
-eor #$ff
-sec
-adc {z1}
-tax
-//FRAGMENT vbsxx=vbsz1_minus_vbsxx
-txa
-eor #$ff
-sec
-adc {z1}
-tax
-//FRAGMENT vbsxx=vbsz1_minus_vbsyy
-tya
-eor #$ff
-sec
-adc {z1}
-tax
-//FRAGMENT vbsz1=vbsxx_minus_vbsz2
-txa
-sec
-sbc {z2}
-sta {z1}
-//FRAGMENT vbsz1=vbsxx_minus_vbsaa
-sta $ff
-txa
-sec
-sbc $ff
-sta {z1}
-//FRAGMENT vbsz1=vbsxx_minus_vbsxx
-lda #0
-sta {z1}
-//FRAGMENT vbsz1=vbsxx_minus_vbsyy
-txa
-sty $ff
-sec
-sbc $ff
-sta {z1}
-//FRAGMENT vbsxx=vbsxx_minus_vbsz1
-txa
-sec
-sbc {z1}
-tax
-//FRAGMENT vbsxx=vbsxx_minus_vbsaa
-sta $ff
-txa
-sec
-sbc $ff
-tax
-//FRAGMENT vbsxx=vbsxx_minus_vbsxx
-lda #0
-tax
-//FRAGMENT vbsxx=vbsxx_minus_vbsyy
-txa
-sty $ff
-sec
-sbc $ff
-tax
-//FRAGMENT vbsz1=vbsyy_minus_vbsz2
-tya
-sec
-sbc {z2}
-sta {z1}
-//FRAGMENT vbsz1=vbsyy_minus_vbsaa
-sta $ff
-tya
-sec
-sbc $ff
-sta {z1}
-//FRAGMENT vbsz1=vbsyy_minus_vbsxx
-tya
-stx $ff
-sec
-sbc $ff
-sta {z1}
-//FRAGMENT vbsz1=vbsyy_minus_vbsyy
-lda #0
-sta {z1}
-//FRAGMENT vbsxx=vbsyy_minus_vbsz1
-tya
-sec
-sbc {z1}
-tax
-//FRAGMENT vbsxx=vbsyy_minus_vbsaa
-sta $ff
-tya
-sec
-sbc $ff
-tax
-//FRAGMENT vbsxx=vbsyy_minus_vbsxx
-tya
-stx $ff
-sec
-sbc $ff
-tax
-//FRAGMENT vbsxx=vbsyy_minus_vbsyy
-lda #0
-tax
-//FRAGMENT vbsc1_neq_vbsxx_then_la1
-cpx #{c1}
-bne {la1}
-//FRAGMENT vbuaa=_byte_vduz1
-lda {z1}
-//FRAGMENT vbuxx=_byte_vduz1
-lda {z1}
-tax
-//FRAGMENT vbuyy=_byte_vduz1
-lda {z1}
 tay
-//FRAGMENT vduz1=pduc1_derefidx_vbuaa
+lda ({z2}),y
+sta {z1}
+//FRAGMENT vbuxx=pbuz1_derefidx_vbuxx
+txa
 tay
-lda {c1},y
+lda ({z1}),y
+tax
+//FRAGMENT vbuyy=pbuz1_derefidx_vbuxx
+txa
+tay
+lda ({z1}),y
+tay
+//FRAGMENT vbuz1=pbuz2_derefidx_vbuyy
+lda ({z2}),y
 sta {z1}
-lda {c1}+1,y
-sta {z1}+1
-lda {c1}+2,y
-sta {z1}+2
-lda {c1}+3,y
-sta {z1}+3
-//FRAGMENT vduz1=pduc1_derefidx_vbuxx
-lda {c1},x
-sta {z1}
-lda {c1}+1,x
-sta {z1}+1
-lda {c1}+2,x
-sta {z1}+2
-lda {c1}+3,x
-sta {z1}+3
-//FRAGMENT vduz1=pduc1_derefidx_vbuyy
-lda {c1},y
-sta {z1}
-lda {c1}+1,y
-sta {z1}+1
-lda {c1}+2,y
-sta {z1}+2
-lda {c1}+3,y
-sta {z1}+3
+//FRAGMENT vbuxx=pbuz1_derefidx_vbuyy
+lda ({z1}),y
+tax
+//FRAGMENT vbuyy=pbuz1_derefidx_vbuyy
+lda ({z1}),y
+tay
 //FRAGMENT vbuaa_ge_vbuz1_then_la1
 cmp {z1}
 bcs {la1}
-//FRAGMENT vbuz1=vbuxx_minus_1
-dex
-stx {z1}
-//FRAGMENT vbuz1=vbuyy_minus_1
+//FRAGMENT pbuc1_derefidx_vbuaa_neq_vbuc2_then_la1
+tay
+lda #{c2}
+cmp {c1},y
+bne {la1}
+//FRAGMENT pbuc1_derefidx_vbuxx_neq_vbuc2_then_la1
+lda {c1},x
+cmp #{c2}
+bne {la1}
+//FRAGMENT pbuc1_derefidx_vbuyy_neq_vbuc2_then_la1
+lda #{c2}
+cmp {c1},y
+bne {la1}
+//FRAGMENT pwuc1_derefidx_vbuz1=_word_vbuxx
+ldy {z1}
+txa
+sta {c1},y
+lda #0
+sta {c1}+1,y
+//FRAGMENT pwuc1_derefidx_vbuz1=_word_vbuyy
 tya
-sec
-sbc #1
-sta {z1}
-//FRAGMENT vbuyy_le_vbuz1_then_la1
+ldy {z1}
+sta {c1},y
+lda #0
+sta {c1}+1,y
+//FRAGMENT pwuc1_derefidx_vbuxx=_word_vbuz1
 lda {z1}
-sty $ff
-cmp $ff
+sta {c1},x
+lda #0
+sta {c1}+1,x
+//FRAGMENT pwuc1_derefidx_vbuxx=_word_vbuxx
+txa
+sta {c1},x
+lda #0
+sta {c1}+1,x
+//FRAGMENT pwuc1_derefidx_vbuxx=_word_vbuyy
+tya
+sta {c1},x
+lda #0
+sta {c1}+1,x
+//FRAGMENT pwuc1_derefidx_vbuyy=_word_vbuz1
+lda {z1}
+sta {c1},y
+lda #0
+sta {c1}+1,y
+//FRAGMENT pwuc1_derefidx_vbuyy=_word_vbuxx
+txa
+sta {c1},y
+lda #0
+sta {c1}+1,y
+//FRAGMENT pwuc1_derefidx_vbuyy=_word_vbuyy
+tya
+sta {c1},y
+lda #0
+sta {c1}+1,y
+//FRAGMENT pwuc1_derefidx_vbuxx=vwuc2
+lda #<{c2}
+sta {c1},x
+lda #>{c2}
+sta {c1}+1,x
+//FRAGMENT pwuc1_derefidx_vbuyy=vwuc2
+lda #<{c2}
+sta {c1},y
+lda #>{c2}
+sta {c1}+1,y
+//FRAGMENT qbuc1_derefidx_vbuxx=pbuz1
+lda {z1}
+sta {c1},x
+lda {z1}+1
+sta {c1}+1,x
+//FRAGMENT qbuc1_derefidx_vbuyy=pbuz1
+lda {z1}
+sta {c1},y
+lda {z1}+1
+sta {c1}+1,y
+//FRAGMENT vbuyy_ge_vbuz1_then_la1
+cpy {z1}
 bcs {la1}
-//FRAGMENT vbuz1_le_vbuaa_then_la1
-cmp {z1}
+//FRAGMENT vbuyy_ge_vbuxx_then_la1
+stx $ff
+cpy $ff
 bcs {la1}
 //FRAGMENT vbuz1_ge_vbuyy_then_la1
 lda {z1}
@@ -6956,85 +8188,287 @@ bcs {la1}
 sty $ff
 cpx $ff
 bcs  {la1}
-//FRAGMENT vbuyy_ge_vbuz1_then_la1
-cpy {z1}
-bcs {la1}
-//FRAGMENT vbuyy_ge_vbuxx_then_la1
-stx $ff
-cpy $ff
-bcs {la1}
-//FRAGMENT vbsaa=_inc_vbsaa
+//FRAGMENT vwuz1=vwuz1_ror_3
+lsr {z1}+1
+ror {z1}
+lsr {z1}+1
+ror {z1}
+lsr {z1}+1
+ror {z1}
+//FRAGMENT vwuz1=vwuz1_rol_4
+asl {z1}
+rol {z1}+1
+asl {z1}
+rol {z1}+1
+asl {z1}
+rol {z1}+1
+asl {z1}
+rol {z1}+1
+//FRAGMENT vwuz1=vwuz1_rol_6
+lda {z1}+1
+lsr
+sta $ff
+lda {z1}
+ror
+sta {z1}+1
+lda #0
+ror
+sta {z1}
+lsr $ff
+ror {z1}+1
+ror {z1}
+//FRAGMENT vwuz1=vbuc1_plus_vwuz1
+lda #{c1}
 clc
-adc #1
-//FRAGMENT vbsxx=_inc_vbsxx
-inx
-//FRAGMENT vbsyy=_sbyte_vwuz1
-ldy {z1}
-//FRAGMENT vbsyy=_inc_vbsyy
+adc {z1}
+sta {z1}
+bcc !+
+inc {z1}+1
+!:
+//FRAGMENT pbuz1=pbuz2_minus_vwuz3
+lda {z2}
+sec
+sbc {z3}
+sta {z1}
+lda {z2}+1
+sbc {z3}+1
+sta {z1}+1
+//FRAGMENT pwuz1=qwuz2_derefidx_vbuz3
+ldy {z3}
+lda ({z2}),y
+sta {z1}
 iny
-//FRAGMENT vbuz1_lt_vbuyy_then_la1
-cpy {z1}
+lda ({z2}),y
+sta {z1}+1
+//FRAGMENT vbuz1_le_0_then_la1
+lda {z1}
+cmp #0
+beq {la1}
+//FRAGMENT vwuz1_eq_vwuc1_then_la1
+lda {z1}
+cmp #<{c1}
+bne !+
+lda {z1}+1
+cmp #>{c1}
+beq {la1}
+!:
+//FRAGMENT _deref_pbuc1=_dec__deref_pbuc1
+dec {c1}
+//FRAGMENT vwuz1=pwuz2_derefidx_vbuz3
+ldy {z3}
+lda ({z2}),y
+sta {z1}
+iny
+lda ({z2}),y
+sta {z1}+1
+//FRAGMENT _deref_pbuz1_gt_vbuz2_then_la1
+ldy #0
+lda ({z1}),y
+cmp {z2}
 beq !+
 bcs {la1}
 !:
-//FRAGMENT vbuaa_lt_vbuxx_then_la1
-stx $ff
-cmp $ff
-bcc {la1}
-//FRAGMENT vbuaa_lt_vbuyy_then_la1
-tax
-sty $ff
-cpx $ff
-bcc {la1}
-//FRAGMENT vbuxx_lt_vbuyy_then_la1
-sty $ff
-cpx $ff
-bcc {la1}
-//FRAGMENT vbuyy_lt_vbuaa_then_la1
+//FRAGMENT pbuz1_derefidx_(_deref_pbuz2)=_inc_pbuz1_derefidx_(_deref_pbuz2)
+ldy #0
+lda ({z2}),y
+tay
+lda ({z1}),y
+clc
+adc #1
+sta ({z1}),y
+//FRAGMENT vwuz1=_deref_pbuz2_rol_1
+ldy #0
+lda ({z2}),y
+asl
+sta {z1}
+lda #0
+rol
+sta {z1}+1
+//FRAGMENT qwuz1=qwuz2_plus_vwuz3
+lda {z2}
+clc
+adc {z3}
+sta {z1}
+lda {z2}+1
+adc {z3}+1
+sta {z1}+1
+//FRAGMENT _deref_qwuz1=pwuz2
+ldy #0
+lda {z2}
+sta ({z1}),y
+iny
+lda {z2}+1
+sta ({z1}),y
+//FRAGMENT vwuz1_neq_vbuc1_then_la1
+NO_SYNTHESIS
+//FRAGMENT vwuz1_neq_vbsc1_then_la1
+NO_SYNTHESIS
+//FRAGMENT pwuz1=_deref_qwuz2
+ldy #0
+lda ({z2}),y
+sta {z1}
+iny
+lda ({z2}),y
+sta {z1}+1
+//FRAGMENT vwuz1=pbuz2_minus_pbuz3
+lda {z2}
+sec
+sbc {z3}
+sta {z1}
+lda {z2}+1
+sbc {z3}+1
+sta {z1}+1
+//FRAGMENT pwuz1_derefidx_vbuz2=vwuz3
+ldy {z2}
+lda {z3}
+sta ({z1}),y
+iny
+lda {z3}+1
+sta ({z1}),y
+//FRAGMENT pbuz1_derefidx_vbuz2=_inc_pbuz1_derefidx_vbuz2
+ldy {z2}
+lda ({z1}),y
+clc
+adc #1
+sta ({z1}),y
+//FRAGMENT vwuz1=pwuz2_minus_pwuz3
+lda {z2}
+sec
+sbc {z3}
+sta {z1}
+lda {z2}+1
+sbc {z3}+1
+sta {z1}+1
+//FRAGMENT pwuz1=qwuz2_derefidx_vbuaa
+tay
+lda ({z2}),y
+sta {z1}
+iny
+lda ({z2}),y
+sta {z1}+1
+//FRAGMENT pwuz1=qwuz2_derefidx_vbuxx
+txa
+tay
+lda ({z2}),y
+sta {z1}
+iny
+lda ({z2}),y
+sta {z1}+1
+//FRAGMENT pwuz1=qwuz2_derefidx_vbuyy
+lda ({z2}),y
+sta {z1}
+iny
+lda ({z2}),y
+sta {z1}+1
+//FRAGMENT vbuaa_le_0_then_la1
+cmp #0
+beq {la1}
+//FRAGMENT vwuz1=pwuz2_derefidx_vbuaa
+tay
+lda ({z2}),y
+sta {z1}
+iny
+lda ({z2}),y
+sta {z1}+1
+//FRAGMENT vwuz1=pwuz2_derefidx_vbuxx
+txa
+tay
+lda ({z2}),y
+sta {z1}
+iny
+lda ({z2}),y
+sta {z1}+1
+//FRAGMENT vwuz1=pwuz2_derefidx_vbuyy
+lda ({z2}),y
+sta {z1}
+iny
+lda ({z2}),y
+sta {z1}+1
+//FRAGMENT _deref_pbuz1_gt_vbuxx_then_la1
+ldy #0
+lda ({z1}),y
 sta $ff
-cpy $ff
-bcc {la1}
-//FRAGMENT vbuyy_lt_vbuxx_then_la1
-stx $ff
-cpy $ff
-bcc {la1}
-//FRAGMENT vbuxx_le_vbuaa_then_la1
-stx $ff
-cmp $ff
-bcs {la1}
-//FRAGMENT vbuyy_le_vbuaa_then_la1
-sty $ff
-cmp $ff
-bcs {la1}
-//FRAGMENT vbuyy_le_vbuxx_then_la1
-sty $ff
 cpx $ff
-bcs  {la1}
-//FRAGMENT vbuz1_le_vbuyy_then_la1
-cpy {z1}
-bcs {la1}
-//FRAGMENT vbuxx_le_vbuyy_then_la1
-stx $ff
-cpy $ff
-bcs {la1}
-//FRAGMENT vbuz1=vbuz2_minus_vbuz1
+bcc {la1}
+//FRAGMENT pwuz1_derefidx_vbuaa=vwuz2
+tay
+lda {z2}
+sta ({z1}),y
+iny
+lda {z2}+1
+sta ({z1}),y
+//FRAGMENT pwuz1_derefidx_vbuxx=vwuz2
+txa
+tay
+lda {z2}
+sta ({z1}),y
+iny
+lda {z2}+1
+sta ({z1}),y
+//FRAGMENT pwuz1_derefidx_vbuyy=vwuz2
+lda {z2}
+sta ({z1}),y
+iny
+lda {z2}+1
+sta ({z1}),y
+//FRAGMENT pbuz1_derefidx_vbuxx=_inc_pbuz1_derefidx_vbuxx
+txa
+tay
+lda ({z1}),y
+clc
+adc #1
+sta ({z1}),y
+//FRAGMENT vbuxx_le_0_then_la1
+cpx #0
+beq {la1}
+//FRAGMENT pbuz1=pbuz2_minus_vwuz1
 lda {z2}
 sec
 sbc {z1}
 sta {z1}
-//FRAGMENT vbsz1=vbsz1_minus_vbsz2
+lda {z2}+1
+sbc {z1}+1
+sta {z1}+1
+//FRAGMENT vwuz1=_deref_pbuz1_rol_1
+ldy #0
+lda ({z1}),y
+asl
+sta {z1}
+lda #0
+rol
+sta {z1}+1
+//FRAGMENT qwuz1=qwuz2_plus_vwuz1
+lda {z1}
+clc
+adc {z2}
+sta {z1}
+lda {z1}+1
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT pwuz1=_deref_qwuz1
+ldy #0
+lda ({z1}),y
+pha
+iny
+lda ({z1}),y
+sta {z1}+1
+pla
+sta {z1}
+//FRAGMENT vwuz1=pwuz1_minus_pwuz2
 lda {z1}
 sec
 sbc {z2}
 sta {z1}
-//FRAGMENT vbuz1=vbuc1_plus_vbuz1
-lax {z1}
-axs #-[{c1}]
-stx {z1}
-//FRAGMENT vbuz1=vbuz1_band_vbuc1
-lda #{c1}
-and {z1}
-sta {z1}
+lda {z1}+1
+sbc {z2}+1
+sta {z1}+1
+//FRAGMENT pbuz1_derefidx_vbuz2=pbuc1_derefidx_vbuaa
+tay
+lda {c1},y
+ldy {z2}
+sta ({z1}),y
+//FRAGMENT vbuyy=pbuc1_derefidx_vbuxx
+ldy {c1},x
 //FRAGMENT pbuz1_le_pbuc1_then_la1
 lda {z1}+1
 cmp #>{c1}
@@ -7137,8 +8571,6 @@ sta {z1}+2
 lda #>{c1}>>$10
 adc #0
 sta {z1}+3
-//FRAGMENT _deref_pbuc1=_dec__deref_pbuc1
-dec {c1}
 //FRAGMENT pbuz1_derefidx_vbuaa=vbuz2
 tay
 lda {z2}
@@ -7158,47 +8590,6 @@ sta ({z1}),y
 //FRAGMENT pbuz1_derefidx_vbuyy=vbuyy
 tya
 sta ({z1}),y
-//FRAGMENT vwuz1_neq_vwuz2_then_la1
-lda {z1}+1
-cmp {z2}+1
-bne {la1}
-lda {z1}
-cmp {z2}
-bne {la1}
-//FRAGMENT vwuz1=vwuz2_rol_7
-lda {z2}+1
-lsr
-lda {z2}
-ror
-sta {z1}+1
-lda #0
-ror
-sta {z1}
-//FRAGMENT vwuz1=vwuz2_bxor_vwuz3
-lda {z2}
-eor {z3}
-sta {z1}
-lda {z2}+1
-eor {z3}+1
-sta {z1}+1
-//FRAGMENT vwuz1=vwuz2_ror_9
-lda {z2}+1
-lsr
-sta {z1}
-lda #0
-sta {z1}+1
-//FRAGMENT vwuz1=vwuz2_rol_8
-lda {z2}
-sta {z1}+1
-lda #0
-sta {z1}
-//FRAGMENT vwuz1=vwuz1_bxor_vwuz2
-lda {z1}
-eor {z2}
-sta {z1}
-lda {z1}+1
-eor {z2}+1
-sta {z1}+1
 //FRAGMENT vwuz1_lt_vbuc1_then_la1
 lda {z1}+1
 bne !+
@@ -7206,73 +8597,11 @@ lda {z1}
 cmp #{c1}
 bcc {la1}
 !:
-//FRAGMENT vduz1=vduz2_minus_vduc1
-lda {z2}
-sec
-sbc #<{c1}
-sta {z1}
-lda {z2}+1
-sbc #>{c1}
-sta {z1}+1
-lda {z2}+2
-sbc #<{c1}>>$10
-sta {z1}+2
-lda {z2}+3
-sbc #>{c1}>>$10
-sta {z1}+3
 //FRAGMENT vwuz1=_word_vduz2
 lda {z2}
 sta {z1}
 lda {z2}+1
 sta {z1}+1
-//FRAGMENT vwuz1=vwuz2_rol_1
-lda {z2}
-asl
-sta {z1}
-lda {z2}+1
-rol
-sta {z1}+1
-//FRAGMENT pbuz1=pbuz1_plus_vwuz2
-lda {z1}
-clc
-adc {z2}
-sta {z1}
-lda {z1}+1
-adc {z2}+1
-sta {z1}+1
-//FRAGMENT _deref_pduc1=vduc2
-lda #<{c2}
-sta {c1}
-lda #>{c2}
-sta {c1}+1
-lda #<{c2}>>$10
-sta {c1}+2
-lda #>{c2}>>$10
-sta {c1}+3
-//FRAGMENT vduz1=vduc1_minus__deref_pduc2
-lda #<{c1}
-sec
-sbc {c2}
-sta {z1}
-lda #>{c1}
-sbc {c2}+1
-sta {z1}+1
-lda #<{c1}>>$10
-sbc {c2}+2
-sta {z1}+2
-lda #>{c1}>>$10
-sbc {c2}+3
-sta {z1}+3
-//FRAGMENT vwuz1=_hi_vduz2
-lda {z2}+2
-sta {z1}
-lda {z2}+3
-sta {z1}+1
-//FRAGMENT vwuz1=_lo_vduz2
-lda {z2}
-sta {z1}
-lda {z2}+1
-sta {z1}+1
 //FRAGMENT vduz1=vwuz2_dword_vwuz3
 lda {z2}
 sta {z1}+2
@@ -7282,20 +8611,6 @@ lda {z3}
 sta {z1}
 lda {z3}+1
 sta {z1}+1
-//FRAGMENT vduz1=vduz1_minus_vduc1
-lda {z1}
-sec
-sbc #<{c1}
-sta {z1}
-lda {z1}+1
-sbc #>{c1}
-sta {z1}+1
-lda {z1}+2
-sbc #<{c1}>>$10
-sta {z1}+2
-lda {z1}+3
-sbc #>{c1}>>$10
-sta {z1}+3
 //FRAGMENT _deref_pbuz1_eq_vbuz2_then_la1
 lda {z2}
 ldy #0
@@ -7321,10 +8636,6 @@ lda {z2}
 sta {z1}
 lda #0
 sta {z1}+1
-//FRAGMENT vbuz1=vwuz2_band_vbuc1
-lda #{c1}
-and {z2}
-sta {z1}
 //FRAGMENT vbuz1=pwuc1_derefidx_vbuz2_band_vbuc2
 lda #{c2}
 ldy {z2}
@@ -7344,17 +8655,6 @@ tya
 sta {z1}
 lda #0
 sta {z1}+1
-//FRAGMENT vbuaa=vwuz1_band_vbuc1
-lda #{c1}
-and {z1}
-//FRAGMENT vbuxx=vwuz1_band_vbuc1
-lda #{c1}
-and {z1}
-tax
-//FRAGMENT vbuyy=vwuz1_band_vbuc1
-lda #{c1}
-and {z1}
-tay
 //FRAGMENT vbuaa=pwuc1_derefidx_vbuz1_band_vbuc2
 lda #{c2}
 ldy {z1}
@@ -7760,37 +9060,12 @@ dey
 txa
 tay
 dey
-//FRAGMENT vbuz1=pbuz2_derefidx_vbuz3
-ldy {z3}
-lda ({z2}),y
-sta {z1}
 //FRAGMENT vwuz1=vwuz2_bor_vbuz3
 lda {z3}
 ora {z2}
 sta {z1}
 lda {z2}+1
 sta {z1}+1
-//FRAGMENT vwuz1=vwuz2_rol_4
-lda {z2}
-asl
-sta {z1}
-lda {z2}+1
-rol
-sta {z1}+1
-asl {z1}
-rol {z1}+1
-asl {z1}
-rol {z1}+1
-asl {z1}
-rol {z1}+1
-//FRAGMENT vbuxx=pbuz1_derefidx_vbuz2
-ldy {z2}
-lda ({z1}),y
-tax
-//FRAGMENT vbuyy=pbuz1_derefidx_vbuz2
-ldy {z2}
-lda ({z1}),y
-tay
 //FRAGMENT vbuz1=pbuz2_derefidx_vbuaa
 tay
 lda ({z2}),y
@@ -7806,30 +9081,6 @@ tax
 tay
 lda ({z1}),y
 tay
-//FRAGMENT vbuz1=pbuz2_derefidx_vbuxx
-txa
-tay
-lda ({z2}),y
-sta {z1}
-//FRAGMENT vbuxx=pbuz1_derefidx_vbuxx
-txa
-tay
-lda ({z1}),y
-tax
-//FRAGMENT vbuyy=pbuz1_derefidx_vbuxx
-txa
-tay
-lda ({z1}),y
-tay
-//FRAGMENT vbuz1=pbuz2_derefidx_vbuyy
-lda ({z2}),y
-sta {z1}
-//FRAGMENT vbuxx=pbuz1_derefidx_vbuyy
-lda ({z1}),y
-tax
-//FRAGMENT vbuyy=pbuz1_derefidx_vbuyy
-lda ({z1}),y
-tay
 //FRAGMENT vwuz1=vwuz2_bor_vbuxx
 txa
 ora {z2}
@@ -7851,24 +9102,14 @@ sta ({z1}),y
 lda {c2},y
 ldy #{c1}
 sta ({z1}),y
+//FRAGMENT vbuyy_lt_vbuxx_then_la1
+stx $ff
+cpy $ff
+bcc {la1}
 //FRAGMENT vwuz1=vwuz1_bor_vbuxx
 txa
 ora {z1}
 sta {z1}
-//FRAGMENT vwuz1=vwuz1_rol_4
-asl {z1}
-rol {z1}+1
-asl {z1}
-rol {z1}+1
-asl {z1}
-rol {z1}+1
-asl {z1}
-rol {z1}+1
-//FRAGMENT vbuz1=vbuc1_minus_vbuz2
-lda #{c1}
-sec
-sbc {z2}
-sta {z1}
 //FRAGMENT vbuz1_ge_pbuc1_derefidx_vbuz2_then_la1
 lda {z1}
 ldy {z2}
@@ -7914,82 +9155,6 @@ bne {la1}
 lda {z1}
 cmp {z1}
 bne {la1}
-//FRAGMENT vbuaa=vbuc1_minus_vbuz1
-lda #{c1}
-sec
-sbc {z1}
-//FRAGMENT vbuxx=vbuc1_minus_vbuz1
-lda #{c1}
-sec
-sbc {z1}
-tax
-//FRAGMENT vbuyy=vbuc1_minus_vbuz1
-lda #{c1}
-sec
-sbc {z1}
-tay
-//FRAGMENT vbuz1=vbuc1_minus_vbuaa
-eor #$ff
-sec
-adc #{c1}
-sta {z1}
-//FRAGMENT vbuaa=vbuc1_minus_vbuaa
-eor #$ff
-sec
-adc #{c1}
-//FRAGMENT vbuxx=vbuc1_minus_vbuaa
-eor #$ff
-tax
-axs #-{c1}-1
-//FRAGMENT vbuyy=vbuc1_minus_vbuaa
-eor #$ff
-sec
-adc #{c1}
-tay
-//FRAGMENT vbuz1=vbuc1_minus_vbuxx
-txa
-eor #$ff
-sec
-adc #{c1}
-sta {z1}
-//FRAGMENT vbuaa=vbuc1_minus_vbuxx
-txa
-eor #$ff
-sec
-adc #{c1}
-//FRAGMENT vbuxx=vbuc1_minus_vbuxx
-txa
-eor #$ff
-tax
-axs #-{c1}-1
-//FRAGMENT vbuyy=vbuc1_minus_vbuxx
-txa
-eor #$ff
-sec
-adc #{c1}
-tay
-//FRAGMENT vbuz1=vbuc1_minus_vbuyy
-tya
-eor #$ff
-sec
-adc #{c1}
-sta {z1}
-//FRAGMENT vbuaa=vbuc1_minus_vbuyy
-tya
-eor #$ff
-sec
-adc #{c1}
-//FRAGMENT vbuxx=vbuc1_minus_vbuyy
-tya
-eor #$ff
-tax
-axs #-{c1}-1
-//FRAGMENT vbuyy=vbuc1_minus_vbuyy
-tya
-eor #$ff
-sec
-adc #{c1}
-tay
 //FRAGMENT vbuz1_ge_pbuc1_derefidx_vbuxx_then_la1
 txa
 tay
@@ -8240,18 +9405,6 @@ tax
 stx $ff
 cpy $ff
 bne {la1}
-//FRAGMENT pwuz1=pwuc1
-lda #<{c1}
-sta {z1}
-lda #>{c1}
-sta {z1}+1
-//FRAGMENT _deref_pwuz1=vwuz2
-ldy #0
-lda {z2}
-sta ({z1}),y
-iny
-lda {z2}+1
-sta ({z1}),y
 //FRAGMENT pwuz1_derefidx_vbuc1=vwuz2
 ldy #{c1}
 lda {z2}
@@ -8259,14 +9412,6 @@ sta ({z1}),y
 iny
 lda {z2}+1
 sta ({z1}),y
-//FRAGMENT pwuz1=pwuz1_plus_vbuc1
-lda #{c1}
-clc
-adc {z1}
-sta {z1}
-bcc !+
-inc {z1}+1
-!:
 //FRAGMENT vbuz1=vbuz2_plus_2
 lda {z2}
 clc
@@ -8328,14 +9473,10 @@ bvc !+
 eor #$80
 !:
 bmi {la1}
-//FRAGMENT vwsz1_ge_0_then_la1
-lda {z1}+1
-bpl {la1}
-//FRAGMENT vwsz1=vbsc1
-lda #<{c1}
-sta {z1}
-lda #>{c1}
-sta {z1}+1
+//FRAGMENT vbsxx=_inc_vbsxx
+inx
+//FRAGMENT vbsyy=_inc_vbsyy
+iny
 //FRAGMENT vwsz1=vwsz2_ror_7
 lda {z2}+1
 sta {z1}
@@ -8382,90 +9523,24 @@ sta {z1}+1
 //FRAGMENT _deref_pbsc1=vbsz1
 lda {z1}
 sta {c1}
-//FRAGMENT pwuc1_derefidx_vbuz1=_word_vbuz2
-lda {z2}
-ldy {z1}
-sta {c1},y
-lda #0
-sta {c1}+1,y
 //FRAGMENT pwuc1_derefidx_vbuaa=_word_vbuz1
 tay
 lda {z1}
 sta {c1},y
 lda #0
 sta {c1}+1,y
-//FRAGMENT pwuc1_derefidx_vbuxx=_word_vbuz1
-lda {z1}
-sta {c1},x
-lda #0
-sta {c1}+1,x
-//FRAGMENT pwuc1_derefidx_vbuyy=_word_vbuz1
-lda {z1}
-sta {c1},y
-lda #0
-sta {c1}+1,y
-//FRAGMENT pwuc1_derefidx_vbuz1=_word_vbuxx
-ldy {z1}
-txa
-sta {c1},y
-lda #0
-sta {c1}+1,y
 //FRAGMENT pwuc1_derefidx_vbuaa=_word_vbuxx
 tay
 txa
 sta {c1},y
 lda #0
 sta {c1}+1,y
-//FRAGMENT pwuc1_derefidx_vbuxx=_word_vbuxx
-txa
-sta {c1},x
-lda #0
-sta {c1}+1,x
-//FRAGMENT pwuc1_derefidx_vbuyy=_word_vbuxx
-txa
-sta {c1},y
-lda #0
-sta {c1}+1,y
-//FRAGMENT pwuc1_derefidx_vbuz1=_word_vbuyy
-tya
-ldy {z1}
-sta {c1},y
-lda #0
-sta {c1}+1,y
 //FRAGMENT pwuc1_derefidx_vbuaa=_word_vbuyy
 tax
 tya
 sta {c1},x
 lda #0
 sta {c1}+1,x
-//FRAGMENT pwuc1_derefidx_vbuxx=_word_vbuyy
-tya
-sta {c1},x
-lda #0
-sta {c1}+1,x
-//FRAGMENT pwuc1_derefidx_vbuyy=_word_vbuyy
-tya
-sta {c1},y
-lda #0
-sta {c1}+1,y
-//FRAGMENT pbuc1_derefidx_vbuz1_neq_vbuc2_then_la1
-lda #{c2}
-ldy {z1}
-cmp {c1},y
-bne {la1}
-//FRAGMENT pbuc1_derefidx_vbuaa_neq_vbuc2_then_la1
-tay
-lda #{c2}
-cmp {c1},y
-bne {la1}
-//FRAGMENT pbuc1_derefidx_vbuxx_neq_vbuc2_then_la1
-lda {c1},x
-cmp #{c2}
-bne {la1}
-//FRAGMENT pbuc1_derefidx_vbuyy_neq_vbuc2_then_la1
-lda #{c2}
-cmp {c1},y
-bne {la1}
 //FRAGMENT vbuxx_neq_vbuaa_then_la1
 tay
 stx $ff
@@ -8522,19 +9597,16 @@ inc {z1}
 lax {z1}
 axs #{c1}
 stx {z1}
-//FRAGMENT pbuz1=pbuz2_plus_1
-clc
-lda {z2}
-adc #1
-sta {z1}
-lda {z2}+1
-adc #0
-sta {z1}+1
 //FRAGMENT vbsz1=vbsz2_plus_vbsz3
 lda {z2}
 clc
 adc {z3}
 sta {z1}
+//FRAGMENT vbsz1=vbsz2_minus_vbsz3
+lda {z2}
+sec
+sbc {z3}
+sta {z1}
 //FRAGMENT vbsz1=pbsc1_derefidx_vbsz2_plus_pbsc1_derefidx_vbsz3
 ldy {z2}
 lda {c1},y
@@ -8897,6 +9969,18 @@ tay
 tya
 asl
 tay
+//FRAGMENT vbsz1=vbsz2_minus_vbsxx
+txa
+eor #$ff
+sec
+adc {z2}
+sta {z1}
+//FRAGMENT vbsz1=vbsz2_minus_vbsyy
+tya
+eor #$ff
+sec
+adc {z2}
+sta {z1}
 //FRAGMENT vbsaa=vbsz1_minus_vbsz2
 lda {z1}
 sec
@@ -8911,6 +9995,23 @@ tya
 eor #$ff
 sec
 adc {z1}
+//FRAGMENT vbsxx=vbsz1_minus_vbsz2
+lda {z1}
+sec
+sbc {z2}
+tax
+//FRAGMENT vbsxx=vbsz1_minus_vbsxx
+txa
+eor #$ff
+sec
+adc {z1}
+tax
+//FRAGMENT vbsxx=vbsz1_minus_vbsyy
+tya
+eor #$ff
+sec
+adc {z1}
+tax
 //FRAGMENT vbsyy=vbsz1_minus_vbsz2
 lda {z1}
 sec
@@ -8928,6 +10029,20 @@ eor #$ff
 sec
 adc {z1}
 tay
+//FRAGMENT vbsz1=vbsxx_minus_vbsz2
+txa
+sec
+sbc {z2}
+sta {z1}
+//FRAGMENT vbsz1=vbsxx_minus_vbsxx
+lda #0
+sta {z1}
+//FRAGMENT vbsz1=vbsxx_minus_vbsyy
+txa
+sty $ff
+sec
+sbc $ff
+sta {z1}
 //FRAGMENT vbsaa=vbsxx_minus_vbsz1
 txa
 sec
@@ -8939,6 +10054,20 @@ txa
 sty $ff
 sec
 sbc $ff
+//FRAGMENT vbsxx=vbsxx_minus_vbsz1
+txa
+sec
+sbc {z1}
+tax
+//FRAGMENT vbsxx=vbsxx_minus_vbsxx
+lda #0
+tax
+//FRAGMENT vbsxx=vbsxx_minus_vbsyy
+txa
+sty $ff
+sec
+sbc $ff
+tax
 //FRAGMENT vbsyy=vbsxx_minus_vbsz1
 txa
 sec
@@ -8953,6 +10082,20 @@ sty $ff
 sec
 sbc $ff
 tay
+//FRAGMENT vbsz1=vbsyy_minus_vbsz2
+tya
+sec
+sbc {z2}
+sta {z1}
+//FRAGMENT vbsz1=vbsyy_minus_vbsxx
+tya
+stx $ff
+sec
+sbc $ff
+sta {z1}
+//FRAGMENT vbsz1=vbsyy_minus_vbsyy
+lda #0
+sta {z1}
 //FRAGMENT vbsaa=vbsyy_minus_vbsz1
 tya
 sec
@@ -8964,6 +10107,20 @@ sec
 sbc $ff
 //FRAGMENT vbsaa=vbsyy_minus_vbsyy
 lda #0
+//FRAGMENT vbsxx=vbsyy_minus_vbsz1
+tya
+sec
+sbc {z1}
+tax
+//FRAGMENT vbsxx=vbsyy_minus_vbsxx
+tya
+stx $ff
+sec
+sbc $ff
+tax
+//FRAGMENT vbsxx=vbsyy_minus_vbsyy
+lda #0
+tax
 //FRAGMENT vbsyy=vbsyy_minus_vbsz1
 tya
 sec
@@ -9837,9 +10994,6 @@ tay
 lda {c1}
 //FRAGMENT vbsxx=_deref_pbsc1
 ldx {c1}
-//FRAGMENT vbuxx=pbuc1_derefidx_vbuxx
-lda {c1},x
-tax
 //FRAGMENT vbsyy=_deref_pbsc1
 ldy {c1}
 //FRAGMENT _deref_pbsc1=vbsxx
@@ -9903,13 +11057,6 @@ sta ({z1}),y
 iny
 lda {z2}+1
 sta ({z1}),y
-//FRAGMENT vwuz1=_deref_pwuz2
-ldy #0
-lda ({z2}),y
-sta {z1}
-iny
-lda ({z2}),y
-sta {z1}+1
 //FRAGMENT vwuz1=pwuz2_derefidx_vbuc1
 ldy #{c1}
 lda ({z2}),y
@@ -9949,29 +11096,11 @@ bne {la1}
 lda {z1}
 cmp #<{c1}
 bne {la1}
-//FRAGMENT vwuz1_neq_vbuc1_then_la1
-NO_SYNTHESIS
-//FRAGMENT vwuz1_neq_vbsc1_then_la1
-NO_SYNTHESIS
-//FRAGMENT pbuc1_derefidx_vbuz1=_byte_vwuz2
-ldy {z1}
+//FRAGMENT vwuz1=vwuz2_rol_8
 lda {z2}
-sta {c1},y
-//FRAGMENT vwuz1=vwuz2_ror_1
-lda {z2}+1
-lsr
 sta {z1}+1
-lda {z2}
-ror
+lda #0
 sta {z1}
-//FRAGMENT vwuz1=vwuz2_plus_1
-clc
-lda {z2}
-adc #1
-sta {z1}
-lda {z2}+1
-adc #0
-sta {z1}+1
 //FRAGMENT vwuz1=vwuz2_ror_4
 lda {z2}+1
 lsr
@@ -10009,6 +11138,9 @@ bcs {la1}
 //FRAGMENT pbuc1_derefidx_vbuxx=_byte_vwuz1
 lda {z1}
 sta {c1},x
+//FRAGMENT vbuz1_le_vbuyy_then_la1
+cpy {z1}
+bcs {la1}
 //FRAGMENT vwuz1=vwuz1_plus_1
 inc {z1}
 bne !+
@@ -10055,6 +11187,35 @@ lda #<{c2}
 sta {c1},y
 lda #>{c2}
 sta {c1}+1,y
+//FRAGMENT vwuz1=vwuz2_rol_7
+lda {z2}+1
+lsr
+lda {z2}
+ror
+sta {z1}+1
+lda #0
+ror
+sta {z1}
+//FRAGMENT vwuz1=vwuz2_bxor_vwuz3
+lda {z2}
+eor {z3}
+sta {z1}
+lda {z2}+1
+eor {z3}+1
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz2_ror_9
+lda {z2}+1
+lsr
+sta {z1}
+lda #0
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz1_bxor_vwuz2
+lda {z1}
+eor {z2}
+sta {z1}
+lda {z1}+1
+eor {z2}+1
+sta {z1}+1
 //FRAGMENT _deref_pbuc1=_byte_vwuz1
 lda {z1}
 sta {c1}
@@ -10095,13 +11256,6 @@ sta {z1}+2
 lda {z2}+3
 adc #0
 sta {z1}+3
-//FRAGMENT vwuz1=vwuz2_band_vwuc1
-lda {z2}
-and #<{c1}
-sta {z1}
-lda {z2}+1
-and #>{c1}
-sta {z1}+1
 //FRAGMENT vwuz1=vwuz2_ror_6
 lda {z2}
 asl
@@ -10938,10 +12092,6 @@ sta {z1}
 lda #>{c1}
 eor {z2}+1
 sta {z1}+1
-//FRAGMENT vbuz1=vbuz1_bxor_vbuc1
-lda #{c1}
-eor {z1}
-sta {z1}
 //FRAGMENT pbuz1_derefidx_vbuz2=pbuz1_derefidx_vbuz2_bor_pbuc1_derefidx_vbuz3
 ldx {z3}
 ldy {z2}
@@ -10959,6 +12109,11 @@ eor #$ff
 clc
 adc #$01
 sta {z1}
+//FRAGMENT vbuyy_le_vbuz1_then_la1
+lda {z1}
+sty $ff
+cmp $ff
+bcs {la1}
 //FRAGMENT pbuz1_derefidx_vbuz2=pbuz1_derefidx_vbuz2_bor_pbuc1_derefidx_vbuaa
 ldy {z2}
 tax
@@ -11073,15 +12228,6 @@ tax
 txa
 eor ({z1}),y
 tax
-//FRAGMENT vbuaa=_neg_vbuaa
-eor #$ff
-clc
-adc #$01
-//FRAGMENT vbuxx=_neg_vbuxx
-dex
-txa
-eor #$ff
-tax
 //FRAGMENT vbuyy=_neg_vbuyy
 dey
 tya
@@ -11256,14 +12402,6 @@ sta {z1}
 lda #0
 rol
 sta {z1}+1
-//FRAGMENT vwuz1=vwuz2_plus_vbuc1
-lda #{c1}
-clc
-adc {z2}
-sta {z1}
-lda #0
-adc {z2}+1
-sta {z1}+1
 //FRAGMENT vwuz1=vbuxx_rol_1
 txa
 asl
@@ -11281,152 +12419,200 @@ sta {z1}+1
 //FRAGMENT vbuyy=pbuc1_derefidx_vbuyy
 lda {c1},y
 tay
-//FRAGMENT vbsz1=vbsc1_minus_vbsz2
-lda #{c1}
-sec
-sbc {z2}
+//FRAGMENT pwsz1=pwsc1
+lda #<{c1}
 sta {z1}
-//FRAGMENT vbsz1=vbsc1_minus_vbsaa
-eor #$ff
-sec
-adc #{c1}
+lda #>{c1}
+sta {z1}+1
+//FRAGMENT vwuz1=_hi_vdsz2
+lda {z2}+2
 sta {z1}
-//FRAGMENT vbsz1=vbsc1_minus_vbsxx
-txa
-eor #$ff
-sec
-adc #{c1}
-sta {z1}
-//FRAGMENT vbsz1=vbsc1_minus_vbsyy
-tya
-eor #$ff
-sec
-adc #{c1}
-sta {z1}
-//FRAGMENT vbsaa=vbsc1_minus_vbsz1
+lda {z2}+3
+sta {z1}+1
+//FRAGMENT pwsz1=pwsz1_plus_vbuc1
 lda #{c1}
-sec
-sbc {z1}
-//FRAGMENT vbsaa=vbsc1_minus_vbsaa
-eor #$ff
-sec
-adc #{c1}
-//FRAGMENT vbsaa=vbsc1_minus_vbsxx
-txa
-eor #$ff
-sec
-adc #{c1}
-//FRAGMENT vbsaa=vbsc1_minus_vbsyy
-tya
-eor #$ff
-sec
-adc #{c1}
-//FRAGMENT vbsxx=vbsc1_minus_vbsz1
-lda #{c1}
-sec
-sbc {z1}
-tax
-//FRAGMENT vbsxx=vbsc1_minus_vbsaa
-eor #$ff
-tax
-axs #-{c1}-1
-//FRAGMENT vbsxx=vbsc1_minus_vbsxx
-txa
-eor #$ff
-tax
-axs #-{c1}-1
-//FRAGMENT vbsxx=vbsc1_minus_vbsyy
-tya
-eor #$ff
-tax
-axs #-{c1}-1
-//FRAGMENT vbsyy=vbsc1_minus_vbsz1
-lda #{c1}
-sec
-sbc {z1}
-tay
-//FRAGMENT vbsyy=vbsc1_minus_vbsaa
-eor #$ff
-sec
-adc #{c1}
-tay
-//FRAGMENT vbsyy=vbsc1_minus_vbsxx
-txa
-eor #$ff
-sec
-adc #{c1}
-tay
-//FRAGMENT vbsyy=vbsc1_minus_vbsyy
-tya
-eor #$ff
-sec
-adc #{c1}
-tay
-//FRAGMENT vbsc1_neq_vbsaa_then_la1
-cmp #{c1}
-bne {la1}
-//FRAGMENT vbsyy=vbsz1_minus_vbsaa
-eor #$ff
-sec
+clc
 adc {z1}
-tay
-//FRAGMENT vbsyy=vbsxx_minus_vbsaa
-sta $ff
-txa
-sec
-sbc $ff
-tay
-//FRAGMENT vbsyy=vbsyy_minus_vbsaa
-sta $ff
-tya
-sec
-sbc $ff
-tay
-//FRAGMENT vbsyy_lt_0_then_la1
-cpy #0
-bmi {la1}
-//FRAGMENT vbsz1_neq_0_then_la1
+sta {z1}
+bcc !+
+inc {z1}+1
+!:
+//FRAGMENT pwsz1=pwsc1_plus_vwuz2
+clc
+lda {z2}
+adc #<{c1}
+sta {z1}
+lda {z2}+1
+adc #>{c1}
+sta {z1}+1
+//FRAGMENT vduz1_lt_vduc1_then_la1
+lda {z1}+3
+cmp #>{c1}>>$10
+bcc {la1}
+bne !+
+lda {z1}+2
+cmp #<{c1}>>$10
+bcc {la1}
+bne !+
+lda {z1}+1
+cmp #>{c1}
+bcc {la1}
+bne !+
 lda {z1}
-cmp #0
-bne {la1}
-//FRAGMENT vwsz1=vbsz2
+cmp #<{c1}
+bcc {la1}
+!:
+//FRAGMENT vduz1=vduc1_minus_vduz1
+lda #<{c1}
+sec
+sbc {z1}
+sta {z1}
+lda #>{c1}
+sbc {z1}+1
+sta {z1}+1
+lda #<{c1}>>$10
+sbc {z1}+2
+sta {z1}+2
+lda #>{c1}>>$10
+sbc {z1}+3
+sta {z1}+3
+//FRAGMENT vduz1=vduz2_rol_3
+lda {z2}
+asl
+sta {z1}
+lda {z2}+1
+rol
+sta {z1}+1
+lda {z2}+2
+rol
+sta {z1}+2
+lda {z2}+3
+rol
+sta {z1}+3
+asl {z1}
+rol {z1}+1
+rol {z1}+2
+rol {z1}+3
+asl {z1}
+rol {z1}+1
+rol {z1}+2
+rol {z1}+3
+//FRAGMENT vwuz1=vwuz2_minus_vwuc1
+lda {z2}
+sec
+sbc #<{c1}
+sta {z1}
+lda {z2}+1
+sbc #>{c1}
+sta {z1}+1
+//FRAGMENT vbuz1=_byte_vwsz2
 lda {z2}
 sta {z1}
-and #$80
-beq !+
-lda #$ff
-!:
-sta {z1}+1
-//FRAGMENT vbsaa_neq_0_then_la1
-cmp #0
-bne {la1}
-//FRAGMENT vwsz1=vbsaa
+//FRAGMENT vbsz1=_sbyte_vwsz2
+lda {z2}
 sta {z1}
-and #$80
-beq !+
-lda #$ff
-!:
-sta {z1}+1
-//FRAGMENT vwsz1=vbsxx
-txa
+//FRAGMENT vduz1=vduz2_rol_vbuz3
+ldy {z3}
+lda {z2}
 sta {z1}
-and #$80
-beq !+
-lda #$ff
-!:
+lda {z2}+1
 sta {z1}+1
-//FRAGMENT vwsz1=vbsyy
-tya
+lda {z2}+2
+sta {z1}+2
+lda {z2}+3
+sta {z1}+3
+cpy #0
+beq !e+
+!:
+asl {z1}
+rol {z1}+1
+rol {z1}+2
+rol {z1}+3
+dey
+bne !-
+!e:
+//FRAGMENT vbuaa=_byte_vwsz1
+lda {z1}
+//FRAGMENT vbuxx=_byte_vwsz1
+lda {z1}
+tax
+//FRAGMENT vbuyy=_byte_vwsz1
+lda {z1}
+tay
+//FRAGMENT vbsaa=_sbyte_vwsz1
+lda {z1}
+//FRAGMENT vbsxx=_sbyte_vwsz1
+lda {z1}
+tax
+//FRAGMENT vbsyy=_sbyte_vwsz1
+lda {z1}
+tay
+//FRAGMENT vduz1=vduz2_rol_vbuxx
+lda {z2}
 sta {z1}
-and #$80
-beq !+
-lda #$ff
-!:
+lda {z2}+1
 sta {z1}+1
-//FRAGMENT vbsxx_neq_0_then_la1
-txa
-cmp #0
-bne {la1}
+lda {z2}+2
+sta {z1}+2
+lda {z2}+3
+sta {z1}+3
+cpx #0
+beq !e+
+!:
+asl {z1}
+rol {z1}+1
+rol {z1}+2
+rol {z1}+3
+dex
+bne !-
+!e:
+//FRAGMENT vduz1=vduz2_rol_vbuyy
+lda {z2}
+sta {z1}
+lda {z2}+1
+sta {z1}+1
+lda {z2}+2
+sta {z1}+2
+lda {z2}+3
+sta {z1}+3
+cpy #0
+beq !e+
+!:
+asl {z1}
+rol {z1}+1
+rol {z1}+2
+rol {z1}+3
+dey
+bne !-
+!e:
+//FRAGMENT vduz1=vduz1_rol_3
+ldy #3
+!:
+asl {z1}
+rol {z1}+1
+rol {z1}+2
+rol {z1}+3
+dey
+bne !-
+//FRAGMENT pwsz1=pwsc1_plus_vwuz1
+clc
+lda {z1}
+adc #<{c1}
+sta {z1}
+lda {z1}+1
+adc #>{c1}
+sta {z1}+1
+//FRAGMENT vduz1=vduz1_rol_vbuxx
+cpx #0
+beq !e+
+!:
+asl {z1}
+rol {z1}+1
+rol {z1}+2
+rol {z1}+3
+dex
+bne !-
+!e:
 //FRAGMENT pssz1=pssc1
 lda #<{c1}
 sta {z1}
@@ -11542,14 +12728,6 @@ sta {z1}
 bcc !+
 inc {z1}+1
 !:
-//FRAGMENT pssz1=pssc1_plus_vbuz2
-lda {z2}
-clc
-adc #<{c1}
-sta {z1}
-lda #>{c1}
-adc #0
-sta {z1}+1
 //FRAGMENT pwsz1_derefidx_vbuc1=vwsc2
 ldy #{c1}
 lda #<{c2}
@@ -11566,29 +12744,11 @@ ldy {z1}
 lda {c1},y
 cmp #{c2}
 bcc {la1}
-//FRAGMENT pssz1=pssc1_plus_vbuaa
-clc
-adc #<{c1}
-sta {z1}
-lda #>{c1}
-adc #0
-sta {z1}+1
-//FRAGMENT pssz1=pssc1_plus_vbuxx
-txa
-clc
-adc #<{c1}
-sta {z1}
-lda #>{c1}
-adc #0
-sta {z1}+1
-//FRAGMENT pssz1=pssc1_plus_vbuyy
-tya
-clc
-adc #<{c1}
-sta {z1}
-lda #>{c1}
-adc #0
-sta {z1}+1
+//FRAGMENT vbuc1_eq_pbuc2_derefidx_vbuz1_then_la1
+ldy {z1}
+lda {c2},y
+cmp #{c1}
+beq {la1}
 //FRAGMENT pbsz1_derefidx_vbuc1=vbsxx
 ldy #{c1}
 txa
@@ -11606,23 +12766,32 @@ bcc {la1}
 lda {c1},y
 cmp #{c2}
 bcc {la1}
+//FRAGMENT vbuc1_eq_pbuc2_derefidx_vbuaa_then_la1
+tay
+lda {c2},y
+cmp #{c1}
+beq {la1}
+//FRAGMENT vbuc1_eq_pbuc2_derefidx_vbuxx_then_la1
+lda {c2},x
+cmp #{c1}
+beq {la1}
+//FRAGMENT vbuc1_eq_pbuc2_derefidx_vbuyy_then_la1
+lda {c2},y
+cmp #{c1}
+beq {la1}
 //FRAGMENT vbuxx=vbuxx_minus_1
 dex
 //FRAGMENT vbuyy=vbuyy_minus_1
 tya
 tay
 dey
-//FRAGMENT pbuz1_derefidx_vbuz2=_inc_pbuz1_derefidx_vbuz2
-ldy {z2}
-lda ({z1}),y
-clc
-adc #1
-sta ({z1}),y
-//FRAGMENT _deref_pwsc1=vwsc2
-lda #<{c2}
-sta {c1}
-lda #>{c2}
-sta {c1}+1
+//FRAGMENT vwsz1_neq_vwsc1_then_la1
+lda {z1}+1
+cmp #>{c1}
+bne {la1}
+lda {z1}
+cmp #<{c1}
+bne {la1}
 //FRAGMENT _deref_pwsc1=vwsz1
 lda {z1}
 sta {c1}
@@ -11667,10 +12836,6 @@ sta {z1}
 ldy {z2}
 lda {c1}+1,y
 sta {z1}
-//FRAGMENT vbuz1=vbuc1_bxor_vbuz2
-lda #{c1}
-eor {z2}
-sta {z1}
 //FRAGMENT pwuc1_derefidx_vbuz1=vbuxx
 ldy {z1}
 txa
@@ -11892,17 +13057,6 @@ tay
 //FRAGMENT vbuyy=_hi_pwuc1_derefidx_vbuxx
 lda {c1}+1,x
 tay
-//FRAGMENT vbuaa=vbuc1_bxor_vbuz1
-lda #{c1}
-eor {z1}
-//FRAGMENT vbuxx=vbuc1_bxor_vbuz1
-lda #{c1}
-eor {z1}
-tax
-//FRAGMENT vbuyy=vbuc1_bxor_vbuz1
-lda #{c1}
-eor {z1}
-tay
 //FRAGMENT vbuxx_ge_pbuc1_derefidx_(pbuc2_derefidx_vbuz1)_then_la1
 ldy {z1}
 txa
@@ -11947,16 +13101,6 @@ cpx $ff
 bcc {la1}
 //FRAGMENT vbsxx=pbsc1_derefidx_vbuyy
 ldx {c1},y
-//FRAGMENT vbuaa=vbuxx_plus_1
-inx
-txa
-//FRAGMENT vbuaa=vbuyy_plus_1
-iny
-tya
-//FRAGMENT vbuxx=vbuyy_plus_1
-tya
-tax
-inx
 //FRAGMENT pbuc1_derefidx_vbuz1=pbuz2_derefidx_vbuc2
 ldx {z1}
 ldy #{c2}
@@ -12092,28 +13236,12 @@ bcc {la1}
 ldy {m1}
 tya
 sta {c1},y
-//FRAGMENT pwuc1_derefidx_vbuz1=vwuc2
-ldy {z1}
-lda #<{c2}
-sta {c1},y
-lda #>{c2}
-sta {c1}+1,y
 //FRAGMENT pwuc1_derefidx_vbuaa=vwuc2
 tay
 lda #<{c2}
 sta {c1},y
 lda #>{c2}
 sta {c1}+1,y
-//FRAGMENT pwuc1_derefidx_vbuxx=vwuc2
-lda #<{c2}
-sta {c1},x
-lda #>{c2}
-sta {c1}+1,x
-//FRAGMENT pwuc1_derefidx_vbuyy=vwuc2
-lda #<{c2}
-sta {c1},y
-lda #>{c2}
-sta {c1}+1,y
 //FRAGMENT _deref_pbuc1_ge_vbuc2_then_la1
 lda {c1}
 cmp #{c2}
@@ -12131,40 +13259,18 @@ tax
 //FRAGMENT vboyy=vboxx
 txa
 tay
-//FRAGMENT vwuz1=pwuz2_derefidx_vbuz3
-ldy {z3}
-lda ({z2}),y
-sta {z1}
-iny
-lda ({z2}),y
-sta {z1}+1
-//FRAGMENT vwuz1=pwuz2_derefidx_vbuaa
-tay
-lda ({z2}),y
-sta {z1}
-iny
-lda ({z2}),y
-sta {z1}+1
-//FRAGMENT vwuz1=pwuz2_derefidx_vbuxx
-txa
-tay
-lda ({z2}),y
-sta {z1}
-iny
-lda ({z2}),y
-sta {z1}+1
-//FRAGMENT vwuz1=pwuz2_derefidx_vbuyy
-lda ({z2}),y
-sta {z1}
-iny
-lda ({z2}),y
-sta {z1}+1
-//FRAGMENT vbsz1=vbsz1_minus_vbsxx
-txa
-eor #$ff
+//FRAGMENT vwsz1=vwsz1_minus_vwsc1
+lda {z1}
 sec
-adc {z1}
+sbc #<{c1}
 sta {z1}
+lda {z1}+1
+sbc #>{c1}
+sta {z1}+1
+//FRAGMENT vbuaa_lt_vbuxx_then_la1
+stx $ff
+cmp $ff
+bcc {la1}
 //FRAGMENT vbsz1=pbsc1_derefidx_vbuz2_minus_pbsc2_derefidx_vbuz2
 ldy {z2}
 lda {c1},y
@@ -12279,6 +13385,57 @@ lda {c1}
 sta {z1}
 lda {c1}+1
 sta {z1}+1
+//FRAGMENT pbuc1_derefidx_vbuz1_eq_vbuz2_then_la1
+ldy {z1}
+lda {c1},y
+cmp {z2}
+beq {la1}
+//FRAGMENT pbuc1_derefidx_vbuxx_eq_vbuz1_then_la1
+lda {c1},x
+cmp {z1}
+beq {la1}
+//FRAGMENT pbuc1_derefidx_vbuyy_eq_vbuz1_then_la1
+lda {c1},y
+cmp {z1}
+beq {la1}
+//FRAGMENT pbuc1_derefidx_vbuz1_eq_vbuxx_then_la1
+ldy {z1}
+lda {c1},y
+tay
+sty $ff
+cpx $ff
+beq  {la1}
+//FRAGMENT pbuc1_derefidx_vbuxx_eq_vbuxx_then_la1
+lda {c1},x
+tay
+sty $ff
+cpx $ff
+beq  {la1}
+//FRAGMENT pbuc1_derefidx_vbuyy_eq_vbuxx_then_la1
+lda {c1},y
+tay
+sty $ff
+cpx $ff
+beq  {la1}
+//FRAGMENT pbuc1_derefidx_vbuz1_eq_vbuyy_then_la1
+ldx {z1}
+lda {c1},x
+tax
+sty $ff
+cpx $ff
+beq  {la1}
+//FRAGMENT pbuc1_derefidx_vbuxx_eq_vbuyy_then_la1
+lda {c1},x
+tax
+sty $ff
+cpx $ff
+beq  {la1}
+//FRAGMENT pbuc1_derefidx_vbuyy_eq_vbuyy_then_la1
+lda {c1},y
+tax
+sty $ff
+cpx $ff
+beq  {la1}
 //FRAGMENT pwuc1_derefidx_vbuz1=pwuc1_derefidx_vbuz1_minus_1
 ldx {z1}
 lda {c1},x
@@ -12373,15 +13530,6 @@ lda {z1}+1
 cmp {z2}+1
 beq {la1}
 !:
-//FRAGMENT vwuz1_lt_vwuz2_then_la1
-lda {z1}+1
-cmp {z2}+1
-bcc {la1}
-bne !+
-lda {z1}
-cmp {z2}
-bcc {la1}
-!:
 //FRAGMENT vwuz1_le_vwuz2_then_la1
 lda {z1}+1
 cmp {z2}+1
@@ -12391,23 +13539,6 @@ cmp {z2}
 beq {la1}
 !:
 bcc {la1}
-//FRAGMENT vwuz1_gt_vwuz2_then_la1
-lda {z2}+1
-cmp {z1}+1
-bcc {la1}
-bne !+
-lda {z2}
-cmp {z1}
-bcc {la1}
-!:
-//FRAGMENT vwuz1=vwuz2_minus_vwuz3
-lda {z2}
-sec
-sbc {z3}
-sta {z1}
-lda {z2}+1
-sbc {z3}+1
-sta {z1}+1
 //FRAGMENT vduz1=vwuz2_dword_vwuc1
 lda #<{c1}
 sta {z1}
@@ -12417,20 +13548,6 @@ lda {z2}
 sta {z1}+2
 lda {z2}+1
 sta {z1}+3
-//FRAGMENT vduz1=vduz1_plus_vduz2
-lda {z1}
-clc
-adc {z2}
-sta {z1}
-lda {z1}+1
-adc {z2}+1
-sta {z1}+1
-lda {z1}+2
-adc {z2}+2
-sta {z1}+2
-lda {z1}+3
-adc {z2}+3
-sta {z1}+3
 //FRAGMENT vwuz1=vwuz1_minus_vbuc1
 sec
 lda {z1}
@@ -12610,23 +13727,6 @@ tax
 NO_SYNTHESIS
 //FRAGMENT vduz1_lt_vwsc1_then_la1
 NO_SYNTHESIS
-//FRAGMENT vduz1_lt_vduc1_then_la1
-lda {z1}+3
-cmp #>{c1}>>$10
-bcc {la1}
-bne !+
-lda {z1}+2
-cmp #<{c1}>>$10
-bcc {la1}
-bne !+
-lda {z1}+1
-cmp #>{c1}
-bcc {la1}
-bne !+
-lda {z1}
-cmp #<{c1}
-bcc {la1}
-!:
 //FRAGMENT vduz1=vduz2_rol_4
 lda {z2}
 asl
@@ -12702,704 +13802,6 @@ asl {z1}
 rol {z1}+1
 rol {z1}+2
 rol {z1}+3
-//FRAGMENT vduz1=vduz1_rol_1
-asl {z1}
-rol {z1}+1
-rol {z1}+2
-rol {z1}+3
-//FRAGMENT vbsz1_neq_vbsc1_then_la1
-lda #{c1}
-cmp {z1}
-bne {la1}
-//FRAGMENT vbuz1=pbuz2_derefidx_vbuz3_rol_4
-ldy {z3}
-lda ({z2}),y
-asl
-asl
-asl
-asl
-sta {z1}
-//FRAGMENT vbuz1=pbuz2_derefidx_vbuz3_rol_1
-ldy {z3}
-lda ({z2}),y
-asl
-sta {z1}
-//FRAGMENT vbsz1_gt_0_then_la1
-lda {z1}
-cmp #0
-beq !+
-bpl {la1}
-!:
-//FRAGMENT vbuz1=vbuc1_minus_vbuz1
-lda #{c1}
-sec
-sbc {z1}
-sta {z1}
-//FRAGMENT vbsz1=vbsz2_ror_vbuz3
-lda {z2}
-ldy {z3}
-cpy #0
-beq !e+
-!l:
-cmp #$80
-ror
-dey
-bne !l-
-!e:
-sta {z1}
-//FRAGMENT vbsz1=vbsz1_plus_vbsz2
-lda {z1}
-clc
-adc {z2}
-sta {z1}
-//FRAGMENT vbuz1=vbuz1_minus_pbuc1_derefidx_vbuz2
-lda {z1}
-ldy {z2}
-sec
-sbc {c1},y
-sta {z1}
-//FRAGMENT vbsaa_neq_vbsc1_then_la1
-cmp #{c1}
-bne {la1}
-//FRAGMENT vbuaa=pbuz1_derefidx_vbuz2_rol_4
-ldy {z2}
-lda ({z1}),y
-asl
-asl
-asl
-asl
-//FRAGMENT vbuxx=pbuz1_derefidx_vbuz2_rol_4
-ldy {z2}
-lda ({z1}),y
-asl
-asl
-asl
-asl
-tax
-//FRAGMENT vbuyy=pbuz1_derefidx_vbuz2_rol_4
-ldy {z2}
-lda ({z1}),y
-asl
-asl
-asl
-asl
-tay
-//FRAGMENT vbuz1=pbuz2_derefidx_vbuaa_rol_4
-tay
-lda ({z2}),y
-asl
-asl
-asl
-asl
-sta {z1}
-//FRAGMENT vbuaa=pbuz1_derefidx_vbuaa_rol_4
-tay
-lda ({z1}),y
-asl
-asl
-asl
-asl
-//FRAGMENT vbuxx=pbuz1_derefidx_vbuaa_rol_4
-tay
-lda ({z1}),y
-asl
-asl
-asl
-asl
-tax
-//FRAGMENT vbuyy=pbuz1_derefidx_vbuaa_rol_4
-tay
-lda ({z1}),y
-asl
-asl
-asl
-asl
-tay
-//FRAGMENT vbuz1=pbuz2_derefidx_vbuxx_rol_4
-txa
-tay
-lda ({z2}),y
-asl
-asl
-asl
-asl
-sta {z1}
-//FRAGMENT vbuaa=pbuz1_derefidx_vbuxx_rol_4
-txa
-tay
-lda ({z1}),y
-asl
-asl
-asl
-asl
-//FRAGMENT vbuxx=pbuz1_derefidx_vbuxx_rol_4
-txa
-tay
-lda ({z1}),y
-asl
-asl
-asl
-asl
-tax
-//FRAGMENT vbuyy=pbuz1_derefidx_vbuxx_rol_4
-txa
-tay
-lda ({z1}),y
-asl
-asl
-asl
-asl
-tay
-//FRAGMENT vbuz1=pbuz2_derefidx_vbuyy_rol_4
-lda ({z2}),y
-asl
-asl
-asl
-asl
-sta {z1}
-//FRAGMENT vbuaa=pbuz1_derefidx_vbuyy_rol_4
-lda ({z1}),y
-asl
-asl
-asl
-asl
-//FRAGMENT vbuxx=pbuz1_derefidx_vbuyy_rol_4
-lda ({z1}),y
-asl
-asl
-asl
-asl
-tax
-//FRAGMENT vbuyy=pbuz1_derefidx_vbuyy_rol_4
-lda ({z1}),y
-asl
-asl
-asl
-asl
-tay
-//FRAGMENT vbuaa=pbuz1_derefidx_vbuz2_rol_1
-ldy {z2}
-lda ({z1}),y
-asl
-//FRAGMENT vbuxx=pbuz1_derefidx_vbuz2_rol_1
-ldy {z2}
-lda ({z1}),y
-asl
-tax
-//FRAGMENT vbuyy=pbuz1_derefidx_vbuz2_rol_1
-ldy {z2}
-lda ({z1}),y
-asl
-tay
-//FRAGMENT vbuz1=pbuz2_derefidx_vbuxx_rol_1
-txa
-tay
-lda ({z2}),y
-asl
-sta {z1}
-//FRAGMENT vbuaa=pbuz1_derefidx_vbuxx_rol_1
-txa
-tay
-lda ({z1}),y
-asl
-//FRAGMENT vbuxx=pbuz1_derefidx_vbuxx_rol_1
-txa
-tay
-lda ({z1}),y
-asl
-tax
-//FRAGMENT vbuyy=pbuz1_derefidx_vbuxx_rol_1
-txa
-tay
-lda ({z1}),y
-asl
-tay
-//FRAGMENT vbuz1=pbuz2_derefidx_vbuyy_rol_1
-lda ({z2}),y
-asl
-sta {z1}
-//FRAGMENT vbuaa=pbuz1_derefidx_vbuyy_rol_1
-lda ({z1}),y
-asl
-//FRAGMENT vbuxx=pbuz1_derefidx_vbuyy_rol_1
-lda ({z1}),y
-asl
-tax
-//FRAGMENT vbuyy=pbuz1_derefidx_vbuyy_rol_1
-lda ({z1}),y
-asl
-tay
-//FRAGMENT vbsaa_gt_0_then_la1
-cmp #0
-beq !+
-bpl {la1}
-!:
-//FRAGMENT vbsxx_gt_0_then_la1
-txa
-cmp #0
-beq !+
-bpl {la1}
-!:
-//FRAGMENT vbsyy_gt_0_then_la1
-tya
-cmp #0
-beq !+
-bpl {la1}
-!:
-//FRAGMENT vbsyy_neq_0_then_la1
-tya
-cmp #0
-bne {la1}
-//FRAGMENT vbsaa=vbsz1_ror_vbuz2
-lda {z1}
-ldy {z2}
-cpy #0
-beq !e+
-!l:
-cmp #$80
-ror
-dey
-bne !l-
-!e:
-//FRAGMENT vbsxx=vbsz1_ror_vbuz2
-lda {z1}
-ldx {z2}
-cpx #0
-beq !e+
-!l:
-cmp #$80
-ror
-dex
-bne !l-
-!e:
-tax
-//FRAGMENT vbsyy=vbsz1_ror_vbuz2
-lda {z1}
-ldy {z2}
-cpy #0
-beq !e+
-!l:
-cmp #$80
-ror
-dey
-bne !l-
-!e:
-tay
-//FRAGMENT vbsz1=vbsxx_ror_vbuz2
-ldy {z2}
-txa
-cpy #0
-beq !e+
-!l:
-cmp #$80
-ror
-dey
-bne !l-
-!e:
-sta {z1}
-//FRAGMENT vbsaa=vbsxx_ror_vbuz1
-ldy {z1}
-txa
-cpy #0
-beq !e+
-!l:
-cmp #$80
-ror
-dey
-bne !l-
-!e:
-//FRAGMENT vbsxx=vbsxx_ror_vbuz1
-txa
-ldx {z1}
-cpx #0
-beq !e+
-!l:
-cmp #$80
-ror
-dex
-bne !l-
-!e:
-tax
-//FRAGMENT vbsyy=vbsxx_ror_vbuz1
-ldy {z1}
-txa
-cpy #0
-beq !e+
-!l:
-cmp #$80
-ror
-dey
-bne !l-
-!e:
-tay
-//FRAGMENT vbsz1=vbsyy_ror_vbuz2
-tya
-ldy {z2}
-cpy #0
-beq !e+
-!l:
-cmp #$80
-ror
-dey
-bne !l-
-!e:
-sta {z1}
-//FRAGMENT vbsaa=vbsyy_ror_vbuz1
-tya
-ldy {z1}
-cpy #0
-beq !e+
-!l:
-cmp #$80
-ror
-dey
-bne !l-
-!e:
-//FRAGMENT vbsxx=vbsyy_ror_vbuz1
-ldx {z1}
-tya
-cpx #0
-beq !e+
-!l:
-cmp #$80
-ror
-dex
-bne !l-
-!e:
-tax
-//FRAGMENT vbsyy=vbsyy_ror_vbuz1
-tya
-ldy {z1}
-cpy #0
-beq !e+
-!l:
-cmp #$80
-ror
-dey
-bne !l-
-!e:
-tay
-//FRAGMENT vbsz1=vbsz2_ror_vbuxx
-lda {z2}
-cpx #0
-beq !e+
-!l:
-cmp #$80
-ror
-dex
-bne !l-
-!e:
-sta {z1}
-//FRAGMENT vbsaa=vbsz1_ror_vbuxx
-lda {z1}
-cpx #0
-beq !e+
-!l:
-cmp #$80
-ror
-dex
-bne !l-
-!e:
-//FRAGMENT vbsxx=vbsz1_ror_vbuxx
-lda {z1}
-cpx #0
-beq !e+
-!l:
-cmp #$80
-ror
-dex
-bne !l-
-!e:
-tax
-//FRAGMENT vbsyy=vbsz1_ror_vbuxx
-lda {z1}
-cpx #0
-beq !e+
-!l:
-cmp #$80
-ror
-dex
-bne !l-
-!e:
-tay
-//FRAGMENT vbsz1=vbsxx_ror_vbuxx
-txa
-cpx #0
-beq !e+
-!l:
-cmp #$80
-ror
-dex
-bne !l-
-!e:
-sta {z1}
-//FRAGMENT vbsaa=vbsxx_ror_vbuxx
-txa
-cpx #0
-beq !e+
-!l:
-cmp #$80
-ror
-dex
-bne !l-
-!e:
-//FRAGMENT vbsxx=vbsxx_ror_vbuxx
-txa
-cpx #0
-beq !e+
-!l:
-cmp #$80
-ror
-dex
-bne !l-
-!e:
-tax
-//FRAGMENT vbsyy=vbsxx_ror_vbuxx
-txa
-cpx #0
-beq !e+
-!l:
-cmp #$80
-ror
-dex
-bne !l-
-!e:
-tay
-//FRAGMENT vbsz1=vbsyy_ror_vbuxx
-tya
-cpx #0
-beq !e+
-!l:
-cmp #$80
-ror
-dex
-bne !l-
-!e:
-sta {z1}
-//FRAGMENT vbsaa=vbsyy_ror_vbuxx
-tya
-cpx #0
-beq !e+
-!l:
-cmp #$80
-ror
-dex
-bne !l-
-!e:
-//FRAGMENT vbsxx=vbsyy_ror_vbuxx
-tya
-cpx #0
-beq !e+
-!l:
-cmp #$80
-ror
-dex
-bne !l-
-!e:
-tax
-//FRAGMENT vbsyy=vbsyy_ror_vbuxx
-tya
-cpx #0
-beq !e+
-!l:
-cmp #$80
-ror
-dex
-bne !l-
-!e:
-tay
-//FRAGMENT vbsz1=vbsz2_ror_vbuyy
-lda {z2}
-cpy #0
-beq !e+
-!l:
-cmp #$80
-ror
-dey
-bne !l-
-!e:
-sta {z1}
-//FRAGMENT vbsaa=vbsz1_ror_vbuyy
-lda {z1}
-cpy #0
-beq !e+
-!l:
-cmp #$80
-ror
-dey
-bne !l-
-!e:
-//FRAGMENT vbsxx=vbsz1_ror_vbuyy
-lda {z1}
-cpy #0
-beq !e+
-!l:
-cmp #$80
-ror
-dey
-bne !l-
-!e:
-tax
-//FRAGMENT vbsyy=vbsz1_ror_vbuyy
-lda {z1}
-cpy #0
-beq !e+
-!l:
-cmp #$80
-ror
-dey
-bne !l-
-!e:
-tay
-//FRAGMENT vbsz1=vbsxx_ror_vbuyy
-txa
-cpy #0
-beq !e+
-!l:
-cmp #$80
-ror
-dey
-bne !l-
-!e:
-sta {z1}
-//FRAGMENT vbsaa=vbsxx_ror_vbuyy
-txa
-cpy #0
-beq !e+
-!l:
-cmp #$80
-ror
-dey
-bne !l-
-!e:
-//FRAGMENT vbsxx=vbsxx_ror_vbuyy
-txa
-cpy #0
-beq !e+
-!l:
-cmp #$80
-ror
-dey
-bne !l-
-!e:
-tax
-//FRAGMENT vbsyy=vbsxx_ror_vbuyy
-txa
-cpy #0
-beq !e+
-!l:
-cmp #$80
-ror
-dey
-bne !l-
-!e:
-tay
-//FRAGMENT vbsz1=vbsyy_ror_vbuyy
-tya
-cpy #0
-beq !e+
-!l:
-cmp #$80
-ror
-dey
-bne !l-
-!e:
-sta {z1}
-//FRAGMENT vbsaa=vbsyy_ror_vbuyy
-tya
-cpy #0
-beq !e+
-!l:
-cmp #$80
-ror
-dey
-bne !l-
-!e:
-//FRAGMENT vbsxx=vbsyy_ror_vbuyy
-tya
-cpy #0
-beq !e+
-!l:
-cmp #$80
-ror
-dey
-bne !l-
-!e:
-tax
-//FRAGMENT vbsyy=vbsyy_ror_vbuyy
-tya
-cpy #0
-beq !e+
-!l:
-cmp #$80
-ror
-dey
-bne !l-
-!e:
-tay
-//FRAGMENT vbsz1=vbsz1_minus_vbsyy
-tya
-eor #$ff
-sec
-adc {z1}
-sta {z1}
-//FRAGMENT vbsz1=vbsz1_plus_vbsxx
-txa
-clc
-adc {z1}
-sta {z1}
-//FRAGMENT vbsz1=vbsz1_plus_vbsyy
-tya
-clc
-adc {z1}
-sta {z1}
-//FRAGMENT vbuxx=vbuxx_minus_pbuc1_derefidx_vbuz1
-txa
-ldx {z1}
-sec
-sbc {c1},x
-tax
-//FRAGMENT vbuyy=vbuyy_minus_pbuc1_derefidx_vbuz1
-tya
-ldy {z1}
-sec
-sbc {c1},y
-tay
-//FRAGMENT vbuz1=vbuz1_minus_pbuc1_derefidx_vbuxx
-lda {z1}
-sec
-sbc {c1},x
-sta {z1}
-//FRAGMENT vbuxx=vbuxx_minus_pbuc1_derefidx_vbuxx
-txa
-tax
-sec
-sbc {c1},x
-tax
-//FRAGMENT vbuyy=vbuyy_minus_pbuc1_derefidx_vbuxx
-tya
-sec
-sbc {c1},x
-tay
-//FRAGMENT vbuz1=vbuz1_minus_pbuc1_derefidx_vbuyy
-lda {z1}
-sec
-sbc {c1},y
-sta {z1}
-//FRAGMENT vbuxx=vbuxx_minus_pbuc1_derefidx_vbuyy
-txa
-sec
-sbc {c1},y
-tax
-//FRAGMENT vbuyy=vbuyy_minus_pbuc1_derefidx_vbuyy
-tya
-tay
-sec
-sbc {c1},y
-tay
-//FRAGMENT vbsxx_neq_vbsc1_then_la1
-cpx #{c1}
-bne {la1}
 //FRAGMENT _deref_pduc1=vduz1
 lda {z1}
 sta {c1}
@@ -13423,6 +13825,15 @@ sta {z1}+2
 lda {z2}+3
 sbc #0
 sta {z1}+3
+//FRAGMENT vduz1=_inc_vduz1
+inc {z1}
+bne !+
+inc {z1}+1
+bne !+
+inc {z1}+2
+bne !+
+inc {z1}+3
+!:
 //FRAGMENT vduz1=vduz1_plus_vbuc1
 lda {z1}
 clc
@@ -13449,6 +13860,8 @@ sta {z1}+2
 lda {z1}+3
 sbc #0
 sta {z1}+3
+//FRAGMENT _stackpullbyte_1
+pla
 //FRAGMENT vwuz1=_stackidxword_vbuc1
 tsx
 lda STACK_BASE+{c1},x
@@ -13551,6 +13964,57 @@ sta {c1},x
 ldx {c3},y
 lda {c2},x
 sta {c1},y
+//FRAGMENT pwsz1_lt_pwsc1_then_la1
+lda {z1}+1
+cmp #>{c1}
+bcc {la1}
+bne !+
+lda {z1}
+cmp #<{c1}
+bcc {la1}
+!:
+//FRAGMENT vbsz1=vbsz2_minus_vbsaa
+eor #$ff
+sec
+adc {z2}
+sta {z1}
+//FRAGMENT vbsz1=vbsxx_minus_vbsaa
+sta $ff
+txa
+sec
+sbc $ff
+sta {z1}
+//FRAGMENT vbsaa=vbsz1_minus_vbsaa
+eor #$ff
+sec
+adc {z1}
+//FRAGMENT vbsaa=vbsxx_minus_vbsaa
+sta $ff
+txa
+sec
+sbc $ff
+//FRAGMENT vbsxx=vbsz1_minus_vbsaa
+eor #$ff
+sec
+adc {z1}
+tax
+//FRAGMENT vbsxx=vbsxx_minus_vbsaa
+sta $ff
+txa
+sec
+sbc $ff
+tax
+//FRAGMENT vbsyy=vbsz1_minus_vbsaa
+eor #$ff
+sec
+adc {z1}
+tay
+//FRAGMENT vbsyy=vbsxx_minus_vbsaa
+sta $ff
+txa
+sec
+sbc $ff
+tay
 //FRAGMENT vbuz1=_deref_pbuc1_bxor_vbuc2
 lda #{c2}
 eor {c1}
@@ -13906,22 +14370,6 @@ bne {la1}
 //FRAGMENT vbsxx_neq_vbsz1_then_la1
 cpx {z1}
 bne {la1}
-//FRAGMENT pwuz1=pwuc1_plus_vwuz2
-clc
-lda {z2}
-adc #<{c1}
-sta {z1}
-lda {z2}+1
-adc #>{c1}
-sta {z1}+1
-//FRAGMENT pwuz1=pwuc1_plus_vwuz1
-clc
-lda {z1}
-adc #<{c1}
-sta {z1}
-lda {z1}+1
-adc #>{c1}
-sta {z1}+1
 //FRAGMENT vbuz1=pbuc1_derefidx_vbuz2_plus_vbuc2
 lda #{c2}
 ldy {z2}
@@ -13942,20 +14390,6 @@ sta ({z1}),y
 lda #0
 iny
 sta ({z1}),y
-//FRAGMENT _deref_pwuz1=_deref_pwuz1_plus_pwuz1_derefidx_vbuc1
-ldy #{c1}
-sty $ff
-clc
-lda ({z1}),y
-ldy #0
-adc ({z1}),y
-sta ({z1}),y
-ldy $ff
-iny
-lda ({z1}),y
-ldy #1
-adc ({z1}),y
-sta ({z1}),y
 //FRAGMENT pwuz1_derefidx_vbuc1=pwuz1_derefidx_vbuc1_plus_vbuc2
 lda #{c2}
 ldy #{c1}
@@ -13966,18 +14400,6 @@ iny
 lda #0
 adc ({z1}),y
 sta ({z1}),y
-//FRAGMENT pwuz1_derefidx_vbuc1=pwuz1_derefidx_vbuc1_plus_pwuz1_derefidx_vbuc2
-ldy #{c2}
-clc
-lda ({z1}),y
-ldy #{c1}
-adc ({z1}),y
-sta ({z1}),y
-ldy #{c2}+1
-lda ({z1}),y
-ldy #{c1}+1
-adc ({z1}),y
-sta ({z1}),y
 //FRAGMENT vwuz1=_deref_pwuz2_ror_8
 ldy #1
 lda ({z2}),y
@@ -14218,9 +14640,6 @@ sta {z1}
 lda #>{c1}
 adc #0
 sta {z1}+1
-//FRAGMENT vbuz1=vbuz1_minus_2
-dec {z1}
-dec {z1}
 //FRAGMENT pbuz1_derefidx_vbuz2=_byte_vwuz3
 lda {z3}
 ldy {z2}
@@ -14262,15 +14681,18 @@ sta ({z1}),y
 lda {z2}
 ora {z3}+1
 sta {z1}
-//FRAGMENT vbuxx=vbuxx_minus_2
-dex
-dex
-//FRAGMENT vbuyy=vbuyy_minus_2
-dey
-dey
 //FRAGMENT vbuz1=vbuz1_bor_vbuaa
 ora {z1}
 sta {z1}
+//FRAGMENT pbuz1_ge_pbuc1_then_la1
+lda {z1}+1
+cmp #>{c1}
+bcc !+
+bne {la1}
+lda {z1}
+cmp #<{c1}
+bcs {la1}
+!:
 //FRAGMENT vbuz1=_deref_pbuc1_ror_1
 lda {c1}
 lsr
@@ -14285,15 +14707,6 @@ cmp {z1}
 beq {la1}
 !:
 bcc {la1}
-//FRAGMENT vwuz1=vwuz1_minus_pwuc1_derefidx_vbuz2
-ldy {z2}
-sec
-lda {z1}
-sbc {c1},y
-sta {z1}
-lda {z1}+1
-sbc {c1}+1,y
-sta {z1}+1
 //FRAGMENT _deref_(_deref_qbuc1)=pbuc2_derefidx_vbuz1
 ldy {z1}
 lda {c2},y
@@ -14347,22 +14760,6 @@ cmp {z1}
 beq {la1}
 !:
 bcc {la1}
-//FRAGMENT vwuz1=vwuz1_minus_pwuc1_derefidx_vbuxx
-sec
-lda {z1}
-sbc {c1},x
-sta {z1}
-lda {z1}+1
-sbc {c1}+1,x
-sta {z1}+1
-//FRAGMENT vwuz1=vwuz1_minus_pwuc1_derefidx_vbuyy
-sec
-lda {z1}
-sbc {c1},y
-sta {z1}
-lda {z1}+1
-sbc {c1}+1,y
-sta {z1}+1
 //FRAGMENT _deref_(_deref_qbuc1)=pbuc2_derefidx_vbuaa
 tay
 lda {c2},y
@@ -14503,11 +14900,6 @@ tax
 //FRAGMENT vbsyy=vbsaa_rol_1
 asl
 tay
-//FRAGMENT pwsz1=pwsc1
-lda #<{c1}
-sta {z1}
-lda #>{c1}
-sta {z1}+1
 //FRAGMENT pwsz1=pwsc1_plus_vbuz2
 lda {z2}
 clc
@@ -14866,11 +15258,12 @@ tax
 //FRAGMENT vboyy=vboc1
 lda #{c1}
 tay
-//FRAGMENT vbuyy_neq_vbuaa_then_la1
-tax
-stx $ff
-cpy $ff
-bne {la1}
+//FRAGMENT vwuz1=_deref_pbuz2_word__deref_pbuz3
+ldy #0
+lda ({z3}),y
+sta {z1}
+lda ({z2}),y
+sta {z1}+1
 //FRAGMENT vbuz1=_deref_pbuc1_plus_2
 lda {c1}
 clc
@@ -14888,352 +15281,14 @@ inx
 ldy {c1}
 iny
 iny
+//FRAGMENT 0_neq_vwuz1_then_la1
+lda {z1}
+ora {z1}+1
+bne {la1}
 //FRAGMENT _deref_pbuz1=_byte_vwsz2
 lda {z2}
 ldy #0
 sta ({z1}),y
-//FRAGMENT vwuz1=vwuz2_rol_6
-lda {z2}+1
-lsr
-sta $ff
-lda {z2}
-ror
-sta {z1}+1
-lda #0
-ror
-sta {z1}
-lsr $ff
-ror {z1}+1
-ror {z1}
-//FRAGMENT vwuz1=vwuz2_minus_vbuc1
-sec
-lda {z2}
-sbc #{c1}
-sta {z1}
-lda {z2}+1
-sbc #0
-sta {z1}+1
-//FRAGMENT vduz1=vwuz2
-lda {z2}
-sta {z1}
-lda {z2}+1
-sta {z1}+1
-lda #0
-sta {z1}+2
-sta {z1}+3
-//FRAGMENT vwsz1_lt_vwuz2_then_la1
-lda {z1}+1
-bmi {la1}
-cmp {z2}+1
-bcc {la1}
-bne !+
-lda {z1}
-cmp {z2}
-bcc {la1}
-!:
-//FRAGMENT vduz1=pduz2_derefidx_vbuz3
-ldy {z3}
-lda ({z2}),y
-sta {z1}
-iny
-lda ({z2}),y
-sta {z1}+1
-iny
-lda ({z2}),y
-sta {z1}+2
-iny
-lda ({z2}),y
-sta {z1}+3
-//FRAGMENT vduz1=vduz2_plus_pduc1_derefidx_vbuz3
-ldy {z3}
-lda {z2}
-clc
-adc {c1},y
-sta {z1}
-lda {z2}+1
-adc {c1}+1,y
-sta {z1}+1
-lda {z2}+2
-adc {c1}+2,y
-sta {z1}+2
-lda {z2}+3
-adc {c1}+3,y
-sta {z1}+3
-//FRAGMENT vduz1=vduz2_plus_pduz3_derefidx_vbuz4
-ldy {z4}
-lda {z2}
-clc
-adc ({z3}),y
-sta {z1}
-iny
-lda {z2}+1
-adc ({z3}),y
-sta {z1}+1
-iny
-lda {z2}+2
-adc ({z3}),y
-sta {z1}+2
-iny
-lda {z2}+3
-adc ({z3}),y
-sta {z1}+3
-//FRAGMENT vduz1=_bnot_vduz2
-lda {z2}
-eor #$ff
-sta {z1}
-lda {z2}+1
-eor #$ff
-sta {z1}+1
-lda {z2}+2
-eor #$ff
-sta {z1}+2
-lda {z2}+3
-eor #$ff
-sta {z1}+3
-//FRAGMENT vduz1=vduz2_bor_vduz3
-lda {z2}
-ora {z3}
-sta {z1}
-lda {z2}+1
-ora {z3}+1
-sta {z1}+1
-lda {z2}+2
-ora {z3}+2
-sta {z1}+2
-lda {z2}+3
-ora {z3}+3
-sta {z1}+3
-//FRAGMENT vduz1=vduz2_bxor_vduz3
-lda {z2}
-eor {z3}
-sta {z1}
-lda {z2}+1
-eor {z3}+1
-sta {z1}+1
-lda {z2}+2
-eor {z3}+2
-sta {z1}+2
-lda {z2}+3
-eor {z3}+3
-sta {z1}+3
-//FRAGMENT vduz1=vduz2_band_vduz3
-lda {z2}
-and {z3}
-sta {z1}
-lda {z2}+1
-and {z3}+1
-sta {z1}+1
-lda {z2}+2
-and {z3}+2
-sta {z1}+2
-lda {z2}+3
-and {z3}+3
-sta {z1}+3
-//FRAGMENT vwuz1=vwuz2_band_vbuc1
-lda #{c1}
-and {z2}
-sta {z1}
-lda #0
-sta {z1}+1
-//FRAGMENT pbuz1=pbuc1_minus_vwuz2
-sec
-lda #<{c1}
-sbc {z2}
-sta {z1}
-lda #>{c1}
-sbc {z2}+1
-sta {z1}+1 
-//FRAGMENT vduz1=pduz2_derefidx_vbuxx
-txa
-tay
-lda ({z2}),y
-sta {z1}
-iny
-lda ({z2}),y
-sta {z1}+1
-iny
-lda ({z2}),y
-sta {z1}+2
-iny
-lda ({z2}),y
-sta {z1}+3
-//FRAGMENT vduz1=vduz2_plus_pduc1_derefidx_vbuxx
-lda {z2}
-clc
-adc {c1},x
-sta {z1}
-lda {z2}+1
-adc {c1}+1,x
-sta {z1}+1
-lda {z2}+2
-adc {c1}+2,x
-sta {z1}+2
-lda {z2}+3
-adc {c1}+3,x
-sta {z1}+3
-//FRAGMENT vduz1=vduz2_plus_pduz3_derefidx_vbuxx
-txa
-tay
-lda {z2}
-clc
-adc ({z3}),y
-sta {z1}
-iny
-lda {z2}+1
-adc ({z3}),y
-sta {z1}+1
-iny
-lda {z2}+2
-adc ({z3}),y
-sta {z1}+2
-iny
-lda {z2}+3
-adc ({z3}),y
-sta {z1}+3
-//FRAGMENT vduz1=vduz2_bxor_vduz1
-lda {z1}
-eor {z2}
-sta {z1}
-lda {z1}+1
-eor {z2}+1
-sta {z1}+1
-lda {z1}+2
-eor {z2}+2
-sta {z1}+2
-lda {z1}+3
-eor {z2}+3
-sta {z1}+3
-//FRAGMENT vduz1=vduz1_bxor_vduz2
-lda {z1}
-eor {z2}
-sta {z1}
-lda {z1}+1
-eor {z2}+1
-sta {z1}+1
-lda {z1}+2
-eor {z2}+2
-sta {z1}+2
-lda {z1}+3
-eor {z2}+3
-sta {z1}+3
-//FRAGMENT vduz1=vduz1_bor_vduz2
-lda {z2}
-ora {z1}
-sta {z1}
-lda {z2}+1
-ora {z1}+1
-sta {z1}+1
-lda {z2}+2
-ora {z1}+2
-sta {z1}+2
-lda {z2}+3
-ora {z1}+3
-sta {z1}+3
-//FRAGMENT vbuz1=vbuz1_rol_2
-lda {z1}
-asl
-asl
-sta {z1}
-//FRAGMENT vwuz1=vwuz1_band_vbuc1
-lda #{c1}
-and {z1}
-sta {z1}
-lda #0
-sta {z1}+1
-//FRAGMENT vwuz1=vwuz1_rol_6
-lda {z1}+1
-lsr
-sta $ff
-lda {z1}
-ror
-sta {z1}+1
-lda #0
-ror
-sta {z1}
-lsr $ff
-ror {z1}+1
-ror {z1}
-//FRAGMENT vduz1=vduz1_plus_pduz2_derefidx_vbuz3
-ldy {z3}
-lda {z1}
-clc
-adc ({z2}),y
-sta {z1}
-iny
-lda {z1}+1
-adc ({z2}),y
-sta {z1}+1
-iny
-lda {z1}+2
-adc ({z2}),y
-sta {z1}+2
-iny
-lda {z1}+3
-adc ({z2}),y
-sta {z1}+3
-//FRAGMENT vduz1=vduz1_band_vduz2
-lda {z1}
-and {z2}
-sta {z1}
-lda {z1}+1
-and {z2}+1
-sta {z1}+1
-lda {z1}+2
-and {z2}+2
-sta {z1}+2
-lda {z1}+3
-and {z2}+3
-sta {z1}+3
-//FRAGMENT pbuz1=pbuc1_minus_vwuz1
-sec
-lda #<{c1}
-sbc {z1}
-sta {z1}
-lda #>{c1}
-sbc {z1}+1
-sta {z1}+1
-//FRAGMENT vduz1=vduz1_plus_pduc1_derefidx_vbuz2
-ldy {z2}
-lda {z1}
-clc
-adc {c1},y
-sta {z1}
-lda {z1}+1
-adc {c1}+1,y
-sta {z1}+1
-lda {z1}+2
-adc {c1}+2,y
-sta {z1}+2
-lda {z1}+3
-adc {c1}+3,y
-sta {z1}+3
-//FRAGMENT vduz1=vduz2_bor_vduz1
-lda {z2}
-ora {z1}
-sta {z1}
-lda {z2}+1
-ora {z1}+1
-sta {z1}+1
-lda {z2}+2
-ora {z1}+2
-sta {z1}+2
-lda {z2}+3
-ora {z1}+3
-sta {z1}+3
-//FRAGMENT vduz1=vduz2_plus_vduz1
-lda {z1}
-clc
-adc {z2}
-sta {z1}
-lda {z1}+1
-adc {z2}+1
-sta {z1}+1
-lda {z1}+2
-adc {z2}+2
-sta {z1}+2
-lda {z1}+3
-adc {z2}+3
-sta {z1}+3
 //FRAGMENT vbuz1=vbuxx_band_pbuz2_derefidx_vbuc1
 ldy #{c1}
 txa
@@ -15328,76 +15383,23 @@ tya
 cmp #$80
 ror
 tay
-//FRAGMENT vwsz1=_neg_vwsz2
-sec
-lda #0
-sbc {z2}
-sta {z1}
-lda #0
-sbc {z2}+1
-sta {z1}+1
-//FRAGMENT vbuz1=_neg_vbuz2
-lda {z2}
-eor #$ff
-clc
-adc #$01
-sta {z1}
-//FRAGMENT vbuz1=_neg_vbuaa
-eor #$ff
-clc
-adc #$01
-sta {z1}
-//FRAGMENT vbuz1=_neg_vbuxx
-dex
-txa
-eor #$ff
-sta {z1}
+//FRAGMENT vbsyy_lt_0_then_la1
+cpy #0
+bmi {la1}
 //FRAGMENT vbuz1=_neg_vbuyy
 dey
 tya
 eor #$ff
 sta {z1}
-//FRAGMENT vbuaa=_neg_vbuz1
-lda {z1}
-eor #$ff
-clc
-adc #$01
-//FRAGMENT vbuaa=_neg_vbuxx
-dex
-txa
-eor #$ff
 //FRAGMENT vbuaa=_neg_vbuyy
 dey
 tya
 eor #$ff
-//FRAGMENT vbuxx=_neg_vbuz1
-lda {z1}
-eor #$ff
-tax
-inx
-//FRAGMENT vbuxx=_neg_vbuaa
-eor #$ff
-tax
-inx
 //FRAGMENT vbuxx=_neg_vbuyy
 tya
 eor #$ff
 tax
 inx
-//FRAGMENT vbuyy=_neg_vbuz1
-lda {z1}
-eor #$ff
-tay
-iny
-//FRAGMENT vbuyy=_neg_vbuaa
-eor #$ff
-tay
-iny
-//FRAGMENT vbuyy=_neg_vbuxx
-txa
-eor #$ff
-tay
-iny
 //FRAGMENT vbuz1=vbuz2_band_vbuz3
 lda {z2}
 and {z3}
@@ -15457,6 +15459,134 @@ tay
 tya
 and {z1}
 tay
+//FRAGMENT vdsz1=vdsz2_rol_4
+lda {z2}
+sta {z1}
+lda {z2}+1
+sta {z1}+1
+lda {z2}+2
+sta {z1}+2
+lda {z2}+3
+sta {z1}+3
+asl {z1}
+rol {z1}+1
+rol {z1}+2
+rol {z1}+3
+asl {z1}
+rol {z1}+1
+rol {z1}+2
+rol {z1}+3
+asl {z1}
+rol {z1}+1
+rol {z1}+2
+rol {z1}+3
+asl {z1}
+rol {z1}+1
+rol {z1}+2
+rol {z1}+3
+//FRAGMENT vwuz1=vbuc1_plus__hi_vdsz2
+NO_SYNTHESIS
+//FRAGMENT vwuz1=vwuc1_plus__hi_vdsz2
+clc
+lda #<{c1}
+adc {z2}+2
+sta {z1}
+lda #>{c1}
+adc {z2}+3
+sta {z1}+1
+//FRAGMENT vwuz1=vbsc1_plus__hi_vdsz2
+NO_SYNTHESIS
+//FRAGMENT vwuz1=vwuz2_minus_vwuz1
+lda {z2}
+sec
+sbc {z1}
+sta {z1}
+lda {z2}+1
+sbc {z1}+1
+sta {z1}+1
+//FRAGMENT vdsz1=vdsz1_rol_4
+asl {z1}
+rol {z1}+1
+rol {z1}+2
+rol {z1}+3
+asl {z1}
+rol {z1}+1
+rol {z1}+2
+rol {z1}+3
+asl {z1}
+rol {z1}+1
+rol {z1}+2
+rol {z1}+3
+asl {z1}
+rol {z1}+1
+rol {z1}+2
+rol {z1}+3
+//FRAGMENT vwsz1=vwsz2_ror_2
+lda {z2}+1
+cmp #$80
+ror
+sta {z1}+1
+lda {z2}
+ror
+sta {z1}
+lda {z1}+1
+cmp #$80
+ror {z1}+1
+ror {z1}
+//FRAGMENT vwsz1=vbsc1_plus_vwsz2
+clc
+lda {z2}
+adc #<{c1}
+sta {z1}
+lda {z2}+1
+adc #>{c1}
+sta {z1}+1
+//FRAGMENT vwsz1=vwsz1_plus_vbuz2
+clc
+lda {z1}
+adc {z2}
+sta {z1}
+lda {z1}+1
+adc #0
+sta {z1}+1
+//FRAGMENT vwsz1=vwsc1_plus_vwsz1
+clc
+lda {z1}
+adc #<{c1}
+sta {z1}
+lda {z1}+1
+adc #>{c1}
+sta {z1}+1
+//FRAGMENT vwsz1=vbsc1_plus_vwsz1
+clc
+lda {z1}
+adc #<{c1}
+sta {z1}
+lda {z1}+1
+adc #>{c1}
+sta {z1}+1
+//FRAGMENT vwuz1=_word_pbuc1_derefidx_vbuz2
+ldy {z2}
+lda {c1},y
+sta {z1}
+lda #0
+sta {z1}+1
+//FRAGMENT vwuz1=_word_pbuc1_derefidx_vbuaa
+tay
+lda {c1},y
+sta {z1}
+lda #0
+sta {z1}+1
+//FRAGMENT vwuz1=_word_pbuc1_derefidx_vbuxx
+lda {c1},x
+sta {z1}
+lda #0
+sta {z1}+1
+//FRAGMENT vwuz1=_word_pbuc1_derefidx_vbuyy
+lda {c1},y
+sta {z1}
+lda #0
+sta {z1}+1
 //FRAGMENT pbuz1_ge_vwuc1_then_la1
 lda {z1}+1
 cmp #>{c1}
@@ -15801,13 +15931,9 @@ sta {z1}
 lda {z1}+1
 sbc $ff
 sta {z1}+1
-//FRAGMENT vwuz1=vwuz1_plus_vbuaa
-clc
-adc {z1}
-sta {z1}
-bcc !+
-inc {z1}+1
-!:
+//FRAGMENT vbsaa_neq_vbsc1_then_la1
+cmp #{c1}
+bne {la1}
 //FRAGMENT vbsaa_le_0_then_la1
 cmp #1
 bmi {la1}
@@ -15869,17 +15995,6 @@ bne {la1}
 stx $ff
 cpy $ff
 bne {la1}
-//FRAGMENT vbuc1_neq_vwuz1_then_la1
-NO_SYNTHESIS
-//FRAGMENT vbsc1_neq_vwuz1_then_la1
-NO_SYNTHESIS
-//FRAGMENT vwuc1_neq_vwuz1_then_la1
-lda {z1}+1
-cmp #>{c1}
-bne {la1}
-lda {z1}
-cmp #<{c1}
-bne {la1}
 //FRAGMENT vbuz1=vbuz1_bor_pbuc1_derefidx_vbuz2
 lda {z1}
 ldy {z2}
@@ -16551,11 +16666,20 @@ lda {c1},y
 clc
 adc {c1},y
 tay
+//FRAGMENT vbuaa_le_vbuz1_then_la1
+ldy {z1}
+sta $ff
+cpy $ff
+bcs {la1}
 //FRAGMENT vbuaa_le_vbuxx_then_la1
 tay
 sty $ff
 cpx $ff
 bcs  {la1}
+//FRAGMENT vbuyy_le_vbuxx_then_la1
+sty $ff
+cpx $ff
+bcs  {la1}
 //FRAGMENT vbuz1=pbuc1_derefidx_vbuz2_plus_pbuc2_derefidx_vbuz2
 ldy {z2}
 lda {c1},y
@@ -16602,6 +16726,193 @@ lda {c1},y
 clc
 adc {c2},y
 tay
+//FRAGMENT vbuz1=pbuz2_derefidx_(pbuz3_derefidx_vbuz4)_plus_pbuz5_derefidx_(pbuz6_derefidx_vbuz4)
+ldy {z4}
+lda ({z6}),y
+sta $ff
+lda ({z3}),y
+tay
+lda ({z2}),y
+ldy $ff
+clc
+adc ({z5}),y
+sta {z1}
+//FRAGMENT vbuz1=vbuz1_bor_pbuc1_derefidx_vbuaa
+tay
+lda {c1},y
+ora {z1}
+sta {z1}
+//FRAGMENT vbuxx=vbuxx_bor_pbuc1_derefidx_vbuaa
+tay
+txa
+ora {c1},y
+tax
+//FRAGMENT vbuyy=vbuyy_bor_pbuc1_derefidx_vbuaa
+tax
+tya
+ora {c1},x
+tay
+//FRAGMENT vbuaa=pbuz1_derefidx_(pbuz2_derefidx_vbuz3)_plus_pbuz4_derefidx_(pbuz5_derefidx_vbuz3)
+ldy {z3}
+lda ({z5}),y
+sta $ff
+lda ({z2}),y
+tay
+lda ({z1}),y
+ldy $ff
+clc
+adc ({z4}),y
+//FRAGMENT vbuxx=pbuz1_derefidx_(pbuz2_derefidx_vbuz3)_plus_pbuz4_derefidx_(pbuz5_derefidx_vbuz3)
+ldy {z3}
+lda ({z5}),y
+sta $ff
+lda ({z2}),y
+tay
+lda ({z1}),y
+ldy $ff
+clc
+adc ({z4}),y
+tax
+//FRAGMENT vbuyy=pbuz1_derefidx_(pbuz2_derefidx_vbuz3)_plus_pbuz4_derefidx_(pbuz5_derefidx_vbuz3)
+ldy {z3}
+lda ({z5}),y
+sta $ff
+lda ({z2}),y
+tay
+lda ({z1}),y
+ldy $ff
+clc
+adc ({z4}),y
+tay
+//FRAGMENT vbuz1=pbuz2_derefidx_(pbuz3_derefidx_vbuaa)_plus_pbuz4_derefidx_(pbuz5_derefidx_vbuaa)
+tay
+lda ({z5}),y
+sta $ff
+lda ({z3}),y
+tay
+lda ({z2}),y
+ldy $ff
+clc
+adc ({z4}),y
+sta {z1}
+//FRAGMENT vbuaa=pbuz1_derefidx_(pbuz2_derefidx_vbuaa)_plus_pbuz3_derefidx_(pbuz4_derefidx_vbuaa)
+tay
+lda ({z4}),y
+sta $ff
+lda ({z2}),y
+tay
+lda ({z1}),y
+ldy $ff
+clc
+adc ({z3}),y
+//FRAGMENT vbuxx=pbuz1_derefidx_(pbuz2_derefidx_vbuaa)_plus_pbuz3_derefidx_(pbuz4_derefidx_vbuaa)
+tay
+lda ({z4}),y
+sta $ff
+lda ({z2}),y
+tay
+lda ({z1}),y
+ldy $ff
+clc
+adc ({z3}),y
+tax
+//FRAGMENT vbuyy=pbuz1_derefidx_(pbuz2_derefidx_vbuaa)_plus_pbuz3_derefidx_(pbuz4_derefidx_vbuaa)
+tay
+lda ({z4}),y
+sta $ff
+lda ({z2}),y
+tay
+lda ({z1}),y
+ldy $ff
+clc
+adc ({z3}),y
+tay
+//FRAGMENT vbuz1=pbuz2_derefidx_(pbuz3_derefidx_vbuxx)_plus_pbuz4_derefidx_(pbuz5_derefidx_vbuxx)
+txa
+tay
+lda ({z5}),y
+sta $ff
+lda ({z3}),y
+tay
+lda ({z2}),y
+ldy $ff
+clc
+adc ({z4}),y
+sta {z1}
+//FRAGMENT vbuaa=pbuz1_derefidx_(pbuz2_derefidx_vbuxx)_plus_pbuz3_derefidx_(pbuz4_derefidx_vbuxx)
+txa
+tay
+lda ({z4}),y
+sta $ff
+lda ({z2}),y
+tay
+lda ({z1}),y
+ldy $ff
+clc
+adc ({z3}),y
+//FRAGMENT vbuxx=pbuz1_derefidx_(pbuz2_derefidx_vbuxx)_plus_pbuz3_derefidx_(pbuz4_derefidx_vbuxx)
+txa
+tay
+lda ({z4}),y
+sta $ff
+lda ({z2}),y
+tay
+lda ({z1}),y
+ldy $ff
+clc
+adc ({z3}),y
+tax
+//FRAGMENT vbuyy=pbuz1_derefidx_(pbuz2_derefidx_vbuxx)_plus_pbuz3_derefidx_(pbuz4_derefidx_vbuxx)
+txa
+tay
+lda ({z4}),y
+sta $ff
+lda ({z2}),y
+tay
+lda ({z1}),y
+ldy $ff
+clc
+adc ({z3}),y
+tay
+//FRAGMENT vbuz1=pbuz2_derefidx_(pbuz3_derefidx_vbuyy)_plus_pbuz4_derefidx_(pbuz5_derefidx_vbuyy)
+lda ({z5}),y
+sta $ff
+lda ({z3}),y
+tay
+lda ({z2}),y
+ldy $ff
+clc
+adc ({z4}),y
+sta {z1}
+//FRAGMENT vbuaa=pbuz1_derefidx_(pbuz2_derefidx_vbuyy)_plus_pbuz3_derefidx_(pbuz4_derefidx_vbuyy)
+lda ({z4}),y
+sta $ff
+lda ({z2}),y
+tay
+lda ({z1}),y
+ldy $ff
+clc
+adc ({z3}),y
+//FRAGMENT vbuxx=pbuz1_derefidx_(pbuz2_derefidx_vbuyy)_plus_pbuz3_derefidx_(pbuz4_derefidx_vbuyy)
+lda ({z4}),y
+sta $ff
+lda ({z2}),y
+tay
+lda ({z1}),y
+ldy $ff
+clc
+adc ({z3}),y
+tax
+//FRAGMENT vbuyy=pbuz1_derefidx_(pbuz2_derefidx_vbuyy)_plus_pbuz3_derefidx_(pbuz4_derefidx_vbuyy)
+lda ({z4}),y
+sta $ff
+lda ({z2}),y
+tay
+lda ({z1}),y
+ldy $ff
+clc
+adc ({z3}),y
+tay
 //FRAGMENT _deref_pbuc1=_deref_(_deref_qbuc2)
 ldy {c2}
 sty $fe
@@ -16610,162 +16921,6 @@ sty $ff
 ldy #0
 lda ($fe),y
 sta {c1}
-//FRAGMENT vbsz1_eq_vbsc1_then_la1
-lda #{c1}
-cmp {z1}
-beq {la1}
-//FRAGMENT vbsc1_eq_vbsz1_then_la1
-lda #{c1}
-cmp {z1}
-beq {la1}
-//FRAGMENT pbuz1=pbuz2_plus_vbsz3
-lda {z3}
-pha
-clc
-adc {z2}
-sta {z1}
-pla
-ora #$7f
-bmi !+
-lda #0
-!:
-adc {z2}+1
-sta {z1}+1
-//FRAGMENT pwsz1=pwsc1_plus_vwuz2
-clc
-lda {z2}
-adc #<{c1}
-sta {z1}
-lda {z2}+1
-adc #>{c1}
-sta {z1}+1
-//FRAGMENT vwsz1=_deref_pwsz2
-ldy #0
-lda ({z2}),y
-sta {z1}
-iny
-lda ({z2}),y
-sta {z1}+1
-//FRAGMENT vwuz1=vwuz2_ror_3
-lda {z2}+1
-lsr
-sta {z1}+1
-lda {z2}
-ror
-sta {z1}
-lsr {z1}+1
-ror {z1}
-lsr {z1}+1
-ror {z1}
-//FRAGMENT vbsaa_eq_vbsc1_then_la1
-cmp #{c1}
-beq {la1}
-//FRAGMENT vbsaa=vbsz1_minus_vbsaa
-eor #$ff
-sec
-adc {z1}
-//FRAGMENT vbsaa=vbsxx_minus_vbsaa
-sta $ff
-txa
-sec
-sbc $ff
-//FRAGMENT vbsaa=vbsyy_minus_vbsaa
-sta $ff
-tya
-sec
-sbc $ff
-//FRAGMENT vbsc1_eq_vbsaa_then_la1
-cmp #{c1}
-beq {la1}
-//FRAGMENT pbuz1=pbuz2_plus_vbsaa
-pha
-clc
-adc {z2}
-sta {z1}
-pla
-ora #$7f
-bmi !+
-lda #0
-!:
-adc {z2}+1
-sta {z1}+1
-//FRAGMENT pbuz1=pbuz2_plus_vbsxx
-txa
-pha
-clc
-adc {z2}
-sta {z1}
-pla
-ora #$7f
-bmi !+
-lda #0
-!:
-adc {z2}+1
-sta {z1}+1
-//FRAGMENT pbuz1=pbuz2_plus_vbsyy
-tya
-pha
-clc
-adc {z2}
-sta {z1}
-pla
-ora #$7f
-bmi !+
-lda #0
-!:
-adc {z2}+1
-sta {z1}+1
-//FRAGMENT vbsc1_eq_vbsxx_then_la1
-cpx #{c1}
-beq {la1}
-//FRAGMENT vbsxx_eq_vbsc1_then_la1
-cpx #{c1}
-beq {la1}
-//FRAGMENT vbsc1_eq_vbsyy_then_la1
-cpy #{c1}
-beq {la1}
-//FRAGMENT pbuz1=pbuz1_plus_vbsxx
-txa
-pha
-clc
-adc {z1}
-sta {z1}
-pla
-ora #$7f
-bmi !+
-lda #0
-!:
-adc {z1}+1
-sta {z1}+1
-//FRAGMENT pwsz1=pwsc1_plus_vwuz1
-clc
-lda {z1}
-adc #<{c1}
-sta {z1}
-lda {z1}+1
-adc #>{c1}
-sta {z1}+1
-//FRAGMENT vwuz1=vwuz1_ror_3
-lsr {z1}+1
-ror {z1}
-lsr {z1}+1
-ror {z1}
-lsr {z1}+1
-ror {z1}
-//FRAGMENT vwuz1=vwuz1_rol_2
-asl {z1}
-rol {z1}+1
-asl {z1}
-rol {z1}+1
-//FRAGMENT vwsz1=_deref_pwsz1
-ldy #0
-lda ({z1}),y
-pha
-iny
-lda ({z1}),y
-sta {z1}+1
-pla
-sta {z1}
 //FRAGMENT _deref_pwsz1=vwsc1
 ldy #0
 lda #<{c1}
@@ -16786,14 +16941,6 @@ sta {z1}+1
 ldy #1
 lda ({z2}),y
 sta {z1}
-//FRAGMENT pwsz1=pwsz1_plus_vbuc1
-lda #{c1}
-clc
-adc {z1}
-sta {z1}
-bcc !+
-inc {z1}+1
-!:
 //FRAGMENT vbuaa=_hi__deref_pwsz1
 ldy #1
 lda ({z1}),y
@@ -17074,16 +17221,6 @@ clc
 ldy #0
 adc ({z2}),y
 tay
-//FRAGMENT vwuz1=_deref_pwuz2_plus__deref_pwuz3
-ldy #0
-clc
-lda ({z2}),y
-adc ({z3}),y
-sta {z1}
-iny
-lda ({z2}),y
-adc ({z3}),y
-sta {z1}+1
 //FRAGMENT vwuz1=_deref_pwuz2_plus__deref_pwuz1
 ldy #0
 clc
@@ -17218,29 +17355,16 @@ sta {c1},y
 lda {c1}+1,y
 adc #>{c2}
 sta {c1}+1,y
-//FRAGMENT vbuz1=vbuz1_bor_pbuc1_derefidx_vbuaa
-tay
-lda {c1},y
-ora {z1}
+//FRAGMENT vwsz1=_deref_pwsz2_minus__deref_pwsz3
+ldy #0
+sec
+lda ({z2}),y
+sbc ({z3}),y
 sta {z1}
-//FRAGMENT vbuxx=vbuxx_bor_pbuc1_derefidx_vbuaa
-tay
-txa
-ora {c1},y
-tax
-//FRAGMENT vbuyy=vbuyy_bor_pbuc1_derefidx_vbuaa
-tax
-tya
-ora {c1},x
-tay
-//FRAGMENT vduz1=_dword_vwuz2
-lda {z2}
-sta {z1}
-lda {z2}+1
+iny
+lda ({z2}),y
+sbc ({z3}),y
 sta {z1}+1
-lda #0
-sta {z1}+2
-sta {z1}+3
 //FRAGMENT vduz1=vduz2_plus_vwuz3
 lda {z2}
 clc
@@ -17277,10 +17401,152 @@ ldy {c1}+1
 sty $ff
 ldy #0
 sta ($fe),y
-//FRAGMENT _deref_pwsc1=vbsc2
-NO_SYNTHESIS
-//FRAGMENT _deref_pwsc1=vwuc2
-NO_SYNTHESIS
+//FRAGMENT vwsz1=vwsz2_minus_vwsc1
+lda {z2}
+sec
+sbc #<{c1}
+sta {z1}
+lda {z2}+1
+sbc #>{c1}
+sta {z1}+1
+//FRAGMENT vwsz1=_sword_pbsc1_derefidx_vbuz2
+ldy {z2}
+lda {c1},y
+sta {z1}
+// sign-extend the byte
+ora #$7f 
+bmi !+
+lda #0
+!:
+sta {z1}+1
+//FRAGMENT vwsz1=_sword_vbsz2
+lda {z2}
+sta {z1}
+// sign-extend the byte
+ora #$7f 
+bmi !+
+lda #0
+!:
+sta {z1}+1
+//FRAGMENT vwsz1=vwsz2_rol_3
+lda {z2}
+asl
+sta {z1}
+lda {z2}+1
+rol
+sta {z1}+1
+asl {z1}
+rol {z1}+1
+asl {z1}
+rol {z1}+1
+//FRAGMENT vwsz1=vwsz2_ror_6
+lda {z2}
+sta $ff
+lda {z2}+1
+sta {z1}
+lda #0
+bit {z2}+1
+bpl !+
+lda #$ff
+!:
+sta {z1}+1
+rol $ff
+rol {z1}
+rol {z1}+1
+rol $ff
+rol {z1}
+rol {z1}+1
+//FRAGMENT vwsz1=_deref_pwsc1
+lda {c1}
+sta {z1}
+lda {c1}+1
+sta {z1}+1
+//FRAGMENT vwsz1=_sword_pbsc1_derefidx_vbuaa
+tay
+lda {c1},y
+sta {z1}
+// sign-extend the byte
+ora #$7f 
+bmi !+
+lda #0
+!:
+sta {z1}+1
+//FRAGMENT vwsz1=_sword_pbsc1_derefidx_vbuxx
+lda {c1},x
+sta {z1}
+// sign-extend the byte
+ora #$7f 
+bmi !+
+lda #0
+!:
+sta {z1}+1
+//FRAGMENT vwsz1=_sword_pbsc1_derefidx_vbuyy
+lda {c1},y
+sta {z1}
+// sign-extend the byte
+ora #$7f 
+bmi !+
+lda #0
+!:
+sta {z1}+1
+//FRAGMENT vwsz1=_sword_vbsaa
+sta {z1}
+// sign-extend the byte
+ora #$7f 
+bmi !+
+lda #0
+!:
+sta {z1}+1
+//FRAGMENT vwsz1=_sword_vbsxx
+txa
+sta {z1}
+// sign-extend the byte
+ora #$7f 
+bmi !+
+lda #0
+!:
+sta {z1}+1
+//FRAGMENT vwsz1=_sword_vbsyy
+tya
+sta {z1}
+// sign-extend the byte
+ora #$7f 
+bmi !+
+lda #0
+!:
+sta {z1}+1
+//FRAGMENT vwsz1=vwsz2_minus_vwsz1
+lda {z2}
+sec
+sbc {z1}
+sta {z1}
+lda {z2}+1
+sbc {z1}+1
+sta {z1}+1
+//FRAGMENT vwsz1=vwsz1_ror_6
+lda {z1}
+sta $ff
+lda {z1}+1
+sta {z1}
+lda #0
+bit {z1}+1
+bpl !+
+lda #$ff
+!:
+sta {z1}+1
+rol $ff
+rol {z1}
+rol {z1}+1
+rol $ff
+rol {z1}
+rol {z1}+1
+//FRAGMENT vwsz1=vwsz1_rol_3
+asl {z1}
+rol {z1}+1
+asl {z1}
+rol {z1}+1
+asl {z1}
+rol {z1}+1
 //FRAGMENT vbsz1_le_vbsc1_then_la1
 lda #{c1}
 sec
@@ -17366,25 +17632,11 @@ lda #0
 !:
 adc #>{c1}
 sta {z1}+1
-//FRAGMENT vwsz1=vwsz1_minus_vwsz2
-lda {z1}
-sec
-sbc {z2}
-sta {z1}
-lda {z1}+1
-sbc {z2}+1
-sta {z1}+1
 //FRAGMENT vbuaa_gt_vbuz1_then_la1
 cmp {z1}
 beq !+
 bcs {la1}
 !:
-//FRAGMENT qbuc1_derefidx_vbuz1=pbuz2
-ldy {z1}
-lda {z2}
-sta {c1},y
-lda {z2}+1
-sta {c1}+1,y
 //FRAGMENT pduc1_derefidx_vbuz1=pduc2_derefidx_vbuz1
 ldy {z1}
 lda {c2},y
@@ -17422,16 +17674,6 @@ lda {z1}
 sta {c1},y
 lda {z1}+1
 sta {c1}+1,y
-//FRAGMENT qbuc1_derefidx_vbuxx=pbuz1
-lda {z1}
-sta {c1},x
-lda {z1}+1
-sta {c1}+1,x
-//FRAGMENT qbuc1_derefidx_vbuyy=pbuz1
-lda {z1}
-sta {c1},y
-lda {z1}+1
-sta {c1}+1,y
 //FRAGMENT pduc1_derefidx_vbuaa=pduc2_derefidx_vbuaa
 tay
 lda {c2},y
@@ -17472,6 +17714,9 @@ lda ({z1}),y
 
 cmp #0
 beq {la1}
+//FRAGMENT vbuz1=vbuxx_minus_1
+dex
+stx {z1}
 //FRAGMENT pduc1_derefidx_vbuaa=pduc1_derefidx_vbuaa_plus_pduc2_derefidx_vbuaa
 tay
 clc
@@ -17523,13 +17768,80 @@ sta {z1}
 lda {z2}+1
 sbc #0
 sta {z1}+1
-//FRAGMENT vwsz1_neq_vwsc1_then_la1
-lda {z1}+1
-cmp #>{c1}
-bne {la1}
+//FRAGMENT vduz1_eq_vduz2_then_la1
 lda {z1}
-cmp #<{c1}
-bne {la1}
+cmp {z2}
+bne !+
+lda {z1}+1
+cmp {z2}+1
+bne !+
+lda {z1}+2
+cmp {z2}+2
+bne !+
+lda {z1}+3
+cmp {z2}+3
+beq {la1}
+!:
+//FRAGMENT vdsz1_eq_vdsz2_then_la1
+lda {z1}
+cmp {z2}
+bne !+
+lda {z1}+1
+cmp {z2}+1
+bne !+
+lda {z1}+2
+cmp {z2}+2
+bne !+
+lda {z1}+3
+cmp {z2}+3
+beq {la1}
+!:
+//FRAGMENT vdsz1=vdsz1_plus_vwsz2
+lda {z2}+1
+ora #$7f
+bmi !+
+lda #0
+!:
+sta $ff
+lda {z1}
+clc
+adc {z2}
+sta {z1}
+lda {z1}+1
+adc {z2}+1
+sta {z1}+1
+lda {z1}+2
+adc $ff
+sta {z1}+2
+lda {z1}+3
+adc $ff
+sta {z1}+3
+//FRAGMENT vdsz1=vdsz1_minus_vwsz2
+lda {z2}+1
+ora #$7f
+bmi !+
+lda #0
+!:
+sta $ff
+sec
+lda {z1}
+sbc {z2}
+sta {z1}
+lda {z1}+1
+sbc {z2}+1
+sta {z1}+1
+lda {z1}+2
+sbc $ff
+sta {z1}+2
+lda {z1}+3
+sbc $ff
+sta {z1}+3
+//FRAGMENT vwsz1=_dec_vwsz1
+lda {z1}
+bne !+
+dec {z1}+1
+!:
+dec {z1}
 //FRAGMENT _deref_pwuc1=vbuz1
 lda {z1}
 sta {c1}
@@ -17590,23 +17902,10 @@ asl {z1}
 rol {z1}+1
 asl {z1}
 rol {z1}+1
-//FRAGMENT vwuz1=_word_pbuc1_derefidx_vbuz2
-ldy {z2}
-lda {c1},y
-sta {z1}
-lda #0
-sta {z1}+1
 //FRAGMENT pbsc1_derefidx_vbuz1=vbsc2
 lda #{c2}
 ldy {z1}
 sta {c1},y
-//FRAGMENT _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuz2
-ldy #0
-lda ({z1}),y
-ldy {z2}
-ora {c1},y
-ldy #0
-sta ({z1}),y
 //FRAGMENT vwsz1=pwsc1_derefidx_vbuaa_minus_pwsc2_derefidx_vbuaa
 tay
 sec
@@ -17668,41 +17967,12 @@ asl {z1}
 rol {z1}+1
 asl {z1}
 rol {z1}+1
-//FRAGMENT vwuz1=_word_pbuc1_derefidx_vbuxx
-lda {c1},x
-sta {z1}
-lda #0
-sta {z1}+1
-//FRAGMENT vwuz1=_word_pbuc1_derefidx_vbuyy
-lda {c1},y
-sta {z1}
-lda #0
-sta {z1}+1
 //FRAGMENT pbsc1_derefidx_vbuxx=vbsc2
 lda #{c2}
 sta {c1},x
 //FRAGMENT pbsc1_derefidx_vbuyy=vbsc2
 lda #{c2}
 sta {c1},y
-//FRAGMENT _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuaa
-tay
-lda {c1},y
-ldy #0
-ora ({z1}),y
-ldy #0
-sta ({z1}),y
-//FRAGMENT _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx
-lda {c1},x
-ldy #0
-ora ({z1}),y
-ldy #0
-sta ({z1}),y
-//FRAGMENT _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuyy
-lda {c1},y
-ldy #0
-ora ({z1}),y
-ldy #0
-sta ({z1}),y
 //FRAGMENT _deref_pwuc1=_deref_pwuc1_plus_vwuc2
 lda #<{c2}
 clc
@@ -17944,6 +18214,9 @@ lda {c1}
 sta {z1}
 lda {c1}+1
 sta {z1}+1
+//FRAGMENT vbuz1_le_vbuaa_then_la1
+cmp {z1}
+bcs {la1}
 //FRAGMENT vbuaa_le_vbuyy_then_la1
 sta $ff
 cpy $ff
@@ -17953,10 +18226,22 @@ tay
 sty $ff
 cpx $ff
 bcs  {la1}
+//FRAGMENT vbuxx_le_vbuaa_then_la1
+stx $ff
+cmp $ff
+bcs {la1}
+//FRAGMENT vbuxx_le_vbuyy_then_la1
+stx $ff
+cpy $ff
+bcs {la1}
 //FRAGMENT vbuyy_ge_vbuaa_then_la1
 sta $ff
 cpy $ff
 bcs {la1}
+//FRAGMENT vbuyy_le_vbuaa_then_la1
+sty $ff
+cmp $ff
+bcs {la1}
 //FRAGMENT pwuc1_derefidx_vbuz1=pwuz2_derefidx_vbuc2
 ldx {z1}
 ldy #{c2}
@@ -17989,11 +18274,6 @@ sta {c1},x
 iny
 lda ({z1}),y
 sta {c1}+1,x
-//FRAGMENT vbsaa=vbsc1
-lda #{c1}
-//FRAGMENT vbsc1_neq_vbsyy_then_la1
-cpy #{c1}
-bne {la1}
 //FRAGMENT vbum1=vbum2
 lda {m2}
 sta {m1}
@@ -18019,6 +18299,1483 @@ sta {c1},x
 lda #{c2}
 ora {c1},y
 sta {c1},y
+//FRAGMENT vbsz1=_sbyte_vwuz2
+lda {z2}
+sta {z1}
+//FRAGMENT 0_neq_vbsz1_then_la1
+lda {z1}
+cmp #0
+bne {la1}
+//FRAGMENT pbuc1_derefidx_vbuaa_eq_vbuz1_then_la1
+tay
+lda {c1},y
+cmp {z1}
+beq {la1}
+//FRAGMENT pbuc1_derefidx_vbuz1_eq_vbuaa_then_la1
+ldx {z1}
+tay
+lda {c1},x
+tax
+sty $ff
+cpx $ff
+beq  {la1}
+//FRAGMENT pbuc1_derefidx_vbuaa_eq_vbuaa_then_la1
+tax
+lda {c1},x
+tay
+sty $ff
+cpx $ff
+beq  {la1}
+//FRAGMENT pbuc1_derefidx_vbuxx_eq_vbuaa_then_la1
+tay
+lda {c1},x
+tax
+sty $ff
+cpx $ff
+beq  {la1}
+//FRAGMENT pbuc1_derefidx_vbuyy_eq_vbuaa_then_la1
+tax
+lda {c1},y
+tay
+sty $ff
+cpx $ff
+beq  {la1}
+//FRAGMENT pbuc1_derefidx_vbuaa_eq_vbuxx_then_la1
+tay
+lda {c1},y
+tay
+sty $ff
+cpx $ff
+beq  {la1}
+//FRAGMENT pbuc1_derefidx_vbuaa_eq_vbuyy_then_la1
+tax
+lda {c1},x
+tax
+sty $ff
+cpx $ff
+beq  {la1}
+//FRAGMENT vbsaa=_sbyte_vwuz1
+lda {z1}
+//FRAGMENT vbsxx=_sbyte_vwuz1
+ldx {z1}
+//FRAGMENT vbsz1=vbsyy_minus_vbsaa
+sta $ff
+tya
+sec
+sbc $ff
+sta {z1}
+//FRAGMENT vbsxx=vbsyy_minus_vbsaa
+sta $ff
+tya
+sec
+sbc $ff
+tax
+//FRAGMENT 0_neq_vbsxx_then_la1
+cpx #0
+bne {la1}
+//FRAGMENT vbuz1=vbuyy_minus_1
+tya
+sec
+sbc #1
+sta {z1}
+//FRAGMENT vbsaa=_inc_vbsaa
+clc
+adc #1
+//FRAGMENT vbsyy=_sbyte_vwuz1
+ldy {z1}
+//FRAGMENT vbuaa_lt_vbuyy_then_la1
+tax
+sty $ff
+cpx $ff
+bcc {la1}
+//FRAGMENT vbuyy_lt_vbuaa_then_la1
+sta $ff
+cpy $ff
+bcc {la1}
+//FRAGMENT vbuz1=vbuz2_minus_vbuz1
+lda {z2}
+sec
+sbc {z1}
+sta {z1}
+//FRAGMENT vbsz1=vbsz1_minus_vbsz2
+lda {z1}
+sec
+sbc {z2}
+sta {z1}
+//FRAGMENT vbuz1=vbuc1_plus_vbuz1
+lax {z1}
+axs #-[{c1}]
+stx {z1}
+//FRAGMENT vbuz1=vbuz1_band_vbuc1
+lda #{c1}
+and {z1}
+sta {z1}
+//FRAGMENT vbsz1=vbsc1_minus_vbsz2
+lda #{c1}
+sec
+sbc {z2}
+sta {z1}
+//FRAGMENT vbsz1=vbsc1_minus_vbsaa
+eor #$ff
+sec
+adc #{c1}
+sta {z1}
+//FRAGMENT vbsz1=vbsc1_minus_vbsxx
+txa
+eor #$ff
+sec
+adc #{c1}
+sta {z1}
+//FRAGMENT vbsz1=vbsc1_minus_vbsyy
+tya
+eor #$ff
+sec
+adc #{c1}
+sta {z1}
+//FRAGMENT vbsaa=vbsc1_minus_vbsz1
+lda #{c1}
+sec
+sbc {z1}
+//FRAGMENT vbsaa=vbsc1_minus_vbsaa
+eor #$ff
+sec
+adc #{c1}
+//FRAGMENT vbsaa=vbsc1_minus_vbsxx
+txa
+eor #$ff
+sec
+adc #{c1}
+//FRAGMENT vbsaa=vbsc1_minus_vbsyy
+tya
+eor #$ff
+sec
+adc #{c1}
+//FRAGMENT vbsxx=vbsc1_minus_vbsz1
+lda #{c1}
+sec
+sbc {z1}
+tax
+//FRAGMENT vbsxx=vbsc1_minus_vbsaa
+eor #$ff
+tax
+axs #-{c1}-1
+//FRAGMENT vbsxx=vbsc1_minus_vbsxx
+txa
+eor #$ff
+tax
+axs #-{c1}-1
+//FRAGMENT vbsxx=vbsc1_minus_vbsyy
+tya
+eor #$ff
+tax
+axs #-{c1}-1
+//FRAGMENT vbsyy=vbsc1_minus_vbsz1
+lda #{c1}
+sec
+sbc {z1}
+tay
+//FRAGMENT vbsyy=vbsc1_minus_vbsaa
+eor #$ff
+sec
+adc #{c1}
+tay
+//FRAGMENT vbsyy=vbsc1_minus_vbsxx
+txa
+eor #$ff
+sec
+adc #{c1}
+tay
+//FRAGMENT vbsyy=vbsc1_minus_vbsyy
+tya
+eor #$ff
+sec
+adc #{c1}
+tay
+//FRAGMENT 0_neq_vbsaa_then_la1
+cmp #0
+bne {la1}
+//FRAGMENT vbsyy=vbsyy_minus_vbsaa
+sta $ff
+tya
+sec
+sbc $ff
+tay
+//FRAGMENT vbsz1_neq_0_then_la1
+lda {z1}
+cmp #0
+bne {la1}
+//FRAGMENT vwsz1=vbsz2
+lda {z2}
+sta {z1}
+and #$80
+beq !+
+lda #$ff
+!:
+sta {z1}+1
+//FRAGMENT vbsaa_neq_0_then_la1
+cmp #0
+bne {la1}
+//FRAGMENT vwsz1=vbsaa
+sta {z1}
+and #$80
+beq !+
+lda #$ff
+!:
+sta {z1}+1
+//FRAGMENT vwsz1=vbsxx
+txa
+sta {z1}
+and #$80
+beq !+
+lda #$ff
+!:
+sta {z1}+1
+//FRAGMENT vwsz1=vbsyy
+tya
+sta {z1}
+and #$80
+beq !+
+lda #$ff
+!:
+sta {z1}+1
+//FRAGMENT vbsxx_neq_0_then_la1
+cpx #0
+bne {la1}
+//FRAGMENT vbsz1=vbsz1_minus_vbsxx
+txa
+eor #$ff
+sec
+adc {z1}
+sta {z1}
+//FRAGMENT vbsz1_gt_0_then_la1
+lda {z1}
+cmp #0
+beq !+
+bpl {la1}
+!:
+//FRAGMENT vbuz1=vbuc1_minus_vbuz1
+lda #{c1}
+sec
+sbc {z1}
+sta {z1}
+//FRAGMENT vbsz1=vbsz2_ror_vbuz3
+lda {z2}
+ldy {z3}
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+sta {z1}
+//FRAGMENT vbsz1=vbsz1_plus_vbsz2
+lda {z1}
+clc
+adc {z2}
+sta {z1}
+//FRAGMENT vbuz1=vbuz1_minus_pbuc1_derefidx_vbuz2
+lda {z1}
+ldy {z2}
+sec
+sbc {c1},y
+sta {z1}
+//FRAGMENT vbsaa_gt_0_then_la1
+cmp #0
+beq !+
+bpl {la1}
+!:
+//FRAGMENT vbsxx_gt_0_then_la1
+txa
+cmp #0
+beq !+
+bpl {la1}
+!:
+//FRAGMENT vbsyy_gt_0_then_la1
+tya
+cmp #0
+beq !+
+bpl {la1}
+!:
+//FRAGMENT vbsaa=vbsz1_ror_vbuz2
+lda {z1}
+ldy {z2}
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+//FRAGMENT vbsxx=vbsz1_ror_vbuz2
+lda {z1}
+ldx {z2}
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+tax
+//FRAGMENT vbsyy=vbsz1_ror_vbuz2
+lda {z1}
+ldy {z2}
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+tay
+//FRAGMENT vbsz1=vbsaa_ror_vbuz2
+ldy {z2}
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+sta {z1}
+//FRAGMENT vbsaa=vbsaa_ror_vbuz1
+ldy {z1}
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+//FRAGMENT vbsxx=vbsaa_ror_vbuz1
+ldx {z1}
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+tax
+//FRAGMENT vbsyy=vbsaa_ror_vbuz1
+ldy {z1}
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+tay
+//FRAGMENT vbsz1=vbsxx_ror_vbuz2
+ldy {z2}
+txa
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+sta {z1}
+//FRAGMENT vbsaa=vbsxx_ror_vbuz1
+ldy {z1}
+txa
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+//FRAGMENT vbsxx=vbsxx_ror_vbuz1
+txa
+ldx {z1}
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+tax
+//FRAGMENT vbsyy=vbsxx_ror_vbuz1
+ldy {z1}
+txa
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+tay
+//FRAGMENT vbsz1=vbsyy_ror_vbuz2
+tya
+ldy {z2}
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+sta {z1}
+//FRAGMENT vbsaa=vbsyy_ror_vbuz1
+tya
+ldy {z1}
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+//FRAGMENT vbsxx=vbsyy_ror_vbuz1
+ldx {z1}
+tya
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+tax
+//FRAGMENT vbsyy=vbsyy_ror_vbuz1
+tya
+ldy {z1}
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+tay
+//FRAGMENT vbsz1=vbsz2_ror_vbuaa
+tay
+lda {z2}
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+sta {z1}
+//FRAGMENT vbsaa=vbsz1_ror_vbuaa
+tay
+lda {z1}
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+//FRAGMENT vbsxx=vbsz1_ror_vbuaa
+tax
+lda {z1}
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+tax
+//FRAGMENT vbsyy=vbsz1_ror_vbuaa
+tay
+lda {z1}
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+tay
+//FRAGMENT vbsz1=vbsaa_ror_vbuaa
+tay
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+sta {z1}
+//FRAGMENT vbsaa=vbsaa_ror_vbuaa
+tay
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+//FRAGMENT vbsxx=vbsaa_ror_vbuaa
+tax
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+tax
+//FRAGMENT vbsyy=vbsaa_ror_vbuaa
+tay
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+tay
+//FRAGMENT vbsz1=vbsxx_ror_vbuaa
+tay
+txa
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+sta {z1}
+//FRAGMENT vbsaa=vbsxx_ror_vbuaa
+tay
+txa
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+//FRAGMENT vbsxx=vbsxx_ror_vbuaa
+tay
+txa
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+tax
+//FRAGMENT vbsyy=vbsxx_ror_vbuaa
+tay
+txa
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+tay
+//FRAGMENT vbsz1=vbsyy_ror_vbuaa
+tax
+tya
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+sta {z1}
+//FRAGMENT vbsaa=vbsyy_ror_vbuaa
+tax
+tya
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+//FRAGMENT vbsxx=vbsyy_ror_vbuaa
+tax
+tya
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+tax
+//FRAGMENT vbsyy=vbsyy_ror_vbuaa
+tax
+tya
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+tay
+//FRAGMENT vbsz1=vbsz2_ror_vbuxx
+lda {z2}
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+sta {z1}
+//FRAGMENT vbsaa=vbsz1_ror_vbuxx
+lda {z1}
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+//FRAGMENT vbsxx=vbsz1_ror_vbuxx
+lda {z1}
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+tax
+//FRAGMENT vbsyy=vbsz1_ror_vbuxx
+lda {z1}
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+tay
+//FRAGMENT vbsz1=vbsaa_ror_vbuxx
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+sta {z1}
+//FRAGMENT vbsaa=vbsaa_ror_vbuxx
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+//FRAGMENT vbsxx=vbsaa_ror_vbuxx
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+tax
+//FRAGMENT vbsyy=vbsaa_ror_vbuxx
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+tay
+//FRAGMENT vbsz1=vbsxx_ror_vbuxx
+txa
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+sta {z1}
+//FRAGMENT vbsaa=vbsxx_ror_vbuxx
+txa
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+//FRAGMENT vbsxx=vbsxx_ror_vbuxx
+txa
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+tax
+//FRAGMENT vbsyy=vbsxx_ror_vbuxx
+txa
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+tay
+//FRAGMENT vbsz1=vbsyy_ror_vbuxx
+tya
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+sta {z1}
+//FRAGMENT vbsaa=vbsyy_ror_vbuxx
+tya
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+//FRAGMENT vbsxx=vbsyy_ror_vbuxx
+tya
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+tax
+//FRAGMENT vbsyy=vbsyy_ror_vbuxx
+tya
+cpx #0
+beq !e+
+!l:
+cmp #$80
+ror
+dex
+bne !l-
+!e:
+tay
+//FRAGMENT vbsz1=vbsz2_ror_vbuyy
+lda {z2}
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+sta {z1}
+//FRAGMENT vbsaa=vbsz1_ror_vbuyy
+lda {z1}
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+//FRAGMENT vbsxx=vbsz1_ror_vbuyy
+lda {z1}
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+tax
+//FRAGMENT vbsyy=vbsz1_ror_vbuyy
+lda {z1}
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+tay
+//FRAGMENT vbsz1=vbsaa_ror_vbuyy
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+sta {z1}
+//FRAGMENT vbsaa=vbsaa_ror_vbuyy
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+//FRAGMENT vbsxx=vbsaa_ror_vbuyy
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+tax
+//FRAGMENT vbsyy=vbsaa_ror_vbuyy
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+tay
+//FRAGMENT vbsz1=vbsxx_ror_vbuyy
+txa
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+sta {z1}
+//FRAGMENT vbsaa=vbsxx_ror_vbuyy
+txa
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+//FRAGMENT vbsxx=vbsxx_ror_vbuyy
+txa
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+tax
+//FRAGMENT vbsyy=vbsxx_ror_vbuyy
+txa
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+tay
+//FRAGMENT vbsz1=vbsyy_ror_vbuyy
+tya
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+sta {z1}
+//FRAGMENT vbsaa=vbsyy_ror_vbuyy
+tya
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+//FRAGMENT vbsxx=vbsyy_ror_vbuyy
+tya
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+tax
+//FRAGMENT vbsyy=vbsyy_ror_vbuyy
+tya
+cpy #0
+beq !e+
+!l:
+cmp #$80
+ror
+dey
+bne !l-
+!e:
+tay
+//FRAGMENT vbsz1=vbsz1_minus_vbsyy
+tya
+eor #$ff
+sec
+adc {z1}
+sta {z1}
+//FRAGMENT vbsz1=vbsz1_plus_vbsxx
+txa
+clc
+adc {z1}
+sta {z1}
+//FRAGMENT vbsz1=vbsz1_plus_vbsyy
+tya
+clc
+adc {z1}
+sta {z1}
+//FRAGMENT vbuxx=vbuxx_minus_pbuc1_derefidx_vbuz1
+txa
+ldx {z1}
+sec
+sbc {c1},x
+tax
+//FRAGMENT vbuyy=vbuyy_minus_pbuc1_derefidx_vbuz1
+tya
+ldy {z1}
+sec
+sbc {c1},y
+tay
+//FRAGMENT vbuz1=vbuz1_minus_pbuc1_derefidx_vbuxx
+lda {z1}
+sec
+sbc {c1},x
+sta {z1}
+//FRAGMENT vbuxx=vbuxx_minus_pbuc1_derefidx_vbuxx
+txa
+tax
+sec
+sbc {c1},x
+tax
+//FRAGMENT vbuyy=vbuyy_minus_pbuc1_derefidx_vbuxx
+tya
+sec
+sbc {c1},x
+tay
+//FRAGMENT vbuz1=vbuz1_minus_pbuc1_derefidx_vbuyy
+lda {z1}
+sec
+sbc {c1},y
+sta {z1}
+//FRAGMENT vbuxx=vbuxx_minus_pbuc1_derefidx_vbuyy
+txa
+sec
+sbc {c1},y
+tax
+//FRAGMENT vbuyy=vbuyy_minus_pbuc1_derefidx_vbuyy
+tya
+tay
+sec
+sbc {c1},y
+tay
+//FRAGMENT vbsyy_neq_0_then_la1
+cpy #0
+bne {la1}
+//FRAGMENT vbuyy_neq_vbuaa_then_la1
+tax
+stx $ff
+cpy $ff
+bne {la1}
+//FRAGMENT vwuz1=vwuz2_minus_vbuc1
+sec
+lda {z2}
+sbc #{c1}
+sta {z1}
+lda {z2}+1
+sbc #0
+sta {z1}+1
+//FRAGMENT vduz1=vwuz2
+lda {z2}
+sta {z1}
+lda {z2}+1
+sta {z1}+1
+lda #0
+sta {z1}+2
+sta {z1}+3
+//FRAGMENT vwsz1_lt_vwuz2_then_la1
+lda {z1}+1
+bmi {la1}
+cmp {z2}+1
+bcc {la1}
+bne !+
+lda {z1}
+cmp {z2}
+bcc {la1}
+!:
+//FRAGMENT vduz1=pduz2_derefidx_vbuz3
+ldy {z3}
+lda ({z2}),y
+sta {z1}
+iny
+lda ({z2}),y
+sta {z1}+1
+iny
+lda ({z2}),y
+sta {z1}+2
+iny
+lda ({z2}),y
+sta {z1}+3
+//FRAGMENT vduz1=vduz2_plus_pduc1_derefidx_vbuz3
+ldy {z3}
+lda {z2}
+clc
+adc {c1},y
+sta {z1}
+lda {z2}+1
+adc {c1}+1,y
+sta {z1}+1
+lda {z2}+2
+adc {c1}+2,y
+sta {z1}+2
+lda {z2}+3
+adc {c1}+3,y
+sta {z1}+3
+//FRAGMENT vduz1=vduz2_plus_pduz3_derefidx_vbuz4
+ldy {z4}
+lda {z2}
+clc
+adc ({z3}),y
+sta {z1}
+iny
+lda {z2}+1
+adc ({z3}),y
+sta {z1}+1
+iny
+lda {z2}+2
+adc ({z3}),y
+sta {z1}+2
+iny
+lda {z2}+3
+adc ({z3}),y
+sta {z1}+3
+//FRAGMENT vduz1=_bnot_vduz2
+lda {z2}
+eor #$ff
+sta {z1}
+lda {z2}+1
+eor #$ff
+sta {z1}+1
+lda {z2}+2
+eor #$ff
+sta {z1}+2
+lda {z2}+3
+eor #$ff
+sta {z1}+3
+//FRAGMENT vduz1=vduz2_bor_vduz3
+lda {z2}
+ora {z3}
+sta {z1}
+lda {z2}+1
+ora {z3}+1
+sta {z1}+1
+lda {z2}+2
+ora {z3}+2
+sta {z1}+2
+lda {z2}+3
+ora {z3}+3
+sta {z1}+3
+//FRAGMENT vduz1=vduz2_bxor_vduz3
+lda {z2}
+eor {z3}
+sta {z1}
+lda {z2}+1
+eor {z3}+1
+sta {z1}+1
+lda {z2}+2
+eor {z3}+2
+sta {z1}+2
+lda {z2}+3
+eor {z3}+3
+sta {z1}+3
+//FRAGMENT vduz1=vduz2_band_vduz3
+lda {z2}
+and {z3}
+sta {z1}
+lda {z2}+1
+and {z3}+1
+sta {z1}+1
+lda {z2}+2
+and {z3}+2
+sta {z1}+2
+lda {z2}+3
+and {z3}+3
+sta {z1}+3
+//FRAGMENT vwuz1=vwuz2_band_vbuc1
+lda #{c1}
+and {z2}
+sta {z1}
+lda #0
+sta {z1}+1
+//FRAGMENT pbuz1=pbuc1_minus_vwuz2
+sec
+lda #<{c1}
+sbc {z2}
+sta {z1}
+lda #>{c1}
+sbc {z2}+1
+sta {z1}+1 
+//FRAGMENT vduz1=pduz2_derefidx_vbuxx
+txa
+tay
+lda ({z2}),y
+sta {z1}
+iny
+lda ({z2}),y
+sta {z1}+1
+iny
+lda ({z2}),y
+sta {z1}+2
+iny
+lda ({z2}),y
+sta {z1}+3
+//FRAGMENT vduz1=vduz2_plus_pduc1_derefidx_vbuxx
+lda {z2}
+clc
+adc {c1},x
+sta {z1}
+lda {z2}+1
+adc {c1}+1,x
+sta {z1}+1
+lda {z2}+2
+adc {c1}+2,x
+sta {z1}+2
+lda {z2}+3
+adc {c1}+3,x
+sta {z1}+3
+//FRAGMENT vduz1=vduz2_plus_pduz3_derefidx_vbuxx
+txa
+tay
+lda {z2}
+clc
+adc ({z3}),y
+sta {z1}
+iny
+lda {z2}+1
+adc ({z3}),y
+sta {z1}+1
+iny
+lda {z2}+2
+adc ({z3}),y
+sta {z1}+2
+iny
+lda {z2}+3
+adc ({z3}),y
+sta {z1}+3
+//FRAGMENT vduz1=vduz2_bxor_vduz1
+lda {z1}
+eor {z2}
+sta {z1}
+lda {z1}+1
+eor {z2}+1
+sta {z1}+1
+lda {z1}+2
+eor {z2}+2
+sta {z1}+2
+lda {z1}+3
+eor {z2}+3
+sta {z1}+3
+//FRAGMENT vduz1=vduz1_bxor_vduz2
+lda {z1}
+eor {z2}
+sta {z1}
+lda {z1}+1
+eor {z2}+1
+sta {z1}+1
+lda {z1}+2
+eor {z2}+2
+sta {z1}+2
+lda {z1}+3
+eor {z2}+3
+sta {z1}+3
+//FRAGMENT vduz1=vduz1_bor_vduz2
+lda {z2}
+ora {z1}
+sta {z1}
+lda {z2}+1
+ora {z1}+1
+sta {z1}+1
+lda {z2}+2
+ora {z1}+2
+sta {z1}+2
+lda {z2}+3
+ora {z1}+3
+sta {z1}+3
+//FRAGMENT vbuz1=vbuz1_rol_2
+lda {z1}
+asl
+asl
+sta {z1}
+//FRAGMENT vwuz1=vwuz1_band_vbuc1
+lda #{c1}
+and {z1}
+sta {z1}
+lda #0
+sta {z1}+1
+//FRAGMENT vduz1=vduz1_plus_pduz2_derefidx_vbuz3
+ldy {z3}
+lda {z1}
+clc
+adc ({z2}),y
+sta {z1}
+iny
+lda {z1}+1
+adc ({z2}),y
+sta {z1}+1
+iny
+lda {z1}+2
+adc ({z2}),y
+sta {z1}+2
+iny
+lda {z1}+3
+adc ({z2}),y
+sta {z1}+3
+//FRAGMENT vduz1=vduz1_band_vduz2
+lda {z1}
+and {z2}
+sta {z1}
+lda {z1}+1
+and {z2}+1
+sta {z1}+1
+lda {z1}+2
+and {z2}+2
+sta {z1}+2
+lda {z1}+3
+and {z2}+3
+sta {z1}+3
+//FRAGMENT pbuz1=pbuc1_minus_vwuz1
+sec
+lda #<{c1}
+sbc {z1}
+sta {z1}
+lda #>{c1}
+sbc {z1}+1
+sta {z1}+1
+//FRAGMENT vduz1=vduz1_plus_pduc1_derefidx_vbuz2
+ldy {z2}
+lda {z1}
+clc
+adc {c1},y
+sta {z1}
+lda {z1}+1
+adc {c1}+1,y
+sta {z1}+1
+lda {z1}+2
+adc {c1}+2,y
+sta {z1}+2
+lda {z1}+3
+adc {c1}+3,y
+sta {z1}+3
+//FRAGMENT vduz1=vduz2_bor_vduz1
+lda {z2}
+ora {z1}
+sta {z1}
+lda {z2}+1
+ora {z1}+1
+sta {z1}+1
+lda {z2}+2
+ora {z1}+2
+sta {z1}+2
+lda {z2}+3
+ora {z1}+3
+sta {z1}+3
+//FRAGMENT vduz1=vduz2_plus_vduz1
+lda {z1}
+clc
+adc {z2}
+sta {z1}
+lda {z1}+1
+adc {z2}+1
+sta {z1}+1
+lda {z1}+2
+adc {z2}+2
+sta {z1}+2
+lda {z1}+3
+adc {z2}+3
+sta {z1}+3
+//FRAGMENT vbsz1_eq_vbsc1_then_la1
+lda #{c1}
+cmp {z1}
+beq {la1}
+//FRAGMENT 0_eq_vbsz1_then_la1
+lda {z1}
+cmp #0
+beq {la1}
+//FRAGMENT pbuz1=pbuz2_plus_vbsz3
+lda {z3}
+pha
+clc
+adc {z2}
+sta {z1}
+pla
+ora #$7f
+bmi !+
+lda #0
+!:
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT vbsaa_eq_vbsc1_then_la1
+cmp #{c1}
+beq {la1}
+//FRAGMENT vbsaa=vbsyy_minus_vbsaa
+sta $ff
+tya
+sec
+sbc $ff
+//FRAGMENT 0_eq_vbsaa_then_la1
+cmp #0
+beq {la1}
+//FRAGMENT pbuz1=pbuz2_plus_vbsaa
+pha
+clc
+adc {z2}
+sta {z1}
+pla
+ora #$7f
+bmi !+
+lda #0
+!:
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT pbuz1=pbuz2_plus_vbsxx
+txa
+pha
+clc
+adc {z2}
+sta {z1}
+pla
+ora #$7f
+bmi !+
+lda #0
+!:
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT pbuz1=pbuz2_plus_vbsyy
+tya
+pha
+clc
+adc {z2}
+sta {z1}
+pla
+ora #$7f
+bmi !+
+lda #0
+!:
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT 0_eq_vbsxx_then_la1
+cpx #0
+beq {la1}
+//FRAGMENT vbsxx_eq_vbsc1_then_la1
+cpx #{c1}
+beq {la1}
+//FRAGMENT 0_eq_vbsyy_then_la1
+cpy #0
+beq {la1}
+//FRAGMENT pbuz1=pbuz1_plus_vbsxx
+txa
+pha
+clc
+adc {z1}
+sta {z1}
+pla
+ora #$7f
+bmi !+
+lda #0
+!:
+adc {z1}+1
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz1_rol_2
+asl {z1}
+rol {z1}+1
+asl {z1}
+rol {z1}+1
+//FRAGMENT vbsaa=vbsc1
+lda #{c1}
+//FRAGMENT 0_neq_vbsyy_then_la1
+cpy #0
+bne {la1}
 //FRAGMENT vduz1=vduz2_rol_0
 lda {z2}
 sta {z1}
@@ -18028,27 +19785,6 @@ lda {z2}+2
 sta {z1}+2
 lda {z2}+3
 sta {z1}+3
-//FRAGMENT vduz1=vduz2_rol_3
-lda {z2}
-asl
-sta {z1}
-lda {z2}+1
-rol
-sta {z1}+1
-lda {z2}+2
-rol
-sta {z1}+2
-lda {z2}+3
-rol
-sta {z1}+3
-asl {z1}
-rol {z1}+1
-rol {z1}+2
-rol {z1}+3
-asl {z1}
-rol {z1}+1
-rol {z1}+2
-rol {z1}+3
 //FRAGMENT vduz1=vduz2_rol_5
 lda {z2}
 asl
@@ -18553,1429 +20289,3 @@ ror {z1}
 dex
 bne !-
 !e:
-//FRAGMENT vwsz1=_sword_vbsz2
-lda {z2}
-sta {z1}
-// sign-extend the byte
-ora #$7f 
-bmi !+
-lda #0
-!:
-sta {z1}+1
-//FRAGMENT vwsz1=vwsz1_minus_vwsc1
-lda {z1}
-sec
-sbc #<{c1}
-sta {z1}
-lda {z1}+1
-sbc #>{c1}
-sta {z1}+1
-//FRAGMENT vwsz1=_sword_vbsyy
-tya
-sta {z1}
-// sign-extend the byte
-ora #$7f 
-bmi !+
-lda #0
-!:
-sta {z1}+1
-//FRAGMENT vwuz1=vwuz2_plus__deref_pwuz3
-ldy #0
-clc
-lda {z2}
-adc ({z3}),y
-sta {z1}
-iny
-lda {z2}+1
-adc ({z3}),y
-sta {z1}+1
-//FRAGMENT vwuz1_neq_0_then_la1
-lda {z1}
-ora {z1}+1
-bne {la1}
-//FRAGMENT vwuz1=vwuz1_ror_1
-lsr {z1}+1
-ror {z1}
-//FRAGMENT vwuz1=_deref_pwuz1
-ldy #0
-lda ({z1}),y
-pha
-iny
-lda ({z1}),y
-sta {z1}+1
-pla
-sta {z1}
-//FRAGMENT vwuz1=_deref_pwuz1_plus__deref_pwuz2
-ldy #0
-clc
-lda ({z1}),y
-adc ({z2}),y
-pha
-iny
-lda ({z1}),y
-adc ({z2}),y
-sta {z1}+1
-pla
-sta {z1}
-//FRAGMENT vwuz1=vwuz2_plus__deref_pwuz1
-ldy #0
-clc
-lda ({z1}),y
-adc {z2}
-pha
-iny
-lda ({z1}),y
-adc {z2}+1
-sta {z1}+1
-pla
-sta {z1}
-//FRAGMENT pwsz1=pwsc1_plus_vwsz2
-clc
-lda {z2}
-adc #<{c1}
-sta {z1}
-lda {z2}+1
-adc #>{c1}
-sta {z1}+1
-//FRAGMENT vdsz1=vdsz2
-lda {z2}
-sta {z1}
-lda {z2}+1
-sta {z1}+1
-lda {z2}+2
-sta {z1}+2
-lda {z2}+3
-sta {z1}+3
-//FRAGMENT vwsz1=_sword_vdsz2
-lda {z2}
-sta {z1}
-lda {z2}+1
-sta {z1}+1
-//FRAGMENT vwsz1_neq_0_then_la1
-lda {z1}+1
-ora {z1}
-bne {la1}
-//FRAGMENT _deref_pwsz1=vwsz2
-ldy #0
-lda {z2}
-sta ({z1}),y
-iny
-lda {z2}+1
-sta ({z1}),y
-//FRAGMENT vduz1=vduz1_sethi_vwuz2
-lda {z2}
-sta {z1}+2
-lda {z2}+1
-sta {z1}+3
-//FRAGMENT pwsz1=pwsc1_plus_vwsz1
-clc
-lda {z1}
-adc #<{c1}
-sta {z1}
-lda {z1}+1
-adc #>{c1}
-sta {z1}+1
-//FRAGMENT vwuz1=vbuz2_word_vbuc1
-lda {z2}
-ldy #{c1}
-sta {z1}+1
-sty {z1}
-//FRAGMENT vbuz1=vbuz2_minus__deref_pbuz3
-lda {z2}
-sec
-ldy #0
-sbc ({z3}),y
-sta {z1}
-//FRAGMENT vwuz1=_neg_vwuz1
-sec
-lda #0
-sbc {z1}
-sta {z1}
-lda #0
-sbc {z1}+1
-sta {z1}+1
-//FRAGMENT vwsz1=vwsz1_ror_1
-lda {z1}+1
-cmp #$80
-ror {z1}+1
-ror {z1}
-//FRAGMENT vwuz1=vwuz1_plus_pwuc1_derefidx_vbuz2
-ldy {z2}
-clc
-lda {z1}
-adc {c1},y
-sta {z1}
-lda {z1}+1
-adc {c1}+1,y
-sta {z1}+1
-//FRAGMENT vwsz1=vwsz1_ror_2
-lda {z1}+1
-cmp #$80
-ror {z1}+1
-ror {z1}
-lda {z1}+1
-cmp #$80
-ror {z1}+1
-ror {z1}
-//FRAGMENT vwuz1=vbuaa_word_vbuc1
-ldy #{c1}
-sta {z1}+1
-sty {z1}
-//FRAGMENT vwuz1=vbuxx_word_vbuc1
-ldy #{c1}
-txa
-sta {z1}+1
-sty {z1}
-//FRAGMENT vwuz1=vbuyy_word_vbuc1
-tya
-ldy #{c1}
-sta {z1}+1
-sty {z1}
-//FRAGMENT vbuz1=vbuxx_minus__deref_pbuz2
-txa
-sec
-ldy #0
-sbc ({z2}),y
-sta {z1}
-//FRAGMENT vbuaa=vbuz1_minus__deref_pbuz2
-lda {z1}
-sec
-ldy #0
-sbc ({z2}),y
-//FRAGMENT vbuaa=vbuxx_minus__deref_pbuz1
-txa
-sec
-ldy #0
-sbc ({z1}),y
-//FRAGMENT vbuxx=vbuz1_minus__deref_pbuz2
-lda {z1}
-sec
-ldy #0
-sbc ({z2}),y
-tax
-//FRAGMENT vbuxx=vbuxx_minus__deref_pbuz1
-txa
-sec
-ldy #0
-sbc ({z1}),y
-tax
-//FRAGMENT vbuyy=vbuz1_minus__deref_pbuz2
-lda {z1}
-sec
-ldy #0
-sbc ({z2}),y
-tay
-//FRAGMENT vbuyy=vbuxx_minus__deref_pbuz1
-txa
-sec
-ldy #0
-sbc ({z1}),y
-tay
-//FRAGMENT vwuz1=vwuz1_minus_pwuc1_derefidx_vbuaa
-tay
-sec
-lda {z1}
-sbc {c1},y
-sta {z1}
-lda {z1}+1
-sbc {c1}+1,y
-sta {z1}+1
-//FRAGMENT vwuz1=vwuz1_plus_pwuc1_derefidx_vbuaa
-tay
-clc
-lda {z1}
-adc {c1},y
-sta {z1}
-lda {z1}+1
-adc {c1}+1,y
-sta {z1}+1
-//FRAGMENT vwuz1=vwuz1_plus_pwuc1_derefidx_vbuxx
-clc
-lda {z1}
-adc {c1},x
-sta {z1}
-lda {z1}+1
-adc {c1}+1,x
-sta {z1}+1
-//FRAGMENT vwuz1=vwuz1_plus_pwuc1_derefidx_vbuyy
-clc
-lda {z1}
-adc {c1},y
-sta {z1}
-lda {z1}+1
-adc {c1}+1,y
-sta {z1}+1
-//FRAGMENT pwuz1=pwuz2
-lda {z2}
-sta {z1}
-lda {z2}+1
-sta {z1}+1
-//FRAGMENT vwuz1=pwuz2_minus_pwuc1
-lda {z2}
-sec
-sbc #<{c1}
-sta {z1}
-lda {z2}+1
-sbc #>{c1}
-sta {z1}+1
-//FRAGMENT _deref_pwuz1_le_vwuz2_then_la1
-ldy #1
-lda ({z1}),y
-cmp {z2}+1
-bne !+
-dey
-lda ({z1}),y
-cmp {z2}
-beq {la1}
-!:
-bcc {la1}
-//FRAGMENT pwuz1=pwuz1_minus_vbuc1
-sec
-lda {z1}
-sbc #{c1}
-sta {z1}
-lda {z1}+1
-sbc #0
-sta {z1}+1
-//FRAGMENT pwuz1=pwuz2_plus_vbuz3
-lda {z3}
-clc
-adc {z2}
-sta {z1}
-lda #0
-adc {z2}+1
-sta {z1}+1
-//FRAGMENT vwsz1=vwsz2_minus__deref_pwsz3
-sec
-lda {z2}
-ldy #0
-sbc ({z3}),y
-sta {z1}
-lda {z2}+1
-iny
-sbc ({z3}),y
-sta {z1}+1
-//FRAGMENT vwsz1_le_0_then_la1
-lda {z1}+1
-bmi {la1}
-bne !+
-lda {z1}
-beq {la1}
-!:
-//FRAGMENT pwuz1=pwuz2_plus_vbuc1
-lda #{c1}
-clc
-adc {z2}
-sta {z1}
-lda #0
-adc {z2}+1
-sta {z1}+1
-//FRAGMENT pwuz1=pwuz2_plus_vbuaa
-clc
-adc {z2}
-sta {z1}
-lda #0
-adc {z2}+1
-sta {z1}+1
-//FRAGMENT pwuz1=pwuz2_plus_vbuxx
-txa
-clc
-adc {z2}
-sta {z1}
-lda #0
-adc {z2}+1
-sta {z1}+1
-//FRAGMENT pwuz1=pwuz2_plus_vbuyy
-tya
-clc
-adc {z2}
-sta {z1}
-lda #0
-adc {z2}+1
-sta {z1}+1
-//FRAGMENT vbuxx=vbuaa_plus_1
-tax
-inx
-//FRAGMENT vbuyy=vbuaa_plus_1
-tay
-iny
-//FRAGMENT vwuz1=pwuz1_minus_pwuc1
-lda {z1}
-sec
-sbc #<{c1}
-sta {z1}
-lda {z1}+1
-sbc #>{c1}
-sta {z1}+1
-//FRAGMENT vwuz1_eq_0_then_la1
-lda {z1}
-ora {z1}+1
-beq {la1}
-//FRAGMENT pbuz1=pbuz2_minus_vwuc1
-lda {z2}
-sec
-sbc #<{c1}
-sta {z1}
-lda {z2}+1
-sbc #>{c1}
-sta {z1}+1
-//FRAGMENT vbuz1=vbuc1_rol_pbuz2_derefidx_vbuc2
-ldy #{c2}
-lda ({z2}),y
-tay
-lda #{c1}
-cpy #0
-beq !e+
-!:
-asl
-dey
-bne !-
-!e:
-sta {z1}
-//FRAGMENT pbuz1_derefidx_vbuc1_eq_vbuc2_then_la1
-lda #{c2}
-ldy #{c1}
-cmp ({z1}),y
-beq {la1}
-//FRAGMENT pbuz1_derefidx_vbuc1_neq_vbuc2_then_la1
-ldy #{c1}
-lda ({z1}),y
-
-cmp #{c2}
-bne {la1}
-//FRAGMENT _deref_(qbuz1_derefidx_vbuc1)=vbuc2
-ldx #{c2}
-ldy #{c1}
-lda ({z1}),y
-sta !+ +1
-iny
-lda ({z1}),y
-sta !+ +2
-!: stx $ffff
-//FRAGMENT pbuc1_derefidx_(pbuz1_derefidx_vbuc2)=pbuz1_derefidx_vbuc3
-ldy #{c3}
-lda ({z1}),y
-ldy #{c2}
-pha
-lda ({z1}),y
-tay
-pla
-sta {c1},y
-//FRAGMENT vwuz1=_deref_pwuz2_ror_4
-ldy #0
-lda ({z2}),y
-sta {z1}
-iny
-lda ({z2}),y
-sta {z1}+1
-lsr {z1}+1
-ror {z1}
-lsr {z1}+1
-ror {z1}
-lsr {z1}+1
-ror {z1}
-lsr {z1}+1
-ror {z1}
-//FRAGMENT vwuz1=pwuz2_derefidx_vbuc1_ror_4
-ldy #{c1}
-lda ({z2}),y
-sta {z1}
-iny
-lda ({z2}),y
-sta {z1}+1
-lsr {z1}+1
-ror {z1}
-lsr {z1}+1
-ror {z1}
-lsr {z1}+1
-ror {z1}
-lsr {z1}+1
-ror {z1}
-//FRAGMENT _deref_pwuz1_lt_vwuc1_then_la1
-ldy #1
-lda ({z1}),y
-cmp #>{c1}
-bcc {la1}
-bne !+
-dey
-lda ({z1}),y
-cmp #<{c1}
-bcc {la1}
-!:
-//FRAGMENT _deref_pwuz1_gt_vwuc1_then_la1
-ldy #1
-lda #>{c1}
-cmp ({z1}),y
-bcc {la1}
-bne !+
-dey
-lda #<{c1}
-cmp ({z1}),y
-bcc {la1}
-!:
-//FRAGMENT pwuz1_derefidx_vbuc1_lt_vwuc2_then_la1
-ldy #{c1}
-iny
-lda ({z1}),y
-cmp #>{c2}
-bcc {la1}
-bne !+
-dey
-lda ({z1}),y
-cmp #<{c2}
-bcc {la1}
-!:
-//FRAGMENT pwuz1_derefidx_vbuc1_gt_vwuc2_then_la1
-ldy #{c1}
-iny
-lda #>{c2}
-cmp ({z1}),y
-bcc {la1}
-bne !+
-dey
-lda #<{c2}
-cmp ({z1}),y
-bcc {la1}
-!:
-//FRAGMENT pwuz1_derefidx_vbuc1=pwuz1_derefidx_vbuc1_plus_pwuc2_derefidx_vbuz2
-ldx {z2}
-ldy #{c1}
-clc
-lda ({z1}),y
-adc {c2},x
-sta ({z1}),y
-iny
-lda ({z1}),y
-adc {c2}+1,x
-sta ({z1}),y
-//FRAGMENT vwuz1=vbuc1_plus_vwuz2
-lda #{c1}
-clc
-adc {z2}
-sta {z1}
-lda #0
-adc {z2}+1
-sta {z1}+1
-//FRAGMENT vbuaa=vbuc1_rol_pbuz1_derefidx_vbuc2
-ldy #{c2}
-lda ({z1}),y
-tay
-lda #{c1}
-cpy #0
-beq !e+
-!:
-asl
-dey
-bne !-
-!e:
-//FRAGMENT vbuxx=vbuc1_rol_pbuz1_derefidx_vbuc2
-ldy #{c2}
-lda ({z1}),y
-tax
-lda #{c1}
-cpx #0
-beq !e+
-!:
-asl
-dex
-bne !-
-!e:
-tax
-//FRAGMENT vbuyy=vbuc1_rol_pbuz1_derefidx_vbuc2
-ldy #{c2}
-lda ({z1}),y
-tay
-lda #{c1}
-cpy #0
-beq !e+
-!:
-asl
-dey
-bne !-
-!e:
-tay
-//FRAGMENT pwuz1_derefidx_vbuc1=pwuz1_derefidx_vbuc1_plus_pwuc2_derefidx_vbuaa
-ldy #{c1}
-tax
-clc
-lda ({z1}),y
-adc {c2},x
-sta ({z1}),y
-iny
-lda ({z1}),y
-adc {c2}+1,x
-sta ({z1}),y
-//FRAGMENT pwuz1_derefidx_vbuc1=pwuz1_derefidx_vbuc1_plus_pwuc2_derefidx_vbuxx
-ldy #{c1}
-clc
-lda ({z1}),y
-adc {c2},x
-sta ({z1}),y
-iny
-lda ({z1}),y
-adc {c2}+1,x
-sta ({z1}),y
-//FRAGMENT pwuz1_derefidx_vbuc1=pwuz1_derefidx_vbuc1_plus_pwuc2_derefidx_vbuyy
-tya
-ldy #{c1}
-tax
-clc
-lda ({z1}),y
-adc {c2},x
-sta ({z1}),y
-iny
-lda ({z1}),y
-adc {c2}+1,x
-sta ({z1}),y
-//FRAGMENT vwuz1=vbuc1_plus_vwuz1
-lda #{c1}
-clc
-adc {z1}
-sta {z1}
-bcc !+
-inc {z1}+1
-!:
-//FRAGMENT pbuz1=pbuz2_minus_vwuz3
-lda {z2}
-sec
-sbc {z3}
-sta {z1}
-lda {z2}+1
-sbc {z3}+1
-sta {z1}+1
-//FRAGMENT pwuz1=qwuz2_derefidx_vbuz3
-ldy {z3}
-lda ({z2}),y
-sta {z1}
-iny
-lda ({z2}),y
-sta {z1}+1
-//FRAGMENT vbuz1_le_0_then_la1
-lda {z1}
-cmp #0
-beq {la1}
-//FRAGMENT vwuz1_eq_vwuc1_then_la1
-lda {z1}
-cmp #<{c1}
-bne !+
-lda {z1}+1
-cmp #>{c1}
-beq {la1}
-!:
-//FRAGMENT _deref_pbuz1_gt_vbuz2_then_la1
-ldy #0
-lda ({z1}),y
-cmp {z2}
-beq !+
-bcs {la1}
-!:
-//FRAGMENT pbuz1_derefidx_(_deref_pbuz2)=_inc_pbuz1_derefidx_(_deref_pbuz2)
-ldy #0
-lda ({z2}),y
-tay
-lda ({z1}),y
-clc
-adc #1
-sta ({z1}),y
-//FRAGMENT vwuz1=_deref_pbuz2_rol_1
-ldy #0
-lda ({z2}),y
-asl
-sta {z1}
-lda #0
-rol
-sta {z1}+1
-//FRAGMENT qwuz1=qwuz2_plus_vwuz3
-lda {z2}
-clc
-adc {z3}
-sta {z1}
-lda {z2}+1
-adc {z3}+1
-sta {z1}+1
-//FRAGMENT _deref_qwuz1=pwuz2
-ldy #0
-lda {z2}
-sta ({z1}),y
-iny
-lda {z2}+1
-sta ({z1}),y
-//FRAGMENT pwuz1=_deref_qwuz2
-ldy #0
-lda ({z2}),y
-sta {z1}
-iny
-lda ({z2}),y
-sta {z1}+1
-//FRAGMENT vwuz1=pbuz2_minus_pbuz3
-lda {z2}
-sec
-sbc {z3}
-sta {z1}
-lda {z2}+1
-sbc {z3}+1
-sta {z1}+1
-//FRAGMENT pwuz1_derefidx_vbuz2=vwuz3
-ldy {z2}
-lda {z3}
-sta ({z1}),y
-iny
-lda {z3}+1
-sta ({z1}),y
-//FRAGMENT vwuz1=pwuz2_minus_pwuz3
-lda {z2}
-sec
-sbc {z3}
-sta {z1}
-lda {z2}+1
-sbc {z3}+1
-sta {z1}+1
-//FRAGMENT pwuz1=qwuz2_derefidx_vbuaa
-tay
-lda ({z2}),y
-sta {z1}
-iny
-lda ({z2}),y
-sta {z1}+1
-//FRAGMENT pwuz1=qwuz2_derefidx_vbuxx
-txa
-tay
-lda ({z2}),y
-sta {z1}
-iny
-lda ({z2}),y
-sta {z1}+1
-//FRAGMENT pwuz1=qwuz2_derefidx_vbuyy
-lda ({z2}),y
-sta {z1}
-iny
-lda ({z2}),y
-sta {z1}+1
-//FRAGMENT vbuaa_le_0_then_la1
-cmp #0
-beq {la1}
-//FRAGMENT _deref_pbuz1_gt_vbuxx_then_la1
-ldy #0
-lda ({z1}),y
-sta $ff
-cpx $ff
-bcc {la1}
-//FRAGMENT pwuz1_derefidx_vbuaa=vwuz2
-tay
-lda {z2}
-sta ({z1}),y
-iny
-lda {z2}+1
-sta ({z1}),y
-//FRAGMENT pwuz1_derefidx_vbuxx=vwuz2
-txa
-tay
-lda {z2}
-sta ({z1}),y
-iny
-lda {z2}+1
-sta ({z1}),y
-//FRAGMENT pwuz1_derefidx_vbuyy=vwuz2
-lda {z2}
-sta ({z1}),y
-iny
-lda {z2}+1
-sta ({z1}),y
-//FRAGMENT pbuz1_derefidx_vbuxx=_inc_pbuz1_derefidx_vbuxx
-txa
-tay
-lda ({z1}),y
-clc
-adc #1
-sta ({z1}),y
-//FRAGMENT vbuxx_le_0_then_la1
-cpx #0
-beq {la1}
-//FRAGMENT pbuz1=pbuz2_minus_vwuz1
-lda {z2}
-sec
-sbc {z1}
-sta {z1}
-lda {z2}+1
-sbc {z1}+1
-sta {z1}+1
-//FRAGMENT vwuz1=_deref_pbuz1_rol_1
-ldy #0
-lda ({z1}),y
-asl
-sta {z1}
-lda #0
-rol
-sta {z1}+1
-//FRAGMENT qwuz1=qwuz2_plus_vwuz1
-lda {z1}
-clc
-adc {z2}
-sta {z1}
-lda {z1}+1
-adc {z2}+1
-sta {z1}+1
-//FRAGMENT pwuz1=_deref_qwuz1
-ldy #0
-lda ({z1}),y
-pha
-iny
-lda ({z1}),y
-sta {z1}+1
-pla
-sta {z1}
-//FRAGMENT vwuz1=pwuz1_minus_pwuz2
-lda {z1}
-sec
-sbc {z2}
-sta {z1}
-lda {z1}+1
-sbc {z2}+1
-sta {z1}+1
-//FRAGMENT vwuz1=_hi_vdsz2
-lda {z2}+2
-sta {z1}
-lda {z2}+3
-sta {z1}+1
-//FRAGMENT vduz1=vduc1_minus_vduz1
-lda #<{c1}
-sec
-sbc {z1}
-sta {z1}
-lda #>{c1}
-sbc {z1}+1
-sta {z1}+1
-lda #<{c1}>>$10
-sbc {z1}+2
-sta {z1}+2
-lda #>{c1}>>$10
-sbc {z1}+3
-sta {z1}+3
-//FRAGMENT vwuz1=vwuz2_minus_vwuc1
-lda {z2}
-sec
-sbc #<{c1}
-sta {z1}
-lda {z2}+1
-sbc #>{c1}
-sta {z1}+1
-//FRAGMENT vbuz1=_byte_vwsz2
-lda {z2}
-sta {z1}
-//FRAGMENT vbsz1=_sbyte_vwsz2
-lda {z2}
-sta {z1}
-//FRAGMENT vduz1=vduz2_rol_vbuz3
-ldy {z3}
-lda {z2}
-sta {z1}
-lda {z2}+1
-sta {z1}+1
-lda {z2}+2
-sta {z1}+2
-lda {z2}+3
-sta {z1}+3
-cpy #0
-beq !e+
-!:
-asl {z1}
-rol {z1}+1
-rol {z1}+2
-rol {z1}+3
-dey
-bne !-
-!e:
-//FRAGMENT vbuaa=_byte_vwsz1
-lda {z1}
-//FRAGMENT vbuxx=_byte_vwsz1
-lda {z1}
-tax
-//FRAGMENT vbuyy=_byte_vwsz1
-lda {z1}
-tay
-//FRAGMENT vbsaa=_sbyte_vwsz1
-lda {z1}
-//FRAGMENT vbsxx=_sbyte_vwsz1
-lda {z1}
-tax
-//FRAGMENT vbsyy=_sbyte_vwsz1
-lda {z1}
-tay
-//FRAGMENT vduz1=vduz2_rol_vbuxx
-lda {z2}
-sta {z1}
-lda {z2}+1
-sta {z1}+1
-lda {z2}+2
-sta {z1}+2
-lda {z2}+3
-sta {z1}+3
-cpx #0
-beq !e+
-!:
-asl {z1}
-rol {z1}+1
-rol {z1}+2
-rol {z1}+3
-dex
-bne !-
-!e:
-//FRAGMENT vduz1=vduz2_rol_vbuyy
-lda {z2}
-sta {z1}
-lda {z2}+1
-sta {z1}+1
-lda {z2}+2
-sta {z1}+2
-lda {z2}+3
-sta {z1}+3
-cpy #0
-beq !e+
-!:
-asl {z1}
-rol {z1}+1
-rol {z1}+2
-rol {z1}+3
-dey
-bne !-
-!e:
-//FRAGMENT vduz1=vduz1_rol_3
-ldy #3
-!:
-asl {z1}
-rol {z1}+1
-rol {z1}+2
-rol {z1}+3
-dey
-bne !-
-//FRAGMENT vduz1=vduz1_rol_vbuxx
-cpx #0
-beq !e+
-!:
-asl {z1}
-rol {z1}+1
-rol {z1}+2
-rol {z1}+3
-dex
-bne !-
-!e:
-//FRAGMENT pwsz1_lt_pwsc1_then_la1
-lda {z1}+1
-cmp #>{c1}
-bcc {la1}
-bne !+
-lda {z1}
-cmp #<{c1}
-bcc {la1}
-!:
-//FRAGMENT pbuz1_ge_pbuc1_then_la1
-lda {z1}+1
-cmp #>{c1}
-bcc !+
-bne {la1}
-lda {z1}
-cmp #<{c1}
-bcs {la1}
-!:
-//FRAGMENT vwuz1=_deref_pbuz2_word__deref_pbuz3
-ldy #0
-lda ({z3}),y
-sta {z1}
-lda ({z2}),y
-sta {z1}+1
-//FRAGMENT vdsz1=vdsz2_rol_4
-lda {z2}
-sta {z1}
-lda {z2}+1
-sta {z1}+1
-lda {z2}+2
-sta {z1}+2
-lda {z2}+3
-sta {z1}+3
-asl {z1}
-rol {z1}+1
-rol {z1}+2
-rol {z1}+3
-asl {z1}
-rol {z1}+1
-rol {z1}+2
-rol {z1}+3
-asl {z1}
-rol {z1}+1
-rol {z1}+2
-rol {z1}+3
-asl {z1}
-rol {z1}+1
-rol {z1}+2
-rol {z1}+3
-//FRAGMENT vwuz1=vbuc1_plus__hi_vdsz2
-NO_SYNTHESIS
-//FRAGMENT vwuz1=vwuc1_plus__hi_vdsz2
-clc
-lda #<{c1}
-adc {z2}+2
-sta {z1}
-lda #>{c1}
-adc {z2}+3
-sta {z1}+1
-//FRAGMENT vwuz1=vbsc1_plus__hi_vdsz2
-NO_SYNTHESIS
-//FRAGMENT vwuz1=vwuz2_minus_vwuz1
-lda {z2}
-sec
-sbc {z1}
-sta {z1}
-lda {z2}+1
-sbc {z1}+1
-sta {z1}+1
-//FRAGMENT vdsz1=vdsz1_rol_4
-asl {z1}
-rol {z1}+1
-rol {z1}+2
-rol {z1}+3
-asl {z1}
-rol {z1}+1
-rol {z1}+2
-rol {z1}+3
-asl {z1}
-rol {z1}+1
-rol {z1}+2
-rol {z1}+3
-asl {z1}
-rol {z1}+1
-rol {z1}+2
-rol {z1}+3
-//FRAGMENT vwsz1=vwsz2_ror_2
-lda {z2}+1
-cmp #$80
-ror
-sta {z1}+1
-lda {z2}
-ror
-sta {z1}
-lda {z1}+1
-cmp #$80
-ror {z1}+1
-ror {z1}
-//FRAGMENT vwsz1=vbsc1_plus_vwsz2
-clc
-lda {z2}
-adc #<{c1}
-sta {z1}
-lda {z2}+1
-adc #>{c1}
-sta {z1}+1
-//FRAGMENT vwsz1=vwsz1_plus_vbuz2
-clc
-lda {z1}
-adc {z2}
-sta {z1}
-lda {z1}+1
-adc #0
-sta {z1}+1
-//FRAGMENT vwsz1=vwsc1_plus_vwsz1
-clc
-lda {z1}
-adc #<{c1}
-sta {z1}
-lda {z1}+1
-adc #>{c1}
-sta {z1}+1
-//FRAGMENT vwsz1=vbsc1_plus_vwsz1
-clc
-lda {z1}
-adc #<{c1}
-sta {z1}
-lda {z1}+1
-adc #>{c1}
-sta {z1}+1
-//FRAGMENT vwuz1=_word_pbuc1_derefidx_vbuaa
-tay
-lda {c1},y
-sta {z1}
-lda #0
-sta {z1}+1
-//FRAGMENT vbuz1=pbuz2_derefidx_(pbuz3_derefidx_vbuz4)_plus_pbuz5_derefidx_(pbuz6_derefidx_vbuz4)
-ldy {z4}
-lda ({z6}),y
-sta $ff
-lda ({z3}),y
-tay
-lda ({z2}),y
-ldy $ff
-clc
-adc ({z5}),y
-sta {z1}
-//FRAGMENT vbuaa=pbuz1_derefidx_(pbuz2_derefidx_vbuz3)_plus_pbuz4_derefidx_(pbuz5_derefidx_vbuz3)
-ldy {z3}
-lda ({z5}),y
-sta $ff
-lda ({z2}),y
-tay
-lda ({z1}),y
-ldy $ff
-clc
-adc ({z4}),y
-//FRAGMENT vbuxx=pbuz1_derefidx_(pbuz2_derefidx_vbuz3)_plus_pbuz4_derefidx_(pbuz5_derefidx_vbuz3)
-ldy {z3}
-lda ({z5}),y
-sta $ff
-lda ({z2}),y
-tay
-lda ({z1}),y
-ldy $ff
-clc
-adc ({z4}),y
-tax
-//FRAGMENT vbuyy=pbuz1_derefidx_(pbuz2_derefidx_vbuz3)_plus_pbuz4_derefidx_(pbuz5_derefidx_vbuz3)
-ldy {z3}
-lda ({z5}),y
-sta $ff
-lda ({z2}),y
-tay
-lda ({z1}),y
-ldy $ff
-clc
-adc ({z4}),y
-tay
-//FRAGMENT vbuz1=pbuz2_derefidx_(pbuz3_derefidx_vbuaa)_plus_pbuz4_derefidx_(pbuz5_derefidx_vbuaa)
-tay
-lda ({z5}),y
-sta $ff
-lda ({z3}),y
-tay
-lda ({z2}),y
-ldy $ff
-clc
-adc ({z4}),y
-sta {z1}
-//FRAGMENT vbuaa=pbuz1_derefidx_(pbuz2_derefidx_vbuaa)_plus_pbuz3_derefidx_(pbuz4_derefidx_vbuaa)
-tay
-lda ({z4}),y
-sta $ff
-lda ({z2}),y
-tay
-lda ({z1}),y
-ldy $ff
-clc
-adc ({z3}),y
-//FRAGMENT vbuxx=pbuz1_derefidx_(pbuz2_derefidx_vbuaa)_plus_pbuz3_derefidx_(pbuz4_derefidx_vbuaa)
-tay
-lda ({z4}),y
-sta $ff
-lda ({z2}),y
-tay
-lda ({z1}),y
-ldy $ff
-clc
-adc ({z3}),y
-tax
-//FRAGMENT vbuyy=pbuz1_derefidx_(pbuz2_derefidx_vbuaa)_plus_pbuz3_derefidx_(pbuz4_derefidx_vbuaa)
-tay
-lda ({z4}),y
-sta $ff
-lda ({z2}),y
-tay
-lda ({z1}),y
-ldy $ff
-clc
-adc ({z3}),y
-tay
-//FRAGMENT vbuz1=pbuz2_derefidx_(pbuz3_derefidx_vbuxx)_plus_pbuz4_derefidx_(pbuz5_derefidx_vbuxx)
-txa
-tay
-lda ({z5}),y
-sta $ff
-lda ({z3}),y
-tay
-lda ({z2}),y
-ldy $ff
-clc
-adc ({z4}),y
-sta {z1}
-//FRAGMENT vbuaa=pbuz1_derefidx_(pbuz2_derefidx_vbuxx)_plus_pbuz3_derefidx_(pbuz4_derefidx_vbuxx)
-txa
-tay
-lda ({z4}),y
-sta $ff
-lda ({z2}),y
-tay
-lda ({z1}),y
-ldy $ff
-clc
-adc ({z3}),y
-//FRAGMENT vbuxx=pbuz1_derefidx_(pbuz2_derefidx_vbuxx)_plus_pbuz3_derefidx_(pbuz4_derefidx_vbuxx)
-txa
-tay
-lda ({z4}),y
-sta $ff
-lda ({z2}),y
-tay
-lda ({z1}),y
-ldy $ff
-clc
-adc ({z3}),y
-tax
-//FRAGMENT vbuyy=pbuz1_derefidx_(pbuz2_derefidx_vbuxx)_plus_pbuz3_derefidx_(pbuz4_derefidx_vbuxx)
-txa
-tay
-lda ({z4}),y
-sta $ff
-lda ({z2}),y
-tay
-lda ({z1}),y
-ldy $ff
-clc
-adc ({z3}),y
-tay
-//FRAGMENT vbuz1=pbuz2_derefidx_(pbuz3_derefidx_vbuyy)_plus_pbuz4_derefidx_(pbuz5_derefidx_vbuyy)
-lda ({z5}),y
-sta $ff
-lda ({z3}),y
-tay
-lda ({z2}),y
-ldy $ff
-clc
-adc ({z4}),y
-sta {z1}
-//FRAGMENT vbuaa=pbuz1_derefidx_(pbuz2_derefidx_vbuyy)_plus_pbuz3_derefidx_(pbuz4_derefidx_vbuyy)
-lda ({z4}),y
-sta $ff
-lda ({z2}),y
-tay
-lda ({z1}),y
-ldy $ff
-clc
-adc ({z3}),y
-//FRAGMENT vbuxx=pbuz1_derefidx_(pbuz2_derefidx_vbuyy)_plus_pbuz3_derefidx_(pbuz4_derefidx_vbuyy)
-lda ({z4}),y
-sta $ff
-lda ({z2}),y
-tay
-lda ({z1}),y
-ldy $ff
-clc
-adc ({z3}),y
-tax
-//FRAGMENT vbuyy=pbuz1_derefidx_(pbuz2_derefidx_vbuyy)_plus_pbuz3_derefidx_(pbuz4_derefidx_vbuyy)
-lda ({z4}),y
-sta $ff
-lda ({z2}),y
-tay
-lda ({z1}),y
-ldy $ff
-clc
-adc ({z3}),y
-tay
-//FRAGMENT vwsz1=_deref_pwsz2_minus__deref_pwsz3
-ldy #0
-sec
-lda ({z2}),y
-sbc ({z3}),y
-sta {z1}
-iny
-lda ({z2}),y
-sbc ({z3}),y
-sta {z1}+1
-//FRAGMENT vwsz1=vwsz2_minus_vwsc1
-lda {z2}
-sec
-sbc #<{c1}
-sta {z1}
-lda {z2}+1
-sbc #>{c1}
-sta {z1}+1
-//FRAGMENT vwsz1=_sword_pbsc1_derefidx_vbuz2
-ldy {z2}
-lda {c1},y
-sta {z1}
-// sign-extend the byte
-ora #$7f 
-bmi !+
-lda #0
-!:
-sta {z1}+1
-//FRAGMENT vwsz1=vwsz2_rol_3
-lda {z2}
-asl
-sta {z1}
-lda {z2}+1
-rol
-sta {z1}+1
-asl {z1}
-rol {z1}+1
-asl {z1}
-rol {z1}+1
-//FRAGMENT vwsz1=vwsz2_ror_6
-lda {z2}
-sta $ff
-lda {z2}+1
-sta {z1}
-lda #0
-bit {z2}+1
-bpl !+
-lda #$ff
-!:
-sta {z1}+1
-rol $ff
-rol {z1}
-rol {z1}+1
-rol $ff
-rol {z1}
-rol {z1}+1
-//FRAGMENT vwsz1=_deref_pwsc1
-lda {c1}
-sta {z1}
-lda {c1}+1
-sta {z1}+1
-//FRAGMENT vwsz1=_sword_pbsc1_derefidx_vbuaa
-tay
-lda {c1},y
-sta {z1}
-// sign-extend the byte
-ora #$7f 
-bmi !+
-lda #0
-!:
-sta {z1}+1
-//FRAGMENT vwsz1=_sword_pbsc1_derefidx_vbuxx
-lda {c1},x
-sta {z1}
-// sign-extend the byte
-ora #$7f 
-bmi !+
-lda #0
-!:
-sta {z1}+1
-//FRAGMENT vwsz1=_sword_pbsc1_derefidx_vbuyy
-lda {c1},y
-sta {z1}
-// sign-extend the byte
-ora #$7f 
-bmi !+
-lda #0
-!:
-sta {z1}+1
-//FRAGMENT vwsz1=_sword_vbsaa
-sta {z1}
-// sign-extend the byte
-ora #$7f 
-bmi !+
-lda #0
-!:
-sta {z1}+1
-//FRAGMENT vwsz1=_sword_vbsxx
-txa
-sta {z1}
-// sign-extend the byte
-ora #$7f 
-bmi !+
-lda #0
-!:
-sta {z1}+1
-//FRAGMENT vwsz1=vwsz2_minus_vwsz1
-lda {z2}
-sec
-sbc {z1}
-sta {z1}
-lda {z2}+1
-sbc {z1}+1
-sta {z1}+1
-//FRAGMENT vwsz1=vwsz1_ror_6
-lda {z1}
-sta $ff
-lda {z1}+1
-sta {z1}
-lda #0
-bit {z1}+1
-bpl !+
-lda #$ff
-!:
-sta {z1}+1
-rol $ff
-rol {z1}
-rol {z1}+1
-rol $ff
-rol {z1}
-rol {z1}+1
-//FRAGMENT vwsz1=vwsz1_rol_3
-asl {z1}
-rol {z1}+1
-asl {z1}
-rol {z1}+1
-asl {z1}
-rol {z1}+1
-//FRAGMENT vduz1_eq_vduz2_then_la1
-lda {z1}
-cmp {z2}
-bne !+
-lda {z1}+1
-cmp {z2}+1
-bne !+
-lda {z1}+2
-cmp {z2}+2
-bne !+
-lda {z1}+3
-cmp {z2}+3
-beq {la1}
-!:
-//FRAGMENT vdsz1_eq_vdsz2_then_la1
-lda {z1}
-cmp {z2}
-bne !+
-lda {z1}+1
-cmp {z2}+1
-bne !+
-lda {z1}+2
-cmp {z2}+2
-bne !+
-lda {z1}+3
-cmp {z2}+3
-beq {la1}
-!:
-//FRAGMENT vdsz1=vdsz1_plus_vwsz2
-lda {z2}+1
-ora #$7f
-bmi !+
-lda #0
-!:
-sta $ff
-lda {z1}
-clc
-adc {z2}
-sta {z1}
-lda {z1}+1
-adc {z2}+1
-sta {z1}+1
-lda {z1}+2
-adc $ff
-sta {z1}+2
-lda {z1}+3
-adc $ff
-sta {z1}+3
-//FRAGMENT vdsz1=vdsz1_minus_vwsz2
-lda {z2}+1
-ora #$7f
-bmi !+
-lda #0
-!:
-sta $ff
-sec
-lda {z1}
-sbc {z2}
-sta {z1}
-lda {z1}+1
-sbc {z2}+1
-sta {z1}+1
-lda {z1}+2
-sbc $ff
-sta {z1}+2
-lda {z1}+3
-sbc $ff
-sta {z1}+3
-//FRAGMENT vwsz1=_dec_vwsz1
-lda {z1}
-bne !+
-dec {z1}+1
-!:
-dec {z1}
diff --git a/src/main/fragment/cache/fragment-cache-wdc65c02.asm b/src/main/fragment/cache/fragment-cache-wdc65c02.asm
index 1867d6adb..661df4b69 100644
--- a/src/main/fragment/cache/fragment-cache-wdc65c02.asm
+++ b/src/main/fragment/cache/fragment-cache-wdc65c02.asm
@@ -1,4 +1,4 @@
-//KICKC FRAGMENT CACHE 129161168d 129161348a
+//KICKC FRAGMENT CACHE 140bf2a915 140bf2c716
 //FRAGMENT vbuz1=_deref_pbuc1
 lda {c1}
 sta {z1}
diff --git a/src/main/fragment/mos6502-common/vbsxx_eq_0_then_la1.asm b/src/main/fragment/mos6502-common/vbsxx_eq_0_then_la1.asm
new file mode 100644
index 000000000..d1d800f7b
--- /dev/null
+++ b/src/main/fragment/mos6502-common/vbsxx_eq_0_then_la1.asm
@@ -0,0 +1,2 @@
+cpx #0
+beq {la1}
\ No newline at end of file
diff --git a/src/main/fragment/mos6502-common/vbsxx_neq_0_then_la1.asm b/src/main/fragment/mos6502-common/vbsxx_neq_0_then_la1.asm
new file mode 100644
index 000000000..0f99f0508
--- /dev/null
+++ b/src/main/fragment/mos6502-common/vbsxx_neq_0_then_la1.asm
@@ -0,0 +1,2 @@
+cpx #0
+bne {la1}
\ No newline at end of file
diff --git a/src/main/fragment/mos6502-common/vbsyy_eq_0_then_la1.asm b/src/main/fragment/mos6502-common/vbsyy_eq_0_then_la1.asm
new file mode 100644
index 000000000..9af1697e9
--- /dev/null
+++ b/src/main/fragment/mos6502-common/vbsyy_eq_0_then_la1.asm
@@ -0,0 +1,2 @@
+cpy #0
+beq {la1}
\ No newline at end of file
diff --git a/src/main/fragment/mos6502-common/vbsyy_neq_0_then_la1.asm b/src/main/fragment/mos6502-common/vbsyy_neq_0_then_la1.asm
new file mode 100644
index 000000000..6d094f911
--- /dev/null
+++ b/src/main/fragment/mos6502-common/vbsyy_neq_0_then_la1.asm
@@ -0,0 +1,2 @@
+cpy #0
+bne {la1}
\ No newline at end of file
diff --git a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpecFactory.java b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpecFactory.java
index 17ea5d95c..7c99706c1 100644
--- a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpecFactory.java
+++ b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpecFactory.java
@@ -199,7 +199,12 @@ public class AsmFragmentInstanceSpecFactory {
          ControlFlowBlock block,
          ControlFlowGraph graph) {
       StringBuilder signature = new StringBuilder();
-      if(conditionalJump.getrValue1() != null) {
+      if(conditionalJump.getrValue1() instanceof ConstantInteger && ((ConstantInteger) conditionalJump.getrValue1()).getValue() == 0) {
+         signature.append("0");
+      } else if(conditionalJump.getrValue1() instanceof ConstantBool) {
+         ConstantBool boolValue = (ConstantBool) conditionalJump.getrValue1();
+         signature.append(boolValue.toString());
+      } else if(conditionalJump.getrValue1() != null) {
          signature.append(bind(conditionalJump.getrValue1()));
       }
       if(conditionalJump.getOperator() != null) {
diff --git a/src/test/ref/32bit-rols.asm b/src/test/ref/32bit-rols.asm
index 4e46d7d41..b422d1043 100644
--- a/src/test/ref/32bit-rols.asm
+++ b/src/test/ref/32bit-rols.asm
@@ -2193,8 +2193,8 @@ printf_number_buffer: {
     // There is a minimum length - work out the padding
     ldy.z __19
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b10
     // len++;
     iny
@@ -2213,10 +2213,11 @@ printf_number_buffer: {
     sta.z padding
   __b1:
     // if(!format.justify_left && !format.zero_padding && padding)
-    lda #0
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b7
     jmp __b2
   __b7:
@@ -2228,18 +2229,18 @@ printf_number_buffer: {
     jsr printf_padding
   __b2:
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // cputc(buffer.sign)
-    lda.z buffer_sign
     jsr cputc
   __b3:
     // if(format.zero_padding && padding)
-    lda #0
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b9
     jmp __b4
   __b9:
@@ -2393,8 +2394,8 @@ uctoa: {
     lda RADIX_DECIMAL_VALUES_CHAR,y
     sta.z digit_value
     // if (started || value >= digit_value)
-    lda #0
-    cmp.z started
+    lda.z started
+    cmp #0
     bne __b5
     cpx.z digit_value
     bcs __b5
diff --git a/src/test/ref/32bit-rols.log b/src/test/ref/32bit-rols.log
index f343a8bab..f5cf1ef42 100644
--- a/src/test/ref/32bit-rols.log
+++ b/src/test/ref/32bit-rols.log
@@ -12763,7 +12763,7 @@ main: {
     // main::@12
   __b12:
     // [26] main::$2 = kbhit::return#2
-    // [27] if(0==main::$2) goto main::@3 -- vbuc1_eq_vbuaa_then_la1 
+    // [27] if(0==main::$2) goto main::@3 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b3_from___b12
     // [28] phi from main::@12 to main::@4 [phi:main::@12->main::@4]
@@ -12805,7 +12805,7 @@ main: {
     // main::@14
   __b14:
     // [35] main::$6 = kbhit::return#3
-    // [36] if(0==main::$6) goto main::@5 -- vbuc1_eq_vbuaa_then_la1 
+    // [36] if(0==main::$6) goto main::@5 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b5_from___b14
     // [37] phi from main::@14 to main::@6 [phi:main::@14->main::@6]
@@ -12847,7 +12847,7 @@ main: {
     // main::@16
   __b16:
     // [44] main::$10 = kbhit::return#4
-    // [45] if(0==main::$10) goto main::@7 -- vbuc1_eq_vbuaa_then_la1 
+    // [45] if(0==main::$10) goto main::@7 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b7_from___b16
     // [46] phi from main::@16 to main::@8 [phi:main::@16->main::@8]
@@ -12889,7 +12889,7 @@ main: {
     // main::@18
   __b18:
     // [53] main::$14 = kbhit::return#10
-    // [54] if(0==main::$14) goto main::@9 -- vbuc1_eq_vbuaa_then_la1 
+    // [54] if(0==main::$14) goto main::@9 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b9_from___b18
     jmp __b10
@@ -16216,7 +16216,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [466] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [466] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -16488,7 +16488,7 @@ utoa: {
     sta.z digit_value
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [516] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [516] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -16556,7 +16556,7 @@ printf_number_buffer: {
     .label buffer_sign = $b
     .label padding = $e
     .label format_zero_padding = $a
-    // [528] if(0==printf_number_buffer::format_min_length#3) goto printf_number_buffer::@1 -- vbuc1_eq_vbuxx_then_la1 
+    // [528] if(0==printf_number_buffer::format_min_length#3) goto printf_number_buffer::@1 -- 0_eq_vbuxx_then_la1 
     cpx #0
     beq __b1_from_printf_number_buffer
     // [529] phi from printf_number_buffer to printf_number_buffer::@5 [phi:printf_number_buffer->printf_number_buffer::@5]
@@ -16576,9 +16576,9 @@ printf_number_buffer: {
     // [533] printf_number_buffer::len#0 = (signed byte)printf_number_buffer::$19 -- vbsyy=_sbyte_vwuz1 
     // There is a minimum length - work out the padding
     ldy.z __19
-    // [534] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@10 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [534] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@10 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b10_from___b11
     jmp __b6
     // printf_number_buffer::@6
@@ -16623,16 +16623,16 @@ printf_number_buffer: {
     jmp __b13
     // printf_number_buffer::@13
   __b13:
-    // [541] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [541] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     jmp __b12
     // printf_number_buffer::@12
   __b12:
-    // [542] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@7 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [542] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@7 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b7
     jmp __b2
     // printf_number_buffer::@7
@@ -16651,9 +16651,9 @@ printf_number_buffer: {
     jmp __b2
     // printf_number_buffer::@2
   __b2:
-    // [545] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [545] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     jmp __b8
     // printf_number_buffer::@8
@@ -16668,16 +16668,16 @@ printf_number_buffer: {
     jmp __b3
     // printf_number_buffer::@3
   __b3:
-    // [548] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [548] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4_from___b3
     jmp __b14
     // printf_number_buffer::@14
   __b14:
-    // [549] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@9 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [549] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@9 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b9
     // [552] phi from printf_number_buffer::@14 printf_number_buffer::@3 printf_number_buffer::@9 to printf_number_buffer::@4 [phi:printf_number_buffer::@14/printf_number_buffer::@3/printf_number_buffer::@9->printf_number_buffer::@4]
   __b4_from___b14:
@@ -16787,7 +16787,7 @@ ultoa: {
     sta.z digit_value+2
     lda RADIX_HEXADECIMAL_VALUES_LONG+3,y
     sta.z digit_value+3
-    // [565] if(0!=ultoa::started#2) goto ultoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [565] if(0!=ultoa::started#2) goto ultoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -16914,9 +16914,9 @@ uctoa: {
     ldy.z digit
     lda RADIX_DECIMAL_VALUES_CHAR,y
     sta.z digit_value
-    // [584] if(0!=uctoa::started#2) goto uctoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [584] if(0!=uctoa::started#2) goto uctoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     jmp __b7
     // uctoa::@7
@@ -17085,7 +17085,7 @@ strlen: {
     jmp __b1
     // strlen::@1
   __b1:
-    // [610] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [610] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -18522,8 +18522,7 @@ Removing instruction jmp __b1
 Removing instruction jmp __b4
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda.z digit_value+1
-Removing instruction lda #0
-Removing instruction lda #0
+Removing instruction lda.z buffer_sign
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction __b3:
 Removing instruction __b6:
@@ -18973,7 +18972,7 @@ mem[12] [ printf_buffer ]
 
 
 FINAL ASSEMBLER
-Score: 2528598
+Score: 2528599
 
   // File Comments
 // Tests different rotate left commands
@@ -19110,7 +19109,7 @@ main: {
     // main::@12
     // [26] main::$2 = kbhit::return#2
     // while(!kbhit())
-    // [27] if(0==main::$2) goto main::@3 -- vbuc1_eq_vbuaa_then_la1 
+    // [27] if(0==main::$2) goto main::@3 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b3
     // [28] phi from main::@12 to main::@4 [phi:main::@12->main::@4]
@@ -19144,7 +19143,7 @@ main: {
     // main::@14
     // [35] main::$6 = kbhit::return#3
     // while(!kbhit())
-    // [36] if(0==main::$6) goto main::@5 -- vbuc1_eq_vbuaa_then_la1 
+    // [36] if(0==main::$6) goto main::@5 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b5
     // [37] phi from main::@14 to main::@6 [phi:main::@14->main::@6]
@@ -19178,7 +19177,7 @@ main: {
     // main::@16
     // [44] main::$10 = kbhit::return#4
     // while(!kbhit())
-    // [45] if(0==main::$10) goto main::@7 -- vbuc1_eq_vbuaa_then_la1 
+    // [45] if(0==main::$10) goto main::@7 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b7
     // [46] phi from main::@16 to main::@8 [phi:main::@16->main::@8]
@@ -19212,7 +19211,7 @@ main: {
     // main::@18
     // [53] main::$14 = kbhit::return#10
     // while(!kbhit())
-    // [54] if(0==main::$14) goto main::@9 -- vbuc1_eq_vbuaa_then_la1 
+    // [54] if(0==main::$14) goto main::@9 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b9
     // main::@10
@@ -22045,7 +22044,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [466] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [466] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
@@ -22305,7 +22304,7 @@ utoa: {
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [516] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [516] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // utoa::@7
@@ -22369,7 +22368,7 @@ printf_number_buffer: {
     .label padding = $e
     .label format_zero_padding = $a
     // if(format.min_length)
-    // [528] if(0==printf_number_buffer::format_min_length#3) goto printf_number_buffer::@1 -- vbuc1_eq_vbuxx_then_la1 
+    // [528] if(0==printf_number_buffer::format_min_length#3) goto printf_number_buffer::@1 -- 0_eq_vbuxx_then_la1 
     cpx #0
     beq __b5
     // [529] phi from printf_number_buffer to printf_number_buffer::@5 [phi:printf_number_buffer->printf_number_buffer::@5]
@@ -22387,9 +22386,9 @@ printf_number_buffer: {
     // There is a minimum length - work out the padding
     ldy.z __19
     // if(buffer.sign)
-    // [534] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@10 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [534] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@10 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b10
     // printf_number_buffer::@6
     // len++;
@@ -22423,13 +22422,14 @@ printf_number_buffer: {
   __b1:
     // printf_number_buffer::@13
     // if(!format.justify_left && !format.zero_padding && padding)
-    // [541] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [541] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     // printf_number_buffer::@12
-    // [542] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@7 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [542] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@7 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b7
     jmp __b2
     // printf_number_buffer::@7
@@ -22448,14 +22448,13 @@ printf_number_buffer: {
     // printf_number_buffer::@2
   __b2:
     // if(buffer.sign)
-    // [545] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [545] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // printf_number_buffer::@8
     // cputc(buffer.sign)
     // [546] cputc::c#2 = printf_number_buffer::buffer_sign#10 -- vbuaa=vbuz1 
-    lda.z buffer_sign
     // [547] call cputc 
     // [495] phi from printf_number_buffer::@8 to cputc [phi:printf_number_buffer::@8->cputc]
     // [495] phi cputc::c#3 = cputc::c#2 [phi:printf_number_buffer::@8->cputc#0] -- register_copy 
@@ -22463,13 +22462,14 @@ printf_number_buffer: {
     // printf_number_buffer::@3
   __b3:
     // if(format.zero_padding && padding)
-    // [548] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [548] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
     // printf_number_buffer::@14
-    // [549] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@9 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [549] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@9 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b9
     // [552] phi from printf_number_buffer::@14 printf_number_buffer::@3 printf_number_buffer::@9 to printf_number_buffer::@4 [phi:printf_number_buffer::@14/printf_number_buffer::@3/printf_number_buffer::@9->printf_number_buffer::@4]
     jmp __b4
@@ -22575,7 +22575,7 @@ ultoa: {
     lda RADIX_HEXADECIMAL_VALUES_LONG+3,y
     sta.z digit_value+3
     // if (started || value >= digit_value)
-    // [565] if(0!=ultoa::started#2) goto ultoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [565] if(0!=ultoa::started#2) goto ultoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // ultoa::@7
@@ -22698,9 +22698,9 @@ uctoa: {
     lda RADIX_DECIMAL_VALUES_CHAR,y
     sta.z digit_value
     // if (started || value >= digit_value)
-    // [584] if(0!=uctoa::started#2) goto uctoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [584] if(0!=uctoa::started#2) goto uctoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     // uctoa::@7
     // [585] if(uctoa::value#2>=uctoa::digit_value#0) goto uctoa::@5 -- vbuxx_ge_vbuz1_then_la1 
@@ -22865,7 +22865,7 @@ strlen: {
     // strlen::@1
   __b1:
     // while(*str)
-    // [610] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [610] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/adventofcode/2020-01.log b/src/test/ref/adventofcode/2020-01.log
index c0b96a6c0..a0e9f02bc 100644
--- a/src/test/ref/adventofcode/2020-01.log
+++ b/src/test/ref/adventofcode/2020-01.log
@@ -7941,7 +7941,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [144] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [144] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -8360,7 +8360,7 @@ utoa: {
     sta.z digit_value
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [213] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [213] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -8427,7 +8427,7 @@ printf_number_buffer: {
     jmp __b1
     // printf_number_buffer::@1
   __b1:
-    // [225] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [225] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2_from___b1
     jmp __b3
@@ -8530,7 +8530,7 @@ ultoa: {
     sta.z digit_value+2
     lda RADIX_DECIMAL_VALUES_LONG+3,y
     sta.z digit_value+3
-    // [241] if(0!=ultoa::started#2) goto ultoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [241] if(0!=ultoa::started#2) goto ultoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -10817,7 +10817,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [144] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [144] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
@@ -11222,7 +11222,7 @@ utoa: {
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [213] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [213] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // utoa::@7
@@ -11283,7 +11283,7 @@ utoa: {
 printf_number_buffer: {
     // printf_number_buffer::@1
     // if(buffer.sign)
-    // [225] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [225] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2
     // printf_number_buffer::@3
@@ -11382,7 +11382,7 @@ ultoa: {
     lda RADIX_DECIMAL_VALUES_LONG+3,y
     sta.z digit_value+3
     // if (started || value >= digit_value)
-    // [241] if(0!=ultoa::started#2) goto ultoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [241] if(0!=ultoa::started#2) goto ultoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // ultoa::@7
diff --git a/src/test/ref/adventofcode/2020-02.log b/src/test/ref/adventofcode/2020-02.log
index 018132561..5df9de229 100644
--- a/src/test/ref/adventofcode/2020-02.log
+++ b/src/test/ref/adventofcode/2020-02.log
@@ -5219,7 +5219,7 @@ main: {
     jmp __b1
     // main::@1
   __b1:
-    // [20] if(0!=*main::pwd) goto main::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [20] if(0!=*main::pwd) goto main::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (pwd),y
     cmp #0
@@ -5529,7 +5529,7 @@ main: {
     jmp __b6
     // main::@6
   __b6:
-    // [71] if(0!=*main::pwd) goto main::@7 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [71] if(0!=*main::pwd) goto main::@7 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (pwd),y
     cmp #0
@@ -5880,7 +5880,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [121] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [121] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -6124,7 +6124,7 @@ utoa: {
     sta.z digit_value
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [167] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [167] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -6192,7 +6192,7 @@ printf_number_buffer: {
     jmp __b1
     // printf_number_buffer::@1
   __b1:
-    // [179] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [179] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2_from___b1
     jmp __b3
@@ -7228,7 +7228,7 @@ main: {
     // main::@1
   __b1:
     // while(*pwd)
-    // [20] if(0!=*main::pwd) goto main::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [20] if(0!=*main::pwd) goto main::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (pwd),y
     cmp #0
@@ -7499,7 +7499,7 @@ main: {
     // main::@6
   __b6:
     // while(*pwd)
-    // [71] if(0!=*main::pwd) goto main::@7 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [71] if(0!=*main::pwd) goto main::@7 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (pwd),y
     cmp #0
@@ -7839,7 +7839,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [121] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [121] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
@@ -8078,7 +8078,7 @@ utoa: {
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [167] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [167] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // utoa::@7
@@ -8140,7 +8140,7 @@ printf_number_buffer: {
     .label buffer_digits = printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS
     // printf_number_buffer::@1
     // if(buffer.sign)
-    // [179] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [179] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2
     // printf_number_buffer::@3
diff --git a/src/test/ref/adventofcode/2020-03.log b/src/test/ref/adventofcode/2020-03.log
index 2e2b4564a..7c20905de 100644
--- a/src/test/ref/adventofcode/2020-03.log
+++ b/src/test/ref/adventofcode/2020-03.log
@@ -5137,7 +5137,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [87] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [87] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -5431,7 +5431,7 @@ utoa: {
     sta.z digit_value
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [138] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [138] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -5499,7 +5499,7 @@ printf_number_buffer: {
     jmp __b1
     // printf_number_buffer::@1
   __b1:
-    // [150] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [150] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2_from___b1
     jmp __b3
@@ -6902,7 +6902,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [87] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [87] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
@@ -7190,7 +7190,7 @@ utoa: {
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [138] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [138] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // utoa::@7
@@ -7252,7 +7252,7 @@ printf_number_buffer: {
     .label buffer_digits = printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS
     // printf_number_buffer::@1
     // if(buffer.sign)
-    // [150] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [150] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2
     // printf_number_buffer::@3
diff --git a/src/test/ref/adventofcode/2020-04.asm b/src/test/ref/adventofcode/2020-04.asm
index 210521dc8..7286dbcda 100644
--- a/src/test/ref/adventofcode/2020-04.asm
+++ b/src/test/ref/adventofcode/2020-04.asm
@@ -184,9 +184,9 @@ main: {
   __b9:
   // Skip letters until we hit another whitespace
     // while(*pass && *pass!=' ' && *pass!='\n')
-    lda #0
-    tay
-    cmp (pass),y
+    ldy #0
+    lda (pass),y
+    cmp #0
     bne !__b1+
     jmp __b1
   !__b1:
diff --git a/src/test/ref/adventofcode/2020-04.log b/src/test/ref/adventofcode/2020-04.log
index f51c90d2a..42e590a55 100644
--- a/src/test/ref/adventofcode/2020-04.log
+++ b/src/test/ref/adventofcode/2020-04.log
@@ -5663,7 +5663,7 @@ main: {
     jmp __b1
     // main::@1
   __b1:
-    // [3] if(0!=*main::pass#10) goto main::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [3] if(0!=*main::pass#10) goto main::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (pass),y
     cmp #0
@@ -5848,7 +5848,7 @@ main: {
     jmp __b12_from___b11
     // main::@6
   __b6:
-    // [30] if(0==main::tags_found[main::i#2]) goto main::@8 -- vbuc1_eq_pbuc2_derefidx_vbuxx_then_la1 
+    // [30] if(0==main::tags_found[main::i#2]) goto main::@8 -- 0_eq_pbuc1_derefidx_vbuxx_then_la1 
     lda tags_found,x
     cmp #0
     beq __b8_from___b6
@@ -5910,10 +5910,10 @@ main: {
   // Skip letters until we hit another whitespace
     // main::@22
   __b22:
-    // [39] if(0==*main::pass#14) goto main::@1 -- vbuc1_eq__deref_pbuz1_then_la1 
-    lda #0
+    // [39] if(0==*main::pass#14) goto main::@1 -- 0_eq__deref_pbuz1_then_la1 
     ldy #0
-    cmp (pass),y
+    lda (pass),y
+    cmp #0
     beq __b1_from___b22
     jmp __b33
     // main::@33
@@ -6086,7 +6086,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [62] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [62] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -6380,7 +6380,7 @@ utoa: {
     sta.z digit_value
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [113] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [113] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -6448,7 +6448,7 @@ printf_number_buffer: {
     jmp __b1
     // printf_number_buffer::@1
   __b1:
-    // [125] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [125] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2_from___b1
     jmp __b3
@@ -6940,7 +6940,6 @@ Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #>0
 Removing instruction lda #<0
 Removing instruction lda #>0
-Replacing instruction ldy #0 with TAY
 Removing instruction lda #0
 Replacing instruction ldy #0 with TAY
 Removing instruction lda #<0
@@ -8511,7 +8510,7 @@ main: {
     // main::@1
   __b1:
     // while(*pass)
-    // [3] if(0!=*main::pass#10) goto main::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [3] if(0!=*main::pass#10) goto main::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (pass),y
     cmp #0
@@ -8675,7 +8674,7 @@ main: {
     // main::@6
   __b6:
     // if(tags_found[i])
-    // [30] if(0==main::tags_found[main::i#2]) goto main::@8 -- vbuc1_eq_pbuc2_derefidx_vbuxx_then_la1 
+    // [30] if(0==main::tags_found[main::i#2]) goto main::@8 -- 0_eq_pbuc1_derefidx_vbuxx_then_la1 
     lda tags_found,x
     cmp #0
     beq __b8
@@ -8732,10 +8731,10 @@ main: {
   // Skip letters until we hit another whitespace
     // main::@22
     // while(*pass && *pass!=' ' && *pass!='\n')
-    // [39] if(0==*main::pass#14) goto main::@1 -- vbuc1_eq__deref_pbuz1_then_la1 
-    lda #0
-    tay
-    cmp (pass),y
+    // [39] if(0==*main::pass#14) goto main::@1 -- 0_eq__deref_pbuz1_then_la1 
+    ldy #0
+    lda (pass),y
+    cmp #0
     bne !__b1+
     jmp __b1
   !__b1:
@@ -8899,7 +8898,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [62] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [62] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
@@ -9187,7 +9186,7 @@ utoa: {
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [113] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [113] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // utoa::@7
@@ -9249,7 +9248,7 @@ printf_number_buffer: {
     .label buffer_digits = printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS
     // printf_number_buffer::@1
     // if(buffer.sign)
-    // [125] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [125] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2
     // printf_number_buffer::@3
diff --git a/src/test/ref/arrays-init-short.log b/src/test/ref/arrays-init-short.log
index d3cbc8abd..c2cf0a2da 100644
--- a/src/test/ref/arrays-init-short.log
+++ b/src/test/ref/arrays-init-short.log
@@ -192,7 +192,7 @@ main: {
     jmp __b1
     // main::@1
   __b1:
-    // [2] if(0!=msg1[main::i#2]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [2] if(0!=msg1[main::i#2]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda msg1,x
     cmp #0
     bne __b2
@@ -203,7 +203,7 @@ main: {
     jmp __b3
     // main::@3
   __b3:
-    // [4] if(0!=msg2[main::i1#2]) goto main::@4 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [4] if(0!=msg2[main::i1#2]) goto main::@4 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda msg2,x
     cmp #0
     bne __b4
@@ -289,7 +289,7 @@ main: {
     // main::@1
   __b1:
     // for(char i=0;msg1[i];i++)
-    // [2] if(0!=msg1[main::i#2]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [2] if(0!=msg1[main::i#2]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda msg1,x
     cmp #0
     bne __b2
@@ -299,7 +299,7 @@ main: {
     // main::@3
   __b3:
     // for(char i=0;msg2[i];i++)
-    // [4] if(0!=msg2[main::i1#2]) goto main::@4 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [4] if(0!=msg2[main::i1#2]) goto main::@4 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda msg2,x
     cmp #0
     bne __b4
diff --git a/src/test/ref/atarixl-md5.asm b/src/test/ref/atarixl-md5.asm
index b2e9b9538..3774ded5f 100644
--- a/src/test/ref/atarixl-md5.asm
+++ b/src/test/ref/atarixl-md5.asm
@@ -1644,8 +1644,8 @@ uctoa: {
     lda RADIX_HEXADECIMAL_VALUES_CHAR,y
     sta.z digit_value
     // if (started || value >= digit_value)
-    lda #0
-    cmp.z started
+    lda.z started
+    cmp #0
     bne __b5
     cpx.z digit_value
     bcs __b5
@@ -1688,8 +1688,8 @@ printf_number_buffer: {
     // There is a minimum length - work out the padding
     ldx.z __19
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b10
     // len++;
     inx
@@ -1707,10 +1707,11 @@ printf_number_buffer: {
     sta.z padding
   __b1:
     // if(!format.justify_left && !format.zero_padding && padding)
-    lda #0
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b7
     jmp __b2
   __b7:
@@ -1722,19 +1723,19 @@ printf_number_buffer: {
     jsr printf_padding
   __b2:
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // cputc(buffer.sign)
-    lda.z buffer_sign
     sta.z cputc.c
     jsr cputc
   __b3:
     // if(format.zero_padding && padding)
-    lda #0
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b9
     jmp __b4
   __b9:
diff --git a/src/test/ref/atarixl-md5.log b/src/test/ref/atarixl-md5.log
index 0640c6c9f..4c3386d82 100644
--- a/src/test/ref/atarixl-md5.log
+++ b/src/test/ref/atarixl-md5.log
@@ -9127,7 +9127,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [12] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [12] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -9161,7 +9161,7 @@ strlen: {
     jmp __b1
     // strlen::@1
   __b1:
-    // [18] if(0!=*strlen::str#3) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [18] if(0!=*strlen::str#3) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -11298,9 +11298,9 @@ uctoa: {
     ldy.z digit
     lda RADIX_HEXADECIMAL_VALUES_CHAR,y
     sta.z digit_value
-    // [329] if(0!=uctoa::started#2) goto uctoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [329] if(0!=uctoa::started#2) goto uctoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     jmp __b7
     // uctoa::@7
@@ -11386,9 +11386,9 @@ printf_number_buffer: {
     // [345] printf_number_buffer::len#0 = (signed byte)printf_number_buffer::$19 -- vbsxx=_sbyte_vwuz1 
     // There is a minimum length - work out the padding
     ldx.z __19
-    // [346] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@10 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [346] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@10 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b10_from___b11
     jmp __b6
     // printf_number_buffer::@6
@@ -11432,16 +11432,16 @@ printf_number_buffer: {
     jmp __b13
     // printf_number_buffer::@13
   __b13:
-    // [353] if(0!=printf_number_buffer::format_zero_padding#0) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [353] if(0!=printf_number_buffer::format_zero_padding#0) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     jmp __b12
     // printf_number_buffer::@12
   __b12:
-    // [354] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@7 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [354] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@7 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b7
     jmp __b2
     // printf_number_buffer::@7
@@ -11460,9 +11460,9 @@ printf_number_buffer: {
     jmp __b2
     // printf_number_buffer::@2
   __b2:
-    // [357] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [357] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     jmp __b8
     // printf_number_buffer::@8
@@ -11475,16 +11475,16 @@ printf_number_buffer: {
     jmp __b3
     // printf_number_buffer::@3
   __b3:
-    // [360] if(0==printf_number_buffer::format_zero_padding#0) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [360] if(0==printf_number_buffer::format_zero_padding#0) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4_from___b3
     jmp __b14
     // printf_number_buffer::@14
   __b14:
-    // [361] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@9 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [361] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@9 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b9
     // [364] phi from printf_number_buffer::@14 printf_number_buffer::@3 printf_number_buffer::@9 to printf_number_buffer::@4 [phi:printf_number_buffer::@14/printf_number_buffer::@3/printf_number_buffer::@9->printf_number_buffer::@4]
   __b4_from___b14:
@@ -12146,8 +12146,7 @@ Succesful ASM optimization Pass5NextJumpElimination
 Replacing instruction lda #>4 with TYA
 Replacing instruction lda #0 with TYA
 Replacing instruction lda #0 with TYA
-Removing instruction lda #0
-Removing instruction lda #0
+Removing instruction lda.z buffer_sign
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction __b5:
 Removing instruction __breturn:
@@ -12611,7 +12610,7 @@ mem[12] [ printf_buffer ]
 
 
 FINAL ASSEMBLER
-Score: 652907
+Score: 652908
 
   // File Comments
 // 8 bit converted md5 calculator
@@ -12706,7 +12705,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [12] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [12] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
@@ -12738,7 +12737,7 @@ strlen: {
     // strlen::@1
   __b1:
     // while(*str)
-    // [18] if(0!=*strlen::str#3) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [18] if(0!=*strlen::str#3) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -14835,9 +14834,9 @@ uctoa: {
     lda RADIX_HEXADECIMAL_VALUES_CHAR,y
     sta.z digit_value
     // if (started || value >= digit_value)
-    // [329] if(0!=uctoa::started#2) goto uctoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [329] if(0!=uctoa::started#2) goto uctoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     // uctoa::@7
     // [330] if(uctoa::value#2>=uctoa::digit_value#0) goto uctoa::@5 -- vbuxx_ge_vbuz1_then_la1 
@@ -14917,9 +14916,9 @@ printf_number_buffer: {
     // There is a minimum length - work out the padding
     ldx.z __19
     // if(buffer.sign)
-    // [346] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@10 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [346] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@10 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b10
     // printf_number_buffer::@6
     // len++;
@@ -14952,13 +14951,14 @@ printf_number_buffer: {
   __b1:
     // printf_number_buffer::@13
     // if(!format.justify_left && !format.zero_padding && padding)
-    // [353] if(0!=printf_number_buffer::format_zero_padding#0) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [353] if(0!=printf_number_buffer::format_zero_padding#0) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     // printf_number_buffer::@12
-    // [354] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@7 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [354] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@7 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b7
     jmp __b2
     // printf_number_buffer::@7
@@ -14977,27 +14977,27 @@ printf_number_buffer: {
     // printf_number_buffer::@2
   __b2:
     // if(buffer.sign)
-    // [357] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [357] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // printf_number_buffer::@8
     // cputc(buffer.sign)
     // [358] cputc::c = printf_number_buffer::buffer_sign#0 -- vbuz1=vbuz2 
-    lda.z buffer_sign
     sta.z cputc.c
     // [359] call cputc 
     jsr cputc
     // printf_number_buffer::@3
   __b3:
     // if(format.zero_padding && padding)
-    // [360] if(0==printf_number_buffer::format_zero_padding#0) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [360] if(0==printf_number_buffer::format_zero_padding#0) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
     // printf_number_buffer::@14
-    // [361] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@9 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [361] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@9 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b9
     // [364] phi from printf_number_buffer::@14 printf_number_buffer::@3 printf_number_buffer::@9 to printf_number_buffer::@4 [phi:printf_number_buffer::@14/printf_number_buffer::@3/printf_number_buffer::@9->printf_number_buffer::@4]
     jmp __b4
diff --git a/src/test/ref/atarixl-md5b.log b/src/test/ref/atarixl-md5b.log
index f58c00935..2a377f105 100644
--- a/src/test/ref/atarixl-md5b.log
+++ b/src/test/ref/atarixl-md5b.log
@@ -1013,7 +1013,7 @@ md5: {
     // [23] md5::$2 = md5::i#2 & 1 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #1
-    // [24] if(0==md5::$2) goto md5::@3 -- vbuc1_eq_vbuaa_then_la1 
+    // [24] if(0==md5::$2) goto md5::@3 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b3
     // [25] phi from md5::@5 to md5::@4 [phi:md5::@5->md5::@4]
@@ -1492,7 +1492,7 @@ md5: {
     txa
     and #1
     // if(i&1)
-    // [24] if(0==md5::$2) goto md5::@3 -- vbuc1_eq_vbuaa_then_la1 
+    // [24] if(0==md5::$2) goto md5::@3 -- 0_eq_vbuaa_then_la1 
     cmp #0
     // [25] phi from md5::@5 to md5::@4 [phi:md5::@5->md5::@4]
     // md5::@4
diff --git a/src/test/ref/atoi-1.log b/src/test/ref/atoi-1.log
index f8116d384..46bfac219 100644
--- a/src/test/ref/atoi-1.log
+++ b/src/test/ref/atoi-1.log
@@ -4463,14 +4463,14 @@ atoi: {
     jmp __b3
     // atoi::@3
   __b3:
-    // [67] if(0!=atoi::str#2[atoi::i#4]) goto atoi::@4 -- vbuc1_neq_pbuz1_derefidx_vbuyy_then_la1 
+    // [67] if(0!=atoi::str#2[atoi::i#4]) goto atoi::@4 -- 0_neq_pbuz1_derefidx_vbuyy_then_la1 
     lda (str),y
     cmp #0
     bne __b4
     jmp __b5
     // atoi::@5
   __b5:
-    // [68] if(0!=atoi::negative#2) goto atoi::@1 -- vbuc1_neq_vbuxx_then_la1 
+    // [68] if(0!=atoi::negative#2) goto atoi::@1 -- 0_neq_vbuxx_then_la1 
     // Return result with sign
     cpx #0
     bne __b1
@@ -4615,7 +4615,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [93] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [93] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -4700,7 +4700,7 @@ utoa: {
     sta.z digit_value
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [107] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [107] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -4768,7 +4768,7 @@ printf_number_buffer: {
     jmp __b1
     // printf_number_buffer::@1
   __b1:
-    // [119] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [119] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2_from___b1
     jmp __b3
@@ -5996,13 +5996,13 @@ atoi: {
     // atoi::@3
   __b3:
     // for (; str[i]; ++i)
-    // [67] if(0!=atoi::str#2[atoi::i#4]) goto atoi::@4 -- vbuc1_neq_pbuz1_derefidx_vbuyy_then_la1 
+    // [67] if(0!=atoi::str#2[atoi::i#4]) goto atoi::@4 -- 0_neq_pbuz1_derefidx_vbuyy_then_la1 
     lda (str),y
     cmp #0
     bne __b4
     // atoi::@5
     // if(negative)
-    // [68] if(0!=atoi::negative#2) goto atoi::@1 -- vbuc1_neq_vbuxx_then_la1 
+    // [68] if(0!=atoi::negative#2) goto atoi::@1 -- 0_neq_vbuxx_then_la1 
     // Return result with sign
     cpx #0
     bne __b1
@@ -6144,7 +6144,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [93] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [93] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
@@ -6229,7 +6229,7 @@ utoa: {
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [107] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [107] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // utoa::@7
@@ -6291,7 +6291,7 @@ printf_number_buffer: {
     .label buffer_digits = printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS
     // printf_number_buffer::@1
     // if(buffer.sign)
-    // [119] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [119] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2
     // printf_number_buffer::@3
diff --git a/src/test/ref/bitmap-line-anim-2.log b/src/test/ref/bitmap-line-anim-2.log
index 3a257c99c..7542c9f5a 100644
--- a/src/test/ref/bitmap-line-anim-2.log
+++ b/src/test/ref/bitmap-line-anim-2.log
@@ -2948,7 +2948,7 @@ abs_u16: {
     lda.z w+1
     // [100] abs_u16::$1 = abs_u16::$0 & $80 -- vbuaa=vbuaa_band_vbuc1 
     and #$80
-    // [101] if(0!=abs_u16::$1) goto abs_u16::@1 -- vbuc1_neq_vbuaa_then_la1 
+    // [101] if(0!=abs_u16::$1) goto abs_u16::@1 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b1
     // [103] phi from abs_u16 abs_u16::@1 to abs_u16::@return [phi:abs_u16/abs_u16::@1->abs_u16::@return]
@@ -2983,7 +2983,7 @@ sgn_u16: {
     lda.z w+1
     // [107] sgn_u16::$1 = sgn_u16::$0 & $80 -- vbuaa=vbuaa_band_vbuc1 
     and #$80
-    // [108] if(0!=sgn_u16::$1) goto sgn_u16::@1 -- vbuc1_neq_vbuaa_then_la1 
+    // [108] if(0!=sgn_u16::$1) goto sgn_u16::@1 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b1_from_sgn_u16
     // [110] phi from sgn_u16 to sgn_u16::@return [phi:sgn_u16->sgn_u16::@return]
@@ -4034,7 +4034,7 @@ abs_u16: {
     // [100] abs_u16::$1 = abs_u16::$0 & $80 -- vbuaa=vbuaa_band_vbuc1 
     and #$80
     // if(>w&0x80)
-    // [101] if(0!=abs_u16::$1) goto abs_u16::@1 -- vbuc1_neq_vbuaa_then_la1 
+    // [101] if(0!=abs_u16::$1) goto abs_u16::@1 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b1
     // [103] phi from abs_u16 abs_u16::@1 to abs_u16::@return [phi:abs_u16/abs_u16::@1->abs_u16::@return]
@@ -4070,7 +4070,7 @@ sgn_u16: {
     // [107] sgn_u16::$1 = sgn_u16::$0 & $80 -- vbuaa=vbuaa_band_vbuc1 
     and #$80
     // if(>w&0x80)
-    // [108] if(0!=sgn_u16::$1) goto sgn_u16::@1 -- vbuc1_neq_vbuaa_then_la1 
+    // [108] if(0!=sgn_u16::$1) goto sgn_u16::@1 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b1
     // [110] phi from sgn_u16 to sgn_u16::@return [phi:sgn_u16->sgn_u16::@return]
diff --git a/src/test/ref/bitmap-plot-0.asm b/src/test/ref/bitmap-plot-0.asm
index 54acea847..82dcd3e7e 100644
--- a/src/test/ref/bitmap-plot-0.asm
+++ b/src/test/ref/bitmap-plot-0.asm
@@ -56,8 +56,8 @@ irq: {
     lda #WHITE
     sta BG_COLOR
     // if(frame_cnt)
-    lda #0
-    cmp.z frame_cnt
+    lda.z frame_cnt
+    cmp #0
     beq __b1
     // frame_cnt++;
     inc.z frame_cnt
diff --git a/src/test/ref/bitmap-plot-0.log b/src/test/ref/bitmap-plot-0.log
index 1b6011057..bbe004d60 100644
--- a/src/test/ref/bitmap-plot-0.log
+++ b/src/test/ref/bitmap-plot-0.log
@@ -1725,9 +1725,9 @@ irq: {
     // [5] *BG_COLOR = WHITE -- _deref_pbuc1=vbuc2 
     lda #WHITE
     sta BG_COLOR
-    // [6] if(0==frame_cnt) goto irq::@1 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z frame_cnt
+    // [6] if(0==frame_cnt) goto irq::@1 -- 0_eq_vbuz1_then_la1 
+    lda.z frame_cnt
+    cmp #0
     beq __b1
     jmp __b2
     // irq::@2
@@ -2516,9 +2516,9 @@ irq: {
     lda #WHITE
     sta BG_COLOR
     // if(frame_cnt)
-    // [6] if(0==frame_cnt) goto irq::@1 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z frame_cnt
+    // [6] if(0==frame_cnt) goto irq::@1 -- 0_eq_vbuz1_then_la1 
+    lda.z frame_cnt
+    cmp #0
     beq __b1
     // irq::@2
     // frame_cnt++;
diff --git a/src/test/ref/bitmap-plot-1.asm b/src/test/ref/bitmap-plot-1.asm
index d8fec5b0b..28df6f107 100644
--- a/src/test/ref/bitmap-plot-1.asm
+++ b/src/test/ref/bitmap-plot-1.asm
@@ -65,8 +65,8 @@ irq: {
     lda #WHITE
     sta BG_COLOR
     // if(frame_cnt)
-    lda #0
-    cmp.z frame_cnt
+    lda.z frame_cnt
+    cmp #0
     beq __b1
     // frame_cnt++;
     inc.z frame_cnt
diff --git a/src/test/ref/bitmap-plot-1.log b/src/test/ref/bitmap-plot-1.log
index 92a3a15f6..76ae657e5 100644
--- a/src/test/ref/bitmap-plot-1.log
+++ b/src/test/ref/bitmap-plot-1.log
@@ -4147,9 +4147,9 @@ irq: {
     // [5] *BG_COLOR = WHITE -- _deref_pbuc1=vbuc2 
     lda #WHITE
     sta BG_COLOR
-    // [6] if(0==frame_cnt) goto irq::@1 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z frame_cnt
+    // [6] if(0==frame_cnt) goto irq::@1 -- 0_eq_vbuz1_then_la1 
+    lda.z frame_cnt
+    cmp #0
     beq __b1
     jmp __b2
     // irq::@2
@@ -6294,9 +6294,9 @@ irq: {
     lda #WHITE
     sta BG_COLOR
     // if(frame_cnt)
-    // [6] if(0==frame_cnt) goto irq::@1 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z frame_cnt
+    // [6] if(0==frame_cnt) goto irq::@1 -- 0_eq_vbuz1_then_la1 
+    lda.z frame_cnt
+    cmp #0
     beq __b1
     // irq::@2
     // frame_cnt++;
diff --git a/src/test/ref/bitmap-plot-2.asm b/src/test/ref/bitmap-plot-2.asm
index 9aec243bf..ee1a27d44 100644
--- a/src/test/ref/bitmap-plot-2.asm
+++ b/src/test/ref/bitmap-plot-2.asm
@@ -66,8 +66,8 @@ irq: {
     lda #WHITE
     sta BG_COLOR
     // if(frame_cnt)
-    lda #0
-    cmp.z frame_cnt
+    lda.z frame_cnt
+    cmp #0
     beq __b1
     // frame_cnt++;
     inc.z frame_cnt
diff --git a/src/test/ref/bitmap-plot-2.log b/src/test/ref/bitmap-plot-2.log
index 802c65d6b..1ee9ba956 100644
--- a/src/test/ref/bitmap-plot-2.log
+++ b/src/test/ref/bitmap-plot-2.log
@@ -4380,9 +4380,9 @@ irq: {
     // [5] *BG_COLOR = WHITE -- _deref_pbuc1=vbuc2 
     lda #WHITE
     sta BG_COLOR
-    // [6] if(0==frame_cnt) goto irq::@1 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z frame_cnt
+    // [6] if(0==frame_cnt) goto irq::@1 -- 0_eq_vbuz1_then_la1 
+    lda.z frame_cnt
+    cmp #0
     beq __b1
     jmp __b2
     // irq::@2
@@ -6612,9 +6612,9 @@ irq: {
     lda #WHITE
     sta BG_COLOR
     // if(frame_cnt)
-    // [6] if(0==frame_cnt) goto irq::@1 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z frame_cnt
+    // [6] if(0==frame_cnt) goto irq::@1 -- 0_eq_vbuz1_then_la1 
+    lda.z frame_cnt
+    cmp #0
     beq __b1
     // irq::@2
     // frame_cnt++;
diff --git a/src/test/ref/bitmap-plot-3.log b/src/test/ref/bitmap-plot-3.log
index 433d7ea67..1b5cc98c5 100644
--- a/src/test/ref/bitmap-plot-3.log
+++ b/src/test/ref/bitmap-plot-3.log
@@ -3212,7 +3212,7 @@ abs_u16: {
     lda.z w+1
     // [108] abs_u16::$1 = abs_u16::$0 & $80 -- vbuaa=vbuaa_band_vbuc1 
     and #$80
-    // [109] if(0!=abs_u16::$1) goto abs_u16::@1 -- vbuc1_neq_vbuaa_then_la1 
+    // [109] if(0!=abs_u16::$1) goto abs_u16::@1 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b1
     // [111] phi from abs_u16 abs_u16::@1 to abs_u16::@return [phi:abs_u16/abs_u16::@1->abs_u16::@return]
@@ -3247,7 +3247,7 @@ sgn_u16: {
     lda.z w+1
     // [115] sgn_u16::$1 = sgn_u16::$0 & $80 -- vbuaa=vbuaa_band_vbuc1 
     and #$80
-    // [116] if(0!=sgn_u16::$1) goto sgn_u16::@1 -- vbuc1_neq_vbuaa_then_la1 
+    // [116] if(0!=sgn_u16::$1) goto sgn_u16::@1 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b1_from_sgn_u16
     // [118] phi from sgn_u16 to sgn_u16::@return [phi:sgn_u16->sgn_u16::@return]
@@ -4334,7 +4334,7 @@ abs_u16: {
     // [108] abs_u16::$1 = abs_u16::$0 & $80 -- vbuaa=vbuaa_band_vbuc1 
     and #$80
     // if(>w&0x80)
-    // [109] if(0!=abs_u16::$1) goto abs_u16::@1 -- vbuc1_neq_vbuaa_then_la1 
+    // [109] if(0!=abs_u16::$1) goto abs_u16::@1 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b1
     // [111] phi from abs_u16 abs_u16::@1 to abs_u16::@return [phi:abs_u16/abs_u16::@1->abs_u16::@return]
@@ -4370,7 +4370,7 @@ sgn_u16: {
     // [115] sgn_u16::$1 = sgn_u16::$0 & $80 -- vbuaa=vbuaa_band_vbuc1 
     and #$80
     // if(>w&0x80)
-    // [116] if(0!=sgn_u16::$1) goto sgn_u16::@1 -- vbuc1_neq_vbuaa_then_la1 
+    // [116] if(0!=sgn_u16::$1) goto sgn_u16::@1 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b1
     // [118] phi from sgn_u16 to sgn_u16::@return [phi:sgn_u16->sgn_u16::@return]
diff --git a/src/test/ref/bool-not-operator-2.log b/src/test/ref/bool-not-operator-2.log
index bd6e8b686..1fa4012c9 100644
--- a/src/test/ref/bool-not-operator-2.log
+++ b/src/test/ref/bool-not-operator-2.log
@@ -225,7 +225,7 @@ main: {
     // [2] main::b#0 = main::i#2 & 1 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #1
-    // [3] if(0==main::b#0) goto main::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [3] if(0==main::b#0) goto main::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2_from___b1
     // [5] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
@@ -323,7 +323,7 @@ main: {
     txa
     and #1
     // !b ? 1 : 0
-    // [3] if(0==main::b#0) goto main::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [3] if(0==main::b#0) goto main::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2
     // [5] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
diff --git a/src/test/ref/c-types.log b/src/test/ref/c-types.log
index b6f71ebb5..5938eed5d 100644
--- a/src/test/ref/c-types.log
+++ b/src/test/ref/c-types.log
@@ -2745,7 +2745,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [82] if(0!=*print_str::str#5) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [82] if(0!=*print_str::str#5) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -3898,7 +3898,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [82] if(0!=*print_str::str#5) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [82] if(0!=*print_str::str#5) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/c64dtv-gfxexplorer.log b/src/test/ref/c64dtv-gfxexplorer.log
index 9ceaa07c5..5a78fd328 100644
--- a/src/test/ref/c64dtv-gfxexplorer.log
+++ b/src/test/ref/c64dtv-gfxexplorer.log
@@ -16448,7 +16448,7 @@ print_str_lines: {
     jmp __b1
     // print_str_lines::@1
   __b1:
-    // [435] if(0!=*print_str_lines::str#3) goto print_str_lines::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [435] if(0!=*print_str_lines::str#3) goto print_str_lines::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -16474,7 +16474,7 @@ print_str_lines: {
     bne !+
     inc.z str+1
   !:
-    // [440] if(0==print_str_lines::ch#0) goto print_str_lines::@3 -- vbuc1_eq_vbuaa_then_la1 
+    // [440] if(0==print_str_lines::ch#0) goto print_str_lines::@3 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b3_from___b2
     jmp __b4
@@ -16490,7 +16490,7 @@ print_str_lines: {
     jmp __b3
     // print_str_lines::@3
   __b3:
-    // [444] if(0!=print_str_lines::ch#0) goto print_str_lines::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [444] if(0!=print_str_lines::ch#0) goto print_str_lines::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2_from___b3
     // [445] phi from print_str_lines::@3 to print_str_lines::@5 [phi:print_str_lines::@3->print_str_lines::@5]
@@ -18704,7 +18704,7 @@ print_str_at: {
     jmp __b1
     // print_str_at::@1
   __b1:
-    // [784] if(0!=*print_str_at::str#2) goto print_str_at::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [784] if(0!=*print_str_at::str#2) goto print_str_at::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -23742,7 +23742,7 @@ print_str_lines: {
     // print_str_lines::@1
   __b1:
     // while(*str)
-    // [435] if(0!=*print_str_lines::str#3) goto print_str_lines::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [435] if(0!=*print_str_lines::str#3) goto print_str_lines::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -23766,7 +23766,7 @@ print_str_lines: {
     inc.z str+1
   !:
     // if(ch)
-    // [440] if(0==print_str_lines::ch#0) goto print_str_lines::@3 -- vbuc1_eq_vbuaa_then_la1 
+    // [440] if(0==print_str_lines::ch#0) goto print_str_lines::@3 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b3
     // print_str_lines::@4
@@ -23779,7 +23779,7 @@ print_str_lines: {
     // print_str_lines::@3
   __b3:
     // while (ch)
-    // [444] if(0!=print_str_lines::ch#0) goto print_str_lines::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [444] if(0!=print_str_lines::ch#0) goto print_str_lines::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // [445] phi from print_str_lines::@3 to print_str_lines::@5 [phi:print_str_lines::@3->print_str_lines::@5]
@@ -25856,7 +25856,7 @@ print_str_at: {
     // print_str_at::@1
   __b1:
     // while(*str)
-    // [784] if(0!=*print_str_at::str#2) goto print_str_at::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [784] if(0!=*print_str_at::str#2) goto print_str_at::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/c64dtv-gfxmodes.log b/src/test/ref/c64dtv-gfxmodes.log
index 5a755e497..52a29483c 100644
--- a/src/test/ref/c64dtv-gfxmodes.log
+++ b/src/test/ref/c64dtv-gfxmodes.log
@@ -13700,7 +13700,7 @@ print_str_lines: {
     jmp __b1
     // print_str_lines::@1
   __b1:
-    // [119] if(0!=*print_str_lines::str#2) goto print_str_lines::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [119] if(0!=*print_str_lines::str#2) goto print_str_lines::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -13726,7 +13726,7 @@ print_str_lines: {
     bne !+
     inc.z str+1
   !:
-    // [124] if(0==print_str_lines::ch#0) goto print_str_lines::@3 -- vbuc1_eq_vbuaa_then_la1 
+    // [124] if(0==print_str_lines::ch#0) goto print_str_lines::@3 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b3_from___b2
     jmp __b4
@@ -13742,7 +13742,7 @@ print_str_lines: {
     jmp __b3
     // print_str_lines::@3
   __b3:
-    // [128] if(0!=print_str_lines::ch#0) goto print_str_lines::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [128] if(0!=print_str_lines::ch#0) goto print_str_lines::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2_from___b3
     // [129] phi from print_str_lines::@3 to print_str_lines::@5 [phi:print_str_lines::@3->print_str_lines::@5]
@@ -20330,7 +20330,7 @@ print_str_lines: {
     // print_str_lines::@1
   __b1:
     // while(*str)
-    // [119] if(0!=*print_str_lines::str#2) goto print_str_lines::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [119] if(0!=*print_str_lines::str#2) goto print_str_lines::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -20354,7 +20354,7 @@ print_str_lines: {
     inc.z str+1
   !:
     // if(ch)
-    // [124] if(0==print_str_lines::ch#0) goto print_str_lines::@3 -- vbuc1_eq_vbuaa_then_la1 
+    // [124] if(0==print_str_lines::ch#0) goto print_str_lines::@3 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b3
     // print_str_lines::@4
@@ -20367,7 +20367,7 @@ print_str_lines: {
     // print_str_lines::@3
   __b3:
     // while (ch)
-    // [128] if(0!=print_str_lines::ch#0) goto print_str_lines::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [128] if(0!=print_str_lines::ch#0) goto print_str_lines::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // [129] phi from print_str_lines::@3 to print_str_lines::@5 [phi:print_str_lines::@3->print_str_lines::@5]
diff --git a/src/test/ref/casting-negative.log b/src/test/ref/casting-negative.log
index d7dbd6b2a..8be4ee302 100644
--- a/src/test/ref/casting-negative.log
+++ b/src/test/ref/casting-negative.log
@@ -3437,7 +3437,6 @@ Statement [1] conio_cursor_x = 0 [ printf_buffer ] (  [ printf_buffer ] { }  ) a
 Statement [2] conio_cursor_y = 0 [ printf_buffer ] (  [ printf_buffer ] { }  ) always clobbers reg byte a 
 Statement [3] conio_line_text = DEFAULT_SCREEN [ printf_buffer ] (  [ printf_buffer ] { }  ) always clobbers reg byte a 
 Statement [4] conio_line_color = COLORRAM [ printf_buffer ] (  [ printf_buffer ] { }  ) always clobbers reg byte a 
-Statement [19] if(main::signed_char_value#2!=0) goto main::@2 [ conio_cursor_x conio_cursor_y conio_line_text conio_line_color main::signed_char_value#2 printf_buffer ] ( main:7 [ conio_cursor_x conio_cursor_y conio_line_text conio_line_color main::signed_char_value#2 printf_buffer ] { }  ) always clobbers reg byte a 
 Statement [22] test_casting::signed_short_value#0 = main::signed_char_value#1 [ conio_cursor_x conio_cursor_y conio_line_text conio_line_color main::signed_char_value#1 test_casting::signed_short_value#0 printf_buffer ] ( main:7 [ conio_cursor_x conio_cursor_y conio_line_text conio_line_color main::signed_char_value#1 test_casting::signed_short_value#0 printf_buffer ] { { test_casting::signed_short_value#0 = main::signed_char_value#1 } }  ) always clobbers reg byte a 
 Statement [27] conio_cursor_x = gotoxy::x#2 [ gotoxy::y#4 ] ( gotoxy:14 [ gotoxy::y#4 ] { { gotoxy::y#2 = conio_c64_init::line#2 } }  conio_c64_init:5::gotoxy:14 [ printf_buffer gotoxy::y#4 ] { { gotoxy::y#2 = conio_c64_init::line#2 } }  ) always clobbers reg byte a 
 Statement [29] gotoxy::$7 = (word)gotoxy::y#4 [ gotoxy::$7 ] ( gotoxy:14 [ gotoxy::$7 ] { { gotoxy::y#2 = conio_c64_init::line#2 } }  conio_c64_init:5::gotoxy:14 [ printf_buffer gotoxy::$7 ] { { gotoxy::y#2 = conio_c64_init::line#2 } }  ) always clobbers reg byte a 
@@ -4079,7 +4078,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [73] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [73] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -4165,7 +4164,7 @@ utoa: {
     sta.z digit_value
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [87] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [87] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -4233,7 +4232,7 @@ printf_number_buffer: {
     jmp __b1
     // printf_number_buffer::@1
   __b1:
-    // [99] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [99] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2_from___b1
     jmp __b3
@@ -5425,7 +5424,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [73] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [73] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
@@ -5511,7 +5510,7 @@ utoa: {
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [87] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [87] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // utoa::@7
@@ -5573,7 +5572,7 @@ printf_number_buffer: {
     .label buffer_digits = printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS
     // printf_number_buffer::@1
     // if(buffer.sign)
-    // [99] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [99] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2
     // printf_number_buffer::@3
diff --git a/src/test/ref/circlechars.log b/src/test/ref/circlechars.log
index 4ba398532..fcd0caff2 100644
--- a/src/test/ref/circlechars.log
+++ b/src/test/ref/circlechars.log
@@ -4753,7 +4753,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [84] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [84] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -4905,7 +4905,7 @@ utoa: {
     sta.z digit_value
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [115] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [115] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -4973,7 +4973,7 @@ printf_number_buffer: {
     jmp __b1
     // printf_number_buffer::@1
   __b1:
-    // [127] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [127] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2_from___b1
     jmp __b3
@@ -6363,7 +6363,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [84] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [84] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
@@ -6510,7 +6510,7 @@ utoa: {
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [115] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [115] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // utoa::@7
@@ -6572,7 +6572,7 @@ printf_number_buffer: {
     .label buffer_digits = printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS
     // printf_number_buffer::@1
     // if(buffer.sign)
-    // [127] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [127] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2
     // printf_number_buffer::@3
diff --git a/src/test/ref/complex/bubbles64/bubbles64.asm b/src/test/ref/complex/bubbles64/bubbles64.asm
index c5a42cfbf..f6d8c1810 100644
--- a/src/test/ref/complex/bubbles64/bubbles64.asm
+++ b/src/test/ref/complex/bubbles64/bubbles64.asm
@@ -214,8 +214,8 @@ main: {
     bcc __b36
   !:
     // if (0==stopIt && objects<maxDrawObjects)
-    lda #0
-    cmp.z stopIt
+    lda.z stopIt
+    cmp #0
     bne __b11
     lda.z objects
     cmp #maxDrawObjects
diff --git a/src/test/ref/complex/bubbles64/bubbles64.log b/src/test/ref/complex/bubbles64/bubbles64.log
index d87381842..135074408 100644
--- a/src/test/ref/complex/bubbles64/bubbles64.log
+++ b/src/test/ref/complex/bubbles64/bubbles64.log
@@ -3692,9 +3692,9 @@ main: {
     jmp __b30
     // main::@30
   __b30:
-    // [42] if(0!=main::stopIt#5) goto main::@33 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z stopIt
+    // [42] if(0!=main::stopIt#5) goto main::@33 -- 0_neq_vbuz1_then_la1 
+    lda.z stopIt
+    cmp #0
     bne __b33_from___b30
     jmp __b42
     // main::@42
@@ -5008,9 +5008,9 @@ main: {
   !:
     // main::@30
     // if (0==stopIt && objects<maxDrawObjects)
-    // [42] if(0!=main::stopIt#5) goto main::@33 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z stopIt
+    // [42] if(0!=main::stopIt#5) goto main::@33 -- 0_neq_vbuz1_then_la1 
+    lda.z stopIt
+    cmp #0
     bne __b11
     // main::@42
     // [43] if(main::objects#9<maxDrawObjects) goto main::@31 -- vbuz1_lt_vbuc1_then_la1 
diff --git a/src/test/ref/complex/clearscreen/clearscreen.log b/src/test/ref/complex/clearscreen/clearscreen.log
index 932582c96..3d482eae4 100644
--- a/src/test/ref/complex/clearscreen/clearscreen.log
+++ b/src/test/ref/complex/clearscreen/clearscreen.log
@@ -5618,7 +5618,7 @@ processChars: {
     ror.z xpos
     // [77] processChars::$9 = > processChars::xpos#0 -- vbuaa=_hi_vwuz1 
     lda.z xpos+1
-    // [78] if(0!=processChars::$9) goto processChars::@4 -- vbuc1_neq_vbuaa_then_la1 
+    // [78] if(0!=processChars::$9) goto processChars::@4 -- 0_neq_vbuaa_then_la1 
     // Set sprite position
     cmp #0
     bne __b4
@@ -6885,7 +6885,7 @@ atan2_16: {
     jmp __b15
     // atan2_16::@15
   __b15:
-    // [278] if(0==atan2_16::shift#2) goto atan2_16::@17 -- vbuc1_eq_vbuyy_then_la1 
+    // [278] if(0==atan2_16::shift#2) goto atan2_16::@17 -- 0_eq_vbuyy_then_la1 
     cpy #0
     beq __b17_from___b15
     jmp __b16
@@ -8302,7 +8302,7 @@ processChars: {
     // [77] processChars::$9 = > processChars::xpos#0 -- vbuaa=_hi_vwuz1 
     lda.z xpos+1
     // if(>xpos)
-    // [78] if(0!=processChars::$9) goto processChars::@4 -- vbuc1_neq_vbuaa_then_la1 
+    // [78] if(0!=processChars::$9) goto processChars::@4 -- 0_neq_vbuaa_then_la1 
     // Set sprite position
     cmp #0
     beq !__b4+
@@ -9586,7 +9586,7 @@ atan2_16: {
     bcs __b14
     // atan2_16::@15
     // if(shift)
-    // [278] if(0==atan2_16::shift#2) goto atan2_16::@17 -- vbuc1_eq_vbuyy_then_la1 
+    // [278] if(0==atan2_16::shift#2) goto atan2_16::@17 -- 0_eq_vbuyy_then_la1 
     cpy #0
     beq __b17
     // atan2_16::@16
diff --git a/src/test/ref/complex/includes/includes-1.log b/src/test/ref/complex/includes/includes-1.log
index d65b7c62e..a760a27e2 100644
--- a/src/test/ref/complex/includes/includes-1.log
+++ b/src/test/ref/complex/includes/includes-1.log
@@ -268,7 +268,7 @@ strlen: {
     jmp __b1
     // strlen::@1
   __b1:
-    // [8] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [8] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -386,7 +386,7 @@ strlen: {
     // strlen::@1
   __b1:
     // while(*str)
-    // [8] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [8] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/complex/nes-balls/kickballs-2.asm b/src/test/ref/complex/nes-balls/kickballs-2.asm
index 93ac2e66b..a5a56760a 100644
--- a/src/test/ref/complex/nes-balls/kickballs-2.asm
+++ b/src/test/ref/complex/nes-balls/kickballs-2.asm
@@ -315,11 +315,12 @@ main: {
     sta $2001
   __b13:
     // while (!vblank_hit)
-    lda #0
-    cmp.z vblank_hit
+    lda.z vblank_hit
+    cmp #0
     beq __b13
     // vblank_hit = 0
     // wait for vblank
+    lda #0
     sta.z vblank_hit
     // poke(0x2001) = 0x18
     lda #$18
diff --git a/src/test/ref/complex/nes-balls/kickballs-2.log b/src/test/ref/complex/nes-balls/kickballs-2.log
index f479d8b6a..5a45484d2 100644
--- a/src/test/ref/complex/nes-balls/kickballs-2.log
+++ b/src/test/ref/complex/nes-balls/kickballs-2.log
@@ -2873,7 +2873,7 @@ main: {
     // [20] main::initNES1_waitForVBlank1_$0 = *((byte*)PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS) & $80 -- vbuaa=_deref_pbuc1_band_vbuc2 
     lda #$80
     and PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS
-    // [21] if(0==main::initNES1_waitForVBlank1_$0) goto main::initNES1_waitForVBlank1_@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [21] if(0==main::initNES1_waitForVBlank1_$0) goto main::initNES1_waitForVBlank1_@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq initNES1_waitForVBlank1___b1
     // [22] phi from main::initNES1_waitForVBlank1_@1 to main::initNES1_@1 [phi:main::initNES1_waitForVBlank1_@1->main::initNES1_@1]
@@ -2913,7 +2913,7 @@ main: {
     sta MEMORY+$700,x
     // [31] main::initNES1_i#1 = ++ main::initNES1_i#2 -- vbuxx=_inc_vbuxx 
     inx
-    // [32] if(0!=main::initNES1_i#1) goto main::initNES1_@1 -- vbuc1_neq_vbuxx_then_la1 
+    // [32] if(0!=main::initNES1_i#1) goto main::initNES1_@1 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne initNES1___b1_from_initNES1___b1
     // [33] phi from main::initNES1_@1 to main::initNES1_waitForVBlank2 [phi:main::initNES1_@1->main::initNES1_waitForVBlank2]
@@ -2927,7 +2927,7 @@ main: {
     // [34] main::initNES1_waitForVBlank2_$0 = *((byte*)PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS) & $80 -- vbuaa=_deref_pbuc1_band_vbuc2 
     lda #$80
     and PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS
-    // [35] if(0==main::initNES1_waitForVBlank2_$0) goto main::initNES1_waitForVBlank2_@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [35] if(0==main::initNES1_waitForVBlank2_$0) goto main::initNES1_waitForVBlank2_@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq initNES1_waitForVBlank2___b1
     jmp initNES1___b7
@@ -3148,9 +3148,9 @@ main: {
     jmp __b13
     // main::@13
   __b13:
-    // [66] if(0==vblank_hit) goto main::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z vblank_hit
+    // [66] if(0==vblank_hit) goto main::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z vblank_hit
+    cmp #0
     beq __b13
     jmp __b14
     // main::@14
@@ -3764,7 +3764,6 @@ Removing instruction jmp initNES1___b1
 Removing instruction jmp __b5
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #0
-Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Fixing long branch [219] bcc __b2 to bcs
 Fixing long branch [243] bne __b25 to beq
@@ -3940,7 +3939,7 @@ zp[2]:31 [ rand::$2 ]
 
 
 FINAL ASSEMBLER
-Score: 40983
+Score: 41003
 
   // File Comments
 //#pragma emulator("java -jar /Applications/Nintaco_bin_2020-05-01/Nintaco.jar")
@@ -4142,7 +4141,7 @@ main: {
     lda #$80
     and PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS
     // while(!(PPU->PPUSTATUS&0x80))
-    // [21] if(0==main::initNES1_waitForVBlank1_$0) goto main::initNES1_waitForVBlank1_@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [21] if(0==main::initNES1_waitForVBlank1_$0) goto main::initNES1_waitForVBlank1_@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq initNES1_waitForVBlank1
     // [22] phi from main::initNES1_waitForVBlank1_@1 to main::initNES1_@1 [phi:main::initNES1_waitForVBlank1_@1->main::initNES1_@1]
@@ -4180,7 +4179,7 @@ main: {
     // while (++i)
     // [31] main::initNES1_i#1 = ++ main::initNES1_i#2 -- vbuxx=_inc_vbuxx 
     inx
-    // [32] if(0!=main::initNES1_i#1) goto main::initNES1_@1 -- vbuc1_neq_vbuxx_then_la1 
+    // [32] if(0!=main::initNES1_i#1) goto main::initNES1_@1 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne initNES1___b1
     // [33] phi from main::initNES1_@1 to main::initNES1_waitForVBlank2 [phi:main::initNES1_@1->main::initNES1_waitForVBlank2]
@@ -4192,7 +4191,7 @@ main: {
     lda #$80
     and PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS
     // while(!(PPU->PPUSTATUS&0x80))
-    // [35] if(0==main::initNES1_waitForVBlank2_$0) goto main::initNES1_waitForVBlank2_@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [35] if(0==main::initNES1_waitForVBlank2_$0) goto main::initNES1_waitForVBlank2_@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq initNES1_waitForVBlank2
     // main::initNES1_@7
@@ -4389,14 +4388,15 @@ main: {
     // main::@13
   __b13:
     // while (!vblank_hit)
-    // [66] if(0==vblank_hit) goto main::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z vblank_hit
+    // [66] if(0==vblank_hit) goto main::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z vblank_hit
+    cmp #0
     beq __b13
     // main::@14
     // vblank_hit = 0
     // [67] vblank_hit = 0 -- vbuz1=vbuc1 
     // wait for vblank
+    lda #0
     sta.z vblank_hit
     // poke(0x2001) = 0x18
     // [68] *((byte*) 8193) = $18 -- _deref_pbuc1=vbuc2 
diff --git a/src/test/ref/complex/nes-balls/kickballs-3.asm b/src/test/ref/complex/nes-balls/kickballs-3.asm
index b277cf651..1c7744894 100644
--- a/src/test/ref/complex/nes-balls/kickballs-3.asm
+++ b/src/test/ref/complex/nes-balls/kickballs-3.asm
@@ -352,11 +352,12 @@ main: {
     sta $2001
   __b13:
     // while (!vblank_hit)
-    lda #0
-    cmp.z vblank_hit
+    lda.z vblank_hit
+    cmp #0
     beq __b13
     // vblank_hit = 0
     // wait for vblank
+    lda #0
     sta.z vblank_hit
     // poke(0x2001) = 0x18
     lda #$18
diff --git a/src/test/ref/complex/nes-balls/kickballs-3.log b/src/test/ref/complex/nes-balls/kickballs-3.log
index fa387efac..114161783 100644
--- a/src/test/ref/complex/nes-balls/kickballs-3.log
+++ b/src/test/ref/complex/nes-balls/kickballs-3.log
@@ -3014,7 +3014,7 @@ main: {
     // [20] main::initNES1_waitForVBlank1_$0 = *((byte*)PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS) & $80 -- vbuaa=_deref_pbuc1_band_vbuc2 
     lda #$80
     and PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS
-    // [21] if(0==main::initNES1_waitForVBlank1_$0) goto main::initNES1_waitForVBlank1_@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [21] if(0==main::initNES1_waitForVBlank1_$0) goto main::initNES1_waitForVBlank1_@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq initNES1_waitForVBlank1___b1
     // [22] phi from main::initNES1_waitForVBlank1_@1 to main::initNES1_@1 [phi:main::initNES1_waitForVBlank1_@1->main::initNES1_@1]
@@ -3054,7 +3054,7 @@ main: {
     sta MEMORY+$700,x
     // [31] main::initNES1_i#1 = ++ main::initNES1_i#2 -- vbuxx=_inc_vbuxx 
     inx
-    // [32] if(0!=main::initNES1_i#1) goto main::initNES1_@1 -- vbuc1_neq_vbuxx_then_la1 
+    // [32] if(0!=main::initNES1_i#1) goto main::initNES1_@1 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne initNES1___b1_from_initNES1___b1
     // [33] phi from main::initNES1_@1 to main::initNES1_waitForVBlank2 [phi:main::initNES1_@1->main::initNES1_waitForVBlank2]
@@ -3068,7 +3068,7 @@ main: {
     // [34] main::initNES1_waitForVBlank2_$0 = *((byte*)PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS) & $80 -- vbuaa=_deref_pbuc1_band_vbuc2 
     lda #$80
     and PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS
-    // [35] if(0==main::initNES1_waitForVBlank2_$0) goto main::initNES1_waitForVBlank2_@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [35] if(0==main::initNES1_waitForVBlank2_$0) goto main::initNES1_waitForVBlank2_@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq initNES1_waitForVBlank2___b1
     jmp initNES1___b7
@@ -3328,9 +3328,9 @@ main: {
     jmp __b13
     // main::@13
   __b13:
-    // [67] if(0==vblank_hit) goto main::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z vblank_hit
+    // [67] if(0==vblank_hit) goto main::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z vblank_hit
+    cmp #0
     beq __b13
     jmp __b14
     // main::@14
@@ -4053,7 +4053,6 @@ Removing instruction jmp initNES1___b1
 Removing instruction jmp __b5
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #0
-Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Fixing long branch [225] bcc __b2 to bcs
 Fixing long branch [254] bne __b25 to beq
@@ -4239,7 +4238,7 @@ zp[2]:45 [ rand::$2 ]
 
 
 FINAL ASSEMBLER
-Score: 64773
+Score: 64793
 
   // File Comments
   // Upstart
@@ -4443,7 +4442,7 @@ main: {
     lda #$80
     and PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS
     // while(!(PPU->PPUSTATUS&0x80))
-    // [21] if(0==main::initNES1_waitForVBlank1_$0) goto main::initNES1_waitForVBlank1_@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [21] if(0==main::initNES1_waitForVBlank1_$0) goto main::initNES1_waitForVBlank1_@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq initNES1_waitForVBlank1
     // [22] phi from main::initNES1_waitForVBlank1_@1 to main::initNES1_@1 [phi:main::initNES1_waitForVBlank1_@1->main::initNES1_@1]
@@ -4481,7 +4480,7 @@ main: {
     // while (++i)
     // [31] main::initNES1_i#1 = ++ main::initNES1_i#2 -- vbuxx=_inc_vbuxx 
     inx
-    // [32] if(0!=main::initNES1_i#1) goto main::initNES1_@1 -- vbuc1_neq_vbuxx_then_la1 
+    // [32] if(0!=main::initNES1_i#1) goto main::initNES1_@1 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne initNES1___b1
     // [33] phi from main::initNES1_@1 to main::initNES1_waitForVBlank2 [phi:main::initNES1_@1->main::initNES1_waitForVBlank2]
@@ -4493,7 +4492,7 @@ main: {
     lda #$80
     and PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS
     // while(!(PPU->PPUSTATUS&0x80))
-    // [35] if(0==main::initNES1_waitForVBlank2_$0) goto main::initNES1_waitForVBlank2_@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [35] if(0==main::initNES1_waitForVBlank2_$0) goto main::initNES1_waitForVBlank2_@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq initNES1_waitForVBlank2
     // main::initNES1_@7
@@ -4726,14 +4725,15 @@ main: {
     // main::@13
   __b13:
     // while (!vblank_hit)
-    // [67] if(0==vblank_hit) goto main::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z vblank_hit
+    // [67] if(0==vblank_hit) goto main::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z vblank_hit
+    cmp #0
     beq __b13
     // main::@14
     // vblank_hit = 0
     // [68] vblank_hit = 0 -- vbuz1=vbuc1 
     // wait for vblank
+    lda #0
     sta.z vblank_hit
     // poke(0x2001) = 0x18
     // [69] *((byte*) 8193) = $18 -- _deref_pbuc1=vbuc2 
diff --git a/src/test/ref/complex/polygon/polygon.asm b/src/test/ref/complex/polygon/polygon.asm
index 17761378e..ba4152456 100644
--- a/src/test/ref/complex/polygon/polygon.asm
+++ b/src/test/ref/complex/polygon/polygon.asm
@@ -302,8 +302,8 @@ main: {
     sta VICII+OFFSET_STRUCT_MOS6569_VICII_BORDER_COLOR
   __b9:
     // while(canvas_show_flag)
-    lda #0
-    cmp.z canvas_show_flag
+    lda.z canvas_show_flag
+    cmp #0
     bne __b9
     // VICII->BORDER_COLOR = BLACK
     lda #BLACK
diff --git a/src/test/ref/complex/polygon/polygon.log b/src/test/ref/complex/polygon/polygon.log
index f653f4ebc..cdc32d765 100644
--- a/src/test/ref/complex/polygon/polygon.log
+++ b/src/test/ref/complex/polygon/polygon.log
@@ -4683,7 +4683,7 @@ irq_bottom_2: {
     // irq_bottom_2::@4
   __b4:
     // [11] irq_bottom_2::$0 = kbhit::return#2
-    // [12] if(0==irq_bottom_2::$0) goto irq_bottom_2::@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [12] if(0==irq_bottom_2::$0) goto irq_bottom_2::@1 -- 0_eq_vbuaa_then_la1 
     // Show the current canvas (unless a key is being pressed)
     cmp #0
     beq __b1
@@ -5036,9 +5036,9 @@ main: {
     jmp __b9
     // main::@9
   __b9:
-    // [69] if(0!=canvas_show_flag) goto main::@9 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z canvas_show_flag
+    // [69] if(0!=canvas_show_flag) goto main::@9 -- 0_neq_vbuz1_then_la1 
+    lda.z canvas_show_flag
+    cmp #0
     bne __b9
     jmp __b10
     // main::@10
@@ -5851,7 +5851,7 @@ abs_u8: {
     // [212] abs_u8::$0 = abs_u8::u#2 & $80 -- vbuxx=vbuaa_band_vbuc1 
     ldx #$80
     axs #0
-    // [213] if(0!=abs_u8::$0) goto abs_u8::@1 -- vbuc1_neq_vbuxx_then_la1 
+    // [213] if(0!=abs_u8::$0) goto abs_u8::@1 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b1
     // [215] phi from abs_u8 abs_u8::@1 to abs_u8::@return [phi:abs_u8/abs_u8::@1->abs_u8::@return]
@@ -5878,7 +5878,7 @@ abs_u8: {
 sgn_u8: {
     // [218] sgn_u8::$0 = sgn_u8::u#2 & $80 -- vbuaa=vbuaa_band_vbuc1 
     and #$80
-    // [219] if(0!=sgn_u8::$0) goto sgn_u8::@1 -- vbuc1_neq_vbuaa_then_la1 
+    // [219] if(0!=sgn_u8::$0) goto sgn_u8::@1 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b1_from_sgn_u8
     // [221] phi from sgn_u8 to sgn_u8::@return [phi:sgn_u8->sgn_u8::@return]
@@ -6593,7 +6593,7 @@ irq_bottom_2: {
     // irq_bottom_2::@4
     // [11] irq_bottom_2::$0 = kbhit::return#2
     // if(!kbhit())
-    // [12] if(0==irq_bottom_2::$0) goto irq_bottom_2::@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [12] if(0==irq_bottom_2::$0) goto irq_bottom_2::@1 -- 0_eq_vbuaa_then_la1 
     // Show the current canvas (unless a key is being pressed)
     cmp #0
     beq __b1
@@ -6931,9 +6931,9 @@ main: {
     // main::@9
   __b9:
     // while(canvas_show_flag)
-    // [69] if(0!=canvas_show_flag) goto main::@9 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z canvas_show_flag
+    // [69] if(0!=canvas_show_flag) goto main::@9 -- 0_neq_vbuz1_then_la1 
+    lda.z canvas_show_flag
+    cmp #0
     bne __b9
     // main::@10
     // VICII->BORDER_COLOR = BLACK
@@ -7753,7 +7753,7 @@ abs_u8: {
     ldx #$80
     axs #0
     // if(u & 0x80)
-    // [213] if(0!=abs_u8::$0) goto abs_u8::@1 -- vbuc1_neq_vbuxx_then_la1 
+    // [213] if(0!=abs_u8::$0) goto abs_u8::@1 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b1
     // [215] phi from abs_u8 abs_u8::@1 to abs_u8::@return [phi:abs_u8/abs_u8::@1->abs_u8::@return]
@@ -7780,7 +7780,7 @@ sgn_u8: {
     // [218] sgn_u8::$0 = sgn_u8::u#2 & $80 -- vbuaa=vbuaa_band_vbuc1 
     and #$80
     // if(u & 0x80)
-    // [219] if(0!=sgn_u8::$0) goto sgn_u8::@1 -- vbuc1_neq_vbuaa_then_la1 
+    // [219] if(0!=sgn_u8::$0) goto sgn_u8::@1 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b1
     // [221] phi from sgn_u8 to sgn_u8::@return [phi:sgn_u8->sgn_u8::@return]
diff --git a/src/test/ref/complex/prebob/grid-bobs.log b/src/test/ref/complex/prebob/grid-bobs.log
index f8b5468d8..4dd3c1174 100644
--- a/src/test/ref/complex/prebob/grid-bobs.log
+++ b/src/test/ref/complex/prebob/grid-bobs.log
@@ -5050,7 +5050,7 @@ main: {
     // main::@15
   __b15:
     // [39] main::$15 = keyboard_key_pressed::return#2
-    // [40] if(0!=main::$15) goto main::@8 -- vbuc1_neq_vbuaa_then_la1 
+    // [40] if(0!=main::$15) goto main::@8 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b8_from___b15
     // [12] phi from main::@15 to main::@1 [phi:main::@15->main::@1]
@@ -5074,7 +5074,7 @@ main: {
     // main::@16
   __b16:
     // [44] main::$17 = keyboard_key_pressed::return#3
-    // [45] if(0!=main::$17) goto main::@8 -- vbuc1_neq_vbuaa_then_la1 
+    // [45] if(0!=main::$17) goto main::@8 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b8_from___b16
     jmp vicSelectGfxBank2
@@ -5977,7 +5977,7 @@ charsetFindOrAddGlyph: {
     jmp __b5
     // charsetFindOrAddGlyph::@5
   __b5:
-    // [189] if(0==charsetFindOrAddGlyph::found#2) goto charsetFindOrAddGlyph::@6 -- vbuc1_eq_vbuaa_then_la1 
+    // [189] if(0==charsetFindOrAddGlyph::found#2) goto charsetFindOrAddGlyph::@6 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b6
     jmp __breturn_from___b5
@@ -6087,7 +6087,7 @@ protoBobShiftRight: {
     // [208] protoBobShiftRight::$1 = PROTO_BOB[protoBobShiftRight::j#3] & 1 -- vbuaa=pbuc1_derefidx_vbuxx_band_vbuc2 
     lda #1
     and PROTO_BOB,x
-    // [209] if(0!=protoBobShiftRight::$1) goto protoBobShiftRight::@3 -- vbuc1_neq_vbuaa_then_la1 
+    // [209] if(0!=protoBobShiftRight::$1) goto protoBobShiftRight::@3 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b3_from___b2
     // [211] phi from protoBobShiftRight::@2 to protoBobShiftRight::@4 [phi:protoBobShiftRight::@2->protoBobShiftRight::@4]
@@ -7130,7 +7130,7 @@ main: {
     // main::@15
     // [39] main::$15 = keyboard_key_pressed::return#2
     // if(keyboard_key_pressed(KEY_SPACE))
-    // [40] if(0!=main::$15) goto main::@8 -- vbuc1_neq_vbuaa_then_la1 
+    // [40] if(0!=main::$15) goto main::@8 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b8
     // [12] phi from main::@15 to main::@1 [phi:main::@15->main::@1]
@@ -7150,7 +7150,7 @@ main: {
     // main::@16
     // [44] main::$17 = keyboard_key_pressed::return#3
     // while(keyboard_key_pressed(KEY_SPACE))
-    // [45] if(0!=main::$17) goto main::@8 -- vbuc1_neq_vbuaa_then_la1 
+    // [45] if(0!=main::$17) goto main::@8 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b8
     // main::vicSelectGfxBank2
@@ -8029,7 +8029,7 @@ charsetFindOrAddGlyph: {
     // charsetFindOrAddGlyph::@5
   __b5:
     // if(found)
-    // [189] if(0==charsetFindOrAddGlyph::found#2) goto charsetFindOrAddGlyph::@6 -- vbuc1_eq_vbuaa_then_la1 
+    // [189] if(0==charsetFindOrAddGlyph::found#2) goto charsetFindOrAddGlyph::@6 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b6
     rts
@@ -8140,7 +8140,7 @@ protoBobShiftRight: {
     lda #1
     and PROTO_BOB,x
     // (PROTO_BOB[j]&1)?0x80ub:0ub
-    // [209] if(0!=protoBobShiftRight::$1) goto protoBobShiftRight::@3 -- vbuc1_neq_vbuaa_then_la1 
+    // [209] if(0!=protoBobShiftRight::$1) goto protoBobShiftRight::@3 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b3
     // [211] phi from protoBobShiftRight::@2 to protoBobShiftRight::@4 [phi:protoBobShiftRight::@2->protoBobShiftRight::@4]
diff --git a/src/test/ref/complex/prebob/vogel-bobs.log b/src/test/ref/complex/prebob/vogel-bobs.log
index 1190d06f7..4933586b8 100644
--- a/src/test/ref/complex/prebob/vogel-bobs.log
+++ b/src/test/ref/complex/prebob/vogel-bobs.log
@@ -5554,7 +5554,7 @@ main: {
     // main::@15
   __b15:
     // [44] main::$19 = keyboard_key_pressed::return#2
-    // [45] if(0!=main::$19) goto main::@6 -- vbuc1_neq_vbuaa_then_la1 
+    // [45] if(0!=main::$19) goto main::@6 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b6_from___b15
     // [12] phi from main::@15 to main::@1 [phi:main::@15->main::@1]
@@ -5577,7 +5577,7 @@ main: {
     // main::@16
   __b16:
     // [49] main::$21 = keyboard_key_pressed::return#3
-    // [50] if(0!=main::$21) goto main::@6 -- vbuc1_neq_vbuaa_then_la1 
+    // [50] if(0!=main::$21) goto main::@6 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b6_from___b16
     jmp vicSelectGfxBank2
@@ -6498,7 +6498,7 @@ bobCharsetFindOrAddGlyph: {
     jmp __b5
     // bobCharsetFindOrAddGlyph::@5
   __b5:
-    // [201] if(0==bobCharsetFindOrAddGlyph::found#2) goto bobCharsetFindOrAddGlyph::@6 -- vbuc1_eq_vbuaa_then_la1 
+    // [201] if(0==bobCharsetFindOrAddGlyph::found#2) goto bobCharsetFindOrAddGlyph::@6 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b6
     jmp __breturn_from___b5
@@ -6608,7 +6608,7 @@ shiftProtoBobRight: {
     // [220] shiftProtoBobRight::$1 = PROTO_BOB[shiftProtoBobRight::j#3] & 1 -- vbuaa=pbuc1_derefidx_vbuxx_band_vbuc2 
     lda #1
     and PROTO_BOB,x
-    // [221] if(0!=shiftProtoBobRight::$1) goto shiftProtoBobRight::@3 -- vbuc1_neq_vbuaa_then_la1 
+    // [221] if(0!=shiftProtoBobRight::$1) goto shiftProtoBobRight::@3 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b3_from___b2
     // [223] phi from shiftProtoBobRight::@2 to shiftProtoBobRight::@4 [phi:shiftProtoBobRight::@2->shiftProtoBobRight::@4]
@@ -7823,7 +7823,7 @@ main: {
     // main::@15
     // [44] main::$19 = keyboard_key_pressed::return#2
     // if(keyboard_key_pressed(KEY_SPACE))
-    // [45] if(0!=main::$19) goto main::@6 -- vbuc1_neq_vbuaa_then_la1 
+    // [45] if(0!=main::$19) goto main::@6 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b6
     // [12] phi from main::@15 to main::@1 [phi:main::@15->main::@1]
@@ -7842,7 +7842,7 @@ main: {
     // main::@16
     // [49] main::$21 = keyboard_key_pressed::return#3
     // while(keyboard_key_pressed(KEY_SPACE))
-    // [50] if(0!=main::$21) goto main::@6 -- vbuc1_neq_vbuaa_then_la1 
+    // [50] if(0!=main::$21) goto main::@6 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b6
     // main::vicSelectGfxBank2
@@ -8734,7 +8734,7 @@ bobCharsetFindOrAddGlyph: {
     // bobCharsetFindOrAddGlyph::@5
   __b5:
     // if(found)
-    // [201] if(0==bobCharsetFindOrAddGlyph::found#2) goto bobCharsetFindOrAddGlyph::@6 -- vbuc1_eq_vbuaa_then_la1 
+    // [201] if(0==bobCharsetFindOrAddGlyph::found#2) goto bobCharsetFindOrAddGlyph::@6 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b6
     rts
@@ -8845,7 +8845,7 @@ shiftProtoBobRight: {
     lda #1
     and PROTO_BOB,x
     // (PROTO_BOB[j]&1)?0x80ub:0ub
-    // [221] if(0!=shiftProtoBobRight::$1) goto shiftProtoBobRight::@3 -- vbuc1_neq_vbuaa_then_la1 
+    // [221] if(0!=shiftProtoBobRight::$1) goto shiftProtoBobRight::@3 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b3
     // [223] phi from shiftProtoBobRight::@2 to shiftProtoBobRight::@4 [phi:shiftProtoBobRight::@2->shiftProtoBobRight::@4]
diff --git a/src/test/ref/complex/prebob/vogel-sprites.log b/src/test/ref/complex/prebob/vogel-sprites.log
index 6707988b2..32ea70407 100644
--- a/src/test/ref/complex/prebob/vogel-sprites.log
+++ b/src/test/ref/complex/prebob/vogel-sprites.log
@@ -3849,7 +3849,7 @@ loop: {
     // loop::@15
   __b15:
     // [88] loop::$18 = keyboard_key_pressed::return#3
-    // [89] if(0!=loop::$18) goto loop::@return -- vbuc1_neq_vbuaa_then_la1 
+    // [89] if(0!=loop::$18) goto loop::@return -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __breturn
     // [42] phi from loop::@15 to loop::@1 [phi:loop::@15->loop::@1]
@@ -3880,7 +3880,7 @@ exit: {
     // exit::@2
   __b2:
     // [95] exit::$0 = keyboard_key_pressed::return#2
-    // [96] if(0!=exit::$0) goto exit::@1 -- vbuc1_neq_vbuaa_then_la1 
+    // [96] if(0!=exit::$0) goto exit::@1 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b1_from___b2
     jmp __breturn
@@ -5641,7 +5641,7 @@ loop: {
     // loop::@15
     // [88] loop::$18 = keyboard_key_pressed::return#3
     // if(keyboard_key_pressed(KEY_SPACE))
-    // [89] if(0!=loop::$18) goto loop::@return -- vbuc1_neq_vbuaa_then_la1 
+    // [89] if(0!=loop::$18) goto loop::@return -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __breturn
     // [42] phi from loop::@15 to loop::@1 [phi:loop::@15->loop::@1]
@@ -5669,7 +5669,7 @@ exit: {
     // exit::@2
     // [95] exit::$0 = keyboard_key_pressed::return#2
     // while(keyboard_key_pressed(KEY_SPACE))
-    // [96] if(0!=exit::$0) goto exit::@1 -- vbuc1_neq_vbuaa_then_la1 
+    // [96] if(0!=exit::$0) goto exit::@1 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b1
     // exit::@return
diff --git a/src/test/ref/complex/splines/truetype-splines.log b/src/test/ref/complex/splines/truetype-splines.log
index 5684d659e..35c008c67 100644
--- a/src/test/ref/complex/splines/truetype-splines.log
+++ b/src/test/ref/complex/splines/truetype-splines.log
@@ -7652,7 +7652,7 @@ abs_u16: {
     lda.z w+1
     // [305] abs_u16::$1 = abs_u16::$0 & $80 -- vbuaa=vbuaa_band_vbuc1 
     and #$80
-    // [306] if(0!=abs_u16::$1) goto abs_u16::@1 -- vbuc1_neq_vbuaa_then_la1 
+    // [306] if(0!=abs_u16::$1) goto abs_u16::@1 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b1
     // [308] phi from abs_u16 abs_u16::@1 to abs_u16::@return [phi:abs_u16/abs_u16::@1->abs_u16::@return]
@@ -7687,7 +7687,7 @@ sgn_u16: {
     lda.z w+1
     // [312] sgn_u16::$1 = sgn_u16::$0 & $80 -- vbuaa=vbuaa_band_vbuc1 
     and #$80
-    // [313] if(0!=sgn_u16::$1) goto sgn_u16::@1 -- vbuc1_neq_vbuaa_then_la1 
+    // [313] if(0!=sgn_u16::$1) goto sgn_u16::@1 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b1_from_sgn_u16
     // [315] phi from sgn_u16 to sgn_u16::@return [phi:sgn_u16->sgn_u16::@return]
@@ -10594,7 +10594,7 @@ abs_u16: {
     // [305] abs_u16::$1 = abs_u16::$0 & $80 -- vbuaa=vbuaa_band_vbuc1 
     and #$80
     // if(>w&0x80)
-    // [306] if(0!=abs_u16::$1) goto abs_u16::@1 -- vbuc1_neq_vbuaa_then_la1 
+    // [306] if(0!=abs_u16::$1) goto abs_u16::@1 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b1
     // [308] phi from abs_u16 abs_u16::@1 to abs_u16::@return [phi:abs_u16/abs_u16::@1->abs_u16::@return]
@@ -10630,7 +10630,7 @@ sgn_u16: {
     // [312] sgn_u16::$1 = sgn_u16::$0 & $80 -- vbuaa=vbuaa_band_vbuc1 
     and #$80
     // if(>w&0x80)
-    // [313] if(0!=sgn_u16::$1) goto sgn_u16::@1 -- vbuc1_neq_vbuaa_then_la1 
+    // [313] if(0!=sgn_u16::$1) goto sgn_u16::@1 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b1
     // [315] phi from sgn_u16 to sgn_u16::@return [phi:sgn_u16->sgn_u16::@return]
diff --git a/src/test/ref/complex/spritescroller/spritescroller.log b/src/test/ref/complex/spritescroller/spritescroller.log
index 610724272..eef2e852e 100644
--- a/src/test/ref/complex/spritescroller/spritescroller.log
+++ b/src/test/ref/complex/spritescroller/spritescroller.log
@@ -4379,7 +4379,7 @@ font_2x2: {
     // [98] font_2x2::$1 = font_2x2::glyph_bits#2 & $80 -- vbuaa=vbuz1_band_vbuc1 
     lda #$80
     and.z glyph_bits
-    // [99] if(0!=font_2x2::$1) goto font_2x2::@4 -- vbuc1_neq_vbuaa_then_la1 
+    // [99] if(0!=font_2x2::$1) goto font_2x2::@4 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b4_from___b3
     // [101] phi from font_2x2::@3 to font_2x2::@5 [phi:font_2x2::@3->font_2x2::@5]
@@ -6164,7 +6164,7 @@ font_2x2: {
     lda #$80
     and.z glyph_bits
     // (glyph_bits&0x80)?1uc:0uc
-    // [99] if(0!=font_2x2::$1) goto font_2x2::@4 -- vbuc1_neq_vbuaa_then_la1 
+    // [99] if(0!=font_2x2::$1) goto font_2x2::@4 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b4
     // [101] phi from font_2x2::@3 to font_2x2::@5 [phi:font_2x2::@3->font_2x2::@5]
diff --git a/src/test/ref/complex/xmega65/xmega65.log b/src/test/ref/complex/xmega65/xmega65.log
index 7a432530f..9b64fd1fc 100644
--- a/src/test/ref/complex/xmega65/xmega65.log
+++ b/src/test/ref/complex/xmega65/xmega65.log
@@ -608,7 +608,7 @@ main: {
     jmp __b1
     // main::@1
   __b1:
-    // [9] if(0!=*main::msg#2) goto main::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [9] if(0!=*main::msg#2) goto main::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (msg),y
     cmp #0
@@ -901,7 +901,7 @@ main: {
     // main::@1
   __b1:
     // while(*msg)
-    // [9] if(0!=*main::msg#2) goto main::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [9] if(0!=*main::msg#2) goto main::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (msg),y
     cmp #0
diff --git a/src/test/ref/complex/xy-scroller/xy-scroller.asm b/src/test/ref/complex/xy-scroller/xy-scroller.asm
index 99e643384..4d6174e01 100644
--- a/src/test/ref/complex/xy-scroller/xy-scroller.asm
+++ b/src/test/ref/complex/xy-scroller/xy-scroller.asm
@@ -142,8 +142,8 @@ main: {
     jmp __b19
   !__b19:
     // screen_buffer?MAIN_SCREEN1:MAIN_SCREEN0
-    lda #0
-    cmp.z screen_buffer
+    lda.z screen_buffer
+    cmp #0
     bne __b3
     lda #<MAIN_SCREEN0
     sta.z __13
@@ -171,8 +171,8 @@ main: {
     adc.z screen_active+1
     sta.z screen_active+1
     // screen_buffer?MAIN_SCREEN0:MAIN_SCREEN1
-    lda #0
-    cmp.z screen_buffer
+    lda.z screen_buffer
+    cmp #0
     bne __b5
     lda #<MAIN_SCREEN1
     sta.z screen_hidden
@@ -189,8 +189,8 @@ main: {
     // screencpy(screen_hidden, screen_active)
     jsr screencpy
     // if(y_movement)
-    lda #0
-    cmp.z y_movement
+    lda.z y_movement
+    cmp #0
     beq __b7
     // if(y_movement==-1)
     lda #-1
@@ -230,8 +230,8 @@ main: {
   !__b11:
   __b7:
     // if(x_movement)
-    lda #0
-    cmp.z x_movement
+    lda.z x_movement
+    cmp #0
     beq __b12
     // if(x_movement==-1)
     lda #-1
@@ -311,8 +311,8 @@ main: {
     sta VICII+OFFSET_STRUCT_MOS6569_VICII_CONTROL2
     // if(screen_buffer)
     // Display current screen
-    lda #0
-    cmp.z screen_buffer
+    lda.z screen_buffer
+    cmp #0
     bne __b30
     // VICII->MEMORY = toD018(MAIN_SCREEN0, MAIN_CHARSET)
     lda #toD0183_return
diff --git a/src/test/ref/complex/xy-scroller/xy-scroller.log b/src/test/ref/complex/xy-scroller/xy-scroller.log
index 3c0f883cb..8a48753f0 100644
--- a/src/test/ref/complex/xy-scroller/xy-scroller.log
+++ b/src/test/ref/complex/xy-scroller/xy-scroller.log
@@ -4275,15 +4275,15 @@ main: {
     sec
     sbc.z x_movement
     tax
-    // [20] if(0==main::movement#3) goto main::@21 -- vbsc1_eq_vbsxx_then_la1 
+    // [20] if(0==main::movement#3) goto main::@21 -- 0_eq_vbsxx_then_la1 
     cpx #0
     beq __b21_from___b2
     jmp __b27
     // main::@27
   __b27:
-    // [21] if(0!=screen_buffer#12) goto main::@3 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z screen_buffer
+    // [21] if(0!=screen_buffer#12) goto main::@3 -- 0_neq_vbuz1_then_la1 
+    lda.z screen_buffer
+    cmp #0
     bne __b3_from___b27
     // [23] phi from main::@27 to main::@4 [phi:main::@27->main::@4]
   __b4_from___b27:
@@ -4321,9 +4321,9 @@ main: {
   !:
     adc.z screen_active+1
     sta.z screen_active+1
-    // [25] if(0!=screen_buffer#12) goto main::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z screen_buffer
+    // [25] if(0!=screen_buffer#12) goto main::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z screen_buffer
+    cmp #0
     bne __b5_from___b4
     // [27] phi from main::@4 to main::@6 [phi:main::@4->main::@6]
   __b6_from___b4:
@@ -4355,9 +4355,9 @@ main: {
     jmp __b33
     // main::@33
   __b33:
-    // [31] if(0==main::y_movement#0) goto main::@7 -- vbsc1_eq_vbsz1_then_la1 
-    lda #0
-    cmp.z y_movement
+    // [31] if(0==main::y_movement#0) goto main::@7 -- 0_eq_vbsz1_then_la1 
+    lda.z y_movement
+    cmp #0
     beq __b7
     jmp __b17
     // main::@17
@@ -4422,9 +4422,9 @@ main: {
     jmp __b7
     // main::@7
   __b7:
-    // [42] if(0==main::x_movement#0) goto main::@12 -- vbsc1_eq_vbsz1_then_la1 
-    lda #0
-    cmp.z x_movement
+    // [42] if(0==main::x_movement#0) goto main::@12 -- 0_eq_vbsz1_then_la1 
+    lda.z x_movement
+    cmp #0
     beq __b12
     jmp __b19
     // main::@19
@@ -4543,10 +4543,10 @@ main: {
     // [64] *((byte*)VICII+OFFSET_STRUCT_MOS6569_VICII_CONTROL2) = main::$46 -- _deref_pbuc1=vbuaa 
     // X-scroll fine
     sta VICII+OFFSET_STRUCT_MOS6569_VICII_CONTROL2
-    // [65] if(0!=screen_buffer#26) goto main::toD0182 -- vbuc1_neq_vbuz1_then_la1 
+    // [65] if(0!=screen_buffer#26) goto main::toD0182 -- 0_neq_vbuz1_then_la1 
     // Display current screen
-    lda #0
-    cmp.z screen_buffer
+    lda.z screen_buffer
+    cmp #0
     bne toD0182_from___b23
     // [66] phi from main::@23 to main::toD0183 [phi:main::@23->main::toD0183]
   toD0183_from___b23:
@@ -5645,16 +5645,16 @@ main: {
     sbc.z x_movement
     tax
     // if(movement)
-    // [20] if(0==main::movement#3) goto main::@21 -- vbsc1_eq_vbsxx_then_la1 
+    // [20] if(0==main::movement#3) goto main::@21 -- 0_eq_vbsxx_then_la1 
     cpx #0
     bne !__b19+
     jmp __b19
   !__b19:
     // main::@27
     // screen_buffer?MAIN_SCREEN1:MAIN_SCREEN0
-    // [21] if(0!=screen_buffer#12) goto main::@3 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z screen_buffer
+    // [21] if(0!=screen_buffer#12) goto main::@3 -- 0_neq_vbuz1_then_la1 
+    lda.z screen_buffer
+    cmp #0
     bne __b3
     // [23] phi from main::@27 to main::@4 [phi:main::@27->main::@4]
     // [23] phi main::$13 = MAIN_SCREEN0 [phi:main::@27->main::@4#0] -- pbuz1=pbuc1 
@@ -5690,9 +5690,9 @@ main: {
     adc.z screen_active+1
     sta.z screen_active+1
     // screen_buffer?MAIN_SCREEN0:MAIN_SCREEN1
-    // [25] if(0!=screen_buffer#12) goto main::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z screen_buffer
+    // [25] if(0!=screen_buffer#12) goto main::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z screen_buffer
+    cmp #0
     bne __b5
     // [27] phi from main::@4 to main::@6 [phi:main::@4->main::@6]
     // [27] phi main::screen_hidden#0 = MAIN_SCREEN1 [phi:main::@4->main::@6#0] -- pbuz1=pbuc1 
@@ -5720,9 +5720,9 @@ main: {
     jsr screencpy
     // main::@33
     // if(y_movement)
-    // [31] if(0==main::y_movement#0) goto main::@7 -- vbsc1_eq_vbsz1_then_la1 
-    lda #0
-    cmp.z y_movement
+    // [31] if(0==main::y_movement#0) goto main::@7 -- 0_eq_vbsz1_then_la1 
+    lda.z y_movement
+    cmp #0
     beq __b7
     // main::@17
     // if(y_movement==-1)
@@ -5784,9 +5784,9 @@ main: {
     // main::@7
   __b7:
     // if(x_movement)
-    // [42] if(0==main::x_movement#0) goto main::@12 -- vbsc1_eq_vbsz1_then_la1 
-    lda #0
-    cmp.z x_movement
+    // [42] if(0==main::x_movement#0) goto main::@12 -- 0_eq_vbsz1_then_la1 
+    lda.z x_movement
+    cmp #0
     beq __b12
     // main::@19
     // if(x_movement==-1)
@@ -5905,10 +5905,10 @@ main: {
     // X-scroll fine
     sta VICII+OFFSET_STRUCT_MOS6569_VICII_CONTROL2
     // if(screen_buffer)
-    // [65] if(0!=screen_buffer#26) goto main::toD0182 -- vbuc1_neq_vbuz1_then_la1 
+    // [65] if(0!=screen_buffer#26) goto main::toD0182 -- 0_neq_vbuz1_then_la1 
     // Display current screen
-    lda #0
-    cmp.z screen_buffer
+    lda.z screen_buffer
+    cmp #0
     bne __b30
     // [66] phi from main::@23 to main::toD0183 [phi:main::@23->main::toD0183]
     // main::toD0183
diff --git a/src/test/ref/condition-integer-0.asm b/src/test/ref/condition-integer-0.asm
index f3d60d1d7..e085878a6 100644
--- a/src/test/ref/condition-integer-0.asm
+++ b/src/test/ref/condition-integer-0.asm
@@ -40,13 +40,9 @@ main: {
   // loop word
   __b7:
     // if(i)
-    lda #0
-    cmp.z i1
-    bne !+
-    lda.z i1+1
-    bne !+
-    jmp __b8
-  !:
+    lda.z i1
+    ora.z i1+1
+    beq __b8
     // SCREEN[idx++] = '+'
     lda #'+'
     sta SCREEN,y
diff --git a/src/test/ref/condition-integer-0.log b/src/test/ref/condition-integer-0.log
index d9066f0db..0a6865c71 100644
--- a/src/test/ref/condition-integer-0.log
+++ b/src/test/ref/condition-integer-0.log
@@ -370,8 +370,8 @@ REGISTER UPLIFT SCOPES
 Uplift Scope [main] 52.33: zp[1]:6 [ main::idx#12 main::idx#17 main::idx#5 main::idx#6 ] 45.92: zp[1]:3 [ main::idx#10 main::idx#11 main::idx#4 ] 23.1: zp[1]:2 [ main::i#2 main::i#1 ] 23.1: zp[2]:4 [ main::i1#2 main::i1#1 ] 
 Uplift Scope [] 
 
-Uplifting [main] best 1225 combination reg byte y [ main::idx#12 main::idx#17 main::idx#5 main::idx#6 ] reg byte y [ main::idx#10 main::idx#11 main::idx#4 ] reg byte x [ main::i#2 main::i#1 ] zp[2]:4 [ main::i1#2 main::i1#1 ] 
-Uplifting [] best 1225 combination 
+Uplifting [main] best 1150 combination reg byte y [ main::idx#12 main::idx#17 main::idx#5 main::idx#6 ] reg byte y [ main::idx#10 main::idx#11 main::idx#4 ] reg byte x [ main::i#2 main::i#1 ] zp[2]:4 [ main::i1#2 main::i1#1 ] 
+Uplifting [] best 1150 combination 
 Allocated (was zp[2]:4) zp[2]:2 [ main::i1#2 main::i1#1 ]
 
 ASSEMBLER BEFORE OPTIMIZATION
@@ -414,7 +414,7 @@ main: {
     jmp __b3
     // main::@3
   __b3:
-    // [4] if(0==main::i#2) goto main::@4 -- vbuc1_eq_vbuxx_then_la1 
+    // [4] if(0==main::i#2) goto main::@4 -- 0_eq_vbuxx_then_la1 
     cpx #0
     beq __b4_from___b3
     jmp __b5
@@ -462,14 +462,10 @@ main: {
     jmp __b7
     // main::@7
   __b7:
-    // [13] if(0==main::i1#2) goto main::@8 -- vbuc1_eq_vwuz1_then_la1 
-    lda #0
-    cmp.z i1
-    bne !+
-    lda.z i1+1
-    bne !+
-    jmp __b8_from___b7
-  !:
+    // [13] if(0==main::i1#2) goto main::@8 -- 0_eq_vwuz1_then_la1 
+    lda.z i1
+    ora.z i1+1
+    beq __b8_from___b7
     jmp __b9
     // main::@9
   __b9:
@@ -569,7 +565,7 @@ reg byte y [ main::idx#12 main::idx#17 main::idx#5 main::idx#6 ]
 
 
 FINAL ASSEMBLER
-Score: 872
+Score: 797
 
   // File Comments
 // Tests using integer conditions in if()
@@ -605,7 +601,7 @@ main: {
     // main::@3
   __b3:
     // if(i)
-    // [4] if(0==main::i#2) goto main::@4 -- vbuc1_eq_vbuxx_then_la1 
+    // [4] if(0==main::i#2) goto main::@4 -- 0_eq_vbuxx_then_la1 
     cpx #0
     beq __b4
     // main::@5
@@ -647,14 +643,10 @@ main: {
     // main::@7
   __b7:
     // if(i)
-    // [13] if(0==main::i1#2) goto main::@8 -- vbuc1_eq_vwuz1_then_la1 
-    lda #0
-    cmp.z i1
-    bne !+
-    lda.z i1+1
-    bne !+
-    jmp __b8
-  !:
+    // [13] if(0==main::i1#2) goto main::@8 -- 0_eq_vwuz1_then_la1 
+    lda.z i1
+    ora.z i1+1
+    beq __b8
     // main::@9
     // SCREEN[idx++] = '+'
     // [14] SCREEN[main::idx#12] = '+' -- pbuc1_derefidx_vbuyy=vbuc2 
diff --git a/src/test/ref/condition-integer-1.asm b/src/test/ref/condition-integer-1.asm
index ca10a0a92..369ab8b34 100644
--- a/src/test/ref/condition-integer-1.asm
+++ b/src/test/ref/condition-integer-1.asm
@@ -40,11 +40,8 @@ main: {
   // loop word
   __b7:
     // if(!i)
-    lda.z i1+1
-    cmp #>0
-    bne __b8
     lda.z i1
-    cmp #<0
+    ora.z i1+1
     bne __b8
     // SCREEN[idx++] = '0'
     lda #'0'
diff --git a/src/test/ref/condition-integer-1.log b/src/test/ref/condition-integer-1.log
index 430235208..3dfcb64ee 100644
--- a/src/test/ref/condition-integer-1.log
+++ b/src/test/ref/condition-integer-1.log
@@ -372,8 +372,8 @@ REGISTER UPLIFT SCOPES
 Uplift Scope [main] 52.33: zp[1]:6 [ main::idx#12 main::idx#17 main::idx#5 main::idx#6 ] 45.92: zp[1]:3 [ main::idx#10 main::idx#11 main::idx#4 ] 23.1: zp[1]:2 [ main::i#2 main::i#1 ] 23.1: zp[2]:4 [ main::i1#2 main::i1#1 ] 
 Uplift Scope [] 
 
-Uplifting [main] best 1215 combination reg byte y [ main::idx#12 main::idx#17 main::idx#5 main::idx#6 ] reg byte y [ main::idx#10 main::idx#11 main::idx#4 ] reg byte x [ main::i#2 main::i#1 ] zp[2]:4 [ main::i1#2 main::i1#1 ] 
-Uplifting [] best 1215 combination 
+Uplifting [main] best 1150 combination reg byte y [ main::idx#12 main::idx#17 main::idx#5 main::idx#6 ] reg byte y [ main::idx#10 main::idx#11 main::idx#4 ] reg byte x [ main::i#2 main::i#1 ] zp[2]:4 [ main::i1#2 main::i1#1 ] 
+Uplifting [] best 1150 combination 
 Allocated (was zp[2]:4) zp[2]:2 [ main::i1#2 main::i1#1 ]
 
 ASSEMBLER BEFORE OPTIMIZATION
@@ -416,7 +416,7 @@ main: {
     jmp __b3
     // main::@3
   __b3:
-    // [4] if(0!=main::i#2) goto main::@4 -- vbuc1_neq_vbuxx_then_la1 
+    // [4] if(0!=main::i#2) goto main::@4 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b4_from___b3
     jmp __b5
@@ -464,12 +464,9 @@ main: {
     jmp __b7
     // main::@7
   __b7:
-    // [13] if(0!=main::i1#2) goto main::@8 -- vwuc1_neq_vwuz1_then_la1 
-    lda.z i1+1
-    cmp #>0
-    bne __b8_from___b7
+    // [13] if(0!=main::i1#2) goto main::@8 -- 0_neq_vwuz1_then_la1 
     lda.z i1
-    cmp #<0
+    ora.z i1+1
     bne __b8_from___b7
     jmp __b9
     // main::@9
@@ -523,7 +520,6 @@ Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Replacing label __b4_from___b3 with __b4
 Replacing label __b3_from___b4 with __b3
 Replacing label __b8_from___b7 with __b8
-Replacing label __b8_from___b7 with __b8
 Replacing label __b7_from___b8 with __b7
 Replacing label __b7_from___b8 with __b7
 Removing instruction __b3_from___b4:
@@ -571,7 +567,7 @@ reg byte y [ main::idx#12 main::idx#17 main::idx#5 main::idx#6 ]
 
 
 FINAL ASSEMBLER
-Score: 862
+Score: 797
 
   // File Comments
 // Tests using integer conditions in if()
@@ -607,7 +603,7 @@ main: {
     // main::@3
   __b3:
     // if(!i)
-    // [4] if(0!=main::i#2) goto main::@4 -- vbuc1_neq_vbuxx_then_la1 
+    // [4] if(0!=main::i#2) goto main::@4 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b4
     // main::@5
@@ -649,12 +645,9 @@ main: {
     // main::@7
   __b7:
     // if(!i)
-    // [13] if(0!=main::i1#2) goto main::@8 -- vwuc1_neq_vwuz1_then_la1 
-    lda.z i1+1
-    cmp #>0
-    bne __b8
+    // [13] if(0!=main::i1#2) goto main::@8 -- 0_neq_vwuz1_then_la1 
     lda.z i1
-    cmp #<0
+    ora.z i1+1
     bne __b8
     // main::@9
     // SCREEN[idx++] = '0'
diff --git a/src/test/ref/condition-integer-2.asm b/src/test/ref/condition-integer-2.asm
index 433d63de7..0682d2499 100644
--- a/src/test/ref/condition-integer-2.asm
+++ b/src/test/ref/condition-integer-2.asm
@@ -25,8 +25,8 @@ main: {
     // while( j-- )
     ldy.z j
     dey
-    lda #0
-    cmp.z j
+    lda.z j
+    cmp #0
     bne __b5
     // SCREEN[idx++] = ' '
     lda #' '
diff --git a/src/test/ref/condition-integer-2.log b/src/test/ref/condition-integer-2.log
index 8841abb0b..5a4e4d965 100644
--- a/src/test/ref/condition-integer-2.log
+++ b/src/test/ref/condition-integer-2.log
@@ -350,7 +350,7 @@ main: {
   // for()
     // main::@1
   __b1:
-    // [2] if(0!=main::i#2) goto main::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [2] if(0!=main::i#2) goto main::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __b3
@@ -373,9 +373,9 @@ main: {
     // [6] main::j#1 = -- main::j#2 -- vbuyy=_dec_vbuz1 
     ldy.z j
     dey
-    // [7] if(0!=main::j#2) goto main::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z j
+    // [7] if(0!=main::j#2) goto main::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z j
+    cmp #0
     bne __b5
     jmp __b6
     // main::@6
@@ -404,7 +404,7 @@ main: {
     txa
     sec
     sbc #1
-    // [14] if(0!=main::k#2) goto main::@8 -- vbuc1_neq_vbuxx_then_la1 
+    // [14] if(0!=main::k#2) goto main::@8 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b8
     jmp __breturn
@@ -530,7 +530,7 @@ main: {
     // main::@1
   __b1:
     // for( byte i=2;i;i--)
-    // [2] if(0!=main::i#2) goto main::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [2] if(0!=main::i#2) goto main::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // main::@3
@@ -552,9 +552,9 @@ main: {
     // [6] main::j#1 = -- main::j#2 -- vbuyy=_dec_vbuz1 
     ldy.z j
     dey
-    // [7] if(0!=main::j#2) goto main::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z j
+    // [7] if(0!=main::j#2) goto main::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z j
+    cmp #0
     bne __b5
     // main::@6
     // SCREEN[idx++] = ' '
@@ -584,7 +584,7 @@ main: {
     txa
     sec
     sbc #1
-    // [14] if(0!=main::k#2) goto main::@8 -- vbuc1_neq_vbuxx_then_la1 
+    // [14] if(0!=main::k#2) goto main::@8 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b8
     // main::@return
diff --git a/src/test/ref/condition-integer-3.log b/src/test/ref/condition-integer-3.log
index 384e93de6..e3809aed9 100644
--- a/src/test/ref/condition-integer-3.log
+++ b/src/test/ref/condition-integer-3.log
@@ -217,7 +217,7 @@ main: {
     jmp __b1
     // main::@1
   __b1:
-    // [2] if(0!=main::i#2) goto main::@2 -- vbsc1_neq_vbsyy_then_la1 
+    // [2] if(0!=main::i#2) goto main::@2 -- 0_neq_vbsyy_then_la1 
     cpy #0
     bne __b2_from___b1
     // [4] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
@@ -315,7 +315,7 @@ main: {
     // main::@1
   __b1:
     // i?'+':'0'
-    // [2] if(0!=main::i#2) goto main::@2 -- vbsc1_neq_vbsyy_then_la1 
+    // [2] if(0!=main::i#2) goto main::@2 -- 0_neq_vbsyy_then_la1 
     cpy #0
     bne __b2
     // [4] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
diff --git a/src/test/ref/condition-integer-4.asm b/src/test/ref/condition-integer-4.asm
index 9d3d20bdd..3825543ee 100644
--- a/src/test/ref/condition-integer-4.asm
+++ b/src/test/ref/condition-integer-4.asm
@@ -14,8 +14,8 @@ main: {
     lda #1
     sax.z __4
     // if(i&1)
-    lda #0
-    cmp.z __4
+    lda.z __4
+    cmp #0
     beq __b2
     // (SCREEN+40*0)[idx] = '+'
     lda #'+'
@@ -25,28 +25,30 @@ main: {
     lda #2
     sax.z __5
     // if(i&2)
-    lda #0
-    cmp.z __5
+    lda.z __5
+    cmp #0
     beq __b3
     // (SCREEN+40*1)[idx] = '+'
     lda #'+'
     sta SCREEN+$28*1,y
   __b3:
     // if(i&1 && i&2)
-    lda #0
-    cmp.z __4
+    lda.z __4
+    cmp #0
     beq __b4
-    cmp.z __5
+    lda.z __5
+    cmp #0
     beq __b4
     // (SCREEN+40*2)[idx] = '+'
     lda #'+'
     sta SCREEN+$28*2,y
   __b4:
     // if(i&1 || i&2)
-    lda #0
-    cmp.z __4
+    lda.z __4
+    cmp #0
     bne __b9
-    cmp.z __5
+    lda.z __5
+    cmp #0
     beq __b5
   __b9:
     // (SCREEN+40*3)[idx] = '+'
diff --git a/src/test/ref/condition-integer-4.log b/src/test/ref/condition-integer-4.log
index 3f0c1878c..52814f4f5 100644
--- a/src/test/ref/condition-integer-4.log
+++ b/src/test/ref/condition-integer-4.log
@@ -414,9 +414,9 @@ main: {
     // [2] main::$4 = main::i#10 & 1 -- vbuz1=vbuxx_band_vbuc1 
     lda #1
     sax.z __4
-    // [3] if(0==main::$4) goto main::@2 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z __4
+    // [3] if(0==main::$4) goto main::@2 -- 0_eq_vbuz1_then_la1 
+    lda.z __4
+    cmp #0
     beq __b2
     jmp __b6
     // main::@6
@@ -430,9 +430,9 @@ main: {
     // [5] main::$5 = main::i#10 & 2 -- vbuz1=vbuxx_band_vbuc1 
     lda #2
     sax.z __5
-    // [6] if(0==main::$5) goto main::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z __5
+    // [6] if(0==main::$5) goto main::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z __5
+    cmp #0
     beq __b3
     jmp __b7
     // main::@7
@@ -443,16 +443,16 @@ main: {
     jmp __b3
     // main::@3
   __b3:
-    // [8] if(0==main::$4) goto main::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z __4
+    // [8] if(0==main::$4) goto main::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z __4
+    cmp #0
     beq __b4
     jmp __b10
     // main::@10
   __b10:
-    // [9] if(0==main::$5) goto main::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z __5
+    // [9] if(0==main::$5) goto main::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z __5
+    cmp #0
     beq __b4
     jmp __b8
     // main::@8
@@ -463,16 +463,16 @@ main: {
     jmp __b4
     // main::@4
   __b4:
-    // [11] if(0!=main::$4) goto main::@9 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z __4
+    // [11] if(0!=main::$4) goto main::@9 -- 0_neq_vbuz1_then_la1 
+    lda.z __4
+    cmp #0
     bne __b9
     jmp __b11
     // main::@11
   __b11:
-    // [12] if(0==main::$5) goto main::@5 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z __5
+    // [12] if(0==main::$5) goto main::@5 -- 0_eq_vbuz1_then_la1 
+    lda.z __5
+    cmp #0
     beq __b5
     jmp __b9
     // main::@9
@@ -525,9 +525,6 @@ Removing instruction __breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Removing instruction jmp __b1
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction lda #0
-Removing instruction lda #0
-Succesful ASM optimization Pass5UnnecesaryLoadElimination
 
 FINAL SYMBOL TABLE
 const nomodify byte* SCREEN = (byte*) 1024
@@ -548,7 +545,7 @@ zp[1]:3 [ main::$5 ]
 
 
 FINAL ASSEMBLER
-Score: 921
+Score: 961
 
   // File Comments
 // Tests using integer conditions in && and || operator
@@ -578,9 +575,9 @@ main: {
     lda #1
     sax.z __4
     // if(i&1)
-    // [3] if(0==main::$4) goto main::@2 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z __4
+    // [3] if(0==main::$4) goto main::@2 -- 0_eq_vbuz1_then_la1 
+    lda.z __4
+    cmp #0
     beq __b2
     // main::@6
     // (SCREEN+40*0)[idx] = '+'
@@ -594,9 +591,9 @@ main: {
     lda #2
     sax.z __5
     // if(i&2)
-    // [6] if(0==main::$5) goto main::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z __5
+    // [6] if(0==main::$5) goto main::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z __5
+    cmp #0
     beq __b3
     // main::@7
     // (SCREEN+40*1)[idx] = '+'
@@ -606,13 +603,14 @@ main: {
     // main::@3
   __b3:
     // if(i&1 && i&2)
-    // [8] if(0==main::$4) goto main::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z __4
+    // [8] if(0==main::$4) goto main::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z __4
+    cmp #0
     beq __b4
     // main::@10
-    // [9] if(0==main::$5) goto main::@4 -- vbuc1_eq_vbuz1_then_la1 
-    cmp.z __5
+    // [9] if(0==main::$5) goto main::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z __5
+    cmp #0
     beq __b4
     // main::@8
     // (SCREEN+40*2)[idx] = '+'
@@ -622,13 +620,14 @@ main: {
     // main::@4
   __b4:
     // if(i&1 || i&2)
-    // [11] if(0!=main::$4) goto main::@9 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z __4
+    // [11] if(0!=main::$4) goto main::@9 -- 0_neq_vbuz1_then_la1 
+    lda.z __4
+    cmp #0
     bne __b9
     // main::@11
-    // [12] if(0==main::$5) goto main::@5 -- vbuc1_eq_vbuz1_then_la1 
-    cmp.z __5
+    // [12] if(0==main::$5) goto main::@5 -- 0_eq_vbuz1_then_la1 
+    lda.z __5
+    cmp #0
     beq __b5
     // main::@9
   __b9:
diff --git a/src/test/ref/constants.log b/src/test/ref/constants.log
index 73e41ed73..4ff54056d 100644
--- a/src/test/ref/constants.log
+++ b/src/test/ref/constants.log
@@ -2115,7 +2115,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [63] if(0!=*print_str::str#10) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [63] if(0!=*print_str::str#10) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -2845,7 +2845,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [63] if(0!=*print_str::str#10) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [63] if(0!=*print_str::str#10) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/cordic-atan2-16-ref.log b/src/test/ref/cordic-atan2-16-ref.log
index 8d68c51f6..ebe03ac45 100644
--- a/src/test/ref/cordic-atan2-16-ref.log
+++ b/src/test/ref/cordic-atan2-16-ref.log
@@ -2825,7 +2825,7 @@ atan2_16: {
     jmp __b15
     // atan2_16::@15
   __b15:
-    // [77] if(0==atan2_16::shift#2) goto atan2_16::@17 -- vbuc1_eq_vbuyy_then_la1 
+    // [77] if(0==atan2_16::shift#2) goto atan2_16::@17 -- 0_eq_vbuyy_then_la1 
     cpy #0
     beq __b17_from___b15
     jmp __b16
@@ -3947,7 +3947,7 @@ atan2_16: {
     bcs __b14
     // atan2_16::@15
     // if(shift)
-    // [77] if(0==atan2_16::shift#2) goto atan2_16::@17 -- vbuc1_eq_vbuyy_then_la1 
+    // [77] if(0==atan2_16::shift#2) goto atan2_16::@17 -- 0_eq_vbuyy_then_la1 
     cpy #0
     beq __b17
     // atan2_16::@16
diff --git a/src/test/ref/cordic-atan2-16.log b/src/test/ref/cordic-atan2-16.log
index 4059660dd..adcb5ff59 100644
--- a/src/test/ref/cordic-atan2-16.log
+++ b/src/test/ref/cordic-atan2-16.log
@@ -2173,7 +2173,7 @@ atan2_16: {
     jmp __b15
     // atan2_16::@15
   __b15:
-    // [67] if(0==atan2_16::shift#2) goto atan2_16::@17 -- vbuc1_eq_vbuyy_then_la1 
+    // [67] if(0==atan2_16::shift#2) goto atan2_16::@17 -- 0_eq_vbuyy_then_la1 
     cpy #0
     beq __b17_from___b15
     jmp __b16
@@ -3012,7 +3012,7 @@ atan2_16: {
     bcs __b14
     // atan2_16::@15
     // if(shift)
-    // [67] if(0==atan2_16::shift#2) goto atan2_16::@17 -- vbuc1_eq_vbuyy_then_la1 
+    // [67] if(0==atan2_16::shift#2) goto atan2_16::@17 -- 0_eq_vbuyy_then_la1 
     cpy #0
     beq __b17
     // atan2_16::@16
diff --git a/src/test/ref/cordic-atan2-clear.log b/src/test/ref/cordic-atan2-clear.log
index 233c6d338..ec55907f8 100644
--- a/src/test/ref/cordic-atan2-clear.log
+++ b/src/test/ref/cordic-atan2-clear.log
@@ -2586,7 +2586,7 @@ atan2_16: {
     jmp __b15
     // atan2_16::@15
   __b15:
-    // [85] if(0==atan2_16::shift#2) goto atan2_16::@17 -- vbuc1_eq_vbuyy_then_la1 
+    // [85] if(0==atan2_16::shift#2) goto atan2_16::@17 -- 0_eq_vbuyy_then_la1 
     cpy #0
     beq __b17_from___b15
     jmp __b16
@@ -3579,7 +3579,7 @@ atan2_16: {
     bcs __b14
     // atan2_16::@15
     // if(shift)
-    // [85] if(0==atan2_16::shift#2) goto atan2_16::@17 -- vbuc1_eq_vbuyy_then_la1 
+    // [85] if(0==atan2_16::shift#2) goto atan2_16::@17 -- 0_eq_vbuyy_then_la1 
     cpy #0
     beq __b17
     // atan2_16::@16
diff --git a/src/test/ref/cordic-atan2.asm b/src/test/ref/cordic-atan2.asm
index 239c45e0a..b0a091d9b 100644
--- a/src/test/ref/cordic-atan2.asm
+++ b/src/test/ref/cordic-atan2.asm
@@ -209,8 +209,7 @@ atan2_8: {
     sta.z i
   __b10:
     // if(yi==0)
-    txa
-    cmp #0
+    cpx #0
     bne __b11
   __b12:
     // angle = angle/2
diff --git a/src/test/ref/cordic-atan2.log b/src/test/ref/cordic-atan2.log
index 2739f8678..eaeb30f4a 100644
--- a/src/test/ref/cordic-atan2.log
+++ b/src/test/ref/cordic-atan2.log
@@ -1279,14 +1279,13 @@ Removing always clobbered register reg byte a as potential for zp[1]:22 [ atan2_
 Statement [44] if(atan2_8::x#0>0) goto atan2_8::@4 [ atan2_8::x#0 atan2_8::y#0 atan2_8::yi#0 ] ( atan2_8:8 [ main::y#4 main::x#2 main::screen#2 atan2_8::x#0 atan2_8::y#0 atan2_8::yi#0 ] { { atan2_8::x#0 = main::x#2 } { atan2_8::y#0 = main::y#4 } { atan2_8::return#0 = atan2_8::return#2 } }  ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp[1]:16 [ atan2_8::yi#3 atan2_8::yi#7 atan2_8::yi#0 atan2_8::yi#11 atan2_8::$2 atan2_8::yi#1 atan2_8::yi#2 ]
 Statement [45] atan2_8::$7 = - atan2_8::x#0 [ atan2_8::x#0 atan2_8::y#0 atan2_8::yi#0 atan2_8::$7 ] ( atan2_8:8 [ main::y#4 main::x#2 main::screen#2 atan2_8::x#0 atan2_8::y#0 atan2_8::yi#0 atan2_8::$7 ] { { atan2_8::x#0 = main::x#2 } { atan2_8::y#0 = main::y#4 } { atan2_8::return#0 = atan2_8::return#2 } }  ) always clobbers reg byte a 
-Statement [48] if(atan2_8::yi#3!=0) goto atan2_8::@11 [ atan2_8::x#0 atan2_8::y#0 atan2_8::yi#3 atan2_8::xi#3 atan2_8::i#2 atan2_8::angle#12 ] ( atan2_8:8 [ main::y#4 main::x#2 main::screen#2 atan2_8::x#0 atan2_8::y#0 atan2_8::yi#3 atan2_8::xi#3 atan2_8::i#2 atan2_8::angle#12 ] { { atan2_8::x#0 = main::x#2 } { atan2_8::y#0 = main::y#4 } { atan2_8::return#0 = atan2_8::return#2 } }  ) always clobbers reg byte a 
-Removing always clobbered register reg byte a as potential for zp[1]:17 [ atan2_8::xi#3 atan2_8::xi#7 atan2_8::xi#0 atan2_8::xi#8 atan2_8::$7 atan2_8::xi#1 atan2_8::xi#2 ]
-Removing always clobbered register reg byte a as potential for zp[1]:18 [ atan2_8::i#2 atan2_8::i#1 ]
-Removing always clobbered register reg byte a as potential for zp[1]:19 [ atan2_8::angle#6 atan2_8::angle#12 atan2_8::angle#13 atan2_8::angle#2 atan2_8::angle#3 ]
 Statement [50] atan2_8::angle#1 = atan2_8::angle#6 >> 1 [ atan2_8::x#0 atan2_8::y#0 atan2_8::angle#1 ] ( atan2_8:8 [ main::y#4 main::x#2 main::screen#2 atan2_8::x#0 atan2_8::y#0 atan2_8::angle#1 ] { { atan2_8::x#0 = main::x#2 } { atan2_8::y#0 = main::y#4 } { atan2_8::return#0 = atan2_8::return#2 } }  ) always clobbers reg byte a 
 Statement [52] atan2_8::angle#4 = $80 - atan2_8::angle#1 [ atan2_8::y#0 atan2_8::angle#4 ] ( atan2_8:8 [ main::y#4 main::x#2 main::screen#2 atan2_8::y#0 atan2_8::angle#4 ] { { atan2_8::x#0 = main::x#2 } { atan2_8::y#0 = main::y#4 } { atan2_8::return#0 = atan2_8::return#2 } }  ) always clobbers reg byte a 
 Statement [55] atan2_8::angle#5 = - atan2_8::angle#11 [ atan2_8::angle#5 ] ( atan2_8:8 [ main::y#4 main::x#2 main::screen#2 atan2_8::angle#5 ] { { atan2_8::x#0 = main::x#2 } { atan2_8::y#0 = main::y#4 } { atan2_8::return#0 = atan2_8::return#2 } }  ) always clobbers reg byte a 
 Statement [58] atan2_8::xd#0 = atan2_8::xi#3 >> atan2_8::i#2 [ atan2_8::x#0 atan2_8::y#0 atan2_8::yi#3 atan2_8::xi#3 atan2_8::i#2 atan2_8::angle#12 atan2_8::xd#0 ] ( atan2_8:8 [ main::y#4 main::x#2 main::screen#2 atan2_8::x#0 atan2_8::y#0 atan2_8::yi#3 atan2_8::xi#3 atan2_8::i#2 atan2_8::angle#12 atan2_8::xd#0 ] { { atan2_8::x#0 = main::x#2 } { atan2_8::y#0 = main::y#4 } { atan2_8::return#0 = atan2_8::return#2 } }  ) always clobbers reg byte a 
+Removing always clobbered register reg byte a as potential for zp[1]:17 [ atan2_8::xi#3 atan2_8::xi#7 atan2_8::xi#0 atan2_8::xi#8 atan2_8::$7 atan2_8::xi#1 atan2_8::xi#2 ]
+Removing always clobbered register reg byte a as potential for zp[1]:18 [ atan2_8::i#2 atan2_8::i#1 ]
+Removing always clobbered register reg byte a as potential for zp[1]:19 [ atan2_8::angle#6 atan2_8::angle#12 atan2_8::angle#13 atan2_8::angle#2 atan2_8::angle#3 ]
 Statement [59] atan2_8::yd#0 = atan2_8::yi#3 >> atan2_8::i#2 [ atan2_8::x#0 atan2_8::y#0 atan2_8::yi#3 atan2_8::xi#3 atan2_8::i#2 atan2_8::angle#12 atan2_8::xd#0 atan2_8::yd#0 ] ( atan2_8:8 [ main::y#4 main::x#2 main::screen#2 atan2_8::x#0 atan2_8::y#0 atan2_8::yi#3 atan2_8::xi#3 atan2_8::i#2 atan2_8::angle#12 atan2_8::xd#0 atan2_8::yd#0 ] { { atan2_8::x#0 = main::x#2 } { atan2_8::y#0 = main::y#4 } { atan2_8::return#0 = atan2_8::return#2 } }  ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp[1]:29 [ atan2_8::xd#0 ]
 Statement [60] if(atan2_8::yi#3>0) goto atan2_8::@13 [ atan2_8::x#0 atan2_8::y#0 atan2_8::yi#3 atan2_8::xi#3 atan2_8::i#2 atan2_8::angle#12 atan2_8::xd#0 atan2_8::yd#0 ] ( atan2_8:8 [ main::y#4 main::x#2 main::screen#2 atan2_8::x#0 atan2_8::y#0 atan2_8::yi#3 atan2_8::xi#3 atan2_8::i#2 atan2_8::angle#12 atan2_8::xd#0 atan2_8::yd#0 ] { { atan2_8::x#0 = main::x#2 } { atan2_8::y#0 = main::y#4 } { atan2_8::return#0 = atan2_8::return#2 } }  ) always clobbers reg byte a 
@@ -1311,7 +1310,6 @@ Statement [41] if(atan2_8::y#0>0) goto atan2_8::@1 [ atan2_8::x#0 atan2_8::y#0 ]
 Statement [42] atan2_8::$2 = - atan2_8::y#0 [ atan2_8::x#0 atan2_8::y#0 atan2_8::$2 ] ( atan2_8:8 [ main::y#4 main::x#2 main::screen#2 atan2_8::x#0 atan2_8::y#0 atan2_8::$2 ] { { atan2_8::x#0 = main::x#2 } { atan2_8::y#0 = main::y#4 } { atan2_8::return#0 = atan2_8::return#2 } }  ) always clobbers reg byte a 
 Statement [44] if(atan2_8::x#0>0) goto atan2_8::@4 [ atan2_8::x#0 atan2_8::y#0 atan2_8::yi#0 ] ( atan2_8:8 [ main::y#4 main::x#2 main::screen#2 atan2_8::x#0 atan2_8::y#0 atan2_8::yi#0 ] { { atan2_8::x#0 = main::x#2 } { atan2_8::y#0 = main::y#4 } { atan2_8::return#0 = atan2_8::return#2 } }  ) always clobbers reg byte a 
 Statement [45] atan2_8::$7 = - atan2_8::x#0 [ atan2_8::x#0 atan2_8::y#0 atan2_8::yi#0 atan2_8::$7 ] ( atan2_8:8 [ main::y#4 main::x#2 main::screen#2 atan2_8::x#0 atan2_8::y#0 atan2_8::yi#0 atan2_8::$7 ] { { atan2_8::x#0 = main::x#2 } { atan2_8::y#0 = main::y#4 } { atan2_8::return#0 = atan2_8::return#2 } }  ) always clobbers reg byte a 
-Statement [48] if(atan2_8::yi#3!=0) goto atan2_8::@11 [ atan2_8::x#0 atan2_8::y#0 atan2_8::yi#3 atan2_8::xi#3 atan2_8::i#2 atan2_8::angle#12 ] ( atan2_8:8 [ main::y#4 main::x#2 main::screen#2 atan2_8::x#0 atan2_8::y#0 atan2_8::yi#3 atan2_8::xi#3 atan2_8::i#2 atan2_8::angle#12 ] { { atan2_8::x#0 = main::x#2 } { atan2_8::y#0 = main::y#4 } { atan2_8::return#0 = atan2_8::return#2 } }  ) always clobbers reg byte a 
 Statement [50] atan2_8::angle#1 = atan2_8::angle#6 >> 1 [ atan2_8::x#0 atan2_8::y#0 atan2_8::angle#1 ] ( atan2_8:8 [ main::y#4 main::x#2 main::screen#2 atan2_8::x#0 atan2_8::y#0 atan2_8::angle#1 ] { { atan2_8::x#0 = main::x#2 } { atan2_8::y#0 = main::y#4 } { atan2_8::return#0 = atan2_8::return#2 } }  ) always clobbers reg byte a 
 Statement [52] atan2_8::angle#4 = $80 - atan2_8::angle#1 [ atan2_8::y#0 atan2_8::angle#4 ] ( atan2_8:8 [ main::y#4 main::x#2 main::screen#2 atan2_8::y#0 atan2_8::angle#4 ] { { atan2_8::x#0 = main::x#2 } { atan2_8::y#0 = main::y#4 } { atan2_8::return#0 = atan2_8::return#2 } }  ) always clobbers reg byte a 
 Statement [55] atan2_8::angle#5 = - atan2_8::angle#11 [ atan2_8::angle#5 ] ( atan2_8:8 [ main::y#4 main::x#2 main::screen#2 atan2_8::angle#5 ] { { atan2_8::x#0 = main::x#2 } { atan2_8::y#0 = main::y#4 } { atan2_8::return#0 = atan2_8::return#2 } }  ) always clobbers reg byte a 
@@ -1359,47 +1357,47 @@ Uplift Scope [MOS6569_VICII]
 Uplift Scope [MOS6581_SID] 
 Uplift Scope [] 
 
-Uplifting [atan2_8] best 278261 combination zp[1]:19 [ atan2_8::angle#6 atan2_8::angle#12 atan2_8::angle#13 atan2_8::angle#2 atan2_8::angle#3 ] reg byte x [ atan2_8::yi#3 atan2_8::yi#7 atan2_8::yi#0 atan2_8::yi#11 atan2_8::$2 atan2_8::yi#1 atan2_8::yi#2 ] zp[1]:17 [ atan2_8::xi#3 atan2_8::xi#7 atan2_8::xi#0 atan2_8::xi#8 atan2_8::$7 atan2_8::xi#1 atan2_8::xi#2 ] zp[1]:18 [ atan2_8::i#2 atan2_8::i#1 ] zp[1]:30 [ atan2_8::yd#0 ] zp[1]:29 [ atan2_8::xd#0 ] zp[1]:20 [ atan2_8::return#0 atan2_8::angle#11 atan2_8::angle#1 atan2_8::angle#4 atan2_8::angle#5 ] zp[1]:23 [ atan2_8::return#2 ] zp[1]:21 [ atan2_8::x#0 ] zp[1]:22 [ atan2_8::y#0 ] 
+Uplifting [atan2_8] best 276261 combination zp[1]:19 [ atan2_8::angle#6 atan2_8::angle#12 atan2_8::angle#13 atan2_8::angle#2 atan2_8::angle#3 ] reg byte x [ atan2_8::yi#3 atan2_8::yi#7 atan2_8::yi#0 atan2_8::yi#11 atan2_8::$2 atan2_8::yi#1 atan2_8::yi#2 ] zp[1]:17 [ atan2_8::xi#3 atan2_8::xi#7 atan2_8::xi#0 atan2_8::xi#8 atan2_8::$7 atan2_8::xi#1 atan2_8::xi#2 ] zp[1]:18 [ atan2_8::i#2 atan2_8::i#1 ] zp[1]:30 [ atan2_8::yd#0 ] zp[1]:29 [ atan2_8::xd#0 ] zp[1]:20 [ atan2_8::return#0 atan2_8::angle#11 atan2_8::angle#1 atan2_8::angle#4 atan2_8::angle#5 ] zp[1]:23 [ atan2_8::return#2 ] zp[1]:21 [ atan2_8::x#0 ] zp[1]:22 [ atan2_8::y#0 ] 
 Limited combination testing to 100 combinations of 104976 possible.
-Uplifting [init_font_hex] best 259261 combination reg byte x [ init_font_hex::i#2 init_font_hex::i#1 ] reg byte a [ init_font_hex::$1 ] reg byte a [ init_font_hex::$2 ] zp[1]:15 [ init_font_hex::idx#5 init_font_hex::idx#2 ] zp[1]:25 [ init_font_hex::$0 ] zp[1]:28 [ init_font_hex::idx#3 ] zp[1]:13 [ init_font_hex::c1#4 init_font_hex::c1#1 ] zp[2]:9 [ init_font_hex::charset#2 init_font_hex::charset#5 init_font_hex::charset#0 ] zp[2]:11 [ init_font_hex::proto_lo#4 init_font_hex::proto_lo#1 ] zp[2]:6 [ init_font_hex::proto_hi#6 init_font_hex::proto_hi#1 ] zp[1]:8 [ init_font_hex::c#6 init_font_hex::c#1 ] 
+Uplifting [init_font_hex] best 257261 combination reg byte x [ init_font_hex::i#2 init_font_hex::i#1 ] reg byte a [ init_font_hex::$1 ] reg byte a [ init_font_hex::$2 ] zp[1]:15 [ init_font_hex::idx#5 init_font_hex::idx#2 ] zp[1]:25 [ init_font_hex::$0 ] zp[1]:28 [ init_font_hex::idx#3 ] zp[1]:13 [ init_font_hex::c1#4 init_font_hex::c1#1 ] zp[2]:9 [ init_font_hex::charset#2 init_font_hex::charset#5 init_font_hex::charset#0 ] zp[2]:11 [ init_font_hex::proto_lo#4 init_font_hex::proto_lo#1 ] zp[2]:6 [ init_font_hex::proto_hi#6 init_font_hex::proto_hi#1 ] zp[1]:8 [ init_font_hex::c#6 init_font_hex::c#1 ] 
 Limited combination testing to 100 combinations of 6912 possible.
-Uplifting [main] best 258661 combination reg byte a [ main::angle#0 ] zp[1]:3 [ main::x#2 main::x#1 ] zp[2]:4 [ main::screen#2 main::screen#4 main::screen#1 ] zp[1]:2 [ main::y#4 main::y#1 ] 
-Uplifting [MOS6526_CIA] best 258661 combination 
-Uplifting [MOS6569_VICII] best 258661 combination 
-Uplifting [MOS6581_SID] best 258661 combination 
-Uplifting [] best 258661 combination 
+Uplifting [main] best 256661 combination reg byte a [ main::angle#0 ] zp[1]:3 [ main::x#2 main::x#1 ] zp[2]:4 [ main::screen#2 main::screen#4 main::screen#1 ] zp[1]:2 [ main::y#4 main::y#1 ] 
+Uplifting [MOS6526_CIA] best 256661 combination 
+Uplifting [MOS6569_VICII] best 256661 combination 
+Uplifting [MOS6581_SID] best 256661 combination 
+Uplifting [] best 256661 combination 
 Attempting to uplift remaining variables inzp[1]:19 [ atan2_8::angle#6 atan2_8::angle#12 atan2_8::angle#13 atan2_8::angle#2 atan2_8::angle#3 ]
-Uplifting [atan2_8] best 258661 combination zp[1]:19 [ atan2_8::angle#6 atan2_8::angle#12 atan2_8::angle#13 atan2_8::angle#2 atan2_8::angle#3 ] 
+Uplifting [atan2_8] best 256661 combination zp[1]:19 [ atan2_8::angle#6 atan2_8::angle#12 atan2_8::angle#13 atan2_8::angle#2 atan2_8::angle#3 ] 
 Attempting to uplift remaining variables inzp[1]:17 [ atan2_8::xi#3 atan2_8::xi#7 atan2_8::xi#0 atan2_8::xi#8 atan2_8::$7 atan2_8::xi#1 atan2_8::xi#2 ]
-Uplifting [atan2_8] best 258661 combination zp[1]:17 [ atan2_8::xi#3 atan2_8::xi#7 atan2_8::xi#0 atan2_8::xi#8 atan2_8::$7 atan2_8::xi#1 atan2_8::xi#2 ] 
+Uplifting [atan2_8] best 256661 combination zp[1]:17 [ atan2_8::xi#3 atan2_8::xi#7 atan2_8::xi#0 atan2_8::xi#8 atan2_8::$7 atan2_8::xi#1 atan2_8::xi#2 ] 
 Attempting to uplift remaining variables inzp[1]:18 [ atan2_8::i#2 atan2_8::i#1 ]
-Uplifting [atan2_8] best 258661 combination zp[1]:18 [ atan2_8::i#2 atan2_8::i#1 ] 
+Uplifting [atan2_8] best 256661 combination zp[1]:18 [ atan2_8::i#2 atan2_8::i#1 ] 
 Attempting to uplift remaining variables inzp[1]:30 [ atan2_8::yd#0 ]
-Uplifting [atan2_8] best 257661 combination reg byte y [ atan2_8::yd#0 ] 
+Uplifting [atan2_8] best 255661 combination reg byte y [ atan2_8::yd#0 ] 
 Attempting to uplift remaining variables inzp[1]:29 [ atan2_8::xd#0 ]
-Uplifting [atan2_8] best 257661 combination zp[1]:29 [ atan2_8::xd#0 ] 
+Uplifting [atan2_8] best 255661 combination zp[1]:29 [ atan2_8::xd#0 ] 
 Attempting to uplift remaining variables inzp[1]:15 [ init_font_hex::idx#5 init_font_hex::idx#2 ]
-Uplifting [init_font_hex] best 257661 combination zp[1]:15 [ init_font_hex::idx#5 init_font_hex::idx#2 ] 
+Uplifting [init_font_hex] best 255661 combination zp[1]:15 [ init_font_hex::idx#5 init_font_hex::idx#2 ] 
 Attempting to uplift remaining variables inzp[1]:25 [ init_font_hex::$0 ]
-Uplifting [init_font_hex] best 257661 combination zp[1]:25 [ init_font_hex::$0 ] 
+Uplifting [init_font_hex] best 255661 combination zp[1]:25 [ init_font_hex::$0 ] 
 Attempting to uplift remaining variables inzp[1]:20 [ atan2_8::return#0 atan2_8::angle#11 atan2_8::angle#1 atan2_8::angle#4 atan2_8::angle#5 ]
-Uplifting [atan2_8] best 257354 combination reg byte x [ atan2_8::return#0 atan2_8::angle#11 atan2_8::angle#1 atan2_8::angle#4 atan2_8::angle#5 ] 
+Uplifting [atan2_8] best 255354 combination reg byte x [ atan2_8::return#0 atan2_8::angle#11 atan2_8::angle#1 atan2_8::angle#4 atan2_8::angle#5 ] 
 Attempting to uplift remaining variables inzp[1]:28 [ init_font_hex::idx#3 ]
-Uplifting [init_font_hex] best 256754 combination reg byte y [ init_font_hex::idx#3 ] 
+Uplifting [init_font_hex] best 254754 combination reg byte y [ init_font_hex::idx#3 ] 
 Attempting to uplift remaining variables inzp[1]:13 [ init_font_hex::c1#4 init_font_hex::c1#1 ]
-Uplifting [init_font_hex] best 256754 combination zp[1]:13 [ init_font_hex::c1#4 init_font_hex::c1#1 ] 
+Uplifting [init_font_hex] best 254754 combination zp[1]:13 [ init_font_hex::c1#4 init_font_hex::c1#1 ] 
 Attempting to uplift remaining variables inzp[1]:23 [ atan2_8::return#2 ]
-Uplifting [atan2_8] best 256354 combination reg byte a [ atan2_8::return#2 ] 
+Uplifting [atan2_8] best 254354 combination reg byte a [ atan2_8::return#2 ] 
 Attempting to uplift remaining variables inzp[1]:3 [ main::x#2 main::x#1 ]
-Uplifting [main] best 256354 combination zp[1]:3 [ main::x#2 main::x#1 ] 
+Uplifting [main] best 254354 combination zp[1]:3 [ main::x#2 main::x#1 ] 
 Attempting to uplift remaining variables inzp[1]:8 [ init_font_hex::c#6 init_font_hex::c#1 ]
-Uplifting [init_font_hex] best 256354 combination zp[1]:8 [ init_font_hex::c#6 init_font_hex::c#1 ] 
+Uplifting [init_font_hex] best 254354 combination zp[1]:8 [ init_font_hex::c#6 init_font_hex::c#1 ] 
 Attempting to uplift remaining variables inzp[1]:21 [ atan2_8::x#0 ]
-Uplifting [atan2_8] best 256354 combination zp[1]:21 [ atan2_8::x#0 ] 
+Uplifting [atan2_8] best 254354 combination zp[1]:21 [ atan2_8::x#0 ] 
 Attempting to uplift remaining variables inzp[1]:22 [ atan2_8::y#0 ]
-Uplifting [atan2_8] best 256354 combination zp[1]:22 [ atan2_8::y#0 ] 
+Uplifting [atan2_8] best 254354 combination zp[1]:22 [ atan2_8::y#0 ] 
 Attempting to uplift remaining variables inzp[1]:2 [ main::y#4 main::y#1 ]
-Uplifting [main] best 256354 combination zp[1]:2 [ main::y#4 main::y#1 ] 
+Uplifting [main] best 254354 combination zp[1]:2 [ main::y#4 main::y#1 ] 
 Coalescing zero page register [ zp[1]:2 [ main::y#4 main::y#1 ] ] with [ zp[1]:22 [ atan2_8::y#0 ] ] - score: 1
 Coalescing zero page register [ zp[1]:3 [ main::x#2 main::x#1 ] ] with [ zp[1]:21 [ atan2_8::x#0 ] ] - score: 1
 Coalescing zero page register [ zp[1]:17 [ atan2_8::xi#3 atan2_8::xi#7 atan2_8::xi#0 atan2_8::xi#8 atan2_8::$7 atan2_8::xi#1 atan2_8::xi#2 ] ] with [ zp[1]:8 [ init_font_hex::c#6 init_font_hex::c#1 ] ]
@@ -1752,8 +1750,7 @@ atan2_8: {
     // atan2_8::@10
   __b10:
     // [48] if(atan2_8::yi#3!=0) goto atan2_8::@11 -- vbsxx_neq_0_then_la1 
-    txa
-    cmp #0
+    cpx #0
     bne __b11
     // [49] phi from atan2_8::@10 atan2_8::@14 to atan2_8::@12 [phi:atan2_8::@10/atan2_8::@14->atan2_8::@12]
   __b12_from___b10:
@@ -2134,7 +2131,7 @@ reg byte y [ atan2_8::yd#0 ]
 
 
 FINAL ASSEMBLER
-Score: 232290
+Score: 230290
 
   // File Comments
 // Find atan2(x, y) using the CORDIC method
@@ -2454,8 +2451,7 @@ atan2_8: {
   __b10:
     // if(yi==0)
     // [48] if(atan2_8::yi#3!=0) goto atan2_8::@11 -- vbsxx_neq_0_then_la1 
-    txa
-    cmp #0
+    cpx #0
     bne __b11
     // [49] phi from atan2_8::@10 atan2_8::@14 to atan2_8::@12 [phi:atan2_8::@10/atan2_8::@14->atan2_8::@12]
     // [49] phi atan2_8::angle#6 = atan2_8::angle#12 [phi:atan2_8::@10/atan2_8::@14->atan2_8::@12#0] -- register_copy 
diff --git a/src/test/ref/cpu-65ce02-eightqueens.asm b/src/test/ref/cpu-65ce02-eightqueens.asm
index be4ecf068..d4103b774 100644
--- a/src/test/ref/cpu-65ce02-eightqueens.asm
+++ b/src/test/ref/cpu-65ce02-eightqueens.asm
@@ -517,8 +517,8 @@ printf_number_buffer: {
     // There is a minimum length - work out the padding
     ldx.z __19
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b13
     // len++;
     inx
@@ -537,12 +537,14 @@ printf_number_buffer: {
     sta.z padding
   __b1:
     // if(!format.justify_left && !format.zero_padding && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     bne __b2
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
   __b8:
@@ -554,18 +556,18 @@ printf_number_buffer: {
     jsr printf_padding
   __b2:
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // cputc(buffer.sign)
-    lda.z buffer_sign
     jsr cputc
   __b3:
     // if(format.zero_padding && padding)
-    lda #0
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
   __b10:
@@ -577,8 +579,8 @@ printf_number_buffer: {
     jsr printf_padding
   __b4:
     // if(format.upper_case)
-    lda #0
-    cmp.z format_upper_case
+    lda.z format_upper_case
+    cmp #0
     beq __b5
     // strupr(buffer.digits)
     jsr strupr
@@ -590,12 +592,14 @@ printf_number_buffer: {
     sta.z cputs.s+1
     jsr cputs
     // if(format.justify_left && !format.zero_padding && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b12
     rts
   __b12:
diff --git a/src/test/ref/cpu-65ce02-eightqueens.log b/src/test/ref/cpu-65ce02-eightqueens.log
index 269f124f4..d7d1b5543 100644
--- a/src/test/ref/cpu-65ce02-eightqueens.log
+++ b/src/test/ref/cpu-65ce02-eightqueens.log
@@ -7559,7 +7559,7 @@ cputs: {
     lda (s),y
     // [67] cputs::s#0 = ++ cputs::s#11 -- pbuz1=_inc_pbuz1 
     inw.z s
-    // [68] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [68] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -7689,7 +7689,7 @@ queens: {
     // queens::@9
   __b9:
     // [86] queens::$2 = legal::return#0
-    // [87] if(0==queens::$2) goto queens::@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [87] if(0==queens::$2) goto queens::@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b1_from___b9
     jmp __b6
@@ -7902,7 +7902,7 @@ utoa: {
     sta.z digit_value
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [124] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuzz_then_la1 
+    // [124] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuzz_then_la1 
     cpz #0
     bne __b5
     jmp __b7
@@ -7969,7 +7969,7 @@ printf_number_buffer: {
     .label format_zero_padding = $11
     .label format_justify_left = $c
     .label format_upper_case = $29
-    // [136] if(0==printf_number_buffer::format_min_length#3) goto printf_number_buffer::@1 -- vbuc1_eq_vbuzz_then_la1 
+    // [136] if(0==printf_number_buffer::format_min_length#3) goto printf_number_buffer::@1 -- 0_eq_vbuzz_then_la1 
     cpz #0
     beq __b1_from_printf_number_buffer
     // [137] phi from printf_number_buffer to printf_number_buffer::@6 [phi:printf_number_buffer->printf_number_buffer::@6]
@@ -7989,9 +7989,9 @@ printf_number_buffer: {
     // [141] printf_number_buffer::len#0 = (signed byte)printf_number_buffer::$19 -- vbsxx=_sbyte_vwuz1 
     // There is a minimum length - work out the padding
     ldx.z __19
-    // [142] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [142] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b13_from___b14
     jmp __b7
     // printf_number_buffer::@7
@@ -8033,23 +8033,23 @@ printf_number_buffer: {
     jmp __b1
     // printf_number_buffer::@1
   __b1:
-    // [149] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [149] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     jmp __b17
     // printf_number_buffer::@17
   __b17:
-    // [150] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [150] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     jmp __b16
     // printf_number_buffer::@16
   __b16:
-    // [151] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [151] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
     // printf_number_buffer::@8
@@ -8068,9 +8068,9 @@ printf_number_buffer: {
     jmp __b2
     // printf_number_buffer::@2
   __b2:
-    // [154] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [154] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     jmp __b9
     // printf_number_buffer::@9
@@ -8085,16 +8085,16 @@ printf_number_buffer: {
     jmp __b3
     // printf_number_buffer::@3
   __b3:
-    // [157] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [157] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
     jmp __b18
     // printf_number_buffer::@18
   __b18:
-    // [158] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [158] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
     // printf_number_buffer::@10
@@ -8113,9 +8113,9 @@ printf_number_buffer: {
     jmp __b4
     // printf_number_buffer::@4
   __b4:
-    // [161] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_upper_case
+    // [161] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- 0_eq_vbuz1_then_la1 
+    lda.z format_upper_case
+    cmp #0
     beq __b5_from___b4
     // [162] phi from printf_number_buffer::@4 to printf_number_buffer::@11 [phi:printf_number_buffer::@4->printf_number_buffer::@11]
   __b11_from___b4:
@@ -8144,23 +8144,23 @@ printf_number_buffer: {
     jmp __b15
     // printf_number_buffer::@15
   __b15:
-    // [166] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [166] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     jmp __b20
     // printf_number_buffer::@20
   __b20:
-    // [167] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [167] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
     jmp __b19
     // printf_number_buffer::@19
   __b19:
-    // [168] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [168] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b12
     jmp __breturn
     // printf_number_buffer::@12
@@ -8571,7 +8571,7 @@ ultoa: {
     sta.z digit_value+2
     lda RADIX_DECIMAL_VALUES_LONG+3,y
     sta.z digit_value+3
-    // [229] if(0!=ultoa::started#2) goto ultoa::@5 -- vbuc1_neq_vbuzz_then_la1 
+    // [229] if(0!=ultoa::started#2) goto ultoa::@5 -- 0_neq_vbuzz_then_la1 
     cpz #0
     bne __b5
     jmp __b7
@@ -8753,7 +8753,7 @@ strlen: {
     jmp __b1
     // strlen::@1
   __b1:
-    // [255] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [255] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -8830,7 +8830,7 @@ strupr: {
     jmp __b1
     // strupr::@1
   __b1:
-    // [268] if(0!=*strupr::src#2) goto strupr::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [268] if(0!=*strupr::src#2) goto strupr::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (src),y
     cmp #0
@@ -9181,7 +9181,7 @@ uctoa: {
     ldy.z digit
     lda RADIX_HEXADECIMAL_VALUES_CHAR,y
     sta.z digit_value
-    // [316] if(0!=uctoa::started#2) goto uctoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [316] if(0!=uctoa::started#2) goto uctoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -9829,11 +9829,7 @@ Removing instruction jmp __breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction ldy.z row
 Removing instruction lda.z digit_value+1
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
+Removing instruction lda.z buffer_sign
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction __breturn:
 Removing instruction __b2:
@@ -10273,7 +10269,7 @@ mem[12] [ printf_buffer ]
 
 
 FINAL ASSEMBLER
-Score: 1297293
+Score: 1297300
 
   // File Comments
 // N Queens Problem in C Using Backtracking
@@ -10670,7 +10666,7 @@ cputs: {
     lda (s),y
     // [67] cputs::s#0 = ++ cputs::s#11 -- pbuz1=_inc_pbuz1 
     inw.z s
-    // [68] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [68] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
@@ -10784,7 +10780,7 @@ queens: {
     // queens::@9
     // [86] queens::$2 = legal::return#0
     // if(legal(row, board[row]))
-    // [87] if(0==queens::$2) goto queens::@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [87] if(0==queens::$2) goto queens::@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2
     // queens::@6
@@ -10990,7 +10986,7 @@ utoa: {
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [124] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuzz_then_la1 
+    // [124] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuzz_then_la1 
     cpz #0
     bne __b5
     // utoa::@7
@@ -11053,7 +11049,7 @@ printf_number_buffer: {
     .label format_justify_left = $c
     .label format_upper_case = $29
     // if(format.min_length)
-    // [136] if(0==printf_number_buffer::format_min_length#3) goto printf_number_buffer::@1 -- vbuc1_eq_vbuzz_then_la1 
+    // [136] if(0==printf_number_buffer::format_min_length#3) goto printf_number_buffer::@1 -- 0_eq_vbuzz_then_la1 
     cpz #0
     beq __b6
     // [137] phi from printf_number_buffer to printf_number_buffer::@6 [phi:printf_number_buffer->printf_number_buffer::@6]
@@ -11071,9 +11067,9 @@ printf_number_buffer: {
     // There is a minimum length - work out the padding
     ldx.z __19
     // if(buffer.sign)
-    // [142] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [142] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b13
     // printf_number_buffer::@7
     // len++;
@@ -11106,17 +11102,19 @@ printf_number_buffer: {
     // printf_number_buffer::@1
   __b1:
     // if(!format.justify_left && !format.zero_padding && padding)
-    // [149] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [149] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     // printf_number_buffer::@17
-    // [150] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    cmp.z format_zero_padding
+    // [150] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     // printf_number_buffer::@16
-    // [151] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [151] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
     // printf_number_buffer::@8
@@ -11135,14 +11133,13 @@ printf_number_buffer: {
     // printf_number_buffer::@2
   __b2:
     // if(buffer.sign)
-    // [154] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [154] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // printf_number_buffer::@9
     // cputc(buffer.sign)
     // [155] cputc::c#2 = printf_number_buffer::buffer_sign#10 -- vbuaa=vbuz1 
-    lda.z buffer_sign
     // [156] call cputc 
     // [103] phi from printf_number_buffer::@9 to cputc [phi:printf_number_buffer::@9->cputc]
     // [103] phi cputc::c#3 = cputc::c#2 [phi:printf_number_buffer::@9->cputc#0] -- register_copy 
@@ -11150,13 +11147,14 @@ printf_number_buffer: {
     // printf_number_buffer::@3
   __b3:
     // if(format.zero_padding && padding)
-    // [157] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [157] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
     // printf_number_buffer::@18
-    // [158] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [158] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
     // printf_number_buffer::@10
@@ -11175,9 +11173,9 @@ printf_number_buffer: {
     // printf_number_buffer::@4
   __b4:
     // if(format.upper_case)
-    // [161] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_upper_case
+    // [161] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- 0_eq_vbuz1_then_la1 
+    lda.z format_upper_case
+    cmp #0
     beq __b5
     // [162] phi from printf_number_buffer::@4 to printf_number_buffer::@11 [phi:printf_number_buffer::@4->printf_number_buffer::@11]
     // printf_number_buffer::@11
@@ -11199,17 +11197,19 @@ printf_number_buffer: {
     jsr cputs
     // printf_number_buffer::@15
     // if(format.justify_left && !format.zero_padding && padding)
-    // [166] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [166] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     // printf_number_buffer::@20
-    // [167] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- vbuc1_neq_vbuz1_then_la1 
-    cmp.z format_zero_padding
+    // [167] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
     // printf_number_buffer::@19
-    // [168] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [168] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b12
     rts
     // printf_number_buffer::@12
@@ -11582,7 +11582,7 @@ ultoa: {
     lda RADIX_DECIMAL_VALUES_LONG+3,y
     sta.z digit_value+3
     // if (started || value >= digit_value)
-    // [229] if(0!=ultoa::started#2) goto ultoa::@5 -- vbuc1_neq_vbuzz_then_la1 
+    // [229] if(0!=ultoa::started#2) goto ultoa::@5 -- 0_neq_vbuzz_then_la1 
     cpz #0
     bne __b5
     // ultoa::@7
@@ -11760,7 +11760,7 @@ strlen: {
     // strlen::@1
   __b1:
     // while(*str)
-    // [255] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [255] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -11832,7 +11832,7 @@ strupr: {
     // strupr::@1
   __b1:
     // while(*src)
-    // [268] if(0!=*strupr::src#2) goto strupr::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [268] if(0!=*strupr::src#2) goto strupr::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (src),y
     cmp #0
@@ -12161,7 +12161,7 @@ uctoa: {
     lda RADIX_HEXADECIMAL_VALUES_CHAR,y
     sta.z digit_value
     // if (started || value >= digit_value)
-    // [316] if(0!=uctoa::started#2) goto uctoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [316] if(0!=uctoa::started#2) goto uctoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // uctoa::@7
diff --git a/src/test/ref/examples/3d/3d.log b/src/test/ref/examples/3d/3d.log
index ff96aa8ef..2f9afa227 100644
--- a/src/test/ref/examples/3d/3d.log
+++ b/src/test/ref/examples/3d/3d.log
@@ -5562,7 +5562,7 @@ print_str_at: {
     jmp __b1
     // print_str_at::@1
   __b1:
-    // [117] if(0!=*print_str_at::str#13) goto print_str_at::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [117] if(0!=*print_str_at::str#13) goto print_str_at::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -8070,7 +8070,7 @@ print_str_at: {
     // print_str_at::@1
   __b1:
     // while(*str)
-    // [117] if(0!=*print_str_at::str#13) goto print_str_at::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [117] if(0!=*print_str_at::str#13) goto print_str_at::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/examples/3d/perspective.log b/src/test/ref/examples/3d/perspective.log
index 6e2ee46ec..36f688245 100644
--- a/src/test/ref/examples/3d/perspective.log
+++ b/src/test/ref/examples/3d/perspective.log
@@ -2059,7 +2059,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [64] if(0!=*print_str::str#7) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [64] if(0!=*print_str::str#7) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -2945,7 +2945,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [64] if(0!=*print_str::str#7) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [64] if(0!=*print_str::str#7) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/examples/atari2600/atari2600-demo.asm b/src/test/ref/examples/atari2600/atari2600-demo.asm
index 8a1751fe6..beffc75a0 100644
--- a/src/test/ref/examples/atari2600/atari2600-demo.asm
+++ b/src/test/ref/examples/atari2600/atari2600-demo.asm
@@ -71,13 +71,14 @@ main: {
   // Wait for the timer to run out
   __b3:
     // while(RIOT->INTIM)
-    lda #0
-    cmp RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    lda RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    cmp #0
     bne __b4
     // TIA->VBLANK = 0
     // Screen - display logic
     // Update the registers in TIA (the video chip) in order to generate what the player sees.
     // For now we're just going to output 192 colored scanlines lines so we have something to see.
+    lda #0
     sta TIA+OFFSET_STRUCT_ATARI_TIA_WRITE_VBLANK
     // c = SINTABLE[idx++]
     // D1=1, turns off Vertical Blank signal (image output on)
@@ -108,8 +109,8 @@ main: {
   // Wait for the timer to run out
   __b9:
     // while(RIOT->INTIM)
-    lda #0
-    cmp RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    lda RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    cmp #0
     bne __b10
     jmp __b2
   __b10:
diff --git a/src/test/ref/examples/atari2600/atari2600-demo.log b/src/test/ref/examples/atari2600/atari2600-demo.log
index bfb56583d..d386c762b 100644
--- a/src/test/ref/examples/atari2600/atari2600-demo.log
+++ b/src/test/ref/examples/atari2600/atari2600-demo.log
@@ -552,9 +552,9 @@ main: {
   // Wait for the timer to run out
     // main::@3
   __b3:
-    // [11] if(0!=*((byte*)RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM)) goto main::@4 -- vbuc1_neq__deref_pbuc2_then_la1 
-    lda #0
-    cmp RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    // [11] if(0!=*((byte*)RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM)) goto main::@4 -- 0_neq__deref_pbuc1_then_la1 
+    lda RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    cmp #0
     bne __b4
     jmp __b5
     // main::@5
@@ -605,9 +605,9 @@ main: {
   // Wait for the timer to run out
     // main::@9
   __b9:
-    // [21] if(0!=*((byte*)RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM)) goto main::@10 -- vbuc1_neq__deref_pbuc2_then_la1 
-    lda #0
-    cmp RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    // [21] if(0!=*((byte*)RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM)) goto main::@10 -- 0_neq__deref_pbuc1_then_la1 
+    lda RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    cmp #0
     bne __b10
     // [4] phi from main::@9 to main::@1 [phi:main::@9->main::@1]
   __b1_from___b9:
@@ -682,9 +682,7 @@ Removing instruction __b8:
 Removing instruction __b1_from___b9:
 Removing instruction __b6_from___b7:
 Succesful ASM optimization Pass5UnusedLabelElimination
-Removing instruction lda #0
 Replacing instruction ldy #0 with TAY
-Succesful ASM optimization Pass5UnnecesaryLoadElimination
 
 FINAL SYMBOL TABLE
 const byte OFFSET_STRUCT_ATARI_TIA_WRITE_COLUBK = 9
@@ -719,7 +717,7 @@ reg byte x [ main::c#2 main::c#0 main::c#1 ]
 
 
 FINAL ASSEMBLER
-Score: 8259
+Score: 8279
 
   // File Comments
 // Minimal Atari 2600 VCS Program
@@ -813,9 +811,9 @@ main: {
     // main::@3
   __b3:
     // while(RIOT->INTIM)
-    // [11] if(0!=*((byte*)RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM)) goto main::@4 -- vbuc1_neq__deref_pbuc2_then_la1 
-    lda #0
-    cmp RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    // [11] if(0!=*((byte*)RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM)) goto main::@4 -- 0_neq__deref_pbuc1_then_la1 
+    lda RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    cmp #0
     bne __b4
     // main::@5
     // TIA->VBLANK = 0
@@ -823,6 +821,7 @@ main: {
     // Screen - display logic
     // Update the registers in TIA (the video chip) in order to generate what the player sees.
     // For now we're just going to output 192 colored scanlines lines so we have something to see.
+    lda #0
     sta TIA+OFFSET_STRUCT_ATARI_TIA_WRITE_VBLANK
     // c = SINTABLE[idx++]
     // [13] main::c#0 = SINTABLE[idx#1] -- vbuxx=pbuc1_derefidx_vbuz1 
@@ -866,9 +865,9 @@ main: {
     // main::@9
   __b9:
     // while(RIOT->INTIM)
-    // [21] if(0!=*((byte*)RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM)) goto main::@10 -- vbuc1_neq__deref_pbuc2_then_la1 
-    lda #0
-    cmp RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    // [21] if(0!=*((byte*)RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM)) goto main::@10 -- 0_neq__deref_pbuc1_then_la1 
+    lda RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    cmp #0
     bne __b10
     // [4] phi from main::@9 to main::@1 [phi:main::@9->main::@1]
     // [4] phi idx#1 = idx#0 [phi:main::@9->main::@1#0] -- register_copy 
diff --git a/src/test/ref/examples/atari2600/atari2600-sprites.asm b/src/test/ref/examples/atari2600/atari2600-sprites.asm
index 2581fb5a4..382e7cd96 100644
--- a/src/test/ref/examples/atari2600/atari2600-sprites.asm
+++ b/src/test/ref/examples/atari2600/atari2600-sprites.asm
@@ -128,13 +128,14 @@ main: {
   // Wait for the timer to run out
   __b3:
     // while(RIOT->INTIM)
-    lda #0
-    cmp RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    lda RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    cmp #0
     bne __b4
     // TIA->VBLANK = 0
     // Screen - display logic
     // Update the registers in TIA (the video chip) in order to generate what the player sees.
     // For now we're just going to output 192 colored scanlines lines so we have something to see.
+    lda #0
     sta TIA+OFFSET_STRUCT_ATARI_TIA_WRITE_VBLANK
     // TIA->COLUBK = 0x0
     // D1=1, turns off Vertical Blank signal (image output on)
@@ -164,8 +165,8 @@ main: {
   // Wait for the timer to run out
   __b13:
     // while(RIOT->INTIM)
-    lda #0
-    cmp RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    lda RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    cmp #0
     bne __b14
     jmp __b2
   __b14:
diff --git a/src/test/ref/examples/atari2600/atari2600-sprites.log b/src/test/ref/examples/atari2600/atari2600-sprites.log
index 7081a52cc..18cf305ab 100644
--- a/src/test/ref/examples/atari2600/atari2600-sprites.log
+++ b/src/test/ref/examples/atari2600/atari2600-sprites.log
@@ -971,9 +971,9 @@ main: {
   // Wait for the timer to run out
     // main::@3
   __b3:
-    // [23] if(0!=*((byte*)RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM)) goto main::@4 -- vbuc1_neq__deref_pbuc2_then_la1 
-    lda #0
-    cmp RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    // [23] if(0!=*((byte*)RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM)) goto main::@4 -- 0_neq__deref_pbuc1_then_la1 
+    lda RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    cmp #0
     bne __b4
     jmp __b5
     // main::@5
@@ -1023,9 +1023,9 @@ main: {
   // Wait for the timer to run out
     // main::@13
   __b13:
-    // [32] if(0!=*((byte*)RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM)) goto main::@14 -- vbuc1_neq__deref_pbuc2_then_la1 
-    lda #0
-    cmp RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    // [32] if(0!=*((byte*)RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM)) goto main::@14 -- 0_neq__deref_pbuc1_then_la1 
+    lda RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    cmp #0
     bne __b14
     // [9] phi from main::@13 to main::@1 [phi:main::@13->main::@1]
   __b1_from___b13:
@@ -1046,7 +1046,7 @@ main: {
     sta TIA+OFFSET_STRUCT_ATARI_TIA_WRITE_WSYNC
     // [35] *((byte*)TIA+OFFSET_STRUCT_ATARI_TIA_WRITE_COLUBK) = main::i#2 -- _deref_pbuc1=vbuxx 
     stx TIA+OFFSET_STRUCT_ATARI_TIA_WRITE_COLUBK
-    // [36] if(0!=main::p0_idx#4) goto main::@9 -- vbuc1_neq_vbuyy_then_la1 
+    // [36] if(0!=main::p0_idx#4) goto main::@9 -- 0_neq_vbuyy_then_la1 
     cpy #0
     bne __b9
     jmp __b11
@@ -1165,9 +1165,7 @@ Skipping double jump to __b10 in jmp __b15
 Succesful ASM optimization Pass5DoubleJumpElimination
 Relabelling long label __b10_from___b9 to __b1
 Succesful ASM optimization Pass5RelabelLongLabels
-Removing instruction lda #0
 Replacing instruction ldy #0 with TAY
-Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction __b15:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Removing unreachable instruction jmp __b10
@@ -1223,7 +1221,7 @@ reg byte a [ main::gfx#0 ]
 
 
 FINAL ASSEMBLER
-Score: 10872
+Score: 10892
 
   // File Comments
 // Minimal Atari 2600 VCS Program using Sprites
@@ -1390,9 +1388,9 @@ main: {
     // main::@3
   __b3:
     // while(RIOT->INTIM)
-    // [23] if(0!=*((byte*)RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM)) goto main::@4 -- vbuc1_neq__deref_pbuc2_then_la1 
-    lda #0
-    cmp RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    // [23] if(0!=*((byte*)RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM)) goto main::@4 -- 0_neq__deref_pbuc1_then_la1 
+    lda RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    cmp #0
     bne __b4
     // main::@5
     // TIA->VBLANK = 0
@@ -1400,6 +1398,7 @@ main: {
     // Screen - display logic
     // Update the registers in TIA (the video chip) in order to generate what the player sees.
     // For now we're just going to output 192 colored scanlines lines so we have something to see.
+    lda #0
     sta TIA+OFFSET_STRUCT_ATARI_TIA_WRITE_VBLANK
     // TIA->COLUBK = 0x0
     // [25] *((byte*)TIA+OFFSET_STRUCT_ATARI_TIA_WRITE_COLUBK) = 0 -- _deref_pbuc1=vbuc2 
@@ -1441,9 +1440,9 @@ main: {
     // main::@13
   __b13:
     // while(RIOT->INTIM)
-    // [32] if(0!=*((byte*)RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM)) goto main::@14 -- vbuc1_neq__deref_pbuc2_then_la1 
-    lda #0
-    cmp RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    // [32] if(0!=*((byte*)RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM)) goto main::@14 -- 0_neq__deref_pbuc1_then_la1 
+    lda RIOT+OFFSET_STRUCT_MOS6532_RIOT_INTIM
+    cmp #0
     bne __b14
     // [9] phi from main::@13 to main::@1 [phi:main::@13->main::@1]
     // [9] phi idx2#1 = idx2#0 [phi:main::@13->main::@1#0] -- register_copy 
@@ -1466,7 +1465,7 @@ main: {
     // [35] *((byte*)TIA+OFFSET_STRUCT_ATARI_TIA_WRITE_COLUBK) = main::i#2 -- _deref_pbuc1=vbuxx 
     stx TIA+OFFSET_STRUCT_ATARI_TIA_WRITE_COLUBK
     // if(p0_idx)
-    // [36] if(0!=main::p0_idx#4) goto main::@9 -- vbuc1_neq_vbuyy_then_la1 
+    // [36] if(0!=main::p0_idx#4) goto main::@9 -- 0_neq_vbuyy_then_la1 
     cpy #0
     bne __b9
     // main::@11
diff --git a/src/test/ref/examples/atarixl/conio-test.log b/src/test/ref/examples/atarixl/conio-test.log
index 7b7828be9..e2a54a23c 100644
--- a/src/test/ref/examples/atarixl/conio-test.log
+++ b/src/test/ref/examples/atarixl/conio-test.log
@@ -5403,7 +5403,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [83] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [83] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -5458,7 +5458,7 @@ waitkey: {
     // waitkey::@2
   __b2:
     // [95] waitkey::$1 = kbhit::return#3
-    // [96] if(0==waitkey::$1) goto waitkey::@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [96] if(0==waitkey::$1) goto waitkey::@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b1_from___b2
     jmp clrkb1
@@ -5907,7 +5907,7 @@ utoa: {
     sta.z digit_value
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [171] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [171] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -5975,7 +5975,7 @@ printf_number_buffer: {
     jmp __b1
     // printf_number_buffer::@1
   __b1:
-    // [183] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [183] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2_from___b1
     jmp __b3
@@ -7394,7 +7394,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [83] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [83] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
@@ -7442,7 +7442,7 @@ waitkey: {
     // waitkey::@2
     // [95] waitkey::$1 = kbhit::return#3
     // while(!kbhit())
-    // [96] if(0==waitkey::$1) goto waitkey::@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [96] if(0==waitkey::$1) goto waitkey::@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b1
     // waitkey::clrkb1
@@ -7880,7 +7880,7 @@ utoa: {
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [171] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [171] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // utoa::@7
@@ -7942,7 +7942,7 @@ printf_number_buffer: {
     .label buffer_digits = printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS
     // printf_number_buffer::@1
     // if(buffer.sign)
-    // [183] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [183] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2
     // printf_number_buffer::@3
diff --git a/src/test/ref/examples/chargen/chargen-analysis.log b/src/test/ref/examples/chargen/chargen-analysis.log
index 4aa110507..bf1afc7b9 100644
--- a/src/test/ref/examples/chargen/chargen-analysis.log
+++ b/src/test/ref/examples/chargen/chargen-analysis.log
@@ -2424,7 +2424,7 @@ print_str_at: {
     jmp __b1
     // print_str_at::@1
   __b1:
-    // [69] if(0!=*print_str_at::str#5) goto print_str_at::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [69] if(0!=*print_str_at::str#5) goto print_str_at::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -3519,7 +3519,7 @@ print_str_at: {
     // print_str_at::@1
   __b1:
     // while(*str)
-    // [69] if(0!=*print_str_at::str#5) goto print_str_at::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [69] if(0!=*print_str_at::str#5) goto print_str_at::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/examples/conio/nacht-screen.asm b/src/test/ref/examples/conio/nacht-screen.asm
index d7876194b..76449b077 100644
--- a/src/test/ref/examples/conio/nacht-screen.asm
+++ b/src/test/ref/examples/conio/nacht-screen.asm
@@ -715,11 +715,11 @@ cscroll: {
     cmp.z conio_cursor_y
     bne __breturn
     // if(conio_scroll_enable)
-    lda #0
-    cmp.z conio_scroll_enable
+    lda.z conio_scroll_enable
+    cmp #0
     bne __b3
     // gotoxy(0,0)
-    tax
+    ldx #0
     txa
     jsr gotoxy
   __breturn:
diff --git a/src/test/ref/examples/conio/nacht-screen.log b/src/test/ref/examples/conio/nacht-screen.log
index 1d424f962..46313c75d 100644
--- a/src/test/ref/examples/conio/nacht-screen.log
+++ b/src/test/ref/examples/conio/nacht-screen.log
@@ -3448,7 +3448,7 @@ main: {
     // main::@4
   __b4:
     // [27] main::$3 = kbhit::return#2
-    // [28] if(0==main::$3) goto main::@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [28] if(0==main::$3) goto main::@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b1_from___b4
     // [29] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
@@ -4265,7 +4265,7 @@ strlen: {
     jmp __b1
     // strlen::@1
   __b1:
-    // [166] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [166] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -4441,7 +4441,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [198] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [198] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -4469,9 +4469,9 @@ cscroll: {
     jmp __b1
     // cscroll::@1
   __b1:
-    // [203] if(0!=conio_scroll_enable) goto cscroll::@3 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z conio_scroll_enable
+    // [203] if(0!=conio_scroll_enable) goto cscroll::@3 -- 0_neq_vbuz1_then_la1 
+    lda.z conio_scroll_enable
+    cmp #0
     bne __b3_from___b1
     // [204] phi from cscroll::@1 to cscroll::@2 [phi:cscroll::@1->cscroll::@2]
   __b2_from___b1:
@@ -4962,7 +4962,6 @@ Removing instruction jmp __b1
 Removing instruction jmp __b1
 Removing instruction jmp __b2
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing instruction ldx #0 with TAX
 
 FINAL SYMBOL TABLE
 const nomodify byte CH_HLINE = $40
@@ -5374,7 +5373,7 @@ main: {
     // main::@4
     // [27] main::$3 = kbhit::return#2
     // while(!kbhit())
-    // [28] if(0==main::$3) goto main::@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [28] if(0==main::$3) goto main::@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b1
     // [29] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
@@ -6127,7 +6126,7 @@ strlen: {
     // strlen::@1
   __b1:
     // while(*str)
-    // [166] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [166] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -6297,7 +6296,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [198] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [198] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
@@ -6324,9 +6323,9 @@ cscroll: {
     bne __breturn
     // cscroll::@1
     // if(conio_scroll_enable)
-    // [203] if(0!=conio_scroll_enable) goto cscroll::@3 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z conio_scroll_enable
+    // [203] if(0!=conio_scroll_enable) goto cscroll::@3 -- 0_neq_vbuz1_then_la1 
+    lda.z conio_scroll_enable
+    cmp #0
     bne __b3
     // [204] phi from cscroll::@1 to cscroll::@2 [phi:cscroll::@1->cscroll::@2]
     // cscroll::@2
@@ -6334,7 +6333,7 @@ cscroll: {
     // [205] call gotoxy 
     // [32] phi from cscroll::@2 to gotoxy [phi:cscroll::@2->gotoxy]
     // [32] phi gotoxy::x#10 = 0 [phi:cscroll::@2->gotoxy#0] -- vbuxx=vbuc1 
-    tax
+    ldx #0
     // [32] phi gotoxy::y#7 = 0 [phi:cscroll::@2->gotoxy#1] -- vbuaa=vbuc1 
     txa
     jsr gotoxy
diff --git a/src/test/ref/examples/eightqueens/eightqueens-recursive.asm b/src/test/ref/examples/eightqueens/eightqueens-recursive.asm
index 89aa1abb2..d0f38de62 100644
--- a/src/test/ref/examples/eightqueens/eightqueens-recursive.asm
+++ b/src/test/ref/examples/eightqueens/eightqueens-recursive.asm
@@ -101,8 +101,8 @@ queen: {
     jsr legal
     // legal(r,column)
     // if(legal(r,column))
-    lda #0
-    cmp.z __1
+    lda.z __1
+    cmp #0
     beq __b3
     // board[r]=column
     //no conflicts so place queen
@@ -595,8 +595,8 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    lda #0
-    cmp.z c
+    lda.z c
+    cmp #0
     bne __b2
     // }
     rts
@@ -998,8 +998,8 @@ utoa: {
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    lda #0
-    cmp.z started
+    lda.z started
+    cmp #0
     bne __b5
     lda.z digit_value+1
     cmp.z value+1
@@ -1040,8 +1040,8 @@ printf_number_buffer: {
     .label format_justify_left = $19
     .label format_upper_case = $24
     // if(format.min_length)
-    lda #0
-    cmp.z format_min_length
+    lda.z format_min_length
+    cmp #0
     beq __b6
     // strlen(buffer.digits)
     jsr strlen
@@ -1051,8 +1051,8 @@ printf_number_buffer: {
     lda.z __19
     sta.z len
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b13
     // len++;
     inc.z len
@@ -1070,12 +1070,14 @@ printf_number_buffer: {
     sta.z padding
   __b1:
     // if(!format.justify_left && !format.zero_padding && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     bne __b2
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
   __b8:
@@ -1087,19 +1089,19 @@ printf_number_buffer: {
     jsr printf_padding
   __b2:
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // cputc(buffer.sign)
-    lda.z buffer_sign
     sta.z cputc.c
     jsr cputc
   __b3:
     // if(format.zero_padding && padding)
-    lda #0
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
   __b10:
@@ -1111,8 +1113,8 @@ printf_number_buffer: {
     jsr printf_padding
   __b4:
     // if(format.upper_case)
-    lda #0
-    cmp.z format_upper_case
+    lda.z format_upper_case
+    cmp #0
     beq __b5
     // strupr(buffer.digits)
     jsr strupr
@@ -1124,12 +1126,14 @@ printf_number_buffer: {
     sta.z cputs.s+1
     jsr cputs
     // if(format.justify_left && !format.zero_padding && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b12
     rts
   __b12:
@@ -1203,8 +1207,8 @@ ultoa: {
     lda RADIX_DECIMAL_VALUES_LONG+3,y
     sta.z digit_value+3
     // if (started || value >= digit_value)
-    lda #0
-    cmp.z started
+    lda.z started
+    cmp #0
     bne __b5
     lda.z value+3
     cmp.z digit_value+3
@@ -1286,8 +1290,8 @@ uctoa: {
     lda RADIX_HEXADECIMAL_VALUES_CHAR,y
     sta.z digit_value
     // if (started || value >= digit_value)
-    lda #0
-    cmp.z started
+    lda.z started
+    cmp #0
     bne __b5
     lda.z value
     cmp.z digit_value
diff --git a/src/test/ref/examples/eightqueens/eightqueens-recursive.log b/src/test/ref/examples/eightqueens/eightqueens-recursive.log
index 0d82b7cc8..c340c1160 100644
--- a/src/test/ref/examples/eightqueens/eightqueens-recursive.log
+++ b/src/test/ref/examples/eightqueens/eightqueens-recursive.log
@@ -8152,9 +8152,9 @@ queen: {
     // queen::@7
   __b7:
     // [19] queen::$1 = legal::return#0
-    // [20] if(0==queen::$1) goto queen::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z __1
+    // [20] if(0==queen::$1) goto queen::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z __1
+    cmp #0
     beq __b3
     jmp __b5
     // queen::@5
@@ -8977,9 +8977,9 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [159] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z c
+    // [159] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z c
+    cmp #0
     bne __b2
     jmp __breturn
     // cputs::@return
@@ -9527,9 +9527,9 @@ utoa: {
     sta.z digit_value
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [251] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [251] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     jmp __b7
     // utoa::@7
@@ -9601,9 +9601,9 @@ printf_number_buffer: {
     .label format_zero_padding = $1c
     .label format_justify_left = $19
     .label format_upper_case = $24
-    // [263] if(0==printf_number_buffer::format_min_length#3) goto printf_number_buffer::@1 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_min_length
+    // [263] if(0==printf_number_buffer::format_min_length#3) goto printf_number_buffer::@1 -- 0_eq_vbuz1_then_la1 
+    lda.z format_min_length
+    cmp #0
     beq __b1_from_printf_number_buffer
     // [264] phi from printf_number_buffer to printf_number_buffer::@6 [phi:printf_number_buffer->printf_number_buffer::@6]
   __b6_from_printf_number_buffer:
@@ -9623,9 +9623,9 @@ printf_number_buffer: {
     // There is a minimum length - work out the padding
     lda.z __19
     sta.z len
-    // [269] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [269] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b13_from___b14
     jmp __b7
     // printf_number_buffer::@7
@@ -9666,23 +9666,23 @@ printf_number_buffer: {
     jmp __b1
     // printf_number_buffer::@1
   __b1:
-    // [276] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [276] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     jmp __b17
     // printf_number_buffer::@17
   __b17:
-    // [277] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [277] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     jmp __b16
     // printf_number_buffer::@16
   __b16:
-    // [278] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [278] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
     // printf_number_buffer::@8
@@ -9701,9 +9701,9 @@ printf_number_buffer: {
     jmp __b2
     // printf_number_buffer::@2
   __b2:
-    // [281] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [281] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     jmp __b9
     // printf_number_buffer::@9
@@ -9719,16 +9719,16 @@ printf_number_buffer: {
     jmp __b3
     // printf_number_buffer::@3
   __b3:
-    // [284] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [284] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
     jmp __b18
     // printf_number_buffer::@18
   __b18:
-    // [285] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [285] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
     // printf_number_buffer::@10
@@ -9747,9 +9747,9 @@ printf_number_buffer: {
     jmp __b4
     // printf_number_buffer::@4
   __b4:
-    // [288] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_upper_case
+    // [288] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- 0_eq_vbuz1_then_la1 
+    lda.z format_upper_case
+    cmp #0
     beq __b5_from___b4
     // [289] phi from printf_number_buffer::@4 to printf_number_buffer::@11 [phi:printf_number_buffer::@4->printf_number_buffer::@11]
   __b11_from___b4:
@@ -9778,23 +9778,23 @@ printf_number_buffer: {
     jmp __b15
     // printf_number_buffer::@15
   __b15:
-    // [293] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [293] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     jmp __b20
     // printf_number_buffer::@20
   __b20:
-    // [294] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [294] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
     jmp __b19
     // printf_number_buffer::@19
   __b19:
-    // [295] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [295] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b12
     jmp __breturn
     // printf_number_buffer::@12
@@ -9894,9 +9894,9 @@ ultoa: {
     sta.z digit_value+2
     lda RADIX_DECIMAL_VALUES_LONG+3,y
     sta.z digit_value+3
-    // [309] if(0!=ultoa::started#2) goto ultoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [309] if(0!=ultoa::started#2) goto ultoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     jmp __b7
     // ultoa::@7
@@ -10025,9 +10025,9 @@ uctoa: {
     ldy.z digit
     lda RADIX_HEXADECIMAL_VALUES_CHAR,y
     sta.z digit_value
-    // [328] if(0!=uctoa::started#2) goto uctoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [328] if(0!=uctoa::started#2) goto uctoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     jmp __b7
     // uctoa::@7
@@ -10200,7 +10200,7 @@ strlen: {
     jmp __b1
     // strlen::@1
   __b1:
-    // [354] if(0!=*strlen::str#3) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [354] if(0!=*strlen::str#3) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -10286,7 +10286,7 @@ strupr: {
     jmp __b1
     // strupr::@1
   __b1:
-    // [367] if(0!=*strupr::src#2) goto strupr::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [367] if(0!=*strupr::src#2) goto strupr::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (src),y
     cmp #0
@@ -11180,11 +11180,7 @@ Removing instruction jmp __breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing instruction lda r with TYA
 Removing instruction ldy.z i
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
+Removing instruction lda.z buffer_sign
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction __breturn:
 Removing instruction __breturn:
@@ -11817,9 +11813,9 @@ queen: {
     // queen::@7
     // [19] queen::$1 = legal::return#0
     // if(legal(r,column))
-    // [20] if(0==queen::$1) goto queen::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z __1
+    // [20] if(0==queen::$1) goto queen::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z __1
+    cmp #0
     beq __b3
     // queen::@5
     // board[r]=column
@@ -12578,9 +12574,9 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [159] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z c
+    // [159] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z c
+    cmp #0
     bne __b2
     // cputs::@return
     // }
@@ -13133,9 +13129,9 @@ utoa: {
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [251] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [251] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     // utoa::@7
     // [252] if(utoa::value#2>=utoa::digit_value#0) goto utoa::@5 -- vwuz1_ge_vwuz2_then_la1 
@@ -13204,9 +13200,9 @@ printf_number_buffer: {
     .label format_justify_left = $19
     .label format_upper_case = $24
     // if(format.min_length)
-    // [263] if(0==printf_number_buffer::format_min_length#3) goto printf_number_buffer::@1 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_min_length
+    // [263] if(0==printf_number_buffer::format_min_length#3) goto printf_number_buffer::@1 -- 0_eq_vbuz1_then_la1 
+    lda.z format_min_length
+    cmp #0
     beq __b6
     // [264] phi from printf_number_buffer to printf_number_buffer::@6 [phi:printf_number_buffer->printf_number_buffer::@6]
     // printf_number_buffer::@6
@@ -13224,9 +13220,9 @@ printf_number_buffer: {
     lda.z __19
     sta.z len
     // if(buffer.sign)
-    // [269] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [269] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b13
     // printf_number_buffer::@7
     // len++;
@@ -13258,17 +13254,19 @@ printf_number_buffer: {
     // printf_number_buffer::@1
   __b1:
     // if(!format.justify_left && !format.zero_padding && padding)
-    // [276] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [276] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     // printf_number_buffer::@17
-    // [277] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    cmp.z format_zero_padding
+    // [277] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     // printf_number_buffer::@16
-    // [278] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [278] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
     // printf_number_buffer::@8
@@ -13287,14 +13285,13 @@ printf_number_buffer: {
     // printf_number_buffer::@2
   __b2:
     // if(buffer.sign)
-    // [281] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [281] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // printf_number_buffer::@9
     // cputc(buffer.sign)
     // [282] cputc::c#2 = printf_number_buffer::buffer_sign#10 -- vbuz1=vbuz2 
-    lda.z buffer_sign
     sta.z cputc.c
     // [283] call cputc 
     // [230] phi from printf_number_buffer::@9 to cputc [phi:printf_number_buffer::@9->cputc]
@@ -13303,13 +13300,14 @@ printf_number_buffer: {
     // printf_number_buffer::@3
   __b3:
     // if(format.zero_padding && padding)
-    // [284] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [284] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
     // printf_number_buffer::@18
-    // [285] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [285] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
     // printf_number_buffer::@10
@@ -13328,9 +13326,9 @@ printf_number_buffer: {
     // printf_number_buffer::@4
   __b4:
     // if(format.upper_case)
-    // [288] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_upper_case
+    // [288] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- 0_eq_vbuz1_then_la1 
+    lda.z format_upper_case
+    cmp #0
     beq __b5
     // [289] phi from printf_number_buffer::@4 to printf_number_buffer::@11 [phi:printf_number_buffer::@4->printf_number_buffer::@11]
     // printf_number_buffer::@11
@@ -13352,17 +13350,19 @@ printf_number_buffer: {
     jsr cputs
     // printf_number_buffer::@15
     // if(format.justify_left && !format.zero_padding && padding)
-    // [293] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [293] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     // printf_number_buffer::@20
-    // [294] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- vbuc1_neq_vbuz1_then_la1 
-    cmp.z format_zero_padding
+    // [294] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
     // printf_number_buffer::@19
-    // [295] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [295] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b12
     rts
     // printf_number_buffer::@12
@@ -13462,9 +13462,9 @@ ultoa: {
     lda RADIX_DECIMAL_VALUES_LONG+3,y
     sta.z digit_value+3
     // if (started || value >= digit_value)
-    // [309] if(0!=ultoa::started#2) goto ultoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [309] if(0!=ultoa::started#2) goto ultoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     // ultoa::@7
     // [310] if(ultoa::value#2>=ultoa::digit_value#0) goto ultoa::@5 -- vduz1_ge_vduz2_then_la1 
@@ -13589,9 +13589,9 @@ uctoa: {
     lda RADIX_HEXADECIMAL_VALUES_CHAR,y
     sta.z digit_value
     // if (started || value >= digit_value)
-    // [328] if(0!=uctoa::started#2) goto uctoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [328] if(0!=uctoa::started#2) goto uctoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     // uctoa::@7
     // [329] if(uctoa::value#2>=uctoa::digit_value#0) goto uctoa::@5 -- vbuz1_ge_vbuz2_then_la1 
@@ -13760,7 +13760,7 @@ strlen: {
     // strlen::@1
   __b1:
     // while(*str)
-    // [354] if(0!=*strlen::str#3) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [354] if(0!=*strlen::str#3) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -13841,7 +13841,7 @@ strupr: {
     // strupr::@1
   __b1:
     // while(*src)
-    // [367] if(0!=*strupr::src#2) goto strupr::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [367] if(0!=*strupr::src#2) goto strupr::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (src),y
     cmp #0
diff --git a/src/test/ref/examples/eightqueens/eightqueens.asm b/src/test/ref/examples/eightqueens/eightqueens.asm
index 2a2370734..306d88692 100644
--- a/src/test/ref/examples/eightqueens/eightqueens.asm
+++ b/src/test/ref/examples/eightqueens/eightqueens.asm
@@ -553,8 +553,8 @@ printf_number_buffer: {
     // There is a minimum length - work out the padding
     ldy.z __19
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b13
     // len++;
     iny
@@ -573,12 +573,14 @@ printf_number_buffer: {
     sta.z padding
   __b1:
     // if(!format.justify_left && !format.zero_padding && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     bne __b2
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
   __b8:
@@ -590,18 +592,18 @@ printf_number_buffer: {
     jsr printf_padding
   __b2:
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // cputc(buffer.sign)
-    lda.z buffer_sign
     jsr cputc
   __b3:
     // if(format.zero_padding && padding)
-    lda #0
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
   __b10:
@@ -613,8 +615,8 @@ printf_number_buffer: {
     jsr printf_padding
   __b4:
     // if(format.upper_case)
-    lda #0
-    cmp.z format_upper_case
+    lda.z format_upper_case
+    cmp #0
     beq __b5
     // strupr(buffer.digits)
     jsr strupr
@@ -626,12 +628,14 @@ printf_number_buffer: {
     sta.z cputs.s+1
     jsr cputs
     // if(format.justify_left && !format.zero_padding && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b12
     rts
   __b12:
@@ -1275,8 +1279,8 @@ uctoa: {
     lda RADIX_HEXADECIMAL_VALUES_CHAR,y
     sta.z digit_value
     // if (started || value >= digit_value)
-    lda #0
-    cmp.z started
+    lda.z started
+    cmp #0
     bne __b5
     cpx.z digit_value
     bcs __b5
diff --git a/src/test/ref/examples/eightqueens/eightqueens.log b/src/test/ref/examples/eightqueens/eightqueens.log
index a92e21d54..9a4f2b8d0 100644
--- a/src/test/ref/examples/eightqueens/eightqueens.log
+++ b/src/test/ref/examples/eightqueens/eightqueens.log
@@ -7452,7 +7452,7 @@ main: {
     // main::@9
   __b9:
     // [35] main::$5 = kbhit::return#2
-    // [36] if(0==main::$5) goto main::@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [36] if(0==main::$5) goto main::@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b1_from___b9
     jmp __breturn
@@ -7686,7 +7686,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [73] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [73] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -7816,7 +7816,7 @@ queens: {
     // queens::@9
   __b9:
     // [91] queens::$2 = legal::return#0
-    // [92] if(0==queens::$2) goto queens::@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [92] if(0==queens::$2) goto queens::@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b1_from___b9
     jmp __b6
@@ -8054,7 +8054,7 @@ utoa: {
     sta.z digit_value
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [132] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [132] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -8124,7 +8124,7 @@ printf_number_buffer: {
     .label format_zero_padding = $d
     .label format_justify_left = $b
     .label format_upper_case = $11
-    // [144] if(0==printf_number_buffer::format_min_length#3) goto printf_number_buffer::@1 -- vbuc1_eq_vbuxx_then_la1 
+    // [144] if(0==printf_number_buffer::format_min_length#3) goto printf_number_buffer::@1 -- 0_eq_vbuxx_then_la1 
     cpx #0
     beq __b1_from_printf_number_buffer
     // [145] phi from printf_number_buffer to printf_number_buffer::@6 [phi:printf_number_buffer->printf_number_buffer::@6]
@@ -8144,9 +8144,9 @@ printf_number_buffer: {
     // [149] printf_number_buffer::len#0 = (signed byte)printf_number_buffer::$19 -- vbsyy=_sbyte_vwuz1 
     // There is a minimum length - work out the padding
     ldy.z __19
-    // [150] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [150] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b13_from___b14
     jmp __b7
     // printf_number_buffer::@7
@@ -8188,23 +8188,23 @@ printf_number_buffer: {
     jmp __b1
     // printf_number_buffer::@1
   __b1:
-    // [157] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [157] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     jmp __b17
     // printf_number_buffer::@17
   __b17:
-    // [158] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [158] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     jmp __b16
     // printf_number_buffer::@16
   __b16:
-    // [159] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [159] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
     // printf_number_buffer::@8
@@ -8223,9 +8223,9 @@ printf_number_buffer: {
     jmp __b2
     // printf_number_buffer::@2
   __b2:
-    // [162] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [162] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     jmp __b9
     // printf_number_buffer::@9
@@ -8240,16 +8240,16 @@ printf_number_buffer: {
     jmp __b3
     // printf_number_buffer::@3
   __b3:
-    // [165] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [165] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
     jmp __b18
     // printf_number_buffer::@18
   __b18:
-    // [166] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [166] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
     // printf_number_buffer::@10
@@ -8268,9 +8268,9 @@ printf_number_buffer: {
     jmp __b4
     // printf_number_buffer::@4
   __b4:
-    // [169] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_upper_case
+    // [169] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- 0_eq_vbuz1_then_la1 
+    lda.z format_upper_case
+    cmp #0
     beq __b5_from___b4
     // [170] phi from printf_number_buffer::@4 to printf_number_buffer::@11 [phi:printf_number_buffer::@4->printf_number_buffer::@11]
   __b11_from___b4:
@@ -8299,23 +8299,23 @@ printf_number_buffer: {
     jmp __b15
     // printf_number_buffer::@15
   __b15:
-    // [174] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [174] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     jmp __b20
     // printf_number_buffer::@20
   __b20:
-    // [175] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [175] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
     jmp __b19
     // printf_number_buffer::@19
   __b19:
-    // [176] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [176] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b12
     jmp __breturn
     // printf_number_buffer::@12
@@ -8733,7 +8733,7 @@ ultoa: {
     sta.z digit_value+2
     lda RADIX_DECIMAL_VALUES_LONG+3,y
     sta.z digit_value+3
-    // [237] if(0!=ultoa::started#2) goto ultoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [237] if(0!=ultoa::started#2) goto ultoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -8916,7 +8916,7 @@ strlen: {
     jmp __b1
     // strlen::@1
   __b1:
-    // [263] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [263] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -9002,7 +9002,7 @@ strupr: {
     jmp __b1
     // strupr::@1
   __b1:
-    // [276] if(0!=*strupr::src#2) goto strupr::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [276] if(0!=*strupr::src#2) goto strupr::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (src),y
     cmp #0
@@ -9355,9 +9355,9 @@ uctoa: {
     ldy.z digit
     lda RADIX_HEXADECIMAL_VALUES_CHAR,y
     sta.z digit_value
-    // [324] if(0!=uctoa::started#2) goto uctoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [324] if(0!=uctoa::started#2) goto uctoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     jmp __b7
     // uctoa::@7
@@ -10024,11 +10024,7 @@ Removing instruction jmp __breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction ldy.z row
 Removing instruction lda.z digit_value+1
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
+Removing instruction lda.z buffer_sign
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction __breturn:
 Removing instruction __b2:
@@ -10474,7 +10470,7 @@ mem[12] [ printf_buffer ]
 
 
 FINAL ASSEMBLER
-Score: 1603841
+Score: 1603848
 
   // File Comments
 // N Queens Problem in C Using Backtracking
@@ -10658,7 +10654,7 @@ main: {
     // main::@9
     // [35] main::$5 = kbhit::return#2
     // while(!kbhit())
-    // [36] if(0==main::$5) goto main::@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [36] if(0==main::$5) goto main::@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b1
     // main::@return
@@ -10889,7 +10885,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [73] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [73] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
@@ -11003,7 +10999,7 @@ queens: {
     // queens::@9
     // [91] queens::$2 = legal::return#0
     // if(legal(row, board[row]))
-    // [92] if(0==queens::$2) goto queens::@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [92] if(0==queens::$2) goto queens::@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2
     // queens::@6
@@ -11236,7 +11232,7 @@ utoa: {
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [132] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [132] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // utoa::@7
@@ -11302,7 +11298,7 @@ printf_number_buffer: {
     .label format_justify_left = $b
     .label format_upper_case = $11
     // if(format.min_length)
-    // [144] if(0==printf_number_buffer::format_min_length#3) goto printf_number_buffer::@1 -- vbuc1_eq_vbuxx_then_la1 
+    // [144] if(0==printf_number_buffer::format_min_length#3) goto printf_number_buffer::@1 -- 0_eq_vbuxx_then_la1 
     cpx #0
     beq __b6
     // [145] phi from printf_number_buffer to printf_number_buffer::@6 [phi:printf_number_buffer->printf_number_buffer::@6]
@@ -11320,9 +11316,9 @@ printf_number_buffer: {
     // There is a minimum length - work out the padding
     ldy.z __19
     // if(buffer.sign)
-    // [150] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [150] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b13
     // printf_number_buffer::@7
     // len++;
@@ -11355,17 +11351,19 @@ printf_number_buffer: {
     // printf_number_buffer::@1
   __b1:
     // if(!format.justify_left && !format.zero_padding && padding)
-    // [157] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [157] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     // printf_number_buffer::@17
-    // [158] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    cmp.z format_zero_padding
+    // [158] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     // printf_number_buffer::@16
-    // [159] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [159] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
     // printf_number_buffer::@8
@@ -11384,14 +11382,13 @@ printf_number_buffer: {
     // printf_number_buffer::@2
   __b2:
     // if(buffer.sign)
-    // [162] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [162] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // printf_number_buffer::@9
     // cputc(buffer.sign)
     // [163] cputc::c#2 = printf_number_buffer::buffer_sign#10 -- vbuaa=vbuz1 
-    lda.z buffer_sign
     // [164] call cputc 
     // [111] phi from printf_number_buffer::@9 to cputc [phi:printf_number_buffer::@9->cputc]
     // [111] phi cputc::c#3 = cputc::c#2 [phi:printf_number_buffer::@9->cputc#0] -- register_copy 
@@ -11399,13 +11396,14 @@ printf_number_buffer: {
     // printf_number_buffer::@3
   __b3:
     // if(format.zero_padding && padding)
-    // [165] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [165] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
     // printf_number_buffer::@18
-    // [166] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [166] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
     // printf_number_buffer::@10
@@ -11424,9 +11422,9 @@ printf_number_buffer: {
     // printf_number_buffer::@4
   __b4:
     // if(format.upper_case)
-    // [169] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_upper_case
+    // [169] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- 0_eq_vbuz1_then_la1 
+    lda.z format_upper_case
+    cmp #0
     beq __b5
     // [170] phi from printf_number_buffer::@4 to printf_number_buffer::@11 [phi:printf_number_buffer::@4->printf_number_buffer::@11]
     // printf_number_buffer::@11
@@ -11448,17 +11446,19 @@ printf_number_buffer: {
     jsr cputs
     // printf_number_buffer::@15
     // if(format.justify_left && !format.zero_padding && padding)
-    // [174] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [174] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     // printf_number_buffer::@20
-    // [175] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- vbuc1_neq_vbuz1_then_la1 
-    cmp.z format_zero_padding
+    // [175] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
     // printf_number_buffer::@19
-    // [176] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [176] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b12
     rts
     // printf_number_buffer::@12
@@ -11839,7 +11839,7 @@ ultoa: {
     lda RADIX_DECIMAL_VALUES_LONG+3,y
     sta.z digit_value+3
     // if (started || value >= digit_value)
-    // [237] if(0!=ultoa::started#2) goto ultoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [237] if(0!=ultoa::started#2) goto ultoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // ultoa::@7
@@ -12018,7 +12018,7 @@ strlen: {
     // strlen::@1
   __b1:
     // while(*str)
-    // [263] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [263] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -12099,7 +12099,7 @@ strupr: {
     // strupr::@1
   __b1:
     // while(*src)
-    // [276] if(0!=*strupr::src#2) goto strupr::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [276] if(0!=*strupr::src#2) goto strupr::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (src),y
     cmp #0
@@ -12430,9 +12430,9 @@ uctoa: {
     lda RADIX_HEXADECIMAL_VALUES_CHAR,y
     sta.z digit_value
     // if (started || value >= digit_value)
-    // [324] if(0!=uctoa::started#2) goto uctoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [324] if(0!=uctoa::started#2) goto uctoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     // uctoa::@7
     // [325] if(uctoa::value#2>=uctoa::digit_value#0) goto uctoa::@5 -- vbuxx_ge_vbuz1_then_la1 
diff --git a/src/test/ref/examples/font-2x2/font-2x2.log b/src/test/ref/examples/font-2x2/font-2x2.log
index 8d767335d..5d53b90c3 100644
--- a/src/test/ref/examples/font-2x2/font-2x2.log
+++ b/src/test/ref/examples/font-2x2/font-2x2.log
@@ -2544,7 +2544,7 @@ font_2x2: {
     // [29] font_2x2::$1 = font_2x2::glyph_bits#2 & $80 -- vbuaa=vbuz1_band_vbuc1 
     lda #$80
     and.z glyph_bits
-    // [30] if(0!=font_2x2::$1) goto font_2x2::@4 -- vbuc1_neq_vbuaa_then_la1 
+    // [30] if(0!=font_2x2::$1) goto font_2x2::@4 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b4_from___b3
     // [32] phi from font_2x2::@3 to font_2x2::@5 [phi:font_2x2::@3->font_2x2::@5]
@@ -3028,7 +3028,7 @@ font_find: {
     jmp __b4
     // font_find::@4
   __b4:
-    // [116] if(0==font_find::found#2) goto font_find::@5 -- vbuc1_eq_vbuaa_then_la1 
+    // [116] if(0==font_find::found#2) goto font_find::@5 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b5
     // [109] phi from font_find::@4 to font_find::@return [phi:font_find::@4->font_find::@return]
@@ -3585,7 +3585,7 @@ font_2x2: {
     lda #$80
     and.z glyph_bits
     // (glyph_bits&0x80)?1uc:0uc
-    // [30] if(0!=font_2x2::$1) goto font_2x2::@4 -- vbuc1_neq_vbuaa_then_la1 
+    // [30] if(0!=font_2x2::$1) goto font_2x2::@4 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b4
     // [32] phi from font_2x2::@3 to font_2x2::@5 [phi:font_2x2::@3->font_2x2::@5]
@@ -4072,7 +4072,7 @@ font_find: {
     // font_find::@4
   __b4:
     // if(found)
-    // [116] if(0==font_find::found#2) goto font_find::@5 -- vbuc1_eq_vbuaa_then_la1 
+    // [116] if(0==font_find::found#2) goto font_find::@5 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b5
     // [109] phi from font_find::@4 to font_find::@return [phi:font_find::@4->font_find::@return]
diff --git a/src/test/ref/examples/helloworld/helloworld.log b/src/test/ref/examples/helloworld/helloworld.log
index ca615ba4a..bd4be4239 100644
--- a/src/test/ref/examples/helloworld/helloworld.log
+++ b/src/test/ref/examples/helloworld/helloworld.log
@@ -1588,7 +1588,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [37] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [37] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -2309,7 +2309,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [37] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [37] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
diff --git a/src/test/ref/examples/kernalload/kernalload.log b/src/test/ref/examples/kernalload/kernalload.log
index 27b39736a..7ffe3fd3c 100644
--- a/src/test/ref/examples/kernalload/kernalload.log
+++ b/src/test/ref/examples/kernalload/kernalload.log
@@ -977,7 +977,7 @@ strlen: {
     jmp __b1
     // strlen::@1
   __b1:
-    // [45] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [45] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -1393,7 +1393,7 @@ strlen: {
     // strlen::@1
   __b1:
     // while(*str)
-    // [45] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [45] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/examples/mega65/hello-mega65.log b/src/test/ref/examples/mega65/hello-mega65.log
index d8a57df4e..2f5f6d840 100644
--- a/src/test/ref/examples/mega65/hello-mega65.log
+++ b/src/test/ref/examples/mega65/hello-mega65.log
@@ -157,7 +157,7 @@ main: {
     jmp __b1
     // main::@1
   __b1:
-    // [2] if(0!=MSG[main::i#2]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [2] if(0!=MSG[main::i#2]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda MSG,x
     cmp #0
     bne __b2
@@ -237,7 +237,7 @@ main: {
     // main::@1
   __b1:
     // for(char i=0;MSG[i];i++)
-    // [2] if(0!=MSG[main::i#2]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [2] if(0!=MSG[main::i#2]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda MSG,x
     cmp #0
     bne __b2
diff --git a/src/test/ref/examples/mega65/helloworld-mega65.log b/src/test/ref/examples/mega65/helloworld-mega65.log
index 16a3db364..387c8df12 100644
--- a/src/test/ref/examples/mega65/helloworld-mega65.log
+++ b/src/test/ref/examples/mega65/helloworld-mega65.log
@@ -1677,7 +1677,7 @@ cputs: {
     lda (s),y
     // [41] cputs::s#0 = ++ cputs::s#2 -- pbuz1=_inc_pbuz1 
     inw.z s
-    // [42] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [42] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -2433,7 +2433,7 @@ cputs: {
     lda (s),y
     // [41] cputs::s#0 = ++ cputs::s#2 -- pbuz1=_inc_pbuz1 
     inw.z s
-    // [42] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [42] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
diff --git a/src/test/ref/examples/nes/nes-conio.asm b/src/test/ref/examples/nes/nes-conio.asm
index bba77c60f..b79ae1f02 100644
--- a/src/test/ref/examples/nes/nes-conio.asm
+++ b/src/test/ref/examples/nes/nes-conio.asm
@@ -574,8 +574,8 @@ uctoa: {
     lda RADIX_HEXADECIMAL_VALUES_CHAR,y
     sta.z digit_value
     // if (started || value >= digit_value)
-    lda #0
-    cmp.z started
+    lda.z started
+    cmp #0
     bne __b5
     cpx.z digit_value
     bcs __b5
diff --git a/src/test/ref/examples/nes/nes-conio.log b/src/test/ref/examples/nes/nes-conio.log
index 192b9e68e..fe38713da 100644
--- a/src/test/ref/examples/nes/nes-conio.log
+++ b/src/test/ref/examples/nes/nes-conio.log
@@ -4340,7 +4340,7 @@ vblank: {
     // [13] vblank::$1 = vblank::joy#0 & JOY_DOWN -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #JOY_DOWN
-    // [14] if(0==vblank::$1) goto vblank::@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [14] if(0==vblank::$1) goto vblank::@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b1
     jmp __b5
@@ -4364,7 +4364,7 @@ vblank: {
     // [18] vblank::$3 = vblank::joy#0 & JOY_UP -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #JOY_UP
-    // [19] if(0==vblank::$3) goto vblank::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [19] if(0==vblank::$3) goto vblank::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2
     jmp __b7
@@ -4388,7 +4388,7 @@ vblank: {
     // [23] vblank::$5 = vblank::joy#0 & JOY_LEFT -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #JOY_LEFT
-    // [24] if(0==vblank::$5) goto vblank::@3 -- vbuc1_eq_vbuaa_then_la1 
+    // [24] if(0==vblank::$5) goto vblank::@3 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b3
     jmp __b9
@@ -4402,7 +4402,7 @@ vblank: {
     // [26] vblank::$7 = vblank::joy#0 & JOY_RIGHT -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #JOY_RIGHT
-    // [27] if(0==vblank::$7) goto vblank::@4 -- vbuc1_eq_vbuaa_then_la1 
+    // [27] if(0==vblank::$7) goto vblank::@4 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b4
     jmp __b10
@@ -4482,7 +4482,7 @@ main: {
     // [40] main::initNES1_waitForVBlank1_$0 = *((byte*)PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS) & $80 -- vbuaa=_deref_pbuc1_band_vbuc2 
     lda #$80
     and PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS
-    // [41] if(0==main::initNES1_waitForVBlank1_$0) goto main::initNES1_waitForVBlank1_@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [41] if(0==main::initNES1_waitForVBlank1_$0) goto main::initNES1_waitForVBlank1_@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq initNES1_waitForVBlank1___b1
     // [42] phi from main::initNES1_waitForVBlank1_@1 to main::initNES1_@1 [phi:main::initNES1_waitForVBlank1_@1->main::initNES1_@1]
@@ -4522,7 +4522,7 @@ main: {
     sta MEMORY+$700,x
     // [51] main::initNES1_i#1 = ++ main::initNES1_i#2 -- vbuxx=_inc_vbuxx 
     inx
-    // [52] if(0!=main::initNES1_i#1) goto main::initNES1_@1 -- vbuc1_neq_vbuxx_then_la1 
+    // [52] if(0!=main::initNES1_i#1) goto main::initNES1_@1 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne initNES1___b1_from_initNES1___b1
     // [53] phi from main::initNES1_@1 to main::initNES1_waitForVBlank2 [phi:main::initNES1_@1->main::initNES1_waitForVBlank2]
@@ -4536,7 +4536,7 @@ main: {
     // [54] main::initNES1_waitForVBlank2_$0 = *((byte*)PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS) & $80 -- vbuaa=_deref_pbuc1_band_vbuc2 
     lda #$80
     and PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS
-    // [55] if(0==main::initNES1_waitForVBlank2_$0) goto main::initNES1_waitForVBlank2_@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [55] if(0==main::initNES1_waitForVBlank2_$0) goto main::initNES1_waitForVBlank2_@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq initNES1_waitForVBlank2___b1
     jmp initNES1___b7
@@ -5103,9 +5103,9 @@ uctoa: {
     ldy.z digit
     lda RADIX_HEXADECIMAL_VALUES_CHAR,y
     sta.z digit_value
-    // [140] if(0!=uctoa::started#2) goto uctoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [140] if(0!=uctoa::started#2) goto uctoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     jmp __b7
     // uctoa::@7
@@ -5373,7 +5373,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [189] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [189] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -6492,7 +6492,7 @@ vblank: {
     txa
     and #JOY_DOWN
     // if(joy&JOY_DOWN)
-    // [14] if(0==vblank::$1) goto vblank::@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [14] if(0==vblank::$1) goto vblank::@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b1
     // vblank::@5
@@ -6515,7 +6515,7 @@ vblank: {
     txa
     and #JOY_UP
     // if(joy&JOY_UP)
-    // [19] if(0==vblank::$3) goto vblank::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [19] if(0==vblank::$3) goto vblank::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2
     // vblank::@7
@@ -6538,7 +6538,7 @@ vblank: {
     txa
     and #JOY_LEFT
     // if(joy&JOY_LEFT)
-    // [24] if(0==vblank::$5) goto vblank::@3 -- vbuc1_eq_vbuaa_then_la1 
+    // [24] if(0==vblank::$5) goto vblank::@3 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b3
     // vblank::@9
@@ -6552,7 +6552,7 @@ vblank: {
     txa
     and #JOY_RIGHT
     // if(joy&JOY_RIGHT)
-    // [27] if(0==vblank::$7) goto vblank::@4 -- vbuc1_eq_vbuaa_then_la1 
+    // [27] if(0==vblank::$7) goto vblank::@4 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b4
     // vblank::@10
@@ -6625,7 +6625,7 @@ main: {
     lda #$80
     and PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS
     // while(!(PPU->PPUSTATUS&0x80))
-    // [41] if(0==main::initNES1_waitForVBlank1_$0) goto main::initNES1_waitForVBlank1_@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [41] if(0==main::initNES1_waitForVBlank1_$0) goto main::initNES1_waitForVBlank1_@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq initNES1_waitForVBlank1
     // [42] phi from main::initNES1_waitForVBlank1_@1 to main::initNES1_@1 [phi:main::initNES1_waitForVBlank1_@1->main::initNES1_@1]
@@ -6663,7 +6663,7 @@ main: {
     // while (++i)
     // [51] main::initNES1_i#1 = ++ main::initNES1_i#2 -- vbuxx=_inc_vbuxx 
     inx
-    // [52] if(0!=main::initNES1_i#1) goto main::initNES1_@1 -- vbuc1_neq_vbuxx_then_la1 
+    // [52] if(0!=main::initNES1_i#1) goto main::initNES1_@1 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne initNES1___b1
     // [53] phi from main::initNES1_@1 to main::initNES1_waitForVBlank2 [phi:main::initNES1_@1->main::initNES1_waitForVBlank2]
@@ -6675,7 +6675,7 @@ main: {
     lda #$80
     and PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS
     // while(!(PPU->PPUSTATUS&0x80))
-    // [55] if(0==main::initNES1_waitForVBlank2_$0) goto main::initNES1_waitForVBlank2_@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [55] if(0==main::initNES1_waitForVBlank2_$0) goto main::initNES1_waitForVBlank2_@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq initNES1_waitForVBlank2
     // main::initNES1_@7
@@ -7195,9 +7195,9 @@ uctoa: {
     lda RADIX_HEXADECIMAL_VALUES_CHAR,y
     sta.z digit_value
     // if (started || value >= digit_value)
-    // [140] if(0!=uctoa::started#2) goto uctoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [140] if(0!=uctoa::started#2) goto uctoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     // uctoa::@7
     // [141] if(uctoa::value#2>=uctoa::digit_value#0) goto uctoa::@5 -- vbuxx_ge_vbuz1_then_la1 
@@ -7444,7 +7444,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [189] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [189] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
diff --git a/src/test/ref/examples/nes/nes-demo.log b/src/test/ref/examples/nes/nes-demo.log
index bbf7410ea..1fb359e12 100644
--- a/src/test/ref/examples/nes/nes-demo.log
+++ b/src/test/ref/examples/nes/nes-demo.log
@@ -2714,7 +2714,7 @@ vblank: {
     // [4] vblank::$1 = vblank::joy#0 & JOY_DOWN -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #JOY_DOWN
-    // [5] if(0==vblank::$1) goto vblank::@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [5] if(0==vblank::$1) goto vblank::@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b1
     jmp __b4
@@ -2734,7 +2734,7 @@ vblank: {
     // [10] vblank::$3 = vblank::joy#0 & JOY_UP -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #JOY_UP
-    // [11] if(0==vblank::$3) goto vblank::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [11] if(0==vblank::$3) goto vblank::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2
     jmp __b5
@@ -2754,7 +2754,7 @@ vblank: {
     // [16] vblank::$5 = vblank::joy#0 & JOY_LEFT -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #JOY_LEFT
-    // [17] if(0==vblank::$5) goto vblank::@3 -- vbuc1_eq_vbuaa_then_la1 
+    // [17] if(0==vblank::$5) goto vblank::@3 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b3
     jmp __b6
@@ -2774,7 +2774,7 @@ vblank: {
     // [22] vblank::$7 = vblank::joy#0 & JOY_RIGHT -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #JOY_RIGHT
-    // [23] if(0==vblank::$7) goto vblank::ppuSpriteBufferDmaTransfer1 -- vbuc1_eq_vbuaa_then_la1 
+    // [23] if(0==vblank::$7) goto vblank::ppuSpriteBufferDmaTransfer1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq ppuSpriteBufferDmaTransfer1
     jmp __b7
@@ -2862,7 +2862,7 @@ main: {
     // [41] main::initNES1_waitForVBlank1_$0 = *((byte*)PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS) & $80 -- vbuaa=_deref_pbuc1_band_vbuc2 
     lda #$80
     and PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS
-    // [42] if(0==main::initNES1_waitForVBlank1_$0) goto main::initNES1_waitForVBlank1_@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [42] if(0==main::initNES1_waitForVBlank1_$0) goto main::initNES1_waitForVBlank1_@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq initNES1_waitForVBlank1___b1
     // [43] phi from main::initNES1_waitForVBlank1_@1 to main::initNES1_@1 [phi:main::initNES1_waitForVBlank1_@1->main::initNES1_@1]
@@ -2902,7 +2902,7 @@ main: {
     sta MEMORY+$700,x
     // [52] main::initNES1_i#1 = ++ main::initNES1_i#2 -- vbuxx=_inc_vbuxx 
     inx
-    // [53] if(0!=main::initNES1_i#1) goto main::initNES1_@1 -- vbuc1_neq_vbuxx_then_la1 
+    // [53] if(0!=main::initNES1_i#1) goto main::initNES1_@1 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne initNES1___b1_from_initNES1___b1
     // [54] phi from main::initNES1_@1 to main::initNES1_waitForVBlank2 [phi:main::initNES1_@1->main::initNES1_waitForVBlank2]
@@ -2916,7 +2916,7 @@ main: {
     // [55] main::initNES1_waitForVBlank2_$0 = *((byte*)PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS) & $80 -- vbuaa=_deref_pbuc1_band_vbuc2 
     lda #$80
     and PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS
-    // [56] if(0==main::initNES1_waitForVBlank2_$0) goto main::initNES1_waitForVBlank2_@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [56] if(0==main::initNES1_waitForVBlank2_$0) goto main::initNES1_waitForVBlank2_@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq initNES1_waitForVBlank2___b1
     jmp initNES1___b7
@@ -3865,7 +3865,7 @@ vblank: {
     txa
     and #JOY_DOWN
     // if(joy&JOY_DOWN)
-    // [5] if(0==vblank::$1) goto vblank::@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [5] if(0==vblank::$1) goto vblank::@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b1
     // vblank::@4
@@ -3888,7 +3888,7 @@ vblank: {
     txa
     and #JOY_UP
     // if(joy&JOY_UP)
-    // [11] if(0==vblank::$3) goto vblank::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [11] if(0==vblank::$3) goto vblank::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2
     // vblank::@5
@@ -3911,7 +3911,7 @@ vblank: {
     txa
     and #JOY_LEFT
     // if(joy&JOY_LEFT)
-    // [17] if(0==vblank::$5) goto vblank::@3 -- vbuc1_eq_vbuaa_then_la1 
+    // [17] if(0==vblank::$5) goto vblank::@3 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b3
     // vblank::@6
@@ -3934,7 +3934,7 @@ vblank: {
     txa
     and #JOY_RIGHT
     // if(joy&JOY_RIGHT)
-    // [23] if(0==vblank::$7) goto vblank::ppuSpriteBufferDmaTransfer1 -- vbuc1_eq_vbuaa_then_la1 
+    // [23] if(0==vblank::$7) goto vblank::ppuSpriteBufferDmaTransfer1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq ppuSpriteBufferDmaTransfer1
     // vblank::@7
@@ -4018,7 +4018,7 @@ main: {
     lda #$80
     and PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS
     // while(!(PPU->PPUSTATUS&0x80))
-    // [42] if(0==main::initNES1_waitForVBlank1_$0) goto main::initNES1_waitForVBlank1_@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [42] if(0==main::initNES1_waitForVBlank1_$0) goto main::initNES1_waitForVBlank1_@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq initNES1_waitForVBlank1
     // [43] phi from main::initNES1_waitForVBlank1_@1 to main::initNES1_@1 [phi:main::initNES1_waitForVBlank1_@1->main::initNES1_@1]
@@ -4056,7 +4056,7 @@ main: {
     // while (++i)
     // [52] main::initNES1_i#1 = ++ main::initNES1_i#2 -- vbuxx=_inc_vbuxx 
     inx
-    // [53] if(0!=main::initNES1_i#1) goto main::initNES1_@1 -- vbuc1_neq_vbuxx_then_la1 
+    // [53] if(0!=main::initNES1_i#1) goto main::initNES1_@1 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne initNES1___b1
     // [54] phi from main::initNES1_@1 to main::initNES1_waitForVBlank2 [phi:main::initNES1_@1->main::initNES1_waitForVBlank2]
@@ -4068,7 +4068,7 @@ main: {
     lda #$80
     and PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS
     // while(!(PPU->PPUSTATUS&0x80))
-    // [56] if(0==main::initNES1_waitForVBlank2_$0) goto main::initNES1_waitForVBlank2_@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [56] if(0==main::initNES1_waitForVBlank2_$0) goto main::initNES1_waitForVBlank2_@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq initNES1_waitForVBlank2
     // main::initNES1_@7
diff --git a/src/test/ref/examples/nes/nes-dxycp.log b/src/test/ref/examples/nes/nes-dxycp.log
index 1404b8514..7028d9b66 100644
--- a/src/test/ref/examples/nes/nes-dxycp.log
+++ b/src/test/ref/examples/nes/nes-dxycp.log
@@ -2249,7 +2249,7 @@ vblank: {
     // vblank::@15
   __b15:
     // [14] vblank::joy#0 = readJoy1::return#2
-    // [15] if(0==vblank::joy#0) goto vblank::@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [15] if(0==vblank::joy#0) goto vblank::@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b1
     jmp __breturn
@@ -2467,7 +2467,7 @@ main: {
     // [53] main::initNES1_waitForVBlank1_$0 = *((byte*)PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS) & $80 -- vbuaa=_deref_pbuc1_band_vbuc2 
     lda #$80
     and PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS
-    // [54] if(0==main::initNES1_waitForVBlank1_$0) goto main::initNES1_waitForVBlank1_@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [54] if(0==main::initNES1_waitForVBlank1_$0) goto main::initNES1_waitForVBlank1_@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq initNES1_waitForVBlank1___b1
     // [55] phi from main::initNES1_waitForVBlank1_@1 to main::initNES1_@1 [phi:main::initNES1_waitForVBlank1_@1->main::initNES1_@1]
@@ -2507,7 +2507,7 @@ main: {
     sta MEMORY+$700,x
     // [64] main::initNES1_i#1 = ++ main::initNES1_i#2 -- vbuxx=_inc_vbuxx 
     inx
-    // [65] if(0!=main::initNES1_i#1) goto main::initNES1_@1 -- vbuc1_neq_vbuxx_then_la1 
+    // [65] if(0!=main::initNES1_i#1) goto main::initNES1_@1 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne initNES1___b1_from_initNES1___b1
     // [66] phi from main::initNES1_@1 to main::initNES1_waitForVBlank2 [phi:main::initNES1_@1->main::initNES1_waitForVBlank2]
@@ -2521,7 +2521,7 @@ main: {
     // [67] main::initNES1_waitForVBlank2_$0 = *((byte*)PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS) & $80 -- vbuaa=_deref_pbuc1_band_vbuc2 
     lda #$80
     and PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS
-    // [68] if(0==main::initNES1_waitForVBlank2_$0) goto main::initNES1_waitForVBlank2_@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [68] if(0==main::initNES1_waitForVBlank2_$0) goto main::initNES1_waitForVBlank2_@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq initNES1_waitForVBlank2___b1
     jmp initNES1___b7
@@ -3319,7 +3319,7 @@ vblank: {
     // joy = readJoy1()
     // [14] vblank::joy#0 = readJoy1::return#2
     // if(joy)
-    // [15] if(0==vblank::joy#0) goto vblank::@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [15] if(0==vblank::joy#0) goto vblank::@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b1
     // vblank::@return
@@ -3527,7 +3527,7 @@ main: {
     lda #$80
     and PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS
     // while(!(PPU->PPUSTATUS&0x80))
-    // [54] if(0==main::initNES1_waitForVBlank1_$0) goto main::initNES1_waitForVBlank1_@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [54] if(0==main::initNES1_waitForVBlank1_$0) goto main::initNES1_waitForVBlank1_@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq initNES1_waitForVBlank1
     // [55] phi from main::initNES1_waitForVBlank1_@1 to main::initNES1_@1 [phi:main::initNES1_waitForVBlank1_@1->main::initNES1_@1]
@@ -3565,7 +3565,7 @@ main: {
     // while (++i)
     // [64] main::initNES1_i#1 = ++ main::initNES1_i#2 -- vbuxx=_inc_vbuxx 
     inx
-    // [65] if(0!=main::initNES1_i#1) goto main::initNES1_@1 -- vbuc1_neq_vbuxx_then_la1 
+    // [65] if(0!=main::initNES1_i#1) goto main::initNES1_@1 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne initNES1___b1
     // [66] phi from main::initNES1_@1 to main::initNES1_waitForVBlank2 [phi:main::initNES1_@1->main::initNES1_waitForVBlank2]
@@ -3577,7 +3577,7 @@ main: {
     lda #$80
     and PPU+OFFSET_STRUCT_RICOH_2C02_PPUSTATUS
     // while(!(PPU->PPUSTATUS&0x80))
-    // [68] if(0==main::initNES1_waitForVBlank2_$0) goto main::initNES1_waitForVBlank2_@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [68] if(0==main::initNES1_waitForVBlank2_$0) goto main::initNES1_waitForVBlank2_@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq initNES1_waitForVBlank2
     // main::initNES1_@7
diff --git a/src/test/ref/examples/plus4walk/plus4walk.log b/src/test/ref/examples/plus4walk/plus4walk.log
index 44ced8a8c..77f83af57 100644
--- a/src/test/ref/examples/plus4walk/plus4walk.log
+++ b/src/test/ref/examples/plus4walk/plus4walk.log
@@ -1349,7 +1349,7 @@ main: {
     // [24] main::$12 = main::rnd#0 & $80 -- vbuaa=vbuyy_band_vbuc1 
     tya
     and #$80
-    // [25] if(0!=main::$12) goto main::@3 -- vbuc1_neq_vbuaa_then_la1 
+    // [25] if(0!=main::$12) goto main::@3 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b3
     jmp __b7
@@ -1358,7 +1358,7 @@ main: {
     // [26] main::$13 = main::rnd#0 & $40 -- vbuaa=vbuyy_band_vbuc1 
     tya
     and #$40
-    // [27] if(0!=main::$13) goto main::@4 -- vbuc1_neq_vbuaa_then_la1 
+    // [27] if(0!=main::$13) goto main::@4 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b4
     jmp __b8
@@ -1429,7 +1429,7 @@ main: {
     // [36] main::$18 = main::rnd#0 & $40 -- vbuaa=vbuyy_band_vbuc1 
     tya
     and #$40
-    // [37] if(0!=main::$18) goto main::@5 -- vbuc1_neq_vbuaa_then_la1 
+    // [37] if(0!=main::$18) goto main::@5 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b5
     jmp __b9
@@ -1963,7 +1963,7 @@ main: {
     tya
     and #$80
     // if(rnd & 0x80)
-    // [25] if(0!=main::$12) goto main::@3 -- vbuc1_neq_vbuaa_then_la1 
+    // [25] if(0!=main::$12) goto main::@3 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b3
     // main::@7
@@ -1972,7 +1972,7 @@ main: {
     tya
     and #$40
     // if(rnd & 0x40)
-    // [27] if(0!=main::$13) goto main::@4 -- vbuc1_neq_vbuaa_then_la1 
+    // [27] if(0!=main::$13) goto main::@4 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b4
     // main::@8
@@ -2031,7 +2031,7 @@ main: {
     tya
     and #$40
     // if(rnd& 0x40)
-    // [37] if(0!=main::$18) goto main::@5 -- vbuc1_neq_vbuaa_then_la1 
+    // [37] if(0!=main::$18) goto main::@5 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b5
     // main::@9
diff --git a/src/test/ref/fastmultiply-127.log b/src/test/ref/fastmultiply-127.log
index 545c9a63c..3b71aa306 100644
--- a/src/test/ref/fastmultiply-127.log
+++ b/src/test/ref/fastmultiply-127.log
@@ -3212,7 +3212,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [52] if(0!=*print_str::str#3) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [52] if(0!=*print_str::str#3) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -4636,7 +4636,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [52] if(0!=*print_str::str#3) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [52] if(0!=*print_str::str#3) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/function-pointer-noarg-call-10.log b/src/test/ref/function-pointer-noarg-call-10.log
index 3b9527b1f..f5b790336 100644
--- a/src/test/ref/function-pointer-noarg-call-10.log
+++ b/src/test/ref/function-pointer-noarg-call-10.log
@@ -482,7 +482,7 @@ print: {
     inc.z idx
     // [20] print::i#1 = ++ print::i#2 -- vbuyy=_inc_vbuyy 
     iny
-    // [21] if(0!=print::msg#3[print::i#1]) goto print::@1 -- vbuc1_neq_pbuz1_derefidx_vbuyy_then_la1 
+    // [21] if(0!=print::msg#3[print::i#1]) goto print::@1 -- 0_neq_pbuz1_derefidx_vbuyy_then_la1 
     lda (msg),y
     cmp #0
     bne __b1_from___b1
@@ -710,7 +710,7 @@ print: {
     // [20] print::i#1 = ++ print::i#2 -- vbuyy=_inc_vbuyy 
     iny
     // while(msg[i])
-    // [21] if(0!=print::msg#3[print::i#1]) goto print::@1 -- vbuc1_neq_pbuz1_derefidx_vbuyy_then_la1 
+    // [21] if(0!=print::msg#3[print::i#1]) goto print::@1 -- 0_neq_pbuz1_derefidx_vbuyy_then_la1 
     lda (msg),y
     cmp #0
     bne __b1
diff --git a/src/test/ref/function-pointer-noarg-call-14.log b/src/test/ref/function-pointer-noarg-call-14.log
index 87f2b88cc..1a4b4831d 100644
--- a/src/test/ref/function-pointer-noarg-call-14.log
+++ b/src/test/ref/function-pointer-noarg-call-14.log
@@ -1654,7 +1654,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [31] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [31] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -2453,7 +2453,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [31] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [31] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
diff --git a/src/test/ref/function-pointer-noarg-call-7.log b/src/test/ref/function-pointer-noarg-call-7.log
index 9fc73ac73..307ea9032 100644
--- a/src/test/ref/function-pointer-noarg-call-7.log
+++ b/src/test/ref/function-pointer-noarg-call-7.log
@@ -319,7 +319,7 @@ hello: {
     inc.z idx
     // [9] hello::i#1 = ++ hello::i#2 -- vbuxx=_inc_vbuxx 
     inx
-    // [10] if(0!=msg[hello::i#1]) goto hello::@1 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [10] if(0!=msg[hello::i#1]) goto hello::@1 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda msg,x
     cmp #0
     bne __b1_from___b1
@@ -474,7 +474,7 @@ hello: {
     // [9] hello::i#1 = ++ hello::i#2 -- vbuxx=_inc_vbuxx 
     inx
     // while(msg[i])
-    // [10] if(0!=msg[hello::i#1]) goto hello::@1 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [10] if(0!=msg[hello::i#1]) goto hello::@1 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda msg,x
     cmp #0
     bne __b1
diff --git a/src/test/ref/function-pointer-noarg-call-8.log b/src/test/ref/function-pointer-noarg-call-8.log
index 20364f500..492a123f6 100644
--- a/src/test/ref/function-pointer-noarg-call-8.log
+++ b/src/test/ref/function-pointer-noarg-call-8.log
@@ -352,7 +352,7 @@ hello: {
     inc.z idx
     // [10] hello::i#1 = ++ hello::i#2 -- vbuyy=_inc_vbuyy 
     iny
-    // [11] if(0!=msg[hello::i#1]) goto hello::@1 -- vbuc1_neq_pbuz1_derefidx_vbuyy_then_la1 
+    // [11] if(0!=msg[hello::i#1]) goto hello::@1 -- 0_neq_pbuz1_derefidx_vbuyy_then_la1 
     lda (msg),y
     cmp #0
     bne __b1_from___b1
@@ -538,7 +538,7 @@ hello: {
     // [10] hello::i#1 = ++ hello::i#2 -- vbuyy=_inc_vbuyy 
     iny
     // while(msg[i])
-    // [11] if(0!=msg[hello::i#1]) goto hello::@1 -- vbuc1_neq_pbuz1_derefidx_vbuyy_then_la1 
+    // [11] if(0!=msg[hello::i#1]) goto hello::@1 -- 0_neq_pbuz1_derefidx_vbuyy_then_la1 
     lda (msg),y
     cmp #0
     bne __b1
diff --git a/src/test/ref/global-label-problem.log b/src/test/ref/global-label-problem.log
index f83e6088a..ea68e255c 100644
--- a/src/test/ref/global-label-problem.log
+++ b/src/test/ref/global-label-problem.log
@@ -389,7 +389,7 @@ print: {
     jmp __b1
     // print::@1
   __b1:
-    // [9] if(0!=*print::msg#5) goto print::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [9] if(0!=*print::msg#5) goto print::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (msg),y
     cmp #0
@@ -564,7 +564,7 @@ print: {
     // print::@1
   __b1:
     // while(*msg)
-    // [9] if(0!=*print::msg#5) goto print::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [9] if(0!=*print::msg#5) goto print::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (msg),y
     cmp #0
diff --git a/src/test/ref/helloworld2-inline.asm b/src/test/ref/helloworld2-inline.asm
index fa6a84479..c708e97a7 100644
--- a/src/test/ref/helloworld2-inline.asm
+++ b/src/test/ref/helloworld2-inline.asm
@@ -8,15 +8,15 @@ main: {
     ldy #0
   print21___b1:
     // for(byte i=0; msg[i]; i++)
-    lda #0
-    cmp hello,y
+    lda hello,y
+    cmp #0
     bne print21___b2
-    tax
-    tay
+    ldx #0
+    ldy #0
   print22___b1:
     // for(byte i=0; msg[i]; i++)
-    lda #0
-    cmp hello,y
+    lda hello,y
+    cmp #0
     bne print22___b2
     // }
     rts
diff --git a/src/test/ref/helloworld2-inline.log b/src/test/ref/helloworld2-inline.log
index beb65b79b..cf04d46e2 100644
--- a/src/test/ref/helloworld2-inline.log
+++ b/src/test/ref/helloworld2-inline.log
@@ -334,9 +334,9 @@ main: {
     jmp print21___b1
     // main::print21_@1
   print21___b1:
-    // [3] if(0!=main::hello[main::print21_i#2]) goto main::print21_@2 -- vbuc1_neq_pbuc2_derefidx_vbuyy_then_la1 
-    lda #0
-    cmp hello,y
+    // [3] if(0!=main::hello[main::print21_i#2]) goto main::print21_@2 -- 0_neq_pbuc1_derefidx_vbuyy_then_la1 
+    lda hello,y
+    cmp #0
     bne print21___b2
     // [4] phi from main::print21_@1 to main::print22 [phi:main::print21_@1->main::print22]
   print22_from_print21___b1:
@@ -352,9 +352,9 @@ main: {
     jmp print22___b1
     // main::print22_@1
   print22___b1:
-    // [6] if(0!=main::hello[main::print22_i#2]) goto main::print22_@2 -- vbuc1_neq_pbuc2_derefidx_vbuyy_then_la1 
-    lda #0
-    cmp hello,y
+    // [6] if(0!=main::hello[main::print22_i#2]) goto main::print22_@2 -- 0_neq_pbuc1_derefidx_vbuyy_then_la1 
+    lda hello,y
+    cmp #0
     bne print22___b2
     jmp __breturn
     // main::@return
@@ -414,8 +414,6 @@ Removing instruction __breturn:
 Removing instruction print22___b1_from_print22___b2:
 Removing instruction print21___b1_from_print21___b2:
 Succesful ASM optimization Pass5UnusedLabelElimination
-Replacing instruction ldx #0 with TAX
-Replacing instruction ldy #0 with TAY
 
 FINAL SYMBOL TABLE
 void main()
@@ -468,23 +466,23 @@ main: {
     // main::print21_@1
   print21___b1:
     // for(byte i=0; msg[i]; i++)
-    // [3] if(0!=main::hello[main::print21_i#2]) goto main::print21_@2 -- vbuc1_neq_pbuc2_derefidx_vbuyy_then_la1 
-    lda #0
-    cmp hello,y
+    // [3] if(0!=main::hello[main::print21_i#2]) goto main::print21_@2 -- 0_neq_pbuc1_derefidx_vbuyy_then_la1 
+    lda hello,y
+    cmp #0
     bne print21___b2
     // [4] phi from main::print21_@1 to main::print22 [phi:main::print21_@1->main::print22]
     // main::print22
     // [5] phi from main::print22 to main::print22_@1 [phi:main::print22->main::print22_@1]
     // [5] phi main::print22_j#2 = 0 [phi:main::print22->main::print22_@1#0] -- vbuxx=vbuc1 
-    tax
+    ldx #0
     // [5] phi main::print22_i#2 = 0 [phi:main::print22->main::print22_@1#1] -- vbuyy=vbuc1 
-    tay
+    ldy #0
     // main::print22_@1
   print22___b1:
     // for(byte i=0; msg[i]; i++)
-    // [6] if(0!=main::hello[main::print22_i#2]) goto main::print22_@2 -- vbuc1_neq_pbuc2_derefidx_vbuyy_then_la1 
-    lda #0
-    cmp hello,y
+    // [6] if(0!=main::hello[main::print22_i#2]) goto main::print22_@2 -- 0_neq_pbuc1_derefidx_vbuyy_then_la1 
+    lda hello,y
+    cmp #0
     bne print22___b2
     // main::@return
     // }
diff --git a/src/test/ref/helloworld2.log b/src/test/ref/helloworld2.log
index 5bb3b034a..5bc102a3a 100644
--- a/src/test/ref/helloworld2.log
+++ b/src/test/ref/helloworld2.log
@@ -294,7 +294,7 @@ print2: {
     jmp __b1
     // print2::@1
   __b1:
-    // [7] if(0!=main::hello[print2::i#2]) goto print2::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [7] if(0!=main::hello[print2::i#2]) goto print2::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda main.hello,x
     cmp #0
     bne __b2
@@ -409,7 +409,7 @@ print2: {
     // print2::@1
   __b1:
     // for(byte i=0; msg[i]; i++)
-    // [7] if(0!=main::hello[print2::i#2]) goto print2::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [7] if(0!=main::hello[print2::i#2]) goto print2::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda main.hello,x
     cmp #0
     bne __b2
diff --git a/src/test/ref/incrementinarray.log b/src/test/ref/incrementinarray.log
index 452dfac02..2721b7477 100644
--- a/src/test/ref/incrementinarray.log
+++ b/src/test/ref/incrementinarray.log
@@ -842,7 +842,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [16] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [16] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -1166,7 +1166,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [16] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [16] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/inline-function-print.asm b/src/test/ref/inline-function-print.asm
index 26b6b6308..4de7ffd3d 100644
--- a/src/test/ref/inline-function-print.asm
+++ b/src/test/ref/inline-function-print.asm
@@ -9,15 +9,15 @@ main: {
     ldy #0
   print1___b1:
     // for(byte i=0; msg[i]; i++)
-    lda #0
-    cmp hello,y
+    lda hello,y
+    cmp #0
     bne print1___b2
-    tax
-    tay
+    ldx #0
+    ldy #0
   print2___b1:
     // for(byte i=0; msg[i]; i++)
-    lda #0
-    cmp hello,y
+    lda hello,y
+    cmp #0
     bne print2___b2
     // }
     rts
diff --git a/src/test/ref/inline-function-print.log b/src/test/ref/inline-function-print.log
index 694137334..cd0fe0202 100644
--- a/src/test/ref/inline-function-print.log
+++ b/src/test/ref/inline-function-print.log
@@ -338,9 +338,9 @@ main: {
     jmp print1___b1
     // main::print1_@1
   print1___b1:
-    // [3] if(0!=main::hello[main::print1_i#2]) goto main::print1_@2 -- vbuc1_neq_pbuc2_derefidx_vbuyy_then_la1 
-    lda #0
-    cmp hello,y
+    // [3] if(0!=main::hello[main::print1_i#2]) goto main::print1_@2 -- 0_neq_pbuc1_derefidx_vbuyy_then_la1 
+    lda hello,y
+    cmp #0
     bne print1___b2
     // [4] phi from main::print1_@1 to main::print2 [phi:main::print1_@1->main::print2]
   print2_from_print1___b1:
@@ -356,9 +356,9 @@ main: {
     jmp print2___b1
     // main::print2_@1
   print2___b1:
-    // [6] if(0!=main::hello[main::print2_i#2]) goto main::print2_@2 -- vbuc1_neq_pbuc2_derefidx_vbuyy_then_la1 
-    lda #0
-    cmp hello,y
+    // [6] if(0!=main::hello[main::print2_i#2]) goto main::print2_@2 -- 0_neq_pbuc1_derefidx_vbuyy_then_la1 
+    lda hello,y
+    cmp #0
     bne print2___b2
     jmp __breturn
     // main::@return
@@ -418,8 +418,6 @@ Removing instruction __breturn:
 Removing instruction print2___b1_from_print2___b2:
 Removing instruction print1___b1_from_print1___b2:
 Succesful ASM optimization Pass5UnusedLabelElimination
-Replacing instruction ldx #0 with TAX
-Replacing instruction ldy #0 with TAY
 
 FINAL SYMBOL TABLE
 void main()
@@ -473,23 +471,23 @@ main: {
     // main::print1_@1
   print1___b1:
     // for(byte i=0; msg[i]; i++)
-    // [3] if(0!=main::hello[main::print1_i#2]) goto main::print1_@2 -- vbuc1_neq_pbuc2_derefidx_vbuyy_then_la1 
-    lda #0
-    cmp hello,y
+    // [3] if(0!=main::hello[main::print1_i#2]) goto main::print1_@2 -- 0_neq_pbuc1_derefidx_vbuyy_then_la1 
+    lda hello,y
+    cmp #0
     bne print1___b2
     // [4] phi from main::print1_@1 to main::print2 [phi:main::print1_@1->main::print2]
     // main::print2
     // [5] phi from main::print2 to main::print2_@1 [phi:main::print2->main::print2_@1]
     // [5] phi main::print2_j#2 = 0 [phi:main::print2->main::print2_@1#0] -- vbuxx=vbuc1 
-    tax
+    ldx #0
     // [5] phi main::print2_i#2 = 0 [phi:main::print2->main::print2_@1#1] -- vbuyy=vbuc1 
-    tay
+    ldy #0
     // main::print2_@1
   print2___b1:
     // for(byte i=0; msg[i]; i++)
-    // [6] if(0!=main::hello[main::print2_i#2]) goto main::print2_@2 -- vbuc1_neq_pbuc2_derefidx_vbuyy_then_la1 
-    lda #0
-    cmp hello,y
+    // [6] if(0!=main::hello[main::print2_i#2]) goto main::print2_@2 -- 0_neq_pbuc1_derefidx_vbuyy_then_la1 
+    lda hello,y
+    cmp #0
     bne print2___b2
     // main::@return
     // }
diff --git a/src/test/ref/inline-string-2.log b/src/test/ref/inline-string-2.log
index f4d4f5e1f..370c31715 100644
--- a/src/test/ref/inline-string-2.log
+++ b/src/test/ref/inline-string-2.log
@@ -452,7 +452,7 @@ print: {
     jmp __b1
     // print::@1
   __b1:
-    // [14] if(0!=*print::msg#2) goto print::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [14] if(0!=*print::msg#2) goto print::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (msg),y
     cmp #0
@@ -624,7 +624,7 @@ print: {
     // print::@1
   __b1:
     // while(*msg)
-    // [14] if(0!=*print::msg#2) goto print::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [14] if(0!=*print::msg#2) goto print::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (msg),y
     cmp #0
diff --git a/src/test/ref/inline-string.log b/src/test/ref/inline-string.log
index 02e9e6577..bc9466991 100644
--- a/src/test/ref/inline-string.log
+++ b/src/test/ref/inline-string.log
@@ -326,7 +326,7 @@ print: {
     jmp __b1
     // print::@1
   __b1:
-    // [9] if(0!=*print::msg#4) goto print::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [9] if(0!=*print::msg#4) goto print::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (msg),y
     cmp #0
@@ -472,7 +472,7 @@ print: {
     // print::@1
   __b1:
     // while(*msg)
-    // [9] if(0!=*print::msg#4) goto print::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [9] if(0!=*print::msg#4) goto print::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (msg),y
     cmp #0
diff --git a/src/test/ref/linegen.log b/src/test/ref/linegen.log
index 46df5f45a..521c80408 100644
--- a/src/test/ref/linegen.log
+++ b/src/test/ref/linegen.log
@@ -3061,7 +3061,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [83] if(0!=*print_str::str#10) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [83] if(0!=*print_str::str#10) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -4262,7 +4262,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [83] if(0!=*print_str::str#10) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [83] if(0!=*print_str::str#10) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/local-string.log b/src/test/ref/local-string.log
index 9ba02f18d..1502f1456 100644
--- a/src/test/ref/local-string.log
+++ b/src/test/ref/local-string.log
@@ -133,7 +133,7 @@ main: {
     jmp __b1
     // main::@1
   __b1:
-    // [2] if(0!=main::msg[main::i#2]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [2] if(0!=main::msg[main::i#2]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda msg,x
     cmp #0
     bne __b2
@@ -197,7 +197,7 @@ main: {
     // main::@1
   __b1:
     // while(msg[i])
-    // [2] if(0!=main::msg[main::i#2]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [2] if(0!=main::msg[main::i#2]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda msg,x
     cmp #0
     bne __b2
diff --git a/src/test/ref/loop-for-continue.log b/src/test/ref/loop-for-continue.log
index 39762bf1d..f42a8773e 100644
--- a/src/test/ref/loop-for-continue.log
+++ b/src/test/ref/loop-for-continue.log
@@ -196,7 +196,7 @@ main: {
     jmp __b1
     // main::@1
   __b1:
-    // [2] if(0!=MESSAGE[main::i#2]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [2] if(0!=MESSAGE[main::i#2]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda MESSAGE,x
     cmp #0
     bne __b2
@@ -291,7 +291,7 @@ main: {
     // main::@1
   __b1:
     // for( char i =0; MESSAGE[i]; i++)
-    // [2] if(0!=MESSAGE[main::i#2]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [2] if(0!=MESSAGE[main::i#2]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda MESSAGE,x
     cmp #0
     bne __b2
diff --git a/src/test/ref/millfork-benchmarks/plasma-kc.asm b/src/test/ref/millfork-benchmarks/plasma-kc.asm
index ca6007fbd..b228f2796 100644
--- a/src/test/ref/millfork-benchmarks/plasma-kc.asm
+++ b/src/test/ref/millfork-benchmarks/plasma-kc.asm
@@ -53,11 +53,8 @@ main: {
   /* Run the demo until a key was hit */
   __b1:
     // while (count)
-    lda.z count+1
-    cmp #>0
-    bne __b2
     lda.z count
-    cmp #<0
+    ora.z count+1
     bne __b2
     // *VIC_MEMORY = v
     lda.z v
diff --git a/src/test/ref/millfork-benchmarks/plasma-kc.log b/src/test/ref/millfork-benchmarks/plasma-kc.log
index dc4f51e84..a8a6bdc7e 100644
--- a/src/test/ref/millfork-benchmarks/plasma-kc.log
+++ b/src/test/ref/millfork-benchmarks/plasma-kc.log
@@ -2185,52 +2185,52 @@ Uplift Scope [start]
 Uplift Scope [end] 
 Uplift Scope [__start] 
 
-Uplifting [doplasma] best 171175 combination reg byte y [ doplasma::j#3 doplasma::j#2 ] reg byte a [ doplasma::$6 ] reg byte x [ doplasma::jj#3 doplasma::jj#2 ] zp[2]:18 [ doplasma::scrn#6 doplasma::scrn#0 doplasma::scrn#13 ] zp[1]:11 [ doplasma::ii#3 doplasma::ii#2 ] zp[1]:14 [ doplasma::i#3 doplasma::i#2 ] zp[1]:52 [ doplasma::$3 ] zp[1]:53 [ doplasma::$1 ] zp[1]:13 [ doplasma::c1b#3 doplasma::c1b#2 ] zp[1]:16 [ doplasma::c2b#3 doplasma::c2b#2 ] zp[1]:12 [ doplasma::c1a#3 doplasma::c1a#2 ] zp[1]:15 [ doplasma::c2a#3 doplasma::c2a#2 ] 
+Uplifting [doplasma] best 171110 combination reg byte y [ doplasma::j#3 doplasma::j#2 ] reg byte a [ doplasma::$6 ] reg byte x [ doplasma::jj#3 doplasma::jj#2 ] zp[2]:18 [ doplasma::scrn#6 doplasma::scrn#0 doplasma::scrn#13 ] zp[1]:11 [ doplasma::ii#3 doplasma::ii#2 ] zp[1]:14 [ doplasma::i#3 doplasma::i#2 ] zp[1]:52 [ doplasma::$3 ] zp[1]:53 [ doplasma::$1 ] zp[1]:13 [ doplasma::c1b#3 doplasma::c1b#2 ] zp[1]:16 [ doplasma::c2b#3 doplasma::c2b#2 ] zp[1]:12 [ doplasma::c1a#3 doplasma::c1a#2 ] zp[1]:15 [ doplasma::c2a#3 doplasma::c2a#2 ] 
 Limited combination testing to 100 combinations of 419904 possible.
-Uplifting [rand] best 171175 combination zp[2]:54 [ rand::$0 ] zp[2]:58 [ rand::$1 ] zp[2]:62 [ rand::$2 ] zp[2]:64 [ rand::return#0 ] zp[2]:40 [ rand::return#2 ] 
-Uplifting [] best 171175 combination zp[2]:56 [ rand_state#0 ] zp[2]:60 [ rand_state#1 ] zp[2]:6 [ rand_state#14 rand_state#25 rand_state#19 rand_state#12 ] zp[2]:25 [ print_char_cursor#26 print_char_cursor#37 print_char_cursor#27 ] zp[2]:21 [ print_line_cursor#9 print_line_cursor#0 ] zp[2]:47 [ Ticks#1 ] zp[2]:45 [ Ticks#0 ] zp[2]:27 [ last_time ] 
-Uplifting [makechar] best 154075 combination reg byte y [ makechar::b#3 makechar::b#7 makechar::b#2 ] reg byte x [ makechar::ii#3 makechar::ii#2 ] zp[2]:42 [ makechar::$3 ] zp[1]:44 [ makechar::$4 ] zp[1]:8 [ makechar::i#3 makechar::i#2 ] zp[2]:34 [ makechar::$7 ] zp[2]:36 [ makechar::$8 ] zp[2]:38 [ makechar::$10 ] zp[1]:33 [ makechar::s#1 ] zp[2]:4 [ makechar::c#3 makechar::c#2 ] zp[1]:32 [ makechar::$9 ] 
+Uplifting [rand] best 171110 combination zp[2]:54 [ rand::$0 ] zp[2]:58 [ rand::$1 ] zp[2]:62 [ rand::$2 ] zp[2]:64 [ rand::return#0 ] zp[2]:40 [ rand::return#2 ] 
+Uplifting [] best 171110 combination zp[2]:56 [ rand_state#0 ] zp[2]:60 [ rand_state#1 ] zp[2]:6 [ rand_state#14 rand_state#25 rand_state#19 rand_state#12 ] zp[2]:25 [ print_char_cursor#26 print_char_cursor#37 print_char_cursor#27 ] zp[2]:21 [ print_line_cursor#9 print_line_cursor#0 ] zp[2]:47 [ Ticks#1 ] zp[2]:45 [ Ticks#0 ] zp[2]:27 [ last_time ] 
+Uplifting [makechar] best 154010 combination reg byte y [ makechar::b#3 makechar::b#7 makechar::b#2 ] reg byte x [ makechar::ii#3 makechar::ii#2 ] zp[2]:42 [ makechar::$3 ] zp[1]:44 [ makechar::$4 ] zp[1]:8 [ makechar::i#3 makechar::i#2 ] zp[2]:34 [ makechar::$7 ] zp[2]:36 [ makechar::$8 ] zp[2]:38 [ makechar::$10 ] zp[1]:33 [ makechar::s#1 ] zp[2]:4 [ makechar::c#3 makechar::c#2 ] zp[1]:32 [ makechar::$9 ] 
 Limited combination testing to 100 combinations of 576 possible.
-Uplifting [print_char] best 154066 combination reg byte a [ print_char::ch#2 print_char::ch#0 print_char::ch#1 ] 
-Uplifting [print_uchar] best 154048 combination reg byte a [ print_uchar::$0 ] reg byte x [ print_uchar::$2 ] reg byte x [ print_uchar::b#2 print_uchar::b#0 print_uchar::b#1 ] 
-Uplifting [print_uint] best 154048 combination zp[2]:49 [ print_uint::w#0 ] 
-Uplifting [main] best 154042 combination zp[2]:2 [ main::count#2 main::count#1 ] reg byte a [ main::tmp#1 ] zp[1]:29 [ main::block#1 ] zp[1]:31 [ main::v#1 ] 
-Uplifting [RADIX] best 154042 combination 
-Uplifting [print_ln] best 154042 combination 
-Uplifting [MOS6526_CIA] best 154042 combination 
-Uplifting [MOS6569_VICII] best 154042 combination 
-Uplifting [MOS6581_SID] best 154042 combination 
-Uplifting [start] best 154042 combination 
-Uplifting [end] best 154042 combination 
-Uplifting [__start] best 154042 combination 
+Uplifting [print_char] best 154001 combination reg byte a [ print_char::ch#2 print_char::ch#0 print_char::ch#1 ] 
+Uplifting [print_uchar] best 153983 combination reg byte a [ print_uchar::$0 ] reg byte x [ print_uchar::$2 ] reg byte x [ print_uchar::b#2 print_uchar::b#0 print_uchar::b#1 ] 
+Uplifting [print_uint] best 153983 combination zp[2]:49 [ print_uint::w#0 ] 
+Uplifting [main] best 153977 combination zp[2]:2 [ main::count#2 main::count#1 ] reg byte a [ main::tmp#1 ] zp[1]:29 [ main::block#1 ] zp[1]:31 [ main::v#1 ] 
+Uplifting [RADIX] best 153977 combination 
+Uplifting [print_ln] best 153977 combination 
+Uplifting [MOS6526_CIA] best 153977 combination 
+Uplifting [MOS6569_VICII] best 153977 combination 
+Uplifting [MOS6581_SID] best 153977 combination 
+Uplifting [start] best 153977 combination 
+Uplifting [end] best 153977 combination 
+Uplifting [__start] best 153977 combination 
 Attempting to uplift remaining variables inzp[1]:11 [ doplasma::ii#3 doplasma::ii#2 ]
-Uplifting [doplasma] best 154042 combination zp[1]:11 [ doplasma::ii#3 doplasma::ii#2 ] 
+Uplifting [doplasma] best 153977 combination zp[1]:11 [ doplasma::ii#3 doplasma::ii#2 ] 
 Attempting to uplift remaining variables inzp[1]:14 [ doplasma::i#3 doplasma::i#2 ]
-Uplifting [doplasma] best 154042 combination zp[1]:14 [ doplasma::i#3 doplasma::i#2 ] 
+Uplifting [doplasma] best 153977 combination zp[1]:14 [ doplasma::i#3 doplasma::i#2 ] 
 Attempting to uplift remaining variables inzp[1]:44 [ makechar::$4 ]
-Uplifting [makechar] best 154042 combination zp[1]:44 [ makechar::$4 ] 
+Uplifting [makechar] best 153977 combination zp[1]:44 [ makechar::$4 ] 
 Attempting to uplift remaining variables inzp[1]:52 [ doplasma::$3 ]
-Uplifting [doplasma] best 153442 combination reg byte a [ doplasma::$3 ] 
+Uplifting [doplasma] best 153377 combination reg byte a [ doplasma::$3 ] 
 Attempting to uplift remaining variables inzp[1]:53 [ doplasma::$1 ]
-Uplifting [doplasma] best 152842 combination reg byte a [ doplasma::$1 ] 
+Uplifting [doplasma] best 152777 combination reg byte a [ doplasma::$1 ] 
 Attempting to uplift remaining variables inzp[1]:13 [ doplasma::c1b#3 doplasma::c1b#2 ]
-Uplifting [doplasma] best 152842 combination zp[1]:13 [ doplasma::c1b#3 doplasma::c1b#2 ] 
+Uplifting [doplasma] best 152777 combination zp[1]:13 [ doplasma::c1b#3 doplasma::c1b#2 ] 
 Attempting to uplift remaining variables inzp[1]:16 [ doplasma::c2b#3 doplasma::c2b#2 ]
-Uplifting [doplasma] best 152842 combination zp[1]:16 [ doplasma::c2b#3 doplasma::c2b#2 ] 
+Uplifting [doplasma] best 152777 combination zp[1]:16 [ doplasma::c2b#3 doplasma::c2b#2 ] 
 Attempting to uplift remaining variables inzp[1]:12 [ doplasma::c1a#3 doplasma::c1a#2 ]
-Uplifting [doplasma] best 152842 combination zp[1]:12 [ doplasma::c1a#3 doplasma::c1a#2 ] 
+Uplifting [doplasma] best 152777 combination zp[1]:12 [ doplasma::c1a#3 doplasma::c1a#2 ] 
 Attempting to uplift remaining variables inzp[1]:15 [ doplasma::c2a#3 doplasma::c2a#2 ]
-Uplifting [doplasma] best 152842 combination zp[1]:15 [ doplasma::c2a#3 doplasma::c2a#2 ] 
+Uplifting [doplasma] best 152777 combination zp[1]:15 [ doplasma::c2a#3 doplasma::c2a#2 ] 
 Attempting to uplift remaining variables inzp[1]:8 [ makechar::i#3 makechar::i#2 ]
-Uplifting [makechar] best 152842 combination zp[1]:8 [ makechar::i#3 makechar::i#2 ] 
+Uplifting [makechar] best 152777 combination zp[1]:8 [ makechar::i#3 makechar::i#2 ] 
 Attempting to uplift remaining variables inzp[1]:33 [ makechar::s#1 ]
-Uplifting [makechar] best 152842 combination zp[1]:33 [ makechar::s#1 ] 
+Uplifting [makechar] best 152777 combination zp[1]:33 [ makechar::s#1 ] 
 Attempting to uplift remaining variables inzp[1]:32 [ makechar::$9 ]
-Uplifting [makechar] best 152802 combination reg byte a [ makechar::$9 ] 
+Uplifting [makechar] best 152737 combination reg byte a [ makechar::$9 ] 
 Attempting to uplift remaining variables inzp[1]:29 [ main::block#1 ]
-Uplifting [main] best 152802 combination zp[1]:29 [ main::block#1 ] 
+Uplifting [main] best 152737 combination zp[1]:29 [ main::block#1 ] 
 Attempting to uplift remaining variables inzp[1]:31 [ main::v#1 ]
-Uplifting [main] best 152802 combination zp[1]:31 [ main::v#1 ] 
+Uplifting [main] best 152737 combination zp[1]:31 [ main::v#1 ] 
 Coalescing zero page register [ zp[2]:6 [ rand_state#14 rand_state#25 rand_state#19 rand_state#12 ] ] with [ zp[2]:56 [ rand_state#0 ] ] - score: 1
 Coalescing zero page register [ zp[2]:6 [ rand_state#14 rand_state#25 rand_state#19 rand_state#12 rand_state#0 ] ] with [ zp[2]:60 [ rand_state#1 ] ] - score: 1
 Coalescing zero page register [ zp[2]:34 [ makechar::$7 ] ] with [ zp[2]:36 [ makechar::$8 ] ] - score: 1
@@ -2355,12 +2355,9 @@ main: {
   /* Run the demo until a key was hit */
     // main::@1
   __b1:
-    // [14] if(0!=main::count#2) goto main::@2 -- vwuc1_neq_vwuz1_then_la1 
-    lda.z count+1
-    cmp #>0
-    bne __b2_from___b1
+    // [14] if(0!=main::count#2) goto main::@2 -- 0_neq_vwuz1_then_la1 
     lda.z count
-    cmp #<0
+    ora.z count+1
     bne __b2_from___b1
     jmp __b3
     // main::@3
@@ -3065,7 +3062,6 @@ Removing instruction lda #0
 Removing instruction lda.z rand_state+1
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Replacing label __b2_from___b1 with __b2
-Replacing label __b2_from___b1 with __b2
 Replacing label __b6_from___b5 with __b6
 Replacing label __b8_from___b10 with __b8
 Replacing label __b1_from___b1 with __b1
@@ -3305,7 +3301,7 @@ reg byte x [ print_uchar::$2 ]
 
 
 FINAL ASSEMBLER
-Score: 102174
+Score: 102109
 
   // File Comments
 // Print a number of zero-terminated strings, each followed by a newline.
@@ -3388,12 +3384,9 @@ main: {
     // main::@1
   __b1:
     // while (count)
-    // [14] if(0!=main::count#2) goto main::@2 -- vwuc1_neq_vwuz1_then_la1 
-    lda.z count+1
-    cmp #>0
-    bne __b2
+    // [14] if(0!=main::count#2) goto main::@2 -- 0_neq_vwuz1_then_la1 
     lda.z count
-    cmp #<0
+    ora.z count+1
     bne __b2
     // main::@3
     // *VIC_MEMORY = v
diff --git a/src/test/ref/millfork-benchmarks/romsum-kc.log b/src/test/ref/millfork-benchmarks/romsum-kc.log
index 4c587d9fe..2b51f65ec 100644
--- a/src/test/ref/millfork-benchmarks/romsum-kc.log
+++ b/src/test/ref/millfork-benchmarks/romsum-kc.log
@@ -2286,7 +2286,7 @@ sum: {
   !:
     // [39] sum::i#2 = ++ sum::i#3 -- vbuyy=_inc_vbuyy 
     iny
-    // [40] if(0!=sum::i#2) goto sum::@2 -- vbuc1_neq_vbuyy_then_la1 
+    // [40] if(0!=sum::i#2) goto sum::@2 -- 0_neq_vbuyy_then_la1 
     cpy #0
     bne __b2_from___b2
     jmp __b3
@@ -2465,7 +2465,7 @@ utoa: {
     sta.z digit_value
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [68] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [68] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -2540,7 +2540,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [81] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [81] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -3189,7 +3189,7 @@ sum: {
     // [39] sum::i#2 = ++ sum::i#3 -- vbuyy=_inc_vbuyy 
     iny
     // while (i)
-    // [40] if(0!=sum::i#2) goto sum::@2 -- vbuc1_neq_vbuyy_then_la1 
+    // [40] if(0!=sum::i#2) goto sum::@2 -- 0_neq_vbuyy_then_la1 
     cpy #0
     bne __b2
     // sum::@3
@@ -3359,7 +3359,7 @@ utoa: {
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [68] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [68] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // utoa::@7
@@ -3428,7 +3428,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [81] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [81] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/multiply-16bit-const.log b/src/test/ref/multiply-16bit-const.log
index 0411c92fa..66404ed76 100644
--- a/src/test/ref/multiply-16bit-const.log
+++ b/src/test/ref/multiply-16bit-const.log
@@ -2025,7 +2025,7 @@ ultoa: {
     sta.z digit_value+2
     lda RADIX_DECIMAL_VALUES_LONG+3,y
     sta.z digit_value+3
-    // [48] if(0!=ultoa::started#2) goto ultoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [48] if(0!=ultoa::started#2) goto ultoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -2113,7 +2113,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [61] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [61] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -2835,7 +2835,7 @@ ultoa: {
     lda RADIX_DECIMAL_VALUES_LONG+3,y
     sta.z digit_value+3
     // if (started || value >= digit_value)
-    // [48] if(0!=ultoa::started#2) goto ultoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [48] if(0!=ultoa::started#2) goto ultoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // ultoa::@7
@@ -2918,7 +2918,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [61] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [61] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/number-ternary-fail-2.asm b/src/test/ref/number-ternary-fail-2.asm
index 43ec430f4..ab8305f08 100644
--- a/src/test/ref/number-ternary-fail-2.asm
+++ b/src/test/ref/number-ternary-fail-2.asm
@@ -35,11 +35,8 @@ SolveMaze: {
     sta.z forward+1
   __b2:
     // forward ? 2 : 3
-    lda.z forward+1
-    cmp #>0
-    bne __b3
     lda.z forward
-    cmp #<0
+    ora.z forward+1
     bne __b3
     lda #3
     jmp __b4
diff --git a/src/test/ref/number-ternary-fail-2.log b/src/test/ref/number-ternary-fail-2.log
index 4a9f2df93..d72877da3 100644
--- a/src/test/ref/number-ternary-fail-2.log
+++ b/src/test/ref/number-ternary-fail-2.log
@@ -533,11 +533,11 @@ Uplift Scope [malloc]
 Uplift Scope [main] 
 Uplift Scope [] 
 
-Uplifting [SolveMaze] best 676 combination zp[2]:2 [ SolveMaze::forward#3 ] reg byte a [ SolveMaze::$9 ] 
-Uplifting [RADIX] best 676 combination 
-Uplifting [malloc] best 676 combination 
-Uplifting [main] best 676 combination 
-Uplifting [] best 676 combination 
+Uplifting [SolveMaze] best 611 combination zp[2]:2 [ SolveMaze::forward#3 ] reg byte a [ SolveMaze::$9 ] 
+Uplifting [RADIX] best 611 combination 
+Uplifting [malloc] best 611 combination 
+Uplifting [main] best 611 combination 
+Uplifting [] best 611 combination 
 
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
@@ -611,12 +611,9 @@ SolveMaze: {
     jmp __b2
     // SolveMaze::@2
   __b2:
-    // [10] if(0!=SolveMaze::forward#3) goto SolveMaze::@3 -- vwuc1_neq_vwuz1_then_la1 
-    lda.z forward+1
-    cmp #>0
-    bne __b3_from___b2
+    // [10] if(0!=SolveMaze::forward#3) goto SolveMaze::@3 -- 0_neq_vwuz1_then_la1 
     lda.z forward
-    cmp #<0
+    ora.z forward+1
     bne __b3_from___b2
     // [12] phi from SolveMaze::@2 to SolveMaze::@4 [phi:SolveMaze::@2->SolveMaze::@4]
   __b4_from___b2:
@@ -661,7 +658,6 @@ Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #>0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Replacing label __b3_from___b2 with __b3
-Replacing label __b3_from___b2 with __b3
 Replacing label __b1 with __b2
 Removing instruction __b1_from_main:
 Removing instruction SolveMaze_from___b1:
@@ -715,7 +711,7 @@ reg byte a [ SolveMaze::$9 ]
 
 
 FINAL ASSEMBLER
-Score: 491
+Score: 426
 
   // File Comments
 // Failing number type resolving in ternary operator
@@ -776,12 +772,9 @@ SolveMaze: {
     // SolveMaze::@2
   __b2:
     // forward ? 2 : 3
-    // [10] if(0!=SolveMaze::forward#3) goto SolveMaze::@3 -- vwuc1_neq_vwuz1_then_la1 
-    lda.z forward+1
-    cmp #>0
-    bne __b3
+    // [10] if(0!=SolveMaze::forward#3) goto SolveMaze::@3 -- 0_neq_vwuz1_then_la1 
     lda.z forward
-    cmp #<0
+    ora.z forward+1
     bne __b3
     // [12] phi from SolveMaze::@2 to SolveMaze::@4 [phi:SolveMaze::@2->SolveMaze::@4]
     // [12] phi SolveMaze::$9 = 3 [phi:SolveMaze::@2->SolveMaze::@4#0] -- vbuaa=vbuc1 
diff --git a/src/test/ref/number-ternary-fail-3.log b/src/test/ref/number-ternary-fail-3.log
index 98be481b6..b9d31a409 100644
--- a/src/test/ref/number-ternary-fail-3.log
+++ b/src/test/ref/number-ternary-fail-3.log
@@ -229,7 +229,7 @@ main: {
     lda BASIC,x
     // [3] main::$0 = main::glyph_bits#0 & $80 -- vbuaa=vbuaa_band_vbuc1 
     and #$80
-    // [4] if(0!=main::$0) goto main::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [4] if(0!=main::$0) goto main::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2_from___b1
     // [6] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
@@ -331,7 +331,7 @@ main: {
     // [3] main::$0 = main::glyph_bits#0 & $80 -- vbuaa=vbuaa_band_vbuc1 
     and #$80
     // (glyph_bits&0x80)?1:0
-    // [4] if(0!=main::$0) goto main::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [4] if(0!=main::$0) goto main::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // [6] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
diff --git a/src/test/ref/number-ternary-fail.log b/src/test/ref/number-ternary-fail.log
index 0db0778b6..7eda903b7 100644
--- a/src/test/ref/number-ternary-fail.log
+++ b/src/test/ref/number-ternary-fail.log
@@ -208,7 +208,7 @@ main: {
     // [2] main::$0 = main::i#2 & 1 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #1
-    // [3] if(0!=main::$0) goto main::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [3] if(0!=main::$0) goto main::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2_from___b1
     // [5] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
@@ -302,7 +302,7 @@ main: {
     txa
     and #1
     // (i&1)?0:0x80
-    // [3] if(0!=main::$0) goto main::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [3] if(0!=main::$0) goto main::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // [5] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
diff --git a/src/test/ref/parse-negated-struct-ref.asm b/src/test/ref/parse-negated-struct-ref.asm
index 528d55728..3a3a54799 100644
--- a/src/test/ref/parse-negated-struct-ref.asm
+++ b/src/test/ref/parse-negated-struct-ref.asm
@@ -7,8 +7,8 @@ main: {
     .label SCREEN = $400
     .label a = aa
     // if(!a->b)
-    lda #0
-    cmp a
+    lda a
+    cmp #0
     bne !a+
     // *SCREEN = 'a'
     lda #'a'
diff --git a/src/test/ref/parse-negated-struct-ref.log b/src/test/ref/parse-negated-struct-ref.log
index af3673cff..5fb9e9f6a 100644
--- a/src/test/ref/parse-negated-struct-ref.log
+++ b/src/test/ref/parse-negated-struct-ref.log
@@ -135,9 +135,9 @@ ASSEMBLER BEFORE OPTIMIZATION
 main: {
     .label SCREEN = $400
     .label a = aa
-    // [0] if(0!=*((byte*)main::a)) goto main::@1 -- vbuc1_neq__deref_pbuc2_then_la1 
-    lda #0
-    cmp a
+    // [0] if(0!=*((byte*)main::a)) goto main::@1 -- 0_neq__deref_pbuc1_then_la1 
+    lda a
+    cmp #0
     bne __b1
     jmp __b2
     // main::@2
@@ -199,9 +199,9 @@ main: {
     .label SCREEN = $400
     .label a = aa
     // if(!a->b)
-    // [0] if(0!=*((byte*)main::a)) goto main::@1 -- vbuc1_neq__deref_pbuc2_then_la1 
-    lda #0
-    cmp a
+    // [0] if(0!=*((byte*)main::a)) goto main::@1 -- 0_neq__deref_pbuc1_then_la1 
+    lda a
+    cmp #0
     bne !a+
     // main::@2
     // *SCREEN = 'a'
diff --git a/src/test/ref/plasma-center.log b/src/test/ref/plasma-center.log
index de2f580e1..165786f49 100644
--- a/src/test/ref/plasma-center.log
+++ b/src/test/ref/plasma-center.log
@@ -6913,7 +6913,7 @@ atan2_16: {
     jmp __b15
     // atan2_16::@15
   __b15:
-    // [206] if(0==atan2_16::shift#2) goto atan2_16::@17 -- vbuc1_eq_vbuyy_then_la1 
+    // [206] if(0==atan2_16::shift#2) goto atan2_16::@17 -- 0_eq_vbuyy_then_la1 
     cpy #0
     beq __b17_from___b15
     jmp __b16
@@ -9172,7 +9172,7 @@ atan2_16: {
     bcs __b14
     // atan2_16::@15
     // if(shift)
-    // [206] if(0==atan2_16::shift#2) goto atan2_16::@17 -- vbuc1_eq_vbuyy_then_la1 
+    // [206] if(0==atan2_16::shift#2) goto atan2_16::@17 -- 0_eq_vbuyy_then_la1 
     cpy #0
     beq __b17
     // atan2_16::@16
diff --git a/src/test/ref/plus4-kbhit.log b/src/test/ref/plus4-kbhit.log
index 885556322..6da85c3c9 100644
--- a/src/test/ref/plus4-kbhit.log
+++ b/src/test/ref/plus4-kbhit.log
@@ -224,7 +224,7 @@ main: {
     // main::@2
   __b2:
     // [4] main::$0 = kbhit::return#0
-    // [5] if(0==main::$0) goto main::@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [5] if(0==main::$0) goto main::@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b1_from___b2
     jmp __breturn
@@ -326,7 +326,7 @@ main: {
     // main::@2
     // [4] main::$0 = kbhit::return#0
     // while(!kbhit())
-    // [5] if(0==main::$0) goto main::@1 -- vbuc1_eq_vbuaa_then_la1 
+    // [5] if(0==main::$0) goto main::@1 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b1
     // main::@return
diff --git a/src/test/ref/plus4-keyboard-test.log b/src/test/ref/plus4-keyboard-test.log
index 987fab926..e1e1eda54 100644
--- a/src/test/ref/plus4-keyboard-test.log
+++ b/src/test/ref/plus4-keyboard-test.log
@@ -649,7 +649,7 @@ main: {
     // [13] main::$6 = main::key_bit#2 & $80 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #$80
-    // [14] if(0==main::$6) goto main::@6 -- vbuc1_eq_vbuaa_then_la1 
+    // [14] if(0==main::$6) goto main::@6 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b6
     jmp __b7
@@ -900,7 +900,7 @@ main: {
     txa
     and #$80
     // if(key_bit&0x80)
-    // [14] if(0==main::$6) goto main::@6 -- vbuc1_eq_vbuaa_then_la1 
+    // [14] if(0==main::$6) goto main::@6 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b6
     // main::@7
diff --git a/src/test/ref/pointer-const.log b/src/test/ref/pointer-const.log
index 48bad2efe..3d2cefd01 100644
--- a/src/test/ref/pointer-const.log
+++ b/src/test/ref/pointer-const.log
@@ -221,7 +221,7 @@ main: {
     jmp __b1
     // main::@1
   __b1:
-    // [2] if(0!=MSG[main::i#4]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [2] if(0!=MSG[main::i#4]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda MSG,x
     cmp #0
     bne __b2
@@ -322,7 +322,7 @@ main: {
     // main::@1
   __b1:
     // while(MSG[i])
-    // [2] if(0!=MSG[main::i#4]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [2] if(0!=MSG[main::i#4]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda MSG,x
     cmp #0
     bne __b2
diff --git a/src/test/ref/pointer-pointer-2.log b/src/test/ref/pointer-pointer-2.log
index 8a8ac65ce..7044bd150 100644
--- a/src/test/ref/pointer-pointer-2.log
+++ b/src/test/ref/pointer-pointer-2.log
@@ -397,7 +397,7 @@ main: {
     jmp __b2
     // main::@2
   __b2:
-    // [4] if(0!=*main::text) goto main::@3 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [4] if(0!=*main::text) goto main::@3 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (text),y
     cmp #0
@@ -577,7 +577,7 @@ main: {
     // main::@2
   __b2:
     // while(*text)
-    // [4] if(0!=*main::text) goto main::@3 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [4] if(0!=*main::text) goto main::@3 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (text),y
     cmp #0
diff --git a/src/test/ref/post-increment-problem-3.log b/src/test/ref/post-increment-problem-3.log
index a929ad089..65dcdca8e 100644
--- a/src/test/ref/post-increment-problem-3.log
+++ b/src/test/ref/post-increment-problem-3.log
@@ -148,7 +148,7 @@ main: {
     // [2] main::n#1 = -- main::n#2 -- vbuxx=_dec_vbuaa 
     tax
     dex
-    // [3] if(0!=main::n#2) goto main::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [3] if(0!=main::n#2) goto main::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -216,7 +216,7 @@ main: {
     // [2] main::n#1 = -- main::n#2 -- vbuxx=_dec_vbuaa 
     tax
     dex
-    // [3] if(0!=main::n#2) goto main::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [3] if(0!=main::n#2) goto main::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // main::@return
diff --git a/src/test/ref/post-increment-problem-4.log b/src/test/ref/post-increment-problem-4.log
index 8f4f1034f..86b8c7a7b 100644
--- a/src/test/ref/post-increment-problem-4.log
+++ b/src/test/ref/post-increment-problem-4.log
@@ -190,7 +190,7 @@ main: {
     bne !+
     inc.z s+1
   !:
-    // [4] if(0!=main::c#1) goto main::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [4] if(0!=main::c#1) goto main::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -275,7 +275,7 @@ main: {
     bne !+
     inc.z s+1
   !:
-    // [4] if(0!=main::c#1) goto main::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [4] if(0!=main::c#1) goto main::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // main::@return
diff --git a/src/test/ref/post-increment-problem.log b/src/test/ref/post-increment-problem.log
index 4836f5982..879858d83 100644
--- a/src/test/ref/post-increment-problem.log
+++ b/src/test/ref/post-increment-problem.log
@@ -238,7 +238,7 @@ main: {
     bne !+
     inc.z msg+1
   !:
-    // [4] if(0!=main::$0) goto main::@1 -- vbuc1_neq_vbuaa_then_la1 
+    // [4] if(0!=main::$0) goto main::@1 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b1_from___b1
     jmp __b2
@@ -271,7 +271,7 @@ main: {
     jmp __b3
     // main::@3
   __b3:
-    // [10] if(0!=MESSAGE[main::i#2]) goto main::@4 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [10] if(0!=MESSAGE[main::i#2]) goto main::@4 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda MESSAGE,x
     cmp #0
     bne __b4
@@ -370,7 +370,7 @@ main: {
     bne !+
     inc.z msg+1
   !:
-    // [4] if(0!=main::$0) goto main::@1 -- vbuc1_neq_vbuaa_then_la1 
+    // [4] if(0!=main::$0) goto main::@1 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b1
     // main::@2
@@ -404,7 +404,7 @@ main: {
     // main::@3
   __b3:
     // while(MESSAGE[i])
-    // [10] if(0!=MESSAGE[main::i#2]) goto main::@4 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [10] if(0!=MESSAGE[main::i#2]) goto main::@4 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda MESSAGE,x
     cmp #0
     bne __b4
diff --git a/src/test/ref/primes-1000-2.log b/src/test/ref/primes-1000-2.log
index f126db9b4..847cdeaff 100644
--- a/src/test/ref/primes-1000-2.log
+++ b/src/test/ref/primes-1000-2.log
@@ -3054,7 +3054,7 @@ utoa: {
     sta.z digit_value
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [88] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [88] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -3129,7 +3129,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [101] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [101] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -4078,7 +4078,7 @@ utoa: {
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [88] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [88] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // utoa::@7
@@ -4147,7 +4147,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [101] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [101] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/primes-1000.log b/src/test/ref/primes-1000.log
index be3f0a371..4fde1cdfc 100644
--- a/src/test/ref/primes-1000.log
+++ b/src/test/ref/primes-1000.log
@@ -4084,7 +4084,7 @@ utoa: {
     sta.z digit_value
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [113] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [113] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -4158,7 +4158,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [126] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [126] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -5528,7 +5528,7 @@ utoa: {
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [113] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [113] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // utoa::@7
@@ -5596,7 +5596,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [126] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [126] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/printf-1.asm b/src/test/ref/printf-1.asm
index f1d1dd680..1bff6e2b5 100644
--- a/src/test/ref/printf-1.asm
+++ b/src/test/ref/printf-1.asm
@@ -277,10 +277,11 @@ printf_string: {
     sta.z padding
   __b1:
     // if(!format.justify_left && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     bne __b2
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b4
     jmp __b2
   __b4:
@@ -294,10 +295,11 @@ printf_string: {
     // cputs(str)
     jsr cputs
     // if(format.justify_left && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b5
     rts
   __b5:
diff --git a/src/test/ref/printf-1.log b/src/test/ref/printf-1.log
index 4ca300182..2be511bf1 100644
--- a/src/test/ref/printf-1.log
+++ b/src/test/ref/printf-1.log
@@ -2779,16 +2779,16 @@ printf_string: {
     jmp __b1
     // printf_string::@1
   __b1:
-    // [73] if(0!=printf_string::format_justify_left#10) goto printf_string::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [73] if(0!=printf_string::format_justify_left#10) goto printf_string::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     jmp __b8
     // printf_string::@8
   __b8:
-    // [74] if(0!=printf_string::padding#3) goto printf_string::@4 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [74] if(0!=printf_string::padding#3) goto printf_string::@4 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b4
     jmp __b2
     // printf_string::@4
@@ -2815,16 +2815,16 @@ printf_string: {
     jmp __b7
     // printf_string::@7
   __b7:
-    // [79] if(0==printf_string::format_justify_left#10) goto printf_string::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [79] if(0==printf_string::format_justify_left#10) goto printf_string::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     jmp __b9
     // printf_string::@9
   __b9:
-    // [80] if(0!=printf_string::padding#3) goto printf_string::@5 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [80] if(0!=printf_string::padding#3) goto printf_string::@5 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b5
     jmp __breturn
     // printf_string::@5
@@ -2896,7 +2896,7 @@ strlen: {
     jmp __b1
     // strlen::@1
   __b1:
-    // [92] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [92] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -2987,7 +2987,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [107] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [107] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -3441,9 +3441,6 @@ Removing instruction jmp __b1
 Removing instruction jmp __b2
 Removing instruction jmp __b1
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction lda #0
-Removing instruction lda #0
-Succesful ASM optimization Pass5UnnecesaryLoadElimination
 
 FINAL SYMBOL TABLE
 const nomodify byte* COLORRAM = (byte*) 55296
@@ -3598,7 +3595,7 @@ zp[2]:27 [ memset::end#0 memcpy::destination#2 memcpy::dst#2 memcpy::dst#4 memcp
 
 
 FINAL ASSEMBLER
-Score: 15321
+Score: 15325
 
   // File Comments
 // Tests printf implementation
@@ -4019,13 +4016,14 @@ printf_string: {
     // printf_string::@1
   __b1:
     // if(!format.justify_left && padding)
-    // [73] if(0!=printf_string::format_justify_left#10) goto printf_string::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [73] if(0!=printf_string::format_justify_left#10) goto printf_string::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     // printf_string::@8
-    // [74] if(0!=printf_string::padding#3) goto printf_string::@4 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [74] if(0!=printf_string::padding#3) goto printf_string::@4 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b4
     jmp __b2
     // printf_string::@4
@@ -4050,13 +4048,14 @@ printf_string: {
     jsr cputs
     // printf_string::@7
     // if(format.justify_left && padding)
-    // [79] if(0==printf_string::format_justify_left#10) goto printf_string::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [79] if(0==printf_string::format_justify_left#10) goto printf_string::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     // printf_string::@9
-    // [80] if(0!=printf_string::padding#3) goto printf_string::@5 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [80] if(0!=printf_string::padding#3) goto printf_string::@5 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b5
     rts
     // printf_string::@5
@@ -4130,7 +4129,7 @@ strlen: {
     // strlen::@1
   __b1:
     // while(*str)
-    // [92] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [92] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -4215,7 +4214,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [107] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [107] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
diff --git a/src/test/ref/printf-10.log b/src/test/ref/printf-10.log
index e1a840c07..e2c3c57db 100644
--- a/src/test/ref/printf-10.log
+++ b/src/test/ref/printf-10.log
@@ -393,7 +393,7 @@ cputs: {
     jmp __b1
     // cputs::@1
   __b1:
-    // [9] if(0!=*cputs::str#4) goto cputs::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [9] if(0!=*cputs::str#4) goto cputs::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -562,7 +562,7 @@ cputs: {
     // cputs::@1
   __b1:
     // while(*str)
-    // [9] if(0!=*cputs::str#4) goto cputs::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [9] if(0!=*cputs::str#4) goto cputs::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/printf-11.log b/src/test/ref/printf-11.log
index 066bf6fa7..cbf72817a 100644
--- a/src/test/ref/printf-11.log
+++ b/src/test/ref/printf-11.log
@@ -524,7 +524,7 @@ cputs: {
     jmp __b1
     // cputs::@1
   __b1:
-    // [9] if(0!=*cputs::str#3) goto cputs::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [9] if(0!=*cputs::str#3) goto cputs::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -729,7 +729,7 @@ cputs: {
     // cputs::@1
   __b1:
     // while(*str)
-    // [9] if(0!=*cputs::str#3) goto cputs::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [9] if(0!=*cputs::str#3) goto cputs::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/printf-12.asm b/src/test/ref/printf-12.asm
index b388d66a5..a326351e6 100644
--- a/src/test/ref/printf-12.asm
+++ b/src/test/ref/printf-12.asm
@@ -819,8 +819,8 @@ printf_number_buffer: {
     // There is a minimum length - work out the padding
     ldy.z __19
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b13
     // len++;
     iny
@@ -839,12 +839,14 @@ printf_number_buffer: {
     sta.z padding
   __b1:
     // if(!format.justify_left && !format.zero_padding && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     bne __b2
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
   __b8:
@@ -856,18 +858,18 @@ printf_number_buffer: {
     jsr printf_padding
   __b2:
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // cputc(buffer.sign)
-    lda.z buffer_sign
     jsr cputc
   __b3:
     // if(format.zero_padding && padding)
-    lda #0
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
   __b10:
@@ -879,8 +881,8 @@ printf_number_buffer: {
     jsr printf_padding
   __b4:
     // if(format.upper_case)
-    lda #0
-    cmp.z format_upper_case
+    lda.z format_upper_case
+    cmp #0
     beq __b5
     // strupr(buffer.digits)
     jsr strupr
@@ -892,12 +894,14 @@ printf_number_buffer: {
     sta.z cputs.s+1
     jsr cputs
     // if(format.justify_left && !format.zero_padding && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b12
     rts
   __b12:
@@ -955,8 +959,8 @@ uctoa: {
     lda RADIX_DECIMAL_VALUES_CHAR,y
     sta.z digit_value
     // if (started || value >= digit_value)
-    lda #0
-    cmp.z started
+    lda.z started
+    cmp #0
     bne __b5
     cpx.z digit_value
     bcs __b5
diff --git a/src/test/ref/printf-12.log b/src/test/ref/printf-12.log
index 587aab8dd..fe864be4d 100644
--- a/src/test/ref/printf-12.log
+++ b/src/test/ref/printf-12.log
@@ -7887,7 +7887,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [107] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [107] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -8490,7 +8490,7 @@ utoa: {
     iny
     lda (digit_values),y
     sta.z digit_value+1
-    // [189] if(0!=utoa::started#2) goto utoa::@10 -- vbuc1_neq_vbuxx_then_la1 
+    // [189] if(0!=utoa::started#2) goto utoa::@10 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b10
     jmp __b12
@@ -8560,7 +8560,7 @@ printf_number_buffer: {
     .label format_justify_left = 4
     .label format_zero_padding = 5
     .label format_upper_case = 7
-    // [201] if(0==printf_number_buffer::format_min_length#10) goto printf_number_buffer::@1 -- vbuc1_eq_vbuxx_then_la1 
+    // [201] if(0==printf_number_buffer::format_min_length#10) goto printf_number_buffer::@1 -- 0_eq_vbuxx_then_la1 
     cpx #0
     beq __b1_from_printf_number_buffer
     // [202] phi from printf_number_buffer to printf_number_buffer::@6 [phi:printf_number_buffer->printf_number_buffer::@6]
@@ -8580,9 +8580,9 @@ printf_number_buffer: {
     // [206] printf_number_buffer::len#0 = (signed byte)printf_number_buffer::$19 -- vbsyy=_sbyte_vwuz1 
     // There is a minimum length - work out the padding
     ldy.z __19
-    // [207] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [207] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b13_from___b14
     jmp __b7
     // printf_number_buffer::@7
@@ -8624,23 +8624,23 @@ printf_number_buffer: {
     jmp __b1
     // printf_number_buffer::@1
   __b1:
-    // [214] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [214] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     jmp __b17
     // printf_number_buffer::@17
   __b17:
-    // [215] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [215] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     jmp __b16
     // printf_number_buffer::@16
   __b16:
-    // [216] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [216] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
     // printf_number_buffer::@8
@@ -8659,9 +8659,9 @@ printf_number_buffer: {
     jmp __b2
     // printf_number_buffer::@2
   __b2:
-    // [219] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [219] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     jmp __b9
     // printf_number_buffer::@9
@@ -8676,16 +8676,16 @@ printf_number_buffer: {
     jmp __b3
     // printf_number_buffer::@3
   __b3:
-    // [222] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [222] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
     jmp __b18
     // printf_number_buffer::@18
   __b18:
-    // [223] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [223] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
     // printf_number_buffer::@10
@@ -8704,9 +8704,9 @@ printf_number_buffer: {
     jmp __b4
     // printf_number_buffer::@4
   __b4:
-    // [226] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_upper_case
+    // [226] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- 0_eq_vbuz1_then_la1 
+    lda.z format_upper_case
+    cmp #0
     beq __b5_from___b4
     // [227] phi from printf_number_buffer::@4 to printf_number_buffer::@11 [phi:printf_number_buffer::@4->printf_number_buffer::@11]
   __b11_from___b4:
@@ -8735,23 +8735,23 @@ printf_number_buffer: {
     jmp __b15
     // printf_number_buffer::@15
   __b15:
-    // [231] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [231] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     jmp __b20
     // printf_number_buffer::@20
   __b20:
-    // [232] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [232] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
     jmp __b19
     // printf_number_buffer::@19
   __b19:
-    // [233] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [233] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b12
     jmp __breturn
     // printf_number_buffer::@12
@@ -8833,9 +8833,9 @@ uctoa: {
     ldy.z digit
     lda RADIX_DECIMAL_VALUES_CHAR,y
     sta.z digit_value
-    // [245] if(0!=uctoa::started#2) goto uctoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [245] if(0!=uctoa::started#2) goto uctoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     jmp __b7
     // uctoa::@7
@@ -8960,7 +8960,7 @@ ultoa: {
     sta.z digit_value+2
     lda RADIX_DECIMAL_VALUES_LONG+3,y
     sta.z digit_value+3
-    // [266] if(0!=ultoa::started#2) goto ultoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [266] if(0!=ultoa::started#2) goto ultoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -9215,7 +9215,7 @@ strlen: {
     jmp __b1
     // strlen::@1
   __b1:
-    // [299] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [299] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -9301,7 +9301,7 @@ strupr: {
     jmp __b1
     // strupr::@1
   __b1:
-    // [312] if(0!=*strupr::src#2) goto strupr::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [312] if(0!=*strupr::src#2) goto strupr::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (src),y
     cmp #0
@@ -10070,11 +10070,7 @@ Removing instruction jmp __b1
 Removing instruction jmp __breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda.z digit_value+1
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
+Removing instruction lda.z buffer_sign
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction __breturn:
 Removing instruction __b2:
@@ -10526,7 +10522,7 @@ mem[12] [ printf_buffer ]
 
 
 FINAL ASSEMBLER
-Score: 35697
+Score: 35704
 
   // File Comments
 // Tests printf function call rewriting
@@ -11146,7 +11142,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [107] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [107] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
@@ -11717,7 +11713,7 @@ utoa: {
     lda (digit_values),y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [189] if(0!=utoa::started#2) goto utoa::@10 -- vbuc1_neq_vbuxx_then_la1 
+    // [189] if(0!=utoa::started#2) goto utoa::@10 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b10
     // utoa::@12
@@ -11783,7 +11779,7 @@ printf_number_buffer: {
     .label format_zero_padding = 5
     .label format_upper_case = 7
     // if(format.min_length)
-    // [201] if(0==printf_number_buffer::format_min_length#10) goto printf_number_buffer::@1 -- vbuc1_eq_vbuxx_then_la1 
+    // [201] if(0==printf_number_buffer::format_min_length#10) goto printf_number_buffer::@1 -- 0_eq_vbuxx_then_la1 
     cpx #0
     beq __b6
     // [202] phi from printf_number_buffer to printf_number_buffer::@6 [phi:printf_number_buffer->printf_number_buffer::@6]
@@ -11801,9 +11797,9 @@ printf_number_buffer: {
     // There is a minimum length - work out the padding
     ldy.z __19
     // if(buffer.sign)
-    // [207] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [207] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b13
     // printf_number_buffer::@7
     // len++;
@@ -11836,17 +11832,19 @@ printf_number_buffer: {
     // printf_number_buffer::@1
   __b1:
     // if(!format.justify_left && !format.zero_padding && padding)
-    // [214] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [214] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     // printf_number_buffer::@17
-    // [215] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    cmp.z format_zero_padding
+    // [215] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     // printf_number_buffer::@16
-    // [216] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [216] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
     // printf_number_buffer::@8
@@ -11865,14 +11863,13 @@ printf_number_buffer: {
     // printf_number_buffer::@2
   __b2:
     // if(buffer.sign)
-    // [219] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [219] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // printf_number_buffer::@9
     // cputc(buffer.sign)
     // [220] cputc::c#2 = printf_number_buffer::buffer_sign#10 -- vbuaa=vbuz1 
-    lda.z buffer_sign
     // [221] call cputc 
     // [111] phi from printf_number_buffer::@9 to cputc [phi:printf_number_buffer::@9->cputc]
     // [111] phi cputc::c#5 = cputc::c#2 [phi:printf_number_buffer::@9->cputc#0] -- register_copy 
@@ -11880,13 +11877,14 @@ printf_number_buffer: {
     // printf_number_buffer::@3
   __b3:
     // if(format.zero_padding && padding)
-    // [222] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [222] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
     // printf_number_buffer::@18
-    // [223] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [223] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
     // printf_number_buffer::@10
@@ -11905,9 +11903,9 @@ printf_number_buffer: {
     // printf_number_buffer::@4
   __b4:
     // if(format.upper_case)
-    // [226] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_upper_case
+    // [226] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- 0_eq_vbuz1_then_la1 
+    lda.z format_upper_case
+    cmp #0
     beq __b5
     // [227] phi from printf_number_buffer::@4 to printf_number_buffer::@11 [phi:printf_number_buffer::@4->printf_number_buffer::@11]
     // printf_number_buffer::@11
@@ -11929,17 +11927,19 @@ printf_number_buffer: {
     jsr cputs
     // printf_number_buffer::@15
     // if(format.justify_left && !format.zero_padding && padding)
-    // [231] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [231] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     // printf_number_buffer::@20
-    // [232] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- vbuc1_neq_vbuz1_then_la1 
-    cmp.z format_zero_padding
+    // [232] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
     // printf_number_buffer::@19
-    // [233] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [233] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b12
     rts
     // printf_number_buffer::@12
@@ -12021,9 +12021,9 @@ uctoa: {
     lda RADIX_DECIMAL_VALUES_CHAR,y
     sta.z digit_value
     // if (started || value >= digit_value)
-    // [245] if(0!=uctoa::started#2) goto uctoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [245] if(0!=uctoa::started#2) goto uctoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     // uctoa::@7
     // [246] if(uctoa::value#3>=uctoa::digit_value#0) goto uctoa::@5 -- vbuxx_ge_vbuz1_then_la1 
@@ -12145,7 +12145,7 @@ ultoa: {
     lda RADIX_DECIMAL_VALUES_LONG+3,y
     sta.z digit_value+3
     // if (started || value >= digit_value)
-    // [266] if(0!=ultoa::started#2) goto ultoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [266] if(0!=ultoa::started#2) goto ultoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // ultoa::@7
@@ -12382,7 +12382,7 @@ strlen: {
     // strlen::@1
   __b1:
     // while(*str)
-    // [299] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [299] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -12463,7 +12463,7 @@ strupr: {
     // strupr::@1
   __b1:
     // while(*src)
-    // [312] if(0!=*strupr::src#2) goto strupr::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [312] if(0!=*strupr::src#2) goto strupr::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (src),y
     cmp #0
diff --git a/src/test/ref/printf-13.asm b/src/test/ref/printf-13.asm
index c06986b3a..c764531bc 100644
--- a/src/test/ref/printf-13.asm
+++ b/src/test/ref/printf-13.asm
@@ -955,10 +955,11 @@ printf_string: {
     sta.z padding
   __b1:
     // if(!format.justify_left && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     bne __b2
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b4
     jmp __b2
   __b4:
@@ -972,10 +973,11 @@ printf_string: {
     // cputs(str)
     jsr cputs
     // if(format.justify_left && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b5
     rts
   __b5:
@@ -1294,8 +1296,8 @@ printf_number_buffer: {
     .label padding = $e
     .label format_min_length = $e
     // if(format.min_length)
-    lda #0
-    cmp.z format_min_length
+    lda.z format_min_length
+    cmp #0
     beq __b6
     // strlen(buffer.digits)
     lda #<printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS
@@ -1308,8 +1310,8 @@ printf_number_buffer: {
     // There is a minimum length - work out the padding
     ldx.z __19
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b13
     // len++;
     inx
@@ -1328,12 +1330,14 @@ printf_number_buffer: {
     sta.z padding
   __b1:
     // if(!format.justify_left && !format.zero_padding && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     bne __b2
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
   __b8:
@@ -1345,18 +1349,18 @@ printf_number_buffer: {
     jsr printf_padding
   __b2:
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // cputc(buffer.sign)
-    lda.z buffer_sign
     jsr cputc
   __b3:
     // if(format.zero_padding && padding)
-    lda #0
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
   __b10:
@@ -1368,8 +1372,8 @@ printf_number_buffer: {
     jsr printf_padding
   __b4:
     // if(format.upper_case)
-    lda #0
-    cmp.z format_upper_case
+    lda.z format_upper_case
+    cmp #0
     beq __b5
     // strupr(buffer.digits)
     jsr strupr
@@ -1381,12 +1385,14 @@ printf_number_buffer: {
     sta.z cputs.s+1
     jsr cputs
     // if(format.justify_left && !format.zero_padding && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b12
     rts
   __b12:
diff --git a/src/test/ref/printf-13.log b/src/test/ref/printf-13.log
index 997f26f4d..9fabb888e 100644
--- a/src/test/ref/printf-13.log
+++ b/src/test/ref/printf-13.log
@@ -8834,7 +8834,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [244] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [244] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -8907,16 +8907,16 @@ printf_string: {
     jmp __b1
     // printf_string::@1
   __b1:
-    // [258] if(0!=printf_string::format_justify_left#10) goto printf_string::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [258] if(0!=printf_string::format_justify_left#10) goto printf_string::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     jmp __b8
     // printf_string::@8
   __b8:
-    // [259] if(0!=printf_string::padding#3) goto printf_string::@4 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [259] if(0!=printf_string::padding#3) goto printf_string::@4 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b4
     jmp __b2
     // printf_string::@4
@@ -8944,16 +8944,16 @@ printf_string: {
     jmp __b7
     // printf_string::@7
   __b7:
-    // [264] if(0==printf_string::format_justify_left#10) goto printf_string::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [264] if(0==printf_string::format_justify_left#10) goto printf_string::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     jmp __b9
     // printf_string::@9
   __b9:
-    // [265] if(0!=printf_string::padding#3) goto printf_string::@5 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [265] if(0!=printf_string::padding#3) goto printf_string::@5 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b5
     jmp __breturn
     // printf_string::@5
@@ -8992,7 +8992,7 @@ printf_sint: {
     jmp __b3
     // printf_sint::@3
   __b3:
-    // [272] if(0==printf_sint::format_sign_always#16) goto printf_sint::@2 -- vbuc1_eq_vbuxx_then_la1 
+    // [272] if(0==printf_sint::format_sign_always#16) goto printf_sint::@2 -- 0_eq_vbuxx_then_la1 
     cpx #0
     beq __b2_from___b3
     jmp __b4
@@ -9160,7 +9160,7 @@ strlen: {
     jmp __b1
     // strlen::@1
   __b1:
-    // [301] if(0!=*strlen::str#3) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [301] if(0!=*strlen::str#3) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -9390,7 +9390,7 @@ utoa: {
     iny
     lda (digit_values),y
     sta.z digit_value+1
-    // [332] if(0!=utoa::started#2) goto utoa::@10 -- vbuc1_neq_vbuxx_then_la1 
+    // [332] if(0!=utoa::started#2) goto utoa::@10 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b10
     jmp __b12
@@ -9461,9 +9461,9 @@ printf_number_buffer: {
     .label format_upper_case = 8
     .label padding = $e
     .label format_min_length = $e
-    // [344] if(0==printf_number_buffer::format_min_length#2) goto printf_number_buffer::@1 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_min_length
+    // [344] if(0==printf_number_buffer::format_min_length#2) goto printf_number_buffer::@1 -- 0_eq_vbuz1_then_la1 
+    lda.z format_min_length
+    cmp #0
     beq __b1_from_printf_number_buffer
     // [345] phi from printf_number_buffer to printf_number_buffer::@6 [phi:printf_number_buffer->printf_number_buffer::@6]
   __b6_from_printf_number_buffer:
@@ -9487,9 +9487,9 @@ printf_number_buffer: {
     // [349] printf_number_buffer::len#0 = (signed byte)printf_number_buffer::$19 -- vbsxx=_sbyte_vwuz1 
     // There is a minimum length - work out the padding
     ldx.z __19
-    // [350] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [350] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b13_from___b14
     jmp __b7
     // printf_number_buffer::@7
@@ -9531,23 +9531,23 @@ printf_number_buffer: {
     jmp __b1
     // printf_number_buffer::@1
   __b1:
-    // [357] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [357] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     jmp __b17
     // printf_number_buffer::@17
   __b17:
-    // [358] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [358] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     jmp __b16
     // printf_number_buffer::@16
   __b16:
-    // [359] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [359] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
     // printf_number_buffer::@8
@@ -9566,9 +9566,9 @@ printf_number_buffer: {
     jmp __b2
     // printf_number_buffer::@2
   __b2:
-    // [362] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [362] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     jmp __b9
     // printf_number_buffer::@9
@@ -9583,16 +9583,16 @@ printf_number_buffer: {
     jmp __b3
     // printf_number_buffer::@3
   __b3:
-    // [365] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [365] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
     jmp __b18
     // printf_number_buffer::@18
   __b18:
-    // [366] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [366] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
     // printf_number_buffer::@10
@@ -9611,9 +9611,9 @@ printf_number_buffer: {
     jmp __b4
     // printf_number_buffer::@4
   __b4:
-    // [369] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_upper_case
+    // [369] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- 0_eq_vbuz1_then_la1 
+    lda.z format_upper_case
+    cmp #0
     beq __b5_from___b4
     // [370] phi from printf_number_buffer::@4 to printf_number_buffer::@11 [phi:printf_number_buffer::@4->printf_number_buffer::@11]
   __b11_from___b4:
@@ -9642,23 +9642,23 @@ printf_number_buffer: {
     jmp __b15
     // printf_number_buffer::@15
   __b15:
-    // [374] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [374] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     jmp __b20
     // printf_number_buffer::@20
   __b20:
-    // [375] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [375] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
     jmp __b19
     // printf_number_buffer::@19
   __b19:
-    // [376] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [376] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b12
     jmp __breturn
     // printf_number_buffer::@12
@@ -9861,7 +9861,7 @@ strupr: {
     jmp __b1
     // strupr::@1
   __b1:
-    // [402] if(0!=*strupr::src#2) goto strupr::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [402] if(0!=*strupr::src#2) goto strupr::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (src),y
     cmp #0
@@ -10719,14 +10719,8 @@ Removing instruction jmp __b1
 Removing instruction jmp __b1
 Removing instruction jmp __breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction lda #0
-Removing instruction lda #0
 Removing instruction lda.z digit_value+1
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
+Removing instruction lda.z buffer_sign
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction __breturn:
 Removing instruction __b2:
@@ -11052,7 +11046,7 @@ mem[12] [ printf_buffer ]
 
 
 FINAL ASSEMBLER
-Score: 23726
+Score: 23737
 
   // File Comments
 // Tests printf function call rewriting
@@ -12613,7 +12607,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [244] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [244] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
@@ -12678,13 +12672,14 @@ printf_string: {
     // printf_string::@1
   __b1:
     // if(!format.justify_left && padding)
-    // [258] if(0!=printf_string::format_justify_left#10) goto printf_string::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [258] if(0!=printf_string::format_justify_left#10) goto printf_string::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     // printf_string::@8
-    // [259] if(0!=printf_string::padding#3) goto printf_string::@4 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [259] if(0!=printf_string::padding#3) goto printf_string::@4 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b4
     jmp __b2
     // printf_string::@4
@@ -12710,13 +12705,14 @@ printf_string: {
     jsr cputs
     // printf_string::@7
     // if(format.justify_left && padding)
-    // [264] if(0==printf_string::format_justify_left#10) goto printf_string::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [264] if(0==printf_string::format_justify_left#10) goto printf_string::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     // printf_string::@9
-    // [265] if(0!=printf_string::padding#3) goto printf_string::@5 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [265] if(0!=printf_string::padding#3) goto printf_string::@5 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b5
     rts
     // printf_string::@5
@@ -12756,7 +12752,7 @@ printf_sint: {
     bmi __b1
     // printf_sint::@3
     // if(format.sign_always)
-    // [272] if(0==printf_sint::format_sign_always#16) goto printf_sint::@2 -- vbuc1_eq_vbuxx_then_la1 
+    // [272] if(0==printf_sint::format_sign_always#16) goto printf_sint::@2 -- 0_eq_vbuxx_then_la1 
     cpx #0
     beq __b2
     // printf_sint::@4
@@ -12914,7 +12910,7 @@ strlen: {
     // strlen::@1
   __b1:
     // while(*str)
-    // [301] if(0!=*strlen::str#3) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [301] if(0!=*strlen::str#3) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -13139,7 +13135,7 @@ utoa: {
     lda (digit_values),y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [332] if(0!=utoa::started#2) goto utoa::@10 -- vbuc1_neq_vbuxx_then_la1 
+    // [332] if(0!=utoa::started#2) goto utoa::@10 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b10
     // utoa::@12
@@ -13206,9 +13202,9 @@ printf_number_buffer: {
     .label padding = $e
     .label format_min_length = $e
     // if(format.min_length)
-    // [344] if(0==printf_number_buffer::format_min_length#2) goto printf_number_buffer::@1 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_min_length
+    // [344] if(0==printf_number_buffer::format_min_length#2) goto printf_number_buffer::@1 -- 0_eq_vbuz1_then_la1 
+    lda.z format_min_length
+    cmp #0
     beq __b6
     // [345] phi from printf_number_buffer to printf_number_buffer::@6 [phi:printf_number_buffer->printf_number_buffer::@6]
     // printf_number_buffer::@6
@@ -13230,9 +13226,9 @@ printf_number_buffer: {
     // There is a minimum length - work out the padding
     ldx.z __19
     // if(buffer.sign)
-    // [350] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [350] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b13
     // printf_number_buffer::@7
     // len++;
@@ -13265,17 +13261,19 @@ printf_number_buffer: {
     // printf_number_buffer::@1
   __b1:
     // if(!format.justify_left && !format.zero_padding && padding)
-    // [357] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [357] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     // printf_number_buffer::@17
-    // [358] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    cmp.z format_zero_padding
+    // [358] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     // printf_number_buffer::@16
-    // [359] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [359] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
     // printf_number_buffer::@8
@@ -13294,14 +13292,13 @@ printf_number_buffer: {
     // printf_number_buffer::@2
   __b2:
     // if(buffer.sign)
-    // [362] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [362] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // printf_number_buffer::@9
     // cputc(buffer.sign)
     // [363] cputc::c#2 = printf_number_buffer::buffer_sign#10 -- vbuaa=vbuz1 
-    lda.z buffer_sign
     // [364] call cputc 
     // [229] phi from printf_number_buffer::@9 to cputc [phi:printf_number_buffer::@9->cputc]
     // [229] phi cputc::c#12 = cputc::c#2 [phi:printf_number_buffer::@9->cputc#0] -- register_copy 
@@ -13309,13 +13306,14 @@ printf_number_buffer: {
     // printf_number_buffer::@3
   __b3:
     // if(format.zero_padding && padding)
-    // [365] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [365] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
     // printf_number_buffer::@18
-    // [366] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [366] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
     // printf_number_buffer::@10
@@ -13334,9 +13332,9 @@ printf_number_buffer: {
     // printf_number_buffer::@4
   __b4:
     // if(format.upper_case)
-    // [369] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_upper_case
+    // [369] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- 0_eq_vbuz1_then_la1 
+    lda.z format_upper_case
+    cmp #0
     beq __b5
     // [370] phi from printf_number_buffer::@4 to printf_number_buffer::@11 [phi:printf_number_buffer::@4->printf_number_buffer::@11]
     // printf_number_buffer::@11
@@ -13358,17 +13356,19 @@ printf_number_buffer: {
     jsr cputs
     // printf_number_buffer::@15
     // if(format.justify_left && !format.zero_padding && padding)
-    // [374] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [374] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     // printf_number_buffer::@20
-    // [375] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- vbuc1_neq_vbuz1_then_la1 
-    cmp.z format_zero_padding
+    // [375] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
     // printf_number_buffer::@19
-    // [376] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [376] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b12
     rts
     // printf_number_buffer::@12
@@ -13558,7 +13558,7 @@ strupr: {
     // strupr::@1
   __b1:
     // while(*src)
-    // [402] if(0!=*strupr::src#2) goto strupr::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [402] if(0!=*strupr::src#2) goto strupr::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (src),y
     cmp #0
diff --git a/src/test/ref/printf-14.asm b/src/test/ref/printf-14.asm
index 263f567f6..a3cf9db71 100644
--- a/src/test/ref/printf-14.asm
+++ b/src/test/ref/printf-14.asm
@@ -273,8 +273,8 @@ uctoa: {
     lda RADIX_DECIMAL_VALUES_CHAR,y
     sta.z digit_value
     // if (started || value >= digit_value)
-    lda #0
-    cmp.z started
+    lda.z started
+    cmp #0
     bne __b5
     cpx.z digit_value
     bcs __b5
diff --git a/src/test/ref/printf-14.log b/src/test/ref/printf-14.log
index 42feea2d1..d866bd77f 100644
--- a/src/test/ref/printf-14.log
+++ b/src/test/ref/printf-14.log
@@ -3894,9 +3894,9 @@ uctoa: {
     ldy.z digit
     lda RADIX_DECIMAL_VALUES_CHAR,y
     sta.z digit_value
-    // [65] if(0!=uctoa::started#2) goto uctoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [65] if(0!=uctoa::started#2) goto uctoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     jmp __b7
     // uctoa::@7
@@ -3958,7 +3958,7 @@ printf_number_buffer: {
     jmp __b1
     // printf_number_buffer::@1
   __b1:
-    // [77] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [77] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2_from___b1
     jmp __b3
@@ -4105,7 +4105,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [105] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [105] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -5120,9 +5120,9 @@ uctoa: {
     lda RADIX_DECIMAL_VALUES_CHAR,y
     sta.z digit_value
     // if (started || value >= digit_value)
-    // [65] if(0!=uctoa::started#2) goto uctoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [65] if(0!=uctoa::started#2) goto uctoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     // uctoa::@7
     // [66] if(uctoa::value#2>=uctoa::digit_value#0) goto uctoa::@5 -- vbuxx_ge_vbuz1_then_la1 
@@ -5179,7 +5179,7 @@ printf_number_buffer: {
     .label buffer_digits = printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS
     // printf_number_buffer::@1
     // if(buffer.sign)
-    // [77] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [77] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2
     // printf_number_buffer::@3
@@ -5315,7 +5315,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [105] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [105] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
diff --git a/src/test/ref/printf-15.log b/src/test/ref/printf-15.log
index c9ff0b771..231868731 100644
--- a/src/test/ref/printf-15.log
+++ b/src/test/ref/printf-15.log
@@ -1969,7 +1969,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [57] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [57] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -2851,7 +2851,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [57] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [57] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
diff --git a/src/test/ref/printf-16.log b/src/test/ref/printf-16.log
index 9ec51c029..20713e6ed 100644
--- a/src/test/ref/printf-16.log
+++ b/src/test/ref/printf-16.log
@@ -5447,7 +5447,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [144] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [144] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -5618,7 +5618,7 @@ utoa: {
     sta.z digit_value
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [175] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [175] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -5686,7 +5686,7 @@ printf_number_buffer: {
     jmp __b1
     // printf_number_buffer::@1
   __b1:
-    // [187] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [187] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2_from___b1
     jmp __b3
@@ -7311,7 +7311,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [144] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [144] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
@@ -7484,7 +7484,7 @@ utoa: {
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [175] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [175] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // utoa::@7
@@ -7546,7 +7546,7 @@ printf_number_buffer: {
     .label buffer_digits = printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS
     // printf_number_buffer::@1
     // if(buffer.sign)
-    // [187] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [187] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2
     // printf_number_buffer::@3
diff --git a/src/test/ref/printf-2.asm b/src/test/ref/printf-2.asm
index d8cd874fe..907b615b0 100644
--- a/src/test/ref/printf-2.asm
+++ b/src/test/ref/printf-2.asm
@@ -444,8 +444,8 @@ uctoa: {
     lda (digit_values),y
     tay
     // if (started || value >= digit_value)
-    lda #0
-    cmp.z started
+    lda.z started
+    cmp #0
     bne __b10
     sty.z $ff
     cpx.z $ff
@@ -489,8 +489,8 @@ printf_number_buffer: {
     // There is a minimum length - work out the padding
     ldy.z __19
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b13
     // len++;
     iny
@@ -509,12 +509,14 @@ printf_number_buffer: {
     sta.z padding
   __b1:
     // if(!format.justify_left && !format.zero_padding && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     bne __b2
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
   __b8:
@@ -526,18 +528,18 @@ printf_number_buffer: {
     jsr printf_padding
   __b2:
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // cputc(buffer.sign)
-    lda.z buffer_sign
     jsr cputc
   __b3:
     // if(format.zero_padding && padding)
-    lda #0
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
   __b10:
@@ -549,8 +551,8 @@ printf_number_buffer: {
     jsr printf_padding
   __b4:
     // if(format.upper_case)
-    lda #0
-    cmp.z format_upper_case
+    lda.z format_upper_case
+    cmp #0
     beq __b5
     // strupr(buffer.digits)
     jsr strupr
@@ -558,12 +560,14 @@ printf_number_buffer: {
     // cputs(buffer.digits)
     jsr cputs
     // if(format.justify_left && !format.zero_padding && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b12
     rts
   __b12:
diff --git a/src/test/ref/printf-2.log b/src/test/ref/printf-2.log
index f53cd25fd..f0c89683c 100644
--- a/src/test/ref/printf-2.log
+++ b/src/test/ref/printf-2.log
@@ -5516,7 +5516,7 @@ printf_schar: {
     jmp __b3
     // printf_schar::@3
   __b3:
-    // [64] if(0==printf_schar::format_sign_always#2) goto printf_schar::@2 -- vbuc1_eq_vbuyy_then_la1 
+    // [64] if(0==printf_schar::format_sign_always#2) goto printf_schar::@2 -- 0_eq_vbuyy_then_la1 
     cpy #0
     beq __b2_from___b3
     jmp __b4
@@ -5809,9 +5809,9 @@ uctoa: {
     ldy.z digit
     lda (digit_values),y
     tay
-    // [105] if(0!=uctoa::started#2) goto uctoa::@10 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [105] if(0!=uctoa::started#2) goto uctoa::@10 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b10
     jmp __b12
     // uctoa::@12
@@ -5877,7 +5877,7 @@ printf_number_buffer: {
     .label padding = $1b
     .label format_justify_left = 5
     .label format_upper_case = 4
-    // [117] if(0==printf_number_buffer::format_min_length#2) goto printf_number_buffer::@1 -- vbuc1_eq_vbuxx_then_la1 
+    // [117] if(0==printf_number_buffer::format_min_length#2) goto printf_number_buffer::@1 -- 0_eq_vbuxx_then_la1 
     cpx #0
     beq __b1_from_printf_number_buffer
     // [118] phi from printf_number_buffer to printf_number_buffer::@6 [phi:printf_number_buffer->printf_number_buffer::@6]
@@ -5897,9 +5897,9 @@ printf_number_buffer: {
     // [122] printf_number_buffer::len#0 = (signed byte)printf_number_buffer::$19 -- vbsyy=_sbyte_vwuz1 
     // There is a minimum length - work out the padding
     ldy.z __19
-    // [123] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [123] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b13_from___b14
     jmp __b7
     // printf_number_buffer::@7
@@ -5941,23 +5941,23 @@ printf_number_buffer: {
     jmp __b1
     // printf_number_buffer::@1
   __b1:
-    // [130] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [130] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     jmp __b17
     // printf_number_buffer::@17
   __b17:
-    // [131] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [131] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     jmp __b16
     // printf_number_buffer::@16
   __b16:
-    // [132] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [132] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
     // printf_number_buffer::@8
@@ -5976,9 +5976,9 @@ printf_number_buffer: {
     jmp __b2
     // printf_number_buffer::@2
   __b2:
-    // [135] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [135] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     jmp __b9
     // printf_number_buffer::@9
@@ -5993,16 +5993,16 @@ printf_number_buffer: {
     jmp __b3
     // printf_number_buffer::@3
   __b3:
-    // [138] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [138] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
     jmp __b18
     // printf_number_buffer::@18
   __b18:
-    // [139] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [139] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
     // printf_number_buffer::@10
@@ -6021,9 +6021,9 @@ printf_number_buffer: {
     jmp __b4
     // printf_number_buffer::@4
   __b4:
-    // [142] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_upper_case
+    // [142] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- 0_eq_vbuz1_then_la1 
+    lda.z format_upper_case
+    cmp #0
     beq __b5_from___b4
     // [143] phi from printf_number_buffer::@4 to printf_number_buffer::@11 [phi:printf_number_buffer::@4->printf_number_buffer::@11]
   __b11_from___b4:
@@ -6047,23 +6047,23 @@ printf_number_buffer: {
     jmp __b15
     // printf_number_buffer::@15
   __b15:
-    // [147] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [147] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     jmp __b20
     // printf_number_buffer::@20
   __b20:
-    // [148] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [148] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
     jmp __b19
     // printf_number_buffer::@19
   __b19:
-    // [149] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [149] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b12
     jmp __breturn
     // printf_number_buffer::@12
@@ -6261,7 +6261,7 @@ utoa: {
     sta.z digit_value
     lda RADIX_HEXADECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [176] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [176] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -6393,7 +6393,7 @@ strlen: {
     jmp __b1
     // strlen::@1
   __b1:
-    // [196] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [196] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -6524,7 +6524,7 @@ strupr: {
     jmp __b1
     // strupr::@1
   __b1:
-    // [220] if(0!=*strupr::src#2) goto strupr::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [220] if(0!=*strupr::src#2) goto strupr::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (src),y
     cmp #0
@@ -6582,7 +6582,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [232] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [232] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -7126,11 +7126,7 @@ Removing instruction jmp __b2
 Removing instruction jmp __b1
 Removing instruction jmp __breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
+Removing instruction lda.z buffer_sign
 Removing instruction lda.z digit_value+1
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction __breturn:
@@ -7459,7 +7455,7 @@ mem[12] [ printf_buffer ]
 
 
 FINAL ASSEMBLER
-Score: 25320
+Score: 25327
 
   // File Comments
 // Tests printf implementation
@@ -7834,7 +7830,7 @@ printf_schar: {
     bmi __b1
     // printf_schar::@3
     // if(format.sign_always)
-    // [64] if(0==printf_schar::format_sign_always#2) goto printf_schar::@2 -- vbuc1_eq_vbuyy_then_la1 
+    // [64] if(0==printf_schar::format_sign_always#2) goto printf_schar::@2 -- 0_eq_vbuyy_then_la1 
     cpy #0
     beq __b2
     // printf_schar::@4
@@ -8119,9 +8115,9 @@ uctoa: {
     lda (digit_values),y
     tay
     // if (started || value >= digit_value)
-    // [105] if(0!=uctoa::started#2) goto uctoa::@10 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [105] if(0!=uctoa::started#2) goto uctoa::@10 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b10
     // uctoa::@12
     // [106] if(uctoa::value#2>=uctoa::digit_value#0) goto uctoa::@10 -- vbuxx_ge_vbuyy_then_la1 
@@ -8184,7 +8180,7 @@ printf_number_buffer: {
     .label format_justify_left = 5
     .label format_upper_case = 4
     // if(format.min_length)
-    // [117] if(0==printf_number_buffer::format_min_length#2) goto printf_number_buffer::@1 -- vbuc1_eq_vbuxx_then_la1 
+    // [117] if(0==printf_number_buffer::format_min_length#2) goto printf_number_buffer::@1 -- 0_eq_vbuxx_then_la1 
     cpx #0
     beq __b6
     // [118] phi from printf_number_buffer to printf_number_buffer::@6 [phi:printf_number_buffer->printf_number_buffer::@6]
@@ -8202,9 +8198,9 @@ printf_number_buffer: {
     // There is a minimum length - work out the padding
     ldy.z __19
     // if(buffer.sign)
-    // [123] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [123] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b13
     // printf_number_buffer::@7
     // len++;
@@ -8237,17 +8233,19 @@ printf_number_buffer: {
     // printf_number_buffer::@1
   __b1:
     // if(!format.justify_left && !format.zero_padding && padding)
-    // [130] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [130] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     // printf_number_buffer::@17
-    // [131] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    cmp.z format_zero_padding
+    // [131] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     // printf_number_buffer::@16
-    // [132] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [132] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
     // printf_number_buffer::@8
@@ -8266,14 +8264,13 @@ printf_number_buffer: {
     // printf_number_buffer::@2
   __b2:
     // if(buffer.sign)
-    // [135] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [135] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // printf_number_buffer::@9
     // cputc(buffer.sign)
     // [136] cputc::c#2 = printf_number_buffer::buffer_sign#10 -- vbuaa=vbuz1 
-    lda.z buffer_sign
     // [137] call cputc 
     // [207] phi from printf_number_buffer::@9 to cputc [phi:printf_number_buffer::@9->cputc]
     // [207] phi cputc::c#3 = cputc::c#2 [phi:printf_number_buffer::@9->cputc#0] -- register_copy 
@@ -8281,13 +8278,14 @@ printf_number_buffer: {
     // printf_number_buffer::@3
   __b3:
     // if(format.zero_padding && padding)
-    // [138] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [138] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
     // printf_number_buffer::@18
-    // [139] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [139] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
     // printf_number_buffer::@10
@@ -8306,9 +8304,9 @@ printf_number_buffer: {
     // printf_number_buffer::@4
   __b4:
     // if(format.upper_case)
-    // [142] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_upper_case
+    // [142] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- 0_eq_vbuz1_then_la1 
+    lda.z format_upper_case
+    cmp #0
     beq __b5
     // [143] phi from printf_number_buffer::@4 to printf_number_buffer::@11 [phi:printf_number_buffer::@4->printf_number_buffer::@11]
     // printf_number_buffer::@11
@@ -8325,17 +8323,19 @@ printf_number_buffer: {
     jsr cputs
     // printf_number_buffer::@15
     // if(format.justify_left && !format.zero_padding && padding)
-    // [147] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [147] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     // printf_number_buffer::@20
-    // [148] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- vbuc1_neq_vbuz1_then_la1 
-    cmp.z format_zero_padding
+    // [148] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
     // printf_number_buffer::@19
-    // [149] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [149] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b12
     rts
     // printf_number_buffer::@12
@@ -8524,7 +8524,7 @@ utoa: {
     lda RADIX_HEXADECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [176] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [176] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // utoa::@7
@@ -8647,7 +8647,7 @@ strlen: {
     // strlen::@1
   __b1:
     // while(*str)
-    // [196] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [196] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -8771,7 +8771,7 @@ strupr: {
     // strupr::@1
   __b1:
     // while(*src)
-    // [220] if(0!=*strupr::src#2) goto strupr::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [220] if(0!=*strupr::src#2) goto strupr::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (src),y
     cmp #0
@@ -8827,7 +8827,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [232] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [232] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
diff --git a/src/test/ref/printf-speed.log b/src/test/ref/printf-speed.log
index 17fe9297b..9906d5165 100644
--- a/src/test/ref/printf-speed.log
+++ b/src/test/ref/printf-speed.log
@@ -5037,7 +5037,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [108] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [108] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -5230,7 +5230,7 @@ utoa: {
     sta.z digit_value
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [144] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [144] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -5298,7 +5298,7 @@ printf_number_buffer: {
     jmp __b1
     // printf_number_buffer::@1
   __b1:
-    // [156] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [156] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2_from___b1
     jmp __b3
@@ -6668,7 +6668,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [108] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [108] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
@@ -6851,7 +6851,7 @@ utoa: {
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [144] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [144] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // utoa::@7
@@ -6913,7 +6913,7 @@ printf_number_buffer: {
     .label buffer_digits = printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS
     // printf_number_buffer::@1
     // if(buffer.sign)
-    // [156] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [156] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2
     // printf_number_buffer::@3
diff --git a/src/test/ref/printmsg.log b/src/test/ref/printmsg.log
index e5584e53f..11cdafee2 100644
--- a/src/test/ref/printmsg.log
+++ b/src/test/ref/printmsg.log
@@ -615,7 +615,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [15] if(0!=*print_str::str#4) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [15] if(0!=*print_str::str#4) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -884,7 +884,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [15] if(0!=*print_str::str#4) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [15] if(0!=*print_str::str#4) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/prng-xorshift.asm b/src/test/ref/prng-xorshift.asm
index d5a04f040..69afd48b3 100644
--- a/src/test/ref/prng-xorshift.asm
+++ b/src/test/ref/prng-xorshift.asm
@@ -603,8 +603,8 @@ printf_number_buffer: {
     // There is a minimum length - work out the padding
     ldy.z __19
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b13
     // len++;
     iny
@@ -623,12 +623,14 @@ printf_number_buffer: {
     sta.z padding
   __b1:
     // if(!format.justify_left && !format.zero_padding && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     bne __b2
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
   __b8:
@@ -640,18 +642,18 @@ printf_number_buffer: {
     jsr printf_padding
   __b2:
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // cputc(buffer.sign)
-    lda.z buffer_sign
     jsr cputc
   __b3:
     // if(format.zero_padding && padding)
-    lda #0
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
   __b10:
@@ -663,8 +665,8 @@ printf_number_buffer: {
     jsr printf_padding
   __b4:
     // if(format.upper_case)
-    lda #0
-    cmp.z format_upper_case
+    lda.z format_upper_case
+    cmp #0
     beq __b5
     // strupr(buffer.digits)
     jsr strupr
@@ -676,12 +678,14 @@ printf_number_buffer: {
     sta.z cputs.s+1
     jsr cputs
     // if(format.justify_left && !format.zero_padding && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b12
     rts
   __b12:
diff --git a/src/test/ref/prng-xorshift.log b/src/test/ref/prng-xorshift.log
index 5fc4b8562..e87037567 100644
--- a/src/test/ref/prng-xorshift.log
+++ b/src/test/ref/prng-xorshift.log
@@ -6122,7 +6122,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [96] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [96] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -6415,7 +6415,7 @@ utoa: {
     sta.z digit_value
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [144] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [144] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -6485,7 +6485,7 @@ printf_number_buffer: {
     .label format_zero_padding = $10
     .label format_justify_left = $c
     .label format_upper_case = $e
-    // [156] if(0==printf_number_buffer::format_min_length#2) goto printf_number_buffer::@1 -- vbuc1_eq_vbuxx_then_la1 
+    // [156] if(0==printf_number_buffer::format_min_length#2) goto printf_number_buffer::@1 -- 0_eq_vbuxx_then_la1 
     cpx #0
     beq __b1_from_printf_number_buffer
     // [157] phi from printf_number_buffer to printf_number_buffer::@6 [phi:printf_number_buffer->printf_number_buffer::@6]
@@ -6505,9 +6505,9 @@ printf_number_buffer: {
     // [161] printf_number_buffer::len#0 = (signed byte)printf_number_buffer::$19 -- vbsyy=_sbyte_vwuz1 
     // There is a minimum length - work out the padding
     ldy.z __19
-    // [162] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [162] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b13_from___b14
     jmp __b7
     // printf_number_buffer::@7
@@ -6549,23 +6549,23 @@ printf_number_buffer: {
     jmp __b1
     // printf_number_buffer::@1
   __b1:
-    // [169] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [169] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     jmp __b17
     // printf_number_buffer::@17
   __b17:
-    // [170] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [170] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     jmp __b16
     // printf_number_buffer::@16
   __b16:
-    // [171] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [171] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
     // printf_number_buffer::@8
@@ -6584,9 +6584,9 @@ printf_number_buffer: {
     jmp __b2
     // printf_number_buffer::@2
   __b2:
-    // [174] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [174] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     jmp __b9
     // printf_number_buffer::@9
@@ -6601,16 +6601,16 @@ printf_number_buffer: {
     jmp __b3
     // printf_number_buffer::@3
   __b3:
-    // [177] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [177] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
     jmp __b18
     // printf_number_buffer::@18
   __b18:
-    // [178] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [178] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
     // printf_number_buffer::@10
@@ -6629,9 +6629,9 @@ printf_number_buffer: {
     jmp __b4
     // printf_number_buffer::@4
   __b4:
-    // [181] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_upper_case
+    // [181] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- 0_eq_vbuz1_then_la1 
+    lda.z format_upper_case
+    cmp #0
     beq __b5_from___b4
     // [182] phi from printf_number_buffer::@4 to printf_number_buffer::@11 [phi:printf_number_buffer::@4->printf_number_buffer::@11]
   __b11_from___b4:
@@ -6660,23 +6660,23 @@ printf_number_buffer: {
     jmp __b15
     // printf_number_buffer::@15
   __b15:
-    // [186] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [186] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     jmp __b20
     // printf_number_buffer::@20
   __b20:
-    // [187] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [187] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
     jmp __b19
     // printf_number_buffer::@19
   __b19:
-    // [188] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [188] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b12
     jmp __breturn
     // printf_number_buffer::@12
@@ -6771,7 +6771,7 @@ ultoa: {
     sta.z digit_value+2
     lda RADIX_DECIMAL_VALUES_LONG+3,y
     sta.z digit_value+3
-    // [202] if(0!=ultoa::started#2) goto ultoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [202] if(0!=ultoa::started#2) goto ultoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -6954,7 +6954,7 @@ strlen: {
     jmp __b1
     // strlen::@1
   __b1:
-    // [228] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [228] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -7040,7 +7040,7 @@ strupr: {
     jmp __b1
     // strupr::@1
   __b1:
-    // [241] if(0!=*strupr::src#2) goto strupr::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [241] if(0!=*strupr::src#2) goto strupr::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (src),y
     cmp #0
@@ -7738,11 +7738,7 @@ Removing instruction jmp __b1
 Removing instruction jmp __breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda.z digit_value+1
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
+Removing instruction lda.z buffer_sign
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction __b2:
 Succesful ASM optimization Pass5UnusedLabelElimination
@@ -8111,7 +8107,7 @@ mem[12] [ printf_buffer ]
 
 
 FINAL ASSEMBLER
-Score: 189567
+Score: 189574
 
   // File Comments
 // Test the xorshift pseudorandom number generator
@@ -8667,7 +8663,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [96] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [96] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
@@ -8955,7 +8951,7 @@ utoa: {
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [144] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [144] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // utoa::@7
@@ -9021,7 +9017,7 @@ printf_number_buffer: {
     .label format_justify_left = $c
     .label format_upper_case = $e
     // if(format.min_length)
-    // [156] if(0==printf_number_buffer::format_min_length#2) goto printf_number_buffer::@1 -- vbuc1_eq_vbuxx_then_la1 
+    // [156] if(0==printf_number_buffer::format_min_length#2) goto printf_number_buffer::@1 -- 0_eq_vbuxx_then_la1 
     cpx #0
     beq __b6
     // [157] phi from printf_number_buffer to printf_number_buffer::@6 [phi:printf_number_buffer->printf_number_buffer::@6]
@@ -9039,9 +9035,9 @@ printf_number_buffer: {
     // There is a minimum length - work out the padding
     ldy.z __19
     // if(buffer.sign)
-    // [162] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [162] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b13
     // printf_number_buffer::@7
     // len++;
@@ -9074,17 +9070,19 @@ printf_number_buffer: {
     // printf_number_buffer::@1
   __b1:
     // if(!format.justify_left && !format.zero_padding && padding)
-    // [169] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [169] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     // printf_number_buffer::@17
-    // [170] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    cmp.z format_zero_padding
+    // [170] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     // printf_number_buffer::@16
-    // [171] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [171] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
     // printf_number_buffer::@8
@@ -9103,14 +9101,13 @@ printf_number_buffer: {
     // printf_number_buffer::@2
   __b2:
     // if(buffer.sign)
-    // [174] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [174] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // printf_number_buffer::@9
     // cputc(buffer.sign)
     // [175] cputc::c#2 = printf_number_buffer::buffer_sign#10 -- vbuaa=vbuz1 
-    lda.z buffer_sign
     // [176] call cputc 
     // [123] phi from printf_number_buffer::@9 to cputc [phi:printf_number_buffer::@9->cputc]
     // [123] phi cputc::c#3 = cputc::c#2 [phi:printf_number_buffer::@9->cputc#0] -- register_copy 
@@ -9118,13 +9115,14 @@ printf_number_buffer: {
     // printf_number_buffer::@3
   __b3:
     // if(format.zero_padding && padding)
-    // [177] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [177] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
     // printf_number_buffer::@18
-    // [178] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [178] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
     // printf_number_buffer::@10
@@ -9143,9 +9141,9 @@ printf_number_buffer: {
     // printf_number_buffer::@4
   __b4:
     // if(format.upper_case)
-    // [181] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_upper_case
+    // [181] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- 0_eq_vbuz1_then_la1 
+    lda.z format_upper_case
+    cmp #0
     beq __b5
     // [182] phi from printf_number_buffer::@4 to printf_number_buffer::@11 [phi:printf_number_buffer::@4->printf_number_buffer::@11]
     // printf_number_buffer::@11
@@ -9167,17 +9165,19 @@ printf_number_buffer: {
     jsr cputs
     // printf_number_buffer::@15
     // if(format.justify_left && !format.zero_padding && padding)
-    // [186] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [186] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     // printf_number_buffer::@20
-    // [187] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- vbuc1_neq_vbuz1_then_la1 
-    cmp.z format_zero_padding
+    // [187] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
     // printf_number_buffer::@19
-    // [188] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [188] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b12
     rts
     // printf_number_buffer::@12
@@ -9273,7 +9273,7 @@ ultoa: {
     lda RADIX_DECIMAL_VALUES_LONG+3,y
     sta.z digit_value+3
     // if (started || value >= digit_value)
-    // [202] if(0!=ultoa::started#2) goto ultoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [202] if(0!=ultoa::started#2) goto ultoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // ultoa::@7
@@ -9452,7 +9452,7 @@ strlen: {
     // strlen::@1
   __b1:
     // while(*str)
-    // [228] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [228] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -9533,7 +9533,7 @@ strupr: {
     // strupr::@1
   __b1:
     // while(*src)
-    // [241] if(0!=*strupr::src#2) goto strupr::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [241] if(0!=*strupr::src#2) goto strupr::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (src),y
     cmp #0
diff --git a/src/test/ref/problem-negative-word-const.log b/src/test/ref/problem-negative-word-const.log
index 21fb26446..47d0614c0 100644
--- a/src/test/ref/problem-negative-word-const.log
+++ b/src/test/ref/problem-negative-word-const.log
@@ -241,7 +241,7 @@ main: {
     // [3] main::$0 = main::i#2 & 1 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #1
-    // [4] if(0==main::$0) goto main::@3 -- vbuc1_eq_vbuaa_then_la1 
+    // [4] if(0==main::$0) goto main::@3 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b3_from___b1
     // [6] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
@@ -358,7 +358,7 @@ main: {
     txa
     and #1
     // if(i&1)
-    // [4] if(0==main::$0) goto main::@3 -- vbuc1_eq_vbuaa_then_la1 
+    // [4] if(0==main::$0) goto main::@3 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2
     // [6] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
diff --git a/src/test/ref/procedure-callingconvention-stack-12.log b/src/test/ref/procedure-callingconvention-stack-12.log
index 99bc7a90c..ffd7ed537 100644
--- a/src/test/ref/procedure-callingconvention-stack-12.log
+++ b/src/test/ref/procedure-callingconvention-stack-12.log
@@ -361,7 +361,7 @@ print: {
     jmp __b1
     // print::@1
   __b1:
-    // [8] if(0!=*print::str#2) goto print::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [8] if(0!=*print::str#2) goto print::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -559,7 +559,7 @@ print: {
     // print::@1
   __b1:
     // while(*str)
-    // [8] if(0!=*print::str#2) goto print::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [8] if(0!=*print::str#2) goto print::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/processor-port-test.log b/src/test/ref/processor-port-test.log
index b19ebcfed..044e07c61 100644
--- a/src/test/ref/processor-port-test.log
+++ b/src/test/ref/processor-port-test.log
@@ -2979,7 +2979,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [69] if(0!=*print_str::str#10) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [69] if(0!=*print_str::str#10) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -4169,7 +4169,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [69] if(0!=*print_str::str#10) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [69] if(0!=*print_str::str#10) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/rand-1.asm b/src/test/ref/rand-1.asm
index fb7e754d8..09bc6f9e1 100644
--- a/src/test/ref/rand-1.asm
+++ b/src/test/ref/rand-1.asm
@@ -608,8 +608,8 @@ printf_number_buffer: {
     // There is a minimum length - work out the padding
     ldy.z __19
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b13
     // len++;
     iny
@@ -628,12 +628,14 @@ printf_number_buffer: {
     sta.z padding
   __b1:
     // if(!format.justify_left && !format.zero_padding && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     bne __b2
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
   __b8:
@@ -645,18 +647,18 @@ printf_number_buffer: {
     jsr printf_padding
   __b2:
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // cputc(buffer.sign)
-    lda.z buffer_sign
     jsr cputc
   __b3:
     // if(format.zero_padding && padding)
-    lda #0
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
   __b10:
@@ -668,8 +670,8 @@ printf_number_buffer: {
     jsr printf_padding
   __b4:
     // if(format.upper_case)
-    lda #0
-    cmp.z format_upper_case
+    lda.z format_upper_case
+    cmp #0
     beq __b5
     // strupr(buffer.digits)
     jsr strupr
@@ -681,12 +683,14 @@ printf_number_buffer: {
     sta.z cputs.s+1
     jsr cputs
     // if(format.justify_left && !format.zero_padding && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b12
     rts
   __b12:
diff --git a/src/test/ref/rand-1.log b/src/test/ref/rand-1.log
index 5998f7119..683dd303c 100644
--- a/src/test/ref/rand-1.log
+++ b/src/test/ref/rand-1.log
@@ -6154,7 +6154,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [98] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [98] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -6450,7 +6450,7 @@ utoa: {
     sta.z digit_value
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [146] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [146] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -6520,7 +6520,7 @@ printf_number_buffer: {
     .label format_zero_padding = $10
     .label format_justify_left = $c
     .label format_upper_case = $e
-    // [158] if(0==printf_number_buffer::format_min_length#2) goto printf_number_buffer::@1 -- vbuc1_eq_vbuxx_then_la1 
+    // [158] if(0==printf_number_buffer::format_min_length#2) goto printf_number_buffer::@1 -- 0_eq_vbuxx_then_la1 
     cpx #0
     beq __b1_from_printf_number_buffer
     // [159] phi from printf_number_buffer to printf_number_buffer::@6 [phi:printf_number_buffer->printf_number_buffer::@6]
@@ -6540,9 +6540,9 @@ printf_number_buffer: {
     // [163] printf_number_buffer::len#0 = (signed byte)printf_number_buffer::$19 -- vbsyy=_sbyte_vwuz1 
     // There is a minimum length - work out the padding
     ldy.z __19
-    // [164] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [164] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b13_from___b14
     jmp __b7
     // printf_number_buffer::@7
@@ -6584,23 +6584,23 @@ printf_number_buffer: {
     jmp __b1
     // printf_number_buffer::@1
   __b1:
-    // [171] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [171] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     jmp __b17
     // printf_number_buffer::@17
   __b17:
-    // [172] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [172] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     jmp __b16
     // printf_number_buffer::@16
   __b16:
-    // [173] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [173] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
     // printf_number_buffer::@8
@@ -6619,9 +6619,9 @@ printf_number_buffer: {
     jmp __b2
     // printf_number_buffer::@2
   __b2:
-    // [176] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [176] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     jmp __b9
     // printf_number_buffer::@9
@@ -6636,16 +6636,16 @@ printf_number_buffer: {
     jmp __b3
     // printf_number_buffer::@3
   __b3:
-    // [179] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [179] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
     jmp __b18
     // printf_number_buffer::@18
   __b18:
-    // [180] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [180] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
     // printf_number_buffer::@10
@@ -6664,9 +6664,9 @@ printf_number_buffer: {
     jmp __b4
     // printf_number_buffer::@4
   __b4:
-    // [183] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_upper_case
+    // [183] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- 0_eq_vbuz1_then_la1 
+    lda.z format_upper_case
+    cmp #0
     beq __b5_from___b4
     // [184] phi from printf_number_buffer::@4 to printf_number_buffer::@11 [phi:printf_number_buffer::@4->printf_number_buffer::@11]
   __b11_from___b4:
@@ -6695,23 +6695,23 @@ printf_number_buffer: {
     jmp __b15
     // printf_number_buffer::@15
   __b15:
-    // [188] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [188] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     jmp __b20
     // printf_number_buffer::@20
   __b20:
-    // [189] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [189] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
     jmp __b19
     // printf_number_buffer::@19
   __b19:
-    // [190] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [190] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b12
     jmp __breturn
     // printf_number_buffer::@12
@@ -6806,7 +6806,7 @@ ultoa: {
     sta.z digit_value+2
     lda RADIX_DECIMAL_VALUES_LONG+3,y
     sta.z digit_value+3
-    // [204] if(0!=ultoa::started#2) goto ultoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [204] if(0!=ultoa::started#2) goto ultoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -6989,7 +6989,7 @@ strlen: {
     jmp __b1
     // strlen::@1
   __b1:
-    // [230] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [230] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -7075,7 +7075,7 @@ strupr: {
     jmp __b1
     // strupr::@1
   __b1:
-    // [243] if(0!=*strupr::src#2) goto strupr::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [243] if(0!=*strupr::src#2) goto strupr::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (src),y
     cmp #0
@@ -7777,11 +7777,7 @@ Removing instruction jmp __b1
 Removing instruction jmp __breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda.z digit_value+1
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
+Removing instruction lda.z buffer_sign
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction __b2:
 Succesful ASM optimization Pass5UnusedLabelElimination
@@ -8150,7 +8146,7 @@ mem[12] [ printf_buffer ]
 
 
 FINAL ASSEMBLER
-Score: 189575
+Score: 189582
 
   // File Comments
 // Test the pseudorandom number generator in stdlib.h
@@ -8713,7 +8709,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [98] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [98] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
@@ -9004,7 +9000,7 @@ utoa: {
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [146] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [146] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // utoa::@7
@@ -9070,7 +9066,7 @@ printf_number_buffer: {
     .label format_justify_left = $c
     .label format_upper_case = $e
     // if(format.min_length)
-    // [158] if(0==printf_number_buffer::format_min_length#2) goto printf_number_buffer::@1 -- vbuc1_eq_vbuxx_then_la1 
+    // [158] if(0==printf_number_buffer::format_min_length#2) goto printf_number_buffer::@1 -- 0_eq_vbuxx_then_la1 
     cpx #0
     beq __b6
     // [159] phi from printf_number_buffer to printf_number_buffer::@6 [phi:printf_number_buffer->printf_number_buffer::@6]
@@ -9088,9 +9084,9 @@ printf_number_buffer: {
     // There is a minimum length - work out the padding
     ldy.z __19
     // if(buffer.sign)
-    // [164] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [164] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b13
     // printf_number_buffer::@7
     // len++;
@@ -9123,17 +9119,19 @@ printf_number_buffer: {
     // printf_number_buffer::@1
   __b1:
     // if(!format.justify_left && !format.zero_padding && padding)
-    // [171] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [171] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     // printf_number_buffer::@17
-    // [172] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    cmp.z format_zero_padding
+    // [172] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     // printf_number_buffer::@16
-    // [173] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [173] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
     // printf_number_buffer::@8
@@ -9152,14 +9150,13 @@ printf_number_buffer: {
     // printf_number_buffer::@2
   __b2:
     // if(buffer.sign)
-    // [176] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [176] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // printf_number_buffer::@9
     // cputc(buffer.sign)
     // [177] cputc::c#2 = printf_number_buffer::buffer_sign#10 -- vbuaa=vbuz1 
-    lda.z buffer_sign
     // [178] call cputc 
     // [125] phi from printf_number_buffer::@9 to cputc [phi:printf_number_buffer::@9->cputc]
     // [125] phi cputc::c#3 = cputc::c#2 [phi:printf_number_buffer::@9->cputc#0] -- register_copy 
@@ -9167,13 +9164,14 @@ printf_number_buffer: {
     // printf_number_buffer::@3
   __b3:
     // if(format.zero_padding && padding)
-    // [179] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [179] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
     // printf_number_buffer::@18
-    // [180] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [180] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
     // printf_number_buffer::@10
@@ -9192,9 +9190,9 @@ printf_number_buffer: {
     // printf_number_buffer::@4
   __b4:
     // if(format.upper_case)
-    // [183] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_upper_case
+    // [183] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- 0_eq_vbuz1_then_la1 
+    lda.z format_upper_case
+    cmp #0
     beq __b5
     // [184] phi from printf_number_buffer::@4 to printf_number_buffer::@11 [phi:printf_number_buffer::@4->printf_number_buffer::@11]
     // printf_number_buffer::@11
@@ -9216,17 +9214,19 @@ printf_number_buffer: {
     jsr cputs
     // printf_number_buffer::@15
     // if(format.justify_left && !format.zero_padding && padding)
-    // [188] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [188] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     // printf_number_buffer::@20
-    // [189] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- vbuc1_neq_vbuz1_then_la1 
-    cmp.z format_zero_padding
+    // [189] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
     // printf_number_buffer::@19
-    // [190] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [190] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b12
     rts
     // printf_number_buffer::@12
@@ -9322,7 +9322,7 @@ ultoa: {
     lda RADIX_DECIMAL_VALUES_LONG+3,y
     sta.z digit_value+3
     // if (started || value >= digit_value)
-    // [204] if(0!=ultoa::started#2) goto ultoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [204] if(0!=ultoa::started#2) goto ultoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // ultoa::@7
@@ -9501,7 +9501,7 @@ strlen: {
     // strlen::@1
   __b1:
     // while(*str)
-    // [230] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [230] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -9582,7 +9582,7 @@ strupr: {
     // strupr::@1
   __b1:
     // while(*src)
-    // [243] if(0!=*strupr::src#2) goto strupr::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [243] if(0!=*strupr::src#2) goto strupr::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (src),y
     cmp #0
diff --git a/src/test/ref/screen-center-angle.log b/src/test/ref/screen-center-angle.log
index 1faabfb67..e9074755b 100644
--- a/src/test/ref/screen-center-angle.log
+++ b/src/test/ref/screen-center-angle.log
@@ -3301,7 +3301,7 @@ atan2_16: {
     jmp __b15
     // atan2_16::@15
   __b15:
-    // [105] if(0==atan2_16::shift#2) goto atan2_16::@17 -- vbuc1_eq_vbuyy_then_la1 
+    // [105] if(0==atan2_16::shift#2) goto atan2_16::@17 -- 0_eq_vbuyy_then_la1 
     cpy #0
     beq __b17_from___b15
     jmp __b16
@@ -4610,7 +4610,7 @@ atan2_16: {
     bcs __b14
     // atan2_16::@15
     // if(shift)
-    // [105] if(0==atan2_16::shift#2) goto atan2_16::@17 -- vbuc1_eq_vbuyy_then_la1 
+    // [105] if(0==atan2_16::shift#2) goto atan2_16::@17 -- 0_eq_vbuyy_then_la1 
     cpy #0
     beq __b17
     // atan2_16::@16
diff --git a/src/test/ref/screen-show-spiral-buckets.log b/src/test/ref/screen-show-spiral-buckets.log
index fbbb166bb..356372b9f 100644
--- a/src/test/ref/screen-show-spiral-buckets.log
+++ b/src/test/ref/screen-show-spiral-buckets.log
@@ -6555,7 +6555,7 @@ atan2_16: {
     jmp __b15
     // atan2_16::@15
   __b15:
-    // [215] if(0==atan2_16::shift#2) goto atan2_16::@17 -- vbuc1_eq_vbuyy_then_la1 
+    // [215] if(0==atan2_16::shift#2) goto atan2_16::@17 -- 0_eq_vbuyy_then_la1 
     cpy #0
     beq __b17_from___b15
     jmp __b16
@@ -8844,7 +8844,7 @@ atan2_16: {
     bcs __b14
     // atan2_16::@15
     // if(shift)
-    // [215] if(0==atan2_16::shift#2) goto atan2_16::@17 -- vbuc1_eq_vbuyy_then_la1 
+    // [215] if(0==atan2_16::shift#2) goto atan2_16::@17 -- 0_eq_vbuyy_then_la1 
     cpy #0
     beq __b17
     // atan2_16::@16
diff --git a/src/test/ref/screen-show-spiral.log b/src/test/ref/screen-show-spiral.log
index b1d88d57b..fc4772fa0 100644
--- a/src/test/ref/screen-show-spiral.log
+++ b/src/test/ref/screen-show-spiral.log
@@ -4889,7 +4889,7 @@ atan2_16: {
     jmp __b15
     // atan2_16::@15
   __b15:
-    // [154] if(0==atan2_16::shift#2) goto atan2_16::@17 -- vbuc1_eq_vbuyy_then_la1 
+    // [154] if(0==atan2_16::shift#2) goto atan2_16::@17 -- 0_eq_vbuyy_then_la1 
     cpy #0
     beq __b17_from___b15
     jmp __b16
@@ -6640,7 +6640,7 @@ atan2_16: {
     bcs __b14
     // atan2_16::@15
     // if(shift)
-    // [154] if(0==atan2_16::shift#2) goto atan2_16::@17 -- vbuc1_eq_vbuyy_then_la1 
+    // [154] if(0==atan2_16::shift#2) goto atan2_16::@17 -- 0_eq_vbuyy_then_la1 
     cpy #0
     beq __b17
     // atan2_16::@16
diff --git a/src/test/ref/semi-struct-1.log b/src/test/ref/semi-struct-1.log
index 32759d47d..48632424d 100644
--- a/src/test/ref/semi-struct-1.log
+++ b/src/test/ref/semi-struct-1.log
@@ -1808,7 +1808,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [50] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [50] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -2413,7 +2413,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [50] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [50] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/semi-struct-2.log b/src/test/ref/semi-struct-2.log
index a690f205e..0cc9f8b7b 100644
--- a/src/test/ref/semi-struct-2.log
+++ b/src/test/ref/semi-struct-2.log
@@ -5794,7 +5794,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [120] if(0!=*print_str::str#18) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [120] if(0!=*print_str::str#18) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -8085,7 +8085,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [120] if(0!=*print_str::str#18) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [120] if(0!=*print_str::str#18) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/sieve-min.log b/src/test/ref/sieve-min.log
index eb14aa832..2529cca5e 100644
--- a/src/test/ref/sieve-min.log
+++ b/src/test/ref/sieve-min.log
@@ -1075,7 +1075,7 @@ main: {
     lda.z i_1+1
     adc #>sieve
     sta.z __16+1
-    // [8] if(0!=*main::$16) goto main::@9 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [8] if(0!=*main::$16) goto main::@9 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (__16),y
     cmp #0
@@ -1117,7 +1117,7 @@ main: {
     jmp __b7
     // main::@2
   __b2:
-    // [15] if(0!=*main::sieve_i#2) goto main::@3 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [15] if(0!=*main::sieve_i#2) goto main::@3 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (sieve_i),y
     cmp #0
@@ -1554,7 +1554,7 @@ main: {
     lda.z i_1+1
     adc #>sieve
     sta.z __16+1
-    // [8] if(0!=*main::$16) goto main::@9 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [8] if(0!=*main::$16) goto main::@9 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (__16),y
     cmp #0
@@ -1590,7 +1590,7 @@ main: {
     // main::@2
   __b2:
     // if (!*sieve_i)
-    // [15] if(0!=*main::sieve_i#2) goto main::@3 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [15] if(0!=*main::sieve_i#2) goto main::@3 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (sieve_i),y
     cmp #0
diff --git a/src/test/ref/sieve.log b/src/test/ref/sieve.log
index 52a4be47a..dce3ea38f 100644
--- a/src/test/ref/sieve.log
+++ b/src/test/ref/sieve.log
@@ -4369,7 +4369,7 @@ main: {
     lda.z i_1+1
     adc #>sieve
     sta.z __33+1
-    // [46] if(0!=*main::$33) goto main::@11 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [46] if(0!=*main::$33) goto main::@11 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (__33),y
     cmp #0
@@ -4419,7 +4419,7 @@ main: {
     jmp __b8
     // main::@2
   __b2:
-    // [54] if(0!=*main::sieve_i#2) goto main::@4 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [54] if(0!=*main::sieve_i#2) goto main::@4 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (sieve_i),y
     cmp #0
@@ -4549,7 +4549,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [69] if(0!=*print_str::str#10) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [69] if(0!=*print_str::str#10) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -4953,7 +4953,7 @@ utoa: {
     sta.z digit_value
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [133] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [133] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -5195,7 +5195,7 @@ ultoa: {
     sta.z digit_value+2
     lda RADIX_DECIMAL_VALUES_LONG+3,y
     sta.z digit_value+3
-    // [172] if(0!=ultoa::started#2) goto ultoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [172] if(0!=ultoa::started#2) goto ultoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -6211,7 +6211,7 @@ main: {
     lda.z i_1+1
     adc #>sieve
     sta.z __33+1
-    // [46] if(0!=*main::$33) goto main::@11 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [46] if(0!=*main::$33) goto main::@11 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (__33),y
     cmp #0
@@ -6255,7 +6255,7 @@ main: {
     // main::@2
   __b2:
     // if (!*sieve_i)
-    // [54] if(0!=*main::sieve_i#2) goto main::@4 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [54] if(0!=*main::sieve_i#2) goto main::@4 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (sieve_i),y
     cmp #0
@@ -6383,7 +6383,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [69] if(0!=*print_str::str#10) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [69] if(0!=*print_str::str#10) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -6780,7 +6780,7 @@ utoa: {
     lda RADIX_DECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [133] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [133] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // utoa::@7
@@ -7012,7 +7012,7 @@ ultoa: {
     lda RADIX_DECIMAL_VALUES_LONG+3,y
     sta.z digit_value+3
     // if (started || value >= digit_value)
-    // [172] if(0!=ultoa::started#2) goto ultoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [172] if(0!=ultoa::started#2) goto ultoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // ultoa::@7
diff --git a/src/test/ref/sinusgen16.log b/src/test/ref/sinusgen16.log
index 5fbf37052..3d63cfb83 100644
--- a/src/test/ref/sinusgen16.log
+++ b/src/test/ref/sinusgen16.log
@@ -3183,7 +3183,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [37] if(0!=*print_str::str#3) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [37] if(0!=*print_str::str#3) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -4702,7 +4702,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [37] if(0!=*print_str::str#3) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [37] if(0!=*print_str::str#3) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/sinusgen16b.log b/src/test/ref/sinusgen16b.log
index 6f20dbd30..ee8c99221 100644
--- a/src/test/ref/sinusgen16b.log
+++ b/src/test/ref/sinusgen16b.log
@@ -4285,7 +4285,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [56] if(0!=*print_str::str#3) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [56] if(0!=*print_str::str#3) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -6329,7 +6329,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [56] if(0!=*print_str::str#3) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [56] if(0!=*print_str::str#3) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/sinusgen8.log b/src/test/ref/sinusgen8.log
index e264d3c1d..aa82e73bb 100644
--- a/src/test/ref/sinusgen8.log
+++ b/src/test/ref/sinusgen8.log
@@ -2778,7 +2778,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [43] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [43] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -4055,7 +4055,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [43] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [43] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/sinusgen8b.log b/src/test/ref/sinusgen8b.log
index a44df4f3f..d24e87b0f 100644
--- a/src/test/ref/sinusgen8b.log
+++ b/src/test/ref/sinusgen8b.log
@@ -4550,7 +4550,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [66] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [66] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -6715,7 +6715,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [66] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [66] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/sinusgenscale8.log b/src/test/ref/sinusgenscale8.log
index 5555ed6a2..24790c23e 100644
--- a/src/test/ref/sinusgenscale8.log
+++ b/src/test/ref/sinusgenscale8.log
@@ -4390,7 +4390,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [80] if(0!=*print_str::str#10) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [80] if(0!=*print_str::str#10) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -6234,7 +6234,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [80] if(0!=*print_str::str#10) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [80] if(0!=*print_str::str#10) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/stars-1.asm b/src/test/ref/stars-1.asm
index 27f04fda5..2c0efe011 100644
--- a/src/test/ref/stars-1.asm
+++ b/src/test/ref/stars-1.asm
@@ -442,8 +442,8 @@ printf_number_buffer: {
     // There is a minimum length - work out the padding
     ldy.z __19
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b13
     // len++;
     iny
@@ -462,12 +462,14 @@ printf_number_buffer: {
     sta.z padding
   __b1:
     // if(!format.justify_left && !format.zero_padding && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     bne __b2
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
   __b8:
@@ -479,18 +481,18 @@ printf_number_buffer: {
     jsr printf_padding
   __b2:
     // if(buffer.sign)
-    lda #0
-    cmp.z buffer_sign
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // cputc(buffer.sign)
-    lda.z buffer_sign
     jsr cputc
   __b3:
     // if(format.zero_padding && padding)
-    lda #0
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
   __b10:
@@ -502,8 +504,8 @@ printf_number_buffer: {
     jsr printf_padding
   __b4:
     // if(format.upper_case)
-    lda #0
-    cmp.z format_upper_case
+    lda.z format_upper_case
+    cmp #0
     beq __b5
     // strupr(buffer.digits)
     jsr strupr
@@ -515,12 +517,14 @@ printf_number_buffer: {
     sta.z cputs.s+1
     jsr cputs
     // if(format.justify_left && !format.zero_padding && padding)
-    lda #0
-    cmp.z format_justify_left
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
-    cmp.z format_zero_padding
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
-    cmp.z padding
+    lda.z padding
+    cmp #0
     bne __b12
     rts
   __b12:
@@ -606,8 +610,8 @@ uctoa: {
     lda RADIX_DECIMAL_VALUES_CHAR,y
     sta.z digit_value
     // if (started || value >= digit_value)
-    lda #0
-    cmp.z started
+    lda.z started
+    cmp #0
     bne __b5
     cpx.z digit_value
     bcs __b5
diff --git a/src/test/ref/stars-1.log b/src/test/ref/stars-1.log
index 03b3b9710..5a1db53d1 100644
--- a/src/test/ref/stars-1.log
+++ b/src/test/ref/stars-1.log
@@ -5526,7 +5526,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [76] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [76] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -5658,7 +5658,7 @@ utoa: {
     sta.z digit_value
     lda RADIX_HEXADECIMAL_VALUES+1,y
     sta.z digit_value+1
-    // [97] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [97] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     jmp __b7
@@ -5728,7 +5728,7 @@ printf_number_buffer: {
     .label format_zero_padding = 9
     .label format_justify_left = 7
     .label format_upper_case = $20
-    // [109] if(0==printf_number_buffer::format_min_length#2) goto printf_number_buffer::@1 -- vbuc1_eq_vbuxx_then_la1 
+    // [109] if(0==printf_number_buffer::format_min_length#2) goto printf_number_buffer::@1 -- 0_eq_vbuxx_then_la1 
     cpx #0
     beq __b1_from_printf_number_buffer
     // [110] phi from printf_number_buffer to printf_number_buffer::@6 [phi:printf_number_buffer->printf_number_buffer::@6]
@@ -5748,9 +5748,9 @@ printf_number_buffer: {
     // [114] printf_number_buffer::len#0 = (signed byte)printf_number_buffer::$19 -- vbsyy=_sbyte_vwuz1 
     // There is a minimum length - work out the padding
     ldy.z __19
-    // [115] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [115] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b13_from___b14
     jmp __b7
     // printf_number_buffer::@7
@@ -5792,23 +5792,23 @@ printf_number_buffer: {
     jmp __b1
     // printf_number_buffer::@1
   __b1:
-    // [122] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [122] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     jmp __b17
     // printf_number_buffer::@17
   __b17:
-    // [123] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [123] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     jmp __b16
     // printf_number_buffer::@16
   __b16:
-    // [124] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [124] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
     // printf_number_buffer::@8
@@ -5827,9 +5827,9 @@ printf_number_buffer: {
     jmp __b2
     // printf_number_buffer::@2
   __b2:
-    // [127] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [127] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     jmp __b9
     // printf_number_buffer::@9
@@ -5844,16 +5844,16 @@ printf_number_buffer: {
     jmp __b3
     // printf_number_buffer::@3
   __b3:
-    // [130] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [130] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
     jmp __b18
     // printf_number_buffer::@18
   __b18:
-    // [131] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [131] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
     // printf_number_buffer::@10
@@ -5872,9 +5872,9 @@ printf_number_buffer: {
     jmp __b4
     // printf_number_buffer::@4
   __b4:
-    // [134] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_upper_case
+    // [134] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- 0_eq_vbuz1_then_la1 
+    lda.z format_upper_case
+    cmp #0
     beq __b5_from___b4
     // [135] phi from printf_number_buffer::@4 to printf_number_buffer::@11 [phi:printf_number_buffer::@4->printf_number_buffer::@11]
   __b11_from___b4:
@@ -5903,23 +5903,23 @@ printf_number_buffer: {
     jmp __b15
     // printf_number_buffer::@15
   __b15:
-    // [139] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [139] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     jmp __b20
     // printf_number_buffer::@20
   __b20:
-    // [140] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [140] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
     jmp __b19
     // printf_number_buffer::@19
   __b19:
-    // [141] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- vbsc1_neq_vbsz1_then_la1 
-    lda #0
-    cmp.z padding
+    // [141] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b12
     jmp __breturn
     // printf_number_buffer::@12
@@ -6046,9 +6046,9 @@ uctoa: {
     ldy.z digit
     lda RADIX_DECIMAL_VALUES_CHAR,y
     sta.z digit_value
-    // [164] if(0!=uctoa::started#2) goto uctoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [164] if(0!=uctoa::started#2) goto uctoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     jmp __b7
     // uctoa::@7
@@ -6185,7 +6185,7 @@ strlen: {
     jmp __b1
     // strlen::@1
   __b1:
-    // [184] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [184] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -6271,7 +6271,7 @@ strupr: {
     jmp __b1
     // strupr::@1
   __b1:
-    // [197] if(0!=*strupr::src#2) goto strupr::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [197] if(0!=*strupr::src#2) goto strupr::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (src),y
     cmp #0
@@ -6935,11 +6935,7 @@ Removing instruction jmp __b1
 Removing instruction jmp __breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda.z digit_value+1
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
-Removing instruction lda #0
+Removing instruction lda.z buffer_sign
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction __b2:
 Succesful ASM optimization Pass5UnusedLabelElimination
@@ -7261,7 +7257,7 @@ mem[12] [ printf_buffer ]
 
 
 FINAL ASSEMBLER
-Score: 207999
+Score: 208006
 
   // File Comments
 // Stars array of struct
@@ -7730,7 +7726,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [76] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [76] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
@@ -7856,7 +7852,7 @@ utoa: {
     lda RADIX_HEXADECIMAL_VALUES+1,y
     sta.z digit_value+1
     // if (started || value >= digit_value)
-    // [97] if(0!=utoa::started#2) goto utoa::@5 -- vbuc1_neq_vbuxx_then_la1 
+    // [97] if(0!=utoa::started#2) goto utoa::@5 -- 0_neq_vbuxx_then_la1 
     cpx #0
     bne __b5
     // utoa::@7
@@ -7922,7 +7918,7 @@ printf_number_buffer: {
     .label format_justify_left = 7
     .label format_upper_case = $20
     // if(format.min_length)
-    // [109] if(0==printf_number_buffer::format_min_length#2) goto printf_number_buffer::@1 -- vbuc1_eq_vbuxx_then_la1 
+    // [109] if(0==printf_number_buffer::format_min_length#2) goto printf_number_buffer::@1 -- 0_eq_vbuxx_then_la1 
     cpx #0
     beq __b6
     // [110] phi from printf_number_buffer to printf_number_buffer::@6 [phi:printf_number_buffer->printf_number_buffer::@6]
@@ -7940,9 +7936,9 @@ printf_number_buffer: {
     // There is a minimum length - work out the padding
     ldy.z __19
     // if(buffer.sign)
-    // [115] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [115] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@13 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b13
     // printf_number_buffer::@7
     // len++;
@@ -7975,17 +7971,19 @@ printf_number_buffer: {
     // printf_number_buffer::@1
   __b1:
     // if(!format.justify_left && !format.zero_padding && padding)
-    // [122] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [122] if(0!=printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     bne __b2
     // printf_number_buffer::@17
-    // [123] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- vbuc1_neq_vbuz1_then_la1 
-    cmp.z format_zero_padding
+    // [123] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __b2
     // printf_number_buffer::@16
-    // [124] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [124] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@8 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b8
     jmp __b2
     // printf_number_buffer::@8
@@ -8004,14 +8002,13 @@ printf_number_buffer: {
     // printf_number_buffer::@2
   __b2:
     // if(buffer.sign)
-    // [127] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z buffer_sign
+    // [127] if(0==printf_number_buffer::buffer_sign#10) goto printf_number_buffer::@3 -- 0_eq_vbuz1_then_la1 
+    lda.z buffer_sign
+    cmp #0
     beq __b3
     // printf_number_buffer::@9
     // cputc(buffer.sign)
     // [128] cputc::c#2 = printf_number_buffer::buffer_sign#10 -- vbuaa=vbuz1 
-    lda.z buffer_sign
     // [129] call cputc 
     // [145] phi from printf_number_buffer::@9 to cputc [phi:printf_number_buffer::@9->cputc]
     // [145] phi cputc::c#3 = cputc::c#2 [phi:printf_number_buffer::@9->cputc#0] -- register_copy 
@@ -8019,13 +8016,14 @@ printf_number_buffer: {
     // printf_number_buffer::@3
   __b3:
     // if(format.zero_padding && padding)
-    // [130] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_zero_padding
+    // [130] if(0==printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@4 -- 0_eq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     beq __b4
     // printf_number_buffer::@18
-    // [131] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [131] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@10 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b10
     jmp __b4
     // printf_number_buffer::@10
@@ -8044,9 +8042,9 @@ printf_number_buffer: {
     // printf_number_buffer::@4
   __b4:
     // if(format.upper_case)
-    // [134] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_upper_case
+    // [134] if(0==printf_number_buffer::format_upper_case#10) goto printf_number_buffer::@5 -- 0_eq_vbuz1_then_la1 
+    lda.z format_upper_case
+    cmp #0
     beq __b5
     // [135] phi from printf_number_buffer::@4 to printf_number_buffer::@11 [phi:printf_number_buffer::@4->printf_number_buffer::@11]
     // printf_number_buffer::@11
@@ -8068,17 +8066,19 @@ printf_number_buffer: {
     jsr cputs
     // printf_number_buffer::@15
     // if(format.justify_left && !format.zero_padding && padding)
-    // [139] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- vbuc1_eq_vbuz1_then_la1 
-    lda #0
-    cmp.z format_justify_left
+    // [139] if(0==printf_number_buffer::format_justify_left#10) goto printf_number_buffer::@return -- 0_eq_vbuz1_then_la1 
+    lda.z format_justify_left
+    cmp #0
     beq __breturn
     // printf_number_buffer::@20
-    // [140] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- vbuc1_neq_vbuz1_then_la1 
-    cmp.z format_zero_padding
+    // [140] if(0!=printf_number_buffer::format_zero_padding#10) goto printf_number_buffer::@return -- 0_neq_vbuz1_then_la1 
+    lda.z format_zero_padding
+    cmp #0
     bne __breturn
     // printf_number_buffer::@19
-    // [141] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- vbsc1_neq_vbsz1_then_la1 
-    cmp.z padding
+    // [141] if(0!=printf_number_buffer::padding#10) goto printf_number_buffer::@12 -- 0_neq_vbsz1_then_la1 
+    lda.z padding
+    cmp #0
     bne __b12
     rts
     // printf_number_buffer::@12
@@ -8203,9 +8203,9 @@ uctoa: {
     lda RADIX_DECIMAL_VALUES_CHAR,y
     sta.z digit_value
     // if (started || value >= digit_value)
-    // [164] if(0!=uctoa::started#2) goto uctoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [164] if(0!=uctoa::started#2) goto uctoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     // uctoa::@7
     // [165] if(uctoa::value#2>=uctoa::digit_value#0) goto uctoa::@5 -- vbuxx_ge_vbuz1_then_la1 
@@ -8334,7 +8334,7 @@ strlen: {
     // strlen::@1
   __b1:
     // while(*str)
-    // [184] if(0!=*strlen::str#2) goto strlen::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [184] if(0!=*strlen::str#2) goto strlen::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -8415,7 +8415,7 @@ strupr: {
     // strupr::@1
   __b1:
     // while(*src)
-    // [197] if(0!=*strupr::src#2) goto strupr::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [197] if(0!=*strupr::src#2) goto strupr::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (src),y
     cmp #0
diff --git a/src/test/ref/stars-2.asm b/src/test/ref/stars-2.asm
index 15ab23c9f..502113c70 100644
--- a/src/test/ref/stars-2.asm
+++ b/src/test/ref/stars-2.asm
@@ -326,8 +326,8 @@ uctoa: {
     lda RADIX_DECIMAL_VALUES_CHAR,y
     sta.z digit_value
     // if (started || value >= digit_value)
-    lda #0
-    cmp.z started
+    lda.z started
+    cmp #0
     bne __b5
     cpx.z digit_value
     bcs __b5
diff --git a/src/test/ref/stars-2.log b/src/test/ref/stars-2.log
index 1e79f903e..45f6da3d4 100644
--- a/src/test/ref/stars-2.log
+++ b/src/test/ref/stars-2.log
@@ -4145,7 +4145,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [71] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [71] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -4223,9 +4223,9 @@ uctoa: {
     ldy.z digit
     lda RADIX_DECIMAL_VALUES_CHAR,y
     sta.z digit_value
-    // [83] if(0!=uctoa::started#2) goto uctoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [83] if(0!=uctoa::started#2) goto uctoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     jmp __b7
     // uctoa::@7
@@ -4287,7 +4287,7 @@ printf_number_buffer: {
     jmp __b1
     // printf_number_buffer::@1
   __b1:
-    // [95] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [95] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2_from___b1
     jmp __b3
@@ -5453,7 +5453,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [71] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [71] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
@@ -5530,9 +5530,9 @@ uctoa: {
     lda RADIX_DECIMAL_VALUES_CHAR,y
     sta.z digit_value
     // if (started || value >= digit_value)
-    // [83] if(0!=uctoa::started#2) goto uctoa::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z started
+    // [83] if(0!=uctoa::started#2) goto uctoa::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z started
+    cmp #0
     bne __b5
     // uctoa::@7
     // [84] if(uctoa::value#2>=uctoa::digit_value#0) goto uctoa::@5 -- vbuxx_ge_vbuz1_then_la1 
@@ -5589,7 +5589,7 @@ printf_number_buffer: {
     .label buffer_digits = printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS
     // printf_number_buffer::@1
     // if(buffer.sign)
-    // [95] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- vbuc1_eq_vbuaa_then_la1 
+    // [95] if(0==printf_number_buffer::buffer_sign#0) goto printf_number_buffer::@2 -- 0_eq_vbuaa_then_la1 
     cmp #0
     beq __b2
     // printf_number_buffer::@3
diff --git a/src/test/ref/strcpy-0.log b/src/test/ref/strcpy-0.log
index 154dd6228..684652cbf 100644
--- a/src/test/ref/strcpy-0.log
+++ b/src/test/ref/strcpy-0.log
@@ -283,7 +283,7 @@ str_cpy: {
     bne !+
     inc.z src+1
   !:
-    // [11] if(0!=str_cpy::$0) goto str_cpy::@1 -- vbuc1_neq_vbuaa_then_la1 
+    // [11] if(0!=str_cpy::$0) goto str_cpy::@1 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b1_from___b1
     jmp __breturn
@@ -417,7 +417,7 @@ str_cpy: {
     bne !+
     inc.z src+1
   !:
-    // [11] if(0!=str_cpy::$0) goto str_cpy::@1 -- vbuc1_neq_vbuaa_then_la1 
+    // [11] if(0!=str_cpy::$0) goto str_cpy::@1 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b1
     // str_cpy::@return
diff --git a/src/test/ref/string-const-consolidation-noroot.log b/src/test/ref/string-const-consolidation-noroot.log
index 16a70956a..47beb3b57 100644
--- a/src/test/ref/string-const-consolidation-noroot.log
+++ b/src/test/ref/string-const-consolidation-noroot.log
@@ -315,7 +315,7 @@ print: {
     jmp __b1
     // print::@1
   __b1:
-    // [9] if(0!=*print::string#4) goto print::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [9] if(0!=*print::string#4) goto print::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (string),y
     cmp #0
@@ -446,7 +446,7 @@ print: {
     // print::@1
   __b1:
     // while(*string)
-    // [9] if(0!=*print::string#4) goto print::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [9] if(0!=*print::string#4) goto print::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (string),y
     cmp #0
diff --git a/src/test/ref/string-const-consolidation.log b/src/test/ref/string-const-consolidation.log
index 8d91b0611..f7cd7c25d 100644
--- a/src/test/ref/string-const-consolidation.log
+++ b/src/test/ref/string-const-consolidation.log
@@ -313,7 +313,7 @@ print: {
     jmp __b1
     // print::@1
   __b1:
-    // [9] if(0!=*print::string#4) goto print::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [9] if(0!=*print::string#4) goto print::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (string),y
     cmp #0
@@ -444,7 +444,7 @@ print: {
     // print::@1
   __b1:
     // while(*string)
-    // [9] if(0!=*print::string#4) goto print::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [9] if(0!=*print::string#4) goto print::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (string),y
     cmp #0
diff --git a/src/test/ref/string-escapes-0.log b/src/test/ref/string-escapes-0.log
index 540a57385..4e1078ffb 100644
--- a/src/test/ref/string-escapes-0.log
+++ b/src/test/ref/string-escapes-0.log
@@ -141,7 +141,7 @@ main: {
     jmp __b1
     // main::@1
   __b1:
-    // [2] if(0!=MESSAGE[main::i#2]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [2] if(0!=MESSAGE[main::i#2]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda MESSAGE,x
     cmp #0
     bne __b2
@@ -206,7 +206,7 @@ main: {
     // main::@1
   __b1:
     // while(MESSAGE[i])
-    // [2] if(0!=MESSAGE[main::i#2]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [2] if(0!=MESSAGE[main::i#2]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda MESSAGE,x
     cmp #0
     bne __b2
diff --git a/src/test/ref/string-escapes-1.log b/src/test/ref/string-escapes-1.log
index 08f300830..7bb024491 100644
--- a/src/test/ref/string-escapes-1.log
+++ b/src/test/ref/string-escapes-1.log
@@ -250,7 +250,7 @@ main: {
     jmp __b1
     // main::@1
   __b1:
-    // [2] if(0!=*main::msg#2) goto main::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [2] if(0!=*main::msg#2) goto main::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (msg),y
     cmp #0
@@ -396,7 +396,7 @@ main: {
     // main::@1
   __b1:
     // while(*msg)
-    // [2] if(0!=*main::msg#2) goto main::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [2] if(0!=*main::msg#2) goto main::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (msg),y
     cmp #0
diff --git a/src/test/ref/string-escapes-2.asm b/src/test/ref/string-escapes-2.asm
index 488c1b70f..ff20135a6 100644
--- a/src/test/ref/string-escapes-2.asm
+++ b/src/test/ref/string-escapes-2.asm
@@ -9,9 +9,9 @@ main: {
     sta.z i
   __b1:
     // while(MESSAGE[i])
-    lda #0
     ldy.z i
-    cmp MESSAGE,y
+    lda MESSAGE,y
+    cmp #0
     bne __b2
     // }
     rts
diff --git a/src/test/ref/string-escapes-2.log b/src/test/ref/string-escapes-2.log
index 68e3a2419..395503e60 100644
--- a/src/test/ref/string-escapes-2.log
+++ b/src/test/ref/string-escapes-2.log
@@ -184,10 +184,10 @@ main: {
     jmp __b1
     // main::@1
   __b1:
-    // [2] if(0!=MESSAGE[main::i#2]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuz1_then_la1 
-    lda #0
+    // [2] if(0!=MESSAGE[main::i#2]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuz1_then_la1 
     ldy.z i
-    cmp MESSAGE,y
+    lda MESSAGE,y
+    cmp #0
     bne __b2
     jmp __breturn
     // main::@return
@@ -282,10 +282,10 @@ main: {
     // main::@1
   __b1:
     // while(MESSAGE[i])
-    // [2] if(0!=MESSAGE[main::i#2]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuz1_then_la1 
-    lda #0
+    // [2] if(0!=MESSAGE[main::i#2]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuz1_then_la1 
     ldy.z i
-    cmp MESSAGE,y
+    lda MESSAGE,y
+    cmp #0
     bne __b2
     // main::@return
     // }
diff --git a/src/test/ref/string-escapes-3.log b/src/test/ref/string-escapes-3.log
index ac23decb2..339229d24 100644
--- a/src/test/ref/string-escapes-3.log
+++ b/src/test/ref/string-escapes-3.log
@@ -284,7 +284,7 @@ main: {
     jmp __b1
     // main::@1
   __b1:
-    // [2] if(0!=*main::msg#2) goto main::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [2] if(0!=*main::msg#2) goto main::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (msg),y
     cmp #0
@@ -449,7 +449,7 @@ main: {
     // main::@1
   __b1:
     // while(*msg)
-    // [2] if(0!=*main::msg#2) goto main::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [2] if(0!=*main::msg#2) goto main::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (msg),y
     cmp #0
diff --git a/src/test/ref/string-escapes-4.log b/src/test/ref/string-escapes-4.log
index 174312738..9acc50357 100644
--- a/src/test/ref/string-escapes-4.log
+++ b/src/test/ref/string-escapes-4.log
@@ -214,7 +214,7 @@ main: {
     jmp __b1
     // main::@1
   __b1:
-    // [2] if(0!=MSG1[main::i#2]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [2] if(0!=MSG1[main::i#2]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda MSG1,x
     cmp #0
     bne __b2
@@ -328,7 +328,7 @@ main: {
     // main::@1
   __b1:
     // while(MSG1[i])
-    // [2] if(0!=MSG1[main::i#2]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [2] if(0!=MSG1[main::i#2]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda MSG1,x
     cmp #0
     bne __b2
diff --git a/src/test/ref/string-escapes-5.log b/src/test/ref/string-escapes-5.log
index 91ad61441..44906cb29 100644
--- a/src/test/ref/string-escapes-5.log
+++ b/src/test/ref/string-escapes-5.log
@@ -156,7 +156,7 @@ main: {
     jmp __b1
     // main::@1
   __b1:
-    // [2] if(0!=MESSAGE[main::i#2]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [2] if(0!=MESSAGE[main::i#2]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda MESSAGE,x
     cmp #0
     bne __b2
@@ -231,7 +231,7 @@ main: {
     // main::@1
   __b1:
     // while(MESSAGE[i])
-    // [2] if(0!=MESSAGE[main::i#2]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [2] if(0!=MESSAGE[main::i#2]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda MESSAGE,x
     cmp #0
     bne __b2
diff --git a/src/test/ref/strncat-0.asm b/src/test/ref/strncat-0.asm
index 7062a8cac..d06d37ed6 100644
--- a/src/test/ref/strncat-0.asm
+++ b/src/test/ref/strncat-0.asm
@@ -71,13 +71,9 @@ strncat: {
     bne !+
     inc.z source+1
   !:
-    lda #0
-    cmp.z num
-    bne !+
-    lda.z num+1
-    bne !+
-    jmp __b5
-  !:
+    lda.z num
+    ora.z num+1
+    beq __b5
     ldy #0
     lda (dst),y
     cmp #0
diff --git a/src/test/ref/strncat-0.log b/src/test/ref/strncat-0.log
index ef105c42f..406430167 100644
--- a/src/test/ref/strncat-0.log
+++ b/src/test/ref/strncat-0.log
@@ -422,9 +422,9 @@ Uplift Scope [strncat] 692: zp[2]:5 [ strncat::dst#5 strncat::dst#3 strncat::dst
 Uplift Scope [main] 40.33: zp[1]:2 [ main::i#2 main::i#1 ] 
 Uplift Scope [] 
 
-Uplifting [strncat] best 1979 combination zp[2]:5 [ strncat::dst#5 strncat::dst#3 strncat::dst#1 strncat::dst#2 ] zp[2]:3 [ strncat::source#4 strncat::source#7 strncat::source#3 ] zp[2]:7 [ strncat::num#4 strncat::num#3 ] 
-Uplifting [main] best 1859 combination reg byte x [ main::i#2 main::i#1 ] 
-Uplifting [] best 1859 combination 
+Uplifting [strncat] best 1904 combination zp[2]:5 [ strncat::dst#5 strncat::dst#3 strncat::dst#1 strncat::dst#2 ] zp[2]:3 [ strncat::source#4 strncat::source#7 strncat::source#3 ] zp[2]:7 [ strncat::num#4 strncat::num#3 ] 
+Uplifting [main] best 1784 combination reg byte x [ main::i#2 main::i#1 ] 
+Uplifting [] best 1784 combination 
 Allocated (was zp[2]:3) zp[2]:2 [ strncat::source#4 strncat::source#7 strncat::source#3 ]
 Allocated (was zp[2]:5) zp[2]:4 [ strncat::dst#5 strncat::dst#3 strncat::dst#1 strncat::dst#2 ]
 Allocated (was zp[2]:7) zp[2]:6 [ strncat::num#4 strncat::num#3 ]
@@ -484,7 +484,7 @@ main: {
     jmp __b1
     // main::@1
   __b1:
-    // [7] if(0!=build[main::i#2]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [7] if(0!=build[main::i#2]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda build,x
     cmp #0
     bne __b2
@@ -524,7 +524,7 @@ strncat: {
   // Skip the existing string at dest
     // strncat::@1
   __b1:
-    // [13] if(0!=*strncat::dst#3) goto strncat::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [13] if(0!=*strncat::dst#3) goto strncat::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (dst),y
     cmp #0
@@ -552,18 +552,14 @@ strncat: {
     bne !+
     inc.z source+1
   !:
-    // [17] if(0==strncat::num#4) goto strncat::@5 -- vbuc1_eq_vwuz1_then_la1 
-    lda #0
-    cmp.z num
-    bne !+
-    lda.z num+1
-    bne !+
-    jmp __b5
-  !:
+    // [17] if(0==strncat::num#4) goto strncat::@5 -- 0_eq_vwuz1_then_la1 
+    lda.z num
+    ora.z num+1
+    beq __b5
     jmp __b6
     // strncat::@6
   __b6:
-    // [18] if(0!=*strncat::dst#5) goto strncat::@4 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [18] if(0!=*strncat::dst#5) goto strncat::@4 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (dst),y
     cmp #0
@@ -688,7 +684,7 @@ zp[2]:6 [ strncat::num#4 strncat::num#3 ]
 
 
 FINAL ASSEMBLER
-Score: 1650
+Score: 1575
 
   // File Comments
 // Test strncat() implementation
@@ -737,7 +733,7 @@ main: {
     // main::@1
   __b1:
     // while(build[i])
-    // [7] if(0!=build[main::i#2]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [7] if(0!=build[main::i#2]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda build,x
     cmp #0
     bne __b2
@@ -776,7 +772,7 @@ strncat: {
     // strncat::@1
   __b1:
     // while (*dst)
-    // [13] if(0!=*strncat::dst#3) goto strncat::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [13] if(0!=*strncat::dst#3) goto strncat::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (dst),y
     cmp #0
@@ -803,16 +799,12 @@ strncat: {
     bne !+
     inc.z source+1
   !:
-    // [17] if(0==strncat::num#4) goto strncat::@5 -- vbuc1_eq_vwuz1_then_la1 
-    lda #0
-    cmp.z num
-    bne !+
-    lda.z num+1
-    bne !+
-    jmp __b5
-  !:
+    // [17] if(0==strncat::num#4) goto strncat::@5 -- 0_eq_vwuz1_then_la1 
+    lda.z num
+    ora.z num+1
+    beq __b5
     // strncat::@6
-    // [18] if(0!=*strncat::dst#5) goto strncat::@4 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [18] if(0!=*strncat::dst#5) goto strncat::@4 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (dst),y
     cmp #0
diff --git a/src/test/ref/struct-11.log b/src/test/ref/struct-11.log
index a700bbad8..7212bf4aa 100644
--- a/src/test/ref/struct-11.log
+++ b/src/test/ref/struct-11.log
@@ -408,7 +408,7 @@ print_person: {
     jmp __b1
     // print_person::@1
   __b1:
-    // [11] if(0!=print_person::person_name#4[print_person::i#2]) goto print_person::@2 -- vbuc1_neq_pbuz1_derefidx_vbuyy_then_la1 
+    // [11] if(0!=print_person::person_name#4[print_person::i#2]) goto print_person::@2 -- 0_neq_pbuz1_derefidx_vbuyy_then_la1 
     lda (person_name),y
     cmp #0
     bne __b2
@@ -581,7 +581,7 @@ print_person: {
     // print_person::@1
   __b1:
     // for(byte i=0; person.name[i]; i++)
-    // [11] if(0!=print_person::person_name#4[print_person::i#2]) goto print_person::@2 -- vbuc1_neq_pbuz1_derefidx_vbuyy_then_la1 
+    // [11] if(0!=print_person::person_name#4[print_person::i#2]) goto print_person::@2 -- 0_neq_pbuz1_derefidx_vbuyy_then_la1 
     lda (person_name),y
     cmp #0
     bne __b2
diff --git a/src/test/ref/struct-11b.log b/src/test/ref/struct-11b.log
index 109395b1d..5fd02a44a 100644
--- a/src/test/ref/struct-11b.log
+++ b/src/test/ref/struct-11b.log
@@ -338,7 +338,7 @@ print_person: {
     jmp __b1
     // print_person::@1
   __b1:
-    // [7] if(0!=print_person::person_initials#4[print_person::i#2]) goto print_person::@2 -- vbuc1_neq_pbuz1_derefidx_vbuyy_then_la1 
+    // [7] if(0!=print_person::person_initials#4[print_person::i#2]) goto print_person::@2 -- 0_neq_pbuz1_derefidx_vbuyy_then_la1 
     lda (person_initials),y
     cmp #0
     bne __b2
@@ -472,7 +472,7 @@ print_person: {
     // print_person::@1
   __b1:
     // for(byte i=0; person_initials[i]; i++)
-    // [7] if(0!=print_person::person_initials#4[print_person::i#2]) goto print_person::@2 -- vbuc1_neq_pbuz1_derefidx_vbuyy_then_la1 
+    // [7] if(0!=print_person::person_initials#4[print_person::i#2]) goto print_person::@2 -- 0_neq_pbuz1_derefidx_vbuyy_then_la1 
     lda (person_initials),y
     cmp #0
     bne __b2
diff --git a/src/test/ref/struct-12.log b/src/test/ref/struct-12.log
index 24a429194..40463a99b 100644
--- a/src/test/ref/struct-12.log
+++ b/src/test/ref/struct-12.log
@@ -427,7 +427,7 @@ print_person: {
     jmp __b1
     // print_person::@1
   __b1:
-    // [11] if(0!=print_person::person_name#4[print_person::i#2]) goto print_person::@2 -- vbuc1_neq_pbuz1_derefidx_vbuyy_then_la1 
+    // [11] if(0!=print_person::person_name#4[print_person::i#2]) goto print_person::@2 -- 0_neq_pbuz1_derefidx_vbuyy_then_la1 
     lda (person_name),y
     cmp #0
     bne __b2
@@ -616,7 +616,7 @@ print_person: {
     // print_person::@1
   __b1:
     // for(byte i=0; person.name[i]; i++)
-    // [11] if(0!=print_person::person_name#4[print_person::i#2]) goto print_person::@2 -- vbuc1_neq_pbuz1_derefidx_vbuyy_then_la1 
+    // [11] if(0!=print_person::person_name#4[print_person::i#2]) goto print_person::@2 -- 0_neq_pbuz1_derefidx_vbuyy_then_la1 
     lda (person_name),y
     cmp #0
     bne __b2
diff --git a/src/test/ref/struct-ptr-20.log b/src/test/ref/struct-ptr-20.log
index bc7fb1c5d..f7e6ce14c 100644
--- a/src/test/ref/struct-ptr-20.log
+++ b/src/test/ref/struct-ptr-20.log
@@ -299,7 +299,7 @@ main: {
     rts
     // main::@2
   __b2:
-    // [4] if(0!=*((byte*)main::setting#2)) goto main::@3 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [4] if(0!=*((byte*)main::setting#2)) goto main::@3 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (setting),y
     cmp #0
@@ -417,7 +417,7 @@ main: {
     // main::@2
   __b2:
     // if (! setting->off)
-    // [4] if(0!=*((byte*)main::setting#2)) goto main::@3 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [4] if(0!=*((byte*)main::setting#2)) goto main::@3 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (setting),y
     cmp #0
diff --git a/src/test/ref/struct-ptr-22.log b/src/test/ref/struct-ptr-22.log
index cbf1e99f7..2eb24925e 100644
--- a/src/test/ref/struct-ptr-22.log
+++ b/src/test/ref/struct-ptr-22.log
@@ -1157,7 +1157,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [23] if(0!=*print_str::str#3) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [23] if(0!=*print_str::str#3) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -1604,7 +1604,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [23] if(0!=*print_str::str#3) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [23] if(0!=*print_str::str#3) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/struct-ptr-28.log b/src/test/ref/struct-ptr-28.log
index 1644bcac9..e9095689c 100644
--- a/src/test/ref/struct-ptr-28.log
+++ b/src/test/ref/struct-ptr-28.log
@@ -466,7 +466,7 @@ print_person: {
     lda #0
     adc.z person+1
     sta.z __1+1
-    // [12] if(0!=print_person::$1[print_person::i#2]) goto print_person::@2 -- vbuc1_neq_pbuz1_derefidx_vbuyy_then_la1 
+    // [12] if(0!=print_person::$1[print_person::i#2]) goto print_person::@2 -- 0_neq_pbuz1_derefidx_vbuyy_then_la1 
     lda (__1),y
     cmp #0
     bne __b2
@@ -672,7 +672,7 @@ print_person: {
     lda #0
     adc.z person+1
     sta.z __1+1
-    // [12] if(0!=print_person::$1[print_person::i#2]) goto print_person::@2 -- vbuc1_neq_pbuz1_derefidx_vbuyy_then_la1 
+    // [12] if(0!=print_person::$1[print_person::i#2]) goto print_person::@2 -- 0_neq_pbuz1_derefidx_vbuyy_then_la1 
     lda (__1),y
     cmp #0
     bne __b2
diff --git a/src/test/ref/struct-ptr-31.log b/src/test/ref/struct-ptr-31.log
index 6acd17125..dae6f4558 100644
--- a/src/test/ref/struct-ptr-31.log
+++ b/src/test/ref/struct-ptr-31.log
@@ -431,7 +431,7 @@ print_person: {
     lda #0
     adc.z person+1
     sta.z __1+1
-    // [12] if(0!=print_person::$1[print_person::i#2]) goto print_person::@2 -- vbuc1_neq_pbuz1_derefidx_vbuyy_then_la1 
+    // [12] if(0!=print_person::$1[print_person::i#2]) goto print_person::@2 -- 0_neq_pbuz1_derefidx_vbuyy_then_la1 
     lda (__1),y
     cmp #0
     bne __b2
@@ -615,7 +615,7 @@ print_person: {
     lda #0
     adc.z person+1
     sta.z __1+1
-    // [12] if(0!=print_person::$1[print_person::i#2]) goto print_person::@2 -- vbuc1_neq_pbuz1_derefidx_vbuyy_then_la1 
+    // [12] if(0!=print_person::$1[print_person::i#2]) goto print_person::@2 -- 0_neq_pbuz1_derefidx_vbuyy_then_la1 
     lda (__1),y
     cmp #0
     bne __b2
diff --git a/src/test/ref/struct-ptr-34.log b/src/test/ref/struct-ptr-34.log
index 8dc1c1201..998367325 100644
--- a/src/test/ref/struct-ptr-34.log
+++ b/src/test/ref/struct-ptr-34.log
@@ -426,7 +426,7 @@ print_person: {
     jmp __b1
     // print_person::@1
   __b1:
-    // [11] if(0!=print_person::person_name#4[print_person::i#2]) goto print_person::@2 -- vbuc1_neq_pbuz1_derefidx_vbuyy_then_la1 
+    // [11] if(0!=print_person::person_name#4[print_person::i#2]) goto print_person::@2 -- 0_neq_pbuz1_derefidx_vbuyy_then_la1 
     lda (person_name),y
     cmp #0
     bne __b2
@@ -614,7 +614,7 @@ print_person: {
     // print_person::@1
   __b1:
     // for(byte i=0; person.name[i]; i++)
-    // [11] if(0!=print_person::person_name#4[print_person::i#2]) goto print_person::@2 -- vbuc1_neq_pbuz1_derefidx_vbuyy_then_la1 
+    // [11] if(0!=print_person::person_name#4[print_person::i#2]) goto print_person::@2 -- 0_neq_pbuz1_derefidx_vbuyy_then_la1 
     lda (person_name),y
     cmp #0
     bne __b2
diff --git a/src/test/ref/subexpr-optimize-4.asm b/src/test/ref/subexpr-optimize-4.asm
index cd0dacf6d..1f21deafc 100644
--- a/src/test/ref/subexpr-optimize-4.asm
+++ b/src/test/ref/subexpr-optimize-4.asm
@@ -15,8 +15,8 @@ main: {
     lda #1
     sax.z __6
     // (i&1)?i+3:i*4
-    lda #0
-    cmp.z __6
+    lda.z __6
+    cmp #0
     bne __b2
     txa
     asl
@@ -31,8 +31,8 @@ main: {
     inc.z screen+1
   !:
     // (i&1)?i+3:i*4
-    lda #0
-    cmp.z __6
+    lda.z __6
+    cmp #0
     bne __b5
     txa
     asl
diff --git a/src/test/ref/subexpr-optimize-4.log b/src/test/ref/subexpr-optimize-4.log
index d6fb57c79..8d01c9c6d 100644
--- a/src/test/ref/subexpr-optimize-4.log
+++ b/src/test/ref/subexpr-optimize-4.log
@@ -379,9 +379,9 @@ main: {
     // [2] main::$6 = main::i#2 & 1 -- vbuz1=vbuxx_band_vbuc1 
     lda #1
     sax.z __6
-    // [3] if(0!=main::$6) goto main::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z __6
+    // [3] if(0!=main::$6) goto main::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z __6
+    cmp #0
     bne __b2
     jmp __b3
     // main::@3
@@ -405,9 +405,9 @@ main: {
     bne !+
     inc.z screen+1
   !:
-    // [8] if(0!=main::$6) goto main::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z __6
+    // [8] if(0!=main::$6) goto main::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z __6
+    cmp #0
     bne __b5
     jmp __b6
     // main::@6
@@ -539,9 +539,9 @@ main: {
     lda #1
     sax.z __6
     // (i&1)?i+3:i*4
-    // [3] if(0!=main::$6) goto main::@2 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z __6
+    // [3] if(0!=main::$6) goto main::@2 -- 0_neq_vbuz1_then_la1 
+    lda.z __6
+    cmp #0
     bne __b2
     // main::@3
     // [4] main::$2 = main::i#2 << 2 -- vbuaa=vbuxx_rol_2 
@@ -563,9 +563,9 @@ main: {
     inc.z screen+1
   !:
     // (i&1)?i+3:i*4
-    // [8] if(0!=main::$6) goto main::@5 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z __6
+    // [8] if(0!=main::$6) goto main::@5 -- 0_neq_vbuz1_then_la1 
+    lda.z __6
+    cmp #0
     bne __b5
     // main::@6
     // [9] main::$8 = main::i#2 << 2 -- vbuaa=vbuxx_rol_2 
diff --git a/src/test/ref/ternary-4.asm b/src/test/ref/ternary-4.asm
index eeaae21e0..ee8dc148a 100644
--- a/src/test/ref/ternary-4.asm
+++ b/src/test/ref/ternary-4.asm
@@ -12,9 +12,10 @@ main: {
     ldx #0
   __b2:
     // (b) ? 24 + (v & 2 ? 8 : 13) * 8 : 0
-    lda #0
-    cmp.z b
+    lda.z b
+    cmp #0
     bne __b3
+    lda #0
   __b4:
     // SCREEN[i++] = x
     sta SCREEN,y
diff --git a/src/test/ref/ternary-4.log b/src/test/ref/ternary-4.log
index 378157fe6..1d20beeba 100644
--- a/src/test/ref/ternary-4.log
+++ b/src/test/ref/ternary-4.log
@@ -430,9 +430,9 @@ main: {
     jmp __b2
     // main::@2
   __b2:
-    // [3] if(0!=main::b#4) goto main::@3 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z b
+    // [3] if(0!=main::b#4) goto main::@3 -- 0_neq_vbuz1_then_la1 
+    lda.z b
+    cmp #0
     bne __b3
     // [4] phi from main::@2 to main::@4 [phi:main::@2->main::@4]
   __b4_from___b2:
@@ -469,7 +469,7 @@ main: {
     // [12] main::$1 = main::v#2 & 2 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #2
-    // [13] if(0!=main::$1) goto main::@5 -- vbuc1_neq_vbuaa_then_la1 
+    // [13] if(0!=main::$1) goto main::@5 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b5_from___b3
     // [15] phi from main::@3 to main::@6 [phi:main::@3->main::@6]
@@ -532,8 +532,6 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Removing instruction jmp __b1
 Removing instruction jmp __b2
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction lda #0
-Succesful ASM optimization Pass5UnnecesaryLoadElimination
 
 FINAL SYMBOL TABLE
 void main()
@@ -565,7 +563,7 @@ reg byte a [ main::$5 ]
 
 
 FINAL ASSEMBLER
-Score: 5351
+Score: 5551
 
   // File Comments
 // Tests the ternary operator - complex nested conditional operators
@@ -599,12 +597,13 @@ main: {
     // main::@2
   __b2:
     // (b) ? 24 + (v & 2 ? 8 : 13) * 8 : 0
-    // [3] if(0!=main::b#4) goto main::@3 -- vbuc1_neq_vbuz1_then_la1 
-    lda #0
-    cmp.z b
+    // [3] if(0!=main::b#4) goto main::@3 -- 0_neq_vbuz1_then_la1 
+    lda.z b
+    cmp #0
     bne __b3
     // [4] phi from main::@2 to main::@4 [phi:main::@2->main::@4]
     // [4] phi main::x#0 = 0 [phi:main::@2->main::@4#0] -- vbuaa=vbuc1 
+    lda #0
     // main::@4
   __b4:
     // SCREEN[i++] = x
@@ -638,7 +637,7 @@ main: {
     txa
     and #2
     // v & 2 ? 8 : 13
-    // [13] if(0!=main::$1) goto main::@5 -- vbuc1_neq_vbuaa_then_la1 
+    // [13] if(0!=main::$1) goto main::@5 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b5
     // [15] phi from main::@3 to main::@6 [phi:main::@3->main::@6]
diff --git a/src/test/ref/test-comparisons-sword.log b/src/test/ref/test-comparisons-sword.log
index 21e56239d..8f98c95da 100644
--- a/src/test/ref/test-comparisons-sword.log
+++ b/src/test/ref/test-comparisons-sword.log
@@ -2856,7 +2856,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [87] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [87] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -3926,7 +3926,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [87] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [87] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/test-comparisons-word.log b/src/test/ref/test-comparisons-word.log
index 91f127c53..3471a8267 100644
--- a/src/test/ref/test-comparisons-word.log
+++ b/src/test/ref/test-comparisons-word.log
@@ -2721,7 +2721,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [84] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [84] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -3721,7 +3721,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [84] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [84] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/test-comparisons.log b/src/test/ref/test-comparisons.log
index 693e73541..a4c0663a4 100644
--- a/src/test/ref/test-comparisons.log
+++ b/src/test/ref/test-comparisons.log
@@ -4818,7 +4818,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [199] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [199] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -6443,7 +6443,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [199] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [199] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/test-division.log b/src/test/ref/test-division.log
index 84ad3eabc..1aabc63b8 100644
--- a/src/test/ref/test-division.log
+++ b/src/test/ref/test-division.log
@@ -5984,7 +5984,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [155] if(0!=*print_str::str#13) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [155] if(0!=*print_str::str#13) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -8216,7 +8216,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [155] if(0!=*print_str::str#13) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [155] if(0!=*print_str::str#13) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/test-multiply-16bit.log b/src/test/ref/test-multiply-16bit.log
index 93304bbe8..2dfb9ae47 100644
--- a/src/test/ref/test-multiply-16bit.log
+++ b/src/test/ref/test-multiply-16bit.log
@@ -6276,7 +6276,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [141] if(0!=*print_str::str#15) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [141] if(0!=*print_str::str#15) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -9182,7 +9182,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [141] if(0!=*print_str::str#15) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [141] if(0!=*print_str::str#15) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/test-multiply-8bit.log b/src/test/ref/test-multiply-8bit.log
index ff2d76a03..c7598e063 100644
--- a/src/test/ref/test-multiply-8bit.log
+++ b/src/test/ref/test-multiply-8bit.log
@@ -6497,7 +6497,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [161] if(0!=*print_str::str#16) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [161] if(0!=*print_str::str#16) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -9333,7 +9333,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [161] if(0!=*print_str::str#16) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [161] if(0!=*print_str::str#16) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/tod-1.log b/src/test/ref/tod-1.log
index 1c6d5a144..b9574c47f 100644
--- a/src/test/ref/tod-1.log
+++ b/src/test/ref/tod-1.log
@@ -2523,7 +2523,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [92] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [92] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     jmp __breturn
@@ -3594,7 +3594,7 @@ cputs: {
     bne !+
     inc.z s+1
   !:
-    // [92] if(0!=cputs::c#1) goto cputs::@2 -- vbuc1_neq_vbuaa_then_la1 
+    // [92] if(0!=cputs::c#1) goto cputs::@2 -- 0_neq_vbuaa_then_la1 
     cmp #0
     bne __b2
     // cputs::@return
diff --git a/src/test/ref/travis1.log b/src/test/ref/travis1.log
index 91622b386..b4090b26b 100644
--- a/src/test/ref/travis1.log
+++ b/src/test/ref/travis1.log
@@ -1008,7 +1008,7 @@ print_str: {
     jmp __b1
     // print_str::@1
   __b1:
-    // [27] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [27] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
@@ -1369,7 +1369,7 @@ print_str: {
     // print_str::@1
   __b1:
     // while(*str)
-    // [27] if(0!=*print_str::str#2) goto print_str::@2 -- vbuc1_neq__deref_pbuz1_then_la1 
+    // [27] if(0!=*print_str::str#2) goto print_str::@2 -- 0_neq__deref_pbuz1_then_la1 
     ldy #0
     lda (str),y
     cmp #0
diff --git a/src/test/ref/var-register-zp-3.log b/src/test/ref/var-register-zp-3.log
index 7e8ab9889..147a3819c 100644
--- a/src/test/ref/var-register-zp-3.log
+++ b/src/test/ref/var-register-zp-3.log
@@ -357,7 +357,7 @@ print2: {
     jmp __b1
     // print2::@1
   __b1:
-    // [9] if(0!=print2::msg[print2::i#2]) goto print2::@2 -- vbuc1_neq_pbuz1_derefidx_vbuz2_then_la1 
+    // [9] if(0!=print2::msg[print2::i#2]) goto print2::@2 -- 0_neq_pbuz1_derefidx_vbuz2_then_la1 
     ldy.z i
     lda (msg),y
     cmp #0
@@ -528,7 +528,7 @@ print2: {
     // print2::@1
   __b1:
     // for(byte i=0; msg[i]; i++)
-    // [9] if(0!=print2::msg[print2::i#2]) goto print2::@2 -- vbuc1_neq_pbuz1_derefidx_vbuz2_then_la1 
+    // [9] if(0!=print2::msg[print2::i#2]) goto print2::@2 -- 0_neq_pbuz1_derefidx_vbuz2_then_la1 
     ldy.z i
     lda (msg),y
     cmp #0
diff --git a/src/test/ref/vic20-simple.log b/src/test/ref/vic20-simple.log
index 90cfcbac5..f8b5598f3 100644
--- a/src/test/ref/vic20-simple.log
+++ b/src/test/ref/vic20-simple.log
@@ -163,7 +163,7 @@ main: {
     jmp __b1
     // main::@1
   __b1:
-    // [2] if(0!=MESSAGE[main::i#2]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [2] if(0!=MESSAGE[main::i#2]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda MESSAGE,x
     cmp #0
     bne __b2
@@ -252,7 +252,7 @@ main: {
     // main::@1
   __b1:
     // for(char i=0; MESSAGE[i]; i++)
-    // [2] if(0!=MESSAGE[main::i#2]) goto main::@2 -- vbuc1_neq_pbuc2_derefidx_vbuxx_then_la1 
+    // [2] if(0!=MESSAGE[main::i#2]) goto main::@2 -- 0_neq_pbuc1_derefidx_vbuxx_then_la1 
     lda MESSAGE,x
     cmp #0
     bne __b2