diff --git a/Editor/resources/lang_de.ts b/Editor/resources/lang_de.ts
index b5c4af1..1a4c939 100644
--- a/Editor/resources/lang_de.ts
+++ b/Editor/resources/lang_de.ts
@@ -125,7 +125,7 @@
 <context>
     <name>CommandWidget</name>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="285"/>
+        <location filename="../SoundMacroEditor.cpp" line="287"/>
         <source>Change %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -162,26 +162,26 @@
 <context>
     <name>EffectCatalogue</name>
     <message>
-        <location filename="../StudioSetupWidget.cpp" line="676"/>
-        <location filename="../StudioSetupWidget.cpp" line="680"/>
+        <location filename="../StudioSetupWidget.cpp" line="196"/>
+        <location filename="../StudioSetupWidget.cpp" line="203"/>
         <source>Reverb Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../StudioSetupWidget.cpp" line="676"/>
-        <location filename="../StudioSetupWidget.cpp" line="680"/>
+        <location filename="../StudioSetupWidget.cpp" line="197"/>
+        <location filename="../StudioSetupWidget.cpp" line="204"/>
         <source>Reverb High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../StudioSetupWidget.cpp" line="677"/>
-        <location filename="../StudioSetupWidget.cpp" line="681"/>
+        <location filename="../StudioSetupWidget.cpp" line="198"/>
+        <location filename="../StudioSetupWidget.cpp" line="205"/>
         <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../StudioSetupWidget.cpp" line="677"/>
-        <location filename="../StudioSetupWidget.cpp" line="681"/>
+        <location filename="../StudioSetupWidget.cpp" line="199"/>
+        <location filename="../StudioSetupWidget.cpp" line="206"/>
         <source>Chorus</source>
         <translation type="unfinished"></translation>
     </message>
@@ -197,47 +197,47 @@
 <context>
     <name>KeymapControls</name>
     <message>
-        <location filename="../KeymapEditor.cpp" line="300"/>
+        <location filename="../KeymapEditor.cpp" line="305"/>
         <source>SoundMacro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeymapEditor.cpp" line="306"/>
+        <location filename="../KeymapEditor.cpp" line="311"/>
         <source>Transpose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeymapEditor.cpp" line="311"/>
+        <location filename="../KeymapEditor.cpp" line="316"/>
         <source>Offset resulting MIDI note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeymapEditor.cpp" line="315"/>
+        <location filename="../KeymapEditor.cpp" line="320"/>
         <source>Pan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeymapEditor.cpp" line="320"/>
+        <location filename="../KeymapEditor.cpp" line="325"/>
         <source>Set initial pan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeymapEditor.cpp" line="324"/>
+        <location filename="../KeymapEditor.cpp" line="329"/>
         <source>Surround</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeymapEditor.cpp" line="328"/>
+        <location filename="../KeymapEditor.cpp" line="333"/>
         <source>Initially play through surround channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeymapEditor.cpp" line="332"/>
+        <location filename="../KeymapEditor.cpp" line="337"/>
         <source>Prio Offset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeymapEditor.cpp" line="337"/>
+        <location filename="../KeymapEditor.cpp" line="342"/>
         <source>Offset resulting priority</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1021,7 +1021,7 @@
 <context>
     <name>ModulationSlider</name>
     <message>
-        <location filename="../KeyboardWidget.cpp" line="187"/>
+        <location filename="../KeyboardWidget.cpp" line="214"/>
         <source>Modulation: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1184,17 +1184,17 @@
 <context>
     <name>PageObjectProxyModel</name>
     <message>
-        <location filename="../ProjectModel.cpp" line="359"/>
+        <location filename="../ProjectModel.cpp" line="368"/>
         <source>SoundMacros:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="361"/>
+        <location filename="../ProjectModel.cpp" line="370"/>
         <source>Keymaps:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="363"/>
+        <location filename="../ProjectModel.cpp" line="372"/>
         <source>Layers:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1215,7 +1215,7 @@
 <context>
     <name>PaintButton</name>
     <message>
-        <location filename="../KeymapEditor.cpp" line="60"/>
+        <location filename="../KeymapEditor.cpp" line="61"/>
         <source>Activate brush to apply values to keys</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1223,7 +1223,7 @@
 <context>
     <name>PitchSlider</name>
     <message>
-        <location filename="../KeyboardWidget.cpp" line="191"/>
+        <location filename="../KeyboardWidget.cpp" line="218"/>
         <source>Pitch: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1231,341 +1231,341 @@
 <context>
     <name>ProjectModel</name>
     <message>
-        <location filename="../ProjectModel.cpp" line="700"/>
-        <location filename="../ProjectModel.cpp" line="710"/>
-        <location filename="../ProjectModel.cpp" line="719"/>
-        <location filename="../ProjectModel.cpp" line="729"/>
-        <location filename="../ProjectModel.cpp" line="737"/>
-        <location filename="../ProjectModel.cpp" line="775"/>
+        <location filename="../ProjectModel.cpp" line="711"/>
+        <location filename="../ProjectModel.cpp" line="721"/>
+        <location filename="../ProjectModel.cpp" line="730"/>
+        <location filename="../ProjectModel.cpp" line="740"/>
+        <location filename="../ProjectModel.cpp" line="748"/>
+        <location filename="../ProjectModel.cpp" line="786"/>
         <source>Export Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="700"/>
-        <location filename="../ProjectModel.cpp" line="750"/>
-        <location filename="../ProjectModel.cpp" line="775"/>
+        <location filename="../ProjectModel.cpp" line="711"/>
+        <location filename="../ProjectModel.cpp" line="761"/>
+        <location filename="../ProjectModel.cpp" line="786"/>
         <source>Unable to find group %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="710"/>
+        <location filename="../ProjectModel.cpp" line="721"/>
         <source>Unable to export %1.proj</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="719"/>
+        <location filename="../ProjectModel.cpp" line="730"/>
         <source>Unable to export %1.pool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="729"/>
+        <location filename="../ProjectModel.cpp" line="740"/>
         <source>Unable to export %1.sdir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="737"/>
+        <location filename="../ProjectModel.cpp" line="748"/>
         <source>Unable to export %1.samp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="750"/>
+        <location filename="../ProjectModel.cpp" line="761"/>
         <source>Import Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="760"/>
+        <location filename="../ProjectModel.cpp" line="771"/>
         <source>Export Header Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="760"/>
+        <location filename="../ProjectModel.cpp" line="771"/>
         <source>Unable to open %1 for reading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="781"/>
+        <location filename="../ProjectModel.cpp" line="792"/>
         <source>File Exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="781"/>
+        <location filename="../ProjectModel.cpp" line="792"/>
         <source>%1 already exists. Overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="830"/>
+        <location filename="../ProjectModel.cpp" line="841"/>
         <source>Sound Macros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="832"/>
+        <location filename="../ProjectModel.cpp" line="843"/>
         <source>ADSRs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="833"/>
+        <location filename="../ProjectModel.cpp" line="844"/>
         <source>Curves</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="834"/>
+        <location filename="../ProjectModel.cpp" line="845"/>
         <source>Keymaps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="835"/>
+        <location filename="../ProjectModel.cpp" line="846"/>
         <source>Layers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="836"/>
+        <location filename="../ProjectModel.cpp" line="847"/>
         <source>Samples</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1088"/>
+        <location filename="../ProjectModel.cpp" line="1099"/>
         <source>Naming Conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1088"/>
+        <location filename="../ProjectModel.cpp" line="1099"/>
         <source>%1 already exists in this context</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1092"/>
+        <location filename="../ProjectModel.cpp" line="1103"/>
         <source>Rename %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1211"/>
+        <location filename="../ProjectModel.cpp" line="1222"/>
         <source>Subproject Conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1212"/>
+        <location filename="../ProjectModel.cpp" line="1223"/>
         <source>The subproject %1 is already defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1220"/>
-        <location filename="../ProjectModel.cpp" line="1783"/>
-        <location filename="../ProjectModel.cpp" line="1916"/>
+        <location filename="../ProjectModel.cpp" line="1231"/>
+        <location filename="../ProjectModel.cpp" line="1786"/>
+        <location filename="../ProjectModel.cpp" line="1919"/>
         <source>Add Subproject %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1302"/>
+        <location filename="../ProjectModel.cpp" line="1313"/>
         <source>Sound Group Conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1302"/>
-        <location filename="../ProjectModel.cpp" line="1324"/>
+        <location filename="../ProjectModel.cpp" line="1313"/>
+        <location filename="../ProjectModel.cpp" line="1335"/>
         <source>The group %1 is already defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1307"/>
-        <location filename="../ProjectModel.cpp" line="1632"/>
-        <location filename="../ProjectModel.cpp" line="1923"/>
+        <location filename="../ProjectModel.cpp" line="1318"/>
+        <location filename="../ProjectModel.cpp" line="1635"/>
+        <location filename="../ProjectModel.cpp" line="1926"/>
         <source>Add Sound Group %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1324"/>
+        <location filename="../ProjectModel.cpp" line="1335"/>
         <source>Song Group Conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1329"/>
-        <location filename="../ProjectModel.cpp" line="1624"/>
-        <location filename="../ProjectModel.cpp" line="1930"/>
+        <location filename="../ProjectModel.cpp" line="1340"/>
+        <location filename="../ProjectModel.cpp" line="1627"/>
+        <location filename="../ProjectModel.cpp" line="1933"/>
         <source>Add Song Group %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1433"/>
+        <location filename="../ProjectModel.cpp" line="1436"/>
         <source>Sound Macro Conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1433"/>
+        <location filename="../ProjectModel.cpp" line="1436"/>
         <source>The macro %1 is already defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1444"/>
-        <location filename="../ProjectModel.cpp" line="1939"/>
+        <location filename="../ProjectModel.cpp" line="1447"/>
+        <location filename="../ProjectModel.cpp" line="1942"/>
         <source>Add Sound Macro %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1461"/>
+        <location filename="../ProjectModel.cpp" line="1464"/>
         <source>ADSR Conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1461"/>
+        <location filename="../ProjectModel.cpp" line="1464"/>
         <source>The ADSR %1 is already defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1468"/>
-        <location filename="../ProjectModel.cpp" line="1657"/>
-        <location filename="../ProjectModel.cpp" line="1946"/>
+        <location filename="../ProjectModel.cpp" line="1471"/>
+        <location filename="../ProjectModel.cpp" line="1660"/>
+        <location filename="../ProjectModel.cpp" line="1949"/>
         <source>Add ADSR %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1485"/>
+        <location filename="../ProjectModel.cpp" line="1488"/>
         <source>Curve Conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1485"/>
+        <location filename="../ProjectModel.cpp" line="1488"/>
         <source>The Curve %1 is already defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1492"/>
-        <location filename="../ProjectModel.cpp" line="1665"/>
-        <location filename="../ProjectModel.cpp" line="1953"/>
+        <location filename="../ProjectModel.cpp" line="1495"/>
+        <location filename="../ProjectModel.cpp" line="1668"/>
+        <location filename="../ProjectModel.cpp" line="1956"/>
         <source>Add Curve %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1509"/>
+        <location filename="../ProjectModel.cpp" line="1512"/>
         <source>Keymap Conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1509"/>
+        <location filename="../ProjectModel.cpp" line="1512"/>
         <source>The Keymap %1 is already defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1515"/>
-        <location filename="../ProjectModel.cpp" line="1680"/>
-        <location filename="../ProjectModel.cpp" line="1960"/>
+        <location filename="../ProjectModel.cpp" line="1518"/>
+        <location filename="../ProjectModel.cpp" line="1683"/>
+        <location filename="../ProjectModel.cpp" line="1963"/>
         <source>Add Keymap %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1532"/>
+        <location filename="../ProjectModel.cpp" line="1535"/>
         <source>Layers Conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1532"/>
+        <location filename="../ProjectModel.cpp" line="1535"/>
         <source>Layers %1 is already defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1538"/>
-        <location filename="../ProjectModel.cpp" line="1696"/>
-        <location filename="../ProjectModel.cpp" line="1967"/>
+        <location filename="../ProjectModel.cpp" line="1541"/>
+        <location filename="../ProjectModel.cpp" line="1699"/>
+        <location filename="../ProjectModel.cpp" line="1970"/>
         <source>Add Layers %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1544"/>
-        <location filename="../ProjectModel.cpp" line="1553"/>
+        <location filename="../ProjectModel.cpp" line="1547"/>
+        <location filename="../ProjectModel.cpp" line="1556"/>
         <source>-copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1642"/>
+        <location filename="../ProjectModel.cpp" line="1645"/>
         <source>Add SoundMacro %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1838"/>
+        <location filename="../ProjectModel.cpp" line="1841"/>
         <source>Cut SongGroup %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1841"/>
+        <location filename="../ProjectModel.cpp" line="1844"/>
         <source>Cut SFXGroup %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1844"/>
+        <location filename="../ProjectModel.cpp" line="1847"/>
         <source>Cut SoundMacro %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1847"/>
+        <location filename="../ProjectModel.cpp" line="1850"/>
         <source>Cut ADSR %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1850"/>
+        <location filename="../ProjectModel.cpp" line="1853"/>
         <source>Cut Curve %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1853"/>
+        <location filename="../ProjectModel.cpp" line="1856"/>
         <source>Cut Keymap %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1856"/>
+        <location filename="../ProjectModel.cpp" line="1859"/>
         <source>Cut Layers %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1988"/>
+        <location filename="../ProjectModel.cpp" line="1991"/>
         <source>Delete Subproject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="1989"/>
+        <location filename="../ProjectModel.cpp" line="1992"/>
         <source>&lt;p&gt;The subproject %1 will be permanently deleted from the project. Sample files will be permanently removed from the file system.&lt;/p&gt;&lt;p&gt;&lt;strong&gt;This action cannot be undone!&lt;/strong&gt;&lt;/p&gt;&lt;p&gt;Continue?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="2003"/>
+        <location filename="../ProjectModel.cpp" line="2006"/>
         <source>Delete SongGroup %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="2006"/>
+        <location filename="../ProjectModel.cpp" line="2009"/>
         <source>Delete SFXGroup %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="2009"/>
+        <location filename="../ProjectModel.cpp" line="2012"/>
         <source>Delete SoundMacro %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="2012"/>
+        <location filename="../ProjectModel.cpp" line="2015"/>
         <source>Delete ADSR %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="2015"/>
+        <location filename="../ProjectModel.cpp" line="2018"/>
         <source>Delete Curve %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="2018"/>
+        <location filename="../ProjectModel.cpp" line="2021"/>
         <source>Delete Keymap %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="2021"/>
+        <location filename="../ProjectModel.cpp" line="2024"/>
         <source>Delete Layers %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="2025"/>
+        <location filename="../ProjectModel.cpp" line="2028"/>
         <source>Delete Sample</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ProjectModel.cpp" line="2026"/>
+        <location filename="../ProjectModel.cpp" line="2029"/>
         <source>&lt;p&gt;The sample %1 will be permanently deleted from the file system. &lt;p&gt;&lt;strong&gt;This action cannot be undone!&lt;/strong&gt;&lt;/p&gt;&lt;p&gt;Continue?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1893,72 +1893,72 @@
 <context>
     <name>SoundMacroCatalogue</name>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="824"/>
+        <location filename="../SoundMacroEditor.cpp" line="826"/>
         <source>Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="824"/>
+        <location filename="../SoundMacroEditor.cpp" line="826"/>
         <source>Pitch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="825"/>
+        <location filename="../SoundMacroEditor.cpp" line="827"/>
         <source>Sample</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="825"/>
+        <location filename="../SoundMacroEditor.cpp" line="827"/>
         <source>Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="826"/>
+        <location filename="../SoundMacroEditor.cpp" line="828"/>
         <source>Special</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="826"/>
+        <location filename="../SoundMacroEditor.cpp" line="828"/>
         <source>Structure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="827"/>
+        <location filename="../SoundMacroEditor.cpp" line="829"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="830"/>
+        <location filename="../SoundMacroEditor.cpp" line="832"/>
         <source>Commands to control the voice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="831"/>
+        <location filename="../SoundMacroEditor.cpp" line="833"/>
         <source>Commands to control the voice&apos;s pitch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="832"/>
+        <location filename="../SoundMacroEditor.cpp" line="834"/>
         <source>Commands to control the voice&apos;s sample playback</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="833"/>
+        <location filename="../SoundMacroEditor.cpp" line="835"/>
         <source>Commands to setup the voice&apos;s mixing process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="834"/>
+        <location filename="../SoundMacroEditor.cpp" line="836"/>
         <source>Miscellaneous commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="835"/>
+        <location filename="../SoundMacroEditor.cpp" line="837"/>
         <source>Commands to control macro branching</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="836"/>
+        <location filename="../SoundMacroEditor.cpp" line="838"/>
         <source>Commands to control the voice&apos;s volume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1974,17 +1974,17 @@
 <context>
     <name>SoundMacroListing</name>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="567"/>
+        <location filename="../SoundMacroEditor.cpp" line="569"/>
         <source>Reorder %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="679"/>
+        <location filename="../SoundMacroEditor.cpp" line="681"/>
         <source>Insert %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="724"/>
+        <location filename="../SoundMacroEditor.cpp" line="726"/>
         <source>Delete %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1997,17 +1997,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../StatusBarWidget.cpp" line="23"/>
+        <location filename="../StatusBarWidget.cpp" line="22"/>
         <source>Aux A send level for all voices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../StatusBarWidget.cpp" line="30"/>
+        <location filename="../StatusBarWidget.cpp" line="29"/>
         <source>Aux B send level for all voices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../StatusBarWidget.cpp" line="37"/>
+        <location filename="../StatusBarWidget.cpp" line="36"/>
         <source>Master volume level</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2015,17 +2015,17 @@
 <context>
     <name>StudioSetupWidget</name>
     <message>
-        <location filename="../StudioSetupWidget.cpp" line="856"/>
+        <location filename="../StudioSetupWidget.cpp" line="927"/>
         <source>Studio Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../StudioSetupWidget.cpp" line="873"/>
+        <location filename="../StudioSetupWidget.cpp" line="944"/>
         <source>Aux A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../StudioSetupWidget.cpp" line="874"/>
+        <location filename="../StudioSetupWidget.cpp" line="945"/>
         <source>Aux B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2094,7 +2094,7 @@
 <context>
     <name>Uint32X8Button</name>
     <message>
-        <location filename="../StudioSetupWidget.cpp" line="202"/>
+        <location filename="../StudioSetupWidget.cpp" line="265"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2102,42 +2102,42 @@
 <context>
     <name>Uint32X8Popup</name>
     <message>
-        <location filename="../StudioSetupWidget.cpp" line="142"/>
+        <location filename="../StudioSetupWidget.cpp" line="189"/>
         <source>Front Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../StudioSetupWidget.cpp" line="142"/>
+        <location filename="../StudioSetupWidget.cpp" line="189"/>
         <source>Front Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../StudioSetupWidget.cpp" line="143"/>
+        <location filename="../StudioSetupWidget.cpp" line="190"/>
         <source>Rear Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../StudioSetupWidget.cpp" line="143"/>
+        <location filename="../StudioSetupWidget.cpp" line="190"/>
         <source>Rear Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../StudioSetupWidget.cpp" line="144"/>
+        <location filename="../StudioSetupWidget.cpp" line="191"/>
         <source>Front Center</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../StudioSetupWidget.cpp" line="144"/>
+        <location filename="../StudioSetupWidget.cpp" line="191"/>
         <source>LFE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../StudioSetupWidget.cpp" line="145"/>
+        <location filename="../StudioSetupWidget.cpp" line="192"/>
         <source>Side Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../StudioSetupWidget.cpp" line="145"/>
+        <location filename="../StudioSetupWidget.cpp" line="192"/>
         <source>Side Right</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2145,7 +2145,7 @@
 <context>
     <name>VelocitySlider</name>
     <message>
-        <location filename="../KeyboardWidget.cpp" line="183"/>
+        <location filename="../KeyboardWidget.cpp" line="210"/>
         <source>Velocity: %1</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/lib/SoundMacroState.cpp b/lib/SoundMacroState.cpp
index bf31ac3..59e5f65 100644
--- a/lib/SoundMacroState.cpp
+++ b/lib/SoundMacroState.cpp
@@ -205,9 +205,9 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdSplitKey::Introspective = {
     CmdType::Structure,
     "Split Key"sv,
     "Conditionally branches macro execution based on MIDI key."sv,
-    {{FIELD_HEAD(SoundMacro::CmdSplitKey, key), "Key"sv, 0, 127, 60},
+    {{{FIELD_HEAD(SoundMacro::CmdSplitKey, key), "Key"sv, 0, 127, 60},
      {FIELD_HEAD(SoundMacro::CmdSplitKey, macro), "Macro"sv, 0, 65535, 65535},
-     {FIELD_HEAD(SoundMacro::CmdSplitKey, macroStep), "Macro Step"sv, 0, 65535, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdSplitKey, macroStep), "Macro Step"sv, 0, 65535, 0}}}};
 bool SoundMacro::CmdSplitKey::Do(SoundMacroState& st, Voice& vox) const {
   if (st.m_initKey >= key) {
     /* Do Branch */
@@ -224,9 +224,9 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdSplitVel::Introspective = {
     CmdType::Structure,
     "Split Velocity"sv,
     "Conditionally branches macro execution based on velocity."sv,
-    {{FIELD_HEAD(SoundMacro::CmdSplitVel, velocity), "Key"sv, 0, 127, 100},
+    {{{FIELD_HEAD(SoundMacro::CmdSplitVel, velocity), "Key"sv, 0, 127, 100},
      {FIELD_HEAD(SoundMacro::CmdSplitVel, macro), "Macro"sv, 0, 65535, 65535},
-     {FIELD_HEAD(SoundMacro::CmdSplitVel, macroStep), "Macro Step"sv, 0, 65535, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdSplitVel, macroStep), "Macro Step"sv, 0, 65535, 0}}}};
 bool SoundMacro::CmdSplitVel::Do(SoundMacroState& st, Voice& vox) const {
   if (st.m_curVel >= velocity) {
     /* Do Branch */
@@ -245,12 +245,12 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdWaitTicks::Introspective = {
     "Suspend SoundMacro execution for specified length of time. Value of 65535 "
     "will wait indefinitely, relying on Key Off or Sample End to signal stop. "
     "Absolute mode waits relative to the start of the SoundMacro."sv,
-    {{FIELD_HEAD(SoundMacro::CmdWaitTicks, keyOff), "Key Off"sv, 0, 1, 0},
+    {{{FIELD_HEAD(SoundMacro::CmdWaitTicks, keyOff), "Key Off"sv, 0, 1, 0},
      {FIELD_HEAD(SoundMacro::CmdWaitTicks, random), "Random"sv, 0, 1, 0},
      {FIELD_HEAD(SoundMacro::CmdWaitTicks, sampleEnd), "Sample End"sv, 0, 1, 0},
      {FIELD_HEAD(SoundMacro::CmdWaitTicks, absolute), "Absolute"sv, 0, 1, 0},
      {FIELD_HEAD(SoundMacro::CmdWaitTicks, msSwitch), "Use Millisec"sv, 0, 1, 0},
-     {FIELD_HEAD(SoundMacro::CmdWaitTicks, ticksOrMs), "Ticks/Millisec"sv, 0, 65535, 96}}};
+     {FIELD_HEAD(SoundMacro::CmdWaitTicks, ticksOrMs), "Ticks/Millisec"sv, 0, 65535, 96}}}};
 bool SoundMacro::CmdWaitTicks::Do(SoundMacroState& st, Voice& vox) const {
   /* Set wait state */
   if (ticksOrMs != 65535) {
@@ -283,11 +283,11 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdLoop::Introspective = {
     "Loop"sv,
     "Branch to specified location in a loop for a specified number of Times. "
     "65535 will cause an endless loop, relying on Key Off or Sample End to signal stop."sv,
-    {{FIELD_HEAD(SoundMacro::CmdLoop, keyOff), "Key Off"sv, 0, 1, 0},
+    {{{FIELD_HEAD(SoundMacro::CmdLoop, keyOff), "Key Off"sv, 0, 1, 0},
      {FIELD_HEAD(SoundMacro::CmdLoop, random), "Random"sv, 0, 1, 0},
      {FIELD_HEAD(SoundMacro::CmdLoop, sampleEnd), "Sample End"sv, 0, 1, 0},
      {FIELD_HEAD(SoundMacro::CmdLoop, macroStep), "Macro Step"sv, 0, 65535, 0},
-     {FIELD_HEAD(SoundMacro::CmdLoop, times), "Times"sv, 0, 65535, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdLoop, times), "Times"sv, 0, 65535, 0}}}};
 bool SoundMacro::CmdLoop::Do(SoundMacroState& st, Voice& vox) const {
   if ((keyOff && st.m_keyoff) || (sampleEnd && st.m_sampleEnd)) {
     /* Break out of loop */
@@ -316,8 +316,8 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdGoto::Introspective = {
     CmdType::Structure,
     "Goto"sv,
     "Unconditional branch to specified SoundMacro location."sv,
-    {{FIELD_HEAD(SoundMacro::CmdGoto, macro), "Macro"sv, 0, 65535, 65535},
-     {FIELD_HEAD(SoundMacro::CmdGoto, macroStep), "Macro Step"sv, 0, 65535, 0}}};
+    {{{FIELD_HEAD(SoundMacro::CmdGoto, macro), "Macro"sv, 0, 65535, 65535},
+     {FIELD_HEAD(SoundMacro::CmdGoto, macroStep), "Macro Step"sv, 0, 65535, 0}}}};
 bool SoundMacro::CmdGoto::Do(SoundMacroState& st, Voice& vox) const {
   /* Do Branch */
   if (macro.id == std::get<0>(st.m_pc.back()))
@@ -334,11 +334,11 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdWaitMs::Introspective = {
     "Suspend SoundMacro execution for specified length of time. Value of 65535 "
     "will wait indefinitely, relying on Key Off or Sample End to signal stop. "
     "Absolute mode waits relative to the start of the SoundMacro."sv,
-    {{FIELD_HEAD(SoundMacro::CmdWaitMs, keyOff), "Key Off"sv, 0, 1, 0},
+    {{{FIELD_HEAD(SoundMacro::CmdWaitMs, keyOff), "Key Off"sv, 0, 1, 0},
      {FIELD_HEAD(SoundMacro::CmdWaitMs, random), "Random"sv, 0, 1, 0},
      {FIELD_HEAD(SoundMacro::CmdWaitMs, sampleEnd), "Sample End"sv, 0, 1, 0},
      {FIELD_HEAD(SoundMacro::CmdWaitMs, absolute), "Absolute"sv, 0, 1, 0},
-     {FIELD_HEAD(SoundMacro::CmdWaitMs, ms), "Millisec"sv, 0, 65535, 96}}};
+     {FIELD_HEAD(SoundMacro::CmdWaitMs, ms), "Millisec"sv, 0, 65535, 96}}}};
 bool SoundMacro::CmdWaitMs::Do(SoundMacroState& st, Voice& vox) const {
   /* Set wait state */
   if (ms != 65535) {
@@ -370,11 +370,11 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdPlayMacro::Introspective = {
     "Play Macro"sv,
     "Play a SoundMacro in parallel to this one. Add Note is added to the "
     "current SoundMacro note to evaluate the new note."sv,
-    {{FIELD_HEAD(SoundMacro::CmdPlayMacro, addNote), "Add Note"sv, -128, 127, 0},
+    {{{FIELD_HEAD(SoundMacro::CmdPlayMacro, addNote), "Add Note"sv, -128, 127, 0},
      {FIELD_HEAD(SoundMacro::CmdPlayMacro, macro), "Macro"sv, 0, 65535, 65535},
      {FIELD_HEAD(SoundMacro::CmdPlayMacro, macroStep), "Macro Step"sv, 0, 65535, 0},
      {FIELD_HEAD(SoundMacro::CmdPlayMacro, priority), "Priority"sv, 0, 127, 50},
-     {FIELD_HEAD(SoundMacro::CmdPlayMacro, maxVoices), "Max Voices"sv, 0, 255, 255}}};
+     {FIELD_HEAD(SoundMacro::CmdPlayMacro, maxVoices), "Max Voices"sv, 0, 255, 255}}}};
 bool SoundMacro::CmdPlayMacro::Do(SoundMacroState& st, Voice& vox) const {
   ObjToken<Voice> sibVox = vox.startChildMacro(addNote, macro.id, macroStep.step);
   if (sibVox)
@@ -387,8 +387,8 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdSendKeyOff::Introspective = {
     CmdType::Structure,
     "Send Key Off"sv,
     "Send Key Off to voice specified by VID stored in a variable or the last started voice."sv,
-    {{FIELD_HEAD(SoundMacro::CmdSendKeyOff, variable), "Variable"sv, 0, 31, 0},
-     {FIELD_HEAD(SoundMacro::CmdSendKeyOff, lastStarted), "Last Started"sv, 0, 1, 0}}};
+    {{{FIELD_HEAD(SoundMacro::CmdSendKeyOff, variable), "Variable"sv, 0, 31, 0},
+     {FIELD_HEAD(SoundMacro::CmdSendKeyOff, lastStarted), "Last Started"sv, 0, 1, 0}}}};
 bool SoundMacro::CmdSendKeyOff::Do(SoundMacroState& st, Voice& vox) const {
   if (lastStarted) {
     if (st.m_lastPlayMacroVid != -1) {
@@ -409,9 +409,9 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdSplitMod::Introspective = {
     CmdType::Structure,
     "Split Mod"sv,
     "Conditionally branch if mod wheel is greater than or equal to specified value."sv,
-    {{FIELD_HEAD(SoundMacro::CmdSplitMod, modValue), "Mod Value"sv, 0, 127, 64},
+    {{{FIELD_HEAD(SoundMacro::CmdSplitMod, modValue), "Mod Value"sv, 0, 127, 64},
      {FIELD_HEAD(SoundMacro::CmdSplitMod, macro), "Macro"sv, 0, 65535, 65535},
-     {FIELD_HEAD(SoundMacro::CmdSplitMod, macroStep), "Macro Step"sv, 0, 65535, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdSplitMod, macroStep), "Macro Step"sv, 0, 65535, 0}}}};
 bool SoundMacro::CmdSplitMod::Do(SoundMacroState& st, Voice& vox) const {
   if (st.m_curMod >= modValue) {
     /* Do Branch */
@@ -429,9 +429,9 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdPianoPan::Introspective = {
     "Piano Pan"sv,
     "Gives piano-like sounds a natural-sounding stereo spread. The current key delta "
     "from Center Key is scaled with Scale and biased with Center Pan to evaluate panning."sv,
-    {{FIELD_HEAD(SoundMacro::CmdPianoPan, scale), "Scale"sv, 0, 127, 127},
+    {{{FIELD_HEAD(SoundMacro::CmdPianoPan, scale), "Scale"sv, 0, 127, 127},
      {FIELD_HEAD(SoundMacro::CmdPianoPan, centerKey), "Center Key"sv, 0, 127, 36},
-     {FIELD_HEAD(SoundMacro::CmdPianoPan, centerPan), "Center Pan"sv, 0, 127, 64}}};
+     {FIELD_HEAD(SoundMacro::CmdPianoPan, centerPan), "Center Pan"sv, 0, 127, 64}}}};
 bool SoundMacro::CmdPianoPan::Do(SoundMacroState& st, Voice& vox) const {
   int32_t pan = int32_t(st.m_initKey - centerKey) * scale / 127 + centerPan;
   pan = std::max(-127, std::min(127, pan));
@@ -444,8 +444,8 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdSetAdsr::Introspective = {
     CmdType::Volume,
     "Set ADSR"sv,
     "Specify ADSR envelope using a pool object. DLS mode must match setting in ADSR."sv,
-    {{FIELD_HEAD(SoundMacro::CmdSetAdsr, table), "ADSR"sv, 0, 65535, 65535},
-     {FIELD_HEAD(SoundMacro::CmdSetAdsr, dlsMode), "DLS Mode"sv, 0, 1, 0}}};
+    {{{FIELD_HEAD(SoundMacro::CmdSetAdsr, table), "ADSR"sv, 0, 65535, 65535},
+     {FIELD_HEAD(SoundMacro::CmdSetAdsr, dlsMode), "DLS Mode"sv, 0, 1, 0}}}};
 bool SoundMacro::CmdSetAdsr::Do(SoundMacroState& st, Voice& vox) const {
   vox.setAdsr(table.id, dlsMode);
   return false;
@@ -456,10 +456,10 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdScaleVolume::Introspective = {
     "Scale Volume"sv,
     "Calculates volume by scaling and biasing velocity. "
     "The result may be passed through an optional Curve."sv,
-    {{FIELD_HEAD(SoundMacro::CmdScaleVolume, scale), "Scale"sv, 0, 127, 127},
+    {{{FIELD_HEAD(SoundMacro::CmdScaleVolume, scale), "Scale"sv, 0, 127, 127},
      {FIELD_HEAD(SoundMacro::CmdScaleVolume, add), "Add"sv, 0, 127, 0},
      {FIELD_HEAD(SoundMacro::CmdScaleVolume, table), "Curve"sv, 0, 65535, 65535},
-     {FIELD_HEAD(SoundMacro::CmdScaleVolume, originalVol), "Original Vol"sv, 0, 1, 1}}};
+     {FIELD_HEAD(SoundMacro::CmdScaleVolume, originalVol), "Original Vol"sv, 0, 1, 1}}}};
 bool SoundMacro::CmdScaleVolume::Do(SoundMacroState& st, Voice& vox) const {
   int32_t eval = int32_t(originalVol ? st.m_initVel : st.m_curVel) * scale / 127 + add;
   eval = std::clamp(eval, 0, 127);
@@ -481,9 +481,9 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdPanning::Introspective = {
     CmdType::Control,
     "Panning"sv,
     "Start pan-sweep from Pan Position offset by Width over specified time period."sv,
-    {{FIELD_HEAD(SoundMacro::CmdPanning, panPosition), "Pan Position"sv, 0, 127, 64},
+    {{{FIELD_HEAD(SoundMacro::CmdPanning, panPosition), "Pan Position"sv, 0, 127, 64},
      {FIELD_HEAD(SoundMacro::CmdPanning, timeMs), "Time Millisec"sv, 0, 65535, 0},
-     {FIELD_HEAD(SoundMacro::CmdPanning, width), "Width"sv, -128, 127, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdPanning, width), "Width"sv, -128, 127, 0}}}};
 bool SoundMacro::CmdPanning::Do(SoundMacroState& st, Voice& vox) const {
   vox.startPanning(timeMs / 1000.0, panPosition, width);
   return false;
@@ -494,11 +494,11 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdEnvelope::Introspective = {
     "Envelope"sv,
     "Start a velocity envelope by fading the current velocity to the one "
     "evaluated by Scale and Add. The result is optionally transformed with a Curve object."sv,
-    {{FIELD_HEAD(SoundMacro::CmdEnvelope, scale), "Scale"sv, 0, 127, 0},
+    {{{FIELD_HEAD(SoundMacro::CmdEnvelope, scale), "Scale"sv, 0, 127, 0},
      {FIELD_HEAD(SoundMacro::CmdEnvelope, add), "Add"sv, 0, 127, 0},
      {FIELD_HEAD(SoundMacro::CmdEnvelope, table), "Curve"sv, 0, 65535, 65535},
      {FIELD_HEAD(SoundMacro::CmdEnvelope, msSwitch), "Use Millisec"sv, 0, 1, 1},
-     {FIELD_HEAD(SoundMacro::CmdEnvelope, ticksOrMs), "Ticks/Millisec"sv, 0, 65535, 500}}};
+     {FIELD_HEAD(SoundMacro::CmdEnvelope, ticksOrMs), "Ticks/Millisec"sv, 0, 65535, 500}}}};
 bool SoundMacro::CmdEnvelope::Do(SoundMacroState& st, Voice& vox) const {
   double q = msSwitch ? 1000.0 : st.m_ticksPerSec;
   double secTime = ticksOrMs / q;
@@ -522,14 +522,14 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdStartSample::Introspective = {
     "Start Sample"sv,
     "Start a Sample playing on the voice. An Offset in samples may be applied. "
     "This offset may be scaled with the current velocity."sv,
-    {{FIELD_HEAD(SoundMacro::CmdStartSample, sample), "Sample"sv, 0, 65535, 0},
+    {{{FIELD_HEAD(SoundMacro::CmdStartSample, sample), "Sample"sv, 0, 65535, 0},
      {FIELD_HEAD(SoundMacro::CmdStartSample, mode),
       "Velocity Scale"sv,
       0,
       2,
       0,
       {"No Scale"sv, "Negative"sv, "Positive"sv}},
-     {FIELD_HEAD(SoundMacro::CmdStartSample, offset), "Offset"sv, 0, 0xffffff, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdStartSample, offset), "Offset"sv, 0, 0xffffff, 0}}}};
 bool SoundMacro::CmdStartSample::Do(SoundMacroState& st, Voice& vox) const {
   uint32_t useOffset = offset;
 
@@ -569,11 +569,9 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdSplitRnd::Introspective = {
     "Split Rnd"sv,
     "Conditionally branch if a random value is greater than or equal to RND. "
     "A lower RND will cause a higher probability of branching."sv,
-    {
-        {FIELD_HEAD(SoundMacro::CmdSplitRnd, rnd), "RND"sv, 0, 255, 128},
-        {FIELD_HEAD(SoundMacro::CmdSplitRnd, macro), "Macro"sv, 0, 65535, 65535},
-        {FIELD_HEAD(SoundMacro::CmdSplitRnd, macroStep), "Macro Step"sv, 0, 65535, 0},
-    }};
+    {{{FIELD_HEAD(SoundMacro::CmdSplitRnd, rnd), "RND"sv, 0, 255, 128},
+     {FIELD_HEAD(SoundMacro::CmdSplitRnd, macro), "Macro"sv, 0, 65535, 65535},
+     {FIELD_HEAD(SoundMacro::CmdSplitRnd, macroStep), "Macro Step"sv, 0, 65535, 0}}}};
 bool SoundMacro::CmdSplitRnd::Do(SoundMacroState& st, Voice& vox) const {
   if (rnd <= vox.getEngine().nextRandom() % 256) {
     /* Do branch */
@@ -591,11 +589,11 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdFadeIn::Introspective = {
     "Fade In"sv,
     "Start a velocity envelope by fading from silence to the velocity "
     "evaluated by Scale and Add. The result is optionally transformed with a Curve object."sv,
-    {{FIELD_HEAD(SoundMacro::CmdFadeIn, scale), "Scale"sv, 0, 127, 0},
+    {{{FIELD_HEAD(SoundMacro::CmdFadeIn, scale), "Scale"sv, 0, 127, 0},
      {FIELD_HEAD(SoundMacro::CmdFadeIn, add), "Add"sv, 0, 127, 0},
      {FIELD_HEAD(SoundMacro::CmdFadeIn, table), "Curve"sv, 0, 65535, 65535},
      {FIELD_HEAD(SoundMacro::CmdFadeIn, msSwitch), "Use Millisec"sv, 0, 1, 1},
-     {FIELD_HEAD(SoundMacro::CmdFadeIn, ticksOrMs), "Ticks/Millisec"sv, 0, 65535, 500}}};
+     {FIELD_HEAD(SoundMacro::CmdFadeIn, ticksOrMs), "Ticks/Millisec"sv, 0, 65535, 500}}}};
 bool SoundMacro::CmdFadeIn::Do(SoundMacroState& st, Voice& vox) const {
   float q = msSwitch ? 1000.f : st.m_ticksPerSec;
   float secTime = ticksOrMs / q;
@@ -618,9 +616,9 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdSpanning::Introspective = {
     CmdType::Control,
     "Spanning"sv,
     "Start span-sweep from Span Position offset by Width over specified time period."sv,
-    {{FIELD_HEAD(SoundMacro::CmdSpanning, spanPosition), "Span Position"sv, 0, 127, 64},
+    {{{FIELD_HEAD(SoundMacro::CmdSpanning, spanPosition), "Span Position"sv, 0, 127, 64},
      {FIELD_HEAD(SoundMacro::CmdSpanning, timeMs), "Time Millisec"sv, 0, 65535, 0},
-     {FIELD_HEAD(SoundMacro::CmdSpanning, width), "Width"sv, -128, 127, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdSpanning, width), "Width"sv, -128, 127, 0}}}};
 bool SoundMacro::CmdSpanning::Do(SoundMacroState& st, Voice& vox) const {
   vox.startSpanning(timeMs / 1000.0, spanPosition, width);
   return false;
@@ -630,12 +628,10 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdSetAdsrCtrl::Introspective = {
     CmdType::Volume,
     "Set ADSR Ctrl"sv,
     "Bind MIDI controls to ADSR parameters."sv,
-    {
-        {FIELD_HEAD(SoundMacro::CmdSetAdsrCtrl, attack), "Attack Ctrl"sv, 0, 127, 0},
-        {FIELD_HEAD(SoundMacro::CmdSetAdsrCtrl, decay), "Decay Ctrl"sv, 0, 127, 0},
-        {FIELD_HEAD(SoundMacro::CmdSetAdsrCtrl, sustain), "Sustain Ctrl"sv, 0, 127, 0},
-        {FIELD_HEAD(SoundMacro::CmdSetAdsrCtrl, release), "Release Ctrl"sv, 0, 127, 0},
-    }};
+    {{{FIELD_HEAD(SoundMacro::CmdSetAdsrCtrl, attack), "Attack Ctrl"sv, 0, 127, 0},
+     {FIELD_HEAD(SoundMacro::CmdSetAdsrCtrl, decay), "Decay Ctrl"sv, 0, 127, 0},
+     {FIELD_HEAD(SoundMacro::CmdSetAdsrCtrl, sustain), "Sustain Ctrl"sv, 0, 127, 0},
+     {FIELD_HEAD(SoundMacro::CmdSetAdsrCtrl, release), "Release Ctrl"sv, 0, 127, 0}}}};
 bool SoundMacro::CmdSetAdsrCtrl::Do(SoundMacroState& st, Voice& vox) const {
   st.m_useAdsrControllers = true;
   st.m_midiAttack = attack;
@@ -658,11 +654,11 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdRndNote::Introspective = {
     "Random Note"sv,
     "Sets random pitch between Note Lo and Note Hi, biased by Detune in cents. "
     "If Free is set, the note will not snap to key steps."sv,
-    {{FIELD_HEAD(SoundMacro::CmdRndNote, noteLo), "Note Lo"sv, -127, 127, 48},
+    {{{FIELD_HEAD(SoundMacro::CmdRndNote, noteLo), "Note Lo"sv, -127, 127, 48},
      {FIELD_HEAD(SoundMacro::CmdRndNote, detune), "Detune"sv, 0, 99, 0},
      {FIELD_HEAD(SoundMacro::CmdRndNote, noteHi), "Note Hi"sv, -127, 127, 72},
      {FIELD_HEAD(SoundMacro::CmdRndNote, fixedFree), "Free"sv, 0, 1, 0},
-     {FIELD_HEAD(SoundMacro::CmdRndNote, absRel), "Absolute"sv, 0, 1, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdRndNote, absRel), "Absolute"sv, 0, 1, 0}}}};
 bool SoundMacro::CmdRndNote::Do(SoundMacroState& st, Voice& vox) const {
   int32_t useNoteLo = noteLo;
   int32_t useNoteHi = noteHi;
@@ -693,11 +689,11 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdAddNote::Introspective = {
     "Add Note"sv,
     "Sets new pitch by adding Add, biased by Detune in cents. "
     "The time parameters behave like a WAIT command when non-zero."sv,
-    {{FIELD_HEAD(SoundMacro::CmdAddNote, add), "Add"sv, -128, 127, 0},
+    {{{FIELD_HEAD(SoundMacro::CmdAddNote, add), "Add"sv, -128, 127, 0},
      {FIELD_HEAD(SoundMacro::CmdAddNote, detune), "Detune"sv, -99, 99, 0},
      {FIELD_HEAD(SoundMacro::CmdAddNote, originalKey), "Original Key"sv, 0, 1, 1},
      {FIELD_HEAD(SoundMacro::CmdAddNote, msSwitch), "Use Millisec"sv, 0, 1, 1},
-     {FIELD_HEAD(SoundMacro::CmdAddNote, ticksOrMs), "Ticks/Millisec"sv, 0, 65535, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdAddNote, ticksOrMs), "Ticks/Millisec"sv, 0, 65535, 0}}}};
 bool SoundMacro::CmdAddNote::Do(SoundMacroState& st, Voice& vox) const {
   st.m_curPitch += add * 100 + detune;
 
@@ -719,10 +715,10 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdSetNote::Introspective = {
     "Set Note"sv,
     "Sets new pitch to Key, biased by Detune in cents. "
     "The time parameters behave like a WAIT command when non-zero."sv,
-    {{FIELD_HEAD(SoundMacro::CmdSetNote, key), "Key"sv, 0, 127, 60},
+    {{{FIELD_HEAD(SoundMacro::CmdSetNote, key), "Key"sv, 0, 127, 60},
      {FIELD_HEAD(SoundMacro::CmdSetNote, detune), "Detune"sv, -99, 99, 0},
      {FIELD_HEAD(SoundMacro::CmdSetNote, msSwitch), "Use Millisec"sv, 0, 1, 1},
-     {FIELD_HEAD(SoundMacro::CmdSetNote, ticksOrMs), "Ticks/Millisec"sv, 0, 65535, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdSetNote, ticksOrMs), "Ticks/Millisec"sv, 0, 65535, 0}}}};
 bool SoundMacro::CmdSetNote::Do(SoundMacroState& st, Voice& vox) const {
   st.m_curPitch = key * 100 + detune;
 
@@ -744,10 +740,10 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdLastNote::Introspective = {
     "Last Note"sv,
     "Sets new pitch by adding Add to last played MIDI note, biased by Detune in cents. "
     "The time parameters behave like a WAIT command when non-zero."sv,
-    {{FIELD_HEAD(SoundMacro::CmdLastNote, add), "Key"sv, -128, 127, 0},
+    {{{FIELD_HEAD(SoundMacro::CmdLastNote, add), "Key"sv, -128, 127, 0},
      {FIELD_HEAD(SoundMacro::CmdLastNote, detune), "Detune"sv, -99, 99, 0},
      {FIELD_HEAD(SoundMacro::CmdLastNote, msSwitch), "Use Millisec"sv, 0, 1, 1},
-     {FIELD_HEAD(SoundMacro::CmdLastNote, ticksOrMs), "Ticks/Millisec"sv, 0, 65535, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdLastNote, ticksOrMs), "Ticks/Millisec"sv, 0, 65535, 0}}}};
 bool SoundMacro::CmdLastNote::Do(SoundMacroState& st, Voice& vox) const {
   st.m_curPitch = (add + vox.getLastNote()) * 100 + detune;
 
@@ -768,7 +764,7 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdPortamento::Introspective = {
     CmdType::Setup,
     "Portamento"sv,
     "Setup portamento mode for this voice."sv,
-    {{FIELD_HEAD(SoundMacro::CmdPortamento, portState),
+    {{{FIELD_HEAD(SoundMacro::CmdPortamento, portState),
       "Port. State"sv,
       0,
       2,
@@ -776,7 +772,7 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdPortamento::Introspective = {
       {"Enable"sv, "Disable"sv, "MIDI Controlled"sv}},
      {FIELD_HEAD(SoundMacro::CmdPortamento, portType), "Port. Type"sv, 0, 1, 0, {"Last Pressed"sv, "Always"sv}},
      {FIELD_HEAD(SoundMacro::CmdPortamento, msSwitch), "Use Millisec"sv, 0, 1, 1},
-     {FIELD_HEAD(SoundMacro::CmdPortamento, ticksOrMs), "Ticks/Millisec"sv, 0, 65535, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdPortamento, ticksOrMs), "Ticks/Millisec"sv, 0, 65535, 0}}}};
 bool SoundMacro::CmdPortamento::Do(SoundMacroState& st, Voice& vox) const {
   st.m_portamentoMode = portState;
   st.m_portamentoType = portType;
@@ -790,23 +786,11 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdVibrato::Introspective = {
     "Vibrato"sv,
     "Setup vibrato mode for this voice. Voice pitch will be "
     "modulated using the Level magnitude or the modwheel."sv,
-    {{
-         FIELD_HEAD(SoundMacro::CmdVibrato, levelNote),
-         "Level Note"sv,
-         -127,
-         127,
-         0,
-     },
-     {
-         FIELD_HEAD(SoundMacro::CmdVibrato, levelFine),
-         "Level Fine"sv,
-         -99,
-         99,
-         15,
-     },
+    {{{FIELD_HEAD(SoundMacro::CmdVibrato, levelNote), "Level Note"sv, -127, 127, 0},
+     {FIELD_HEAD(SoundMacro::CmdVibrato, levelFine), "Level Fine"sv, -99, 99, 15},
      {FIELD_HEAD(SoundMacro::CmdVibrato, modwheelFlag), "Use Modwheel"sv, 0, 1, 1},
      {FIELD_HEAD(SoundMacro::CmdVibrato, msSwitch), "Use Millisec"sv, 0, 1, 1},
-     {FIELD_HEAD(SoundMacro::CmdVibrato, ticksOrMs), "Ticks/Millisec"sv, 0, 65535, 250}}};
+     {FIELD_HEAD(SoundMacro::CmdVibrato, ticksOrMs), "Ticks/Millisec"sv, 0, 65535, 250}}}};
 bool SoundMacro::CmdVibrato::Do(SoundMacroState& st, Voice& vox) const {
   float q = msSwitch ? 1000.f : st.m_ticksPerSec;
   vox.setVibrato(levelNote * 100 + levelFine, modwheelFlag, ticksOrMs / q);
@@ -818,22 +802,10 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdPitchSweep1::Introspective = {
     "Pitch Sweep 1"sv,
     "Setup pitch sweep 1 for this voice. Voice pitch will accumulate Add for Times frames. "
     "If the time values are non-zero, this command also functions as a WAIT."sv,
-    {{
-         FIELD_HEAD(SoundMacro::CmdPitchSweep1, times),
-         "Times"sv,
-         0,
-         127,
-         100,
-     },
-     {
-         FIELD_HEAD(SoundMacro::CmdPitchSweep1, add),
-         "Add"sv,
-         -32768,
-         32767,
-         100,
-     },
+    {{{FIELD_HEAD(SoundMacro::CmdPitchSweep1, times), "Times"sv, 0, 127, 100},
+     {FIELD_HEAD(SoundMacro::CmdPitchSweep1, add), "Add"sv, -32768, 32767, 100},
      {FIELD_HEAD(SoundMacro::CmdPitchSweep1, msSwitch), "Use Millisec"sv, 0, 1, 1},
-     {FIELD_HEAD(SoundMacro::CmdPitchSweep1, ticksOrMs), "Ticks/Millisec"sv, 0, 65535, 1000}}};
+     {FIELD_HEAD(SoundMacro::CmdPitchSweep1, ticksOrMs), "Ticks/Millisec"sv, 0, 65535, 1000}}}};
 bool SoundMacro::CmdPitchSweep1::Do(SoundMacroState& st, Voice& vox) const {
   /* Set wait state */
   if (msSwitch) {
@@ -853,22 +825,10 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdPitchSweep2::Introspective = {
     "Pitch Sweep 2"sv,
     "Setup pitch sweep 2 for this voice. Voice pitch will accumulate Add for Times frames. "
     "If the time values are non-zero, this command also functions as a WAIT."sv,
-    {{
-         FIELD_HEAD(SoundMacro::CmdPitchSweep2, times),
-         "Times"sv,
-         0,
-         127,
-         100,
-     },
-     {
-         FIELD_HEAD(SoundMacro::CmdPitchSweep2, add),
-         "Add"sv,
-         -32768,
-         32767,
-         100,
-     },
+    {{{FIELD_HEAD(SoundMacro::CmdPitchSweep2, times), "Times"sv, 0, 127, 100},
+     {FIELD_HEAD(SoundMacro::CmdPitchSweep2, add), "Add"sv, -32768, 32767, 100},
      {FIELD_HEAD(SoundMacro::CmdPitchSweep2, msSwitch), "Use Millisec"sv, 0, 1, 1},
-     {FIELD_HEAD(SoundMacro::CmdPitchSweep2, ticksOrMs), "Ticks/Millisec"sv, 0, 65535, 1000}}};
+     {FIELD_HEAD(SoundMacro::CmdPitchSweep2, ticksOrMs), "Ticks/Millisec"sv, 0, 65535, 1000}}}};
 bool SoundMacro::CmdPitchSweep2::Do(SoundMacroState& st, Voice& vox) const {
   /* Set wait state */
   if (msSwitch) {
@@ -887,20 +847,8 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdSetPitch::Introspective = {
     CmdType::Pitch,
     "Set Pitch"sv,
     "Set the playback sample rate directly."sv,
-    {{
-         FIELD_HEAD(SoundMacro::CmdSetPitch, hz.val),
-         "Hz"sv,
-         0,
-         0xffffff,
-         22050,
-     },
-     {
-         FIELD_HEAD(SoundMacro::CmdSetPitch, fine),
-         "Level Fine"sv,
-         0,
-         65535,
-         0,
-     }}};
+    {{{FIELD_HEAD(SoundMacro::CmdSetPitch, hz.val), "Hz"sv, 0, 0xffffff, 22050},
+     {FIELD_HEAD(SoundMacro::CmdSetPitch, fine), "Level Fine"sv, 0, 65535, 0}}}};
 bool SoundMacro::CmdSetPitch::Do(SoundMacroState& st, Voice& vox) const {
   vox.setPitchFrequency(hz, fine);
   return false;
@@ -911,27 +859,9 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdSetPitchAdsr::Introspective =
     "Set Pitch ADSR"sv,
     "Define the pitch ADSR from a DLS ADSR pool object. The pitch range is "
     "specified using Note and Cents parameters."sv,
-    {{
-         FIELD_HEAD(SoundMacro::CmdSetPitchAdsr, table),
-         "ADSR"sv,
-         0,
-         65535,
-         65535,
-     },
-     {
-         FIELD_HEAD(SoundMacro::CmdSetPitchAdsr, keys),
-         "Note range"sv,
-         -128,
-         127,
-         0,
-     },
-     {
-         FIELD_HEAD(SoundMacro::CmdSetPitchAdsr, cents),
-         "Cents range"sv,
-         -99,
-         99,
-         0,
-     }}};
+    {{{FIELD_HEAD(SoundMacro::CmdSetPitchAdsr, table), "ADSR"sv, 0, 65535, 65535},
+     {FIELD_HEAD(SoundMacro::CmdSetPitchAdsr, keys), "Note range"sv, -128, 127, 0},
+     {FIELD_HEAD(SoundMacro::CmdSetPitchAdsr, cents), "Cents range"sv, -99, 99, 0}}}};
 bool SoundMacro::CmdSetPitchAdsr::Do(SoundMacroState& st, Voice& vox) const {
   vox.setPitchAdsr(table.id, keys * 100 + cents);
   return false;
@@ -941,20 +871,8 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdScaleVolumeDLS::Introspective
     CmdType::Volume,
     "Scale Volume DLS"sv,
     "Sets new volume by scaling the velocity. A value of 4096 == 100%."sv,
-    {{
-         FIELD_HEAD(SoundMacro::CmdScaleVolumeDLS, scale),
-         "Scale"sv,
-         0,
-         16383,
-         4096,
-     },
-     {
-         FIELD_HEAD(SoundMacro::CmdScaleVolumeDLS, originalVol),
-         "Original Vol"sv,
-         0,
-         1,
-         1,
-     }}};
+    {{{FIELD_HEAD(SoundMacro::CmdScaleVolumeDLS, scale), "Scale"sv, 0, 16383, 4096},
+     {FIELD_HEAD(SoundMacro::CmdScaleVolumeDLS, originalVol), "Original Vol"sv, 0, 1, 1}}}};
 bool SoundMacro::CmdScaleVolumeDLS::Do(SoundMacroState& st, Voice& vox) const {
   vox.m_curVol = int32_t(originalVol ? st.m_initVel : st.m_curVel) * scale / 4096.f / 127.f;
   return false;
@@ -964,20 +882,8 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdMod2Vibrange::Introspective =
     CmdType::Pitch,
     "Mod 2 Vibrange"sv,
     "Values used to scale the modwheel control for vibrato."sv,
-    {{
-         FIELD_HEAD(SoundMacro::CmdMod2Vibrange, keys),
-         "Key range"sv,
-         0,
-         16383,
-         4096,
-     },
-     {
-         FIELD_HEAD(SoundMacro::CmdMod2Vibrange, cents),
-         "Cent range"sv,
-         0,
-         1,
-         1,
-     }}};
+    {{{FIELD_HEAD(SoundMacro::CmdMod2Vibrange, keys), "Key range"sv, 0, 16383, 4096},
+     {FIELD_HEAD(SoundMacro::CmdMod2Vibrange, cents), "Cent range"sv, 0, 1, 1}}}};
 bool SoundMacro::CmdMod2Vibrange::Do(SoundMacroState& st, Voice& vox) const {
   vox.setMod2VibratoRange(keys * 100 + cents);
   return false;
@@ -988,20 +894,8 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdSetupTremolo::Introspective =
     "Setup Tremolo"sv,
     "Setup tremolo effect. Must be combined with Tremolo Select to connect "
     "with a configured LFO. A value of 4096 == 100%."sv,
-    {{
-         FIELD_HEAD(SoundMacro::CmdSetupTremolo, scale),
-         "Scale"sv,
-         0,
-         16383,
-         8192,
-     },
-     {
-         FIELD_HEAD(SoundMacro::CmdSetupTremolo, modwAddScale),
-         "Modw. add scale"sv,
-         0,
-         16383,
-         0,
-     }}};
+    {{{FIELD_HEAD(SoundMacro::CmdSetupTremolo, scale), "Scale"sv, 0, 16383, 8192},
+     {FIELD_HEAD(SoundMacro::CmdSetupTremolo, modwAddScale), "Modw. add scale"sv, 0, 16383, 0}}}};
 bool SoundMacro::CmdSetupTremolo::Do(SoundMacroState& st, Voice& vox) const {
   vox.setTremolo(scale / 4096.f, scale / 4096.f);
   return false;
@@ -1021,10 +915,8 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdGoSub::Introspective = {
     CmdType::Structure,
     "Go Subroutine"sv,
     "Push location onto call stack and branch to specified location."sv,
-    {
-        {FIELD_HEAD(SoundMacro::CmdSplitRnd, macro), "Macro"sv, 0, 65535, 65535},
-        {FIELD_HEAD(SoundMacro::CmdSplitRnd, macroStep), "Macro Step"sv, 0, 65535, 0},
-    }};
+    {{{FIELD_HEAD(SoundMacro::CmdSplitRnd, macro), "Macro"sv, 0, 65535, 65535},
+     {FIELD_HEAD(SoundMacro::CmdSplitRnd, macroStep), "Macro Step"sv, 0, 65535, 0}}}};
 bool SoundMacro::CmdGoSub::Do(SoundMacroState& st, Voice& vox) const {
   if (macro.id == std::get<0>(st.m_pc.back()))
     st.m_pc.emplace_back(std::get<0>(st.m_pc.back()), std::get<1>(st.m_pc.back()),
@@ -1041,16 +933,9 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdTrapEvent::Introspective = {
     CmdType::Structure,
     "Trap Event"sv,
     "Register event-based branch to a specified location."sv,
-    {
-        {FIELD_HEAD(SoundMacro::CmdTrapEvent, event),
-         "Event"sv,
-         0,
-         2,
-         0,
-         {"Key Off"sv, "Sample End"sv, "Message Recv"sv}},
-        {FIELD_HEAD(SoundMacro::CmdTrapEvent, macro), "Macro"sv, 0, 65535, 65535},
-        {FIELD_HEAD(SoundMacro::CmdTrapEvent, macroStep), "Macro Step"sv, 0, 65535, 0},
-    }};
+    {{{FIELD_HEAD(SoundMacro::CmdTrapEvent, event), "Event"sv, 0, 2, 0, {"Key Off"sv, "Sample End"sv, "Message Recv"sv}},
+     {FIELD_HEAD(SoundMacro::CmdTrapEvent, macro), "Macro"sv, 0, 65535, 65535},
+     {FIELD_HEAD(SoundMacro::CmdTrapEvent, macroStep), "Macro Step"sv, 0, 65535, 0}}}};
 bool SoundMacro::CmdTrapEvent::Do(SoundMacroState& st, Voice& vox) const {
   switch (event) {
   case EventType::KeyOff:
@@ -1076,12 +961,12 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdUntrapEvent::Introspective = {
     CmdType::Structure,
     "Untrap Event"sv,
     "Unregister event-based branch."sv,
-    {{FIELD_HEAD(SoundMacro::CmdUntrapEvent, event),
+    {{{FIELD_HEAD(SoundMacro::CmdUntrapEvent, event),
       "Event"sv,
       0,
       2,
       0,
-      {"Key Off"sv, "Sample End"sv, "Message Recv"sv}}}};
+      {"Key Off"sv, "Sample End"sv, "Message Recv"sv}}}}};
 bool SoundMacro::CmdUntrapEvent::Do(SoundMacroState& st, Voice& vox) const {
   switch (event) {
   case CmdTrapEvent::EventType::KeyOff:
@@ -1108,12 +993,10 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdSendMessage::Introspective = {
     "Send Message"sv,
     "Send message to SoundMacro or Voice referenced in a variable. "
     "The message value is retrieved from a variable."sv,
-    {
-        {FIELD_HEAD(SoundMacro::CmdSendMessage, isVar), "Is Var"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdSendMessage, macro), "Macro"sv, 1, 65535, 65535},
-        {FIELD_HEAD(SoundMacro::CmdSendMessage, voiceVar), "Voice Var"sv, 0, 31, 0},
-        {FIELD_HEAD(SoundMacro::CmdSendMessage, valueVar), "Value Var"sv, 0, 31, 0},
-    }};
+    {{{FIELD_HEAD(SoundMacro::CmdSendMessage, isVar), "Is Var"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdSendMessage, macro), "Macro"sv, 1, 65535, 65535},
+     {FIELD_HEAD(SoundMacro::CmdSendMessage, voiceVar), "Voice Var"sv, 0, 31, 0},
+     {FIELD_HEAD(SoundMacro::CmdSendMessage, valueVar), "Value Var"sv, 0, 31, 0}}}};
 bool SoundMacro::CmdSendMessage::Do(SoundMacroState& st, Voice& vox) const {
   if (isVar) {
     ObjToken<Voice> findVox = vox.getEngine().findVoice(st.m_variables[voiceVar & 0x1f]);
@@ -1129,7 +1012,7 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdGetMessage::Introspective = {
     CmdType::Special,
     "Get Message"sv,
     "Get voice's latest received message and store its value in Variable."sv,
-    {{FIELD_HEAD(SoundMacro::CmdGetMessage, variable), "Variable"sv, 0, 31, 0}}};
+    {{{FIELD_HEAD(SoundMacro::CmdGetMessage, variable), "Variable"sv, 0, 31, 0}}}};
 bool SoundMacro::CmdGetMessage::Do(SoundMacroState& st, Voice& vox) const {
   st.m_variables[variable & 0x1f] = vox.m_latestMessage;
   return false;
@@ -1139,8 +1022,8 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdGetVid::Introspective = {
     CmdType::Special,
     "Get VID"sv,
     "Get ID of current voice or last voice started by Play Macro command and store in Variable."sv,
-    {{FIELD_HEAD(SoundMacro::CmdGetVid, variable), "Variable"sv, 0, 31, 0},
-     {FIELD_HEAD(SoundMacro::CmdGetVid, playMacro), "Play Macro"sv, 0, 1, 1}}};
+    {{{FIELD_HEAD(SoundMacro::CmdGetVid, variable), "Variable"sv, 0, 31, 0},
+     {FIELD_HEAD(SoundMacro::CmdGetVid, playMacro), "Play Macro"sv, 0, 1, 1}}}};
 bool SoundMacro::CmdGetVid::Do(SoundMacroState& st, Voice& vox) const {
   st.m_variables[variable & 0x1f] = playMacro ? st.m_lastPlayMacroVid : vox.vid();
   return false;
@@ -1150,22 +1033,22 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdAddAgeCount::Introspective = {
     CmdType::Special,
     "Add Age Count"sv,
     "Adds a value to the current voice's age counter."sv,
-    {{FIELD_HEAD(SoundMacro::CmdAddAgeCount, add), "Add"sv, -32768, 32767, -30000}}};
+    {{{FIELD_HEAD(SoundMacro::CmdAddAgeCount, add), "Add"sv, -32768, 32767, -30000}}}};
 bool SoundMacro::CmdAddAgeCount::Do(SoundMacroState& st, Voice& vox) const { return false; }
 
 const SoundMacro::CmdIntrospection SoundMacro::CmdSetAgeCount::Introspective = {
     CmdType::Special,
     "Set Age Count"sv,
     "Set a value into the current voice's age counter."sv,
-    {{FIELD_HEAD(SoundMacro::CmdSetAgeCount, counter), "Counter"sv, 0, 65535, 0}}};
+    {{{FIELD_HEAD(SoundMacro::CmdSetAgeCount, counter), "Counter"sv, 0, 65535, 0}}}};
 bool SoundMacro::CmdSetAgeCount::Do(SoundMacroState& st, Voice& vox) const { return false; }
 
 const SoundMacro::CmdIntrospection SoundMacro::CmdSendFlag::Introspective = {
     CmdType::Special,
     "Send Flag"sv,
     "Send a flag value to the host application."sv,
-    {{FIELD_HEAD(SoundMacro::CmdSendFlag, flagId), "Flag ID"sv, 0, 15, 0},
-     {FIELD_HEAD(SoundMacro::CmdSendFlag, value), "Value"sv, 0, 255, 255}}};
+    {{{FIELD_HEAD(SoundMacro::CmdSendFlag, flagId), "Flag ID"sv, 0, 15, 0},
+     {FIELD_HEAD(SoundMacro::CmdSendFlag, value), "Value"sv, 0, 255, 255}}}};
 bool SoundMacro::CmdSendFlag::Do(SoundMacroState& st, Voice& vox) const {
   /* TODO: figure out a good API */
   return false;
@@ -1175,8 +1058,8 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdPitchWheelR::Introspective = {
     CmdType::Setup,
     "Pitch Wheel Range"sv,
     "Specifies the number of note steps for the range of the pitch wheel."sv,
-    {{FIELD_HEAD(SoundMacro::CmdPitchWheelR, rangeUp), "Range Up"sv, 0, 127, 2},
-     {FIELD_HEAD(SoundMacro::CmdPitchWheelR, rangeDown), "Range Down"sv, 0, 127, 2}}};
+    {{{FIELD_HEAD(SoundMacro::CmdPitchWheelR, rangeUp), "Range Up"sv, 0, 127, 2},
+     {FIELD_HEAD(SoundMacro::CmdPitchWheelR, rangeDown), "Range Down"sv, 0, 127, 2}}}};
 bool SoundMacro::CmdPitchWheelR::Do(SoundMacroState& st, Voice& vox) const {
   vox.setPitchWheelRange(rangeUp, rangeDown);
   return false;
@@ -1186,40 +1069,40 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdSetPriority::Introspective = {
     CmdType::Special,
     "Set Priority"sv,
     "Sets the priority of the current voice."sv,
-    {{FIELD_HEAD(SoundMacro::CmdSetPriority, prio), "Priority"sv, 0, 254, 50}}};
+    {{{FIELD_HEAD(SoundMacro::CmdSetPriority, prio), "Priority"sv, 0, 254, 50}}}};
 bool SoundMacro::CmdSetPriority::Do(SoundMacroState& st, Voice& vox) const { return false; }
 
 const SoundMacro::CmdIntrospection SoundMacro::CmdAddPriority::Introspective = {
     CmdType::Special,
     "Add Priority"sv,
     "Adds to the priority of the current voice."sv,
-    {{FIELD_HEAD(SoundMacro::CmdAddPriority, prio), "Priority"sv, -255, 255, 1}}};
+    {{{FIELD_HEAD(SoundMacro::CmdAddPriority, prio), "Priority"sv, -255, 255, 1}}}};
 bool SoundMacro::CmdAddPriority::Do(SoundMacroState& st, Voice& vox) const { return false; }
 
 const SoundMacro::CmdIntrospection SoundMacro::CmdAgeCntSpeed::Introspective = {
     CmdType::Special,
     "Age Count Speed"sv,
     "Sets the speed the current voice's age counter is decremented."sv,
-    {{FIELD_HEAD(SoundMacro::CmdAgeCntSpeed, time), "Millisec"sv, 0, 16777215, 1080000}}};
+    {{{FIELD_HEAD(SoundMacro::CmdAgeCntSpeed, time), "Millisec"sv, 0, 16777215, 1080000}}}};
 bool SoundMacro::CmdAgeCntSpeed::Do(SoundMacroState& st, Voice& vox) const { return false; }
 
 const SoundMacro::CmdIntrospection SoundMacro::CmdAgeCntVel::Introspective = {
     CmdType::Special,
     "Age Count Velocity"sv,
     "Sets the current voice's age counter by scaling the velocity."sv,
-    {{FIELD_HEAD(SoundMacro::CmdAgeCntVel, ageBase), "Base"sv, 0, 65535, 60000},
-     {FIELD_HEAD(SoundMacro::CmdAgeCntVel, ageScale), "Scale"sv, 0, 65535, 127}}};
+    {{{FIELD_HEAD(SoundMacro::CmdAgeCntVel, ageBase), "Base"sv, 0, 65535, 60000},
+     {FIELD_HEAD(SoundMacro::CmdAgeCntVel, ageScale), "Scale"sv, 0, 65535, 127}}}};
 bool SoundMacro::CmdAgeCntVel::Do(SoundMacroState& st, Voice& vox) const { return false; }
 
 const SoundMacro::CmdIntrospection SoundMacro::CmdVolSelect::Introspective = {
     CmdType::Setup,
     "Volume Select"sv,
     "Appends an evaluator component for computing the voice's volume."sv,
-    {{FIELD_HEAD(SoundMacro::CmdVolSelect, midiControl), "MIDI Control"sv, 0, 132, 7},
+    {{{FIELD_HEAD(SoundMacro::CmdVolSelect, midiControl), "MIDI Control"sv, 0, 132, 7},
      {FIELD_HEAD(SoundMacro::CmdVolSelect, scalingPercentage), "Scale Percentage"sv, -10000, 10000, 100},
      {FIELD_HEAD(SoundMacro::CmdVolSelect, combine), "Combine Mode"sv, 0, 2, 0, {"Set"sv, "Add"sv, "Mult"sv}},
      {FIELD_HEAD(SoundMacro::CmdVolSelect, isVar), "Is Var"sv, 0, 1, 0},
-     {FIELD_HEAD(SoundMacro::CmdVolSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdVolSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}}};
 bool SoundMacro::CmdVolSelect::Do(SoundMacroState& st, Voice& vox) const {
   st.m_volumeSel.addComponent(midiControl, (scalingPercentage + fineScaling / 100.f) / 100.f,
                               SoundMacroState::Evaluator::Combine(combine), SoundMacroState::Evaluator::VarType(isVar));
@@ -1230,11 +1113,11 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdPanSelect::Introspective = {
     CmdType::Setup,
     "Pan Select"sv,
     "Appends an evaluator component for computing the voice's pan."sv,
-    {{FIELD_HEAD(SoundMacro::CmdPanSelect, midiControl), "MIDI Control"sv, 0, 132, 10},
+    {{{FIELD_HEAD(SoundMacro::CmdPanSelect, midiControl), "MIDI Control"sv, 0, 132, 10},
      {FIELD_HEAD(SoundMacro::CmdPanSelect, scalingPercentage), "Scale Percentage"sv, -10000, 10000, 100},
      {FIELD_HEAD(SoundMacro::CmdPanSelect, combine), "Combine Mode"sv, 0, 2, 0, {"Set"sv, "Add"sv, "Mult"sv}},
      {FIELD_HEAD(SoundMacro::CmdPanSelect, isVar), "Is Var"sv, 0, 1, 0},
-     {FIELD_HEAD(SoundMacro::CmdPanSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdPanSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}}};
 bool SoundMacro::CmdPanSelect::Do(SoundMacroState& st, Voice& vox) const {
   st.m_panSel.addComponent(midiControl, (scalingPercentage + fineScaling / 100.f) / 100.f,
                            SoundMacroState::Evaluator::Combine(combine), SoundMacroState::Evaluator::VarType(isVar));
@@ -1245,11 +1128,11 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdPitchWheelSelect::Introspectiv
     CmdType::Setup,
     "Pitch Wheel Select"sv,
     "Appends an evaluator component for computing the voice's pitch wheel."sv,
-    {{FIELD_HEAD(SoundMacro::CmdPitchWheelSelect, midiControl), "MIDI Control"sv, 0, 132, 128},
+    {{{FIELD_HEAD(SoundMacro::CmdPitchWheelSelect, midiControl), "MIDI Control"sv, 0, 132, 128},
      {FIELD_HEAD(SoundMacro::CmdPitchWheelSelect, scalingPercentage), "Scale Percentage"sv, -10000, 10000, 100},
      {FIELD_HEAD(SoundMacro::CmdPitchWheelSelect, combine), "Combine Mode"sv, 0, 2, 0, {"Set"sv, "Add"sv, "Mult"sv}},
      {FIELD_HEAD(SoundMacro::CmdPitchWheelSelect, isVar), "Is Var"sv, 0, 1, 0},
-     {FIELD_HEAD(SoundMacro::CmdPitchWheelSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdPitchWheelSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}}};
 bool SoundMacro::CmdPitchWheelSelect::Do(SoundMacroState& st, Voice& vox) const {
   st.m_pitchWheelSel.addComponent(midiControl, (scalingPercentage + fineScaling / 100.f) / 100.f,
                                   SoundMacroState::Evaluator::Combine(combine),
@@ -1261,11 +1144,11 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdModWheelSelect::Introspective
     CmdType::Setup,
     "Mod Wheel Select"sv,
     "Appends an evaluator component for computing the voice's mod wheel."sv,
-    {{FIELD_HEAD(SoundMacro::CmdModWheelSelect, midiControl), "MIDI Control"sv, 0, 132, 1},
+    {{{FIELD_HEAD(SoundMacro::CmdModWheelSelect, midiControl), "MIDI Control"sv, 0, 132, 1},
      {FIELD_HEAD(SoundMacro::CmdModWheelSelect, scalingPercentage), "Scale Percentage"sv, -10000, 10000, 100},
      {FIELD_HEAD(SoundMacro::CmdModWheelSelect, combine), "Combine Mode"sv, 0, 2, 0, {"Set"sv, "Add"sv, "Mult"sv}},
      {FIELD_HEAD(SoundMacro::CmdModWheelSelect, isVar), "Is Var"sv, 0, 1, 0},
-     {FIELD_HEAD(SoundMacro::CmdModWheelSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdModWheelSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}}};
 bool SoundMacro::CmdModWheelSelect::Do(SoundMacroState& st, Voice& vox) const {
   st.m_modWheelSel.addComponent(midiControl, (scalingPercentage + fineScaling / 100.f) / 100.f,
                                 SoundMacroState::Evaluator::Combine(combine),
@@ -1277,11 +1160,11 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdPedalSelect::Introspective = {
     CmdType::Setup,
     "Pedal Select"sv,
     "Appends an evaluator component for computing the voice's pedal."sv,
-    {{FIELD_HEAD(SoundMacro::CmdPedalSelect, midiControl), "MIDI Control"sv, 0, 132, 1},
+    {{{FIELD_HEAD(SoundMacro::CmdPedalSelect, midiControl), "MIDI Control"sv, 0, 132, 1},
      {FIELD_HEAD(SoundMacro::CmdPedalSelect, scalingPercentage), "Scale Percentage"sv, -10000, 10000, 100},
      {FIELD_HEAD(SoundMacro::CmdPedalSelect, combine), "Combine Mode"sv, 0, 2, 0, {"Set"sv, "Add"sv, "Mult"sv}},
      {FIELD_HEAD(SoundMacro::CmdPedalSelect, isVar), "Is Var"sv, 0, 1, 0},
-     {FIELD_HEAD(SoundMacro::CmdPedalSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdPedalSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}}};
 bool SoundMacro::CmdPedalSelect::Do(SoundMacroState& st, Voice& vox) const {
   st.m_pedalSel.addComponent(midiControl, (scalingPercentage + fineScaling / 100.f) / 100.f,
                              SoundMacroState::Evaluator::Combine(combine), SoundMacroState::Evaluator::VarType(isVar));
@@ -1292,11 +1175,11 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdPortamentoSelect::Introspectiv
     CmdType::Setup,
     "Portamento Select"sv,
     "Appends an evaluator component for computing the voice's portamento."sv,
-    {{FIELD_HEAD(SoundMacro::CmdPortamentoSelect, midiControl), "MIDI Control"sv, 0, 132, 1},
+    {{{FIELD_HEAD(SoundMacro::CmdPortamentoSelect, midiControl), "MIDI Control"sv, 0, 132, 1},
      {FIELD_HEAD(SoundMacro::CmdPortamentoSelect, scalingPercentage), "Scale Percentage"sv, -10000, 10000, 100},
      {FIELD_HEAD(SoundMacro::CmdPortamentoSelect, combine), "Combine Mode"sv, 0, 2, 0, {"Set"sv, "Add"sv, "Mult"sv}},
      {FIELD_HEAD(SoundMacro::CmdPortamentoSelect, isVar), "Is Var"sv, 0, 1, 0},
-     {FIELD_HEAD(SoundMacro::CmdPortamentoSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdPortamentoSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}}};
 bool SoundMacro::CmdPortamentoSelect::Do(SoundMacroState& st, Voice& vox) const {
   st.m_portamentoSel.addComponent(midiControl, (scalingPercentage + fineScaling / 100.f) / 100.f,
                                   SoundMacroState::Evaluator::Combine(combine),
@@ -1308,11 +1191,11 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdReverbSelect::Introspective =
     CmdType::Setup,
     "Reverb Select"sv,
     "Appends an evaluator component for computing the voice's reverb."sv,
-    {{FIELD_HEAD(SoundMacro::CmdReverbSelect, midiControl), "MIDI Control"sv, 0, 132, 1},
+    {{{FIELD_HEAD(SoundMacro::CmdReverbSelect, midiControl), "MIDI Control"sv, 0, 132, 1},
      {FIELD_HEAD(SoundMacro::CmdReverbSelect, scalingPercentage), "Scale Percentage"sv, -10000, 10000, 100},
      {FIELD_HEAD(SoundMacro::CmdReverbSelect, combine), "Combine Mode"sv, 0, 2, 0, {"Set"sv, "Add"sv, "Mult"sv}},
      {FIELD_HEAD(SoundMacro::CmdReverbSelect, isVar), "Is Var"sv, 0, 1, 0},
-     {FIELD_HEAD(SoundMacro::CmdReverbSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdReverbSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}}};
 bool SoundMacro::CmdReverbSelect::Do(SoundMacroState& st, Voice& vox) const {
   st.m_reverbSel.addComponent(midiControl, (scalingPercentage + fineScaling / 100.f) / 100.f,
                               SoundMacroState::Evaluator::Combine(combine), SoundMacroState::Evaluator::VarType(isVar));
@@ -1323,11 +1206,11 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdSpanSelect::Introspective = {
     CmdType::Setup,
     "Span Select"sv,
     "Appends an evaluator component for computing the voice's span."sv,
-    {{FIELD_HEAD(SoundMacro::CmdSpanSelect, midiControl), "MIDI Control"sv, 0, 132, 19},
+    {{{FIELD_HEAD(SoundMacro::CmdSpanSelect, midiControl), "MIDI Control"sv, 0, 132, 19},
      {FIELD_HEAD(SoundMacro::CmdSpanSelect, scalingPercentage), "Scale Percentage"sv, -10000, 10000, 100},
      {FIELD_HEAD(SoundMacro::CmdSpanSelect, combine), "Combine Mode"sv, 0, 2, 0, {"Set"sv, "Add"sv, "Mult"sv}},
      {FIELD_HEAD(SoundMacro::CmdSpanSelect, isVar), "Is Var"sv, 0, 1, 0},
-     {FIELD_HEAD(SoundMacro::CmdSpanSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdSpanSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}}};
 bool SoundMacro::CmdSpanSelect::Do(SoundMacroState& st, Voice& vox) const {
   st.m_spanSel.addComponent(midiControl, (scalingPercentage + fineScaling / 100.f) / 100.f,
                             SoundMacroState::Evaluator::Combine(combine), SoundMacroState::Evaluator::VarType(isVar));
@@ -1338,11 +1221,11 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdDopplerSelect::Introspective =
     CmdType::Setup,
     "Doppler Select"sv,
     "Appends an evaluator component for computing the voice's doppler."sv,
-    {{FIELD_HEAD(SoundMacro::CmdDopplerSelect, midiControl), "MIDI Control"sv, 0, 132, 132},
+    {{{FIELD_HEAD(SoundMacro::CmdDopplerSelect, midiControl), "MIDI Control"sv, 0, 132, 132},
      {FIELD_HEAD(SoundMacro::CmdDopplerSelect, scalingPercentage), "Scale Percentage"sv, -10000, 10000, 100},
      {FIELD_HEAD(SoundMacro::CmdDopplerSelect, combine), "Combine Mode"sv, 0, 2, 0, {"Set"sv, "Add"sv, "Mult"sv}},
      {FIELD_HEAD(SoundMacro::CmdDopplerSelect, isVar), "Is Var"sv, 0, 1, 0},
-     {FIELD_HEAD(SoundMacro::CmdDopplerSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdDopplerSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}}};
 bool SoundMacro::CmdDopplerSelect::Do(SoundMacroState& st, Voice& vox) const {
   st.m_dopplerSel.addComponent(midiControl, (scalingPercentage + fineScaling / 100.f) / 100.f,
                                SoundMacroState::Evaluator::Combine(combine),
@@ -1354,11 +1237,11 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdTremoloSelect::Introspective =
     CmdType::Setup,
     "Tremolo Select"sv,
     "Appends an evaluator component for computing the voice's tremolo."sv,
-    {{FIELD_HEAD(SoundMacro::CmdTremoloSelect, midiControl), "MIDI Control"sv, 0, 132, 1},
+    {{{FIELD_HEAD(SoundMacro::CmdTremoloSelect, midiControl), "MIDI Control"sv, 0, 132, 1},
      {FIELD_HEAD(SoundMacro::CmdTremoloSelect, scalingPercentage), "Scale Percentage"sv, -10000, 10000, 100},
      {FIELD_HEAD(SoundMacro::CmdTremoloSelect, combine), "Combine Mode"sv, 0, 2, 0, {"Set"sv, "Add"sv, "Mult"sv}},
      {FIELD_HEAD(SoundMacro::CmdTremoloSelect, isVar), "Is Var"sv, 0, 1, 0},
-     {FIELD_HEAD(SoundMacro::CmdTremoloSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdTremoloSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}}};
 bool SoundMacro::CmdTremoloSelect::Do(SoundMacroState& st, Voice& vox) const {
   st.m_tremoloSel.addComponent(midiControl, (scalingPercentage + fineScaling / 100.f) / 100.f,
                                SoundMacroState::Evaluator::Combine(combine),
@@ -1370,11 +1253,11 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdPreASelect::Introspective = {
     CmdType::Setup,
     "PreA Select"sv,
     "Appends an evaluator component for computing the voice's pre-AUXA."sv,
-    {{FIELD_HEAD(SoundMacro::CmdPreASelect, midiControl), "MIDI Control"sv, 0, 132, 1},
+    {{{FIELD_HEAD(SoundMacro::CmdPreASelect, midiControl), "MIDI Control"sv, 0, 132, 1},
      {FIELD_HEAD(SoundMacro::CmdPreASelect, scalingPercentage), "Scale Percentage"sv, -10000, 10000, 100},
      {FIELD_HEAD(SoundMacro::CmdPreASelect, combine), "Combine Mode"sv, 0, 2, 0, {"Set"sv, "Add"sv, "Mult"sv}},
      {FIELD_HEAD(SoundMacro::CmdPreASelect, isVar), "Is Var"sv, 0, 1, 0},
-     {FIELD_HEAD(SoundMacro::CmdPreASelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdPreASelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}}};
 bool SoundMacro::CmdPreASelect::Do(SoundMacroState& st, Voice& vox) const {
   st.m_preAuxASel.addComponent(midiControl, (scalingPercentage + fineScaling / 100.f) / 100.f,
                                SoundMacroState::Evaluator::Combine(combine),
@@ -1386,11 +1269,11 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdPreBSelect::Introspective = {
     CmdType::Setup,
     "PreB Select"sv,
     "Appends an evaluator component for computing the voice's pre-AUXB."sv,
-    {{FIELD_HEAD(SoundMacro::CmdPreBSelect, midiControl), "MIDI Control"sv, 0, 132, 1},
+    {{{FIELD_HEAD(SoundMacro::CmdPreBSelect, midiControl), "MIDI Control"sv, 0, 132, 1},
      {FIELD_HEAD(SoundMacro::CmdPreBSelect, scalingPercentage), "Scale Percentage"sv, -10000, 10000, 100},
      {FIELD_HEAD(SoundMacro::CmdPreBSelect, combine), "Combine Mode"sv, 0, 2, 0, {"Set"sv, "Add"sv, "Mult"sv}},
      {FIELD_HEAD(SoundMacro::CmdPreBSelect, isVar), "Is Var"sv, 0, 1, 0},
-     {FIELD_HEAD(SoundMacro::CmdPreBSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdPreBSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}}};
 bool SoundMacro::CmdPreBSelect::Do(SoundMacroState& st, Voice& vox) const {
   st.m_preAuxBSel.addComponent(midiControl, (scalingPercentage + fineScaling / 100.f) / 100.f,
                                SoundMacroState::Evaluator::Combine(combine),
@@ -1402,11 +1285,11 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdPostBSelect::Introspective = {
     CmdType::Setup,
     "PostB Select"sv,
     "Appends an evaluator component for computing the voice's post-AUXB."sv,
-    {{FIELD_HEAD(SoundMacro::CmdPostBSelect, midiControl), "MIDI Control"sv, 0, 132, 1},
+    {{{FIELD_HEAD(SoundMacro::CmdPostBSelect, midiControl), "MIDI Control"sv, 0, 132, 1},
      {FIELD_HEAD(SoundMacro::CmdPostBSelect, scalingPercentage), "Scale Percentage"sv, -10000, 10000, 100},
      {FIELD_HEAD(SoundMacro::CmdPostBSelect, combine), "Combine Mode"sv, 0, 2, 0, {"Set"sv, "Add"sv, "Mult"sv}},
      {FIELD_HEAD(SoundMacro::CmdPostBSelect, isVar), "Is Var"sv, 0, 1, 0},
-     {FIELD_HEAD(SoundMacro::CmdPostBSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdPostBSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0}}}};
 bool SoundMacro::CmdPostBSelect::Do(SoundMacroState& st, Voice& vox) const {
   st.m_postAuxB.addComponent(midiControl, (scalingPercentage + fineScaling / 100.f) / 100.f,
                              SoundMacroState::Evaluator::Combine(combine), SoundMacroState::Evaluator::VarType(isVar));
@@ -1417,12 +1300,12 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdAuxAFXSelect::Introspective =
     CmdType::Setup,
     "AuxA FX Select"sv,
     "Appends an evaluator component for computing the AUXA Parameter."sv,
-    {{FIELD_HEAD(SoundMacro::CmdAuxAFXSelect, midiControl), "MIDI Control"sv, 0, 132, 1},
+    {{{FIELD_HEAD(SoundMacro::CmdAuxAFXSelect, midiControl), "MIDI Control"sv, 0, 132, 1},
      {FIELD_HEAD(SoundMacro::CmdAuxAFXSelect, scalingPercentage), "Scale Percentage"sv, -10000, 10000, 100},
      {FIELD_HEAD(SoundMacro::CmdAuxAFXSelect, combine), "Combine Mode"sv, 0, 2, 0, {"Set"sv, "Add"sv, "Mult"sv}},
      {FIELD_HEAD(SoundMacro::CmdAuxAFXSelect, isVar), "Is Var"sv, 0, 1, 0},
      {FIELD_HEAD(SoundMacro::CmdAuxAFXSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0},
-     {FIELD_HEAD(SoundMacro::CmdAuxAFXSelect, paramIndex), "Param Index"sv, 0, 2, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdAuxAFXSelect, paramIndex), "Param Index"sv, 0, 2, 0}}}};
 bool SoundMacro::CmdAuxAFXSelect::Do(SoundMacroState& st, Voice& vox) const {
   st.m_auxAFxSel[std::min(paramIndex, atUint8(3))].addComponent(
       midiControl, (scalingPercentage + fineScaling / 100.f) / 100.f, SoundMacroState::Evaluator::Combine(combine),
@@ -1434,12 +1317,12 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdAuxBFXSelect::Introspective =
     CmdType::Setup,
     "AuxB FX Select"sv,
     "Appends an evaluator component for computing the AUXB Parameter."sv,
-    {{FIELD_HEAD(SoundMacro::CmdAuxBFXSelect, midiControl), "MIDI Control"sv, 0, 132, 1},
+    {{{FIELD_HEAD(SoundMacro::CmdAuxBFXSelect, midiControl), "MIDI Control"sv, 0, 132, 1},
      {FIELD_HEAD(SoundMacro::CmdAuxBFXSelect, scalingPercentage), "Scale Percentage"sv, -10000, 10000, 100},
      {FIELD_HEAD(SoundMacro::CmdAuxBFXSelect, combine), "Combine Mode"sv, 0, 2, 0, {"Set"sv, "Add"sv, "Mult"sv}},
      {FIELD_HEAD(SoundMacro::CmdAuxBFXSelect, isVar), "Is Var"sv, 0, 1, 0},
      {FIELD_HEAD(SoundMacro::CmdAuxBFXSelect, fineScaling), "Fine Scaling"sv, -100, 100, 0},
-     {FIELD_HEAD(SoundMacro::CmdAuxBFXSelect, paramIndex), "Param Index"sv, 0, 2, 0}}};
+     {FIELD_HEAD(SoundMacro::CmdAuxBFXSelect, paramIndex), "Param Index"sv, 0, 2, 0}}}};
 bool SoundMacro::CmdAuxBFXSelect::Do(SoundMacroState& st, Voice& vox) const {
   st.m_auxBFxSel[std::min(paramIndex, atUint8(3))].addComponent(
       midiControl, (scalingPercentage + fineScaling / 100.f) / 100.f, SoundMacroState::Evaluator::Combine(combine),
@@ -1451,8 +1334,8 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdSetupLFO::Introspective = {
     CmdType::Setup,
     "Setup LFO"sv,
     "Configures voice's LFO period in milliseconds."sv,
-    {{FIELD_HEAD(SoundMacro::CmdSetupLFO, lfoNumber), "LFO Number"sv, 0, 1, 0},
-     {FIELD_HEAD(SoundMacro::CmdSetupLFO, periodInMs), "Period"sv, -10000, 10000, 100}}};
+    {{{FIELD_HEAD(SoundMacro::CmdSetupLFO, lfoNumber), "LFO Number"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdSetupLFO, periodInMs), "Period"sv, -10000, 10000, 100}}}};
 bool SoundMacro::CmdSetupLFO::Do(SoundMacroState& st, Voice& vox) const {
   if (lfoNumber == 0)
     vox.setLFO1Period(periodInMs / 1000.f);
@@ -1465,8 +1348,8 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdModeSelect::Introspective = {
     CmdType::Setup,
     "Mode Select"sv,
     "Sets operating modes for current voice."sv,
-    {{FIELD_HEAD(SoundMacro::CmdModeSelect, dlsVol), "DLS Vol"sv, 0, 1, 0},
-     {FIELD_HEAD(SoundMacro::CmdModeSelect, itd), "ITD"sv, 0, 1, 0}}};
+    {{{FIELD_HEAD(SoundMacro::CmdModeSelect, dlsVol), "DLS Vol"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdModeSelect, itd), "ITD"sv, 0, 1, 0}}}};
 bool SoundMacro::CmdModeSelect::Do(SoundMacroState& st, Voice& vox) const {
   vox.m_dlsVol = dlsVol;
   return false;
@@ -1476,8 +1359,8 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdSetKeygroup::Introspective = {
     CmdType::Setup,
     "Set Keygroup"sv,
     "Selects keygroup for current voice."sv,
-    {{FIELD_HEAD(SoundMacro::CmdSetKeygroup, group), "Group"sv, 0, 255, 0},
-     {FIELD_HEAD(SoundMacro::CmdSetKeygroup, killNow), "Kill now"sv, 0, 1, 0}}};
+    {{{FIELD_HEAD(SoundMacro::CmdSetKeygroup, group), "Group"sv, 0, 255, 0},
+     {FIELD_HEAD(SoundMacro::CmdSetKeygroup, killNow), "Kill now"sv, 0, 1, 0}}}};
 bool SoundMacro::CmdSetKeygroup::Do(SoundMacroState& st, Voice& vox) const {
   vox.setKeygroup(0);
   if (group) {
@@ -1491,30 +1374,28 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdSRCmodeSelect::Introspective =
     CmdType::Setup,
     "SRC Mode Select"sv,
     "Sets operating modes for sample rate converter."sv,
-    {{FIELD_HEAD(SoundMacro::CmdSRCmodeSelect, srcType), "SRC Type"sv, 0, 2, 0},
-     {FIELD_HEAD(SoundMacro::CmdSRCmodeSelect, type0SrcFilter), "Type 0 SRC Filter"sv, 0, 2, 1}}};
+    {{{FIELD_HEAD(SoundMacro::CmdSRCmodeSelect, srcType), "SRC Type"sv, 0, 2, 0},
+     {FIELD_HEAD(SoundMacro::CmdSRCmodeSelect, type0SrcFilter), "Type 0 SRC Filter"sv, 0, 2, 1}}}};
 bool SoundMacro::CmdSRCmodeSelect::Do(SoundMacroState& st, Voice& vox) const { return false; }
 
 const SoundMacro::CmdIntrospection SoundMacro::CmdWiiUnknown::Introspective = {
-    CmdType::Setup, "Wii Unknown"sv, "????"sv, {{FIELD_HEAD(SoundMacro::CmdWiiUnknown, flag), "?"sv, 0, 1, 0}}};
+    CmdType::Setup, "Wii Unknown"sv, "????"sv, {{{FIELD_HEAD(SoundMacro::CmdWiiUnknown, flag), "?"sv, 0, 1, 0}}}};
 bool SoundMacro::CmdWiiUnknown::Do(SoundMacroState& st, Voice& vox) const { return false; }
 
 const SoundMacro::CmdIntrospection SoundMacro::CmdWiiUnknown2::Introspective = {
-    CmdType::Setup, "Wii Unknown 2"sv, "????"sv, {{FIELD_HEAD(SoundMacro::CmdWiiUnknown2, flag), "?"sv, 0, 1, 0}}};
+    CmdType::Setup, "Wii Unknown 2"sv, "????"sv, {{{FIELD_HEAD(SoundMacro::CmdWiiUnknown2, flag), "?"sv, 0, 1, 0}}}};
 bool SoundMacro::CmdWiiUnknown2::Do(SoundMacroState& st, Voice& vox) const { return false; }
 
 const SoundMacro::CmdIntrospection SoundMacro::CmdAddVars::Introspective = {
     CmdType::Special,
     "Add Vars"sv,
     "A = B + C"sv,
-    {
-        {FIELD_HEAD(SoundMacro::CmdAddVars, varCtrlA), "Use Ctrl A"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdAddVars, a), "A"sv, 0, 255, 0},
-        {FIELD_HEAD(SoundMacro::CmdAddVars, varCtrlB), "Use Ctrl B"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdAddVars, b), "B"sv, 0, 255, 0},
-        {FIELD_HEAD(SoundMacro::CmdAddVars, varCtrlC), "Use Ctrl C"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdAddVars, c), "C"sv, 0, 255, 0},
-    }};
+    {{{FIELD_HEAD(SoundMacro::CmdAddVars, varCtrlA), "Use Ctrl A"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdAddVars, a), "A"sv, 0, 255, 0},
+     {FIELD_HEAD(SoundMacro::CmdAddVars, varCtrlB), "Use Ctrl B"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdAddVars, b), "B"sv, 0, 255, 0},
+     {FIELD_HEAD(SoundMacro::CmdAddVars, varCtrlC), "Use Ctrl C"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdAddVars, c), "C"sv, 0, 255, 0}}}};
 bool SoundMacro::CmdAddVars::Do(SoundMacroState& st, Voice& vox) const {
   int32_t useB, useC;
 
@@ -1540,14 +1421,12 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdSubVars::Introspective = {
     CmdType::Special,
     "Sub Vars"sv,
     "A = B - C"sv,
-    {
-        {FIELD_HEAD(SoundMacro::CmdSubVars, varCtrlA), "Use Ctrl A"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdSubVars, a), "A"sv, 0, 255, 0},
-        {FIELD_HEAD(SoundMacro::CmdSubVars, varCtrlB), "Use Ctrl B"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdSubVars, b), "B"sv, 0, 255, 0},
-        {FIELD_HEAD(SoundMacro::CmdSubVars, varCtrlC), "Use Ctrl C"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdSubVars, c), "C"sv, 0, 255, 0},
-    }};
+    {{{FIELD_HEAD(SoundMacro::CmdSubVars, varCtrlA), "Use Ctrl A"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdSubVars, a), "A"sv, 0, 255, 0},
+     {FIELD_HEAD(SoundMacro::CmdSubVars, varCtrlB), "Use Ctrl B"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdSubVars, b), "B"sv, 0, 255, 0},
+     {FIELD_HEAD(SoundMacro::CmdSubVars, varCtrlC), "Use Ctrl C"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdSubVars, c), "C"sv, 0, 255, 0}}}};
 bool SoundMacro::CmdSubVars::Do(SoundMacroState& st, Voice& vox) const {
   int32_t useB, useC;
 
@@ -1573,14 +1452,12 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdMulVars::Introspective = {
     CmdType::Special,
     "Mul Vars"sv,
     "A = B * C"sv,
-    {
-        {FIELD_HEAD(SoundMacro::CmdMulVars, varCtrlA), "Use Ctrl A"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdMulVars, a), "A"sv, 0, 255, 0},
-        {FIELD_HEAD(SoundMacro::CmdMulVars, varCtrlB), "Use Ctrl B"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdMulVars, b), "B"sv, 0, 255, 0},
-        {FIELD_HEAD(SoundMacro::CmdMulVars, varCtrlC), "Use Ctrl C"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdMulVars, c), "C"sv, 0, 255, 0},
-    }};
+    {{{FIELD_HEAD(SoundMacro::CmdMulVars, varCtrlA), "Use Ctrl A"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdMulVars, a), "A"sv, 0, 255, 0},
+     {FIELD_HEAD(SoundMacro::CmdMulVars, varCtrlB), "Use Ctrl B"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdMulVars, b), "B"sv, 0, 255, 0},
+     {FIELD_HEAD(SoundMacro::CmdMulVars, varCtrlC), "Use Ctrl C"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdMulVars, c), "C"sv, 0, 255, 0}}}};
 bool SoundMacro::CmdMulVars::Do(SoundMacroState& st, Voice& vox) const {
   int32_t useB, useC;
 
@@ -1606,14 +1483,12 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdDivVars::Introspective = {
     CmdType::Special,
     "Div Vars"sv,
     "A = B / C"sv,
-    {
-        {FIELD_HEAD(SoundMacro::CmdDivVars, varCtrlA), "Use Ctrl A"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdDivVars, a), "A"sv, 0, 255, 0},
-        {FIELD_HEAD(SoundMacro::CmdDivVars, varCtrlB), "Use Ctrl B"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdDivVars, b), "B"sv, 0, 255, 0},
-        {FIELD_HEAD(SoundMacro::CmdDivVars, varCtrlC), "Use Ctrl C"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdDivVars, c), "C"sv, 0, 255, 0},
-    }};
+    {{{FIELD_HEAD(SoundMacro::CmdDivVars, varCtrlA), "Use Ctrl A"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdDivVars, a), "A"sv, 0, 255, 0},
+     {FIELD_HEAD(SoundMacro::CmdDivVars, varCtrlB), "Use Ctrl B"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdDivVars, b), "B"sv, 0, 255, 0},
+     {FIELD_HEAD(SoundMacro::CmdDivVars, varCtrlC), "Use Ctrl C"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdDivVars, c), "C"sv, 0, 255, 0}}}};
 bool SoundMacro::CmdDivVars::Do(SoundMacroState& st, Voice& vox) const {
   int32_t useB, useC;
 
@@ -1639,13 +1514,11 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdAddIVars::Introspective = {
     CmdType::Special,
     "Add Imm Vars"sv,
     "A = B + Immediate"sv,
-    {
-        {FIELD_HEAD(SoundMacro::CmdAddIVars, varCtrlA), "Use Ctrl A"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdAddIVars, a), "A"sv, 0, 255, 0},
-        {FIELD_HEAD(SoundMacro::CmdAddIVars, varCtrlB), "Use Ctrl B"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdAddIVars, b), "B"sv, 0, 255, 0},
-        {FIELD_HEAD(SoundMacro::CmdAddIVars, imm), "Immediate"sv, -32768, 32767, 0},
-    }};
+    {{{FIELD_HEAD(SoundMacro::CmdAddIVars, varCtrlA), "Use Ctrl A"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdAddIVars, a), "A"sv, 0, 255, 0},
+     {FIELD_HEAD(SoundMacro::CmdAddIVars, varCtrlB), "Use Ctrl B"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdAddIVars, b), "B"sv, 0, 255, 0},
+     {FIELD_HEAD(SoundMacro::CmdAddIVars, imm), "Immediate"sv, -32768, 32767, 0}}}};
 bool SoundMacro::CmdAddIVars::Do(SoundMacroState& st, Voice& vox) const {
   int32_t useB;
 
@@ -1666,11 +1539,9 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdSetVar::Introspective = {
     CmdType::Special,
     "Set Var"sv,
     "A = Immediate"sv,
-    {
-        {FIELD_HEAD(SoundMacro::CmdSetVar, varCtrlA), "Use Ctrl A"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdSetVar, a), "A"sv, 0, 255, 0},
-        {FIELD_HEAD(SoundMacro::CmdSetVar, imm), "Immediate"sv, -32768, 32767, 0},
-    }};
+    {{{FIELD_HEAD(SoundMacro::CmdSetVar, varCtrlA), "Use Ctrl A"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdSetVar, a), "A"sv, 0, 255, 0},
+     {FIELD_HEAD(SoundMacro::CmdSetVar, imm), "Immediate"sv, -32768, 32767, 0}}}};
 bool SoundMacro::CmdSetVar::Do(SoundMacroState& st, Voice& vox) const {
   if (varCtrlA)
     vox.setCtrlValue(a, imm);
@@ -1684,14 +1555,12 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdIfEqual::Introspective = {
     CmdType::Structure,
     "If Equal"sv,
     "Branches to specified step if A == B."sv,
-    {
-        {FIELD_HEAD(SoundMacro::CmdIfEqual, varCtrlA), "Use Ctrl A"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdIfEqual, a), "A"sv, 0, 255, 0},
-        {FIELD_HEAD(SoundMacro::CmdIfEqual, varCtrlB), "Use Ctrl B"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdIfEqual, b), "B"sv, 0, 255, 0},
-        {FIELD_HEAD(SoundMacro::CmdIfEqual, notEq), "Not"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdIfEqual, macroStep), "Macro Step"sv, 0, 65535, 0},
-    }};
+    {{{FIELD_HEAD(SoundMacro::CmdIfEqual, varCtrlA), "Use Ctrl A"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdIfEqual, a), "A"sv, 0, 255, 0},
+     {FIELD_HEAD(SoundMacro::CmdIfEqual, varCtrlB), "Use Ctrl B"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdIfEqual, b), "B"sv, 0, 255, 0},
+     {FIELD_HEAD(SoundMacro::CmdIfEqual, notEq), "Not"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdIfEqual, macroStep), "Macro Step"sv, 0, 65535, 0}}}};
 bool SoundMacro::CmdIfEqual::Do(SoundMacroState& st, Voice& vox) const {
   int32_t useA, useB;
 
@@ -1715,14 +1584,12 @@ const SoundMacro::CmdIntrospection SoundMacro::CmdIfLess::Introspective = {
     CmdType::Structure,
     "If Less"sv,
     "Branches to specified step if A < B."sv,
-    {
-        {FIELD_HEAD(SoundMacro::CmdIfLess, varCtrlA), "Use Ctrl A"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdIfLess, a), "A"sv, 0, 255, 0},
-        {FIELD_HEAD(SoundMacro::CmdIfLess, varCtrlB), "Use Ctrl B"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdIfLess, b), "B"sv, 0, 255, 0},
-        {FIELD_HEAD(SoundMacro::CmdIfLess, notLt), "Not"sv, 0, 1, 0},
-        {FIELD_HEAD(SoundMacro::CmdIfLess, macroStep), "Macro Step"sv, 0, 65535, 0},
-    }};
+    {{{FIELD_HEAD(SoundMacro::CmdIfLess, varCtrlA), "Use Ctrl A"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdIfLess, a), "A"sv, 0, 255, 0},
+     {FIELD_HEAD(SoundMacro::CmdIfLess, varCtrlB), "Use Ctrl B"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdIfLess, b), "B"sv, 0, 255, 0},
+     {FIELD_HEAD(SoundMacro::CmdIfLess, notLt), "Not"sv, 0, 1, 0},
+     {FIELD_HEAD(SoundMacro::CmdIfLess, macroStep), "Macro Step"sv, 0, 65535, 0}}}};
 bool SoundMacro::CmdIfLess::Do(SoundMacroState& st, Voice& vox) const {
   int32_t useA, useB;