diff --git a/src/sfizz/OpcodeCleanup.cpp b/src/sfizz/OpcodeCleanup.cpp
index 459ce514..d61d8933 100644
--- a/src/sfizz/OpcodeCleanup.cpp
+++ b/src/sfizz/OpcodeCleanup.cpp
@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 on Mon Sep 28 14:07:14 2020 */
+/* Generated by re2c 2.0.3 on Thu Nov 12 10:20:58 2020 */
 #line 1 "src/sfizz/OpcodeCleanup.re"
 /* -*- mode: c++; -*- */
 // SPDX-License-Identifier: BSD-2-Clause
@@ -583,15 +583,18 @@ yy70:
 	case 'd':
 		yyt1 = YYCURSOR;
 		goto yy93;
-	case 'u':
+	case 's':
 		yyt1 = YYCURSOR;
 		goto yy94;
+	case 'u':
+		yyt1 = YYCURSOR;
+		goto yy95;
 	default:	goto yy34;
 	}
 yy71:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'f':	goto yy95;
+	case 'f':	goto yy96;
 	default:	goto yy34;
 	}
 yy72:
@@ -599,10 +602,10 @@ yy72:
 	switch (yych) {
 	case 'c':
 		yyt2 = YYCURSOR;
-		goto yy96;
+		goto yy97;
 	case 'r':
 		yyt2 = YYCURSOR;
-		goto yy97;
+		goto yy98;
 	default:	goto yy34;
 	}
 yy73:
@@ -610,13 +613,13 @@ yy73:
 	switch (yych) {
 	case 'b':
 		yyt2 = YYCURSOR;
-		goto yy98;
+		goto yy99;
 	case 'f':
 		yyt2 = YYCURSOR;
-		goto yy99;
+		goto yy100;
 	case 'g':
 		yyt2 = YYCURSOR;
-		goto yy100;
+		goto yy101;
 	default:	goto yy34;
 	}
 yy74:
@@ -632,17 +635,17 @@ yy74:
 	case '7':
 	case '8':
 	case '9':	goto yy74;
-	case 't':	goto yy101;
+	case 't':	goto yy102;
 	default:	goto yy34;
 	}
 yy76:
 	yych = *++YYCURSOR;
 	yyt1 = YYCURSOR;
-	goto yy105;
+	goto yy106;
 yy77:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'y':	goto yy106;
+	case 'y':	goto yy107;
 	default:	goto yy34;
 	}
 yy78:
@@ -650,16 +653,16 @@ yy78:
 	switch (yych) {
 	case 0x00:
 		yyt2 = yyt3 = NULL;
-		goto yy107;
+		goto yy108;
 	case '_':
 		yyt3 = YYCURSOR;
-		goto yy109;
+		goto yy110;
 	default:	goto yy34;
 	}
 yy79:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy110;
+	case 'a':	goto yy111;
 	default:	goto yy34;
 	}
 yy80:
@@ -675,7 +678,7 @@ yy80:
 	case '7':
 	case '8':
 	case '9':	goto yy80;
-	case '_':	goto yy111;
+	case '_':	goto yy112;
 	default:	goto yy34;
 	}
 yy82:
@@ -683,37 +686,37 @@ yy82:
 	switch (yych) {
 	case 'e':
 		yyt1 = YYCURSOR;
-		goto yy112;
+		goto yy113;
 	case 'm':
 		yyt1 = YYCURSOR;
-		goto yy113;
+		goto yy114;
 	case 's':
 		yyt1 = YYCURSOR;
-		goto yy114;
+		goto yy115;
 	default:	goto yy34;
 	}
 yy83:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'y':	goto yy115;
+	case 'y':	goto yy116;
 	default:	goto yy34;
 	}
 yy84:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy116;
+	case 'o':	goto yy117;
 	default:	goto yy34;
 	}
 yy85:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'i':	goto yy117;
+	case 'i':	goto yy118;
 	default:	goto yy34;
 	}
 yy86:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy117;
+	case 'o':	goto yy118;
 	default:	goto yy34;
 	}
 yy87:
@@ -725,13 +728,13 @@ yy87:
 yy88:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'p':	goto yy118;
+	case 'p':	goto yy119;
 	default:	goto yy34;
 	}
 yy89:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'n':	goto yy119;
+	case 'n':	goto yy120;
 	default:	goto yy34;
 	}
 yy90:
@@ -739,79 +742,85 @@ yy90:
 	switch (yych) {
 	case 0x00:
 		yyt2 = yyt3 = NULL;
-		goto yy120;
+		goto yy121;
 	case '_':
 		yyt3 = YYCURSOR;
-		goto yy122;
+		goto yy123;
 	default:	goto yy34;
 	}
 yy91:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case '_':	goto yy124;
+	case '_':	goto yy125;
 	default:	goto yy34;
 	}
 yy92:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy125;
+	case 'o':	goto yy126;
 	default:	goto yy34;
 	}
 yy93:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy126;
+	case 'o':	goto yy127;
 	default:	goto yy34;
 	}
 yy94:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'p':	goto yy127;
+	case 't':	goto yy128;
 	default:	goto yy34;
 	}
 yy95:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'f':	goto yy128;
+	case 'p':	goto yy129;
 	default:	goto yy34;
 	}
 yy96:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'u':	goto yy129;
+	case 'f':	goto yy130;
 	default:	goto yy34;
 	}
 yy97:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy130;
+	case 'u':	goto yy131;
 	default:	goto yy34;
 	}
 yy98:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'w':	goto yy131;
+	case 'e':	goto yy132;
 	default:	goto yy34;
 	}
 yy99:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'r':	goto yy132;
+	case 'w':	goto yy133;
 	default:	goto yy34;
 	}
 yy100:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy133;
+	case 'r':	goto yy134;
 	default:	goto yy34;
 	}
 yy101:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'y':	goto yy134;
+	case 'a':	goto yy135;
 	default:	goto yy34;
 	}
 yy102:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'y':	goto yy136;
+	default:	goto yy34;
+	}
+yy103:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[2] = yyt1;
@@ -823,19 +832,19 @@ yy102:
         opcode = absl::StrCat("fil1_", group(1));
         goto end_region;
     }
-#line 827 "src/sfizz/OpcodeCleanup.cpp"
-yy104:
-	yych = *++YYCURSOR;
+#line 836 "src/sfizz/OpcodeCleanup.cpp"
 yy105:
-	if (yych <= 0x00) goto yy102;
-	goto yy104;
+	yych = *++YYCURSOR;
 yy106:
+	if (yych <= 0x00) goto yy103;
+	goto yy105;
+yy107:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'p':	goto yy135;
+	case 'p':	goto yy137;
 	default:	goto yy34;
 	}
-yy107:
+yy108:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[0] = yyt1;
@@ -847,87 +856,87 @@ yy107:
         opcode = absl::StrCat("volume", group(1));
         goto end_region;
     }
-#line 851 "src/sfizz/OpcodeCleanup.cpp"
-yy109:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'r':	goto yy138;
-	default:	goto yy137;
-	}
+#line 860 "src/sfizz/OpcodeCleanup.cpp"
 yy110:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'l':	goto yy139;
-	default:	goto yy34;
+	case 'r':	goto yy140;
+	default:	goto yy139;
 	}
 yy111:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':
-		yyt2 = YYCURSOR;
-		goto yy140;
-	case 'o':
-		yyt2 = YYCURSOR;
-		goto yy141;
-	case 'r':
-		yyt2 = YYCURSOR;
-		goto yy142;
-	case 's':
-		yyt2 = YYCURSOR;
-		goto yy143;
-	case 'w':
-		yyt2 = YYCURSOR;
-		goto yy144;
+	case 'l':	goto yy141;
 	default:	goto yy34;
 	}
 yy112:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'n':	goto yy145;
+	case 'c':
+		yyt2 = YYCURSOR;
+		goto yy142;
+	case 'o':
+		yyt2 = YYCURSOR;
+		goto yy143;
+	case 'r':
+		yyt2 = YYCURSOR;
+		goto yy144;
+	case 's':
+		yyt2 = YYCURSOR;
+		goto yy145;
+	case 'w':
+		yyt2 = YYCURSOR;
+		goto yy146;
 	default:	goto yy34;
 	}
 yy113:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy146;
+	case 'n':	goto yy147;
 	default:	goto yy34;
 	}
 yy114:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy147;
+	case 'o':	goto yy148;
 	default:	goto yy34;
 	}
 yy115:
-	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy148;
-	goto yy34;
-yy116:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'd':	goto yy150;
+	case 't':	goto yy149;
 	default:	goto yy34;
 	}
+yy116:
+	yych = *++YYCURSOR;
+	if (yych <= 0x00) goto yy150;
+	goto yy34;
 yy117:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy151;
-	case 'h':	goto yy152;
+	case 'd':	goto yy152;
 	default:	goto yy34;
 	}
 yy118:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'h':	goto yy153;
+	case 'c':	goto yy153;
+	case 'h':	goto yy154;
 	default:	goto yy34;
 	}
 yy119:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy154;
+	case 'h':	goto yy155;
 	default:	goto yy34;
 	}
 yy120:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'a':	goto yy156;
+	default:	goto yy34;
+	}
+yy121:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[0] = yyt1;
@@ -939,56 +948,62 @@ yy120:
         opcode = absl::StrCat("pitch", group(1));
         goto end_region;
     }
-#line 943 "src/sfizz/OpcodeCleanup.cpp"
-yy122:
+#line 952 "src/sfizz/OpcodeCleanup.cpp"
+yy123:
 	yych = *++YYCURSOR;
 	if (yych <= 0x00) {
 		yyt2 = YYCURSOR;
-		goto yy120;
+		goto yy121;
 	}
-	goto yy122;
-yy124:
+	goto yy123;
+yy125:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case 'a':
 		yyt2 = YYCURSOR;
-		goto yy155;
+		goto yy157;
 	case 'd':
 		yyt2 = YYCURSOR;
-		goto yy156;
+		goto yy158;
 	case 'h':
 		yyt2 = YYCURSOR;
-		goto yy157;
+		goto yy159;
 	case 'r':
 		yyt2 = YYCURSOR;
-		goto yy158;
+		goto yy160;
 	case 's':
 		yyt2 = YYCURSOR;
-		goto yy159;
-	default:	goto yy34;
-	}
-yy125:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case '_':	goto yy160;
+		goto yy161;
 	default:	goto yy34;
 	}
 yy126:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'w':	goto yy161;
+	case '_':	goto yy162;
 	default:	goto yy34;
 	}
 yy127:
 	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy162;
-	goto yy34;
+	switch (yych) {
+	case 'w':	goto yy163;
+	default:	goto yy34;
+	}
 yy128:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'e':	goto yy95;
+	default:	goto yy34;
+	}
+yy129:
+	yych = *++YYCURSOR;
+	if (yych <= 0x00) goto yy164;
+	goto yy34;
+yy130:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case 0x00:
 		yyt2 = yyt3 = NULL;
-		goto yy164;
+		goto yy166;
 	case '0':
 	case '1':
 	case '2':
@@ -1000,125 +1015,125 @@ yy128:
 	case '8':
 	case '9':
 		yyt2 = YYCURSOR;
-		goto yy166;
+		goto yy168;
 	case '_':
 		yyt2 = yyt4 = NULL;
 		yyt3 = YYCURSOR;
-		goto yy168;
-	default:	goto yy34;
-	}
-yy129:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 't':	goto yy169;
-	default:	goto yy34;
-	}
-yy130:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 's':	goto yy170;
+		goto yy170;
 	default:	goto yy34;
 	}
 yy131:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy171;
+	case 't':	goto yy171;
 	default:	goto yy34;
 	}
 yy132:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy172;
+	case 's':	goto yy172;
 	default:	goto yy34;
 	}
 yy133:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'i':	goto yy173;
+	case 'c':	goto yy173;
 	default:	goto yy34;
 	}
 yy134:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'p':	goto yy174;
+	case 'e':	goto yy174;
 	default:	goto yy34;
 	}
 yy135:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy175;
+	case 'i':	goto yy175;
 	default:	goto yy34;
 	}
 yy136:
 	yych = *++YYCURSOR;
-yy137:
-	if (yych <= 0x00) {
-		yyt2 = YYCURSOR;
-		goto yy107;
-	}
-	goto yy136;
-yy138:
-	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy176;
-	default:	goto yy137;
-	}
-yy139:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'c':	goto yy177;
+	case 'p':	goto yy176;
 	default:	goto yy34;
 	}
+yy137:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'e':	goto yy177;
+	default:	goto yy34;
+	}
+yy138:
+	yych = *++YYCURSOR;
+yy139:
+	if (yych <= 0x00) {
+		yyt2 = YYCURSOR;
+		goto yy108;
+	}
+	goto yy138;
 yy140:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'u':	goto yy178;
-	default:	goto yy34;
+	case 'a':	goto yy178;
+	default:	goto yy139;
 	}
 yy141:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'f':	goto yy179;
+	case 'c':	goto yy179;
 	default:	goto yy34;
 	}
 yy142:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy180;
-	case 'e':	goto yy181;
+	case 'u':	goto yy180;
 	default:	goto yy34;
 	}
 yy143:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy182;
+	case 'f':	goto yy181;
 	default:	goto yy34;
 	}
 yy144:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy183;
+	case 'a':	goto yy182;
+	case 'e':	goto yy183;
 	default:	goto yy34;
 	}
 yy145:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'd':	goto yy184;
+	case 'c':	goto yy184;
 	default:	goto yy34;
 	}
 yy146:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'd':	goto yy185;
+	case 'a':	goto yy185;
 	default:	goto yy34;
 	}
 yy147:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy186;
+	case 'd':	goto yy186;
 	default:	goto yy34;
 	}
 yy148:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'd':	goto yy187;
+	default:	goto yy34;
+	}
+yy149:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'a':	goto yy188;
+	default:	goto yy34;
+	}
+yy150:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[2] = yyt1;
@@ -1130,53 +1145,41 @@ yy148:
         opcode = absl::StrCat("off_", group(1));
         goto end_region;
     }
-#line 1134 "src/sfizz/OpcodeCleanup.cpp"
-yy150:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'e':	goto yy115;
-	default:	goto yy34;
-	}
-yy151:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'c':	goto yy187;
-	default:	goto yy34;
-	}
+#line 1149 "src/sfizz/OpcodeCleanup.cpp"
 yy152:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'd':	goto yy188;
+	case 'e':	goto yy116;
 	default:	goto yy34;
 	}
 yy153:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy189;
+	case 'c':	goto yy189;
 	default:	goto yy34;
 	}
 yy154:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'n':	goto yy190;
+	case 'd':	goto yy190;
 	default:	goto yy34;
 	}
 yy155:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy191;
+	case 'o':	goto yy191;
 	default:	goto yy34;
 	}
 yy156:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy192;
+	case 'n':	goto yy192;
 	default:	goto yy34;
 	}
 yy157:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy193;
+	case 't':	goto yy193;
 	default:	goto yy34;
 	}
 yy158:
@@ -1188,28 +1191,40 @@ yy158:
 yy159:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy195;
-	case 'u':	goto yy196;
+	case 'o':	goto yy195;
 	default:	goto yy34;
 	}
 yy160:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'd':
-		yyt2 = YYCURSOR;
-		goto yy197;
-	case 'f':
-		yyt2 = YYCURSOR;
-		goto yy198;
+	case 'e':	goto yy196;
 	default:	goto yy34;
 	}
 yy161:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'n':	goto yy127;
+	case 't':	goto yy197;
+	case 'u':	goto yy198;
 	default:	goto yy34;
 	}
 yy162:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'd':
+		yyt2 = YYCURSOR;
+		goto yy199;
+	case 'f':
+		yyt2 = YYCURSOR;
+		goto yy200;
+	default:	goto yy34;
+	}
+yy163:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'n':	goto yy129;
+	default:	goto yy34;
+	}
+yy164:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[2] = yyt1;
@@ -1221,8 +1236,8 @@ yy162:
         opcode = absl::StrCat("bend_", group(1));
         goto end_region;
     }
-#line 1225 "src/sfizz/OpcodeCleanup.cpp"
-yy164:
+#line 1240 "src/sfizz/OpcodeCleanup.cpp"
+yy166:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[0] = yyt1;
@@ -1234,8 +1249,8 @@ yy164:
         opcode = absl::StrCat("cutoff1", group(1));
         goto end_region;
     }
-#line 1238 "src/sfizz/OpcodeCleanup.cpp"
-yy166:
+#line 1253 "src/sfizz/OpcodeCleanup.cpp"
+yy168:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case '0':
@@ -1247,80 +1262,68 @@ yy166:
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy166;
+	case '9':	goto yy168;
 	case '_':
 		yyt4 = YYCURSOR;
-		goto yy199;
-	default:	goto yy34;
-	}
-yy168:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'r':	goto yy202;
-	default:	goto yy201;
-	}
-yy169:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'o':	goto yy203;
+		goto yy201;
 	default:	goto yy34;
 	}
 yy170:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy204;
-	default:	goto yy34;
+	case 'r':	goto yy204;
+	default:	goto yy203;
 	}
 yy171:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy205;
+	case 'o':	goto yy205;
 	default:	goto yy34;
 	}
 yy172:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'q':	goto yy131;
+	case 'o':	goto yy206;
 	default:	goto yy34;
 	}
 yy173:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'n':	goto yy131;
+	case 'c':	goto yy207;
 	default:	goto yy34;
 	}
 yy174:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy206;
+	case 'q':	goto yy133;
 	default:	goto yy34;
 	}
 yy175:
 	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy207;
-	goto yy34;
+	switch (yych) {
+	case 'n':	goto yy133;
+	default:	goto yy34;
+	}
 yy176:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'n':	goto yy209;
-	default:	goto yy137;
+	case 'e':	goto yy208;
+	default:	goto yy34;
 	}
 yy177:
 	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'c':	goto yy210;
-	default:	goto yy34;
-	}
+	if (yych <= 0x00) goto yy209;
+	goto yy34;
 yy178:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy211;
-	default:	goto yy34;
+	case 'n':	goto yy211;
+	default:	goto yy139;
 	}
 yy179:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'f':	goto yy212;
+	case 'c':	goto yy212;
 	default:	goto yy34;
 	}
 yy180:
@@ -1332,38 +1335,50 @@ yy180:
 yy181:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 's':	goto yy214;
+	case 'f':	goto yy214;
 	default:	goto yy34;
 	}
 yy182:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy215;
+	case 't':	goto yy215;
 	default:	goto yy34;
 	}
 yy183:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'v':	goto yy216;
+	case 's':	goto yy216;
 	default:	goto yy34;
 	}
 yy184:
 	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy217;
-	goto yy34;
+	switch (yych) {
+	case 'a':	goto yy217;
+	default:	goto yy34;
+	}
 yy185:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy184;
+	case 'v':	goto yy218;
 	default:	goto yy34;
 	}
 yy186:
+	yych = *++YYCURSOR;
+	if (yych <= 0x00) goto yy219;
+	goto yy34;
+yy187:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'r':	goto yy219;
+	case 'e':	goto yy186;
 	default:	goto yy34;
 	}
-yy187:
+yy188:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'r':	goto yy221;
+	default:	goto yy34;
+	}
+yy189:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case '0':
@@ -1377,19 +1392,7 @@ yy187:
 	case '8':
 	case '9':
 		yyt1 = YYCURSOR;
-		goto yy220;
-	default:	goto yy34;
-	}
-yy188:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'c':	goto yy222;
-	default:	goto yy34;
-	}
-yy189:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'n':	goto yy223;
+		goto yy222;
 	default:	goto yy34;
 	}
 yy190:
@@ -1401,86 +1404,98 @@ yy190:
 yy191:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy225;
+	case 'n':	goto yy225;
 	default:	goto yy34;
 	}
 yy192:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':
-	case 'l':	goto yy226;
+	case 'c':	goto yy226;
 	default:	goto yy34;
 	}
 yy193:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'l':	goto yy227;
+	case 't':	goto yy227;
 	default:	goto yy34;
 	}
 yy194:
 	yych = *++YYCURSOR;
 	switch (yych) {
+	case 'c':
 	case 'l':	goto yy228;
 	default:	goto yy34;
 	}
 yy195:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy229;
+	case 'l':	goto yy229;
 	default:	goto yy34;
 	}
 yy196:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 's':	goto yy230;
+	case 'l':	goto yy230;
 	default:	goto yy34;
 	}
 yy197:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy231;
+	case 'a':	goto yy231;
 	default:	goto yy34;
 	}
 yy198:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy232;
-	case 'r':	goto yy233;
+	case 's':	goto yy232;
 	default:	goto yy34;
 	}
 yy199:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'r':	goto yy234;
+	case 'e':	goto yy233;
 	default:	goto yy34;
 	}
 yy200:
 	yych = *++YYCURSOR;
-yy201:
-	if (yych <= 0x00) {
-		yyt2 = YYCURSOR;
-		goto yy164;
-	}
-	goto yy200;
-yy202:
-	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy235;
-	default:	goto yy201;
-	}
-yy203:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'f':	goto yy236;
+	case 'a':	goto yy234;
+	case 'r':	goto yy235;
 	default:	goto yy34;
 	}
+yy201:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'r':	goto yy236;
+	default:	goto yy34;
+	}
+yy202:
+	yych = *++YYCURSOR;
+yy203:
+	if (yych <= 0x00) {
+		yyt2 = YYCURSOR;
+		goto yy166;
+	}
+	goto yy202;
 yy204:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'n':	goto yy237;
-	default:	goto yy34;
+	case 'a':	goto yy237;
+	default:	goto yy203;
 	}
 yy205:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'f':	goto yy238;
+	default:	goto yy34;
+	}
+yy206:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'n':	goto yy239;
+	default:	goto yy34;
+	}
+yy207:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case '0':
@@ -1494,14 +1509,14 @@ yy205:
 	case '8':
 	case '9':
 		yyt3 = YYCURSOR;
-		goto yy238;
+		goto yy240;
 	default:	goto yy34;
 	}
-yy206:
+yy208:
 	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy240;
+	if (yych <= 0x00) goto yy242;
 	goto yy34;
-yy207:
+yy209:
 	++YYCURSOR;
 	yynmatch = 1;
 	yypmatch[0] = YYCURSOR - 8;
@@ -1511,14 +1526,14 @@ yy207:
         opcode = absl::StrCat("fil1_type");
         goto end_region;
     }
-#line 1515 "src/sfizz/OpcodeCleanup.cpp"
-yy209:
+#line 1530 "src/sfizz/OpcodeCleanup.cpp"
+yy211:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'd':	goto yy242;
-	default:	goto yy137;
+	case 'd':	goto yy244;
+	default:	goto yy139;
 	}
-yy210:
+yy212:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case '0':
@@ -1532,46 +1547,46 @@ yy210:
 	case '8':
 	case '9':
 		yyt1 = YYCURSOR;
-		goto yy243;
-	default:	goto yy34;
-	}
-yy211:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'o':	goto yy245;
-	default:	goto yy34;
-	}
-yy212:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 's':	goto yy246;
+		goto yy245;
 	default:	goto yy34;
 	}
 yy213:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'i':	goto yy247;
+	case 'o':	goto yy247;
 	default:	goto yy34;
 	}
 yy214:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy248;
+	case 's':	goto yy248;
 	default:	goto yy34;
 	}
 yy215:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'l':	goto yy216;
+	case 'i':	goto yy249;
 	default:	goto yy34;
 	}
 yy216:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy249;
+	case 'o':	goto yy250;
 	default:	goto yy34;
 	}
 yy217:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'l':	goto yy218;
+	default:	goto yy34;
+	}
+yy218:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'e':	goto yy251;
+	default:	goto yy34;
+	}
+yy219:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[2] = yyt1;
@@ -1583,129 +1598,17 @@ yy217:
         opcode = absl::StrCat("loop_", group(1));
         goto end_region;
     }
-#line 1587 "src/sfizz/OpcodeCleanup.cpp"
-yy219:
+#line 1602 "src/sfizz/OpcodeCleanup.cpp"
+yy221:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy184;
-	default:	goto yy34;
-	}
-yy220:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 0x00:	goto yy250;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy220;
+	case 't':	goto yy186;
 	default:	goto yy34;
 	}
 yy222:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy252;
-	default:	goto yy34;
-	}
-yy223:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'y':	goto yy253;
-	default:	goto yy34;
-	}
-yy224:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'e':	goto yy254;
-	default:	goto yy34;
-	}
-yy225:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'a':	goto yy255;
-	default:	goto yy34;
-	}
-yy226:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'a':	goto yy256;
-	default:	goto yy34;
-	}
-yy227:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'd':	goto yy257;
-	default:	goto yy34;
-	}
-yy228:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'e':	goto yy258;
-	default:	goto yy34;
-	}
-yy229:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'r':	goto yy259;
-	default:	goto yy34;
-	}
-yy230:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 't':	goto yy260;
-	default:	goto yy34;
-	}
-yy231:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'p':	goto yy261;
-	default:	goto yy34;
-	}
-yy232:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'd':	goto yy262;
-	default:	goto yy34;
-	}
-yy233:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'e':	goto yy263;
-	default:	goto yy34;
-	}
-yy234:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'a':	goto yy264;
-	default:	goto yy34;
-	}
-yy235:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'n':	goto yy265;
-	default:	goto yy201;
-	}
-yy236:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'f':	goto yy266;
-	default:	goto yy34;
-	}
-yy237:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'a':	goto yy267;
-	default:	goto yy34;
-	}
-yy238:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 0x00:	goto yy268;
+	case 0x00:	goto yy252;
 	case '0':
 	case '1':
 	case '2':
@@ -1715,10 +1618,122 @@ yy238:
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy238;
+	case '9':	goto yy222;
+	default:	goto yy34;
+	}
+yy224:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'c':	goto yy254;
+	default:	goto yy34;
+	}
+yy225:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'y':	goto yy255;
+	default:	goto yy34;
+	}
+yy226:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'e':	goto yy256;
+	default:	goto yy34;
+	}
+yy227:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'a':	goto yy257;
+	default:	goto yy34;
+	}
+yy228:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'a':	goto yy258;
+	default:	goto yy34;
+	}
+yy229:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'd':	goto yy259;
+	default:	goto yy34;
+	}
+yy230:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'e':	goto yy260;
+	default:	goto yy34;
+	}
+yy231:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'r':	goto yy261;
+	default:	goto yy34;
+	}
+yy232:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 't':	goto yy262;
+	default:	goto yy34;
+	}
+yy233:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'p':	goto yy263;
+	default:	goto yy34;
+	}
+yy234:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'd':	goto yy264;
+	default:	goto yy34;
+	}
+yy235:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'e':	goto yy265;
+	default:	goto yy34;
+	}
+yy236:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'a':	goto yy266;
+	default:	goto yy34;
+	}
+yy237:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'n':	goto yy267;
+	default:	goto yy203;
+	}
+yy238:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'f':	goto yy268;
+	default:	goto yy34;
+	}
+yy239:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'a':	goto yy269;
 	default:	goto yy34;
 	}
 yy240:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 0x00:	goto yy270;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy240;
+	default:	goto yy34;
+	}
+yy242:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[2] = yyt1;
@@ -1730,17 +1745,17 @@ yy240:
         opcode = absl::StrCat("fil", group(1), "_type");
         goto end_region;
     }
-#line 1734 "src/sfizz/OpcodeCleanup.cpp"
-yy242:
+#line 1749 "src/sfizz/OpcodeCleanup.cpp"
+yy244:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy270;
-	default:	goto yy137;
+	case 'o':	goto yy272;
+	default:	goto yy139;
 	}
-yy243:
+yy245:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 0x00:	goto yy271;
+	case 0x00:	goto yy273;
 	case '0':
 	case '1':
 	case '2':
@@ -1750,38 +1765,38 @@ yy243:
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy243;
-	default:	goto yy34;
-	}
-yy245:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'f':	goto yy273;
-	default:	goto yy34;
-	}
-yy246:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'e':	goto yy274;
+	case '9':	goto yy245;
 	default:	goto yy34;
 	}
 yy247:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy249;
+	case 'f':	goto yy275;
 	default:	goto yy34;
 	}
 yy248:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'n':	goto yy275;
+	case 'e':	goto yy276;
 	default:	goto yy34;
 	}
 yy249:
 	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy276;
-	goto yy34;
+	switch (yych) {
+	case 'o':	goto yy251;
+	default:	goto yy34;
+	}
 yy250:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'n':	goto yy277;
+	default:	goto yy34;
+	}
+yy251:
+	yych = *++YYCURSOR;
+	if (yych <= 0x00) goto yy278;
+	goto yy34;
+yy252:
 	++YYCURSOR;
 	yynmatch = 3;
 	yypmatch[4] = yyt1;
@@ -1795,8 +1810,8 @@ yy250:
         opcode = absl::StrCat("start_", group(1), "cc", group(2));
         goto end_region;
     }
-#line 1799 "src/sfizz/OpcodeCleanup.cpp"
-yy252:
+#line 1814 "src/sfizz/OpcodeCleanup.cpp"
+yy254:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case '0':
@@ -1810,111 +1825,111 @@ yy252:
 	case '8':
 	case '9':
 		yyt1 = YYCURSOR;
-		goto yy278;
-	default:	goto yy34;
-	}
-yy253:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case '_':	goto yy280;
-	default:	goto yy34;
-	}
-yy254:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 0x00:
-		yyt2 = yyt3 = NULL;
-		goto yy281;
-	case '_':
-		yyt3 = YYCURSOR;
-		goto yy283;
+		goto yy280;
 	default:	goto yy34;
 	}
 yy255:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy285;
+	case '_':	goto yy282;
 	default:	goto yy34;
 	}
 yy256:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'y':	goto yy257;
+	case 0x00:
+		yyt2 = yyt3 = NULL;
+		goto yy283;
+	case '_':
+		yyt3 = YYCURSOR;
+		goto yy285;
 	default:	goto yy34;
 	}
 yy257:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy286;
+	case 'c':	goto yy287;
 	default:	goto yy34;
 	}
 yy258:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy287;
+	case 'y':	goto yy259;
 	default:	goto yy34;
 	}
 yy259:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy257;
+	case 'c':	goto yy288;
 	default:	goto yy34;
 	}
 yy260:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy288;
+	case 'a':	goto yy289;
 	default:	goto yy34;
 	}
 yy261:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy289;
+	case 't':	goto yy259;
 	default:	goto yy34;
 	}
 yy262:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy290;
+	case 'a':	goto yy290;
 	default:	goto yy34;
 	}
 yy263:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'q':	goto yy290;
+	case 't':	goto yy291;
 	default:	goto yy34;
 	}
 yy264:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'n':	goto yy291;
+	case 'e':	goto yy292;
 	default:	goto yy34;
 	}
 yy265:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'd':	goto yy292;
-	default:	goto yy201;
+	case 'q':	goto yy292;
+	default:	goto yy34;
 	}
 yy266:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 0x00:
-		yyt4 = yyt5 = NULL;
-		yyt3 = YYCURSOR;
-		goto yy293;
-	case '_':
-		yyt3 = yyt5 = YYCURSOR;
-		goto yy295;
+	case 'n':	goto yy293;
 	default:	goto yy34;
 	}
 yy267:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'n':	goto yy297;
-	default:	goto yy34;
+	case 'd':	goto yy294;
+	default:	goto yy203;
 	}
 yy268:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 0x00:
+		yyt4 = yyt5 = NULL;
+		yyt3 = YYCURSOR;
+		goto yy295;
+	case '_':
+		yyt3 = yyt5 = YYCURSOR;
+		goto yy297;
+	default:	goto yy34;
+	}
+yy269:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'n':	goto yy299;
+	default:	goto yy34;
+	}
+yy270:
 	++YYCURSOR;
 	yynmatch = 4;
 	yypmatch[2] = yyt1;
@@ -1930,14 +1945,14 @@ yy268:
         opcode = absl::StrCat(group(1), "_", group(2), "_oncc", group(3));
         goto end_region;
     }
-#line 1934 "src/sfizz/OpcodeCleanup.cpp"
-yy270:
+#line 1949 "src/sfizz/OpcodeCleanup.cpp"
+yy272:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'm':	goto yy298;
-	default:	goto yy137;
+	case 'm':	goto yy300;
+	default:	goto yy139;
 	}
-yy271:
+yy273:
 	++YYCURSOR;
 	yynmatch = 3;
 	yypmatch[4] = yyt1;
@@ -1951,26 +1966,26 @@ yy271:
         opcode = absl::StrCat(group(1), "hdcc", group(2));
         goto end_region;
     }
-#line 1955 "src/sfizz/OpcodeCleanup.cpp"
-yy273:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'f':	goto yy299;
-	default:	goto yy34;
-	}
-yy274:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 't':	goto yy249;
-	default:	goto yy34;
-	}
+#line 1970 "src/sfizz/OpcodeCleanup.cpp"
 yy275:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy300;
+	case 'f':	goto yy301;
 	default:	goto yy34;
 	}
 yy276:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 't':	goto yy251;
+	default:	goto yy34;
+	}
+yy277:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'a':	goto yy302;
+	default:	goto yy34;
+	}
+yy278:
 	++YYCURSOR;
 	yynmatch = 3;
 	yypmatch[2] = yyt1;
@@ -1984,11 +1999,11 @@ yy276:
         opcode = absl::StrCat(group(1), "_", group(2), "1");
         goto end_region;
     }
-#line 1988 "src/sfizz/OpcodeCleanup.cpp"
-yy278:
+#line 2003 "src/sfizz/OpcodeCleanup.cpp"
+yy280:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 0x00:	goto yy301;
+	case 0x00:	goto yy303;
 	case '0':
 	case '1':
 	case '2':
@@ -1998,16 +2013,16 @@ yy278:
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy278;
+	case '9':	goto yy280;
 	default:	goto yy34;
 	}
-yy280:
+yy282:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'g':	goto yy303;
+	case 'g':	goto yy305;
 	default:	goto yy34;
 	}
-yy281:
+yy283:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[0] = yyt1;
@@ -2019,63 +2034,63 @@ yy281:
         opcode = absl::StrCat("resonance1", group(1));
         goto end_region;
     }
-#line 2023 "src/sfizz/OpcodeCleanup.cpp"
-yy283:
+#line 2038 "src/sfizz/OpcodeCleanup.cpp"
+yy285:
 	yych = *++YYCURSOR;
 	if (yych <= 0x00) {
 		yyt2 = YYCURSOR;
-		goto yy281;
-	}
-	goto yy283;
-yy285:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'k':	goto yy257;
-	default:	goto yy34;
-	}
-yy286:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'c':	goto yy304;
-	default:	goto yy34;
+		goto yy283;
 	}
+	goto yy285;
 yy287:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 's':	goto yy305;
+	case 'k':	goto yy259;
 	default:	goto yy34;
 	}
 yy288:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'i':	goto yy306;
+	case 'c':	goto yy306;
 	default:	goto yy34;
 	}
 yy289:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'h':	goto yy290;
+	case 's':	goto yy307;
 	default:	goto yy34;
 	}
 yy290:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy307;
+	case 'i':	goto yy308;
 	default:	goto yy34;
 	}
 yy291:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'd':	goto yy308;
+	case 'h':	goto yy292;
 	default:	goto yy34;
 	}
 yy292:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy309;
-	default:	goto yy201;
+	case 'c':	goto yy309;
+	default:	goto yy34;
 	}
 yy293:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'd':	goto yy310;
+	default:	goto yy34;
+	}
+yy294:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'o':	goto yy311;
+	default:	goto yy203;
+	}
+yy295:
 	++YYCURSOR;
 	yynmatch = 4;
 	yypmatch[2] = yyt1;
@@ -2091,43 +2106,43 @@ yy293:
         opcode = absl::StrCat(group(1), "_", group(2), "1", group(3));
         goto end_region;
     }
-#line 2095 "src/sfizz/OpcodeCleanup.cpp"
-yy295:
+#line 2110 "src/sfizz/OpcodeCleanup.cpp"
+yy297:
 	yych = *++YYCURSOR;
 	if (yych <= 0x00) {
 		yyt4 = YYCURSOR;
-		goto yy293;
+		goto yy295;
 	}
-	goto yy295;
-yy297:
+	goto yy297;
+yy299:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy310;
+	case 'c':	goto yy312;
 	default:	goto yy34;
 	}
-yy298:
+yy300:
 	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy311;
-	goto yy136;
-yy299:
+	if (yych <= 0x00) goto yy313;
+	goto yy138;
+yy301:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case 0x00:
 		yyt4 = yyt5 = NULL;
 		yyt3 = YYCURSOR;
-		goto yy313;
+		goto yy315;
 	case '_':
 		yyt3 = yyt5 = YYCURSOR;
-		goto yy315;
+		goto yy317;
 	default:	goto yy34;
 	}
-yy300:
+yy302:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'n':	goto yy317;
+	case 'n':	goto yy319;
 	default:	goto yy34;
 	}
-yy301:
+yy303:
 	++YYCURSOR;
 	yynmatch = 3;
 	yypmatch[4] = yyt1;
@@ -2141,14 +2156,14 @@ yy301:
         opcode = absl::StrCat("start_", group(1), "hdcc", group(2));
         goto end_region;
     }
-#line 2145 "src/sfizz/OpcodeCleanup.cpp"
-yy303:
+#line 2160 "src/sfizz/OpcodeCleanup.cpp"
+yy305:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'r':	goto yy318;
+	case 'r':	goto yy320;
 	default:	goto yy34;
 	}
-yy304:
+yy306:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case '0':
@@ -2162,46 +2177,46 @@ yy304:
 	case '8':
 	case '9':
 		yyt3 = YYCURSOR;
-		goto yy319;
-	default:	goto yy34;
-	}
-yy305:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'e':	goto yy257;
-	default:	goto yy34;
-	}
-yy306:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'n':	goto yy257;
+		goto yy321;
 	default:	goto yy34;
 	}
 yy307:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy321;
+	case 'e':	goto yy259;
 	default:	goto yy34;
 	}
 yy308:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy322;
+	case 'n':	goto yy259;
 	default:	goto yy34;
 	}
 yy309:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'm':	goto yy323;
-	default:	goto yy201;
+	case 'c':	goto yy323;
+	default:	goto yy34;
 	}
 yy310:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy266;
+	case 'o':	goto yy324;
 	default:	goto yy34;
 	}
 yy311:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'm':	goto yy325;
+	default:	goto yy203;
+	}
+yy312:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'e':	goto yy268;
+	default:	goto yy34;
+	}
+yy313:
 	++YYCURSOR;
 	yynmatch = 1;
 	yypmatch[0] = YYCURSOR - 12;
@@ -2211,8 +2226,8 @@ yy311:
         opcode = "amp_random";
         goto end_region;
     }
-#line 2215 "src/sfizz/OpcodeCleanup.cpp"
-yy313:
+#line 2230 "src/sfizz/OpcodeCleanup.cpp"
+yy315:
 	++YYCURSOR;
 	yynmatch = 4;
 	yypmatch[2] = yyt1;
@@ -2228,30 +2243,30 @@ yy313:
         opcode = absl::StrCat(group(1), "_", group(2), "1", group(3));
         goto end_region;
     }
-#line 2232 "src/sfizz/OpcodeCleanup.cpp"
-yy315:
+#line 2247 "src/sfizz/OpcodeCleanup.cpp"
+yy317:
 	yych = *++YYCURSOR;
 	if (yych <= 0x00) {
 		yyt4 = YYCURSOR;
-		goto yy313;
-	}
-	goto yy315;
-yy317:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'c':	goto yy324;
-	default:	goto yy34;
-	}
-yy318:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'o':	goto yy325;
-	default:	goto yy34;
+		goto yy315;
 	}
+	goto yy317;
 yy319:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 0x00:	goto yy326;
+	case 'c':	goto yy326;
+	default:	goto yy34;
+	}
+yy320:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'o':	goto yy327;
+	default:	goto yy34;
+	}
+yy321:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 0x00:	goto yy328;
 	case '0':
 	case '1':
 	case '2':
@@ -2261,10 +2276,10 @@ yy319:
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy319;
+	case '9':	goto yy321;
 	default:	goto yy34;
 	}
-yy321:
+yy323:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case '0':
@@ -2278,32 +2293,32 @@ yy321:
 	case '8':
 	case '9':
 		yyt3 = YYCURSOR;
-		goto yy328;
+		goto yy330;
 	default:	goto yy34;
 	}
-yy322:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'm':	goto yy330;
-	default:	goto yy34;
-	}
-yy323:
-	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy331;
-	goto yy200;
 yy324:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy299;
+	case 'm':	goto yy332;
 	default:	goto yy34;
 	}
 yy325:
+	yych = *++YYCURSOR;
+	if (yych <= 0x00) goto yy333;
+	goto yy202;
+yy326:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'u':	goto yy333;
+	case 'e':	goto yy301;
 	default:	goto yy34;
 	}
-yy326:
+yy327:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'u':	goto yy335;
+	default:	goto yy34;
+	}
+yy328:
 	++YYCURSOR;
 	yynmatch = 4;
 	yypmatch[2] = yyt1;
@@ -2319,11 +2334,11 @@ yy326:
         opcode = absl::StrCat(group(1), "_", group(2), "_oncc", group(3));
         goto end_region;
     }
-#line 2323 "src/sfizz/OpcodeCleanup.cpp"
-yy328:
+#line 2338 "src/sfizz/OpcodeCleanup.cpp"
+yy330:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 0x00:	goto yy334;
+	case 0x00:	goto yy336;
 	case '0':
 	case '1':
 	case '2':
@@ -2333,13 +2348,13 @@ yy328:
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy328;
+	case '9':	goto yy330;
 	default:	goto yy34;
 	}
-yy330:
+yy332:
 	yych = *++YYCURSOR;
 	if (yych >= 0x01) goto yy34;
-yy331:
+yy333:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[0] = yyt1;
@@ -2351,14 +2366,14 @@ yy331:
         opcode = absl::StrCat("fil", group(1), "_random");
         goto again_region;
     }
-#line 2355 "src/sfizz/OpcodeCleanup.cpp"
-yy333:
+#line 2370 "src/sfizz/OpcodeCleanup.cpp"
+yy335:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'p':	goto yy336;
+	case 'p':	goto yy338;
 	default:	goto yy34;
 	}
-yy334:
+yy336:
 	++YYCURSOR;
 	yynmatch = 4;
 	yypmatch[2] = yyt1;
@@ -2374,8 +2389,8 @@ yy334:
         opcode = absl::StrCat(group(1), "_", group(2), "_oncc", group(3));
         goto end_region;
     }
-#line 2378 "src/sfizz/OpcodeCleanup.cpp"
-yy336:
+#line 2393 "src/sfizz/OpcodeCleanup.cpp"
+yy338:
 	yych = *++YYCURSOR;
 	if (yych >= 0x01) goto yy34;
 	++YYCURSOR;
@@ -2387,7 +2402,7 @@ yy336:
         opcode = "group";
         goto end_region;
     }
-#line 2391 "src/sfizz/OpcodeCleanup.cpp"
+#line 2406 "src/sfizz/OpcodeCleanup.cpp"
 }
 #line 191 "src/sfizz/OpcodeCleanup.re"
 
@@ -2404,80 +2419,80 @@ end_region:
     YYCURSOR = opcode.c_str();
 
     
-#line 2408 "src/sfizz/OpcodeCleanup.cpp"
+#line 2423 "src/sfizz/OpcodeCleanup.cpp"
 {
 	char yych;
 	yych = *YYCURSOR;
 	switch (yych) {
-	case 's':	goto yy343;
-	default:	goto yy341;
+	case 's':	goto yy345;
+	default:	goto yy343;
 	}
-yy341:
+yy343:
 	++YYCURSOR;
-yy342:
+yy344:
 #line 211 "src/sfizz/OpcodeCleanup.re"
 	{
         goto end_control;
     }
-#line 2423 "src/sfizz/OpcodeCleanup.cpp"
-yy343:
+#line 2438 "src/sfizz/OpcodeCleanup.cpp"
+yy345:
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch (yych) {
-	case 'e':	goto yy344;
-	default:	goto yy342;
+	case 'e':	goto yy346;
+	default:	goto yy344;
 	}
-yy344:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 't':	goto yy346;
-	default:	goto yy345;
-	}
-yy345:
-	YYCURSOR = YYMARKER;
-	goto yy342;
 yy346:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case '_':	goto yy347;
-	default:	goto yy345;
+	case 't':	goto yy348;
+	default:	goto yy347;
 	}
 yy347:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'r':	goto yy348;
-	default:	goto yy345;
-	}
+	YYCURSOR = YYMARKER;
+	goto yy344;
 yy348:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy349;
-	default:	goto yy345;
+	case '_':	goto yy349;
+	default:	goto yy347;
 	}
 yy349:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy350;
-	default:	goto yy345;
+	case 'r':	goto yy350;
+	default:	goto yy347;
 	}
 yy350:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'l':	goto yy351;
-	default:	goto yy345;
+	case 'e':	goto yy351;
+	default:	goto yy347;
 	}
 yy351:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy352;
-	default:	goto yy345;
+	case 'a':	goto yy352;
+	default:	goto yy347;
 	}
 yy352:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy353;
-	default:	goto yy345;
+	case 'l':	goto yy353;
+	default:	goto yy347;
 	}
 yy353:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'c':	goto yy354;
+	default:	goto yy347;
+	}
+yy354:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'c':	goto yy355;
+	default:	goto yy347;
+	}
+yy355:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case '0':
@@ -2491,13 +2506,13 @@ yy353:
 	case '8':
 	case '9':
 		yyt1 = YYCURSOR;
-		goto yy354;
-	default:	goto yy345;
+		goto yy356;
+	default:	goto yy347;
 	}
-yy354:
+yy356:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 0x00:	goto yy356;
+	case 0x00:	goto yy358;
 	case '0':
 	case '1':
 	case '2':
@@ -2507,10 +2522,10 @@ yy354:
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy354;
-	default:	goto yy345;
+	case '9':	goto yy356;
+	default:	goto yy347;
 	}
-yy356:
+yy358:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[2] = yyt1;
@@ -2522,7 +2537,7 @@ yy356:
         opcode = absl::StrCat("set_hdcc", group(1));
         goto end_control;
     }
-#line 2526 "src/sfizz/OpcodeCleanup.cpp"
+#line 2541 "src/sfizz/OpcodeCleanup.cpp"
 }
 #line 215 "src/sfizz/OpcodeCleanup.re"
 
diff --git a/src/sfizz/OpcodeCleanup.re b/src/sfizz/OpcodeCleanup.re
index 245f62d5..c9a3d5c4 100644
--- a/src/sfizz/OpcodeCleanup.re
+++ b/src/sfizz/OpcodeCleanup.re
@@ -120,7 +120,7 @@ end_region_oncc:
         opcode = absl::StrCat("off_", group(1));
         goto end_region;
     }
-    "bend" ("up"|"down") END {
+    "bend" ("up"|"down"|"step") END {
         opcode = absl::StrCat("bend_", group(1));
         goto end_region;
     }
diff --git a/tests/OpcodeT.cpp b/tests/OpcodeT.cpp
index 336907f7..b5115243 100644
--- a/tests/OpcodeT.cpp
+++ b/tests/OpcodeT.cpp
@@ -212,6 +212,7 @@ TEST_CASE("[Opcode] Normalization")
         {"offmode", "off_mode"},
         {"bendup", "bend_up"},
         {"benddown", "bend_down"},
+        {"bendstep", "bend_step"},
         {"filtype", "fil1_type"},
         {"fil21type", "fil21_type"},
         // ARIA aliases