diff --git a/ref/uxnmin.c b/ref/uxnmin.c
index e114372..da8ff1a 100644
--- a/ref/uxnmin.c
+++ b/ref/uxnmin.c
@@ -31,18 +31,18 @@ emu_deo(Uint8 addr, Uint8 value)
 	}
 }
 
-#define FLIP     { s = ins & 0x40 ? &uxn.wst : &uxn.rst; }
-#define JUMP(x)  { if(m2) pc = (x); else pc += (Sint8)(x); }
-#define POP1(o)  { o = s->dat[--*sp]; }
-#define POP2(o)  { o = s->dat[--*sp] | (s->dat[--*sp] << 0x8); }
-#define POPx(o)  { if(m2) { POP2(o) } else POP1(o) }
-#define PUSH1(y) { s->dat[s->ptr++] = (y); }
-#define PUSH2(y) { tt = (y); s->dat[s->ptr++] = tt >> 0x8; s->dat[s->ptr++] = tt; }
-#define PUSHx(y) { if(m2) { PUSH2(y) } else PUSH1(y) }
-#define PEEK(o, x, r) { if(m2) { r = (x); o = uxn.ram[r++] << 8 | uxn.ram[r]; } else o = uxn.ram[(x)]; }
-#define POKE(x, y, r) { if(m2) { r = (x); uxn.ram[r++] = y >> 8; uxn.ram[r] = y; } else uxn.ram[(x)] = (y); }
-#define DEVR(o, p)    { if(m2) { o = (emu_dei(p) << 8) | emu_dei(p + 1); } else o = emu_dei(p); }
-#define DEVW(p, y)    { if(m2) { emu_deo(p, y >> 8); emu_deo(p + 1, y); } else emu_deo(p, y); }
+#define FLP { s = ins & 0x40 ? &uxn.wst : &uxn.rst; }
+#define JMP(x) { if(m2) 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 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); }
 
 int
 uxn_eval(Uint16 pc)
@@ -58,43 +58,43 @@ uxn_eval(Uint16 pc)
 		case 0x00:
 		switch(ins) {
 			case 0x00: /* BRK */ return 1;
-			case 0x20: /* JCI */ POP1(b) if(!b) { pc += 2; break; } /* fall */
+			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 */ PUSH2(pc + 2) a = uxn.ram[pc++] << 8 | uxn.ram[pc++]; pc += a; break;
-			case 0xa0: case 0xe0: /* LIT2 */ PUSH1(uxn.ram[pc++]) /* fall */
-			case 0x80: case 0xc0: /* LIT  */ PUSH1(uxn.ram[pc++]) 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 */ POPx(a) PUSHx(a + 1) break;
-		case 0x02: /* POP */ POPx(a) break;
-		case 0x03: /* NIP */ POPx(a) POPx(b) PUSHx(a) break;
-		case 0x04: /* SWP */ POPx(a) POPx(b) PUSHx(a) PUSHx(b) break;
-		case 0x05: /* ROT */ POPx(a) POPx(b) POPx(c) PUSHx(b) PUSHx(a) PUSHx(c) break;
-		case 0x06: /* DUP */ POPx(a) PUSHx(a) PUSHx(a) break;
-		case 0x07: /* OVR */ POPx(a) POPx(b) PUSHx(b) PUSHx(a) PUSHx(b) break;
-		case 0x08: /* EQU */ POPx(a) POPx(b) PUSH1(b == a) break;
-		case 0x09: /* NEQ */ POPx(a) POPx(b) PUSH1(b != a) break;
-		case 0x0a: /* GTH */ POPx(a) POPx(b) PUSH1(b > a) break;
-		case 0x0b: /* LTH */ POPx(a) POPx(b) PUSH1(b < a) break;
-		case 0x0c: /* JMP */ POPx(a) JUMP(a) break;
-		case 0x0d: /* JCN */ POPx(a) POP1(b) if(b) JUMP(a) break;
-		case 0x0e: /* JSR */ POPx(a) FLIP PUSH2(pc) JUMP(a) break;
-		case 0x0f: /* STH */ POPx(a) FLIP PUSHx(a) break;
-		case 0x10: /* LDZ */ POP1(a) PEEK(b, a, t) PUSHx(b) break;
-		case 0x11: /* STZ */ POP1(a) POPx(b) POKE(a, b, t) break;
-		case 0x12: /* LDR */ POP1(a) PEEK(b, pc + (Sint8)a, tt) PUSHx(b) break;
-		case 0x13: /* STR */ POP1(a) POPx(b) POKE(pc + (Sint8)a, b, tt) break;
-		case 0x14: /* LDA */ POP2(a) PEEK(b, a, tt) PUSHx(b) break;
-		case 0x15: /* STA */ POP2(a) POPx(b) POKE(a, b, tt) break;
-		case 0x16: /* DEI */ POP1(a) DEVR(b, a) PUSHx(b) break;
-		case 0x17: /* DEO */ POP1(a) POPx(b) DEVW(a, b) break;
-		case 0x18: /* ADD */ POPx(a) POPx(b) PUSHx(b + a) break;
-		case 0x19: /* SUB */ POPx(a) POPx(b) PUSHx(b - a) break;
-		case 0x1a: /* MUL */ POPx(a) POPx(b) PUSHx(b * a) break;
-		case 0x1b: /* DIV */ POPx(a) POPx(b) PUSHx(a ? b / a : 0) break;
-		case 0x1c: /* AND */ POPx(a) POPx(b) PUSHx(b & a) break;
-		case 0x1d: /* ORA */ POPx(a) POPx(b) PUSHx(b | a) break;
-		case 0x1e: /* EOR */ POPx(a) POPx(b) PUSHx(b ^ a) break;
-		case 0x1f: /* SFT */ POP1(a) POPx(b) PUSHx(b >> (a & 0xf) << (a >> 4)) 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;
 		}
 	}
 }