about summary refs log tree commit diff stats
path: root/html
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2018-05-08 10:25:00 -0700
committerKartik Agaram <vc@akkartik.com>2018-05-08 10:25:00 -0700
commit4bb57a55a0c828dfce12e80651bcc37711335e12 (patch)
treee6b8ebd71157de9d69b87cb47466df6548c2c264 /html
parenta809b975108e638fe99a295ce20327e6749499e7 (diff)
downloadmu-4bb57a55a0c828dfce12e80651bcc37711335e12.tar.gz
4239
Diffstat (limited to 'html')
-rw-r--r--html/000organization.cc.html8
-rw-r--r--html/001help.cc.html26
-rw-r--r--html/002test.cc.html14
-rw-r--r--html/003trace.cc.html20
-rw-r--r--html/003trace.test.cc.html8
-rw-r--r--html/010vm.cc.html14
-rw-r--r--html/011load.cc.html14
-rw-r--r--html/012transform.cc.html8
-rw-r--r--html/013update_operation.cc.html16
-rw-r--r--html/014literal_string.cc.html12
-rw-r--r--html/015literal_noninteger.cc.html12
-rw-r--r--html/016dilated_reagent.cc.html19
-rw-r--r--html/017parse_tree.cc.html14
-rw-r--r--html/018type_abbreviations.cc.html16
-rw-r--r--html/020run.cc.html14
-rw-r--r--html/021check_instruction.cc.html14
-rw-r--r--html/022arithmetic.cc.html14
-rw-r--r--html/023boolean.cc.html12
-rw-r--r--html/024jump.cc.html16
-rw-r--r--html/025compare.cc.html12
-rw-r--r--html/026call.cc.html14
-rw-r--r--html/027call_ingredient.cc.html12
-rw-r--r--html/028call_return.cc.html12
-rw-r--r--html/029tools.cc.html16
-rw-r--r--html/030container.cc.html18
-rw-r--r--html/031merge.cc.html18
-rw-r--r--html/032array.cc.html16
-rw-r--r--html/033exclusive_container.cc.html16
-rw-r--r--html/034address.cc.html14
-rw-r--r--html/035lookup.cc.html16
-rw-r--r--html/036refcount.cc.html8
-rw-r--r--html/037abandon.cc.html12
-rw-r--r--html/038new_text.cc.html16
-rw-r--r--html/040brace.cc.html12
-rw-r--r--html/041jump_target.cc.html14
-rw-r--r--html/042name.cc.html16
-rw-r--r--html/043space.cc.html16
-rw-r--r--html/044space_surround.cc.html12
-rw-r--r--html/045closure_name.cc.html12
-rw-r--r--html/046check_type_by_name.cc.html14
-rw-r--r--html/050scenario.cc.html18
-rw-r--r--html/051scenario_test.mu.html6
-rw-r--r--html/052tangle.cc.html14
-rw-r--r--html/053recipe_header.cc.html14
-rw-r--r--html/054static_dispatch.cc.html14
-rw-r--r--html/055shape_shifting_container.cc.html16
-rw-r--r--html/056shape_shifting_recipe.cc.html25
-rw-r--r--html/057immutable.cc.html14
-rw-r--r--html/058to_text.cc.html8
-rw-r--r--html/059to_text.mu.html6
-rw-r--r--html/060rewrite_literal_string.cc.html10
-rw-r--r--html/061text.mu.html10
-rw-r--r--html/062convert_ingredients_to_text.cc.html12
-rw-r--r--html/063array.mu.html8
-rw-r--r--html/064list.mu.html10
-rw-r--r--html/065duplex_list.mu.html10
-rw-r--r--html/066stream.mu.html8
-rw-r--r--html/067random.cc.html8
-rw-r--r--html/068random.mu.html8
-rw-r--r--html/069hash.cc.html18
-rw-r--r--html/070table.mu.html10
-rw-r--r--html/071deep_copy.cc.html16
-rw-r--r--html/072recipe.cc.html16
-rw-r--r--html/073scheduler.cc.html18
-rw-r--r--html/074wait.cc.html16
-rw-r--r--html/075channel.mu.html12
-rw-r--r--html/076continuation.cc.html407
-rw-r--r--html/080display.cc.html14
-rw-r--r--html/081print.mu.html12
-rw-r--r--html/082scenario_screen.cc.html18
-rw-r--r--html/083scenario_screen_test.mu.html6
-rw-r--r--html/084console.mu.html10
-rw-r--r--html/085scenario_console.cc.html10
-rw-r--r--html/086scenario_console_test.mu.html6
-rw-r--r--html/087file.cc.html10
-rw-r--r--html/088file.mu.html10
-rw-r--r--html/089scenario_filesystem.cc.html12
-rw-r--r--html/090scenario_filesystem_test.mu.html6
-rw-r--r--html/091socket.cc.html12
-rw-r--r--html/092socket.mu.html10
-rw-r--r--html/099hardware_checks.cc.html12
-rw-r--r--html/100trace_browser.cc.html8
-rw-r--r--html/101run_sandboxed.cc.html14
-rw-r--r--html/998check_type_pointers.cc.html6
-rw-r--r--html/999spaces.cc.html8
-rw-r--r--html/channel.mu.html10
-rw-r--r--html/chessboard.mu.html16
-rw-r--r--html/console.mu.html10
-rw-r--r--html/continuation1.mu.html8
-rw-r--r--html/continuation2.mu.html10
-rw-r--r--html/continuation3.mu.html8
-rw-r--r--html/continuation4.mu.html10
-rw-r--r--html/continuation5.mu.html10
-rw-r--r--html/counters.mu.html6
-rw-r--r--html/display.mu.html6
-rw-r--r--html/edit/001-editor.mu.html12
-rw-r--r--html/edit/002-typing.mu.html12
-rw-r--r--html/edit/003-shortcuts.mu.html10
-rw-r--r--html/edit/004-programming-environment.mu.html12
-rw-r--r--html/edit/005-sandbox.mu.html12
-rw-r--r--html/edit/006-sandbox-copy.mu.html10
-rw-r--r--html/edit/007-sandbox-delete.mu.html10
-rw-r--r--html/edit/008-sandbox-edit.mu.html10
-rw-r--r--html/edit/009-sandbox-test.mu.html12
-rw-r--r--html/edit/010-sandbox-trace.mu.html12
-rw-r--r--html/edit/011-errors.mu.html12
-rw-r--r--html/edit/012-editor-undo.mu.html12
-rw-r--r--html/example1.mu.html6
-rw-r--r--html/exception1.mu.html10
-rw-r--r--html/exception2.mu.html10
-rw-r--r--html/factorial.mu.html10
-rw-r--r--html/filesystem.mu.html10
-rw-r--r--html/fork.mu.html10
-rw-r--r--html/http-client.mu.html10
-rw-r--r--html/http-server.mu.html12
-rw-r--r--html/immutable-error.mu.html6
-rw-r--r--html/lambda-to-mu.mu.html14
-rw-r--r--html/mutable.mu.html6
-rw-r--r--html/nqueens.mu.html10
-rw-r--r--html/real-files.mu.html6
-rw-r--r--html/same-fringe.mu.html10
-rw-r--r--html/screen.mu.html6
-rw-r--r--html/static-dispatch.mu.html6
-rw-r--r--html/subx/000organization.cc.html10
-rw-r--r--html/subx/001help.cc.html22
-rw-r--r--html/subx/002test.cc.html14
-rw-r--r--html/subx/003trace.cc.html16
-rw-r--r--html/subx/003trace.test.cc.html8
-rw-r--r--html/subx/010core.cc.html14
-rw-r--r--html/subx/011direct_addressing.cc.html16
-rw-r--r--html/subx/012indirect_addressing.cc.html16
-rw-r--r--html/subx/013immediate_addressing.cc.html14
-rw-r--r--html/subx/014index_addressing.cc.html14
-rw-r--r--html/subx/015jump_relative.cc.html18
-rw-r--r--html/subx/016jump_relative.cc.html18
-rw-r--r--html/subx/017functions.cc.html14
-rw-r--r--html/subx/020elf.cc.html12
-rw-r--r--html/tangle.mu.html8
-rw-r--r--html/x.mu.html6
139 files changed, 1045 insertions, 1030 deletions
diff --git a/html/000organization.cc.html b/html/000organization.cc.html
index 6876f1de..f951a49d 100644
--- a/html/000organization.cc.html
+++ b/html/000organization.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 000organization.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .PreProc { color: #800080; }
 -->
 </style>
diff --git a/html/001help.cc.html b/html/001help.cc.html
index de06a6e8..e8f19b3e 100644
--- a/html/001help.cc.html
+++ b/html/001help.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 001help.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.PreProc { color: #800080; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
 .SalientComment { color: #00ffff; }
-.Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.PreProc { color: #800080; }
+.CommentedCode { color: #6c6c6c; }
 .cSpecial { color: #008000; }
 -->
 </style>
@@ -219,19 +219,19 @@ if ('onhashchange' in window) {
 <span id="L157" class="LineNr">157 </span>  sigaction<span class="Delimiter">(</span><span class="Constant">SIGABRT</span><span class="Delimiter">,</span> &amp;action<span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">);</span>  <span class="Comment">// assert() failure or integer overflow on linux (with -ftrapv)</span>
 <span id="L158" class="LineNr">158 </span>  sigaction<span class="Delimiter">(</span><span class="Constant">SIGILL</span><span class="Delimiter">,</span>  &amp;action<span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">);</span>  <span class="Comment">// integer overflow on OS X (with -ftrapv)</span>
 <span id="L159" class="LineNr">159 </span><span class="Delimiter">}</span>
-<span id="L160" class="LineNr">160 </span><span class="Normal">void</span> <a href='001help.cc.html#L160'>dump_and_exit</a><span class="Delimiter">(</span><span class="Normal">int</span> sig<span class="Delimiter">,</span> <a href='001help.cc.html#L259'>unused</a> siginfo_t* dummy1<span class="Delimiter">,</span> <a href='001help.cc.html#L259'>unused</a> <span class="Normal">void</span>* dummy2<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L160" class="LineNr">160 </span><span class="Normal">void</span> <a href='001help.cc.html#L160'>dump_and_exit</a><span class="Delimiter">(</span><span class="Normal">int</span> sig<span class="Delimiter">,</span> <a href='001help.cc.html#L259'>vestigial</a> siginfo_t* dummy1<span class="Delimiter">,</span> <a href='001help.cc.html#L259'>vestigial</a> <span class="Normal">void</span>* dummy2<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L161" class="LineNr">161 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>sig<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L162" class="LineNr">162 </span>    <span class="Normal">case</span> <span class="Constant">SIGABRT</span>:
-<span id="L163" class="LineNr">163 </span>      <span class="PreProc">#ifndef __APPLE__</span>
+<span id="L163" class="LineNr">163 </span><span class="PreProc">      #ifndef __APPLE__</span>
 <span id="L164" class="LineNr">164 </span>        cerr &lt;&lt; <span class="Constant">&quot;SIGABRT: might be an integer overflow if it wasn't an assert() failure or exception</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L165" class="LineNr">165 </span>        _Exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L166" class="LineNr">166 </span>      <span class="PreProc">#endif</span>
+<span id="L166" class="LineNr">166 </span><span class="PreProc">      #endif</span>
 <span id="L167" class="LineNr">167 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L168" class="LineNr">168 </span>    <span class="Normal">case</span> <span class="Constant">SIGILL</span>:
-<span id="L169" class="LineNr">169 </span>      <span class="PreProc">#ifdef __APPLE__</span>
+<span id="L169" class="LineNr">169 </span><span class="PreProc">      #ifdef __APPLE__</span>
 <span id="L170" class="LineNr">170 </span>        cerr &lt;&lt; <span class="Constant">&quot;SIGILL: most likely caused by integer overflow</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L171" class="LineNr">171 </span>        _Exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L172" class="LineNr">172 </span>      <span class="PreProc">#endif</span>
+<span id="L172" class="LineNr">172 </span><span class="PreProc">      #endif</span>
 <span id="L173" class="LineNr">173 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L174" class="LineNr">174 </span>    <span class="Normal">default</span>:
 <span id="L175" class="LineNr">175 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -318,7 +318,7 @@ if ('onhashchange' in window) {
 <span id="L256" class="LineNr">256 </span><span class="PreProc">#include </span><span class="Constant">&lt;string&gt;</span>
 <span id="L257" class="LineNr">257 </span><span class="Normal">using</span> std::string<span class="Delimiter">;</span>
 <span id="L258" class="LineNr">258 </span>
-<span id="L259" class="LineNr">259 </span><span class="PreProc">#define unused  __attribute__((unused))</span>
+<span id="L259" class="LineNr">259 </span><span class="PreProc">#define vestigial  __attribute__((unused))</span>
 <span id="L260" class="LineNr">260 </span>
 <span id="L261" class="LineNr">261 </span><span class="PreProc">#include </span><span class="Constant">&lt;algorithm&gt;</span>
 <span id="L262" class="LineNr">262 </span><span class="Normal">using</span> std::min<span class="Delimiter">;</span>
diff --git a/html/002test.cc.html b/html/002test.cc.html
index b5d3ab92..99c08114 100644
--- a/html/002test.cc.html
+++ b/html/002test.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 002test.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.CommentedCode { color: #6c6c6c; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .PreProc { color: #800080; }
+.CommentedCode { color: #6c6c6c; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
@@ -74,7 +74,7 @@ if ('onhashchange' in window) {
 <span id="L13" class="LineNr">13 </span><span class="Delimiter">:(before &quot;Globals&quot;)</span>
 <span id="L14" class="LineNr">14 </span><span class="Comment">// move a global ahead into types that we can't generate an extern declaration for</span>
 <span id="L15" class="LineNr">15 </span><span class="Normal">const</span> <a href='002test.cc.html#L12'>test_fn</a> Tests[] = <span class="Delimiter">{</span>
-<span id="L16" class="LineNr">16 </span>  <span class="PreProc">#include </span><span class="Constant">&quot;test_list&quot;</span>  <span class="Comment">// auto-generated; see 'build' script</span>
+<span id="L16" class="LineNr">16 </span><span class="PreProc">  #include </span><span class="Constant">&quot;test_list&quot;</span>  <span class="Comment">// auto-generated; see 'build' script</span>
 <span id="L17" class="LineNr">17 </span><span class="Delimiter">};</span>
 <span id="L18" class="LineNr">18 </span>
 <span id="L19" class="LineNr">19 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
diff --git a/html/003trace.cc.html b/html/003trace.cc.html
index 65251f0a..caf54354 100644
--- a/html/003trace.cc.html
+++ b/html/003trace.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 003trace.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.PreProc { color: #800080; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
+.PreProc { color: #800080; }
 .cSpecial { color: #008000; }
 -->
 </style>
@@ -105,7 +105,7 @@ if ('onhashchange' in window) {
 <span id="L45" class="LineNr"> 45 </span><span class="Comment">//:</span>
 <span id="L46" class="LineNr"> 46 </span><span class="Comment">//: Between layers and domain-driven testing, programming starts to look like a</span>
 <span id="L47" class="LineNr"> 47 </span><span class="Comment">//: fundamentally different activity. Instead of a) superficial, b) local rules</span>
-<span id="L48" class="LineNr"> 48 </span><span class="Comment">//: on c) code [like say <a href="http://blog.bbv.ch/2013/06/05/clean-code-cheat-sheet">http://blog.bbv.ch/2013/06/05/clean-code-cheat-sheet</a>],</span>
+<span id="L48" class="LineNr"> 48 </span><span class="Comment">//: on c) code [like say <a href="http://blog.bbv.ch/2013/06/05/clean-code-cheat-sheet">http://blog.bbv.ch/2013/06/05/clean-code-cheat-sheet</a></span>
 <span id="L49" class="LineNr"> 49 </span><span class="Comment">//: we allow programmers to engage with the a) deep, b) global structure of the</span>
 <span id="L50" class="LineNr"> 50 </span><span class="Comment">//: c) domain. If you can systematically track discontinuities in the domain,</span>
 <span id="L51" class="LineNr"> 51 </span><span class="Comment">//: you don't care if the code used gotos as long as it passed the tests. If</span>
@@ -224,7 +224,7 @@ if ('onhashchange' in window) {
 <span id="L164" class="LineNr">164 </span><span class="PreProc">#define CLEAR_TRACE  </span><span class="Normal">delete</span><span class="PreProc"> Trace_stream</span><span class="Delimiter">,</span><span class="PreProc"> Trace_stream = </span><span class="Normal">new</span><span class="PreProc"> trace_stream</span><span class="Delimiter">;</span>
 <span id="L165" class="LineNr">165 </span>
 <span id="L166" class="LineNr">166 </span><span class="Comment">// Top-level helper. IMPORTANT: can't nest</span>
-<span id="L167" class="LineNr">167 </span><span class="PreProc">#define trace(</span><span class="Delimiter">...</span><span class="PreProc">)  !Trace_stream ? cerr </span><span class="Comment">/*</span><span class="Comment">print nothing</span><span class="Comment">*/</span><span class="PreProc"> : Trace_stream</span><span class="Delimiter">-&gt;</span><span class="PreProc">stream(</span><span class="Constant">__VA_ARGS__</span><span class="PreProc">)</span>
+<span id="L167" class="LineNr">167 </span><span class="PreProc">#define trace(</span><span class="Delimiter">...</span><span class="PreProc">)  !Trace_stream ? cerr </span><span class="Comment">/*</span><span class="Comment">print nothing</span><span class="Comment">*/</span><span class="PreProc"> : Trace_stream</span><span class="Delimiter">-&gt;</span><span class="PreProc">stream(__VA_ARGS__)</span>
 <span id="L168" class="LineNr">168 </span>
 <span id="L169" class="LineNr">169 </span><span class="Comment">// Just for debugging; 'git log' should never show any calls to 'dbg'.</span>
 <span id="L170" class="LineNr">170 </span><span class="PreProc">#define dbg trace(</span><span class="Constant">0</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">&quot;a&quot;</span><span class="PreProc">)</span>
@@ -262,7 +262,7 @@ if ('onhashchange' in window) {
 <span id="L202" class="LineNr">202 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
 <span id="L203" class="LineNr">203 </span><span class="Normal">struct</span> <a href='003trace.cc.html#L203'>end</a> <span class="Delimiter">{};</span>
 <span id="L204" class="LineNr">204 </span><span class="Delimiter">:(code)</span>
-<span id="L205" class="LineNr">205 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> <a href='001help.cc.html#L259'>unused</a> <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L205" class="LineNr">205 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> <a href='001help.cc.html#L259'>vestigial</a> <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L206" class="LineNr">206 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> Trace_stream<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L133'>newline</a><span class="Delimiter">();</span>
 <span id="L207" class="LineNr">207 </span>  <span class="Identifier">return</span> os<span class="Delimiter">;</span>
 <span id="L208" class="LineNr">208 </span><span class="Delimiter">}</span>
@@ -289,7 +289,7 @@ if ('onhashchange' in window) {
 <span id="L229" class="LineNr">229 </span><a href='003trace.cc.html#L227'>START_TRACING_UNTIL_END_OF_SCOPE</a>
 <span id="L230" class="LineNr">230 </span>
 <span id="L231" class="LineNr">231 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L232" class="LineNr">232 </span><span class="PreProc">#define CHECK_TRACE_CONTENTS(</span><span class="Delimiter">...</span><span class="PreProc">)  check_trace_contents(__FUNCTION__</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">__FILE__</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">__LINE__</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">__VA_ARGS__</span><span class="PreProc">)</span>
+<span id="L232" class="LineNr">232 </span><span class="PreProc">#define CHECK_TRACE_CONTENTS(</span><span class="Delimiter">...</span><span class="PreProc">)  check_trace_contents(__FUNCTION__</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">__FILE__</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">__LINE__</span><span class="Delimiter">,</span><span class="PreProc"> __VA_ARGS__)</span>
 <span id="L233" class="LineNr">233 </span>
 <span id="L234" class="LineNr">234 </span><span class="PreProc">#define CHECK_TRACE_CONTAINS_ERRORS()  CHECK(trace_contains_errors())</span>
 <span id="L235" class="LineNr">235 </span><span class="PreProc">#define CHECK_TRACE_DOESNT_CONTAIN_ERRORS() \</span>
@@ -309,7 +309,7 @@ if ('onhashchange' in window) {
 <span id="L249" class="LineNr">249 </span><span class="PreProc">    </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span><span class="PreProc"> \</span>
 <span id="L250" class="LineNr">250 </span><span class="PreProc">  </span><span class="Delimiter">}</span>
 <span id="L251" class="LineNr">251 </span>
-<span id="L252" class="LineNr">252 </span><span class="PreProc">#define CHECK_TRACE_DOESNT_CONTAIN(</span><span class="Delimiter">...</span><span class="PreProc">)  CHECK(trace_doesnt_contain(</span><span class="Constant">__VA_ARGS__</span><span class="PreProc">))</span>
+<span id="L252" class="LineNr">252 </span><span class="PreProc">#define CHECK_TRACE_DOESNT_CONTAIN(</span><span class="Delimiter">...</span><span class="PreProc">)  CHECK(trace_doesnt_contain(__VA_ARGS__))</span>
 <span id="L253" class="LineNr">253 </span>
 <span id="L254" class="LineNr">254 </span><span class="Delimiter">:(code)</span>
 <span id="L255" class="LineNr">255 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L255'>check_trace_contents</a><span class="Delimiter">(</span>string FUNCTION<span class="Delimiter">,</span> string <span class="Normal">FILE</span><span class="Delimiter">,</span> <span class="Normal">int</span> LINE<span class="Delimiter">,</span> string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
diff --git a/html/003trace.test.cc.html b/html/003trace.test.cc.html
index c9324c89..d71854da 100644
--- a/html/003trace.test.cc.html
+++ b/html/003trace.test.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 003trace.test.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,12 +15,12 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/010vm.cc.html b/html/010vm.cc.html
index 9d40e117..096cc89f 100644
--- a/html/010vm.cc.html
+++ b/html/010vm.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 010vm.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.PreProc { color: #800080; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
 .muRecipe { color: #ff8700; }
+.SalientComment { color: #00ffff; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
+.PreProc { color: #800080; }
 .CommentedCode { color: #6c6c6c; }
-.SalientComment { color: #00ffff; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/011load.cc.html b/html/011load.cc.html
index 10533966..e25263d7 100644
--- a/html/011load.cc.html
+++ b/html/011load.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 011load.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.LineNr { color: #444444; }
-.traceAbsent { color: #c00000; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
+.traceAbsent { color: #c00000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/012transform.cc.html b/html/012transform.cc.html
index e3a180fd..bf15b20c 100644
--- a/html/012transform.cc.html
+++ b/html/012transform.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 012transform.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 -->
 </style>
 
diff --git a/html/013update_operation.cc.html b/html/013update_operation.cc.html
index cfdba20f..596e7624 100644
--- a/html/013update_operation.cc.html
+++ b/html/013update_operation.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 013update_operation.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.traceContains { color: #008000; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Delimiter { color: #800080; }
+.traceContains { color: #008000; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.muRecipe { color: #ff8700; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.CommentedCode { color: #6c6c6c; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Identifier { color: #c0a020; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/014literal_string.cc.html b/html/014literal_string.cc.html
index 0d7a82e4..c5fc1143 100644
--- a/html/014literal_string.cc.html
+++ b/html/014literal_string.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 014literal_string.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/015literal_noninteger.cc.html b/html/015literal_noninteger.cc.html
index eb2ae0d3..073fea49 100644
--- a/html/015literal_noninteger.cc.html
+++ b/html/015literal_noninteger.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 015literal_noninteger.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/016dilated_reagent.cc.html b/html/016dilated_reagent.cc.html
index 9da1dc33..bf41460b 100644
--- a/html/016dilated_reagent.cc.html
+++ b/html/016dilated_reagent.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 016dilated_reagent.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.cSpecial { color: #008000; }
+.muRecipe { color: #ff8700; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.cSpecial { color: #008000; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
+.PreProc { color: #800080; }
 .traceContains { color: #008000; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 -->
 </style>
 
@@ -74,7 +75,7 @@ if ('onhashchange' in window) {
 <span id="L11" class="LineNr"> 11 </span>
 <span id="L12" class="LineNr"> 12 </span><span class="Delimiter">:(scenario load_trailing_space_after_curly_bracket)</span>
 <span id="L13" class="LineNr"> 13 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L14" class="LineNr"> 14 </span>  <span class="Comment"># line below has a space at the end</span>
+<span id="L14" class="LineNr"> 14 </span><span class="PreProc">  </span><span class="Comment"># line below has a space at the end</span>
 <span id="L15" class="LineNr"> 15 </span>  <span class="Delimiter">{</span><span class="Error"> </span>
 <span id="L16" class="LineNr"> 16 </span>]
 <span id="L17" class="LineNr"> 17 </span><span class="Comment"># successfully parsed</span>
diff --git a/html/017parse_tree.cc.html b/html/017parse_tree.cc.html
index 2d9ab117..e800c0ce 100644
--- a/html/017parse_tree.cc.html
+++ b/html/017parse_tree.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 017parse_tree.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.LineNr { color: #444444; }
-.muData { color: #ffff00; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.muData { color: #ffff00; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/018type_abbreviations.cc.html b/html/018type_abbreviations.cc.html
index 7d1b28ba..177b7f67 100644
--- a/html/018type_abbreviations.cc.html
+++ b/html/018type_abbreviations.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 018type_abbreviations.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Identifier { color: #c0a020; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .muData { color: #ffff00; }
-.Constant { color: #00a0a0; }
+.cSpecial { color: #008000; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color: #800080; }
-.Special { color: #c00000; }
 .SalientComment { color: #00ffff; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.cSpecial { color: #008000; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Constant { color: #00a0a0; }
 .traceContains { color: #008000; }
 -->
 </style>
diff --git a/html/020run.cc.html b/html/020run.cc.html
index 6aa87f36..455985b6 100644
--- a/html/020run.cc.html
+++ b/html/020run.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 020run.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,21 +15,21 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.SalientComment { color: #00ffff; }
+.CommentedCode { color: #6c6c6c; }
 .LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.SalientComment { color: #00ffff; }
-.CommentedCode { color: #6c6c6c; }
+.traceContains { color: #008000; }
 .traceAbsent { color: #c00000; }
+.cSpecial { color: #008000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .PreProc { color: #800080; }
-.cSpecial { color: #008000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/021check_instruction.cc.html b/html/021check_instruction.cc.html
index 8bb8ca09..b52134c3 100644
--- a/html/021check_instruction.cc.html
+++ b/html/021check_instruction.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 021check_instruction.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muRecipe { color: #ff8700; }
-.traceContains { color: #008000; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.muRecipe { color: #ff8700; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.traceContains { color: #008000; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/022arithmetic.cc.html b/html/022arithmetic.cc.html
index a9ae8710..a92cedae 100644
--- a/html/022arithmetic.cc.html
+++ b/html/022arithmetic.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 022arithmetic.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.traceContains { color: #008000; }
-.PreProc { color: #800080; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
+.PreProc { color: #800080; }
+.traceContains { color: #008000; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/023boolean.cc.html b/html/023boolean.cc.html
index e3ed198b..eb220299 100644
--- a/html/023boolean.cc.html
+++ b/html/023boolean.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 023boolean.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.traceContains { color: #008000; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
+.traceContains { color: #008000; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/024jump.cc.html b/html/024jump.cc.html
index a5e962e9..35cc5ef2 100644
--- a/html/024jump.cc.html
+++ b/html/024jump.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 024jump.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.traceAbsent { color: #c00000; }
-.Identifier { color: #c0a020; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.cSpecial { color: #008000; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.muRecipe { color: #ff8700; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .traceContains { color: #008000; }
+.traceAbsent { color: #c00000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/025compare.cc.html b/html/025compare.cc.html
index 5bfd2d97..a7b77ddf 100644
--- a/html/025compare.cc.html
+++ b/html/025compare.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 025compare.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.traceContains { color: #008000; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
+.traceContains { color: #008000; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/026call.cc.html b/html/026call.cc.html
index 12ff47c9..92d57b36 100644
--- a/html/026call.cc.html
+++ b/html/026call.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 026call.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,20 +15,20 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.SalientComment { color: #00ffff; }
+.CommentedCode { color: #6c6c6c; }
 .LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.SalientComment { color: #00ffff; }
-.CommentedCode { color: #6c6c6c; }
+.traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .PreProc { color: #800080; }
-.cSpecial { color: #008000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/027call_ingredient.cc.html b/html/027call_ingredient.cc.html
index ff7cd92d..daa703d3 100644
--- a/html/027call_ingredient.cc.html
+++ b/html/027call_ingredient.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 027call_ingredient.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/028call_return.cc.html b/html/028call_return.cc.html
index 89091732..1b4b0c47 100644
--- a/html/028call_return.cc.html
+++ b/html/028call_return.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 028call_return.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/029tools.cc.html b/html/029tools.cc.html
index ac8b7381..826286d5 100644
--- a/html/029tools.cc.html
+++ b/html/029tools.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 029tools.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.CommentedCode { color: #6c6c6c; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
+.CommentedCode { color: #6c6c6c; }
 .muRecipe { color: #ff8700; }
+.SalientComment { color: #00ffff; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/030container.cc.html b/html/030container.cc.html
index 89512ff0..113446d0 100644
--- a/html/030container.cc.html
+++ b/html/030container.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 030container.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,21 +15,21 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.SalientComment { color: #00ffff; }
+.CommentedCode { color: #6c6c6c; }
+.muData { color: #ffff00; }
 .LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.SalientComment { color: #00ffff; }
-.CommentedCode { color: #6c6c6c; }
+.traceContains { color: #008000; }
 .traceAbsent { color: #c00000; }
+.cSpecial { color: #008000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Identifier { color: #c0a020; }
-.cSpecial { color: #008000; }
-.muData { color: #ffff00; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.traceContains { color: #008000; }
 -->
 </style>
 
@@ -827,7 +827,7 @@ if ('onhashchange' in window) {
 <span id="L761" class="LineNr">761 </span><span class="Delimiter">:(code)</span>
 <span id="L762" class="LineNr">762 </span><span class="Comment">// extremely inefficient; we process all types over and over again, once for every single recipe</span>
 <span id="L763" class="LineNr">763 </span><span class="Comment">// but it doesn't seem to cause any noticeable slowdown</span>
-<span id="L764" class="LineNr">764 </span><span class="Normal">void</span> <a href='030container.cc.html#L764'>expand_type_abbreviations_in_containers</a><span class="Delimiter">(</span><a href='001help.cc.html#L259'>unused</a> <span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L764" class="LineNr">764 </span><span class="Normal">void</span> <a href='030container.cc.html#L764'>expand_type_abbreviations_in_containers</a><span class="Delimiter">(</span><a href='001help.cc.html#L259'>vestigial</a> <span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L765" class="LineNr">765 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;type_ordinal<span class="Delimiter">,</span> type_info&gt;::iterator p = Type<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Type<span class="Delimiter">.</span><a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L766" class="LineNr">766 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L767" class="LineNr">767 </span>      expand_type_abbreviations<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">);</span>
diff --git a/html/031merge.cc.html b/html/031merge.cc.html
index 0f44cf3a..5de62baf 100644
--- a/html/031merge.cc.html
+++ b/html/031merge.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 031merge.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muRecipe { color: #ff8700; }
-.PreProc { color: #800080; }
-.LineNr { color: #444444; }
-.muData { color: #ffff00; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
+.muData { color: #ffff00; }
+.muRecipe { color: #ff8700; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.cSpecial { color: #008000; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.PreProc { color: #800080; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/032array.cc.html b/html/032array.cc.html
index 955f1c9c..0324ca15 100644
--- a/html/032array.cc.html
+++ b/html/032array.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 032array.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.LineNr { color: #444444; }
-.muData { color: #ffff00; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.SalientComment { color: #00ffff; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.muData { color: #ffff00; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/033exclusive_container.cc.html b/html/033exclusive_container.cc.html
index f9e8abe5..bf6acc18 100644
--- a/html/033exclusive_container.cc.html
+++ b/html/033exclusive_container.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 033exclusive_container.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.LineNr { color: #444444; }
-.muData { color: #ffff00; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.SalientComment { color: #00ffff; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.muData { color: #ffff00; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/034address.cc.html b/html/034address.cc.html
index f13bcb12..0129110f 100644
--- a/html/034address.cc.html
+++ b/html/034address.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 034address.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
+.CommentedCode { color: #6c6c6c; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.CommentedCode { color: #6c6c6c; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/035lookup.cc.html b/html/035lookup.cc.html
index 05c16805..9b30b168 100644
--- a/html/035lookup.cc.html
+++ b/html/035lookup.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 035lookup.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.traceAbsent { color: #c00000; }
-.SalientComment { color: #00ffff; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.SalientComment { color: #00ffff; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.cSpecial { color: #008000; }
 .traceContains { color: #008000; }
+.traceAbsent { color: #c00000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/036refcount.cc.html b/html/036refcount.cc.html
index 4820c43a..ffc58fb3 100644
--- a/html/036refcount.cc.html
+++ b/html/036refcount.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 036refcount.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/037abandon.cc.html b/html/037abandon.cc.html
index 3c153c63..4c496c5b 100644
--- a/html/037abandon.cc.html
+++ b/html/037abandon.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 037abandon.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/038new_text.cc.html b/html/038new_text.cc.html
index 666dfcd6..a48f15cb 100644
--- a/html/038new_text.cc.html
+++ b/html/038new_text.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 038new_text.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.cSpecial { color: #008000; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
+.CommentedCode { color: #6c6c6c; }
 .muRecipe { color: #ff8700; }
+.SalientComment { color: #00ffff; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/040brace.cc.html b/html/040brace.cc.html
index 2a73fc1b..a7c0592d 100644
--- a/html/040brace.cc.html
+++ b/html/040brace.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 040brace.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/041jump_target.cc.html b/html/041jump_target.cc.html
index abf0871c..626afa40 100644
--- a/html/041jump_target.cc.html
+++ b/html/041jump_target.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 041jump_target.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.traceAbsent { color: #c00000; }
-.traceContains { color: #008000; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
+.traceContains { color: #008000; }
+.traceAbsent { color: #c00000; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/042name.cc.html b/html/042name.cc.html
index b0ef0f85..d3d2e60c 100644
--- a/html/042name.cc.html
+++ b/html/042name.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 042name.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.SalientComment { color: #00ffff; }
-.LineNr { color: #444444; }
-.traceAbsent { color: #c00000; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.SalientComment { color: #00ffff; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.cSpecial { color: #008000; }
 .traceContains { color: #008000; }
+.traceAbsent { color: #c00000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/043space.cc.html b/html/043space.cc.html
index f6ab6d50..97a1bd92 100644
--- a/html/043space.cc.html
+++ b/html/043space.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 043space.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.traceAbsent { color: #c00000; }
-.SalientComment { color: #00ffff; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.SalientComment { color: #00ffff; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.cSpecial { color: #008000; }
 .traceContains { color: #008000; }
+.traceAbsent { color: #c00000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/044space_surround.cc.html b/html/044space_surround.cc.html
index 25e50f70..5f6ec84d 100644
--- a/html/044space_surround.cc.html
+++ b/html/044space_surround.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 044space_surround.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/045closure_name.cc.html b/html/045closure_name.cc.html
index d183aef3..6cacabf7 100644
--- a/html/045closure_name.cc.html
+++ b/html/045closure_name.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 045closure_name.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.cSpecial { color: #008000; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/046check_type_by_name.cc.html b/html/046check_type_by_name.cc.html
index dd7bcee9..9bd08a5d 100644
--- a/html/046check_type_by_name.cc.html
+++ b/html/046check_type_by_name.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 046check_type_by_name.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.LineNr { color: #444444; }
-.traceAbsent { color: #c00000; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.cSpecial { color: #008000; }
 .traceContains { color: #008000; }
+.traceAbsent { color: #c00000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/050scenario.cc.html b/html/050scenario.cc.html
index b8c45288..6f5cf28c 100644
--- a/html/050scenario.cc.html
+++ b/html/050scenario.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 050scenario.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,21 +15,21 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.SalientComment { color: #00ffff; }
+.CommentedCode { color: #6c6c6c; }
+.muScenario { color: #00af00; }
 .LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.SalientComment { color: #00ffff; }
-.CommentedCode { color: #6c6c6c; }
+.traceContains { color: #008000; }
 .traceAbsent { color: #c00000; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.muScenario { color: #00af00; }
-.Special { color: #c00000; }
-.Identifier { color: #c0a020; }
 .cSpecial { color: #008000; }
+.muRecipe { color: #ff8700; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.traceContains { color: #008000; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
+.Identifier { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/051scenario_test.mu.html b/html/051scenario_test.mu.html
index 744b4554..15716ab9 100644
--- a/html/051scenario_test.mu.html
+++ b/html/051scenario_test.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 051scenario_test.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,11 +16,11 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/052tangle.cc.html b/html/052tangle.cc.html
index 0d2f5a93..c755161f 100644
--- a/html/052tangle.cc.html
+++ b/html/052tangle.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 052tangle.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.LineNr { color: #444444; }
-.traceAbsent { color: #c00000; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
+.traceAbsent { color: #c00000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/053recipe_header.cc.html b/html/053recipe_header.cc.html
index aa8561e0..7ef683cd 100644
--- a/html/053recipe_header.cc.html
+++ b/html/053recipe_header.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 053recipe_header.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,20 +15,20 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.SalientComment { color: #00ffff; }
 .LineNr { color: #444444; }
+.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
 .Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.SalientComment { color: #00ffff; }
+.traceContains { color: #008000; }
 .traceAbsent { color: #c00000; }
+.cSpecial { color: #008000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Identifier { color: #c0a020; }
-.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
-.cSpecial { color: #008000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/054static_dispatch.cc.html b/html/054static_dispatch.cc.html
index 945900e8..2134baef 100644
--- a/html/054static_dispatch.cc.html
+++ b/html/054static_dispatch.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 054static_dispatch.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,20 +15,20 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.CommentedCode { color: #6c6c6c; }
+.muData { color: #ffff00; }
 .LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.CommentedCode { color: #6c6c6c; }
+.traceContains { color: #008000; }
 .traceAbsent { color: #c00000; }
+.cSpecial { color: #008000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Identifier { color: #c0a020; }
-.cSpecial { color: #008000; }
-.muData { color: #ffff00; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/055shape_shifting_container.cc.html b/html/055shape_shifting_container.cc.html
index 2b8ab3e3..fcff28ed 100644
--- a/html/055shape_shifting_container.cc.html
+++ b/html/055shape_shifting_container.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 055shape_shifting_container.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,20 +15,20 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.SalientComment { color: #00ffff; }
+.CommentedCode { color: #6c6c6c; }
+.muData { color: #ffff00; }
 .LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.SalientComment { color: #00ffff; }
-.CommentedCode { color: #6c6c6c; }
+.traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Identifier { color: #c0a020; }
-.cSpecial { color: #008000; }
-.muData { color: #ffff00; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/056shape_shifting_recipe.cc.html b/html/056shape_shifting_recipe.cc.html
index 8c3afa7f..c6bbe840 100644
--- a/html/056shape_shifting_recipe.cc.html
+++ b/html/056shape_shifting_recipe.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 056shape_shifting_recipe.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,20 +15,21 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.SalientComment { color: #00ffff; }
+.CommentedCode { color: #6c6c6c; }
+.muData { color: #ffff00; }
 .LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.SalientComment { color: #00ffff; }
-.CommentedCode { color: #6c6c6c; }
+.traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Identifier { color: #c0a020; }
-.traceContains { color: #008000; }
-.muData { color: #ffff00; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.cSpecial { color: #008000; }
+.PreProc { color: #800080; }
 -->
 </style>
 
@@ -270,7 +271,7 @@ if ('onhashchange' in window) {
 <span id="L205" class="LineNr"> 205 </span>  <span class="Identifier">return</span> contains_type_ingredient_name<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">)</span> || contains_type_ingredient_name<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">);</span>
 <span id="L206" class="LineNr"> 206 </span><span class="Delimiter">}</span>
 <span id="L207" class="LineNr"> 207 </span>
-<span id="L208" class="LineNr"> 208 </span><span class="Normal">int</span> number_of_concrete_type_names<span class="Delimiter">(</span><a href='001help.cc.html#L259'>unused</a> <span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L208" class="LineNr"> 208 </span><span class="Normal">int</span> number_of_concrete_type_names<span class="Delimiter">(</span><a href='001help.cc.html#L259'>vestigial</a> <span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L209" class="LineNr"> 209 </span>  <span class="Normal">const</span> recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
 <span id="L210" class="LineNr"> 210 </span>  <span class="Normal">int</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L211" class="LineNr"> 211 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
@@ -288,7 +289,7 @@ if ('onhashchange' in window) {
 <span id="L223" class="LineNr"> 223 </span>       + number_of_concrete_type_names<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">);</span>
 <span id="L224" class="LineNr"> 224 </span><span class="Delimiter">}</span>
 <span id="L225" class="LineNr"> 225 </span>
-<span id="L226" class="LineNr"> 226 </span><span class="Normal">int</span> number_of_type_ingredients<span class="Delimiter">(</span><a href='001help.cc.html#L259'>unused</a> <span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L226" class="LineNr"> 226 </span><span class="Normal">int</span> number_of_type_ingredients<span class="Delimiter">(</span><a href='001help.cc.html#L259'>vestigial</a> <span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L227" class="LineNr"> 227 </span>  <span class="Normal">const</span> recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
 <span id="L228" class="LineNr"> 228 </span>  <span class="Normal">int</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L229" class="LineNr"> 229 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
@@ -1122,7 +1123,7 @@ if ('onhashchange' in window) {
 <span id="L1057" class="LineNr">1057 </span>  local-scope
 <span id="L1058" class="LineNr">1058 </span>  <span class="Normal">x</span>:foo2<span class="Special"> &lt;- </span>merge <span class="Constant">34</span>
 <span id="L1059" class="LineNr">1059 </span>  <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>get x<span class="Delimiter">,</span> z:offse  <span class="Comment"># typo in 'offset'</span>
-<span id="L1060" class="LineNr">1060 </span>  <span class="Comment"># define a variable with the same name 'z'</span>
+<span id="L1060" class="LineNr">1060 </span><span class="PreProc">  </span><span class="Comment"># define a variable with the same name 'z'</span>
 <span id="L1061" class="LineNr">1061 </span>  <span class="Normal">z</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
 <span id="L1062" class="LineNr">1062 </span>  <span class="Comment"># trigger specialization of the shape-shifting recipe</span>
 <span id="L1063" class="LineNr">1063 </span>  foo z
@@ -1142,7 +1143,7 @@ if ('onhashchange' in window) {
 <span id="L1077" class="LineNr">1077 </span>  local-scope
 <span id="L1078" class="LineNr">1078 </span>  <span class="Normal">x</span>:foo2<span class="Special"> &lt;- </span>merge <span class="Constant">34</span>
 <span id="L1079" class="LineNr">1079 </span>  <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>get x<span class="Delimiter">,</span> z:offse  <span class="Comment"># typo in 'offset'</span>
-<span id="L1080" class="LineNr">1080 </span>  <span class="Comment"># define a variable with the same name 'z'</span>
+<span id="L1080" class="LineNr">1080 </span><span class="PreProc">  </span><span class="Comment"># define a variable with the same name 'z'</span>
 <span id="L1081" class="LineNr">1081 </span>  <span class="Normal">z</span>:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
 <span id="L1082" class="LineNr">1082 </span>  <span class="Comment"># trigger specialization of the shape-shifting recipe</span>
 <span id="L1083" class="LineNr">1083 </span>  foo *z
diff --git a/html/057immutable.cc.html b/html/057immutable.cc.html
index 6949e418..125de6ba 100644
--- a/html/057immutable.cc.html
+++ b/html/057immutable.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 057immutable.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.LineNr { color: #444444; }
-.muData { color: #ffff00; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.muData { color: #ffff00; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.cSpecial { color: #008000; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/058to_text.cc.html b/html/058to_text.cc.html
index fd540292..572c9f77 100644
--- a/html/058to_text.cc.html
+++ b/html/058to_text.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 058to_text.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/059to_text.mu.html b/html/059to_text.mu.html
index 55d9846c..0cc17996 100644
--- a/html/059to_text.mu.html
+++ b/html/059to_text.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 059to_text.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -17,11 +17,11 @@ a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/060rewrite_literal_string.cc.html b/html/060rewrite_literal_string.cc.html
index 91e54970..b1dee8b4 100644
--- a/html/060rewrite_literal_string.cc.html
+++ b/html/060rewrite_literal_string.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 060rewrite_literal_string.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
 -->
 </style>
diff --git a/html/061text.mu.html b/html/061text.mu.html
index e8cebf0d..1cf8aa34 100644
--- a/html/061text.mu.html
+++ b/html/061text.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 061text.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 .muData { color: #ffff00; }
 -->
 </style>
diff --git a/html/062convert_ingredients_to_text.cc.html b/html/062convert_ingredients_to_text.cc.html
index ebb35e8d..00f740d4 100644
--- a/html/062convert_ingredients_to_text.cc.html
+++ b/html/062convert_ingredients_to_text.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 062convert_ingredients_to_text.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.LineNr { color: #444444; }
-.muData { color: #ffff00; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.muData { color: #ffff00; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
 -->
 </style>
diff --git a/html/063array.mu.html b/html/063array.mu.html
index 2bec85d6..80244daf 100644
--- a/html/063array.mu.html
+++ b/html/063array.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 063array.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 .Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 -->
diff --git a/html/064list.mu.html b/html/064list.mu.html
index 89203829..2ce82c35 100644
--- a/html/064list.mu.html
+++ b/html/064list.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 064list.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 .muData { color: #ffff00; }
 -->
 </style>
diff --git a/html/065duplex_list.mu.html b/html/065duplex_list.mu.html
index 92276388..16453fae 100644
--- a/html/065duplex_list.mu.html
+++ b/html/065duplex_list.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 065duplex_list.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 .muData { color: #ffff00; }
 -->
 </style>
diff --git a/html/066stream.mu.html b/html/066stream.mu.html
index 3df28e6e..08c4c0fe 100644
--- a/html/066stream.mu.html
+++ b/html/066stream.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 066stream.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 .Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 .muData { color: #ffff00; }
 -->
 </style>
diff --git a/html/067random.cc.html b/html/067random.cc.html
index eec8e30a..a044f382 100644
--- a/html/067random.cc.html
+++ b/html/067random.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 067random.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 -->
 </style>
 
diff --git a/html/068random.mu.html b/html/068random.mu.html
index 0f82ba41..1c2d47fc 100644
--- a/html/068random.mu.html
+++ b/html/068random.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 068random.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 .Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/069hash.cc.html b/html/069hash.cc.html
index 06aa1a3e..f36c1b59 100644
--- a/html/069hash.cc.html
+++ b/html/069hash.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 069hash.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.traceContains { color: #008000; }
-.LineNr { color: #444444; }
-.muData { color: #ffff00; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
+.muData { color: #ffff00; }
 .muRecipe { color: #ff8700; }
-.Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Special { color: #c00000; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.CommentedCode { color: #6c6c6c; }
+.traceContains { color: #008000; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/070table.mu.html b/html/070table.mu.html
index db376fe2..6e1c73f7 100644
--- a/html/070table.mu.html
+++ b/html/070table.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 070table.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 .muData { color: #ffff00; }
 -->
 </style>
diff --git a/html/071deep_copy.cc.html b/html/071deep_copy.cc.html
index 954425e6..45b42149 100644
--- a/html/071deep_copy.cc.html
+++ b/html/071deep_copy.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 071deep_copy.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Identifier { color: #c0a020; }
-.LineNr { color: #444444; }
-.muData { color: #ffff00; }
 .Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.cSpecial { color: #008000; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.muRecipe { color: #ff8700; }
+.muData { color: #ffff00; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/072recipe.cc.html b/html/072recipe.cc.html
index 9717739c..be80dff4 100644
--- a/html/072recipe.cc.html
+++ b/html/072recipe.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 072recipe.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.SalientComment { color: #00ffff; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.SalientComment { color: #00ffff; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.cSpecial { color: #008000; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
@@ -119,7 +119,7 @@ if ('onhashchange' in window) {
 <span id="L56" class="LineNr"> 56 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L57" class="LineNr"> 57 </span>  local-scope
 <span id="L58" class="LineNr"> 58 </span>  <span class="Normal">a</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>equal <span class="Identifier">break</span> <span class="Constant">0</span>
-<span id="L59" class="LineNr"> 59 </span>  <span class="Identifier">break</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L59" class="LineNr"> 59 </span>  <span class="Normal">break</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="L60" class="LineNr"> 60 </span>]
 <span id="L61" class="LineNr"> 61 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: missing type for 'break' in 'a:bool &lt;- equal break, 0'</span>
 <span id="L62" class="LineNr"> 62 </span>
diff --git a/html/073scheduler.cc.html b/html/073scheduler.cc.html
index 0fbe4e7c..9d95b952 100644
--- a/html/073scheduler.cc.html
+++ b/html/073scheduler.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 073scheduler.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.LineNr { color: #444444; }
-.traceAbsent { color: #c00000; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.SalientComment { color: #00ffff; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
 .traceContains { color: #008000; }
+.traceAbsent { color: #c00000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
@@ -376,7 +376,7 @@ if ('onhashchange' in window) {
 <span id="L312" class="LineNr">312 </span><span class="traceContains">+error: f2: divide by zero in '3:num &lt;- divide-with-remainder 4, 0'</span>
 <span id="L313" class="LineNr">313 </span><span class="traceAbsent">-error: f2: divide by zero in '4:num &lt;- divide-with-remainder 4, 0'</span>
 <span id="L314" class="LineNr">314 </span>
-<span id="L315" class="LineNr">315 </span><span class="Delimiter">:(after &quot;operator&lt;&lt;(ostream&amp; os, <a href='001help.cc.html#L259'>unused</a> end)&quot;)</span>
+<span id="L315" class="LineNr">315 </span><span class="Delimiter">:(after &quot;operator&lt;&lt;(ostream&amp; os, <a href='001help.cc.html#L259'>vestigial</a> end)&quot;)</span>
 <span id="L316" class="LineNr">316 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream &amp;&amp; Trace_stream<span class="Delimiter">-&gt;</span>curr_label == <span class="Constant">&quot;error&quot;</span> &amp;&amp; Current_routine<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L317" class="LineNr">317 </span>    Current_routine<span class="Delimiter">-&gt;</span>state = <a href='073scheduler.cc.html#L42'>COMPLETED</a><span class="Delimiter">;</span>
 <span id="L318" class="LineNr">318 </span>  <span class="Delimiter">}</span>
diff --git a/html/074wait.cc.html b/html/074wait.cc.html
index 46f25c43..038391ca 100644
--- a/html/074wait.cc.html
+++ b/html/074wait.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 074wait.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.LineNr { color: #444444; }
-.muData { color: #ffff00; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
+.SalientComment { color: #00ffff; }
 .muRecipe { color: #ff8700; }
+.muData { color: #ffff00; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/075channel.mu.html b/html/075channel.mu.html
index 6d3b267a..ccbc5178 100644
--- a/html/075channel.mu.html
+++ b/html/075channel.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 075channel.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.muControl { color: #c0a020; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .SalientComment { color: #00ffff; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.CommentedCode { color: #6c6c6c; }
+.muControl { color: #c0a020; }
 .muData { color: #ffff00; }
 -->
 </style>
diff --git a/html/076continuation.cc.html b/html/076continuation.cc.html
index 4987689f..232fdf84 100644
--- a/html/076continuation.cc.html
+++ b/html/076continuation.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 076continuation.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.traceAbsent { color: #c00000; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.cSpecial { color: #008000; }
 .traceContains { color: #008000; }
+.traceAbsent { color: #c00000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
@@ -202,7 +202,7 @@ if ('onhashchange' in window) {
 <span id="L139" class="LineNr">139 </span>  <span class="Delimiter">}</span>
 <span id="L140" class="LineNr">140 </span>  <a href='010vm.cc.html#L32'>instruction</a><span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> caller_instruction = <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">();</span>
 <span id="L141" class="LineNr">141 </span>  Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>continuation_mark_tag = <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>value<span class="Delimiter">;</span>
-<span id="L142" class="LineNr">142 </span>  Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>push_front<span class="Delimiter">(</span>call<span class="Delimiter">(</span>Recipe_ordinal[current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name]<span class="Delimiter">));</span>
+<span id="L142" class="LineNr">142 </span>  Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>push_front<span class="Delimiter">(</span>call<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)));</span>
 <span id="L143" class="LineNr">143 </span>  <span class="Comment">// drop the mark</span>
 <span id="L144" class="LineNr">144 </span>  caller_instruction<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>caller_instruction<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">());</span>
 <span id="L145" class="LineNr">145 </span>  ingredients<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">());</span>
@@ -222,202 +222,215 @@ if ('onhashchange' in window) {
 <span id="L159" class="LineNr">159 </span>]
 <span id="L160" class="LineNr">160 </span><span class="traceContains">+mem: storing 1 in location 10</span>
 <span id="L161" class="LineNr">161 </span>
-<span id="L162" class="LineNr">162 </span><span class="Comment">//: save the slice of current call stack until the 'call-with-continuation-mark'</span>
-<span id="L163" class="LineNr">163 </span><span class="Comment">//: call, and return it as the result.</span>
-<span id="L164" class="LineNr">164 </span><span class="Comment">//: todo: implement delimited continuations in Mu's memory</span>
-<span id="L165" class="LineNr">165 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L166" class="LineNr">166 </span><span class="Normal">struct</span> delimited_continuation <span class="Delimiter">{</span>
-<span id="L167" class="LineNr">167 </span>  call_stack frames<span class="Delimiter">;</span>
-<span id="L168" class="LineNr">168 </span>  <span class="Normal">int</span> nrefs<span class="Delimiter">;</span>
-<span id="L169" class="LineNr">169 </span>  delimited_continuation<span class="Delimiter">(</span>call_stack::iterator begin<span class="Delimiter">,</span> call_stack::iterator <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">)</span> :frames<span class="Delimiter">(</span>call_stack<span class="Delimiter">(</span>begin<span class="Delimiter">,</span> <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">)),</span> nrefs<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{}</span>
-<span id="L170" class="LineNr">170 </span><span class="Delimiter">};</span>
-<span id="L171" class="LineNr">171 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L172" class="LineNr">172 </span>map&lt;<span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span><span class="Delimiter">,</span> delimited_continuation&gt; Delimited_continuation<span class="Delimiter">;</span>
-<span id="L173" class="LineNr">173 </span><span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span> Next_delimited_continuation_id = <span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// 0 is null just like an address</span>
-<span id="L174" class="LineNr">174 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L175" class="LineNr">175 </span>Delimited_continuation<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
-<span id="L176" class="LineNr">176 </span>Next_delimited_continuation_id = <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L177" class="LineNr">177 </span>
-<span id="L178" class="LineNr">178 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Declarations&quot;)</span>
-<span id="L179" class="LineNr">179 </span>RETURN_CONTINUATION_UNTIL_MARK<span class="Delimiter">,</span>
-<span id="L180" class="LineNr">180 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Numbers&quot;)</span>
-<span id="L181" class="LineNr">181 </span>Recipe_ordinal[<span class="Constant">&quot;return-continuation-until-mark&quot;</span>] = RETURN_CONTINUATION_UNTIL_MARK<span class="Delimiter">;</span>
-<span id="L182" class="LineNr">182 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
-<span id="L183" class="LineNr">183 </span><span class="Normal">case</span> RETURN_CONTINUATION_UNTIL_MARK: <span class="Delimiter">{</span>
-<span id="L184" class="LineNr">184 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L185" class="LineNr">185 </span><span class="Delimiter">}</span>
-<span id="L186" class="LineNr">186 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
-<span id="L187" class="LineNr">187 </span><span class="Normal">case</span> RETURN_CONTINUATION_UNTIL_MARK: <span class="Delimiter">{</span>
-<span id="L188" class="LineNr">188 </span>  <span class="Comment">// I don't know how to think about next-ingredient in combination with</span>
-<span id="L189" class="LineNr">189 </span>  <span class="Comment">// continuations, so seems cleaner to just kill it. Functions have to read</span>
-<span id="L190" class="LineNr">190 </span>  <span class="Comment">// their inputs before ever returning a continuation.</span>
-<span id="L191" class="LineNr">191 </span>  Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
-<span id="L192" class="LineNr">192 </span>  Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>next_ingredient_to_process = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L193" class="LineNr">193 </span>  <span class="Comment">// copy the current call stack until the most recent marked call</span>
-<span id="L194" class="LineNr">194 </span>  call_stack::iterator find_base_of_continuation<span class="Delimiter">(</span>call_stack&amp;<span class="Delimiter">,</span> <span class="Normal">int</span><span class="Delimiter">);</span>  <span class="Comment">// manual prototype containing '::'</span>
-<span id="L195" class="LineNr">195 </span>  call_stack::iterator base = find_base_of_continuation<span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">mark tag</span><span class="Comment">*/</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>value<span class="Delimiter">);</span>
-<span id="L196" class="LineNr">196 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base == Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span><a href='003trace.cc.html#L203'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L197" class="LineNr">197 </span>    <a href='003trace.cc.html#L174'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;couldn't find a 'call-with-continuation-mark' to return to</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L198" class="LineNr">198 </span>    <a href='003trace.cc.html#L174'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;call stack:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
-<span id="L199" class="LineNr">199 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::iterator p = Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span><a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L200" class="LineNr">200 </span>      <a href='003trace.cc.html#L174'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>running_recipe<span class="Delimiter">).</span>name &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
-<span id="L201" class="LineNr">201 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L202" class="LineNr">202 </span>  <span class="Delimiter">}</span>
-<span id="L203" class="LineNr">203 </span>  <a href='003trace.cc.html#L167'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;creating continuation &quot;</span> &lt;&lt; Next_delimited_continuation_id &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
-<span id="L204" class="LineNr">204 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> Next_delimited_continuation_id<span class="Delimiter">,</span> delimited_continuation<span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> base<span class="Delimiter">));</span>
-<span id="L205" class="LineNr">205 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>begin<span class="Delimiter">()</span> != base<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L206" class="LineNr">206 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L207" class="LineNr">207 </span>      --Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">;</span>
-<span id="L208" class="LineNr">208 </span>      assert<span class="Delimiter">(</span>Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &gt;= <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L209" class="LineNr">209 </span>    <span class="Delimiter">}</span>
-<span id="L210" class="LineNr">210 </span>    Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>pop_front<span class="Delimiter">();</span>
-<span id="L211" class="LineNr">211 </span>  <span class="Delimiter">}</span>
-<span id="L212" class="LineNr">212 </span>  <span class="Comment">// return it as the result of the marked call</span>
-<span id="L213" class="LineNr">213 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L214" class="LineNr">214 </span>  products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>Next_delimited_continuation_id<span class="Delimiter">);</span>
-<span id="L215" class="LineNr">215 </span>  <span class="Comment">// return any other ingredients passed in</span>
-<span id="L216" class="LineNr">216 </span>  copy<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip mark tag</span><span class="Comment">*/</span>++ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L203'>end</a><span class="Delimiter">(),</span> inserter<span class="Delimiter">(</span>products<span class="Delimiter">,</span> products<span class="Delimiter">.</span><a href='003trace.cc.html#L203'>end</a><span class="Delimiter">()));</span>
-<span id="L217" class="LineNr">217 </span>  ++Next_delimited_continuation_id<span class="Delimiter">;</span>
-<span id="L218" class="LineNr">218 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// continue to process rest of marked call</span>
-<span id="L219" class="LineNr">219 </span><span class="Delimiter">}</span>
-<span id="L220" class="LineNr">220 </span>
-<span id="L221" class="LineNr">221 </span><span class="Delimiter">:(code)</span>
-<span id="L222" class="LineNr">222 </span>call_stack::iterator find_base_of_continuation<span class="Delimiter">(</span>call_stack&amp; c<span class="Delimiter">,</span> <span class="Normal">int</span> mark_tag<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L223" class="LineNr">223 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::iterator p = c<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != c<span class="Delimiter">.</span><a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span>
-<span id="L224" class="LineNr">224 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>continuation_mark_tag == mark_tag<span class="Delimiter">)</span> <span class="Identifier">return</span> p<span class="Delimiter">;</span>
-<span id="L225" class="LineNr">225 </span>  <span class="Identifier">return</span> c<span class="Delimiter">.</span><a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
-<span id="L226" class="LineNr">226 </span><span class="Delimiter">}</span>
-<span id="L227" class="LineNr">227 </span>
-<span id="L228" class="LineNr">228 </span><span class="Comment">//: overload 'call' for continuations</span>
-<span id="L229" class="LineNr">229 </span><span class="Delimiter">:(after &quot;Begin Call&quot;)</span>
-<span id="L230" class="LineNr">230 </span><span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_continuation<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L231" class="LineNr">231 </span>  <span class="Comment">// copy multiple calls on to current call stack</span>
-<span id="L232" class="LineNr">232 </span>  assert<span class="Delimiter">(</span>scalar<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)));</span>
-<span id="L233" class="LineNr">233 </span>  <a href='003trace.cc.html#L167'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;calling continuation &quot;</span> &lt;&lt; ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
-<span id="L234" class="LineNr">234 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span>
-<span id="L235" class="LineNr">235 </span>    <a href='003trace.cc.html#L174'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;no such delimited continuation &quot;</span> &lt;&lt; <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
-<span id="L236" class="LineNr">236 </span>  <span class="Normal">const</span> call_stack&amp; new_frames = get<span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)).</span>frames<span class="Delimiter">;</span>
-<span id="L237" class="LineNr">237 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::const_reverse_iterator p = new_frames<span class="Delimiter">.</span>rbegin<span class="Delimiter">();</span> p != new_frames<span class="Delimiter">.</span>rend<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span>
-<span id="L238" class="LineNr">238 </span>    Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>push_front<span class="Delimiter">(</span>*p<span class="Delimiter">);</span>
-<span id="L239" class="LineNr">239 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L240" class="LineNr">240 </span>    Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth += <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>new_frames<span class="Delimiter">);</span>
-<span id="L241" class="LineNr">241 </span>    <a href='003trace.cc.html#L167'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;calling delimited continuation; growing callstack depth to &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
-<span id="L242" class="LineNr">242 </span>    assert<span class="Delimiter">(</span>Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt; <span class="Constant">9000</span><span class="Delimiter">);</span>  <span class="Comment">// 9998-101 plus cushion</span>
-<span id="L243" class="LineNr">243 </span>  <span class="Delimiter">}</span>
-<span id="L244" class="LineNr">244 </span>  <span class="Comment">// no call housekeeping; continuations don't support next-ingredient</span>
-<span id="L245" class="LineNr">245 </span>  copy<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">drop continuation</span><span class="Comment">*/</span>++ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L203'>end</a><span class="Delimiter">(),</span> inserter<span class="Delimiter">(</span>products<span class="Delimiter">,</span> products<span class="Delimiter">.</span>begin<span class="Delimiter">()));</span>
-<span id="L246" class="LineNr">246 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// record results of resuming 'return-continuation-until-mark' instruction</span>
-<span id="L247" class="LineNr">247 </span><span class="Delimiter">}</span>
-<span id="L248" class="LineNr">248 </span>
-<span id="L249" class="LineNr">249 </span><span class="Delimiter">:(scenario continuations_can_return_values)</span>
-<span id="L250" class="LineNr">250 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L251" class="LineNr">251 </span>  local-scope
-<span id="L252" class="LineNr">252 </span>  <span class="Normal">k</span>:continuation<span class="Delimiter">,</span> <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>call-with-continuation-mark <span class="Constant">233</span>/mark<span class="Delimiter">,</span> f
-<span id="L253" class="LineNr">253 </span>]
-<span id="L254" class="LineNr">254 </span><span class="muRecipe">def</span> f [
-<span id="L255" class="LineNr">255 </span>  local-scope
-<span id="L256" class="LineNr">256 </span>  g
-<span id="L257" class="LineNr">257 </span>]
-<span id="L258" class="LineNr">258 </span><span class="muRecipe">def</span> g [
-<span id="L259" class="LineNr">259 </span>  local-scope
-<span id="L260" class="LineNr">260 </span>  <span class="Identifier">return</span>-continuation-until-mark <span class="Constant">233</span>/mark<span class="Delimiter">,</span> <span class="Constant">34</span>
-<span id="L261" class="LineNr">261 </span>  stash [continuation called]
-<span id="L262" class="LineNr">262 </span>]
-<span id="L263" class="LineNr">263 </span><span class="traceContains">+mem: storing 34 in location 1</span>
-<span id="L264" class="LineNr">264 </span>
-<span id="L265" class="LineNr">265 </span><span class="Delimiter">:(scenario continuations_continue_to_matching_mark)</span>
-<span id="L266" class="LineNr">266 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L267" class="LineNr">267 </span>  local-scope
-<span id="L268" class="LineNr">268 </span>  <span class="Normal">k</span>:continuation<span class="Delimiter">,</span> <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>call-with-continuation-mark <span class="Constant">233</span>/mark<span class="Delimiter">,</span> f
-<span id="L269" class="LineNr">269 </span>  add <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span>
+<span id="L162" class="LineNr">162 </span><span class="Delimiter">:(scenario delimited_continuation_out_of_recipe_variable)</span>
+<span id="L163" class="LineNr">163 </span><span class="muRecipe"><a href='010vm.cc.html#L19'>recipe</a></span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L164" class="LineNr">164 </span>  <span class="Normal">x</span>:<a href='010vm.cc.html#L19'>recipe</a><span class="Special"> &lt;- </span>copy f
+<span id="L165" class="LineNr">165 </span>  call-with-continuation-mark <span class="Constant">233</span>/mark<span class="Delimiter">,</span> x<span class="Delimiter">,</span> <span class="Constant">1</span>/<span class="Constant">true</span>
+<span id="L166" class="LineNr">166 </span>]
+<span id="L167" class="LineNr">167 </span><span class="muRecipe"><a href='010vm.cc.html#L19'>recipe</a></span> f [
+<span id="L168" class="LineNr">168 </span>  <span class="Constant">10</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>next-input
+<span id="L169" class="LineNr">169 </span>]
+<span id="L170" class="LineNr">170 </span><span class="traceContains">+mem: storing 1 in location 10</span>
+<span id="L171" class="LineNr">171 </span>
+<span id="L172" class="LineNr">172 </span><span class="Comment">//: save the slice of current call stack until the 'call-with-continuation-mark'</span>
+<span id="L173" class="LineNr">173 </span><span class="Comment">//: call, and return it as the result.</span>
+<span id="L174" class="LineNr">174 </span><span class="Comment">//: todo: implement delimited continuations in Mu's memory</span>
+<span id="L175" class="LineNr">175 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L176" class="LineNr">176 </span><span class="Normal">struct</span> delimited_continuation <span class="Delimiter">{</span>
+<span id="L177" class="LineNr">177 </span>  call_stack frames<span class="Delimiter">;</span>
+<span id="L178" class="LineNr">178 </span>  <span class="Normal">int</span> nrefs<span class="Delimiter">;</span>
+<span id="L179" class="LineNr">179 </span>  delimited_continuation<span class="Delimiter">(</span>call_stack::iterator begin<span class="Delimiter">,</span> call_stack::iterator <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">)</span> :frames<span class="Delimiter">(</span>call_stack<span class="Delimiter">(</span>begin<span class="Delimiter">,</span> <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">)),</span> nrefs<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{}</span>
+<span id="L180" class="LineNr">180 </span><span class="Delimiter">};</span>
+<span id="L181" class="LineNr">181 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L182" class="LineNr">182 </span>map&lt;<span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span><span class="Delimiter">,</span> delimited_continuation&gt; Delimited_continuation<span class="Delimiter">;</span>
+<span id="L183" class="LineNr">183 </span><span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span> Next_delimited_continuation_id = <span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// 0 is null just like an address</span>
+<span id="L184" class="LineNr">184 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
+<span id="L185" class="LineNr">185 </span>Delimited_continuation<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L186" class="LineNr">186 </span>Next_delimited_continuation_id = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L187" class="LineNr">187 </span>
+<span id="L188" class="LineNr">188 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Declarations&quot;)</span>
+<span id="L189" class="LineNr">189 </span>RETURN_CONTINUATION_UNTIL_MARK<span class="Delimiter">,</span>
+<span id="L190" class="LineNr">190 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Numbers&quot;)</span>
+<span id="L191" class="LineNr">191 </span>Recipe_ordinal[<span class="Constant">&quot;return-continuation-until-mark&quot;</span>] = RETURN_CONTINUATION_UNTIL_MARK<span class="Delimiter">;</span>
+<span id="L192" class="LineNr">192 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
+<span id="L193" class="LineNr">193 </span><span class="Normal">case</span> RETURN_CONTINUATION_UNTIL_MARK: <span class="Delimiter">{</span>
+<span id="L194" class="LineNr">194 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L195" class="LineNr">195 </span>    <a href='003trace.cc.html#L174'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' requires at least one ingredient: a mark tag (number)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
+<span id="L196" class="LineNr">196 </span>  <span class="Delimiter">}</span>
+<span id="L197" class="LineNr">197 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L198" class="LineNr">198 </span><span class="Delimiter">}</span>
+<span id="L199" class="LineNr">199 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
+<span id="L200" class="LineNr">200 </span><span class="Normal">case</span> RETURN_CONTINUATION_UNTIL_MARK: <span class="Delimiter">{</span>
+<span id="L201" class="LineNr">201 </span>  <span class="Comment">// I don't know how to think about next-ingredient in combination with</span>
+<span id="L202" class="LineNr">202 </span>  <span class="Comment">// continuations, so seems cleaner to just kill it. Functions have to read</span>
+<span id="L203" class="LineNr">203 </span>  <span class="Comment">// their inputs before ever returning a continuation.</span>
+<span id="L204" class="LineNr">204 </span>  Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L205" class="LineNr">205 </span>  Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>next_ingredient_to_process = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L206" class="LineNr">206 </span>  <span class="Comment">// copy the current call stack until the most recent marked call</span>
+<span id="L207" class="LineNr">207 </span>  call_stack::iterator find_base_of_continuation<span class="Delimiter">(</span>call_stack&amp;<span class="Delimiter">,</span> <span class="Normal">int</span><span class="Delimiter">);</span>  <span class="Comment">// manual prototype containing '::'</span>
+<span id="L208" class="LineNr">208 </span>  call_stack::iterator base = find_base_of_continuation<span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">mark tag</span><span class="Comment">*/</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>value<span class="Delimiter">);</span>
+<span id="L209" class="LineNr">209 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base == Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span><a href='003trace.cc.html#L203'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L210" class="LineNr">210 </span>    <a href='003trace.cc.html#L174'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;couldn't find a 'call-with-continuation-mark' to return to with tag &quot;</span> &lt;&lt; current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L211" class="LineNr">211 </span>    <a href='003trace.cc.html#L174'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;call stack:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
+<span id="L212" class="LineNr">212 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::iterator p = Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span><a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L213" class="LineNr">213 </span>      <a href='003trace.cc.html#L174'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>running_recipe<span class="Delimiter">).</span>name &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
+<span id="L214" class="LineNr">214 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L215" class="LineNr">215 </span>  <span class="Delimiter">}</span>
+<span id="L216" class="LineNr">216 </span>  <a href='003trace.cc.html#L167'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;creating continuation &quot;</span> &lt;&lt; Next_delimited_continuation_id &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
+<span id="L217" class="LineNr">217 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> Next_delimited_continuation_id<span class="Delimiter">,</span> delimited_continuation<span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> base<span class="Delimiter">));</span>
+<span id="L218" class="LineNr">218 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>begin<span class="Delimiter">()</span> != base<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L219" class="LineNr">219 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L220" class="LineNr">220 </span>      --Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">;</span>
+<span id="L221" class="LineNr">221 </span>      assert<span class="Delimiter">(</span>Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &gt;= <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L222" class="LineNr">222 </span>    <span class="Delimiter">}</span>
+<span id="L223" class="LineNr">223 </span>    Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>pop_front<span class="Delimiter">();</span>
+<span id="L224" class="LineNr">224 </span>  <span class="Delimiter">}</span>
+<span id="L225" class="LineNr">225 </span>  <span class="Comment">// return it as the result of the marked call</span>
+<span id="L226" class="LineNr">226 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L227" class="LineNr">227 </span>  products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>Next_delimited_continuation_id<span class="Delimiter">);</span>
+<span id="L228" class="LineNr">228 </span>  <span class="Comment">// return any other ingredients passed in</span>
+<span id="L229" class="LineNr">229 </span>  copy<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip mark tag</span><span class="Comment">*/</span>++ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L203'>end</a><span class="Delimiter">(),</span> inserter<span class="Delimiter">(</span>products<span class="Delimiter">,</span> products<span class="Delimiter">.</span><a href='003trace.cc.html#L203'>end</a><span class="Delimiter">()));</span>
+<span id="L230" class="LineNr">230 </span>  ++Next_delimited_continuation_id<span class="Delimiter">;</span>
+<span id="L231" class="LineNr">231 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// continue to process rest of marked call</span>
+<span id="L232" class="LineNr">232 </span><span class="Delimiter">}</span>
+<span id="L233" class="LineNr">233 </span>
+<span id="L234" class="LineNr">234 </span><span class="Delimiter">:(code)</span>
+<span id="L235" class="LineNr">235 </span>call_stack::iterator find_base_of_continuation<span class="Delimiter">(</span>call_stack&amp; c<span class="Delimiter">,</span> <span class="Normal">int</span> mark_tag<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L236" class="LineNr">236 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::iterator p = c<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != c<span class="Delimiter">.</span><a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span>
+<span id="L237" class="LineNr">237 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>continuation_mark_tag == mark_tag<span class="Delimiter">)</span> <span class="Identifier">return</span> p<span class="Delimiter">;</span>
+<span id="L238" class="LineNr">238 </span>  <span class="Identifier">return</span> c<span class="Delimiter">.</span><a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
+<span id="L239" class="LineNr">239 </span><span class="Delimiter">}</span>
+<span id="L240" class="LineNr">240 </span>
+<span id="L241" class="LineNr">241 </span><span class="Comment">//: overload 'call' for continuations</span>
+<span id="L242" class="LineNr">242 </span><span class="Delimiter">:(after &quot;Begin Call&quot;)</span>
+<span id="L243" class="LineNr">243 </span><span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_continuation<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
+<span id="L244" class="LineNr">244 </span>  <span class="Comment">// copy multiple calls on to current call stack</span>
+<span id="L245" class="LineNr">245 </span>  assert<span class="Delimiter">(</span>scalar<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)));</span>
+<span id="L246" class="LineNr">246 </span>  <a href='003trace.cc.html#L167'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;calling continuation &quot;</span> &lt;&lt; ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
+<span id="L247" class="LineNr">247 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span>
+<span id="L248" class="LineNr">248 </span>    <a href='003trace.cc.html#L174'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;no such delimited continuation &quot;</span> &lt;&lt; <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
+<span id="L249" class="LineNr">249 </span>  <span class="Normal">const</span> call_stack&amp; new_frames = get<span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)).</span>frames<span class="Delimiter">;</span>
+<span id="L250" class="LineNr">250 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::const_reverse_iterator p = new_frames<span class="Delimiter">.</span>rbegin<span class="Delimiter">();</span> p != new_frames<span class="Delimiter">.</span>rend<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span>
+<span id="L251" class="LineNr">251 </span>    Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>push_front<span class="Delimiter">(</span>*p<span class="Delimiter">);</span>
+<span id="L252" class="LineNr">252 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L253" class="LineNr">253 </span>    Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth += <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>new_frames<span class="Delimiter">);</span>
+<span id="L254" class="LineNr">254 </span>    <a href='003trace.cc.html#L167'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;calling delimited continuation; growing callstack depth to &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
+<span id="L255" class="LineNr">255 </span>    assert<span class="Delimiter">(</span>Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt; <span class="Constant">9000</span><span class="Delimiter">);</span>  <span class="Comment">// 9998-101 plus cushion</span>
+<span id="L256" class="LineNr">256 </span>  <span class="Delimiter">}</span>
+<span id="L257" class="LineNr">257 </span>  <span class="Comment">// no call housekeeping; continuations don't support next-ingredient</span>
+<span id="L258" class="LineNr">258 </span>  copy<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">drop continuation</span><span class="Comment">*/</span>++ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L203'>end</a><span class="Delimiter">(),</span> inserter<span class="Delimiter">(</span>products<span class="Delimiter">,</span> products<span class="Delimiter">.</span>begin<span class="Delimiter">()));</span>
+<span id="L259" class="LineNr">259 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// record results of resuming 'return-continuation-until-mark' instruction</span>
+<span id="L260" class="LineNr">260 </span><span class="Delimiter">}</span>
+<span id="L261" class="LineNr">261 </span>
+<span id="L262" class="LineNr">262 </span><span class="Delimiter">:(scenario continuations_can_return_values)</span>
+<span id="L263" class="LineNr">263 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L264" class="LineNr">264 </span>  local-scope
+<span id="L265" class="LineNr">265 </span>  <span class="Normal">k</span>:continuation<span class="Delimiter">,</span> <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>call-with-continuation-mark <span class="Constant">233</span>/mark<span class="Delimiter">,</span> f
+<span id="L266" class="LineNr">266 </span>]
+<span id="L267" class="LineNr">267 </span><span class="muRecipe">def</span> f [
+<span id="L268" class="LineNr">268 </span>  local-scope
+<span id="L269" class="LineNr">269 </span>  g
 <span id="L270" class="LineNr">270 </span>]
-<span id="L271" class="LineNr">271 </span><span class="muRecipe">def</span> f [
+<span id="L271" class="LineNr">271 </span><span class="muRecipe">def</span> g [
 <span id="L272" class="LineNr">272 </span>  local-scope
-<span id="L273" class="LineNr">273 </span>  <span class="Normal">k2</span>:continuation<span class="Special"> &lt;- </span>call-with-continuation-mark <span class="Constant">234</span>/mark<span class="Delimiter">,</span> g
-<span id="L274" class="LineNr">274 </span>  add <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">2</span>
+<span id="L273" class="LineNr">273 </span>  <span class="Identifier">return</span>-continuation-until-mark <span class="Constant">233</span>/mark<span class="Delimiter">,</span> <span class="Constant">34</span>
+<span id="L274" class="LineNr">274 </span>  stash [continuation called]
 <span id="L275" class="LineNr">275 </span>]
-<span id="L276" class="LineNr">276 </span><span class="muRecipe">def</span> g [
-<span id="L277" class="LineNr">277 </span>  local-scope
-<span id="L278" class="LineNr">278 </span>  <span class="Identifier">return</span>-continuation-until-mark <span class="Constant">233</span>/mark<span class="Delimiter">,</span> <span class="Constant">34</span>
-<span id="L279" class="LineNr">279 </span>  stash [continuation called]
-<span id="L280" class="LineNr">280 </span>]
-<span id="L281" class="LineNr">281 </span><span class="traceContains">+run: add {1: &quot;literal&quot;}, {1: &quot;literal&quot;}</span>
-<span id="L282" class="LineNr">282 </span><span class="traceAbsent">-run: add {2: &quot;literal&quot;}, {2: &quot;literal&quot;}</span>
-<span id="L283" class="LineNr">283 </span>
-<span id="L284" class="LineNr">284 </span><span class="Comment">//: Allow shape-shifting recipes to return continuations.</span>
-<span id="L285" class="LineNr">285 </span>
-<span id="L286" class="LineNr">286 </span><span class="Delimiter">:(scenario call_shape_shifting_recipe_with_continuation_mark)</span>
-<span id="L287" class="LineNr">287 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L288" class="LineNr">288 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>call-with-continuation-mark <span class="Constant">233</span>/mark<span class="Delimiter">,</span> f<span class="Delimiter">,</span> <span class="Constant">34</span>
-<span id="L289" class="LineNr">289 </span>]
-<span id="L290" class="LineNr">290 </span><span class="muRecipe">def</span> f x:_elem<span class="muRecipe"> -&gt; </span>y:_elem [
-<span id="L291" class="LineNr">291 </span>  local-scope
-<span id="L292" class="LineNr">292 </span>  load-ingredients
-<span id="L293" class="LineNr">293 </span>  y<span class="Special"> &lt;- </span>copy x
-<span id="L294" class="LineNr">294 </span>]
-<span id="L295" class="LineNr">295 </span><span class="traceContains">+mem: storing 34 in location 1</span>
+<span id="L276" class="LineNr">276 </span><span class="traceContains">+mem: storing 34 in location 1</span>
+<span id="L277" class="LineNr">277 </span>
+<span id="L278" class="LineNr">278 </span><span class="Delimiter">:(scenario continuations_continue_to_matching_mark)</span>
+<span id="L279" class="LineNr">279 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L280" class="LineNr">280 </span>  local-scope
+<span id="L281" class="LineNr">281 </span>  <span class="Normal">k</span>:continuation<span class="Delimiter">,</span> <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>call-with-continuation-mark <span class="Constant">233</span>/mark<span class="Delimiter">,</span> f
+<span id="L282" class="LineNr">282 </span>  add <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span>
+<span id="L283" class="LineNr">283 </span>]
+<span id="L284" class="LineNr">284 </span><span class="muRecipe">def</span> f [
+<span id="L285" class="LineNr">285 </span>  local-scope
+<span id="L286" class="LineNr">286 </span>  <span class="Normal">k2</span>:continuation<span class="Special"> &lt;- </span>call-with-continuation-mark <span class="Constant">234</span>/mark<span class="Delimiter">,</span> g
+<span id="L287" class="LineNr">287 </span>  add <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">2</span>
+<span id="L288" class="LineNr">288 </span>]
+<span id="L289" class="LineNr">289 </span><span class="muRecipe">def</span> g [
+<span id="L290" class="LineNr">290 </span>  local-scope
+<span id="L291" class="LineNr">291 </span>  <span class="Identifier">return</span>-continuation-until-mark <span class="Constant">233</span>/mark<span class="Delimiter">,</span> <span class="Constant">34</span>
+<span id="L292" class="LineNr">292 </span>  stash [continuation called]
+<span id="L293" class="LineNr">293 </span>]
+<span id="L294" class="LineNr">294 </span><span class="traceContains">+run: add {1: &quot;literal&quot;}, {1: &quot;literal&quot;}</span>
+<span id="L295" class="LineNr">295 </span><span class="traceAbsent">-run: add {2: &quot;literal&quot;}, {2: &quot;literal&quot;}</span>
 <span id="L296" class="LineNr">296 </span>
-<span id="L297" class="LineNr">297 </span><span class="Delimiter">:(before &quot;End resolve_ambiguous_call(r, index, inst, caller_recipe) Special-cases&quot;)</span>
-<span id="L298" class="LineNr">298 </span><span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;call-with-continuation-mark&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L299" class="LineNr">299 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> &gt; <span class="Constant">1</span> &amp;&amp; <a href='072recipe.cc.html#L208'>is_recipe_literal</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip mark</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L300" class="LineNr">300 </span>  resolve_indirect_continuation_call<span class="Delimiter">(</span>r<span class="Delimiter">,</span> index<span class="Delimiter">,</span> inst<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">);</span>
-<span id="L301" class="LineNr">301 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L302" class="LineNr">302 </span>  <span class="Delimiter">}</span>
-<span id="L303" class="LineNr">303 </span><span class="Delimiter">}</span>
-<span id="L304" class="LineNr">304 </span><span class="Delimiter">:(code)</span>
-<span id="L305" class="LineNr">305 </span><span class="Normal">void</span> resolve_indirect_continuation_call<span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">,</span> <span class="Normal">int</span> index<span class="Delimiter">,</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; caller_recipe<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L306" class="LineNr">306 </span>  <a href='010vm.cc.html#L32'>instruction</a> inst2<span class="Delimiter">;</span>
-<span id="L307" class="LineNr">307 </span>  inst2<span class="Delimiter">.</span>name = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip mark</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">).</span>name<span class="Delimiter">;</span>
-<span id="L308" class="LineNr">308 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip mark and <a href='010vm.cc.html#L19'>recipe</a></span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L309" class="LineNr">309 </span>    inst2<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L310" class="LineNr">310 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip continuation</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L311" class="LineNr">311 </span>    inst2<span class="Delimiter">.</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L312" class="LineNr">312 </span>  <a href='054static_dispatch.cc.html#L173'>resolve_ambiguous_call</a><span class="Delimiter">(</span>r<span class="Delimiter">,</span> index<span class="Delimiter">,</span> inst2<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">);</span>
-<span id="L313" class="LineNr">313 </span>  inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip mark</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">).</span>name = inst2<span class="Delimiter">.</span>name<span class="Delimiter">;</span>
-<span id="L314" class="LineNr">314 </span>  inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip mark</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> inst2<span class="Delimiter">.</span>name<span class="Delimiter">));</span>
-<span id="L315" class="LineNr">315 </span><span class="Delimiter">}</span>
-<span id="L316" class="LineNr">316 </span>
-<span id="L317" class="LineNr">317 </span><span class="Delimiter">:(scenario call_shape_shifting_recipe_with_continuation_mark_and_no_outputs)</span>
-<span id="L318" class="LineNr">318 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L319" class="LineNr">319 </span>  <span class="Constant">1</span>:continuation<span class="Special"> &lt;- </span>call-with-continuation-mark <span class="Constant">233</span>/mark<span class="Delimiter">,</span> f<span class="Delimiter">,</span> <span class="Constant">34</span>
-<span id="L320" class="LineNr">320 </span>]
-<span id="L321" class="LineNr">321 </span><span class="muRecipe">def</span> f x:_elem [
-<span id="L322" class="LineNr">322 </span>  local-scope
-<span id="L323" class="LineNr">323 </span>  load-ingredients
-<span id="L324" class="LineNr">324 </span>  <span class="Identifier">return</span>-continuation-until-mark <span class="Constant">233</span>/mark
-<span id="L325" class="LineNr">325 </span>]
-<span id="L326" class="LineNr">326 </span>$error: <span class="Constant">0</span>
-<span id="L327" class="LineNr">327 </span>
-<span id="L328" class="LineNr">328 </span><span class="Delimiter">:(scenario continuation1)</span>
-<span id="L329" class="LineNr">329 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L330" class="LineNr">330 </span>  local-scope
-<span id="L331" class="LineNr">331 </span>  <span class="Normal">k</span>:continuation<span class="Special"> &lt;- </span>call-with-continuation-mark <span class="Constant">233</span>/mark<span class="Delimiter">,</span> create-yielder
-<span id="L332" class="LineNr">332 </span>  <span class="Constant">10</span>:num/<span class="Special">raw &lt;- </span>call k
+<span id="L297" class="LineNr">297 </span><span class="Comment">//: Allow shape-shifting recipes to return continuations.</span>
+<span id="L298" class="LineNr">298 </span>
+<span id="L299" class="LineNr">299 </span><span class="Delimiter">:(scenario call_shape_shifting_recipe_with_continuation_mark)</span>
+<span id="L300" class="LineNr">300 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L301" class="LineNr">301 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>call-with-continuation-mark <span class="Constant">233</span>/mark<span class="Delimiter">,</span> f<span class="Delimiter">,</span> <span class="Constant">34</span>
+<span id="L302" class="LineNr">302 </span>]
+<span id="L303" class="LineNr">303 </span><span class="muRecipe">def</span> f x:_elem<span class="muRecipe"> -&gt; </span>y:_elem [
+<span id="L304" class="LineNr">304 </span>  local-scope
+<span id="L305" class="LineNr">305 </span>  load-ingredients
+<span id="L306" class="LineNr">306 </span>  y<span class="Special"> &lt;- </span>copy x
+<span id="L307" class="LineNr">307 </span>]
+<span id="L308" class="LineNr">308 </span><span class="traceContains">+mem: storing 34 in location 1</span>
+<span id="L309" class="LineNr">309 </span>
+<span id="L310" class="LineNr">310 </span><span class="Delimiter">:(before &quot;End resolve_ambiguous_call(r, index, inst, caller_recipe) Special-cases&quot;)</span>
+<span id="L311" class="LineNr">311 </span><span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;call-with-continuation-mark&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L312" class="LineNr">312 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> &gt; <span class="Constant">1</span> &amp;&amp; <a href='072recipe.cc.html#L208'>is_recipe_literal</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip mark</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
+<span id="L313" class="LineNr">313 </span>  resolve_indirect_continuation_call<span class="Delimiter">(</span>r<span class="Delimiter">,</span> index<span class="Delimiter">,</span> inst<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">);</span>
+<span id="L314" class="LineNr">314 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L315" class="LineNr">315 </span>  <span class="Delimiter">}</span>
+<span id="L316" class="LineNr">316 </span><span class="Delimiter">}</span>
+<span id="L317" class="LineNr">317 </span><span class="Delimiter">:(code)</span>
+<span id="L318" class="LineNr">318 </span><span class="Normal">void</span> resolve_indirect_continuation_call<span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">,</span> <span class="Normal">int</span> index<span class="Delimiter">,</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; caller_recipe<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L319" class="LineNr">319 </span>  <a href='010vm.cc.html#L32'>instruction</a> inst2<span class="Delimiter">;</span>
+<span id="L320" class="LineNr">320 </span>  inst2<span class="Delimiter">.</span>name = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip mark</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">).</span>name<span class="Delimiter">;</span>
+<span id="L321" class="LineNr">321 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip mark and <a href='010vm.cc.html#L19'>recipe</a></span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L322" class="LineNr">322 </span>    inst2<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L323" class="LineNr">323 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip continuation</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L324" class="LineNr">324 </span>    inst2<span class="Delimiter">.</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L325" class="LineNr">325 </span>  <a href='054static_dispatch.cc.html#L173'>resolve_ambiguous_call</a><span class="Delimiter">(</span>r<span class="Delimiter">,</span> index<span class="Delimiter">,</span> inst2<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">);</span>
+<span id="L326" class="LineNr">326 </span>  inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip mark</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">).</span>name = inst2<span class="Delimiter">.</span>name<span class="Delimiter">;</span>
+<span id="L327" class="LineNr">327 </span>  inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip mark</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> inst2<span class="Delimiter">.</span>name<span class="Delimiter">));</span>
+<span id="L328" class="LineNr">328 </span><span class="Delimiter">}</span>
+<span id="L329" class="LineNr">329 </span>
+<span id="L330" class="LineNr">330 </span><span class="Delimiter">:(scenario call_shape_shifting_recipe_with_continuation_mark_and_no_outputs)</span>
+<span id="L331" class="LineNr">331 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L332" class="LineNr">332 </span>  <span class="Constant">1</span>:continuation<span class="Special"> &lt;- </span>call-with-continuation-mark <span class="Constant">233</span>/mark<span class="Delimiter">,</span> f<span class="Delimiter">,</span> <span class="Constant">34</span>
 <span id="L333" class="LineNr">333 </span>]
-<span id="L334" class="LineNr">334 </span><span class="muRecipe">def</span> create-yielder<span class="muRecipe"> -&gt; </span>n:num [
+<span id="L334" class="LineNr">334 </span><span class="muRecipe">def</span> f x:_elem [
 <span id="L335" class="LineNr">335 </span>  local-scope
-<span id="L336" class="LineNr">336 </span>  load-inputs
+<span id="L336" class="LineNr">336 </span>  load-ingredients
 <span id="L337" class="LineNr">337 </span>  <span class="Identifier">return</span>-continuation-until-mark <span class="Constant">233</span>/mark
-<span id="L338" class="LineNr">338 </span>  <span class="Identifier">return</span> <span class="Constant">1</span>
-<span id="L339" class="LineNr">339 </span>]
-<span id="L340" class="LineNr">340 </span><span class="traceContains">+mem: storing 1 in location 10</span>
-<span id="L341" class="LineNr">341 </span>$error: <span class="Constant">0</span>
-<span id="L342" class="LineNr">342 </span>
-<span id="L343" class="LineNr">343 </span><span class="Delimiter">:(code)</span>
-<span id="L344" class="LineNr">344 </span><span class="Normal">bool</span> is_mu_continuation<span class="Delimiter">(</span>reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L345" class="LineNr">345 </span>  canonize_type<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
-<span id="L346" class="LineNr">346 </span>  <span class="Identifier">return</span> x<span class="Delimiter">.</span>type &amp;&amp; x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom &amp;&amp; x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>value == get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;continuation&quot;</span><span class="Delimiter">);</span>
-<span id="L347" class="LineNr">347 </span><span class="Delimiter">}</span>
-<span id="L348" class="LineNr">348 </span>
-<span id="L349" class="LineNr">349 </span><span class="Comment">// helper for debugging</span>
-<span id="L350" class="LineNr">350 </span><span class="Normal">void</span> <a href='003trace.cc.html#L120'>dump</a><span class="Delimiter">(</span><span class="Normal">const</span> <span class="Normal">int</span> continuation_id<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L351" class="LineNr">351 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> continuation_id<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L352" class="LineNr">352 </span>    <a href='003trace.cc.html#L174'>raise</a> &lt;&lt; <span class="Constant">&quot;missing delimited continuation: &quot;</span> &lt;&lt; continuation_id &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
-<span id="L353" class="LineNr">353 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L354" class="LineNr">354 </span>  <span class="Delimiter">}</span>
-<span id="L355" class="LineNr">355 </span>  delimited_continuation&amp; curr = get<span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> continuation_id<span class="Delimiter">);</span>
-<span id="L356" class="LineNr">356 </span>  <a href='003trace.cc.html#L120'>dump</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>frames<span class="Delimiter">);</span>
-<span id="L357" class="LineNr">357 </span><span class="Delimiter">}</span>
+<span id="L338" class="LineNr">338 </span>]
+<span id="L339" class="LineNr">339 </span>$error: <span class="Constant">0</span>
+<span id="L340" class="LineNr">340 </span>
+<span id="L341" class="LineNr">341 </span><span class="Delimiter">:(scenario continuation1)</span>
+<span id="L342" class="LineNr">342 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L343" class="LineNr">343 </span>  local-scope
+<span id="L344" class="LineNr">344 </span>  <span class="Normal">k</span>:continuation<span class="Special"> &lt;- </span>call-with-continuation-mark <span class="Constant">233</span>/mark<span class="Delimiter">,</span> create-yielder
+<span id="L345" class="LineNr">345 </span>  <span class="Constant">10</span>:num/<span class="Special">raw &lt;- </span>call k
+<span id="L346" class="LineNr">346 </span>]
+<span id="L347" class="LineNr">347 </span><span class="muRecipe">def</span> create-yielder<span class="muRecipe"> -&gt; </span>n:num [
+<span id="L348" class="LineNr">348 </span>  local-scope
+<span id="L349" class="LineNr">349 </span>  load-inputs
+<span id="L350" class="LineNr">350 </span>  <span class="Identifier">return</span>-continuation-until-mark <span class="Constant">233</span>/mark
+<span id="L351" class="LineNr">351 </span>  <span class="Identifier">return</span> <span class="Constant">1</span>
+<span id="L352" class="LineNr">352 </span>]
+<span id="L353" class="LineNr">353 </span><span class="traceContains">+mem: storing 1 in location 10</span>
+<span id="L354" class="LineNr">354 </span>$error: <span class="Constant">0</span>
+<span id="L355" class="LineNr">355 </span>
+<span id="L356" class="LineNr">356 </span><span class="Delimiter">:(code)</span>
+<span id="L357" class="LineNr">357 </span><span class="Normal">bool</span> is_mu_continuation<span class="Delimiter">(</span>reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L358" class="LineNr">358 </span>  canonize_type<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
+<span id="L359" class="LineNr">359 </span>  <span class="Identifier">return</span> x<span class="Delimiter">.</span>type &amp;&amp; x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom &amp;&amp; x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>value == get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;continuation&quot;</span><span class="Delimiter">);</span>
+<span id="L360" class="LineNr">360 </span><span class="Delimiter">}</span>
+<span id="L361" class="LineNr">361 </span>
+<span id="L362" class="LineNr">362 </span><span class="Comment">// helper for debugging</span>
+<span id="L363" class="LineNr">363 </span><span class="Normal">void</span> <a href='003trace.cc.html#L120'>dump</a><span class="Delimiter">(</span><span class="Normal">const</span> <span class="Normal">int</span> continuation_id<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L364" class="LineNr">364 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> continuation_id<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L365" class="LineNr">365 </span>    <a href='003trace.cc.html#L174'>raise</a> &lt;&lt; <span class="Constant">&quot;missing delimited continuation: &quot;</span> &lt;&lt; continuation_id &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
+<span id="L366" class="LineNr">366 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L367" class="LineNr">367 </span>  <span class="Delimiter">}</span>
+<span id="L368" class="LineNr">368 </span>  delimited_continuation&amp; curr = get<span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> continuation_id<span class="Delimiter">);</span>
+<span id="L369" class="LineNr">369 </span>  <a href='003trace.cc.html#L120'>dump</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>frames<span class="Delimiter">);</span>
+<span id="L370" class="LineNr">370 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/080display.cc.html b/html/080display.cc.html
index 90059104..38c3adc9 100644
--- a/html/080display.cc.html
+++ b/html/080display.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 080display.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.PreProc { color: #800080; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.SalientComment { color: #00ffff; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.PreProc { color: #800080; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/081print.mu.html b/html/081print.mu.html
index e8f85a36..e33a35a2 100644
--- a/html/081print.mu.html
+++ b/html/081print.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 081print.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.muControl { color: #c0a020; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.CommentedCode { color: #6c6c6c; }
+.muControl { color: #c0a020; }
 .muData { color: #ffff00; }
 -->
 </style>
diff --git a/html/082scenario_screen.cc.html b/html/082scenario_screen.cc.html
index a0f0b515..5a0311bc 100644
--- a/html/082scenario_screen.cc.html
+++ b/html/082scenario_screen.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 082scenario_screen.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muRecipe { color: #ff8700; }
-.cSpecial { color: #008000; }
-.LineNr { color: #444444; }
-.traceAbsent { color: #c00000; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
-.muScenario { color: #00af00; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.muRecipe { color: #ff8700; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Special { color: #c00000; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.muScenario { color: #00af00; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .traceContains { color: #008000; }
+.traceAbsent { color: #c00000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/083scenario_screen_test.mu.html b/html/083scenario_screen_test.mu.html
index e28c3a8f..410ddfd7 100644
--- a/html/083scenario_screen_test.mu.html
+++ b/html/083scenario_screen_test.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 083scenario_screen_test.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,11 +16,11 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/084console.mu.html b/html/084console.mu.html
index 79431d05..2a1feec8 100644
--- a/html/084console.mu.html
+++ b/html/084console.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 084console.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 .muData { color: #ffff00; }
 -->
 </style>
diff --git a/html/085scenario_console.cc.html b/html/085scenario_console.cc.html
index 69962e44..4b7506b1 100644
--- a/html/085scenario_console.cc.html
+++ b/html/085scenario_console.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 085scenario_console.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
+.LineNr { color: #444444; }
 .muScenario { color: #00af00; }
-.Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
+.Identifier { color: #c0a020; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/086scenario_console_test.mu.html b/html/086scenario_console_test.mu.html
index 95f75adb..6bc9bb19 100644
--- a/html/086scenario_console_test.mu.html
+++ b/html/086scenario_console_test.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 086scenario_console_test.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,11 +16,11 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/087file.cc.html b/html/087file.cc.html
index 9e677f11..6967ce4c 100644
--- a/html/087file.cc.html
+++ b/html/087file.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 087file.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.PreProc { color: #800080; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
+.PreProc { color: #800080; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/088file.mu.html b/html/088file.mu.html
index c787a176..17c78532 100644
--- a/html/088file.mu.html
+++ b/html/088file.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 088file.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 .muData { color: #ffff00; }
 -->
 </style>
diff --git a/html/089scenario_filesystem.cc.html b/html/089scenario_filesystem.cc.html
index 7df32904..d9d727b6 100644
--- a/html/089scenario_filesystem.cc.html
+++ b/html/089scenario_filesystem.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 089scenario_filesystem.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
 .muScenario { color: #00af00; }
-.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Constant { color: #00a0a0; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/090scenario_filesystem_test.mu.html b/html/090scenario_filesystem_test.mu.html
index d598993f..847489f1 100644
--- a/html/090scenario_filesystem_test.mu.html
+++ b/html/090scenario_filesystem_test.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 090scenario_filesystem_test.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,11 +16,11 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/091socket.cc.html b/html/091socket.cc.html
index 354d990e..bcd1288d 100644
--- a/html/091socket.cc.html
+++ b/html/091socket.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 091socket.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.PreProc { color: #800080; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
+.PreProc { color: #800080; }
+.CommentedCode { color: #6c6c6c; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/092socket.mu.html b/html/092socket.mu.html
index 0e6d990b..427daf3d 100644
--- a/html/092socket.mu.html
+++ b/html/092socket.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 092socket.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,14 +16,14 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muControl { color: #c0a020; }
-.muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muRecipe { color: #ff8700; }
 .muData { color: #ffff00; }
 -->
 </style>
diff --git a/html/099hardware_checks.cc.html b/html/099hardware_checks.cc.html
index 85c0e046..7889d8a7 100644
--- a/html/099hardware_checks.cc.html
+++ b/html/099hardware_checks.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 099hardware_checks.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.traceContains { color: #008000; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
+.traceContains { color: #008000; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/100trace_browser.cc.html b/html/100trace_browser.cc.html
index 8b94dd9b..23ac48c7 100644
--- a/html/100trace_browser.cc.html
+++ b/html/100trace_browser.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 100trace_browser.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/101run_sandboxed.cc.html b/html/101run_sandboxed.cc.html
index 632eb48b..59f27f05 100644
--- a/html/101run_sandboxed.cc.html
+++ b/html/101run_sandboxed.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 101run_sandboxed.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
+.CommentedCode { color: #6c6c6c; }
 .muRecipe { color: #ff8700; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.CommentedCode { color: #6c6c6c; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/998check_type_pointers.cc.html b/html/998check_type_pointers.cc.html
index ba56ad81..0c26fe83 100644
--- a/html/998check_type_pointers.cc.html
+++ b/html/998check_type_pointers.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 998check_type_pointers.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,10 +15,10 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.LineNr { color: #444444; }
+.CommentedCode { color: #6c6c6c; }
 -->
 </style>
 
diff --git a/html/999spaces.cc.html b/html/999spaces.cc.html
index d1b38c3d..ab9d112d 100644
--- a/html/999spaces.cc.html
+++ b/html/999spaces.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 999spaces.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,12 +15,12 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
+.SalientComment { color: #00ffff; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/channel.mu.html b/html/channel.mu.html
index 8889cc76..f69af8e5 100644
--- a/html/channel.mu.html
+++ b/html/channel.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - channel.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/chessboard.mu.html b/html/chessboard.mu.html
index 1d3d7c43..1d479289 100644
--- a/html/chessboard.mu.html
+++ b/html/chessboard.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - chessboard.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.CommentedCode { color: #6c6c6c; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.muData { color: #ffff00; }
+.Delimiter { color: #800080; }
+.SalientComment { color: #00ffff; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.CommentedCode { color: #6c6c6c; }
+.muControl { color: #c0a020; }
+.muData { color: #ffff00; }
 -->
 </style>
 
diff --git a/html/console.mu.html b/html/console.mu.html
index 01572445..89a29e0e 100644
--- a/html/console.mu.html
+++ b/html/console.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - console.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/continuation1.mu.html b/html/continuation1.mu.html
index 3f9df7df..117cec3c 100644
--- a/html/continuation1.mu.html
+++ b/html/continuation1.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - continuation1.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/continuation2.mu.html b/html/continuation2.mu.html
index e994b660..fff4b247 100644
--- a/html/continuation2.mu.html
+++ b/html/continuation2.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - continuation2.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/continuation3.mu.html b/html/continuation3.mu.html
index 2eae301f..6fe3d94d 100644
--- a/html/continuation3.mu.html
+++ b/html/continuation3.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - continuation3.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/continuation4.mu.html b/html/continuation4.mu.html
index 99cfd00f..c6b56509 100644
--- a/html/continuation4.mu.html
+++ b/html/continuation4.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - continuation4.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/continuation5.mu.html b/html/continuation5.mu.html
index e73f7c66..8775a17b 100644
--- a/html/continuation5.mu.html
+++ b/html/continuation5.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - continuation5.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/counters.mu.html b/html/counters.mu.html
index fcd14576..bc824899 100644
--- a/html/counters.mu.html
+++ b/html/counters.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - counters.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,11 +16,11 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/display.mu.html b/html/display.mu.html
index 255c43fc..1010e09e 100644
--- a/html/display.mu.html
+++ b/html/display.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - display.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,11 +16,11 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/edit/001-editor.mu.html b/html/edit/001-editor.mu.html
index ab509ba6..b9ff83f1 100644
--- a/html/edit/001-editor.mu.html
+++ b/html/edit/001-editor.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/001-editor.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Delimiter { color: #800080; }
+.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.muData { color: #ffff00; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.muControl { color: #c0a020; }
+.muData { color: #ffff00; }
 -->
 </style>
 
diff --git a/html/edit/002-typing.mu.html b/html/edit/002-typing.mu.html
index d41306e4..a0cb8c06 100644
--- a/html/edit/002-typing.mu.html
+++ b/html/edit/002-typing.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/002-typing.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Delimiter { color: #800080; }
+.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.muData { color: #ffff00; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.muControl { color: #c0a020; }
+.muData { color: #ffff00; }
 -->
 </style>
 
diff --git a/html/edit/003-shortcuts.mu.html b/html/edit/003-shortcuts.mu.html
index e0dce0d0..9d7cd6d1 100644
--- a/html/edit/003-shortcuts.mu.html
+++ b/html/edit/003-shortcuts.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/003-shortcuts.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Delimiter { color: #800080; }
+.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/edit/004-programming-environment.mu.html b/html/edit/004-programming-environment.mu.html
index 5aa8c1d3..34437128 100644
--- a/html/edit/004-programming-environment.mu.html
+++ b/html/edit/004-programming-environment.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/004-programming-environment.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Delimiter { color: #800080; }
+.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.muData { color: #ffff00; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.muControl { color: #c0a020; }
+.muData { color: #ffff00; }
 -->
 </style>
 
diff --git a/html/edit/005-sandbox.mu.html b/html/edit/005-sandbox.mu.html
index 659d3d5e..93fec922 100644
--- a/html/edit/005-sandbox.mu.html
+++ b/html/edit/005-sandbox.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/005-sandbox.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Delimiter { color: #800080; }
+.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.muData { color: #ffff00; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.muControl { color: #c0a020; }
+.muData { color: #ffff00; }
 -->
 </style>
 
diff --git a/html/edit/006-sandbox-copy.mu.html b/html/edit/006-sandbox-copy.mu.html
index d5f19605..57c581a7 100644
--- a/html/edit/006-sandbox-copy.mu.html
+++ b/html/edit/006-sandbox-copy.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/006-sandbox-copy.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Delimiter { color: #800080; }
+.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/edit/007-sandbox-delete.mu.html b/html/edit/007-sandbox-delete.mu.html
index 531b4f9a..d51294bc 100644
--- a/html/edit/007-sandbox-delete.mu.html
+++ b/html/edit/007-sandbox-delete.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/007-sandbox-delete.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Delimiter { color: #800080; }
+.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/edit/008-sandbox-edit.mu.html b/html/edit/008-sandbox-edit.mu.html
index a9608819..a38ea948 100644
--- a/html/edit/008-sandbox-edit.mu.html
+++ b/html/edit/008-sandbox-edit.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/008-sandbox-edit.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Delimiter { color: #800080; }
+.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/edit/009-sandbox-test.mu.html b/html/edit/009-sandbox-test.mu.html
index 69023387..88dca874 100644
--- a/html/edit/009-sandbox-test.mu.html
+++ b/html/edit/009-sandbox-test.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/009-sandbox-test.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Delimiter { color: #800080; }
+.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.muData { color: #ffff00; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.muControl { color: #c0a020; }
+.muData { color: #ffff00; }
 -->
 </style>
 
diff --git a/html/edit/010-sandbox-trace.mu.html b/html/edit/010-sandbox-trace.mu.html
index fea30168..d0834aa1 100644
--- a/html/edit/010-sandbox-trace.mu.html
+++ b/html/edit/010-sandbox-trace.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/010-sandbox-trace.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,16 +16,16 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muControl { color: #c0a020; }
-.muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Delimiter { color: #800080; }
+.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.muData { color: #ffff00; }
+.LineNr { color: #444444; }
+.muRecipe { color: #ff8700; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.muData { color: #ffff00; }
 -->
 </style>
 
diff --git a/html/edit/011-errors.mu.html b/html/edit/011-errors.mu.html
index f0223f9a..2a5511ac 100644
--- a/html/edit/011-errors.mu.html
+++ b/html/edit/011-errors.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/011-errors.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Delimiter { color: #800080; }
+.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.muData { color: #ffff00; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.muControl { color: #c0a020; }
+.muData { color: #ffff00; }
 -->
 </style>
 
diff --git a/html/edit/012-editor-undo.mu.html b/html/edit/012-editor-undo.mu.html
index 0107b46d..ca822068 100644
--- a/html/edit/012-editor-undo.mu.html
+++ b/html/edit/012-editor-undo.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/012-editor-undo.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Delimiter { color: #800080; }
+.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.muData { color: #ffff00; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.muControl { color: #c0a020; }
+.muData { color: #ffff00; }
 -->
 </style>
 
diff --git a/html/example1.mu.html b/html/example1.mu.html
index d243e28a..2ff1fd66 100644
--- a/html/example1.mu.html
+++ b/html/example1.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - example1.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,9 +16,9 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/exception1.mu.html b/html/exception1.mu.html
index 0847b7f1..2810d748 100644
--- a/html/exception1.mu.html
+++ b/html/exception1.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - exception1.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/exception2.mu.html b/html/exception2.mu.html
index 50dede52..8e5c5c21 100644
--- a/html/exception2.mu.html
+++ b/html/exception2.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - exception2.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 .muData { color: #ffff00; }
 -->
 </style>
diff --git a/html/factorial.mu.html b/html/factorial.mu.html
index 25bb9120..67159a82 100644
--- a/html/factorial.mu.html
+++ b/html/factorial.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - factorial.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/filesystem.mu.html b/html/filesystem.mu.html
index e2668cba..8a6ec191 100644
--- a/html/filesystem.mu.html
+++ b/html/filesystem.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - filesystem.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/fork.mu.html b/html/fork.mu.html
index 51524616..79a3c978 100644
--- a/html/fork.mu.html
+++ b/html/fork.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - fork.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
+.muControl { color: #c0a020; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 -->
 </style>
 
diff --git a/html/http-client.mu.html b/html/http-client.mu.html
index a9de0103..d44e5f97 100644
--- a/html/http-client.mu.html
+++ b/html/http-client.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - http-client.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/http-server.mu.html b/html/http-server.mu.html
index f991bbf4..b8ff0d97 100644
--- a/html/http-server.mu.html
+++ b/html/http-server.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - http-server.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 -->
 </style>
 
@@ -78,8 +78,8 @@ if ('onhashchange' in window) {
 <span id="L20" class="LineNr">20 </span>  <a href='092socket.mu.html#L132'>write-to-socket</a> session, <span class="Constant">[HTTP/1.0 200 OK</span>
 <span id="L21" class="LineNr">21 </span><span class="Constant">Content-type: text/plain</span>
 <span id="L22" class="LineNr">22 </span>
-<span id="L23" class="LineNr">23 </span>SUCCESS!
-<span id="L24" class="LineNr">24 </span>]
+<span id="L23" class="LineNr">23 </span><span class="Constant">SUCCESS!</span>
+<span id="L24" class="LineNr">24 </span><span class="Constant">]</span>
 <span id="L25" class="LineNr">25 </span>  $print <span class="Constant">10/newline</span>, <span class="Constant">[Wrote to and closing socket...]</span>, <span class="Constant">10/newline</span>
 <span id="L26" class="LineNr">26 </span>  session <span class="Special">&lt;-</span> $close-socket session
 <span id="L27" class="LineNr">27 </span>  socket <span class="Special">&lt;-</span> $close-socket socket
diff --git a/html/immutable-error.mu.html b/html/immutable-error.mu.html
index 5beae585..92113108 100644
--- a/html/immutable-error.mu.html
+++ b/html/immutable-error.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - immutable-error.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,11 +16,11 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/lambda-to-mu.mu.html b/html/lambda-to-mu.mu.html
index 16fd5fa8..995ffb5b 100644
--- a/html/lambda-to-mu.mu.html
+++ b/html/lambda-to-mu.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - lambda-to-mu.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Delimiter { color: #800080; }
-.CommentedCode { color: #6c6c6c; }
+.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.muData { color: #ffff00; }
+.LineNr { color: #444444; }
+.CommentedCode { color: #6c6c6c; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.muControl { color: #c0a020; }
+.muData { color: #ffff00; }
 -->
 </style>
 
diff --git a/html/mutable.mu.html b/html/mutable.mu.html
index e95e071d..eea20c1b 100644
--- a/html/mutable.mu.html
+++ b/html/mutable.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - mutable.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,11 +16,11 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/nqueens.mu.html b/html/nqueens.mu.html
index 738ed03c..96140af7 100644
--- a/html/nqueens.mu.html
+++ b/html/nqueens.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - nqueens.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 .muData { color: #ffff00; }
 -->
 </style>
diff --git a/html/real-files.mu.html b/html/real-files.mu.html
index 3ca6dc32..c72cb608 100644
--- a/html/real-files.mu.html
+++ b/html/real-files.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - real-files.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,11 +16,11 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/same-fringe.mu.html b/html/same-fringe.mu.html
index 379762b2..e9057ab1 100644
--- a/html/same-fringe.mu.html
+++ b/html/same-fringe.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - same-fringe.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 .muData { color: #ffff00; }
 -->
 </style>
diff --git a/html/screen.mu.html b/html/screen.mu.html
index 93867b02..74f00d11 100644
--- a/html/screen.mu.html
+++ b/html/screen.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - screen.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,11 +16,11 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/static-dispatch.mu.html b/html/static-dispatch.mu.html
index 17061e69..26aa6263 100644
--- a/html/static-dispatch.mu.html
+++ b/html/static-dispatch.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - static-dispatch.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,11 +16,11 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/subx/000organization.cc.html b/html/subx/000organization.cc.html
index 411fb7a4..7bc3557c 100644
--- a/html/subx/000organization.cc.html
+++ b/html/subx/000organization.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/000organization.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .PreProc { color: #800080; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/subx/001help.cc.html b/html/subx/001help.cc.html
index b41814f3..da5d00c5 100644
--- a/html/subx/001help.cc.html
+++ b/html/subx/001help.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/001help.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.PreProc { color: #800080; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
 .SalientComment { color: #00ffff; }
-.Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.PreProc { color: #800080; }
+.CommentedCode { color: #6c6c6c; }
 .cSpecial { color: #008000; }
 -->
 </style>
@@ -172,16 +172,16 @@ if ('onhashchange' in window) {
 <span id="L110" class="LineNr">110 </span><span class="Normal">void</span> <a href='001help.cc.html#L110'>dump_and_exit</a><span class="Delimiter">(</span><span class="Normal">int</span> sig<span class="Delimiter">,</span> <a href='001help.cc.html#L208'>unused</a> siginfo_t* dummy1<span class="Delimiter">,</span> <a href='001help.cc.html#L208'>unused</a> <span class="Normal">void</span>* dummy2<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L111" class="LineNr">111 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>sig<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L112" class="LineNr">112 </span>    <span class="Normal">case</span> <span class="Constant">SIGABRT</span>:
-<span id="L113" class="LineNr">113 </span>      <span class="PreProc">#ifndef __APPLE__</span>
+<span id="L113" class="LineNr">113 </span><span class="PreProc">      #ifndef __APPLE__</span>
 <span id="L114" class="LineNr">114 </span>        cerr &lt;&lt; <span class="Constant">&quot;SIGABRT: might be an integer overflow if it wasn't an assert() failure</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L115" class="LineNr">115 </span>        _Exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L116" class="LineNr">116 </span>      <span class="PreProc">#endif</span>
+<span id="L116" class="LineNr">116 </span><span class="PreProc">      #endif</span>
 <span id="L117" class="LineNr">117 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L118" class="LineNr">118 </span>    <span class="Normal">case</span> <span class="Constant">SIGILL</span>:
-<span id="L119" class="LineNr">119 </span>      <span class="PreProc">#ifdef __APPLE__</span>
+<span id="L119" class="LineNr">119 </span><span class="PreProc">      #ifdef __APPLE__</span>
 <span id="L120" class="LineNr">120 </span>        cerr &lt;&lt; <span class="Constant">&quot;SIGILL: most likely caused by integer overflow</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L121" class="LineNr">121 </span>        _Exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L122" class="LineNr">122 </span>      <span class="PreProc">#endif</span>
+<span id="L122" class="LineNr">122 </span><span class="PreProc">      #endif</span>
 <span id="L123" class="LineNr">123 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L124" class="LineNr">124 </span>    <span class="Normal">default</span>:
 <span id="L125" class="LineNr">125 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/subx/002test.cc.html b/html/subx/002test.cc.html
index 0b9a1213..59ee6642 100644
--- a/html/subx/002test.cc.html
+++ b/html/subx/002test.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/002test.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.CommentedCode { color: #6c6c6c; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .PreProc { color: #800080; }
+.CommentedCode { color: #6c6c6c; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
@@ -74,7 +74,7 @@ if ('onhashchange' in window) {
 <span id="L13" class="LineNr">13 </span><span class="Delimiter">:(before &quot;Globals&quot;)</span>
 <span id="L14" class="LineNr">14 </span><span class="Comment">// move a global ahead into types that we can't generate an extern declaration for</span>
 <span id="L15" class="LineNr">15 </span><span class="Normal">const</span> <a href='002test.cc.html#L12'>test_fn</a> Tests[] = <span class="Delimiter">{</span>
-<span id="L16" class="LineNr">16 </span>  <span class="PreProc">#include </span><span class="Constant">&quot;test_list&quot;</span>  <span class="Comment">// auto-generated; see 'build' script</span>
+<span id="L16" class="LineNr">16 </span><span class="PreProc">  #include </span><span class="Constant">&quot;test_list&quot;</span>  <span class="Comment">// auto-generated; see 'build' script</span>
 <span id="L17" class="LineNr">17 </span><span class="Delimiter">};</span>
 <span id="L18" class="LineNr">18 </span>
 <span id="L19" class="LineNr">19 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
diff --git a/html/subx/003trace.cc.html b/html/subx/003trace.cc.html
index c20aed7a..da4d4f00 100644
--- a/html/subx/003trace.cc.html
+++ b/html/subx/003trace.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/003trace.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.PreProc { color: #800080; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
+.PreProc { color: #800080; }
 .cSpecial { color: #008000; }
 -->
 </style>
@@ -217,7 +217,7 @@ if ('onhashchange' in window) {
 <span id="L157" class="LineNr">157 </span><span class="PreProc">#define CLEAR_TRACE  </span><span class="Normal">delete</span><span class="PreProc"> Trace_stream</span><span class="Delimiter">,</span><span class="PreProc"> Trace_stream = </span><span class="Normal">new</span><span class="PreProc"> trace_stream</span><span class="Delimiter">;</span>
 <span id="L158" class="LineNr">158 </span>
 <span id="L159" class="LineNr">159 </span><span class="Comment">// Top-level helper. IMPORTANT: can't nest</span>
-<span id="L160" class="LineNr">160 </span><span class="PreProc">#define trace(</span><span class="Delimiter">...</span><span class="PreProc">)  !Trace_stream ? cerr </span><span class="Comment">/*</span><span class="Comment">print nothing</span><span class="Comment">*/</span><span class="PreProc"> : Trace_stream</span><span class="Delimiter">-&gt;</span><span class="PreProc">stream(</span><span class="Constant">__VA_ARGS__</span><span class="PreProc">)</span>
+<span id="L160" class="LineNr">160 </span><span class="PreProc">#define trace(</span><span class="Delimiter">...</span><span class="PreProc">)  !Trace_stream ? cerr </span><span class="Comment">/*</span><span class="Comment">print nothing</span><span class="Comment">*/</span><span class="PreProc"> : Trace_stream</span><span class="Delimiter">-&gt;</span><span class="PreProc">stream(__VA_ARGS__)</span>
 <span id="L161" class="LineNr">161 </span>
 <span id="L162" class="LineNr">162 </span><span class="Comment">// Just for debugging; 'git log' should never show any calls to 'dbg'.</span>
 <span id="L163" class="LineNr">163 </span><span class="PreProc">#define dbg trace(</span><span class="Constant">0</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">&quot;a&quot;</span><span class="PreProc">)</span>
@@ -274,7 +274,7 @@ if ('onhashchange' in window) {
 <span id="L214" class="LineNr">214 </span><a href='003trace.cc.html#L212'>START_TRACING_UNTIL_END_OF_SCOPE</a>
 <span id="L215" class="LineNr">215 </span>
 <span id="L216" class="LineNr">216 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L217" class="LineNr">217 </span><span class="PreProc">#define CHECK_TRACE_CONTENTS(</span><span class="Delimiter">...</span><span class="PreProc">)  check_trace_contents(__FUNCTION__</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">__FILE__</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">__LINE__</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">__VA_ARGS__</span><span class="PreProc">)</span>
+<span id="L217" class="LineNr">217 </span><span class="PreProc">#define CHECK_TRACE_CONTENTS(</span><span class="Delimiter">...</span><span class="PreProc">)  check_trace_contents(__FUNCTION__</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">__FILE__</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">__LINE__</span><span class="Delimiter">,</span><span class="PreProc"> __VA_ARGS__)</span>
 <span id="L218" class="LineNr">218 </span>
 <span id="L219" class="LineNr">219 </span><span class="PreProc">#define CHECK_TRACE_CONTAINS_ERRORS()  CHECK(trace_contains_errors())</span>
 <span id="L220" class="LineNr">220 </span><span class="PreProc">#define CHECK_TRACE_DOESNT_CONTAIN_ERRORS() \</span>
@@ -294,7 +294,7 @@ if ('onhashchange' in window) {
 <span id="L234" class="LineNr">234 </span><span class="PreProc">    </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span><span class="PreProc"> \</span>
 <span id="L235" class="LineNr">235 </span><span class="PreProc">  </span><span class="Delimiter">}</span>
 <span id="L236" class="LineNr">236 </span>
-<span id="L237" class="LineNr">237 </span><span class="PreProc">#define CHECK_TRACE_DOESNT_CONTAIN(</span><span class="Delimiter">...</span><span class="PreProc">)  CHECK(trace_doesnt_contain(</span><span class="Constant">__VA_ARGS__</span><span class="PreProc">))</span>
+<span id="L237" class="LineNr">237 </span><span class="PreProc">#define CHECK_TRACE_DOESNT_CONTAIN(</span><span class="Delimiter">...</span><span class="PreProc">)  CHECK(trace_doesnt_contain(__VA_ARGS__))</span>
 <span id="L238" class="LineNr">238 </span>
 <span id="L239" class="LineNr">239 </span><span class="Delimiter">:(code)</span>
 <span id="L240" class="LineNr">240 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L240'>check_trace_contents</a><span class="Delimiter">(</span>string FUNCTION<span class="Delimiter">,</span> string <span class="Normal">FILE</span><span class="Delimiter">,</span> <span class="Normal">int</span> LINE<span class="Delimiter">,</span> string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
diff --git a/html/subx/003trace.test.cc.html b/html/subx/003trace.test.cc.html
index 2d875c8b..621dab4d 100644
--- a/html/subx/003trace.test.cc.html
+++ b/html/subx/003trace.test.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/003trace.test.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,12 +15,12 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/subx/010core.cc.html b/html/subx/010core.cc.html
index 4488688c..1a41f0d6 100644
--- a/html/subx/010core.cc.html
+++ b/html/subx/010core.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/010core.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.traceContains { color: #008000; }
-.PreProc { color: #800080; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.SalientComment { color: #00ffff; }
 .Delimiter { color: #800080; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.PreProc { color: #800080; }
+.traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/subx/011direct_addressing.cc.html b/html/subx/011direct_addressing.cc.html
index b1441467..f22eca60 100644
--- a/html/subx/011direct_addressing.cc.html
+++ b/html/subx/011direct_addressing.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/011direct_addressing.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.traceContains { color: #008000; }
-.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .SalientComment { color: #00ffff; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .PreProc { color: #800080; }
+.traceContains { color: #008000; }
+.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/subx/012indirect_addressing.cc.html b/html/subx/012indirect_addressing.cc.html
index 407c1880..4ae0e3cc 100644
--- a/html/subx/012indirect_addressing.cc.html
+++ b/html/subx/012indirect_addressing.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/012indirect_addressing.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
-.traceContains { color: #008000; }
-.LineNr { color: #444444; }
-.traceAbsent { color: #c00000; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
+.traceAbsent { color: #c00000; }
 .SalientComment { color: #00ffff; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .PreProc { color: #800080; }
+.traceContains { color: #008000; }
+.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
 -->
 </style>
 
diff --git a/html/subx/013immediate_addressing.cc.html b/html/subx/013immediate_addressing.cc.html
index b998bb3f..169be4fe 100644
--- a/html/subx/013immediate_addressing.cc.html
+++ b/html/subx/013immediate_addressing.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/013immediate_addressing.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.PreProc { color: #800080; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .SalientComment { color: #00ffff; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
+.PreProc { color: #800080; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/subx/014index_addressing.cc.html b/html/subx/014index_addressing.cc.html
index 88ce0614..c8562245 100644
--- a/html/subx/014index_addressing.cc.html
+++ b/html/subx/014index_addressing.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/014index_addressing.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
-.traceContains { color: #008000; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .PreProc { color: #800080; }
+.traceContains { color: #008000; }
+.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
 -->
 </style>
 
diff --git a/html/subx/015jump_relative.cc.html b/html/subx/015jump_relative.cc.html
index 3517af1b..af4609c4 100644
--- a/html/subx/015jump_relative.cc.html
+++ b/html/subx/015jump_relative.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/015jump_relative.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.traceAbsent { color: #c00000; }
-.traceContains { color: #008000; }
-.PreProc { color: #800080; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.SalientComment { color: #00ffff; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.PreProc { color: #800080; }
+.traceContains { color: #008000; }
+.traceAbsent { color: #c00000; }
 -->
 </style>
 
diff --git a/html/subx/016jump_relative.cc.html b/html/subx/016jump_relative.cc.html
index 8c8dbbe1..9a9049e2 100644
--- a/html/subx/016jump_relative.cc.html
+++ b/html/subx/016jump_relative.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/016jump_relative.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.traceAbsent { color: #c00000; }
-.traceContains { color: #008000; }
-.PreProc { color: #800080; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.SalientComment { color: #00ffff; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.PreProc { color: #800080; }
+.traceContains { color: #008000; }
+.traceAbsent { color: #c00000; }
 -->
 </style>
 
diff --git a/html/subx/017functions.cc.html b/html/subx/017functions.cc.html
index c71b8a41..80d2f34d 100644
--- a/html/subx/017functions.cc.html
+++ b/html/subx/017functions.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/017functions.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.traceContains { color: #008000; }
-.PreProc { color: #800080; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
 .Special { color: #c00000; }
+.SalientComment { color: #00ffff; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.PreProc { color: #800080; }
+.traceContains { color: #008000; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 -->
 </style>
 
diff --git a/html/subx/020elf.cc.html b/html/subx/020elf.cc.html
index ef3dea8b..b346296e 100644
--- a/html/subx/020elf.cc.html
+++ b/html/subx/020elf.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/020elf.cc</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Todo { color: #000000; background-color: #ffff00; padding-bottom: 1px; }
-.PreProc { color: #800080; }
-.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.PreProc { color: #800080; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
+.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
+.Todo { color: #000000; background-color: #ffff00; padding-bottom: 1px; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/tangle.mu.html b/html/tangle.mu.html
index 2dbb66d5..789a9af4 100644
--- a/html/tangle.mu.html
+++ b/html/tangle.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - tangle.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
+.muControl { color: #c0a020; }
 .Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/x.mu.html b/html/x.mu.html
index 022c3a6f..2581c401 100644
--- a/html/x.mu.html
+++ b/html/x.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - x.mu</title>
-<meta name="Generator" content="Vim/8.0">
+<meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,11 +16,11 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 -->
 </style>