From 81f8e2bff2de2e4e8459d137ac85e8d85abe4e16 Mon Sep 17 00:00:00 2001
From: Jean Pierre Cimalando <jp-dev@inbox.ru>
Date: Fri, 15 May 2020 00:38:26 +0200
Subject: [PATCH] Update the opcode cleanup grammar

---
 src/sfizz/OpcodeCleanup.cpp | 1788 ++++++++++++++++++-----------------
 1 file changed, 940 insertions(+), 848 deletions(-)

diff --git a/src/sfizz/OpcodeCleanup.cpp b/src/sfizz/OpcodeCleanup.cpp
index b42c44e1..8e33865f 100644
--- a/src/sfizz/OpcodeCleanup.cpp
+++ b/src/sfizz/OpcodeCleanup.cpp
@@ -1,4 +1,4 @@
-/* Generated by re2c 1.3 on Tue May  5 03:27:40 2020 */
+/* Generated by re2c 1.3 on Fri May 15 00:29:29 2020 */
 #line 1 "src/sfizz/OpcodeCleanup.re"
 /* -*- mode: c++; -*- */
 // SPDX-License-Identifier: BSD-2-Clause
@@ -189,214 +189,127 @@ end_generic:
 	case 'g':
 		yyt1 = YYCURSOR;
 		goto yy26;
+	case 'h':	goto yy27;
 	case 'l':
 		yyt1 = YYCURSOR;
-		goto yy27;
-	case 'o':	goto yy28;
+		goto yy28;
+	case 'o':	goto yy29;
 	case 'p':
 		yyt1 = YYCURSOR;
-		goto yy29;
+		goto yy30;
 	case 'r':
 		yyt1 = YYCURSOR;
-		goto yy30;
+		goto yy31;
 	case 't':
 		yyt1 = YYCURSOR;
-		goto yy31;
+		goto yy32;
 	default:	goto yy19;
 	}
 yy19:
 	++YYCURSOR;
 yy20:
-#line 149 "src/sfizz/OpcodeCleanup.re"
+#line 154 "src/sfizz/OpcodeCleanup.re"
 	{
         goto end_region;
     }
-#line 215 "src/sfizz/OpcodeCleanup.cpp"
+#line 216 "src/sfizz/OpcodeCleanup.cpp"
 yy21:
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch (yych) {
-	case 'm':	goto yy32;
+	case 'm':	goto yy33;
 	default:	goto yy20;
 	}
 yy22:
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch (yych) {
-	case 'e':	goto yy34;
+	case 'e':	goto yy35;
 	default:	goto yy20;
 	}
 yy23:
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch (yych) {
-	case 'u':	goto yy35;
+	case 'u':	goto yy36;
 	default:	goto yy20;
 	}
 yy24:
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch (yych) {
-	case 'q':	goto yy36;
+	case 'q':	goto yy37;
 	default:	goto yy20;
 	}
 yy25:
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch (yych) {
-	case 'i':	goto yy37;
+	case 'i':	goto yy38;
 	default:	goto yy20;
 	}
 yy26:
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch (yych) {
-	case 'a':	goto yy38;
+	case 'a':	goto yy39;
 	default:	goto yy20;
 	}
 yy27:
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch (yych) {
-	case 'f':	goto yy39;
-	case 'o':	goto yy40;
+	case 'i':	goto yy40;
 	default:	goto yy20;
 	}
 yy28:
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch (yych) {
 	case 'f':	goto yy41;
-	case 'n':	goto yy42;
+	case 'o':	goto yy42;
 	default:	goto yy20;
 	}
 yy29:
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch (yych) {
-	case 'i':	goto yy43;
-	case 'o':	goto yy44;
+	case 'f':	goto yy43;
+	case 'n':	goto yy44;
 	default:	goto yy20;
 	}
 yy30:
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch (yych) {
-	case 'e':	goto yy45;
+	case 'i':	goto yy45;
+	case 'o':	goto yy46;
 	default:	goto yy20;
 	}
 yy31:
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch (yych) {
-	case 'u':	goto yy46;
+	case 'e':	goto yy47;
 	default:	goto yy20;
 	}
 yy32:
-	yych = *++YYCURSOR;
+	yych = *(YYMARKER = ++YYCURSOR);
 	switch (yych) {
-	case 'p':	goto yy47;
-	default:	goto yy33;
+	case 'u':	goto yy48;
+	default:	goto yy20;
 	}
 yy33:
-	YYCURSOR = YYMARKER;
-	goto yy20;
-yy34:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'n':	goto yy48;
-	default:	goto yy33;
+	case 'p':	goto yy49;
+	default:	goto yy34;
 	}
+yy34:
+	YYCURSOR = YYMARKER;
+	goto yy20;
 yy35:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy49;
-	default:	goto yy33;
+	case 'n':	goto yy50;
+	default:	goto yy34;
 	}
 yy36:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy50;
-	default:	goto yy33;
+	case 't':	goto yy51;
+	default:	goto yy34;
 	}
 yy37:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'l':	goto yy52;
-	default:	goto yy33;
-	}
-yy38:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'i':	goto yy53;
-	default:	goto yy33;
-	}
-yy39:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'o':	goto yy54;
-	default:	goto yy33;
-	}
-yy40:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'o':	goto yy55;
-	default:	goto yy33;
-	}
-yy41:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'f':	goto yy56;
-	default:	goto yy33;
-	}
-yy42:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case '_':	goto yy57;
-	default:	goto yy33;
-	}
-yy43:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 't':	goto yy58;
-	default:	goto yy33;
-	}
-yy44:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'l':	goto yy59;
-	default:	goto yy33;
-	}
-yy45:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 's':	goto yy60;
-	default:	goto yy33;
-	}
-yy46:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'n':	goto yy61;
-	default:	goto yy33;
-	}
-yy47:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'e':	goto yy62;
-	case 'l':	goto yy63;
-	default:	goto yy33;
-	}
-yy48:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'd':	goto yy64;
-	default:	goto yy33;
-	}
-yy49:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'o':	goto yy65;
-	default:	goto yy33;
-	}
-yy50:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case '0':
@@ -408,9 +321,94 @@ yy50:
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy50;
-	case '_':	goto yy66;
-	default:	goto yy33;
+	case '9':	goto yy52;
+	default:	goto yy34;
+	}
+yy38:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'l':	goto yy54;
+	default:	goto yy34;
+	}
+yy39:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'i':	goto yy55;
+	default:	goto yy34;
+	}
+yy40:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'r':	goto yy56;
+	default:	goto yy34;
+	}
+yy41:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'o':	goto yy57;
+	default:	goto yy34;
+	}
+yy42:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'o':	goto yy58;
+	case 'r':	goto yy56;
+	default:	goto yy34;
+	}
+yy43:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'f':	goto yy59;
+	default:	goto yy34;
+	}
+yy44:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case '_':	goto yy60;
+	default:	goto yy34;
+	}
+yy45:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 't':	goto yy61;
+	default:	goto yy34;
+	}
+yy46:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'l':	goto yy62;
+	default:	goto yy34;
+	}
+yy47:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 's':	goto yy63;
+	default:	goto yy34;
+	}
+yy48:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'n':	goto yy64;
+	default:	goto yy34;
+	}
+yy49:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'e':	goto yy65;
+	case 'l':	goto yy66;
+	default:	goto yy34;
+	}
+yy50:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'd':	goto yy67;
+	default:	goto yy34;
+	}
+yy51:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'o':	goto yy68;
+	default:	goto yy34;
 	}
 yy52:
 	yych = *++YYCURSOR;
@@ -424,20 +422,9 @@ yy52:
 	case '6':
 	case '7':
 	case '8':
-	case '9':
-		yyt1 = YYCURSOR;
-		goto yy67;
+	case '9':	goto yy52;
 	case '_':	goto yy69;
-	case 'e':	goto yy62;
-	case 'l':	goto yy63;
-	case 't':	goto yy70;
-	default:	goto yy33;
-	}
-yy53:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'n':	goto yy71;
-	default:	goto yy33;
+	default:	goto yy34;
 	}
 yy54:
 	yych = *++YYCURSOR;
@@ -451,138 +438,134 @@ yy54:
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy72;
-	default:	goto yy33;
+	case '9':
+		yyt1 = YYCURSOR;
+		goto yy70;
+	case '_':	goto yy72;
+	case 'e':	goto yy65;
+	case 'l':	goto yy66;
+	case 't':	goto yy73;
+	default:	goto yy34;
 	}
 yy55:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'p':	goto yy74;
-	default:	goto yy33;
+	case 'n':	goto yy74;
+	default:	goto yy34;
 	}
 yy56:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'b':
-		yyt1 = YYCURSOR;
-		goto yy75;
-	case 'm':
-		yyt1 = YYCURSOR;
-		goto yy76;
-	default:	goto yy33;
+	case 'e':	goto yy75;
+	default:	goto yy34;
 	}
 yy57:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'h':	goto yy77;
-	case 'l':	goto yy78;
-	default:	goto yy33;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy76;
+	default:	goto yy34;
 	}
 yy58:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy79;
-	default:	goto yy33;
+	case 'p':	goto yy78;
+	default:	goto yy34;
 	}
 yy59:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'y':	goto yy80;
-	default:	goto yy33;
+	case 'b':
+		yyt1 = YYCURSOR;
+		goto yy79;
+	case 'm':
+		yyt1 = YYCURSOR;
+		goto yy80;
+	default:	goto yy34;
 	}
 yy60:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy81;
-	default:	goto yy33;
+	case 'h':	goto yy81;
+	case 'l':	goto yy82;
+	default:	goto yy34;
 	}
 yy61:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy82;
-	default:	goto yy33;
+	case 'c':	goto yy83;
+	default:	goto yy34;
 	}
 yy62:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'g':	goto yy83;
-	default:	goto yy33;
+	case 'y':	goto yy84;
+	default:	goto yy34;
 	}
 yy63:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'f':	goto yy84;
-	default:	goto yy33;
+	case 'o':	goto yy85;
+	default:	goto yy34;
 	}
 yy64:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'd':
-		yyt1 = YYCURSOR;
-		goto yy85;
-	case 'u':
-		yyt1 = YYCURSOR;
-		goto yy86;
-	default:	goto yy33;
+	case 'e':	goto yy86;
+	default:	goto yy34;
 	}
 yy65:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'f':	goto yy87;
-	default:	goto yy33;
+	case 'g':	goto yy87;
+	default:	goto yy34;
 	}
 yy66:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'b':
-		yyt2 = YYCURSOR;
-		goto yy88;
-	case 'f':
-		yyt2 = YYCURSOR;
-		goto yy89;
-	case 'g':
-		yyt2 = YYCURSOR;
-		goto yy90;
-	default:	goto yy33;
+	case 'f':	goto yy88;
+	default:	goto yy34;
 	}
 yy67:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy67;
-	case 't':	goto yy91;
-	default:	goto yy33;
+	case 'd':
+		yyt1 = YYCURSOR;
+		goto yy89;
+	case 'u':
+		yyt1 = YYCURSOR;
+		goto yy90;
+	default:	goto yy34;
+	}
+yy68:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'f':	goto yy91;
+	default:	goto yy34;
 	}
 yy69:
 	yych = *++YYCURSOR;
-	yyt1 = YYCURSOR;
-	goto yy95;
+	switch (yych) {
+	case 'b':
+		yyt2 = YYCURSOR;
+		goto yy92;
+	case 'f':
+		yyt2 = YYCURSOR;
+		goto yy93;
+	case 'g':
+		yyt2 = YYCURSOR;
+		goto yy94;
+	default:	goto yy34;
+	}
 yy70:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'y':	goto yy96;
-	default:	goto yy33;
-	}
-yy71:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 0x00:
-		yyt2 = yyt3 = NULL;
-		goto yy97;
-	case '_':
-		yyt3 = YYCURSOR;
-		goto yy99;
-	default:	goto yy33;
-	}
-yy72:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case '0':
@@ -594,132 +577,175 @@ yy72:
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy72;
-	case '_':	goto yy101;
-	default:	goto yy33;
+	case '9':	goto yy70;
+	case 't':	goto yy95;
+	default:	goto yy34;
+	}
+yy72:
+	yych = *++YYCURSOR;
+	yyt1 = YYCURSOR;
+	goto yy99;
+yy73:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'y':	goto yy100;
+	default:	goto yy34;
 	}
 yy74:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':
-		yyt1 = YYCURSOR;
-		goto yy102;
-	case 'm':
-		yyt1 = YYCURSOR;
+	case 0x00:
+		yyt2 = yyt3 = NULL;
+		goto yy101;
+	case '_':
+		yyt3 = YYCURSOR;
 		goto yy103;
-	case 's':
-		yyt1 = YYCURSOR;
-		goto yy104;
-	default:	goto yy33;
+	default:	goto yy34;
 	}
 yy75:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'y':	goto yy105;
-	default:	goto yy33;
+	case 'a':	goto yy105;
+	default:	goto yy34;
 	}
 yy76:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy106;
-	default:	goto yy33;
-	}
-yy77:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'i':	goto yy107;
-	default:	goto yy33;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy76;
+	case '_':	goto yy106;
+	default:	goto yy34;
 	}
 yy78:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy107;
-	default:	goto yy33;
+	case 'e':
+		yyt1 = YYCURSOR;
+		goto yy107;
+	case 'm':
+		yyt1 = YYCURSOR;
+		goto yy108;
+	case 's':
+		yyt1 = YYCURSOR;
+		goto yy109;
+	default:	goto yy34;
 	}
 yy79:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'h':	goto yy47;
-	default:	goto yy33;
+	case 'y':	goto yy110;
+	default:	goto yy34;
 	}
 yy80:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'p':	goto yy108;
-	default:	goto yy33;
+	case 'o':	goto yy111;
+	default:	goto yy34;
 	}
 yy81:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'n':	goto yy109;
-	default:	goto yy33;
+	case 'i':	goto yy112;
+	default:	goto yy34;
 	}
 yy82:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 0x00:
-		yyt2 = yyt3 = NULL;
-		goto yy110;
-	case '_':
-		yyt3 = YYCURSOR;
-		goto yy112;
-	default:	goto yy33;
+	case 'o':	goto yy112;
+	default:	goto yy34;
 	}
 yy83:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case '_':	goto yy114;
-	default:	goto yy33;
+	case 'h':	goto yy49;
+	default:	goto yy34;
 	}
 yy84:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy115;
-	default:	goto yy33;
+	case 'p':	goto yy113;
+	default:	goto yy34;
 	}
 yy85:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy116;
-	default:	goto yy33;
+	case 'n':	goto yy114;
+	default:	goto yy34;
 	}
 yy86:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'p':	goto yy117;
-	default:	goto yy33;
+	case 0x00:
+		yyt2 = yyt3 = NULL;
+		goto yy115;
+	case '_':
+		yyt3 = YYCURSOR;
+		goto yy117;
+	default:	goto yy34;
 	}
 yy87:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'f':	goto yy118;
-	default:	goto yy33;
+	case '_':	goto yy119;
+	default:	goto yy34;
 	}
 yy88:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'w':	goto yy119;
-	default:	goto yy33;
+	case 'o':	goto yy120;
+	default:	goto yy34;
 	}
 yy89:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'r':	goto yy120;
-	default:	goto yy33;
+	case 'o':	goto yy121;
+	default:	goto yy34;
 	}
 yy90:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy121;
-	default:	goto yy33;
+	case 'p':	goto yy122;
+	default:	goto yy34;
 	}
 yy91:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'y':	goto yy122;
-	default:	goto yy33;
+	case 'f':	goto yy123;
+	default:	goto yy34;
 	}
 yy92:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'w':	goto yy124;
+	default:	goto yy34;
+	}
+yy93:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'r':	goto yy125;
+	default:	goto yy34;
+	}
+yy94:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'a':	goto yy126;
+	default:	goto yy34;
+	}
+yy95:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'y':	goto yy127;
+	default:	goto yy34;
+	}
+yy96:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[2] = yyt1;
@@ -728,22 +754,22 @@ yy92:
 	yypmatch[3] = YYCURSOR - 1;
 #line 136 "src/sfizz/OpcodeCleanup.re"
 	{
-         opcode = absl::StrCat("fil1_", group(1));
-         goto end_region;
-     }
-#line 735 "src/sfizz/OpcodeCleanup.cpp"
-yy94:
+        opcode = absl::StrCat("fil1_", group(1));
+        goto end_region;
+    }
+#line 761 "src/sfizz/OpcodeCleanup.cpp"
+yy98:
 	yych = *++YYCURSOR;
-yy95:
-	if (yych <= 0x00) goto yy92;
-	goto yy94;
-yy96:
+yy99:
+	if (yych <= 0x00) goto yy96;
+	goto yy98;
+yy100:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'p':	goto yy123;
-	default:	goto yy33;
+	case 'p':	goto yy128;
+	default:	goto yy34;
 	}
-yy97:
+yy101:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[0] = yyt1;
@@ -752,81 +778,87 @@ yy97:
 	yypmatch[1] = YYCURSOR;
 #line 122 "src/sfizz/OpcodeCleanup.re"
 	{
-         opcode = absl::StrCat("volume", group(1));
-         goto end_region;
-     }
-#line 759 "src/sfizz/OpcodeCleanup.cpp"
-yy99:
+        opcode = absl::StrCat("volume", group(1));
+        goto end_region;
+    }
+#line 785 "src/sfizz/OpcodeCleanup.cpp"
+yy103:
 	yych = *++YYCURSOR;
 	if (yych <= 0x00) {
 		yyt2 = YYCURSOR;
-		goto yy97;
+		goto yy101;
 	}
-	goto yy99;
-yy101:
+	goto yy103;
+yy105:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'l':	goto yy129;
+	default:	goto yy34;
+	}
+yy106:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case 'o':
 		yyt2 = YYCURSOR;
-		goto yy124;
+		goto yy130;
 	case 'r':
 		yyt2 = YYCURSOR;
-		goto yy125;
+		goto yy131;
 	case 's':
 		yyt2 = YYCURSOR;
-		goto yy126;
+		goto yy132;
 	case 'w':
 		yyt2 = YYCURSOR;
-		goto yy127;
-	default:	goto yy33;
-	}
-yy102:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'n':	goto yy128;
-	default:	goto yy33;
-	}
-yy103:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'o':	goto yy129;
-	default:	goto yy33;
-	}
-yy104:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 't':	goto yy130;
-	default:	goto yy33;
-	}
-yy105:
-	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy131;
-	goto yy33;
-yy106:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'd':	goto yy133;
-	default:	goto yy33;
+		goto yy133;
+	default:	goto yy34;
 	}
 yy107:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy134;
-	default:	goto yy33;
+	case 'n':	goto yy134;
+	default:	goto yy34;
 	}
 yy108:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'h':	goto yy135;
-	default:	goto yy33;
+	case 'o':	goto yy135;
+	default:	goto yy34;
 	}
 yy109:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy136;
-	default:	goto yy33;
+	case 't':	goto yy136;
+	default:	goto yy34;
 	}
 yy110:
+	yych = *++YYCURSOR;
+	if (yych <= 0x00) goto yy137;
+	goto yy34;
+yy111:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'd':	goto yy139;
+	default:	goto yy34;
+	}
+yy112:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'c':	goto yy140;
+	default:	goto yy34;
+	}
+yy113:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'h':	goto yy141;
+	default:	goto yy34;
+	}
+yy114:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'a':	goto yy142;
+	default:	goto yy34;
+	}
+yy115:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[0] = yyt1;
@@ -835,137 +867,143 @@ yy110:
 	yypmatch[1] = YYCURSOR;
 #line 126 "src/sfizz/OpcodeCleanup.re"
 	{
-         opcode = absl::StrCat("pitch", group(1));
-         goto end_region;
-     }
-#line 842 "src/sfizz/OpcodeCleanup.cpp"
-yy112:
+        opcode = absl::StrCat("pitch", group(1));
+        goto end_region;
+    }
+#line 874 "src/sfizz/OpcodeCleanup.cpp"
+yy117:
 	yych = *++YYCURSOR;
 	if (yych <= 0x00) {
 		yyt2 = YYCURSOR;
-		goto yy110;
+		goto yy115;
 	}
-	goto yy112;
-yy114:
+	goto yy117;
+yy119:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case 'a':
 		yyt2 = YYCURSOR;
-		goto yy137;
+		goto yy143;
 	case 'd':
 		yyt2 = YYCURSOR;
-		goto yy138;
+		goto yy144;
 	case 'h':
 		yyt2 = YYCURSOR;
-		goto yy139;
+		goto yy145;
 	case 'r':
 		yyt2 = YYCURSOR;
-		goto yy140;
+		goto yy146;
 	case 's':
 		yyt2 = YYCURSOR;
-		goto yy141;
-	default:	goto yy33;
-	}
-yy115:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case '_':	goto yy142;
-	default:	goto yy33;
-	}
-yy116:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'w':	goto yy143;
-	default:	goto yy33;
-	}
-yy117:
-	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy144;
-	goto yy33;
-yy118:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 0x00:
-		yyt2 = yyt3 = NULL;
-		goto yy146;
-	case '_':
-		yyt3 = YYCURSOR;
-		goto yy148;
-	default:	goto yy33;
-	}
-yy119:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'c':	goto yy150;
-	default:	goto yy33;
+		goto yy147;
+	default:	goto yy34;
 	}
 yy120:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy151;
-	default:	goto yy33;
+	case '_':	goto yy148;
+	default:	goto yy34;
 	}
 yy121:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'i':	goto yy152;
-	default:	goto yy33;
+	case 'w':	goto yy149;
+	default:	goto yy34;
 	}
 yy122:
 	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'p':	goto yy153;
-	default:	goto yy33;
-	}
+	if (yych <= 0x00) goto yy150;
+	goto yy34;
 yy123:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy154;
-	default:	goto yy33;
+	case 0x00:
+		yyt2 = yyt3 = NULL;
+		goto yy152;
+	case '_':
+		yyt3 = YYCURSOR;
+		goto yy154;
+	default:	goto yy34;
 	}
 yy124:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'f':	goto yy155;
-	default:	goto yy33;
+	case 'c':	goto yy156;
+	default:	goto yy34;
 	}
 yy125:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy156;
-	default:	goto yy33;
+	case 'e':	goto yy157;
+	default:	goto yy34;
 	}
 yy126:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy157;
-	default:	goto yy33;
+	case 'i':	goto yy158;
+	default:	goto yy34;
 	}
 yy127:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy158;
-	default:	goto yy33;
+	case 'p':	goto yy159;
+	default:	goto yy34;
 	}
 yy128:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'd':	goto yy159;
-	default:	goto yy33;
+	case 'e':	goto yy160;
+	default:	goto yy34;
 	}
 yy129:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'd':	goto yy160;
-	default:	goto yy33;
+	case 'c':	goto yy161;
+	default:	goto yy34;
 	}
 yy130:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy161;
-	default:	goto yy33;
+	case 'f':	goto yy162;
+	default:	goto yy34;
 	}
 yy131:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'a':	goto yy163;
+	default:	goto yy34;
+	}
+yy132:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'c':	goto yy164;
+	default:	goto yy34;
+	}
+yy133:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'a':	goto yy165;
+	default:	goto yy34;
+	}
+yy134:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'd':	goto yy166;
+	default:	goto yy34;
+	}
+yy135:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'd':	goto yy167;
+	default:	goto yy34;
+	}
+yy136:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'a':	goto yy168;
+	default:	goto yy34;
+	}
+yy137:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[2] = yyt1;
@@ -977,80 +1015,80 @@ yy131:
         opcode = absl::StrCat("off_", group(1));
         goto end_region;
     }
-#line 981 "src/sfizz/OpcodeCleanup.cpp"
-yy133:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'e':	goto yy105;
-	default:	goto yy33;
-	}
-yy134:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'c':	goto yy162;
-	default:	goto yy33;
-	}
-yy135:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'o':	goto yy163;
-	default:	goto yy33;
-	}
-yy136:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'n':	goto yy164;
-	default:	goto yy33;
-	}
-yy137:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 't':	goto yy165;
-	default:	goto yy33;
-	}
-yy138:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'e':	goto yy166;
-	default:	goto yy33;
-	}
+#line 1019 "src/sfizz/OpcodeCleanup.cpp"
 yy139:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy167;
-	default:	goto yy33;
+	case 'e':	goto yy110;
+	default:	goto yy34;
 	}
 yy140:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy168;
-	default:	goto yy33;
+	case 'c':	goto yy169;
+	default:	goto yy34;
 	}
 yy141:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy169;
-	case 'u':	goto yy170;
-	default:	goto yy33;
+	case 'o':	goto yy170;
+	default:	goto yy34;
 	}
 yy142:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'd':
-		yyt2 = YYCURSOR;
-		goto yy171;
-	case 'f':
-		yyt2 = YYCURSOR;
-		goto yy172;
-	default:	goto yy33;
+	case 'n':	goto yy171;
+	default:	goto yy34;
 	}
 yy143:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'n':	goto yy117;
-	default:	goto yy33;
+	case 't':	goto yy172;
+	default:	goto yy34;
 	}
 yy144:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'e':	goto yy173;
+	default:	goto yy34;
+	}
+yy145:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'o':	goto yy174;
+	default:	goto yy34;
+	}
+yy146:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'e':	goto yy175;
+	default:	goto yy34;
+	}
+yy147:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 't':	goto yy176;
+	case 'u':	goto yy177;
+	default:	goto yy34;
+	}
+yy148:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'd':
+		yyt2 = YYCURSOR;
+		goto yy178;
+	case 'f':
+		yyt2 = YYCURSOR;
+		goto yy179;
+	default:	goto yy34;
+	}
+yy149:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'n':	goto yy122;
+	default:	goto yy34;
+	}
+yy150:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[2] = yyt1;
@@ -1062,8 +1100,8 @@ yy144:
         opcode = absl::StrCat("bend_", group(1));
         goto end_region;
     }
-#line 1066 "src/sfizz/OpcodeCleanup.cpp"
-yy146:
+#line 1104 "src/sfizz/OpcodeCleanup.cpp"
+yy152:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[0] = yyt1;
@@ -1072,86 +1110,92 @@ yy146:
 	yypmatch[1] = YYCURSOR;
 #line 140 "src/sfizz/OpcodeCleanup.re"
 	{
-         opcode = absl::StrCat("cutoff1", group(1));
-         goto end_region;
-     }
-#line 1079 "src/sfizz/OpcodeCleanup.cpp"
-yy148:
+        opcode = absl::StrCat("cutoff1", group(1));
+        goto end_region;
+    }
+#line 1117 "src/sfizz/OpcodeCleanup.cpp"
+yy154:
 	yych = *++YYCURSOR;
 	if (yych <= 0x00) {
 		yyt2 = YYCURSOR;
-		goto yy146;
-	}
-	goto yy148;
-yy150:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'c':	goto yy173;
-	default:	goto yy33;
-	}
-yy151:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'q':	goto yy119;
-	default:	goto yy33;
-	}
-yy152:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'n':	goto yy119;
-	default:	goto yy33;
-	}
-yy153:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'e':	goto yy174;
-	default:	goto yy33;
-	}
-yy154:
-	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy175;
-	goto yy33;
-yy155:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'f':	goto yy177;
-	default:	goto yy33;
+		goto yy152;
 	}
+	goto yy154;
 yy156:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy178;
-	default:	goto yy33;
+	case 'c':	goto yy180;
+	default:	goto yy34;
 	}
 yy157:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy179;
-	default:	goto yy33;
+	case 'q':	goto yy124;
+	default:	goto yy34;
 	}
 yy158:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'v':	goto yy180;
-	default:	goto yy33;
+	case 'n':	goto yy124;
+	default:	goto yy34;
 	}
 yy159:
 	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy181;
-	goto yy33;
+	switch (yych) {
+	case 'e':	goto yy181;
+	default:	goto yy34;
+	}
 yy160:
 	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'e':	goto yy159;
-	default:	goto yy33;
-	}
+	if (yych <= 0x00) goto yy182;
+	goto yy34;
 yy161:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'r':	goto yy183;
-	default:	goto yy33;
+	case 'c':	goto yy184;
+	default:	goto yy34;
 	}
 yy162:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'f':	goto yy185;
+	default:	goto yy34;
+	}
+yy163:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 't':	goto yy186;
+	default:	goto yy34;
+	}
+yy164:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'a':	goto yy187;
+	default:	goto yy34;
+	}
+yy165:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'v':	goto yy188;
+	default:	goto yy34;
+	}
+yy166:
+	yych = *++YYCURSOR;
+	if (yych <= 0x00) goto yy189;
+	goto yy34;
+yy167:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'e':	goto yy166;
+	default:	goto yy34;
+	}
+yy168:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'r':	goto yy191;
+	default:	goto yy34;
+	}
+yy169:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case '0':
@@ -1165,72 +1209,72 @@ yy162:
 	case '8':
 	case '9':
 		yyt1 = YYCURSOR;
-		goto yy184;
-	default:	goto yy33;
-	}
-yy163:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'n':	goto yy186;
-	default:	goto yy33;
-	}
-yy164:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'c':	goto yy187;
-	default:	goto yy33;
-	}
-yy165:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 't':	goto yy188;
-	default:	goto yy33;
-	}
-yy166:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'c':
-	case 'l':	goto yy189;
-	default:	goto yy33;
-	}
-yy167:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'l':	goto yy190;
-	default:	goto yy33;
-	}
-yy168:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'l':	goto yy191;
-	default:	goto yy33;
-	}
-yy169:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'a':	goto yy192;
-	default:	goto yy33;
+		goto yy192;
+	default:	goto yy34;
 	}
 yy170:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 's':	goto yy193;
-	default:	goto yy33;
+	case 'n':	goto yy194;
+	default:	goto yy34;
 	}
 yy171:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy194;
-	default:	goto yy33;
+	case 'c':	goto yy195;
+	default:	goto yy34;
 	}
 yy172:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy195;
-	case 'r':	goto yy196;
-	default:	goto yy33;
+	case 't':	goto yy196;
+	default:	goto yy34;
 	}
 yy173:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'c':
+	case 'l':	goto yy197;
+	default:	goto yy34;
+	}
+yy174:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'l':	goto yy198;
+	default:	goto yy34;
+	}
+yy175:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'l':	goto yy199;
+	default:	goto yy34;
+	}
+yy176:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'a':	goto yy200;
+	default:	goto yy34;
+	}
+yy177:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 's':	goto yy201;
+	default:	goto yy34;
+	}
+yy178:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'e':	goto yy202;
+	default:	goto yy34;
+	}
+yy179:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'a':	goto yy203;
+	case 'r':	goto yy204;
+	default:	goto yy34;
+	}
+yy180:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case '0':
@@ -1244,14 +1288,14 @@ yy173:
 	case '8':
 	case '9':
 		yyt3 = YYCURSOR;
-		goto yy197;
-	default:	goto yy33;
+		goto yy205;
+	default:	goto yy34;
 	}
-yy174:
+yy181:
 	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy199;
-	goto yy33;
-yy175:
+	if (yych <= 0x00) goto yy207;
+	goto yy34;
+yy182:
 	++YYCURSOR;
 	yynmatch = 1;
 	yypmatch[0] = YYCURSOR - 8;
@@ -1261,32 +1305,49 @@ yy175:
         opcode = absl::StrCat("fil1_type");
         goto end_region;
     }
-#line 1265 "src/sfizz/OpcodeCleanup.cpp"
-yy177:
+#line 1309 "src/sfizz/OpcodeCleanup.cpp"
+yy184:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 's':	goto yy201;
-	default:	goto yy33;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+		yyt1 = YYCURSOR;
+		goto yy209;
+	default:	goto yy34;
 	}
-yy178:
+yy185:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'i':	goto yy202;
-	default:	goto yy33;
+	case 's':	goto yy211;
+	default:	goto yy34;
 	}
-yy179:
+yy186:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'l':	goto yy180;
-	default:	goto yy33;
+	case 'i':	goto yy212;
+	default:	goto yy34;
 	}
-yy180:
+yy187:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy203;
-	default:	goto yy33;
+	case 'l':	goto yy188;
+	default:	goto yy34;
 	}
-yy181:
+yy188:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'e':	goto yy213;
+	default:	goto yy34;
+	}
+yy189:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[2] = yyt1;
@@ -1298,99 +1359,17 @@ yy181:
         opcode = absl::StrCat("loop_", group(1));
         goto end_region;
     }
-#line 1302 "src/sfizz/OpcodeCleanup.cpp"
-yy183:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 't':	goto yy159;
-	default:	goto yy33;
-	}
-yy184:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 0x00:	goto yy204;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy184;
-	default:	goto yy33;
-	}
-yy186:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'y':	goto yy206;
-	default:	goto yy33;
-	}
-yy187:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'e':	goto yy207;
-	default:	goto yy33;
-	}
-yy188:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'a':	goto yy208;
-	default:	goto yy33;
-	}
-yy189:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'a':	goto yy209;
-	default:	goto yy33;
-	}
-yy190:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'd':	goto yy210;
-	default:	goto yy33;
-	}
+#line 1363 "src/sfizz/OpcodeCleanup.cpp"
 yy191:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy211;
-	default:	goto yy33;
+	case 't':	goto yy166;
+	default:	goto yy34;
 	}
 yy192:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'r':	goto yy212;
-	default:	goto yy33;
-	}
-yy193:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 't':	goto yy213;
-	default:	goto yy33;
-	}
-yy194:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'p':	goto yy214;
-	default:	goto yy33;
-	}
-yy195:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'd':	goto yy215;
-	default:	goto yy33;
-	}
-yy196:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'e':	goto yy216;
-	default:	goto yy33;
-	}
-yy197:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 0x00:	goto yy217;
+	case 0x00:	goto yy214;
 	case '0':
 	case '1':
 	case '2':
@@ -1400,10 +1379,92 @@ yy197:
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy197;
-	default:	goto yy33;
+	case '9':	goto yy192;
+	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 '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy205;
+	default:	goto yy34;
+	}
+yy207:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[2] = yyt1;
@@ -1415,24 +1476,40 @@ yy199:
         opcode = absl::StrCat("fil", group(1), "_type");
         goto end_region;
     }
-#line 1419 "src/sfizz/OpcodeCleanup.cpp"
-yy201:
+#line 1480 "src/sfizz/OpcodeCleanup.cpp"
+yy209:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy219;
-	default:	goto yy33;
+	case 0x00:	goto yy229;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy209;
+	default:	goto yy34;
 	}
-yy202:
+yy211:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'o':	goto yy203;
-	default:	goto yy33;
+	case 'e':	goto yy231;
+	default:	goto yy34;
 	}
-yy203:
+yy212:
 	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy220;
-	goto yy33;
-yy204:
+	switch (yych) {
+	case 'o':	goto yy213;
+	default:	goto yy34;
+	}
+yy213:
+	yych = *++YYCURSOR;
+	if (yych <= 0x00) goto yy232;
+	goto yy34;
+yy214:
 	++YYCURSOR;
 	yynmatch = 3;
 	yypmatch[4] = yyt1;
@@ -1446,79 +1523,79 @@ yy204:
         opcode = absl::StrCat("start_", group(1), "cc", group(2));
         goto end_region;
     }
-#line 1450 "src/sfizz/OpcodeCleanup.cpp"
-yy206:
+#line 1527 "src/sfizz/OpcodeCleanup.cpp"
+yy216:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case '_':	goto yy222;
-	default:	goto yy33;
+	case '_':	goto yy234;
+	default:	goto yy34;
 	}
-yy207:
+yy217:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case 0x00:
 		yyt2 = yyt3 = NULL;
-		goto yy223;
+		goto yy235;
 	case '_':
 		yyt3 = YYCURSOR;
-		goto yy225;
-	default:	goto yy33;
+		goto yy237;
+	default:	goto yy34;
 	}
-yy208:
+yy218:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy227;
-	default:	goto yy33;
+	case 'c':	goto yy239;
+	default:	goto yy34;
 	}
-yy209:
+yy219:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'y':	goto yy210;
-	default:	goto yy33;
+	case 'y':	goto yy220;
+	default:	goto yy34;
 	}
-yy210:
+yy220:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'c':	goto yy228;
-	default:	goto yy33;
+	case 'c':	goto yy240;
+	default:	goto yy34;
 	}
-yy211:
+yy221:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy229;
-	default:	goto yy33;
+	case 'a':	goto yy241;
+	default:	goto yy34;
 	}
-yy212:
+yy222:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy210;
-	default:	goto yy33;
+	case 't':	goto yy220;
+	default:	goto yy34;
 	}
-yy213:
+yy223:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'a':	goto yy230;
-	default:	goto yy33;
+	case 'a':	goto yy242;
+	default:	goto yy34;
 	}
-yy214:
+yy224:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy231;
-	default:	goto yy33;
+	case 't':	goto yy243;
+	default:	goto yy34;
 	}
-yy215:
+yy225:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'e':	goto yy232;
-	default:	goto yy33;
+	case 'e':	goto yy244;
+	default:	goto yy34;
 	}
-yy216:
+yy226:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'q':	goto yy232;
-	default:	goto yy33;
+	case 'q':	goto yy244;
+	default:	goto yy34;
 	}
-yy217:
+yy227:
 	++YYCURSOR;
 	yynmatch = 4;
 	yypmatch[2] = yyt1;
@@ -1534,14 +1611,29 @@ yy217:
         opcode = absl::StrCat(group(1), "_", group(2), "_oncc", group(3));
         goto end_region;
     }
-#line 1538 "src/sfizz/OpcodeCleanup.cpp"
-yy219:
+#line 1615 "src/sfizz/OpcodeCleanup.cpp"
+yy229:
+	++YYCURSOR;
+	yynmatch = 3;
+	yypmatch[4] = yyt1;
+	yypmatch[0] = yyt1 - 8;
+	yypmatch[1] = YYCURSOR;
+	yypmatch[2] = yyt1 - 8;
+	yypmatch[3] = yyt1 - 6;
+	yypmatch[5] = YYCURSOR - 1;
+#line 149 "src/sfizz/OpcodeCleanup.re"
+	{
+        opcode = absl::StrCat(group(1), "hdcc", group(2));
+        goto end_region;
+    }
+#line 1630 "src/sfizz/OpcodeCleanup.cpp"
+yy231:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 't':	goto yy203;
-	default:	goto yy33;
+	case 't':	goto yy213;
+	default:	goto yy34;
 	}
-yy220:
+yy232:
 	++YYCURSOR;
 	yynmatch = 3;
 	yypmatch[2] = yyt1;
@@ -1555,14 +1647,14 @@ yy220:
         opcode = absl::StrCat(group(1), "_", group(2), "1");
         goto end_region;
     }
-#line 1559 "src/sfizz/OpcodeCleanup.cpp"
-yy222:
+#line 1651 "src/sfizz/OpcodeCleanup.cpp"
+yy234:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'g':	goto yy233;
-	default:	goto yy33;
+	case 'g':	goto yy245;
+	default:	goto yy34;
 	}
-yy223:
+yy235:
 	++YYCURSOR;
 	yynmatch = 2;
 	yypmatch[0] = yyt1;
@@ -1571,117 +1663,60 @@ yy223:
 	yypmatch[1] = YYCURSOR;
 #line 144 "src/sfizz/OpcodeCleanup.re"
 	{
-         opcode = absl::StrCat("resonance1", group(1));
-         goto end_region;
-     }
-#line 1578 "src/sfizz/OpcodeCleanup.cpp"
-yy225:
+        opcode = absl::StrCat("resonance1", group(1));
+        goto end_region;
+    }
+#line 1670 "src/sfizz/OpcodeCleanup.cpp"
+yy237:
 	yych = *++YYCURSOR;
 	if (yych <= 0x00) {
 		yyt2 = YYCURSOR;
-		goto yy223;
-	}
-	goto yy225;
-yy227:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'k':	goto yy210;
-	default:	goto yy33;
-	}
-yy228:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'c':	goto yy234;
-	default:	goto yy33;
-	}
-yy229:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 's':	goto yy235;
-	default:	goto yy33;
-	}
-yy230:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'i':	goto yy236;
-	default:	goto yy33;
-	}
-yy231:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'h':	goto yy232;
-	default:	goto yy33;
-	}
-yy232:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'c':	goto yy237;
-	default:	goto yy33;
-	}
-yy233:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'r':	goto yy238;
-	default:	goto yy33;
-	}
-yy234:
-	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 yy239;
-	default:	goto yy33;
-	}
-yy235:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'e':	goto yy210;
-	default:	goto yy33;
-	}
-yy236:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'n':	goto yy210;
-	default:	goto yy33;
-	}
-yy237:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'c':	goto yy241;
-	default:	goto yy33;
-	}
-yy238:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case 'o':	goto yy242;
-	default:	goto yy33;
+		goto yy235;
 	}
+	goto yy237;
 yy239:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 0x00:	goto yy243;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy239;
-	default:	goto yy33;
+	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;
+	}
+yy245:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'r':	goto yy250;
+	default:	goto yy34;
+	}
+yy246:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case '0':
@@ -1695,16 +1730,73 @@ yy241:
 	case '8':
 	case '9':
 		yyt3 = YYCURSOR;
-		goto yy245;
-	default:	goto yy33;
+		goto yy251;
+	default:	goto yy34;
 	}
-yy242:
+yy247:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'u':	goto yy247;
-	default:	goto yy33;
+	case 'e':	goto yy220;
+	default:	goto yy34;
 	}
-yy243:
+yy248:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'n':	goto yy220;
+	default:	goto yy34;
+	}
+yy249:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'c':	goto yy253;
+	default:	goto yy34;
+	}
+yy250:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'o':	goto yy254;
+	default:	goto yy34;
+	}
+yy251:
+	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;
+	default:	goto yy34;
+	}
+yy253:
+	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 yy257;
+	default:	goto yy34;
+	}
+yy254:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case 'u':	goto yy259;
+	default:	goto yy34;
+	}
+yy255:
 	++YYCURSOR;
 	yynmatch = 4;
 	yypmatch[2] = yyt1;
@@ -1720,11 +1812,11 @@ yy243:
         opcode = absl::StrCat(group(1), "_", group(2), "_oncc", group(3));
         goto end_region;
     }
-#line 1724 "src/sfizz/OpcodeCleanup.cpp"
-yy245:
+#line 1816 "src/sfizz/OpcodeCleanup.cpp"
+yy257:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 0x00:	goto yy248;
+	case 0x00:	goto yy260;
 	case '0':
 	case '1':
 	case '2':
@@ -1734,16 +1826,16 @@ yy245:
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy245;
-	default:	goto yy33;
+	case '9':	goto yy257;
+	default:	goto yy34;
 	}
-yy247:
+yy259:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case 'p':	goto yy250;
-	default:	goto yy33;
+	case 'p':	goto yy262;
+	default:	goto yy34;
 	}
-yy248:
+yy260:
 	++YYCURSOR;
 	yynmatch = 4;
 	yypmatch[2] = yyt1;
@@ -1759,10 +1851,10 @@ yy248:
         opcode = absl::StrCat(group(1), "_", group(2), "_oncc", group(3));
         goto end_region;
     }
-#line 1763 "src/sfizz/OpcodeCleanup.cpp"
-yy250:
+#line 1855 "src/sfizz/OpcodeCleanup.cpp"
+yy262:
 	yych = *++YYCURSOR;
-	if (yych >= 0x01) goto yy33;
+	if (yych >= 0x01) goto yy34;
 	++YYCURSOR;
 	yynmatch = 1;
 	yypmatch[0] = YYCURSOR - 16;
@@ -1771,10 +1863,10 @@ yy250:
 	{
         opcode = "group";
         goto end_region;
-     }
-#line 1776 "src/sfizz/OpcodeCleanup.cpp"
+    }
+#line 1868 "src/sfizz/OpcodeCleanup.cpp"
 }
-#line 153 "src/sfizz/OpcodeCleanup.re"
+#line 158 "src/sfizz/OpcodeCleanup.re"
 
 
 end_region: