3431

Improvements to syntax highlighting, particularly for Mu code in C++
files.

12 files changed, 166 insertions, 170 deletions

diff --git a/html/edit/001-editor.mu.html b/html/edit/001-editor.mu.html
index 38865350..35adc47e 100644
--- a/html/edit/001-editor.mu.html
+++ b/html/edit/001-editor.mu.html
@@ -13,15 +13,15 @@
 pre { white-space: pre-wrap; font-family: monospace; color: #eeeeee; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color: #080808; }
 * { font-size: 12pt; font-size: 1em; }
-.muRecipe { color: #ff8700; }
 .muData { color: #ffff00; }
-.muScenario { color: #00af00; }
-.Delimiter { color: #800080; }
+.muControl { color: #c0a020; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Constant { color: #00a0a0; }
 .SalientComment { color: #00ffff; }
-.muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
+.muScenario { color: #00af00; }
 -->
 </style>
 
diff --git a/html/edit/002-typing.mu.html b/html/edit/002-typing.mu.html
index 3c35ec6f..e8d68e3f 100644
--- a/html/edit/002-typing.mu.html
+++ b/html/edit/002-typing.mu.html
@@ -13,15 +13,15 @@
 pre { white-space: pre-wrap; font-family: monospace; color: #eeeeee; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color: #080808; }
 * { font-size: 12pt; font-size: 1em; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
-.muScenario { color: #00af00; }
 .Delimiter { color: #800080; }
+.muControl { color: #c0a020; }
+.Special { color: #c00000; }
+.muData { color: #ffff00; }
 .Comment { color: #9090ff; }
 .Constant { color: #00a0a0; }
 .SalientComment { color: #00ffff; }
-.muData { color: #ffff00; }
-.muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
+.muScenario { color: #00af00; }
 -->
 </style>
 
@@ -481,7 +481,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   editor-render screen, e
 <span class="Constant">  $clear-trace</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[abc]</span>
+    type <span class="Constant">[abc]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -503,9 +503,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
 <span class="Constant">  $clear-trace</span>
   <span class="Comment"># type two letters at different places</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
     left-click <span class="Constant">1</span>, <span class="Constant">2</span>
-    <span class="muData">type</span> <span class="Constant">[d]</span>
+    type <span class="Constant">[d]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -527,7 +527,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
 <span class="Constant">  $clear-trace</span>
   assume-console [
     left-click <span class="Constant">1</span>, <span class="Constant">5</span>  <span class="Comment"># right of last line</span>
-    <span class="muData">type</span> <span class="Constant">[d]</span>
+    type <span class="Constant">[d]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -551,7 +551,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
 <span class="Constant">  $clear-trace</span>
   assume-console [
     left-click <span class="Constant">1</span>, <span class="Constant">5</span>  <span class="Comment"># right of non-last line</span>
-    <span class="muData">type</span> <span class="Constant">[e]</span>
+    type <span class="Constant">[e]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -574,7 +574,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
 <span class="Constant">  $clear-trace</span>
   assume-console [
     left-click <span class="Constant">3</span>, <span class="Constant">5</span>  <span class="Comment"># below all text</span>
-    <span class="muData">type</span> <span class="Constant">[d]</span>
+    type <span class="Constant">[d]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -598,7 +598,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
 <span class="Constant">  $clear-trace</span>
   assume-console [
     left-click <span class="Constant">3</span>, <span class="Constant">5</span>  <span class="Comment"># below all text</span>
-    <span class="muData">type</span> <span class="Constant">[e]</span>
+    type <span class="Constant">[e]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -623,7 +623,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
 <span class="Constant">  $clear-trace</span>
   assume-console [
     left-click <span class="Constant">3</span>, <span class="Constant">5</span>  <span class="Comment"># below all text</span>
-    <span class="muData">type</span> <span class="Constant">[ef]</span>
+    type <span class="Constant">[ef]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -644,7 +644,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   e:&amp;:editor<span class="Special"> &lt;- </span>new-editor <span class="Constant">[ab]</span>, screen:&amp;:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span>
   editor-render screen, e
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[01]</span>
+    type <span class="Constant">[01]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -666,7 +666,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   editor-render screen, e
   <span class="Comment"># type a letter</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[e]</span>
+    type <span class="Constant">[e]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -681,7 +681,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># type a second letter</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[f]</span>
+    type <span class="Constant">[f]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -707,7 +707,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   <span class="Comment"># type more text at the start</span>
   assume-console [
     left-click <span class="Constant">3</span>, <span class="Constant">0</span>
-    <span class="muData">type</span> <span class="Constant">[abc]</span>
+    type <span class="Constant">[abc]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -786,7 +786,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   e:&amp;:editor<span class="Special"> &lt;- </span>new-editor <span class="Constant">[abcde]</span>, screen:&amp;:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span>
   assume-console [
     left-click <span class="Constant">1</span>, <span class="Constant">3</span>  <span class="Comment"># right before the wrap icon</span>
-    <span class="muData">type</span> <span class="Constant">[f]</span>
+    type <span class="Constant">[f]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -821,7 +821,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   assume-console [
     left-click <span class="Constant">1</span>, <span class="Constant">4</span>  <span class="Comment"># at end of first line</span>
-    <span class="muData">type</span> <span class="Constant">[de]</span>  <span class="Comment"># trigger wrap</span>
+    type <span class="Constant">[de]</span>  <span class="Comment"># trigger wrap</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -841,7 +841,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   e:&amp;:editor<span class="Special"> &lt;- </span>new-editor <span class="Constant">[abcde]</span>, screen:&amp;:screen, <span class="Constant">2/left</span>, <span class="Constant">7/right</span>
   assume-console [
     left-click <span class="Constant">1</span>, <span class="Constant">5</span>  <span class="Comment"># line is full; no wrap icon yet</span>
-    <span class="muData">type</span> <span class="Constant">[01]</span>
+    type <span class="Constant">[01]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -876,7 +876,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span>
   e:&amp;:editor<span class="Special"> &lt;- </span>new-editor <span class="Constant">[abc]</span>, screen:&amp;:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[0</span>
+    type <span class="Constant">[0</span>
 <span class="Constant">1]</span>
   ]
   run [
@@ -982,7 +982,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span>
   e:&amp;:editor<span class="Special"> &lt;- </span>new-editor <span class="Constant">[abc]</span>, screen:&amp;:screen, <span class="Constant">1/left</span>, <span class="Constant">10/right</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[0</span>
+    type <span class="Constant">[0</span>
 <span class="Constant">1]</span>
   ]
   run [
@@ -1034,7 +1034,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   <span class="Comment"># position cursor after 'cd' and hit 'newline'</span>
   assume-console [
     left-click <span class="Constant">2</span>, <span class="Constant">8</span>
-    <span class="muData">type</span> [
+    type [
 ]
   ]
   run [
diff --git a/html/edit/003-shortcuts.mu.html b/html/edit/003-shortcuts.mu.html
index e3085a78..f909a4c7 100644
--- a/html/edit/003-shortcuts.mu.html
+++ b/html/edit/003-shortcuts.mu.html
@@ -13,15 +13,14 @@
 pre { white-space: pre-wrap; font-family: monospace; color: #eeeeee; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color: #080808; }
 * { font-size: 12pt; font-size: 1em; }
-.muScenario { color: #00af00; }
-.Special { color: #c00000; }
 .Delimiter { color: #800080; }
-.muRecipe { color: #ff8700; }
+.muControl { color: #c0a020; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Constant { color: #00a0a0; }
 .SalientComment { color: #00ffff; }
-.muData { color: #ffff00; }
-.muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
+.muScenario { color: #00af00; }
 -->
 </style>
 
@@ -437,7 +436,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
 <span class="Constant">  $clear-trace</span>
   assume-console [
     press right-arrow
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -547,7 +546,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   check-trace-count-for-label <span class="Constant">0</span>, <span class="Constant">[print-character]</span>
   <span class="Comment"># type something and ensure it goes where it should</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -574,7 +573,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
     press right-arrow
     press right-arrow
     press right-arrow  <span class="Comment"># next line</span>
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -695,7 +694,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   assume-console [
     left-click <span class="Constant">1</span>, <span class="Constant">3</span>
     press right-arrow
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -724,7 +723,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   assume-console [
     left-click <span class="Constant">1</span>, <span class="Constant">2</span>
     press left-arrow
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -798,7 +797,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   assume-console [
     left-click <span class="Constant">3</span>, <span class="Constant">0</span>
     press left-arrow
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -826,7 +825,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   assume-console [
     left-click <span class="Constant">1</span>, <span class="Constant">0</span>
     press left-arrow
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -856,7 +855,7 @@ d]
   assume-console [
     left-click <span class="Constant">3</span>, <span class="Constant">0</span>
     press left-arrow
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -995,7 +994,7 @@ d]
   ]
   check-trace-count-for-label <span class="Constant">0</span>, <span class="Constant">[print-character]</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -1112,7 +1111,7 @@ d]
   ]
   check-trace-count-for-label <span class="Constant">0</span>, <span class="Constant">[print-character]</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -1149,7 +1148,7 @@ d]
   ]
   check-trace-count-for-label <span class="Constant">0</span>, <span class="Constant">[print-character]</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -1189,7 +1188,7 @@ d]
   ]
   check-trace-count-for-label <span class="Constant">0</span>, <span class="Constant">[print-character]</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -1229,7 +1228,7 @@ d]
   ]
   check-trace-count-for-label <span class="Constant">0</span>, <span class="Constant">[print-character]</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -1334,7 +1333,7 @@ d]
   ]
   check-trace-count-for-label <span class="Constant">0</span>, <span class="Constant">[print-character]</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -1531,7 +1530,7 @@ d]
   check-trace-count-for-label <span class="Constant">0</span>, <span class="Constant">[print-character]</span>
   <span class="Comment"># editor inserts future characters at cursor</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[z]</span>
+    type <span class="Constant">[z]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -2159,7 +2158,7 @@ d]
   <span class="Comment"># position cursor at end, type a character</span>
   assume-console [
     left-click <span class="Constant">3</span>, <span class="Constant">4</span>
-    <span class="muData">type</span> <span class="Constant">[g]</span>
+    type <span class="Constant">[g]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -2189,7 +2188,7 @@ d]
   e:&amp;:editor<span class="Special"> &lt;- </span>new-editor s, screen:&amp;:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span>
   assume-console [
     left-click <span class="Constant">3</span>, <span class="Constant">4</span>
-    <span class="muData">type</span> [
+    type [
 ]
   ]
   run [
@@ -2299,7 +2298,7 @@ d]
     <span class="Constant">4</span><span class="Special"> &lt;- </span><span class="Constant">2</span>
   ]
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -2328,7 +2327,7 @@ d]
   ]
   check-trace-count-for-label <span class="Constant">0</span>, <span class="Constant">[print-character]</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[1]</span>
+    type <span class="Constant">[1]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
diff --git a/html/edit/004-programming-environment.mu.html b/html/edit/004-programming-environment.mu.html
index 5b97c018..6e6ba954 100644
--- a/html/edit/004-programming-environment.mu.html
+++ b/html/edit/004-programming-environment.mu.html
@@ -13,15 +13,15 @@
 pre { white-space: pre-wrap; font-family: monospace; color: #eeeeee; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color: #080808; }
 * { font-size: 12pt; font-size: 1em; }
-.muRecipe { color: #ff8700; }
+.muData { color: #ffff00; }
+.muControl { color: #c0a020; }
 .Special { color: #c00000; }
-.muScenario { color: #00af00; }
 .Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Constant { color: #00a0a0; }
 .SalientComment { color: #00ffff; }
-.muData { color: #ffff00; }
-.muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
+.muScenario { color: #00af00; }
 -->
 </style>
 
@@ -118,7 +118,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
       <span class="muControl">break-unless</span> is-touch?
       <span class="Comment"># ignore all but 'left-click' events for now</span>
       <span class="Comment"># todo: test this</span>
-      touch-type:num<span class="Special"> &lt;- </span>get t, <span class="muData">type</span>:offset
+      touch-type:num<span class="Special"> &lt;- </span>get t, <span class="Constant">type:offset</span>
       is-left-click?:bool<span class="Special"> &lt;- </span>equal touch-type, <span class="Constant">65513/mouse-left</span>
       <span class="muControl">loop-unless</span> is-left-click?, <span class="Constant">+next-event:label</span>
       click-row:num<span class="Special"> &lt;- </span>get t, <span class="Constant">row:offset</span>
@@ -362,9 +362,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   <span class="Comment"># type one letter in each of them</span>
   assume-console [
     left-click <span class="Constant">1</span>, <span class="Constant">1</span>
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
     left-click <span class="Constant">1</span>, <span class="Constant">17</span>
-    <span class="muData">type</span> <span class="Constant">[1]</span>
+    type <span class="Constant">[1]</span>
   ]
   run [
     event-loop screen:&amp;:screen, console:&amp;:console, env
@@ -436,7 +436,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># now try typing a letter</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[z]</span>
+    type <span class="Constant">[z]</span>
   ]
   run [
     event-loop screen:&amp;:screen, console:&amp;:console, env
@@ -487,7 +487,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
 ]
 
-<span class="muRecipe">def</span> render-all screen:&amp;:screen, env:&amp;:environment, <span class="Delimiter">{</span>render-editor: (<span class="muRecipe">recipe</span> (address screen) (address editor)<span class="muRecipe"> -&gt; </span>number number (address screen) (address editor))<span class="Delimiter">}</span><span class="muRecipe"> -&gt; </span>screen:&amp;:screen, env:&amp;:environment [
+<span class="muRecipe">def</span> render-all screen:&amp;:screen, env:&amp;:environment, <span class="Delimiter">{</span>render-editor: (recipe (address screen) (address editor)<span class="muRecipe"> -&gt; </span>number number (address screen) (address editor))<span class="Delimiter">}</span><span class="muRecipe"> -&gt; </span>screen:&amp;:screen, env:&amp;:environment [
   <span class="Constant">local-scope</span>
   <span class="Constant">load-ingredients</span>
   trace <span class="Constant">10</span>, <span class="Constant">[app]</span>, <span class="Constant">[render all]</span>
@@ -519,7 +519,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   show-screen screen
 ]
 
-<span class="muRecipe">def</span> render-recipes screen:&amp;:screen, env:&amp;:environment, <span class="Delimiter">{</span>render-editor: (<span class="muRecipe">recipe</span> (address screen) (address editor)<span class="muRecipe"> -&gt; </span>number number (address screen) (address editor))<span class="Delimiter">}</span><span class="muRecipe"> -&gt; </span>screen:&amp;:screen, env:&amp;:environment [
+<span class="muRecipe">def</span> render-recipes screen:&amp;:screen, env:&amp;:environment, <span class="Delimiter">{</span>render-editor: (recipe (address screen) (address editor)<span class="muRecipe"> -&gt; </span>number number (address screen) (address editor))<span class="Delimiter">}</span><span class="muRecipe"> -&gt; </span>screen:&amp;:screen, env:&amp;:environment [
   <span class="Constant">local-scope</span>
   <span class="Constant">load-ingredients</span>
   trace <span class="Constant">11</span>, <span class="Constant">[app]</span>, <span class="Constant">[render recipes]</span>
@@ -538,7 +538,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
 ]
 
 <span class="Comment"># replaced in a later layer</span>
-<span class="muRecipe">def</span> render-sandbox-side screen:&amp;:screen, env:&amp;:environment, <span class="Delimiter">{</span>render-editor: (<span class="muRecipe">recipe</span> (address screen) (address editor)<span class="muRecipe"> -&gt; </span>number number (address screen) (address editor))<span class="Delimiter">}</span><span class="muRecipe"> -&gt; </span>screen:&amp;:screen, env:&amp;:environment [
+<span class="muRecipe">def</span> render-sandbox-side screen:&amp;:screen, env:&amp;:environment, <span class="Delimiter">{</span>render-editor: (recipe (address screen) (address editor)<span class="muRecipe"> -&gt; </span>number number (address screen) (address editor))<span class="Delimiter">}</span><span class="muRecipe"> -&gt; </span>screen:&amp;:screen, env:&amp;:environment [
   <span class="Constant">local-scope</span>
   <span class="Constant">load-ingredients</span>
   current-sandbox:&amp;:editor<span class="Special"> &lt;- </span>get *env, <span class="Constant">current-sandbox:offset</span>
diff --git a/html/edit/005-sandbox.mu.html b/html/edit/005-sandbox.mu.html
index 5afc8a83..8f328e91 100644
--- a/html/edit/005-sandbox.mu.html
+++ b/html/edit/005-sandbox.mu.html
@@ -13,15 +13,15 @@
 pre { white-space: pre-wrap; font-family: monospace; color: #eeeeee; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color: #080808; }
 * { font-size: 12pt; font-size: 1em; }
-.muRecipe { color: #ff8700; }
+.muData { color: #ffff00; }
+.muControl { color: #c0a020; }
 .Special { color: #c00000; }
-.muScenario { color: #00af00; }
 .Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Constant { color: #00a0a0; }
 .SalientComment { color: #00ffff; }
-.muData { color: #ffff00; }
-.muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
+.muScenario { color: #00af00; }
 -->
 </style>
 
@@ -134,7 +134,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   <span class="Comment"># run another command</span>
   assume-console [
     left-click <span class="Constant">1</span>, <span class="Constant">80</span>
-    <span class="muData">type</span> <span class="Constant">[add 2, 2]</span>
+    type <span class="Constant">[add 2, 2]</span>
     press F4
   ]
   run [
@@ -268,7 +268,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   <span class="Delimiter">}</span>
 ]
 
-<span class="muRecipe">def!</span> render-sandbox-side screen:&amp;:screen, env:&amp;:environment, <span class="Delimiter">{</span>render-editor: (<span class="muRecipe">recipe</span> (address screen) (address editor)<span class="muRecipe"> -&gt; </span>number number (address screen) (address editor))<span class="Delimiter">}</span><span class="muRecipe"> -&gt; </span>screen:&amp;:screen, env:&amp;:environment [
+<span class="muRecipe">def!</span> render-sandbox-side screen:&amp;:screen, env:&amp;:environment, <span class="Delimiter">{</span>render-editor: (recipe (address screen) (address editor)<span class="muRecipe"> -&gt; </span>number number (address screen) (address editor))<span class="Delimiter">}</span><span class="muRecipe"> -&gt; </span>screen:&amp;:screen, env:&amp;:environment [
   <span class="Constant">local-scope</span>
   <span class="Constant">load-ingredients</span>
   trace <span class="Constant">11</span>, <span class="Constant">[app]</span>, <span class="Constant">[render sandbox side]</span>
@@ -582,7 +582,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   assume-console [
     left-click <span class="Constant">4</span>, <span class="Constant">28</span>  <span class="Comment"># one past the value of the second arg</span>
     press backspace
-    <span class="muData">type</span> <span class="Constant">[3]</span>
+    type <span class="Constant">[3]</span>
     press F4
   ]
   run [
@@ -659,7 +659,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   e:&amp;:editor<span class="Special"> &lt;- </span>new-editor <span class="Constant">[abc]</span>, screen:&amp;:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span>
   assume-console [
     left-click <span class="Constant">1</span>, <span class="Constant">2</span>
-    <span class="muData">type</span> <span class="Constant">[def]</span>
+    type <span class="Constant">[def]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -1002,9 +1002,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   <span class="Comment"># create 2 sandboxes</span>
   assume-console [
     press ctrl-n
-    <span class="muData">type</span> <span class="Constant">[add 2, 2]</span>
+    type <span class="Constant">[add 2, 2]</span>
     press F4
-    <span class="muData">type</span> <span class="Constant">[add 1, 1]</span>
+    type <span class="Constant">[add 1, 1]</span>
     press F4
   ]
   event-loop screen:&amp;:screen, console:&amp;:console, env
@@ -1153,7 +1153,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   <span class="Comment"># create a sandbox</span>
   assume-console [
     press ctrl-n
-    <span class="muData">type</span> <span class="Constant">[add 1, 1]</span>
+    type <span class="Constant">[add 1, 1]</span>
     press F4
   ]
   event-loop screen:&amp;:screen, console:&amp;:console, env
diff --git a/html/edit/006-sandbox-copy.mu.html b/html/edit/006-sandbox-copy.mu.html
index 4ed88981..c7f0d656 100644
--- a/html/edit/006-sandbox-copy.mu.html
+++ b/html/edit/006-sandbox-copy.mu.html
@@ -13,15 +13,14 @@
 pre { white-space: pre-wrap; font-family: monospace; color: #eeeeee; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color: #080808; }
 * { font-size: 12pt; font-size: 1em; }
-.muScenario { color: #00af00; }
-.Special { color: #c00000; }
 .Delimiter { color: #800080; }
-.muRecipe { color: #ff8700; }
+.muControl { color: #c0a020; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Constant { color: #00a0a0; }
 .SalientComment { color: #00ffff; }
-.muData { color: #ffff00; }
-.muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
+.muScenario { color: #00af00; }
 -->
 </style>
 
@@ -81,7 +80,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be in the right place</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
   ]
   run [
     event-loop screen:&amp;:screen, console:&amp;:console, env
@@ -143,7 +142,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be in the right place</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
   ]
   run [
     event-loop screen:&amp;:screen, console:&amp;:console, env
@@ -283,7 +282,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   <span class="Comment"># type something into the sandbox editor, then click on the 'copy' button</span>
   assume-console [
     left-click <span class="Constant">2</span>, <span class="Constant">70</span>  <span class="Comment"># put cursor in sandbox editor</span>
-    <span class="muData">type</span> <span class="Constant">[0]</span>  <span class="Comment"># type something</span>
+    type <span class="Constant">[0]</span>  <span class="Comment"># type something</span>
     left-click <span class="Constant">3</span>, <span class="Constant">70</span>  <span class="Comment"># click 'copy' button</span>
   ]
   run [
@@ -302,7 +301,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be in the right place</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[1]</span>
+    type <span class="Constant">[1]</span>
   ]
   run [
     event-loop screen:&amp;:screen, console:&amp;:console, env
diff --git a/html/edit/007-sandbox-delete.mu.html b/html/edit/007-sandbox-delete.mu.html
index 931df954..285e063e 100644
--- a/html/edit/007-sandbox-delete.mu.html
+++ b/html/edit/007-sandbox-delete.mu.html
@@ -13,15 +13,14 @@
 pre { white-space: pre-wrap; font-family: monospace; color: #eeeeee; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color: #080808; }
 * { font-size: 12pt; font-size: 1em; }
-.muScenario { color: #00af00; }
-.Special { color: #c00000; }
 .Delimiter { color: #800080; }
-.muRecipe { color: #ff8700; }
+.muControl { color: #c0a020; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Constant { color: #00a0a0; }
 .SalientComment { color: #00ffff; }
-.muData { color: #ffff00; }
-.muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
+.muScenario { color: #00af00; }
 -->
 </style>
 
@@ -43,9 +42,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   <span class="Comment"># run a few commands</span>
   assume-console [
     left-click <span class="Constant">1</span>, <span class="Constant">80</span>
-    <span class="muData">type</span> <span class="Constant">[divide-with-remainder 11, 3]</span>
+    type <span class="Constant">[divide-with-remainder 11, 3]</span>
     press F4
-    <span class="muData">type</span> <span class="Constant">[add 2, 2]</span>
+    type <span class="Constant">[add 2, 2]</span>
     press F4
   ]
   event-loop screen:&amp;:screen, console:&amp;:console, env
@@ -191,9 +190,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   <span class="Comment"># create 2 sandboxes and scroll to second</span>
   assume-console [
     press ctrl-n
-    <span class="muData">type</span> <span class="Constant">[add 2, 2]</span>
+    type <span class="Constant">[add 2, 2]</span>
     press F4
-    <span class="muData">type</span> <span class="Constant">[add 1, 1]</span>
+    type <span class="Constant">[add 1, 1]</span>
     press F4
     press page-down
   ]
@@ -236,9 +235,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   <span class="Comment"># create 2 sandboxes and scroll to second</span>
   assume-console [
     press ctrl-n
-    <span class="muData">type</span> <span class="Constant">[add 2, 2]</span>
+    type <span class="Constant">[add 2, 2]</span>
     press F4
-    <span class="muData">type</span> <span class="Constant">[add 1, 1]</span>
+    type <span class="Constant">[add 1, 1]</span>
     press F4
     press page-down
   ]
@@ -281,9 +280,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   <span class="Comment"># create 2 sandboxes and scroll to second</span>
   assume-console [
     press ctrl-n
-    <span class="muData">type</span> <span class="Constant">[add 2, 2]</span>
+    type <span class="Constant">[add 2, 2]</span>
     press F4
-    <span class="muData">type</span> <span class="Constant">[add 1, 1]</span>
+    type <span class="Constant">[add 1, 1]</span>
     press F4
     press page-down
     press page-down
@@ -328,9 +327,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   <span class="Comment"># create 2 sandboxes</span>
   assume-console [
     press ctrl-n
-    <span class="muData">type</span> <span class="Constant">[add 2, 2]</span>
+    type <span class="Constant">[add 2, 2]</span>
     press F4
-    <span class="muData">type</span> <span class="Constant">[add 1, 1]</span>
+    type <span class="Constant">[add 1, 1]</span>
     press F4
   ]
   event-loop screen:&amp;:screen, console:&amp;:console, env
diff --git a/html/edit/008-sandbox-edit.mu.html b/html/edit/008-sandbox-edit.mu.html
index 9be5a9a1..b3f3751a 100644
--- a/html/edit/008-sandbox-edit.mu.html
+++ b/html/edit/008-sandbox-edit.mu.html
@@ -13,15 +13,14 @@
 pre { white-space: pre-wrap; font-family: monospace; color: #eeeeee; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color: #080808; }
 * { font-size: 12pt; font-size: 1em; }
-.muScenario { color: #00af00; }
-.Special { color: #c00000; }
 .Delimiter { color: #800080; }
-.muRecipe { color: #ff8700; }
+.muControl { color: #c0a020; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Constant { color: #00a0a0; }
 .SalientComment { color: #00ffff; }
-.muData { color: #ffff00; }
-.muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
+.muScenario { color: #00af00; }
 -->
 </style>
 
@@ -79,7 +78,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be in the right place</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
   ]
   run [
     event-loop screen:&amp;:screen, console:&amp;:console, env
@@ -139,7 +138,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be in the right place</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
   ]
   run [
     event-loop screen:&amp;:screen, console:&amp;:console, env
@@ -261,9 +260,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   <span class="Comment"># create 2 sandboxes and scroll to second</span>
   assume-console [
     press ctrl-n
-    <span class="muData">type</span> <span class="Constant">[add 2, 2]</span>
+    type <span class="Constant">[add 2, 2]</span>
     press F4
-    <span class="muData">type</span> <span class="Constant">[add 1, 1]</span>
+    type <span class="Constant">[add 1, 1]</span>
     press F4
     press page-down
     press page-down
@@ -308,9 +307,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   <span class="Comment"># create 2 sandboxes</span>
   assume-console [
     press ctrl-n
-    <span class="muData">type</span> <span class="Constant">[add 2, 2]</span>
+    type <span class="Constant">[add 2, 2]</span>
     press F4
-    <span class="muData">type</span> <span class="Constant">[add 1, 1]</span>
+    type <span class="Constant">[add 1, 1]</span>
     press F4
   ]
   event-loop screen:&amp;:screen, console:&amp;:console, env
diff --git a/html/edit/009-sandbox-test.mu.html b/html/edit/009-sandbox-test.mu.html
index b9095f7e..a2124cd4 100644
--- a/html/edit/009-sandbox-test.mu.html
+++ b/html/edit/009-sandbox-test.mu.html
@@ -13,15 +13,15 @@
 pre { white-space: pre-wrap; font-family: monospace; color: #eeeeee; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color: #080808; }
 * { font-size: 12pt; font-size: 1em; }
-.muScenario { color: #00af00; }
+.muData { color: #ffff00; }
+.muControl { color: #c0a020; }
 .Special { color: #c00000; }
 .Delimiter { color: #800080; }
-.muRecipe { color: #ff8700; }
 .Comment { color: #9090ff; }
 .Constant { color: #00a0a0; }
 .SalientComment { color: #00ffff; }
-.muData { color: #ffff00; }
-.muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
+.muScenario { color: #00af00; }
 -->
 </style>
 
@@ -100,7 +100,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   assume-console [
     left-click <span class="Constant">3</span>, <span class="Constant">11</span>  <span class="Comment"># cursor to end of line</span>
     press backspace
-    <span class="muData">type</span> <span class="Constant">[3]</span>
+    type <span class="Constant">[3]</span>
     press F4
   ]
   run [
diff --git a/html/edit/010-sandbox-trace.mu.html b/html/edit/010-sandbox-trace.mu.html
index 0bff823b..599f69b3 100644
--- a/html/edit/010-sandbox-trace.mu.html
+++ b/html/edit/010-sandbox-trace.mu.html
@@ -13,15 +13,15 @@
 pre { white-space: pre-wrap; font-family: monospace; color: #eeeeee; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color: #080808; }
 * { font-size: 12pt; font-size: 1em; }
-.muScenario { color: #00af00; }
+.muData { color: #ffff00; }
+.muControl { color: #c0a020; }
 .Special { color: #c00000; }
 .Delimiter { color: #800080; }
-.muRecipe { color: #ff8700; }
 .Comment { color: #9090ff; }
 .Constant { color: #00a0a0; }
 .SalientComment { color: #00ffff; }
-.muData { color: #ffff00; }
-.muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
+.muScenario { color: #00af00; }
 -->
 </style>
 
diff --git a/html/edit/011-errors.mu.html b/html/edit/011-errors.mu.html
index d9228d0e..be2a087f 100644
--- a/html/edit/011-errors.mu.html
+++ b/html/edit/011-errors.mu.html
@@ -13,15 +13,15 @@
 pre { white-space: pre-wrap; font-family: monospace; color: #eeeeee; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color: #080808; }
 * { font-size: 12pt; font-size: 1em; }
-.muRecipe { color: #ff8700; }
 .muData { color: #ffff00; }
-.muScenario { color: #00af00; }
-.Delimiter { color: #800080; }
+.muControl { color: #c0a020; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Constant { color: #00a0a0; }
 .SalientComment { color: #00ffff; }
-.muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
+.muScenario { color: #00af00; }
 -->
 </style>
 
@@ -197,10 +197,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   assume-console [
     left-click <span class="Constant">3</span>, <span class="Constant">80</span>
     <span class="Comment"># create invalid sandbox 1</span>
-    <span class="muData">type</span> <span class="Constant">[get foo, x:offset]</span>
+    type <span class="Constant">[get foo, x:offset]</span>
     press F4
     <span class="Comment"># create invalid sandbox 0</span>
-    <span class="muData">type</span> <span class="Constant">[get foo, x:offset]</span>
+    type <span class="Constant">[get foo, x:offset]</span>
     press F4
   ]
   run [
@@ -220,13 +220,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   assume-console [
     left-click <span class="Constant">3</span>, <span class="Constant">80</span>
     <span class="Comment"># create invalid sandbox 2</span>
-    <span class="muData">type</span> <span class="Constant">[get foo, x:offset]</span>
+    type <span class="Constant">[get foo, x:offset]</span>
     press F4
     <span class="Comment"># create invalid sandbox 1</span>
-    <span class="muData">type</span> <span class="Constant">[get foo, x:offset]</span>
+    type <span class="Constant">[get foo, x:offset]</span>
     press F4
     <span class="Comment"># create valid sandbox 0</span>
-    <span class="muData">type</span> <span class="Constant">[add 2, 2]</span>
+    type <span class="Constant">[add 2, 2]</span>
     press F4
   ]
   run [
@@ -252,7 +252,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   assume-console [
     left-click <span class="Constant">3</span>, <span class="Constant">58</span>
     press ctrl-k
-    <span class="muData">type</span> <span class="Constant">[add 2, 2]</span>  <span class="Comment"># valid code</span>
+    type <span class="Constant">[add 2, 2]</span>  <span class="Comment"># valid code</span>
     press F4  <span class="Comment"># update sandbox</span>
   ]
   run [
diff --git a/html/edit/012-editor-undo.mu.html b/html/edit/012-editor-undo.mu.html
index be0db050..38ab0f2d 100644
--- a/html/edit/012-editor-undo.mu.html
+++ b/html/edit/012-editor-undo.mu.html
@@ -13,15 +13,15 @@
 pre { white-space: pre-wrap; font-family: monospace; color: #eeeeee; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color: #080808; }
 * { font-size: 12pt; font-size: 1em; }
-.muRecipe { color: #ff8700; }
 .muData { color: #ffff00; }
-.muScenario { color: #00af00; }
-.Delimiter { color: #800080; }
+.muControl { color: #c0a020; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Constant { color: #00a0a0; }
 .SalientComment { color: #00ffff; }
-.muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
+.muScenario { color: #00af00; }
 -->
 </style>
 
@@ -140,7 +140,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   e:&amp;:editor<span class="Special"> &lt;- </span>new-editor <span class="Constant">[]</span>, screen:&amp;:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span>
   editor-render screen, e
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
   ]
   editor-event-loop screen:&amp;:screen, console:&amp;:console, e
   <span class="Comment"># undo</span>
@@ -159,7 +159,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be in the right place</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[1]</span>
+    type <span class="Constant">[1]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -203,7 +203,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   insert-from:&amp;:duplex-list:char<span class="Special"> &lt;- </span>next cursor-before
   insert-to:&amp;:duplex-list:char<span class="Special"> &lt;- </span>next insert-from
   op:&amp;:operation<span class="Special"> &lt;- </span>new <span class="Constant">operation:type</span>
-  *op<span class="Special"> &lt;- </span>merge <span class="Constant">0/insert-operation</span>, save-row/<span class="muRecipe">before</span>, save-column/<span class="muRecipe">before</span>, top-before, cursor-row/<span class="muRecipe">after</span>, cursor-column/<span class="muRecipe">after</span>, top-after, insert-from, insert-to, <span class="Constant">1/coalesce</span>
+  *op<span class="Special"> &lt;- </span>merge <span class="Constant">0/insert-operation</span>, save-row/before, save-column/before, top-before, cursor-row/after, cursor-column/after, top-after, insert-from, insert-to, <span class="Constant">1/coalesce</span>
   editor<span class="Special"> &lt;- </span>add-operation editor, op
 <span class="Constant">  +done-adding-insert-operation</span>
 ]
@@ -224,7 +224,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   before-cursor:&amp;:duplex-list:char<span class="Special"> &lt;- </span>get *editor, <span class="Constant">before-cursor:offset</span>
   insert-to:&amp;:duplex-list:char<span class="Special"> &lt;- </span>next before-cursor
   op:&amp;:operation<span class="Special"> &lt;- </span>new <span class="Constant">operation:type</span>
-  *op<span class="Special"> &lt;- </span>merge <span class="Constant">0/insert-operation</span>, cursor-row-before, cursor-column-before, top-before, cursor-row/<span class="muRecipe">after</span>, cursor-column/<span class="muRecipe">after</span>, top-after, insert-from, insert-to, <span class="Constant">0/never-coalesce</span>
+  *op<span class="Special"> &lt;- </span>merge <span class="Constant">0/insert-operation</span>, cursor-row-before, cursor-column-before, top-before, cursor-row/after, cursor-column/after, top-after, insert-from, insert-to, <span class="Constant">0/never-coalesce</span>
   editor<span class="Special"> &lt;- </span>add-operation editor, op
 ]
 
@@ -270,7 +270,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   e:&amp;:editor<span class="Special"> &lt;- </span>new-editor <span class="Constant">[]</span>, screen:&amp;:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span>
   editor-render screen, e
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[012]</span>
+    type <span class="Constant">[012]</span>
   ]
   editor-event-loop screen:&amp;:screen, console:&amp;:console, e
   <span class="Comment"># undo</span>
@@ -297,7 +297,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   editor-render screen, e
   <span class="Comment"># type some characters</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[012]</span>
+    type <span class="Constant">[012]</span>
   ]
   editor-event-loop screen:&amp;:screen, console:&amp;:console, e
   screen-should-contain [
@@ -322,7 +322,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be in the right place</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[3]</span>
+    type <span class="Constant">[3]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -383,7 +383,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be at end of line</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[1]</span>
+    type <span class="Constant">[1]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -405,7 +405,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   e:&amp;:editor<span class="Special"> &lt;- </span>new-editor <span class="Constant">[a]</span>, screen:&amp;:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span>
   editor-render screen, e
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[012]</span>
+    type <span class="Constant">[012]</span>
     press ctrl-z
   ]
   editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -431,7 +431,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be in the right place</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[3]</span>
+    type <span class="Constant">[3]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -469,7 +469,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   e:&amp;:editor<span class="Special"> &lt;- </span>new-editor <span class="Constant">[]</span>, screen:&amp;:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span>
   editor-render screen, e
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[012]</span>
+    type <span class="Constant">[012]</span>
     press ctrl-z
   ]
   editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -495,7 +495,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be in the right place</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[3]</span>
+    type <span class="Constant">[3]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -518,13 +518,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   e:&amp;:editor<span class="Special"> &lt;- </span>new-editor contents, screen:&amp;:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span>
   editor-render screen, e
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[1]</span>
+    type <span class="Constant">[1]</span>
     press ctrl-z
   ]
   editor-event-loop screen:&amp;:screen, console:&amp;:console, e
   <span class="Comment"># do some more work</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[0]</span>
+    type <span class="Constant">[0]</span>
   ]
   editor-event-loop screen:&amp;:screen, console:&amp;:console, e
   screen-should-contain [
@@ -560,12 +560,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   <span class="Comment"># insert some text and tabs, hit enter, some more text and tabs</span>
   assume-console [
     press tab
-    <span class="muData">type</span> <span class="Constant">[ab]</span>
+    type <span class="Constant">[ab]</span>
     press tab
-    <span class="muData">type</span> <span class="Constant">[cd]</span>
+    type <span class="Constant">[cd]</span>
     press enter
     press tab
-    <span class="muData">type</span> <span class="Constant">[efg]</span>
+    type <span class="Constant">[efg]</span>
   ]
   editor-event-loop screen:&amp;:screen, console:&amp;:console, e
   screen-should-contain [
@@ -738,7 +738,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be in the right place</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[1]</span>
+    type <span class="Constant">[1]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -780,7 +780,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
     <span class="muControl">break</span> <span class="Constant">+done-adding-move-operation:label</span>
   <span class="Delimiter">}</span>
   op:&amp;:operation<span class="Special"> &lt;- </span>new <span class="Constant">operation:type</span>
-  *op<span class="Special"> &lt;- </span>merge <span class="Constant">1/move-operation</span>, cursor-row-before, cursor-column-before, top-before, cursor-row/<span class="muRecipe">after</span>, cursor-column/<span class="muRecipe">after</span>, top-after, undo-coalesce-tag
+  *op<span class="Special"> &lt;- </span>merge <span class="Constant">1/move-operation</span>, cursor-row-before, cursor-column-before, top-before, cursor-row/after, cursor-column/after, top-after, undo-coalesce-tag
   editor<span class="Special"> &lt;- </span>add-operation editor, op
 <span class="Constant">  +done-adding-move-operation</span>
 ]
@@ -850,7 +850,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be in the right place</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[1]</span>
+    type <span class="Constant">[1]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -894,7 +894,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be in the right place</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[1]</span>
+    type <span class="Constant">[1]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -945,7 +945,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be in the right place</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[1]</span>
+    type <span class="Constant">[1]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -990,7 +990,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be in the right place</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[1]</span>
+    type <span class="Constant">[1]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -1173,7 +1173,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be in the right place</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[1]</span>
+    type <span class="Constant">[1]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -1218,7 +1218,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be in the right place</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[1]</span>
+    type <span class="Constant">[1]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -1263,7 +1263,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be in the right place</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[1]</span>
+    type <span class="Constant">[1]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -1308,7 +1308,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be in the right place</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[1]</span>
+    type <span class="Constant">[1]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -1407,7 +1407,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be in the right place</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[1]</span>
+    type <span class="Constant">[1]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -1442,9 +1442,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   e:&amp;:editor<span class="Special"> &lt;- </span>new-editor <span class="Constant">[]</span>, screen:&amp;:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span>
   editor-render screen, e
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[abc]</span>
+    type <span class="Constant">[abc]</span>
     left-click <span class="Constant">1</span>, <span class="Constant">1</span>
-    <span class="muData">type</span> <span class="Constant">[d]</span>
+    type <span class="Constant">[d]</span>
   ]
   editor-event-loop screen:&amp;:screen, console:&amp;:console, e
   <span class="Constant">3</span>:num/<span class="Special">raw &lt;- </span>get *e, <span class="Constant">cursor-row:offset</span>
@@ -1592,7 +1592,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   editor-render screen, e
   <span class="Comment"># insert some text and hit backspace</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[abc]</span>
+    type <span class="Constant">[abc]</span>
     press backspace
     press backspace
   ]
@@ -1683,7 +1683,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
     <span class="Comment"># if not, create a new operation</span>
     op:&amp;:operation<span class="Special"> &lt;- </span>new <span class="Constant">operation:type</span>
     deleted-until:&amp;:duplex-list:char<span class="Special"> &lt;- </span>next before-cursor
-    *op<span class="Special"> &lt;- </span>merge <span class="Constant">2/delete-operation</span>, save-row/<span class="muRecipe">before</span>, save-column/<span class="muRecipe">before</span>, top-before, cursor-row/<span class="muRecipe">after</span>, cursor-column/<span class="muRecipe">after</span>, top-after, backspaced-cell/deleted, before-cursor/delete-from, deleted-until, <span class="Constant">1/coalesce-backspace</span>
+    *op<span class="Special"> &lt;- </span>merge <span class="Constant">2/delete-operation</span>, save-row/before, save-column/before, top-before, cursor-row/after, cursor-column/after, top-after, backspaced-cell/deleted, before-cursor/delete-from, deleted-until, <span class="Constant">1/coalesce-backspace</span>
     editor<span class="Special"> &lt;- </span>add-operation editor, op
 <span class="Constant">    +done-adding-backspace-operation</span>
   <span class="Delimiter">}</span>
@@ -1737,7 +1737,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   editor-render screen, e
   <span class="Comment"># insert some text and hit delete and backspace a few times</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[abcdef]</span>
+    type <span class="Constant">[abcdef]</span>
     left-click <span class="Constant">1</span>, <span class="Constant">2</span>
     press delete
     press backspace
@@ -1910,7 +1910,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
     <span class="Comment"># if not, create a new operation</span>
     op:&amp;:operation<span class="Special"> &lt;- </span>new <span class="Constant">operation:type</span>
     deleted-until:&amp;:duplex-list:char<span class="Special"> &lt;- </span>next before-cursor
-    *op<span class="Special"> &lt;- </span>merge <span class="Constant">2/delete-operation</span>, save-row/<span class="muRecipe">before</span>, save-column/<span class="muRecipe">before</span>, top-before, cursor-row/<span class="muRecipe">after</span>, cursor-column/<span class="muRecipe">after</span>, top-after, deleted-cell/deleted, before-cursor/delete-from, deleted-until, <span class="Constant">2/coalesce-delete</span>
+    *op<span class="Special"> &lt;- </span>merge <span class="Constant">2/delete-operation</span>, save-row/before, save-column/before, top-before, cursor-row/after, cursor-column/after, top-after, deleted-cell/deleted, before-cursor/delete-from, deleted-until, <span class="Constant">2/coalesce-delete</span>
     editor<span class="Special"> &lt;- </span>add-operation editor, op
 <span class="Constant">    +done-adding-delete-operation</span>
   <span class="Delimiter">}</span>
@@ -1988,7 +1988,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be in the right place</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[1]</span>
+    type <span class="Constant">[1]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -2013,7 +2013,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
     cursor-column:num<span class="Special"> &lt;- </span>get *editor, <span class="Constant">cursor-column:offset</span>
     deleted-until:&amp;:duplex-list:char<span class="Special"> &lt;- </span>next before-cursor
     op:&amp;:operation<span class="Special"> &lt;- </span>new <span class="Constant">operation:type</span>
-    *op<span class="Special"> &lt;- </span>merge <span class="Constant">2/delete-operation</span>, save-row/<span class="muRecipe">before</span>, save-column/<span class="muRecipe">before</span>, top-before, cursor-row/<span class="muRecipe">after</span>, cursor-column/<span class="muRecipe">after</span>, top-after, deleted-cells/deleted, before-cursor/delete-from, deleted-until, <span class="Constant">0/never-coalesce</span>
+    *op<span class="Special"> &lt;- </span>merge <span class="Constant">2/delete-operation</span>, save-row/before, save-column/before, top-before, cursor-row/after, cursor-column/after, top-after, deleted-cells/deleted, before-cursor/delete-from, deleted-until, <span class="Constant">0/never-coalesce</span>
     editor<span class="Special"> &lt;- </span>add-operation editor, op
 <span class="Constant">    +done-adding-delete-operation</span>
   <span class="Delimiter">}</span>
@@ -2091,7 +2091,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   ]
   <span class="Comment"># cursor should be in the right place</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[1]</span>
+    type <span class="Constant">[1]</span>
   ]
   run [
     editor-event-loop screen:&amp;:screen, console:&amp;:console, e
@@ -2117,7 +2117,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
     deleted-until:&amp;:duplex-list:char<span class="Special"> &lt;- </span>next before-cursor
     cursor-row:num<span class="Special"> &lt;- </span>get *editor, <span class="Constant">cursor-row:offset</span>
     cursor-column:num<span class="Special"> &lt;- </span>get *editor, <span class="Constant">cursor-column:offset</span>
-    *op<span class="Special"> &lt;- </span>merge <span class="Constant">2/delete-operation</span>, save-row/<span class="muRecipe">before</span>, save-column/<span class="muRecipe">before</span>, top-before, cursor-row/<span class="muRecipe">after</span>, cursor-column/<span class="muRecipe">after</span>, top-after, deleted-cells/deleted, before-cursor/delete-from, deleted-until, <span class="Constant">0/never-coalesce</span>
+    *op<span class="Special"> &lt;- </span>merge <span class="Constant">2/delete-operation</span>, save-row/before, save-column/before, top-before, cursor-row/after, cursor-column/after, top-after, deleted-cells/deleted, before-cursor/delete-from, deleted-until, <span class="Constant">0/never-coalesce</span>
     editor<span class="Special"> &lt;- </span>add-operation editor, op
 <span class="Constant">    +done-adding-delete-operation</span>
   <span class="Delimiter">}</span>
@@ -2131,7 +2131,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
   editor-render screen, e
   <span class="Comment"># insert some text and hit delete and backspace a few times</span>
   assume-console [
-    <span class="muData">type</span> <span class="Constant">[abc]</span>
+    type <span class="Constant">[abc]</span>
     press ctrl-u
     press ctrl-z
   ]