diff --git a/ref/uxnmin.c b/ref/uxnmin.c
index da8ff1a..1a2c103 100644
--- a/ref/uxnmin.c
+++ b/ref/uxnmin.c
@@ -32,17 +32,17 @@ emu_deo(Uint8 addr, Uint8 value)
 }
 
 #define FLP { s = ins & 0x40 ? &uxn.wst : &uxn.rst; }
-#define JMP(x) { if(m2) pc = (x); else pc += (Sint8)(x); }
+#define JMP(x) { if(_2) pc = (x); else pc += (Sint8)(x); }
 #define PO1(o) { o = s->dat[--*sp]; }
 #define PO2(o) { o = s->dat[--*sp] | (s->dat[--*sp] << 0x8); }
-#define POx(o) { if(m2) { PO2(o) } else PO1(o) }
+#define POx(o) { if(_2) { PO2(o) } else PO1(o) }
 #define PU1(y) { s->dat[s->ptr++] = (y); }
 #define PU2(y) { tt = (y); s->dat[s->ptr++] = tt >> 0x8; s->dat[s->ptr++] = tt; }
-#define PUx(y) { if(m2) { PU2(y) } else PU1(y) }
-#define PEK(o, x, r) { if(m2) { r = (x); o = uxn.ram[r++] << 8 | uxn.ram[r]; } else o = uxn.ram[(x)]; }
-#define POK(x, y, r) { if(m2) { r = (x); uxn.ram[r++] = y >> 8; uxn.ram[r] = y; } else uxn.ram[(x)] = (y); }
-#define DEI(o, p) { if(m2) { o = (emu_dei(p) << 8) | emu_dei(p + 1); } else o = emu_dei(p); }
-#define DEO(p, y) { if(m2) { emu_deo(p, y >> 8); emu_deo(p + 1, y); } else emu_deo(p, y); }
+#define PUx(y) { if(_2) { PU2(y) } else PU1(y) }
+#define PEK(o, x, r) { if(_2) { r = (x); o = uxn.ram[r++] << 8 | uxn.ram[r]; } else o = uxn.ram[(x)]; }
+#define POK(x, y, r) { if(_2) { r = (x); uxn.ram[r++] = y >> 8; uxn.ram[r] = y; } else uxn.ram[(x)] = (y); }
+#define DEI(o, p) { if(_2) { o = (emu_dei(p) << 8) | emu_dei(p + 1); } else o = emu_dei(p); }
+#define DEO(p, y) { if(_2) { emu_deo(p, y >> 8); emu_deo(p + 1, y); } else emu_deo(p, y); }
 
 int
 uxn_eval(Uint16 pc)
@@ -51,50 +51,50 @@ uxn_eval(Uint16 pc)
 	for(;;) {
 		Uint16 tt, a, b, c;
 		Uint8 t, kp, *sp, ins = uxn.ram[pc++];
-		/* 2 */ Uint8 m2 = ins & 0x20;
+		/* 2 */ Uint8 _2 = ins & 0x20;
 		/* r */ Stack *s = ins & 0x40 ? &uxn.rst : &uxn.wst;
 		/* k */ if(ins & 0x80) kp = s->ptr, sp = &kp; else sp = &s->ptr;
 		switch(ins & 0x1f) {
 		case 0x00:
-		switch(ins) {
-			case 0x00: /* BRK */ return 1;
-			case 0x20: /* JCI */ PO1(b) if(!b) { pc += 2; break; } /* fall */
-			case 0x40: /* JMI */ a = uxn.ram[pc++] << 8 | uxn.ram[pc++]; pc += a; break;
-			case 0x60: /* JSI */ PU2(pc + 2) a = uxn.ram[pc++] << 8 | uxn.ram[pc++]; pc += a; break;
-			case 0xa0: case 0xe0: /* LIT2 */ PU1(uxn.ram[pc++]) /* fall */
-			case 0x80: case 0xc0: /* LIT  */ PU1(uxn.ram[pc++]) break;
-		} break;
-		case 0x01: /* INC */ POx(a) PUx(a + 1) break;
-		case 0x02: /* POP */ POx(a) break;
-		case 0x03: /* NIP */ POx(a) POx(b) PUx(a) break;
-		case 0x04: /* SWP */ POx(a) POx(b) PUx(a) PUx(b) break;
-		case 0x05: /* ROT */ POx(a) POx(b) POx(c) PUx(b) PUx(a) PUx(c) break;
-		case 0x06: /* DUP */ POx(a) PUx(a) PUx(a) break;
-		case 0x07: /* OVR */ POx(a) POx(b) PUx(b) PUx(a) PUx(b) break;
-		case 0x08: /* EQU */ POx(a) POx(b) PU1(b == a) break;
-		case 0x09: /* NEQ */ POx(a) POx(b) PU1(b != a) break;
-		case 0x0a: /* GTH */ POx(a) POx(b) PU1(b > a) break;
-		case 0x0b: /* LTH */ POx(a) POx(b) PU1(b < a) break;
-		case 0x0c: /* JMP */ POx(a) JMP(a) break;
-		case 0x0d: /* JCN */ POx(a) PO1(b) if(b) JMP(a) break;
-		case 0x0e: /* JSR */ POx(a) FLP PU2(pc) JMP(a) break;
-		case 0x0f: /* STH */ POx(a) FLP PUx(a) break;
-		case 0x10: /* LDZ */ PO1(a) PEK(b, a, t) PUx(b) break;
-		case 0x11: /* STZ */ PO1(a) POx(b) POK(a, b, t) break;
-		case 0x12: /* LDR */ PO1(a) PEK(b, pc + (Sint8)a, tt) PUx(b) break;
-		case 0x13: /* STR */ PO1(a) POx(b) POK(pc + (Sint8)a, b, tt) break;
-		case 0x14: /* LDA */ PO2(a) PEK(b, a, tt) PUx(b) break;
-		case 0x15: /* STA */ PO2(a) POx(b) POK(a, b, tt) break;
-		case 0x16: /* DEI */ PO1(a) DEI(b, a) PUx(b) break;
-		case 0x17: /* DEO */ PO1(a) POx(b) DEO(a, b) break;
-		case 0x18: /* ADD */ POx(a) POx(b) PUx(b + a) break;
-		case 0x19: /* SUB */ POx(a) POx(b) PUx(b - a) break;
-		case 0x1a: /* MUL */ POx(a) POx(b) PUx(b * a) break;
-		case 0x1b: /* DIV */ POx(a) POx(b) PUx(a ? b / a : 0) break;
-		case 0x1c: /* AND */ POx(a) POx(b) PUx(b & a) break;
-		case 0x1d: /* ORA */ POx(a) POx(b) PUx(b | a) break;
-		case 0x1e: /* EOR */ POx(a) POx(b) PUx(b ^ a) break;
-		case 0x1f: /* SFT */ PO1(a) POx(b) PUx(b >> (a & 0xf) << (a >> 4)) break;
+			switch(ins) {
+			/* BRK */ case 0x00: return 1;
+			/* JCI */ case 0x20: PO1(b) if(b) { goto JMI; } pc += 2; break;
+			/* JMI */ case 0x40: JMI: pc += uxn.ram[pc++] << 8 | uxn.ram[pc++]; break;
+			/* JSI */ case 0x60: PU2(pc + 2) goto JMI;
+			/* LI2 */ case 0xa0: case 0xe0: PU1(uxn.ram[pc++]) /* fall */
+			/* LIT */ case 0x80: case 0xc0: PU1(uxn.ram[pc++]) break;
+			} break;
+		/* INC */ case 0x01: POx(a) PUx(a + 1) break;
+		/* POP */ case 0x02: POx(a) break;
+		/* NIP */ case 0x03: POx(a) POx(b) PUx(a) break;
+		/* SWP */ case 0x04: POx(a) POx(b) PUx(a) PUx(b) break;
+		/* ROT */ case 0x05: POx(a) POx(b) POx(c) PUx(b) PUx(a) PUx(c) break;
+		/* DUP */ case 0x06: POx(a) PUx(a) PUx(a) break;
+		/* OVR */ case 0x07: POx(a) POx(b) PUx(b) PUx(a) PUx(b) break;
+		/* EQU */ case 0x08: POx(a) POx(b) PU1(b == a) break;
+		/* NEQ */ case 0x09: POx(a) POx(b) PU1(b != a) break;
+		/* GTH */ case 0x0a: POx(a) POx(b) PU1(b > a) break;
+		/* LTH */ case 0x0b: POx(a) POx(b) PU1(b < a) break;
+		/* JMP */ case 0x0c: POx(a) JMP(a) break;
+		/* JCN */ case 0x0d: POx(a) PO1(b) if(b) JMP(a) break;
+		/* JSR */ case 0x0e: POx(a) FLP PU2(pc) JMP(a) break;
+		/* STH */ case 0x0f: POx(a) FLP PUx(a) break;
+		/* LDZ */ case 0x10: PO1(a) PEK(b, a, t) PUx(b) break;
+		/* STZ */ case 0x11: PO1(a) POx(b) POK(a, b, t) break;
+		/* LDR */ case 0x12: PO1(a) PEK(b, pc + (Sint8)a, tt) PUx(b) break;
+		/* STR */ case 0x13: PO1(a) POx(b) POK(pc + (Sint8)a, b, tt) break;
+		/* LDA */ case 0x14: PO2(a) PEK(b, a, tt) PUx(b) break;
+		/* STA */ case 0x15: PO2(a) POx(b) POK(a, b, tt) break;
+		/* DEI */ case 0x16: PO1(a) DEI(b, a) PUx(b) break;
+		/* DEO */ case 0x17: PO1(a) POx(b) DEO(a, b) break;
+		/* ADD */ case 0x18: POx(a) POx(b) PUx(b + a) break;
+		/* SUB */ case 0x19: POx(a) POx(b) PUx(b - a) break;
+		/* MUL */ case 0x1a: POx(a) POx(b) PUx(b * a) break;
+		/* DIV */ case 0x1b: POx(a) POx(b) PUx(a ? b / a : 0) break;
+		/* AND */ case 0x1c: POx(a) POx(b) PUx(b & a) break;
+		/* ORA */ case 0x1d: POx(a) POx(b) PUx(b | a) break;
+		/* EOR */ case 0x1e: POx(a) POx(b) PUx(b ^ a) break;
+		/* SFT */ case 0x1f: PO1(a) POx(b) PUx(b >> (a & 0xf) << (a >> 4)) break;
 		}
 	}
 }