diff --git a/src/sfizz/OpcodeCleanup.cpp b/src/sfizz/OpcodeCleanup.cpp
index 8e33865f..83b8aeb8 100644
--- a/src/sfizz/OpcodeCleanup.cpp
+++ b/src/sfizz/OpcodeCleanup.cpp
@@ -1,4 +1,4 @@
-/* Generated by re2c 1.3 on Fri May 15 00:29:29 2020 */
+/* Generated by re2c 1.3 on Fri May 15 08:07:56 2020 */
 #line 1 "src/sfizz/OpcodeCleanup.re"
 /* -*- mode: c++; -*- */
 // SPDX-License-Identifier: BSD-2-Clause
@@ -208,7 +208,7 @@ end_generic:
 yy19:
 	++YYCURSOR;
 yy20:
-#line 154 "src/sfizz/OpcodeCleanup.re"
+#line 158 "src/sfizz/OpcodeCleanup.re"
 	{
         goto end_region;
     }
@@ -752,7 +752,7 @@ yy96:
 	yypmatch[0] = yyt1 - 4;
 	yypmatch[1] = YYCURSOR;
 	yypmatch[3] = YYCURSOR - 1;
-#line 136 "src/sfizz/OpcodeCleanup.re"
+#line 140 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat("fil1_", group(1));
         goto end_region;
@@ -844,18 +844,19 @@ yy112:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case 'c':	goto yy140;
+	case 'h':	goto yy141;
 	default:	goto yy34;
 	}
 yy113:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'h':	goto yy141;
+	case 'h':	goto yy142;
 	default:	goto yy34;
 	}
 yy114:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy142;
+	case 'a':	goto yy143;
 	default:	goto yy34;
 	}
 yy115:
@@ -870,7 +871,7 @@ yy115:
         opcode = absl::StrCat("pitch", group(1));
         goto end_region;
     }
-#line 874 "src/sfizz/OpcodeCleanup.cpp"
+#line 875 "src/sfizz/OpcodeCleanup.cpp"
 yy117:
 	yych = *++YYCURSOR;
 	if (yych <= 0x00) {
@@ -883,124 +884,124 @@ yy119:
 	switch (yych) {
 	case 'a':
 		yyt2 = YYCURSOR;
-		goto yy143;
+		goto yy144;
 	case 'd':
 		yyt2 = YYCURSOR;
-		goto yy144;
+		goto yy145;
 	case 'h':
 		yyt2 = YYCURSOR;
-		goto yy145;
+		goto yy146;
 	case 'r':
 		yyt2 = YYCURSOR;
-		goto yy146;
+		goto yy147;
 	case 's':
 		yyt2 = YYCURSOR;
-		goto yy147;
+		goto yy148;
 	default:	goto yy34;
 	}
 yy120:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case '_':	goto yy148;
+	case '_':	goto yy149;
 	default:	goto yy34;
 	}
 yy121:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'w':	goto yy149;
+	case 'w':	goto yy150;
 	default:	goto yy34;
 	}
 yy122:
 	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy150;
+	if (yych <= 0x00) goto yy151;
 	goto yy34;
 yy123:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case 0x00:
 		yyt2 = yyt3 = NULL;
-		goto yy152;
+		goto yy153;
 	case '_':
 		yyt3 = YYCURSOR;
-		goto yy154;
+		goto yy155;
 	default:	goto yy34;
 	}
 yy124:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy156;
+	case 'c':	goto yy157;
 	default:	goto yy34;
 	}
 yy125:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy157;
+	case 'e':	goto yy158;
 	default:	goto yy34;
 	}
 yy126:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'i':	goto yy158;
+	case 'i':	goto yy159;
 	default:	goto yy34;
 	}
 yy127:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'p':	goto yy159;
+	case 'p':	goto yy160;
 	default:	goto yy34;
 	}
 yy128:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy160;
+	case 'e':	goto yy161;
 	default:	goto yy34;
 	}
 yy129:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy161;
+	case 'c':	goto yy162;
 	default:	goto yy34;
 	}
 yy130:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'f':	goto yy162;
+	case 'f':	goto yy163;
 	default:	goto yy34;
 	}
 yy131:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy163;
+	case 'a':	goto yy164;
 	default:	goto yy34;
 	}
 yy132:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy164;
+	case 'c':	goto yy165;
 	default:	goto yy34;
 	}
 yy133:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy165;
+	case 'a':	goto yy166;
 	default:	goto yy34;
 	}
 yy134:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'd':	goto yy166;
+	case 'd':	goto yy167;
 	default:	goto yy34;
 	}
 yy135:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'd':	goto yy167;
+	case 'd':	goto yy168;
 	default:	goto yy34;
 	}
 yy136:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy168;
+	case 'a':	goto yy169;
 	default:	goto yy34;
 	}
 yy137:
@@ -1015,7 +1016,7 @@ yy137:
         opcode = absl::StrCat("off_", group(1));
         goto end_region;
     }
-#line 1019 "src/sfizz/OpcodeCleanup.cpp"
+#line 1020 "src/sfizz/OpcodeCleanup.cpp"
 yy139:
 	yych = *++YYCURSOR;
 	switch (yych) {
@@ -1025,70 +1026,76 @@ yy139:
 yy140:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy169;
+	case 'c':	goto yy170;
 	default:	goto yy34;
 	}
 yy141:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy170;
+	case 'd':	goto yy171;
 	default:	goto yy34;
 	}
 yy142:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'n':	goto yy171;
+	case 'o':	goto yy172;
 	default:	goto yy34;
 	}
 yy143:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy172;
+	case 'n':	goto yy173;
 	default:	goto yy34;
 	}
 yy144:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy173;
+	case 't':	goto yy174;
 	default:	goto yy34;
 	}
 yy145:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy174;
+	case 'e':	goto yy175;
 	default:	goto yy34;
 	}
 yy146:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy175;
+	case 'o':	goto yy176;
 	default:	goto yy34;
 	}
 yy147:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy176;
-	case 'u':	goto yy177;
+	case 'e':	goto yy177;
 	default:	goto yy34;
 	}
 yy148:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'd':
-		yyt2 = YYCURSOR;
-		goto yy178;
-	case 'f':
-		yyt2 = YYCURSOR;
-		goto yy179;
+	case 't':	goto yy178;
+	case 'u':	goto yy179;
 	default:	goto yy34;
 	}
 yy149:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'n':	goto yy122;
+	case 'd':
+		yyt2 = YYCURSOR;
+		goto yy180;
+	case 'f':
+		yyt2 = YYCURSOR;
+		goto yy181;
 	default:	goto yy34;
 	}
 yy150:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'n':	goto yy122;
+	default:	goto yy34;
+	}
+yy151:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[2] = yyt1;
@@ -1100,102 +1107,102 @@ yy150:
         opcode = absl::StrCat("bend_", group(1));
         goto end_region;
     }
-#line 1104 "src/sfizz/OpcodeCleanup.cpp"
-yy152:
+#line 1111 "src/sfizz/OpcodeCleanup.cpp"
+yy153:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[0] = yyt1;
 	yypmatch[2] = yyt3;
 	yypmatch[3] = yyt2;
 	yypmatch[1] = YYCURSOR;
-#line 140 "src/sfizz/OpcodeCleanup.re"
+#line 144 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat("cutoff1", group(1));
         goto end_region;
     }
-#line 1117 "src/sfizz/OpcodeCleanup.cpp"
-yy154:
+#line 1124 "src/sfizz/OpcodeCleanup.cpp"
+yy155:
 	yych = *++YYCURSOR;
 	if (yych <= 0x00) {
 		yyt2 = YYCURSOR;
-		goto yy152;
-	}
-	goto yy154;
-yy156:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'c':	goto yy180;
-	default:	goto yy34;
+		goto yy153;
 	}
+	goto yy155;
 yy157:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'q':	goto yy124;
+	case 'c':	goto yy182;
 	default:	goto yy34;
 	}
 yy158:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'n':	goto yy124;
+	case 'q':	goto yy124;
 	default:	goto yy34;
 	}
 yy159:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy181;
+	case 'n':	goto yy124;
 	default:	goto yy34;
 	}
 yy160:
-	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy182;
-	goto yy34;
-yy161:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy184;
+	case 'e':	goto yy183;
 	default:	goto yy34;
 	}
+yy161:
+	yych = *++YYCURSOR;
+	if (yych <= 0x00) goto yy184;
+	goto yy34;
 yy162:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'f':	goto yy185;
+	case 'c':	goto yy186;
 	default:	goto yy34;
 	}
 yy163:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy186;
+	case 'f':	goto yy187;
 	default:	goto yy34;
 	}
 yy164:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy187;
+	case 't':	goto yy188;
 	default:	goto yy34;
 	}
 yy165:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'v':	goto yy188;
+	case 'a':	goto yy189;
 	default:	goto yy34;
 	}
 yy166:
-	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy189;
-	goto yy34;
-yy167:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy166;
+	case 'v':	goto yy190;
 	default:	goto yy34;
 	}
+yy167:
+	yych = *++YYCURSOR;
+	if (yych <= 0x00) goto yy191;
+	goto yy34;
 yy168:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'r':	goto yy191;
+	case 'e':	goto yy167;
 	default:	goto yy34;
 	}
 yy169:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'r':	goto yy193;
+	default:	goto yy34;
+	}
+yy170:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case '0':
@@ -1209,72 +1216,78 @@ yy169:
 	case '8':
 	case '9':
 		yyt1 = YYCURSOR;
-		goto yy192;
-	default:	goto yy34;
-	}
-yy170:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'n':	goto yy194;
+		goto yy194;
 	default:	goto yy34;
 	}
 yy171:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy195;
+	case 'c':	goto yy196;
 	default:	goto yy34;
 	}
 yy172:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy196;
+	case 'n':	goto yy197;
 	default:	goto yy34;
 	}
 yy173:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':
-	case 'l':	goto yy197;
+	case 'c':	goto yy198;
 	default:	goto yy34;
 	}
 yy174:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'l':	goto yy198;
+	case 't':	goto yy199;
 	default:	goto yy34;
 	}
 yy175:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'l':	goto yy199;
+	case 'c':
+	case 'l':	goto yy200;
 	default:	goto yy34;
 	}
 yy176:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy200;
+	case 'l':	goto yy201;
 	default:	goto yy34;
 	}
 yy177:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 's':	goto yy201;
+	case 'l':	goto yy202;
 	default:	goto yy34;
 	}
 yy178:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy202;
+	case 'a':	goto yy203;
 	default:	goto yy34;
 	}
 yy179:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy203;
-	case 'r':	goto yy204;
+	case 's':	goto yy204;
 	default:	goto yy34;
 	}
 yy180:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'e':	goto yy205;
+	default:	goto yy34;
+	}
+yy181:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'a':	goto yy206;
+	case 'r':	goto yy207;
+	default:	goto yy34;
+	}
+yy182:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case '0':
@@ -1288,14 +1301,14 @@ yy180:
 	case '8':
 	case '9':
 		yyt3 = YYCURSOR;
-		goto yy205;
+		goto yy208;
 	default:	goto yy34;
 	}
-yy181:
+yy183:
 	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy207;
+	if (yych <= 0x00) goto yy210;
 	goto yy34;
-yy182:
+yy184:
 	++YYCURSOR;
 	yynmatch = 1;
 	yypmatch[0] = YYCURSOR - 8;
@@ -1305,8 +1318,8 @@ yy182:
         opcode = absl::StrCat("fil1_type");
         goto end_region;
     }
-#line 1309 "src/sfizz/OpcodeCleanup.cpp"
-yy184:
+#line 1322 "src/sfizz/OpcodeCleanup.cpp"
+yy186:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case '0':
@@ -1320,34 +1333,34 @@ yy184:
 	case '8':
 	case '9':
 		yyt1 = YYCURSOR;
-		goto yy209;
-	default:	goto yy34;
-	}
-yy185:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 's':	goto yy211;
-	default:	goto yy34;
-	}
-yy186:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'i':	goto yy212;
+		goto yy212;
 	default:	goto yy34;
 	}
 yy187:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'l':	goto yy188;
+	case 's':	goto yy214;
 	default:	goto yy34;
 	}
 yy188:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy213;
+	case 'i':	goto yy215;
 	default:	goto yy34;
 	}
 yy189:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'l':	goto yy190;
+	default:	goto yy34;
+	}
+yy190:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'e':	goto yy216;
+	default:	goto yy34;
+	}
+yy191:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[2] = yyt1;
@@ -1359,99 +1372,17 @@ yy189:
         opcode = absl::StrCat("loop_", group(1));
         goto end_region;
     }
-#line 1363 "src/sfizz/OpcodeCleanup.cpp"
-yy191:
+#line 1376 "src/sfizz/OpcodeCleanup.cpp"
+yy193:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy166;
-	default:	goto yy34;
-	}
-yy192:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 0x00:	goto yy214;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy192;
+	case 't':	goto yy167;
 	default:	goto yy34;
 	}
 yy194:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'y':	goto yy216;
-	default:	goto yy34;
-	}
-yy195:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'e':	goto yy217;
-	default:	goto yy34;
-	}
-yy196:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'a':	goto yy218;
-	default:	goto yy34;
-	}
-yy197:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'a':	goto yy219;
-	default:	goto yy34;
-	}
-yy198:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'd':	goto yy220;
-	default:	goto yy34;
-	}
-yy199:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'e':	goto yy221;
-	default:	goto yy34;
-	}
-yy200:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'r':	goto yy222;
-	default:	goto yy34;
-	}
-yy201:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 't':	goto yy223;
-	default:	goto yy34;
-	}
-yy202:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'p':	goto yy224;
-	default:	goto yy34;
-	}
-yy203:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'd':	goto yy225;
-	default:	goto yy34;
-	}
-yy204:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'e':	goto yy226;
-	default:	goto yy34;
-	}
-yy205:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 0x00:	goto yy227;
+	case 0x00:	goto yy217;
 	case '0':
 	case '1':
 	case '2':
@@ -1461,10 +1392,98 @@ yy205:
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy205;
+	case '9':	goto yy194;
+	default:	goto yy34;
+	}
+yy196:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'c':	goto yy219;
+	default:	goto yy34;
+	}
+yy197:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'y':	goto yy220;
+	default:	goto yy34;
+	}
+yy198:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'e':	goto yy221;
+	default:	goto yy34;
+	}
+yy199:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'a':	goto yy222;
+	default:	goto yy34;
+	}
+yy200:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'a':	goto yy223;
+	default:	goto yy34;
+	}
+yy201:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'd':	goto yy224;
+	default:	goto yy34;
+	}
+yy202:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'e':	goto yy225;
+	default:	goto yy34;
+	}
+yy203:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'r':	goto yy226;
+	default:	goto yy34;
+	}
+yy204:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 't':	goto yy227;
+	default:	goto yy34;
+	}
+yy205:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'p':	goto yy228;
+	default:	goto yy34;
+	}
+yy206:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'd':	goto yy229;
 	default:	goto yy34;
 	}
 yy207:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'e':	goto yy230;
+	default:	goto yy34;
+	}
+yy208:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 0x00:	goto yy231;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy208;
+	default:	goto yy34;
+	}
+yy210:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[2] = yyt1;
@@ -1476,11 +1495,11 @@ yy207:
         opcode = absl::StrCat("fil", group(1), "_type");
         goto end_region;
     }
-#line 1480 "src/sfizz/OpcodeCleanup.cpp"
-yy209:
+#line 1499 "src/sfizz/OpcodeCleanup.cpp"
+yy212:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 0x00:	goto yy229;
+	case 0x00:	goto yy233;
 	case '0':
 	case '1':
 	case '2':
@@ -1490,26 +1509,26 @@ yy209:
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy209;
+	case '9':	goto yy212;
 	default:	goto yy34;
 	}
-yy211:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'e':	goto yy231;
-	default:	goto yy34;
-	}
-yy212:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'o':	goto yy213;
-	default:	goto yy34;
-	}
-yy213:
-	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy232;
-	goto yy34;
 yy214:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'e':	goto yy235;
+	default:	goto yy34;
+	}
+yy215:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'o':	goto yy216;
+	default:	goto yy34;
+	}
+yy216:
+	yych = *++YYCURSOR;
+	if (yych <= 0x00) goto yy236;
+	goto yy34;
+yy217:
 	++YYCURSOR;
 	yynmatch = 3;
 	yypmatch[4] = yyt1;
@@ -1523,79 +1542,96 @@ yy214:
         opcode = absl::StrCat("start_", group(1), "cc", group(2));
         goto end_region;
     }
-#line 1527 "src/sfizz/OpcodeCleanup.cpp"
-yy216:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case '_':	goto yy234;
-	default:	goto yy34;
-	}
-yy217:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 0x00:
-		yyt2 = yyt3 = NULL;
-		goto yy235;
-	case '_':
-		yyt3 = YYCURSOR;
-		goto yy237;
-	default:	goto yy34;
-	}
-yy218:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'c':	goto yy239;
-	default:	goto yy34;
-	}
+#line 1546 "src/sfizz/OpcodeCleanup.cpp"
 yy219:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'y':	goto yy220;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+		yyt1 = YYCURSOR;
+		goto yy238;
 	default:	goto yy34;
 	}
 yy220:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy240;
+	case '_':	goto yy240;
 	default:	goto yy34;
 	}
 yy221:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy241;
+	case 0x00:
+		yyt2 = yyt3 = NULL;
+		goto yy241;
+	case '_':
+		yyt3 = YYCURSOR;
+		goto yy243;
 	default:	goto yy34;
 	}
 yy222:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy220;
+	case 'c':	goto yy245;
 	default:	goto yy34;
 	}
 yy223:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy242;
+	case 'y':	goto yy224;
 	default:	goto yy34;
 	}
 yy224:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy243;
+	case 'c':	goto yy246;
 	default:	goto yy34;
 	}
 yy225:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy244;
+	case 'a':	goto yy247;
 	default:	goto yy34;
 	}
 yy226:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'q':	goto yy244;
+	case 't':	goto yy224;
 	default:	goto yy34;
 	}
 yy227:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'a':	goto yy248;
+	default:	goto yy34;
+	}
+yy228:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 't':	goto yy249;
+	default:	goto yy34;
+	}
+yy229:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'e':	goto yy250;
+	default:	goto yy34;
+	}
+yy230:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'q':	goto yy250;
+	default:	goto yy34;
+	}
+yy231:
 	++YYCURSOR;
 	yynmatch = 4;
 	yypmatch[2] = yyt1;
@@ -1611,8 +1647,8 @@ yy227:
         opcode = absl::StrCat(group(1), "_", group(2), "_oncc", group(3));
         goto end_region;
     }
-#line 1615 "src/sfizz/OpcodeCleanup.cpp"
-yy229:
+#line 1651 "src/sfizz/OpcodeCleanup.cpp"
+yy233:
 	++YYCURSOR;
 	yynmatch = 3;
 	yypmatch[4] = yyt1;
@@ -1621,19 +1657,19 @@ yy229:
 	yypmatch[2] = yyt1 - 8;
 	yypmatch[3] = yyt1 - 6;
 	yypmatch[5] = YYCURSOR - 1;
-#line 149 "src/sfizz/OpcodeCleanup.re"
+#line 153 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat(group(1), "hdcc", group(2));
         goto end_region;
     }
-#line 1630 "src/sfizz/OpcodeCleanup.cpp"
-yy231:
+#line 1666 "src/sfizz/OpcodeCleanup.cpp"
+yy235:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy213;
+	case 't':	goto yy216;
 	default:	goto yy34;
 	}
-yy232:
+yy236:
 	++YYCURSOR;
 	yynmatch = 3;
 	yypmatch[2] = yyt1;
@@ -1647,133 +1683,107 @@ yy232:
         opcode = absl::StrCat(group(1), "_", group(2), "1");
         goto end_region;
     }
-#line 1651 "src/sfizz/OpcodeCleanup.cpp"
-yy234:
+#line 1687 "src/sfizz/OpcodeCleanup.cpp"
+yy238:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'g':	goto yy245;
+	case 0x00:	goto yy251;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy238;
 	default:	goto yy34;
 	}
-yy235:
+yy240:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'g':	goto yy253;
+	default:	goto yy34;
+	}
+yy241:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[0] = yyt1;
 	yypmatch[2] = yyt3;
 	yypmatch[3] = yyt2;
 	yypmatch[1] = YYCURSOR;
-#line 144 "src/sfizz/OpcodeCleanup.re"
+#line 148 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat("resonance1", group(1));
         goto end_region;
     }
-#line 1670 "src/sfizz/OpcodeCleanup.cpp"
-yy237:
+#line 1722 "src/sfizz/OpcodeCleanup.cpp"
+yy243:
 	yych = *++YYCURSOR;
 	if (yych <= 0x00) {
 		yyt2 = YYCURSOR;
-		goto yy235;
-	}
-	goto yy237;
-yy239:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'k':	goto yy220;
-	default:	goto yy34;
-	}
-yy240:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'c':	goto yy246;
-	default:	goto yy34;
-	}
-yy241:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 's':	goto yy247;
-	default:	goto yy34;
-	}
-yy242:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'i':	goto yy248;
-	default:	goto yy34;
-	}
-yy243:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'h':	goto yy244;
-	default:	goto yy34;
-	}
-yy244:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'c':	goto yy249;
-	default:	goto yy34;
+		goto yy241;
 	}
+	goto yy243;
 yy245:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'r':	goto yy250;
+	case 'k':	goto yy224;
 	default:	goto yy34;
 	}
 yy246:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-		yyt3 = YYCURSOR;
-		goto yy251;
+	case 'c':	goto yy254;
 	default:	goto yy34;
 	}
 yy247:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy220;
+	case 's':	goto yy255;
 	default:	goto yy34;
 	}
 yy248:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'n':	goto yy220;
+	case 'i':	goto yy256;
 	default:	goto yy34;
 	}
 yy249:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy253;
+	case 'h':	goto yy250;
 	default:	goto yy34;
 	}
 yy250:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy254;
+	case 'c':	goto yy257;
 	default:	goto yy34;
 	}
 yy251:
+	++YYCURSOR;
+	yynmatch = 3;
+	yypmatch[4] = yyt1;
+	yypmatch[0] = yyt1 - 9;
+	yypmatch[1] = YYCURSOR;
+	yypmatch[2] = yyt1 - 6;
+	yypmatch[3] = yyt1 - 4;
+	yypmatch[5] = YYCURSOR - 1;
+#line 135 "src/sfizz/OpcodeCleanup.re"
+	{
+        opcode = absl::StrCat("start_", group(1), "hdcc", group(2));
+        goto end_region;
+    }
+#line 1780 "src/sfizz/OpcodeCleanup.cpp"
+yy253:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 0x00:	goto yy255;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy251;
+	case 'r':	goto yy258;
 	default:	goto yy34;
 	}
-yy253:
+yy254:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case '0':
@@ -1787,16 +1797,73 @@ yy253:
 	case '8':
 	case '9':
 		yyt3 = YYCURSOR;
-		goto yy257;
-	default:	goto yy34;
-	}
-yy254:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'u':	goto yy259;
+		goto yy259;
 	default:	goto yy34;
 	}
 yy255:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'e':	goto yy224;
+	default:	goto yy34;
+	}
+yy256:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'n':	goto yy224;
+	default:	goto yy34;
+	}
+yy257:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'c':	goto yy261;
+	default:	goto yy34;
+	}
+yy258:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'o':	goto yy262;
+	default:	goto yy34;
+	}
+yy259:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 0x00:	goto yy263;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy259;
+	default:	goto yy34;
+	}
+yy261:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+		yyt3 = YYCURSOR;
+		goto yy265;
+	default:	goto yy34;
+	}
+yy262:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'u':	goto yy267;
+	default:	goto yy34;
+	}
+yy263:
 	++YYCURSOR;
 	yynmatch = 4;
 	yypmatch[2] = yyt1;
@@ -1812,11 +1879,11 @@ yy255:
         opcode = absl::StrCat(group(1), "_", group(2), "_oncc", group(3));
         goto end_region;
     }
-#line 1816 "src/sfizz/OpcodeCleanup.cpp"
-yy257:
+#line 1883 "src/sfizz/OpcodeCleanup.cpp"
+yy265:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 0x00:	goto yy260;
+	case 0x00:	goto yy268;
 	case '0':
 	case '1':
 	case '2':
@@ -1826,16 +1893,16 @@ yy257:
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy257;
+	case '9':	goto yy265;
 	default:	goto yy34;
 	}
-yy259:
+yy267:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'p':	goto yy262;
+	case 'p':	goto yy270;
 	default:	goto yy34;
 	}
-yy260:
+yy268:
 	++YYCURSOR;
 	yynmatch = 4;
 	yypmatch[2] = yyt1;
@@ -1851,8 +1918,8 @@ yy260:
         opcode = absl::StrCat(group(1), "_", group(2), "_oncc", group(3));
         goto end_region;
     }
-#line 1855 "src/sfizz/OpcodeCleanup.cpp"
-yy262:
+#line 1922 "src/sfizz/OpcodeCleanup.cpp"
+yy270:
 	yych = *++YYCURSOR;
 	if (yych >= 0x01) goto yy34;
 	++YYCURSOR;
@@ -1864,9 +1931,9 @@ yy262:
         opcode = "group";
         goto end_region;
     }
-#line 1868 "src/sfizz/OpcodeCleanup.cpp"
+#line 1935 "src/sfizz/OpcodeCleanup.cpp"
 }
-#line 158 "src/sfizz/OpcodeCleanup.re"
+#line 162 "src/sfizz/OpcodeCleanup.re"
 
 
 end_region: