about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2017-12-15 02:09:36 -0800
committerKartik K. Agaram <vc@akkartik.com>2017-12-15 02:09:36 -0800
commitfe8bf967a945c7d9e6aba36e42518262d54bd348 (patch)
treed8693470d0695508dd650d1b9b836fbeae79394c
parent5059f32d0ddf36b9591ad0c14ee474ad5f2f8816 (diff)
downloadmu-fe8bf967a945c7d9e6aba36e42518262d54bd348.tar.gz
4161
-rw-r--r--html/000organization.cc.html10
-rw-r--r--html/001help.cc.html22
-rw-r--r--html/002test.cc.html16
-rw-r--r--html/003trace.cc.html18
-rw-r--r--html/003trace.test.cc.html8
-rw-r--r--html/010vm.cc.html16
-rw-r--r--html/011load.cc.html16
-rw-r--r--html/012transform.cc.html10
-rw-r--r--html/013update_operation.cc.html14
-rw-r--r--html/014literal_string.cc.html16
-rw-r--r--html/015literal_noninteger.cc.html18
-rw-r--r--html/016dilated_reagent.cc.html19
-rw-r--r--html/017parse_tree.cc.html16
-rw-r--r--html/018type_abbreviations.cc.html12
-rw-r--r--html/020run.cc.html14
-rw-r--r--html/021check_instruction.cc.html16
-rw-r--r--html/022arithmetic.cc.html26
-rw-r--r--html/023boolean.cc.html14
-rw-r--r--html/024jump.cc.html18
-rw-r--r--html/025compare.cc.html14
-rw-r--r--html/026call.cc.html14
-rw-r--r--html/027call_ingredient.cc.html18
-rw-r--r--html/028call_return.cc.html18
-rw-r--r--html/029tools.cc.html20
-rw-r--r--html/030container.cc.html12
-rw-r--r--html/031merge.cc.html12
-rw-r--r--html/032array.cc.html14
-rw-r--r--html/033exclusive_container.cc.html12
-rw-r--r--html/034address.cc.html16
-rw-r--r--html/035lookup.cc.html16
-rw-r--r--html/036refcount.cc.html12
-rw-r--r--html/037abandon.cc.html12
-rw-r--r--html/038new_text.cc.html16
-rw-r--r--html/040brace.cc.html14
-rw-r--r--html/041jump_target.cc.html18
-rw-r--r--html/042name.cc.html12
-rw-r--r--html/043space.cc.html12
-rw-r--r--html/044space_surround.cc.html16
-rw-r--r--html/045closure_name.cc.html18
-rw-r--r--html/046check_type_by_name.cc.html18
-rw-r--r--html/050scenario.cc.html32
-rw-r--r--html/051scenario_test.mu.html8
-rw-r--r--html/052tangle.cc.html18
-rw-r--r--html/053recipe_header.cc.html14
-rw-r--r--html/054static_dispatch.cc.html12
-rw-r--r--html/055shape_shifting_container.cc.html10
-rw-r--r--html/056shape_shifting_recipe.cc.html19
-rw-r--r--html/057immutable.cc.html18
-rw-r--r--html/058to_text.cc.html10
-rw-r--r--html/059to_text.mu.html8
-rw-r--r--html/060rewrite_literal_string.cc.html16
-rw-r--r--html/061text.mu.html10
-rw-r--r--html/062convert_ingredients_to_text.cc.html16
-rw-r--r--html/063array.mu.html14
-rw-r--r--html/064list.mu.html12
-rw-r--r--html/065duplex_list.mu.html12
-rw-r--r--html/066stream.mu.html12
-rw-r--r--html/067random.cc.html8
-rw-r--r--html/068random.mu.html12
-rw-r--r--html/069hash.cc.html14
-rw-r--r--html/070table.mu.html12
-rw-r--r--html/071deep_copy.cc.html16
-rw-r--r--html/072recipe.cc.html526
-rw-r--r--html/073scheduler.cc.html14
-rw-r--r--html/074wait.cc.html12
-rw-r--r--html/075channel.mu.html18
-rw-r--r--html/076continuation.cc.html609
-rw-r--r--html/080display.cc.html14
-rw-r--r--html/081print.mu.html14
-rw-r--r--html/082scenario_screen.cc.html40
-rw-r--r--html/083scenario_screen_test.mu.html8
-rw-r--r--html/084console.mu.html10
-rw-r--r--html/085scenario_console.cc.html14
-rw-r--r--html/086scenario_console_test.mu.html8
-rw-r--r--html/087file.cc.html12
-rw-r--r--html/088file.mu.html12
-rw-r--r--html/089scenario_filesystem.cc.html12
-rw-r--r--html/090scenario_filesystem_test.mu.html8
-rw-r--r--html/091socket.cc.html14
-rw-r--r--html/092socket.mu.html12
-rw-r--r--html/099hardware_checks.cc.html14
-rw-r--r--html/100trace_browser.cc.html12
-rw-r--r--html/101run_sandboxed.cc.html28
-rw-r--r--html/998check_type_pointers.cc.html4
-rw-r--r--html/999spaces.cc.html8
-rw-r--r--html/channel.mu.html8
-rw-r--r--html/chessboard.mu.html12
-rw-r--r--html/console.mu.html8
-rw-r--r--html/continuation1.mu.html12
-rw-r--r--html/continuation2.mu.html16
-rw-r--r--html/continuation3.mu.html14
-rw-r--r--html/continuation4.mu.html14
-rw-r--r--html/continuation5.mu.html14
-rw-r--r--html/counters.mu.html8
-rw-r--r--html/display.mu.html8
-rw-r--r--html/edit/001-editor.mu.html14
-rw-r--r--html/edit/002-typing.mu.html12
-rw-r--r--html/edit/003-shortcuts.mu.html12
-rw-r--r--html/edit/004-programming-environment.mu.html14
-rw-r--r--html/edit/005-sandbox.mu.html14
-rw-r--r--html/edit/006-sandbox-copy.mu.html12
-rw-r--r--html/edit/007-sandbox-delete.mu.html12
-rw-r--r--html/edit/008-sandbox-edit.mu.html12
-rw-r--r--html/edit/009-sandbox-test.mu.html14
-rw-r--r--html/edit/010-sandbox-trace.mu.html14
-rw-r--r--html/edit/011-errors.mu.html14
-rw-r--r--html/edit/012-editor-undo.mu.html14
-rw-r--r--html/example1.mu.html8
-rw-r--r--html/factorial.mu.html8
-rw-r--r--html/filesystem.mu.html8
-rw-r--r--html/fork.mu.html8
-rw-r--r--html/http-client.mu.html8
-rw-r--r--html/http-server.mu.html8
-rw-r--r--html/immutable-error.mu.html8
-rw-r--r--html/lambda-to-mu.mu.html16
-rw-r--r--html/mutable.mu.html8
-rw-r--r--html/nqueens.mu.html10
-rw-r--r--html/real-files.mu.html8
-rw-r--r--html/same-fringe.mu.html54
-rw-r--r--html/screen.mu.html8
-rw-r--r--html/static-dispatch.mu.html8
-rw-r--r--html/subx/000organization.cc.html12
-rw-r--r--html/subx/001help.cc.html24
-rw-r--r--html/subx/002test.cc.html16
-rw-r--r--html/subx/003trace.cc.html18
-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.html20
-rw-r--r--html/subx/012indirect_addressing.cc.html18
-rw-r--r--html/subx/013immediate_addressing.cc.html16
-rw-r--r--html/subx/014jump_relative.cc.html18
-rw-r--r--html/subx/015jump_relative.cc.html18
-rw-r--r--html/subx/016functions.cc.html16
-rw-r--r--html/tangle.mu.html10
-rw-r--r--html/x.mu.html8
135 files changed, 1520 insertions, 1475 deletions
diff --git a/html/000organization.cc.html b/html/000organization.cc.html
index f951a49d..8a5467a4 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.Identifier { color: #c0a020; }
 .Delimiter { color: #800080; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .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; }
-.PreProc { color: #800080; }
 -->
 </style>
 
diff --git a/html/001help.cc.html b/html/001help.cc.html
index eeebfa25..e4c794c5 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
 .Conceal { color: #4e4e4e; }
+.PreProc { color: #800080; }
+.LineNr { color: #444444; }
 .SalientComment { color: #00ffff; }
+.Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
+.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; }
+.CommentedCode { color: #6c6c6c; }
 -->
 </style>
 
@@ -223,16 +223,16 @@ if ('onhashchange' in window) {
 <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="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="Conceal">¦</span> <span class="Normal">case</span> <span class="Constant">SIGABRT</span>:
-<span id="L163" class="LineNr">163 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> #ifndef __APPLE__</span>
+<span id="L163" class="LineNr">163 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> #ifndef __APPLE__
 <span id="L164" class="LineNr">164 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</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="L165" class="LineNr">165 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</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">  </span><span class="Conceal">¦</span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> #endif</span>
+<span id="L166" class="LineNr">166 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> #endif
 <span id="L167" class="LineNr">167 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L168" class="LineNr">168 </span>  <span class="Conceal">¦</span> <span class="Normal">case</span> <span class="Constant">SIGILL</span>:
-<span id="L169" class="LineNr">169 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> #ifdef __APPLE__</span>
+<span id="L169" class="LineNr">169 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> #ifdef __APPLE__
 <span id="L170" class="LineNr">170 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</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>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</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">  </span><span class="Conceal">¦</span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> #endif</span>
+<span id="L172" class="LineNr">172 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> #endif
 <span id="L173" class="LineNr">173 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L174" class="LineNr">174 </span>  <span class="Conceal">¦</span> <span class="Normal">default</span>:
 <span id="L175" class="LineNr">175 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/002test.cc.html b/html/002test.cc.html
index db483fc5..29ae89bc 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
 .Conceal { color: #4e4e4e; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
+.PreProc { color: #800080; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
-.CommentedCode { color: #6c6c6c; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
 .cSpecial { color: #008000; }
+.CommentedCode { color: #6c6c6c; }
 -->
 </style>
 
@@ -75,7 +75,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 f94ed738..0b64e30d 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
 .Conceal { color: #4e4e4e; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
+.PreProc { color: #800080; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
 .cSpecial { color: #008000; }
 -->
 </style>
@@ -225,7 +225,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(__VA_ARGS__)</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="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>
@@ -290,7 +290,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"> __VA_ARGS__)</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="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>
@@ -310,7 +310,7 @@ if ('onhashchange' in window) {
 <span id="L249" class="LineNr">249 </span><span class="PreProc">  </span><span class="Conceal">¦</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(__VA_ARGS__))</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="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 d71854da..5b1b67b0 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.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 f67b4efa..64c81ae2 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
 .Conceal { color: #4e4e4e; }
+.PreProc { color: #800080; }
+.LineNr { color: #444444; }
 .SalientComment { color: #00ffff; }
+.Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
+.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; }
+.CommentedCode { color: #6c6c6c; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/011load.cc.html b/html/011load.cc.html
index 88c1c8ba..8f952e1b 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.traceContains { color: #008000; }
 .traceAbsent { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/012transform.cc.html b/html/012transform.cc.html
index 28355ac1..f4e8fc5b 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
 .Conceal { color: #4e4e4e; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
 -->
 </style>
 
diff --git a/html/013update_operation.cc.html b/html/013update_operation.cc.html
index 5de8c4a7..5eea5199 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
 .Conceal { color: #4e4e4e; }
 .traceContains { color: #008000; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.muRecipe { color: #ff8700; }
+.Constant { color: #00a0a0; }
+.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; }
 .CommentedCode { color: #6c6c6c; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Identifier { color: #c0a020; }
 .cSpecial { color: #008000; }
+.Special { color: #c00000; }
 -->
 </style>
 
diff --git a/html/014literal_string.cc.html b/html/014literal_string.cc.html
index 61a4ac39..93cf8607 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
+.traceContains { color: #008000; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/015literal_noninteger.cc.html b/html/015literal_noninteger.cc.html
index e08dc7ba..d4fff757 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
+.traceContains { color: #008000; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
@@ -66,7 +66,7 @@ if ('onhashchange' in window) {
 <span id="L3" class="LineNr"> 3 </span><span class="Delimiter">:(scenarios load)</span>
 <span id="L4" class="LineNr"> 4 </span><span class="Delimiter">:(scenario noninteger_literal)</span>
 <span id="L5" class="LineNr"> 5 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L6" class="LineNr"> 6 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">3.14159</span>
+<span id="L6" class="LineNr"> 6 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">3</span><span class="Delimiter">.</span><span class="Constant">14159</span>
 <span id="L7" class="LineNr"> 7 </span>]
 <span id="L8" class="LineNr"> 8 </span><span class="traceContains">+parse:   ingredient: {3.14159: &quot;literal-fractional-number&quot;}</span>
 <span id="L9" class="LineNr"> 9 </span>
diff --git a/html/016dilated_reagent.cc.html b/html/016dilated_reagent.cc.html
index 554d317a..617a199a 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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,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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.traceContains { color: #008000; }
+.LineNr { color: #444444; }
+.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
+.Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .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; }
-.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
-.PreProc { color: #800080; }
+.Special { color: #c00000; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
@@ -76,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="PreProc">  </span><span class="Comment"># line below has a space at the end</span>
+<span id="L14" class="LineNr"> 14 </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 b395e755..c94a0f6d 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.traceContains { color: #008000; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
 .muData { color: #ffff00; }
+.Constant { color: #00a0a0; }
+.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; }
+.Special { color: #c00000; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/018type_abbreviations.cc.html b/html/018type_abbreviations.cc.html
index 2e4578cb..576dfe01 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.LineNr { color: #444444; }
 .SalientComment { color: #00ffff; }
 .muRecipe { color: #ff8700; }
+.cSpecial { color: #008000; }
 .muData { color: #ffff00; }
-.LineNr { color: #444444; }
-.traceContains { color: #008000; }
+.Identifier { color: #c0a020; }
 .Delimiter { color: #800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 .Conceal { color: #4e4e4e; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/020run.cc.html b/html/020run.cc.html
index 92d9c218..1eb373ef 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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,22 +15,22 @@ 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; }
 .SalientComment { color: #00ffff; }
 .CommentedCode { color: #6c6c6c; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
+.cSpecial { color: #008000; }
+.Identifier { color: #c0a020; }
+.PreProc { color: #800080; }
+.Delimiter { color: #800080; }
 .traceContains { color: #008000; }
+.Conceal { color: #4e4e4e; }
 .traceAbsent { color: #c00000; }
-.Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.cSpecial { color: #008000; }
-.Conceal { color: #4e4e4e; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
-.PreProc { color: #800080; }
 -->
 </style>
 
diff --git a/html/021check_instruction.cc.html b/html/021check_instruction.cc.html
index 8d22e6a8..72c54c98 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
 .Conceal { color: #4e4e4e; }
 .traceContains { color: #008000; }
-.Special { color: #c00000; }
-.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; }
 .muRecipe { color: #ff8700; }
+.Constant { color: #00a0a0; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
 .cSpecial { color: #008000; }
+.Special { color: #c00000; }
 -->
 </style>
 
@@ -102,7 +102,7 @@ if ('onhashchange' in window) {
 <span id="L39" class="LineNr"> 39 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// End Defined Recipe Checks</span>
 <span id="L40" class="LineNr"> 40 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L41" class="LineNr"> 41 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L42" class="LineNr"> 42 </span>  <span class="Conceal">¦</span> <span class="Normal">finish_checking_instruction</span>:<span class="Delimiter">;</span>
+<span id="L42" class="LineNr"> 42 </span>  <span class="Conceal">¦</span> finish_checking_instruction:<span class="Delimiter">;</span>
 <span id="L43" class="LineNr"> 43 </span>  <span class="Delimiter">}</span>
 <span id="L44" class="LineNr"> 44 </span><span class="Delimiter">}</span>
 <span id="L45" class="LineNr"> 45 </span>
diff --git a/html/022arithmetic.cc.html b/html/022arithmetic.cc.html
index 0e6443e4..c46d35ea 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
+.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
 .traceContains { color: #008000; }
-.Special { color: #c00000; }
-.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; }
+.Constant { color: #00a0a0; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
 .cSpecial { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
@@ -774,19 +774,19 @@ if ('onhashchange' in window) {
 <span id="L710" class="LineNr">710 </span>
 <span id="L711" class="LineNr">711 </span><span class="Delimiter">:(scenario round_to_nearest_integer)</span>
 <span id="L712" class="LineNr">712 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L713" class="LineNr">713 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>round <span class="Constant">12.2</span>
+<span id="L713" class="LineNr">713 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>round <span class="Constant">12</span><span class="Delimiter">.</span><span class="Constant">2</span>
 <span id="L714" class="LineNr">714 </span>]
 <span id="L715" class="LineNr">715 </span><span class="traceContains">+mem: storing 12 in location 1</span>
 <span id="L716" class="LineNr">716 </span>
 <span id="L717" class="LineNr">717 </span><span class="Delimiter">:(scenario round_halves_toward_zero)</span>
 <span id="L718" class="LineNr">718 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L719" class="LineNr">719 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>round <span class="Constant">12.5</span>
+<span id="L719" class="LineNr">719 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>round <span class="Constant">12</span><span class="Delimiter">.</span><span class="Constant">5</span>
 <span id="L720" class="LineNr">720 </span>]
 <span id="L721" class="LineNr">721 </span><span class="traceContains">+mem: storing 12 in location 1</span>
 <span id="L722" class="LineNr">722 </span>
 <span id="L723" class="LineNr">723 </span><span class="Delimiter">:(scenario round_halves_toward_zero_2)</span>
 <span id="L724" class="LineNr">724 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L725" class="LineNr">725 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>round -<span class="Constant">12.5</span>
+<span id="L725" class="LineNr">725 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>round -<span class="Constant">12</span><span class="Delimiter">.</span><span class="Constant">5</span>
 <span id="L726" class="LineNr">726 </span>]
 <span id="L727" class="LineNr">727 </span><span class="traceContains">+mem: storing -12 in location 1</span>
 <span id="L728" class="LineNr">728 </span>
@@ -815,13 +815,13 @@ if ('onhashchange' in window) {
 <span id="L751" class="LineNr">751 </span>
 <span id="L752" class="LineNr">752 </span><span class="Delimiter">:(scenario truncate_to_nearest_integer)</span>
 <span id="L753" class="LineNr">753 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L754" class="LineNr">754 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span><a href='101run_sandboxed.cc.html#L523'>truncate</a> <span class="Constant">12.2</span>
+<span id="L754" class="LineNr">754 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span><a href='101run_sandboxed.cc.html#L523'>truncate</a> <span class="Constant">12</span><span class="Delimiter">.</span><span class="Constant">2</span>
 <span id="L755" class="LineNr">755 </span>]
 <span id="L756" class="LineNr">756 </span><span class="traceContains">+mem: storing 12 in location 1</span>
 <span id="L757" class="LineNr">757 </span>
 <span id="L758" class="LineNr">758 </span><span class="Delimiter">:(scenario truncate_negative)</span>
 <span id="L759" class="LineNr">759 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L760" class="LineNr">760 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span><a href='101run_sandboxed.cc.html#L523'>truncate</a> -<span class="Constant">12.2</span>
+<span id="L760" class="LineNr">760 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span><a href='101run_sandboxed.cc.html#L523'>truncate</a> -<span class="Constant">12</span><span class="Delimiter">.</span><span class="Constant">2</span>
 <span id="L761" class="LineNr">761 </span>]
 <span id="L762" class="LineNr">762 </span><span class="traceContains">+mem: storing -12 in location 1</span>
 <span id="L763" class="LineNr">763 </span>
diff --git a/html/023boolean.cc.html b/html/023boolean.cc.html
index e2f6eca6..4e81b369 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
+.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
 .traceContains { color: #008000; }
-.Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
 .cSpecial { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/024jump.cc.html b/html/024jump.cc.html
index cdc86f04..da98e2b0 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.traceContains { color: #008000; }
+.traceAbsent { color: #c00000; }
+.LineNr { color: #444444; }
+.cSpecial { color: #008000; }
+.Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .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; }
-.traceAbsent { color: #c00000; }
-.cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.Special { color: #c00000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/025compare.cc.html b/html/025compare.cc.html
index 0ad418a1..e3b71636 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
+.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
 .traceContains { color: #008000; }
-.Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
 .cSpecial { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/026call.cc.html b/html/026call.cc.html
index 1720fc4b..9615ec3f 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.LineNr { color: #444444; }
 .SalientComment { color: #00ffff; }
 .CommentedCode { color: #6c6c6c; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
-.traceContains { color: #008000; }
-.Delimiter { color: #800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .cSpecial { color: #008000; }
+.Identifier { color: #c0a020; }
+.PreProc { color: #800080; }
+.Delimiter { color: #800080; }
+.traceContains { color: #008000; }
 .Conceal { color: #4e4e4e; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
-.PreProc { color: #800080; }
 -->
 </style>
 
diff --git a/html/027call_ingredient.cc.html b/html/027call_ingredient.cc.html
index 3f553742..2fbaf8d8 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
+.traceContains { color: #008000; }
 .LineNr { color: #444444; }
+.cSpecial { color: #008000; }
 .Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/028call_return.cc.html b/html/028call_return.cc.html
index f69f1c47..0b3a579c 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
+.traceContains { color: #008000; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
@@ -170,7 +170,7 @@ if ('onhashchange' in window) {
 <span id="L107" class="LineNr">107 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L108" class="LineNr">108 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L109" class="LineNr">109 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L110" class="LineNr">110 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">finish_return_check</span>:<span class="Delimiter">;</span>
+<span id="L110" class="LineNr">110 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> finish_return_check:<span class="Delimiter">;</span>
 <span id="L111" class="LineNr">111 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L112" class="LineNr">112 </span>  <span class="Delimiter">}</span>
 <span id="L113" class="LineNr">113 </span><span class="Delimiter">}</span>
diff --git a/html/029tools.cc.html b/html/029tools.cc.html
index 550ceabe..4470ef05 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Conceal { color: #4e4e4e; }
-.SalientComment { color: #00ffff; }
 .Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
+.traceContains { color: #008000; }
 .LineNr { color: #444444; }
+.SalientComment { color: #00ffff; }
+.cSpecial { color: #008000; }
 .Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.Conceal { color: #4e4e4e; }
 .CommentedCode { color: #6c6c6c; }
-.cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/030container.cc.html b/html/030container.cc.html
index 22f0bf40..5a4d0c9f 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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,22 +15,22 @@ 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; }
 .SalientComment { color: #00ffff; }
 .CommentedCode { color: #6c6c6c; }
 .muRecipe { color: #ff8700; }
+.cSpecial { color: #008000; }
 .muData { color: #ffff00; }
-.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Delimiter { color: #800080; }
 .traceContains { color: #008000; }
+.Conceal { color: #4e4e4e; }
 .traceAbsent { color: #c00000; }
-.Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.cSpecial { color: #008000; }
-.Conceal { color: #4e4e4e; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/031merge.cc.html b/html/031merge.cc.html
index 0daad3a6..394417aa 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
-.muData { color: #ffff00; }
 .LineNr { color: #444444; }
+.muRecipe { color: #ff8700; }
 .traceContains { color: #008000; }
+.muData { color: #ffff00; }
+.Identifier { color: #c0a020; }
+.PreProc { color: #800080; }
 .Delimiter { color: #800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .cSpecial { color: #008000; }
 .Conceal { color: #4e4e4e; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
-.PreProc { color: #800080; }
 -->
 </style>
 
diff --git a/html/032array.cc.html b/html/032array.cc.html
index 3e04c400..469d3fd7 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.LineNr { color: #444444; }
 .SalientComment { color: #00ffff; }
 .muRecipe { color: #ff8700; }
+.cSpecial { color: #008000; }
 .muData { color: #ffff00; }
-.LineNr { color: #444444; }
-.traceContains { color: #008000; }
+.Identifier { color: #c0a020; }
 .Delimiter { color: #800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 .Conceal { color: #4e4e4e; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
 -->
 </style>
 
@@ -493,7 +493,7 @@ if ('onhashchange' in window) {
 <span id="L428" class="LineNr">428 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">14</span>
 <span id="L429" class="LineNr">429 </span>  <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">15</span>
 <span id="L430" class="LineNr">430 </span>  <span class="Constant">4</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">16</span>
-<span id="L431" class="LineNr">431 </span>  <span class="Constant">5</span>:num<span class="Special"> &lt;- </span>index <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1.5</span>  <span class="Comment"># non-whole number</span>
+<span id="L431" class="LineNr">431 </span>  <span class="Constant">5</span>:num<span class="Special"> &lt;- </span>index <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">.</span><span class="Constant">5</span>  <span class="Comment"># non-whole number</span>
 <span id="L432" class="LineNr">432 </span>]
 <span id="L433" class="LineNr">433 </span><span class="Comment"># fraction is truncated away</span>
 <span id="L434" class="LineNr">434 </span><span class="traceContains">+mem: storing 15 in location 5</span>
diff --git a/html/033exclusive_container.cc.html b/html/033exclusive_container.cc.html
index 9543caa7..759e8db1 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.LineNr { color: #444444; }
 .SalientComment { color: #00ffff; }
 .muRecipe { color: #ff8700; }
+.cSpecial { color: #008000; }
 .muData { color: #ffff00; }
-.LineNr { color: #444444; }
-.traceContains { color: #008000; }
+.Identifier { color: #c0a020; }
 .Delimiter { color: #800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 .Conceal { color: #4e4e4e; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/034address.cc.html b/html/034address.cc.html
index 2ad1f7a4..5738b7da 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.traceContains { color: #008000; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
 .CommentedCode { color: #6c6c6c; }
+.Constant { color: #00a0a0; }
+.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; }
+.Special { color: #c00000; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/035lookup.cc.html b/html/035lookup.cc.html
index 858f776b..6d575f6c 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.traceContains { color: #008000; }
+.traceAbsent { color: #c00000; }
+.LineNr { color: #444444; }
 .SalientComment { color: #00ffff; }
+.Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .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; }
-.traceAbsent { color: #c00000; }
+.Special { color: #c00000; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/036refcount.cc.html b/html/036refcount.cc.html
index f8f67c42..e1486f8e 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.LineNr { color: #444444; }
 .SalientComment { color: #00ffff; }
 .muRecipe { color: #ff8700; }
+.cSpecial { color: #008000; }
 .muData { color: #ffff00; }
-.LineNr { color: #444444; }
-.traceContains { color: #008000; }
+.Identifier { color: #c0a020; }
 .Delimiter { color: #800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 .Conceal { color: #4e4e4e; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/037abandon.cc.html b/html/037abandon.cc.html
index aa6d8b76..9a1075f6 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.LineNr { color: #444444; }
 .CommentedCode { color: #6c6c6c; }
 .muRecipe { color: #ff8700; }
+.cSpecial { color: #008000; }
 .muData { color: #ffff00; }
-.LineNr { color: #444444; }
-.traceContains { color: #008000; }
+.Identifier { color: #c0a020; }
 .Delimiter { color: #800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 .Conceal { color: #4e4e4e; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/038new_text.cc.html b/html/038new_text.cc.html
index 8563f8fb..5713219d 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.traceContains { color: #008000; }
 .cSpecial { color: #008000; }
+.LineNr { color: #444444; }
 .SalientComment { color: #00ffff; }
+.Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
+.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; }
+.Special { color: #c00000; }
 .CommentedCode { color: #6c6c6c; }
-.traceContains { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/040brace.cc.html b/html/040brace.cc.html
index d601bb65..0331a715 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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=">
@@ -16,17 +16,17 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .Conceal { color: #4e4e4e; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.traceContains { color: #008000; }
+.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; }
-.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/041jump_target.cc.html b/html/041jump_target.cc.html
index a378280e..08231a30 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
-.traceAbsent { color: #c00000; }
+.traceContains { color: #008000; }
 .Conceal { color: #4e4e4e; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
+.traceAbsent { color: #c00000; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
 .cSpecial { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/042name.cc.html b/html/042name.cc.html
index 36806f41..9b82dae4 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.LineNr { color: #444444; }
 .SalientComment { color: #00ffff; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
+.cSpecial { color: #008000; }
+.Identifier { color: #c0a020; }
+.Delimiter { color: #800080; }
 .traceContains { color: #008000; }
+.Conceal { color: #4e4e4e; }
 .traceAbsent { color: #c00000; }
-.Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.cSpecial { color: #008000; }
-.Conceal { color: #4e4e4e; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/043space.cc.html b/html/043space.cc.html
index 4460d3f7..d1c3f7bb 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.LineNr { color: #444444; }
 .SalientComment { color: #00ffff; }
 .muRecipe { color: #ff8700; }
+.cSpecial { color: #008000; }
 .muData { color: #ffff00; }
-.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Delimiter { color: #800080; }
 .traceContains { color: #008000; }
+.Conceal { color: #4e4e4e; }
 .traceAbsent { color: #c00000; }
-.Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.cSpecial { color: #008000; }
-.Conceal { color: #4e4e4e; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/044space_surround.cc.html b/html/044space_surround.cc.html
index 312db856..c2eaec77 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
+.traceContains { color: #008000; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/045closure_name.cc.html b/html/045closure_name.cc.html
index aae9944e..ab77a6b9 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
-.cSpecial { color: #008000; }
+.Identifier { color: #c0a020; }
+.traceContains { color: #008000; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
+.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; }
-.traceContains { color: #008000; }
+.Special { color: #c00000; }
+.cSpecial { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/046check_type_by_name.cc.html b/html/046check_type_by_name.cc.html
index d9c6c6dc..1b8868ea 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
-.cSpecial { color: #008000; }
+.traceContains { color: #008000; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 .traceAbsent { 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; }
-.traceContains { color: #008000; }
+.Special { color: #c00000; }
+.cSpecial { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/050scenario.cc.html b/html/050scenario.cc.html
index 0721c6bc..a7a239ae 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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,22 +15,22 @@ 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; }
 .SalientComment { color: #00ffff; }
 .CommentedCode { color: #6c6c6c; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
 .cSpecial { color: #008000; }
-.traceAbsent { color: #c00000; }
+.Identifier { color: #c0a020; }
 .Delimiter { color: #800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .traceContains { color: #008000; }
 .Conceal { color: #4e4e4e; }
+.traceAbsent { color: #c00000; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
 -->
 </style>
 
@@ -110,10 +110,10 @@ if ('onhashchange' in window) {
 <span id="L43" class="LineNr"> 43 </span>  <span class="Conceal">¦</span> <span class="Constant">1</span><span class="Special"> &lt;- </span><span class="Constant">13</span>
 <span id="L44" class="LineNr"> 44 </span>  ]
 <span id="L45" class="LineNr"> 45 </span>  trace-should-contain [
-<span id="L46" class="LineNr"> 46 </span>  <span class="Conceal">¦</span> <span class="Normal">a</span>: a b c
+<span id="L46" class="LineNr"> 46 </span>  <span class="Conceal">¦</span> a: a b c
 <span id="L47" class="LineNr"> 47 </span>  ]
 <span id="L48" class="LineNr"> 48 </span>  trace-should-<span class="Normal">not</span>-contain [
-<span id="L49" class="LineNr"> 49 </span>  <span class="Conceal">¦</span> <span class="Normal">a</span>: x y z
+<span id="L49" class="LineNr"> 49 </span>  <span class="Conceal">¦</span> a: x y z
 <span id="L50" class="LineNr"> 50 </span>  ]
 <span id="L51" class="LineNr"> 51 </span>]
 <span id="L52" class="LineNr"> 52 </span><span class="Comment"># checks are inside scenario</span>
@@ -644,8 +644,8 @@ if ('onhashchange' in window) {
 <span id="L577" class="LineNr">577 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L578" class="LineNr">578 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L579" class="LineNr">579 </span>  trace-should-contain [
-<span id="L580" class="LineNr">580 </span>  <span class="Conceal">¦</span> <span class="Normal">a</span>: b
-<span id="L581" class="LineNr">581 </span>  <span class="Conceal">¦</span> <span class="Normal">a</span>: d
+<span id="L580" class="LineNr">580 </span>  <span class="Conceal">¦</span> a: b
+<span id="L581" class="LineNr">581 </span>  <span class="Conceal">¦</span> a: d
 <span id="L582" class="LineNr">582 </span>  ]
 <span id="L583" class="LineNr">583 </span>]
 <span id="L584" class="LineNr">584 </span><span class="traceContains">+error: F - <a href='000organization.cc.html#L113'>main</a>: missing [b] in <a href='003trace.cc.html#L167'>trace</a> with label 'a'</span>
@@ -713,8 +713,8 @@ if ('onhashchange' in window) {
 <span id="L646" class="LineNr">646 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L167'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [a]<span class="Delimiter">,</span> [b]
 <span id="L647" class="LineNr">647 </span>  ]
 <span id="L648" class="LineNr">648 </span>  trace-should-contain [
-<span id="L649" class="LineNr">649 </span>  <span class="Conceal">¦</span> <span class="Normal">a</span>: b
-<span id="L650" class="LineNr">650 </span>  <span class="Conceal">¦</span> <span class="Normal">a</span>: d
+<span id="L649" class="LineNr">649 </span>  <span class="Conceal">¦</span> a: b
+<span id="L650" class="LineNr">650 </span>  <span class="Conceal">¦</span> a: d
 <span id="L651" class="LineNr">651 </span>  ]
 <span id="L652" class="LineNr">652 </span>]
 <span id="L653" class="LineNr">653 </span><span class="traceContains">+error: F - <a href='000organization.cc.html#L113'>main</a>: missing [d] in <a href='003trace.cc.html#L167'>trace</a> with label 'a'</span>
@@ -726,7 +726,7 @@ if ('onhashchange' in window) {
 <span id="L659" class="LineNr">659 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L167'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [a]<span class="Delimiter">,</span> [b]
 <span id="L660" class="LineNr">660 </span>  ]
 <span id="L661" class="LineNr">661 </span>  trace-should-contain [
-<span id="L662" class="LineNr">662 </span>  <span class="Conceal">¦</span> <span class="Normal">a</span>: b
+<span id="L662" class="LineNr">662 </span>  <span class="Conceal">¦</span> a: b
 <span id="L663" class="LineNr">663 </span>  ]
 <span id="L664" class="LineNr">664 </span>]
 <span id="L665" class="LineNr">665 </span><span class="traceAbsent">-error: missing [b] in <a href='003trace.cc.html#L167'>trace</a> with label 'a'</span>
@@ -744,7 +744,7 @@ if ('onhashchange' in window) {
 <span id="L677" class="LineNr">677 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L167'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [a]<span class="Delimiter">,</span> [b]
 <span id="L678" class="LineNr">678 </span>  ]
 <span id="L679" class="LineNr">679 </span>  trace-should-<span class="Normal">not</span>-contain [
-<span id="L680" class="LineNr">680 </span>  <span class="Conceal">¦</span> <span class="Normal">a</span>: b
+<span id="L680" class="LineNr">680 </span>  <span class="Conceal">¦</span> a: b
 <span id="L681" class="LineNr">681 </span>  ]
 <span id="L682" class="LineNr">682 </span>]
 <span id="L683" class="LineNr">683 </span><span class="traceContains">+error: F - <a href='000organization.cc.html#L113'>main</a>: unexpected [b] in <a href='003trace.cc.html#L167'>trace</a> with label 'a'</span>
@@ -784,7 +784,7 @@ if ('onhashchange' in window) {
 <span id="L717" class="LineNr">717 </span><span class="Special">% Scenario_testing_scenario = true;</span>
 <span id="L718" class="LineNr">718 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L719" class="LineNr">719 </span>  trace-should-<span class="Normal">not</span>-contain [
-<span id="L720" class="LineNr">720 </span>  <span class="Conceal">¦</span> <span class="Normal">a</span>: b
+<span id="L720" class="LineNr">720 </span>  <span class="Conceal">¦</span> a: b
 <span id="L721" class="LineNr">721 </span>  ]
 <span id="L722" class="LineNr">722 </span>]
 <span id="L723" class="LineNr">723 </span><span class="traceAbsent">-error: unexpected [b] in <a href='003trace.cc.html#L167'>trace</a> with label 'a'</span>
@@ -798,8 +798,8 @@ if ('onhashchange' in window) {
 <span id="L731" class="LineNr">731 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L167'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [a]<span class="Delimiter">,</span> [d]
 <span id="L732" class="LineNr">732 </span>  ]
 <span id="L733" class="LineNr">733 </span>  trace-should-<span class="Normal">not</span>-contain [
-<span id="L734" class="LineNr">734 </span>  <span class="Conceal">¦</span> <span class="Normal">a</span>: b
-<span id="L735" class="LineNr">735 </span>  <span class="Conceal">¦</span> <span class="Normal">a</span>: d
+<span id="L734" class="LineNr">734 </span>  <span class="Conceal">¦</span> a: b
+<span id="L735" class="LineNr">735 </span>  <span class="Conceal">¦</span> a: d
 <span id="L736" class="LineNr">736 </span>  ]
 <span id="L737" class="LineNr">737 </span>]
 <span id="L738" class="LineNr">738 </span><span class="traceContains">+error: F - <a href='000organization.cc.html#L113'>main</a>: unexpected [d] in <a href='003trace.cc.html#L167'>trace</a> with label 'a'</span>
diff --git a/html/051scenario_test.mu.html b/html/051scenario_test.mu.html
index f4f9b2dd..6a8e0209 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Conceal { color: #4e4e4e; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
+.Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 -->
 </style>
 
diff --git a/html/052tangle.cc.html b/html/052tangle.cc.html
index 91d1ddf8..9527d022 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.traceContains { color: #008000; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 .traceAbsent { color: #c00000; }
+.cSpecial { color: #008000; }
+.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; }
-.cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.Special { color: #c00000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/053recipe_header.cc.html b/html/053recipe_header.cc.html
index 0d81785c..33585d70 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.LineNr { color: #444444; }
 .SalientComment { color: #00ffff; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
+.cSpecial { color: #008000; }
+.Identifier { color: #c0a020; }
 .Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
-.traceAbsent { color: #c00000; }
 .Delimiter { color: #800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 .Conceal { color: #4e4e4e; }
+.traceAbsent { color: #c00000; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
-.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/054static_dispatch.cc.html b/html/054static_dispatch.cc.html
index b639bdb8..7dc4043e 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.LineNr { color: #444444; }
 .CommentedCode { color: #6c6c6c; }
 .muRecipe { color: #ff8700; }
+.cSpecial { color: #008000; }
 .muData { color: #ffff00; }
-.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Delimiter { color: #800080; }
 .traceContains { color: #008000; }
+.Conceal { color: #4e4e4e; }
 .traceAbsent { color: #c00000; }
-.Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.cSpecial { color: #008000; }
-.Conceal { color: #4e4e4e; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/055shape_shifting_container.cc.html b/html/055shape_shifting_container.cc.html
index c4065bb4..b81fd8fe 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.LineNr { color: #444444; }
 .SalientComment { color: #00ffff; }
 .CommentedCode { color: #6c6c6c; }
 .muRecipe { color: #ff8700; }
-.muData { color: #ffff00; }
-.LineNr { color: #444444; }
 .cSpecial { color: #008000; }
+.muData { color: #ffff00; }
+.Identifier { color: #c0a020; }
 .Delimiter { color: #800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .traceContains { color: #008000; }
 .Conceal { color: #4e4e4e; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/056shape_shifting_recipe.cc.html b/html/056shape_shifting_recipe.cc.html
index 254302cb..a39c9453 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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,22 +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; }
+.LineNr { color: #444444; }
 .SalientComment { color: #00ffff; }
 .CommentedCode { color: #6c6c6c; }
 .muRecipe { color: #ff8700; }
+.cSpecial { color: #008000; }
 .muData { color: #ffff00; }
-.LineNr { color: #444444; }
-.traceContains { color: #008000; }
+.Identifier { color: #c0a020; }
 .Delimiter { color: #800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 .Conceal { color: #4e4e4e; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
-.PreProc { color: #800080; }
 -->
 </style>
 
@@ -995,7 +994,7 @@ if ('onhashchange' in window) {
 <span id="L928" class="LineNr"> 928 </span>  load-ingredients
 <span id="L929" class="LineNr"> 929 </span>  <span class="Delimiter">{</span>
 <span id="L930" class="LineNr"> 930 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span>
-<span id="L931" class="LineNr"> 931 </span>  <span class="Conceal">¦</span> <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>foo x
+<span id="L931" class="LineNr"> 931 </span>  <span class="Conceal">¦</span> y:num<span class="Special"> &lt;- </span>foo x
 <span id="L932" class="LineNr"> 932 </span>  <span class="Delimiter">}</span>
 <span id="L933" class="LineNr"> 933 </span>  <span class="Identifier">return</span> y
 <span id="L934" class="LineNr"> 934 </span>]
@@ -1124,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="PreProc">  </span><span class="Comment"># define a variable with the same name 'z'</span>
+<span id="L1060" class="LineNr">1060 </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
@@ -1144,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="PreProc">  </span><span class="Comment"># define a variable with the same name 'z'</span>
+<span id="L1080" class="LineNr">1080 </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 17c2dffb..3d620733 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.traceContains { color: #008000; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
 .muData { color: #ffff00; }
-.cSpecial { color: #008000; }
+.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; }
-.traceContains { color: #008000; }
+.Special { color: #c00000; }
+.cSpecial { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/058to_text.cc.html b/html/058to_text.cc.html
index b0798332..9ff86c43 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
 .Conceal { color: #4e4e4e; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/059to_text.mu.html b/html/059to_text.mu.html
index e4d0da79..885d16f5 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/060rewrite_literal_string.cc.html b/html/060rewrite_literal_string.cc.html
index 578ec354..162968ec 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
+.traceContains { color: #008000; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/061text.mu.html b/html/061text.mu.html
index cb9ca6d3..61022255 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
-.muData { color: #ffff00; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/062convert_ingredients_to_text.cc.html b/html/062convert_ingredients_to_text.cc.html
index fadab53b..1fc1d386 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.traceContains { color: #008000; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
 .muData { color: #ffff00; }
+.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; }
-.traceContains { color: #008000; }
+.Special { color: #c00000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/063array.mu.html b/html/063array.mu.html
index aa51fc06..a80e9678 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Conceal { color: #4e4e4e; }
 .muScenario { color: #00af00; }
-.muControl { color: #c0a020; }
-.Delimiter { color: #800080; }
-.Special { color: #c00000; }
-.Constant { color: #00a0a0; }
+.Conceal { color: #4e4e4e; }
 .LineNr { color: #444444; }
-.muRecipe { color: #ff8700; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
+.muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/064list.mu.html b/html/064list.mu.html
index d9552c9a..88228bdb 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
-.Conceal { color: #4e4e4e; }
+.muData { color: #ffff00; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
+.Conceal { color: #4e4e4e; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
-.muData { color: #ffff00; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/065duplex_list.mu.html b/html/065duplex_list.mu.html
index e0bde027..c0557ad9 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
-.Conceal { color: #4e4e4e; }
+.muData { color: #ffff00; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
+.Conceal { color: #4e4e4e; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
-.muData { color: #ffff00; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/066stream.mu.html b/html/066stream.mu.html
index 4c80df9d..02747cbc 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
-.muControl { color: #c0a020; }
 .Conceal { color: #4e4e4e; }
+.muData { color: #ffff00; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muData { color: #ffff00; }
+.Special { color: #c00000; }
+.muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/067random.cc.html b/html/067random.cc.html
index a044f382..2dfa5c17 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.Identifier { color: #c0a020; }
 .Constant { color: #00a0a0; }
+.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; }
 -->
 </style>
 
diff --git a/html/068random.mu.html b/html/068random.mu.html
index dbe3bc66..bad6f85d 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.muControl { color: #c0a020; }
-.Delimiter { color: #800080; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
-.Constant { color: #00a0a0; }
 .LineNr { color: #444444; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
+.muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/069hash.cc.html b/html/069hash.cc.html
index 6af75ee9..433f5453 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.LineNr { color: #444444; }
 .CommentedCode { color: #6c6c6c; }
 .muRecipe { color: #ff8700; }
-.muData { color: #ffff00; }
-.Special { color: #c00000; }
 .cSpecial { color: #008000; }
+.muData { color: #ffff00; }
+.Identifier { color: #c0a020; }
 .Delimiter { color: #800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .traceContains { color: #008000; }
 .Conceal { color: #4e4e4e; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.Identifier { color: #c0a020; }
+.Special { color: #c00000; }
 -->
 </style>
 
@@ -261,7 +261,7 @@ if ('onhashchange' in window) {
 <span id="L196" class="LineNr">196 </span><span class="Comment">//: on the precise bit pattern of a floating-point number.</span>
 <span id="L197" class="LineNr">197 </span><span class="Delimiter">:(scenario hash_of_numbers_ignores_fractional_part)</span>
 <span id="L198" class="LineNr">198 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L199" class="LineNr">199 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span><a href='069hash.cc.html#L34'>hash</a> <span class="Constant">1.5</span>
+<span id="L199" class="LineNr">199 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span><a href='069hash.cc.html#L34'>hash</a> <span class="Constant">1</span><span class="Delimiter">.</span><span class="Constant">5</span>
 <span id="L200" class="LineNr">200 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span><a href='069hash.cc.html#L34'>hash</a> <span class="Constant">1</span>
 <span id="L201" class="LineNr">201 </span>  <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>equal <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num
 <span id="L202" class="LineNr">202 </span>]
diff --git a/html/070table.mu.html b/html/070table.mu.html
index 620dab6b..c964ec5c 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Conceal { color: #4e4e4e; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
+.Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muRecipe { color: #ff8700; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
-.muData { color: #ffff00; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/071deep_copy.cc.html b/html/071deep_copy.cc.html
index 0a7f6295..4b130138 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.traceContains { color: #008000; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.cSpecial { color: #008000; }
 .muData { color: #ffff00; }
+.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; }
-.cSpecial { color: #008000; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
-.traceContains { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/072recipe.cc.html b/html/072recipe.cc.html
index 3c0351d5..aa256245 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
-.cSpecial { color: #008000; }
+.traceContains { color: #008000; }
+.LineNr { color: #444444; }
 .SalientComment { color: #00ffff; }
+.Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
+.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; }
-.traceContains { color: #008000; }
+.Special { color: #c00000; }
+.cSpecial { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
@@ -122,7 +122,7 @@ if ('onhashchange' in window) {
 <span id="L58" class="LineNr"> 58 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L59" class="LineNr"> 59 </span>  local-scope
 <span id="L60" class="LineNr"> 60 </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="L61" class="LineNr"> 61 </span>  <span class="Normal">break</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L61" class="LineNr"> 61 </span>  <span class="Identifier">break</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="L62" class="LineNr"> 62 </span>]
 <span id="L63" class="LineNr"> 63 </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="L64" class="LineNr"> 64 </span>
@@ -269,263 +269,261 @@ if ('onhashchange' in window) {
 <span id="L205" class="LineNr">205 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: product 0 has the wrong type at '2:num &lt;- call {1: (recipe point -&gt; point)}, 34'</span>
 <span id="L206" class="LineNr">206 </span>
 <span id="L207" class="LineNr">207 </span><span class="Delimiter">:(before &quot;End resolve_ambiguous_call(r, index, inst, caller_recipe) Special-cases&quot;)</span>
-<span id="L208" class="LineNr">208 </span><span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;call&quot;</span> &amp;&amp; <a href='072recipe.cc.html#L213'>first_ingredient_is_recipe_literal</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L209" class="LineNr">209 </span>  <a href='072recipe.cc.html#L218'>resolve_indirect_ambiguous_call</a><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="L208" class="LineNr">208 </span><span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;call&quot;</span> &amp;&amp; !inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; <a href='072recipe.cc.html#L213'>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="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
+<span id="L209" class="LineNr">209 </span>  <a href='072recipe.cc.html#L216'>resolve_indirect_ambiguous_call</a><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="L210" class="LineNr">210 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L211" class="LineNr">211 </span><span class="Delimiter">}</span>
 <span id="L212" class="LineNr">212 </span><span class="Delimiter">:(code)</span>
-<span id="L213" class="LineNr">213 </span><span class="Normal">bool</span> <a href='072recipe.cc.html#L213'>first_ingredient_is_recipe_literal</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L214" class="LineNr">214 </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="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L215" class="LineNr">215 </span>  <span class="Normal">const</span> reagent&amp; ingredient = inst<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="L216" class="LineNr">216 </span>  <span class="Identifier">return</span> ingredient<span class="Delimiter">.</span>type &amp;&amp; ingredient<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom &amp;&amp; ingredient<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;recipe-literal&quot;</span><span class="Delimiter">;</span>
-<span id="L217" class="LineNr">217 </span><span class="Delimiter">}</span>
-<span id="L218" class="LineNr">218 </span><span class="Normal">void</span> <a href='072recipe.cc.html#L218'>resolve_indirect_ambiguous_call</a><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="L219" class="LineNr">219 </span>  <a href='010vm.cc.html#L32'>instruction</a> inst2<span class="Delimiter">;</span>
-<span id="L220" class="LineNr">220 </span>  inst2<span class="Delimiter">.</span>name = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">;</span>
-<span id="L221" class="LineNr">221 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='010vm.cc.html#L19'>recipe</a></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>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L222" class="LineNr">222 </span>  <span class="Conceal">¦</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="L223" class="LineNr">223 </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>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L224" class="LineNr">224 </span>  <span class="Conceal">¦</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="L225" class="LineNr">225 </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="L226" class="LineNr">226 </span>  inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name = inst2<span class="Delimiter">.</span>name<span class="Delimiter">;</span>
-<span id="L227" class="LineNr">227 </span>  inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='010vm.cc.html#L65'>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="L228" class="LineNr">228 </span><span class="Delimiter">}</span>
-<span id="L229" class="LineNr">229 </span>
-<span id="L230" class="LineNr">230 </span><span class="Delimiter">:(after &quot;Transform.push_back(check_instruction)&quot;)</span>
-<span id="L231" class="LineNr">231 </span>Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='072recipe.cc.html#L233'>check_indirect_calls_against_header</a><span class="Delimiter">);</span>  <span class="Comment">// idempotent</span>
-<span id="L232" class="LineNr">232 </span><span class="Delimiter">:(code)</span>
-<span id="L233" class="LineNr">233 </span><span class="Normal">void</span> <a href='072recipe.cc.html#L233'>check_indirect_calls_against_header</a><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="Delimiter">{</span>
-<span id="L234" class="LineNr">234 </span>  <a href='003trace.cc.html#L167'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- type-check 'call' instructions inside <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
-<span id="L235" class="LineNr">235 </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="L236" class="LineNr">236 </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>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L237" class="LineNr">237 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> instruction&amp; inst = caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L238" class="LineNr">238 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!is_indirect_call<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L239" class="LineNr">239 </span>  <span class="Conceal">¦</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="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// error raised above</span>
-<span id="L240" class="LineNr">240 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> reagent&amp; callee = inst<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="L241" class="LineNr">241 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_recipe<span class="Delimiter">(</span>callee<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// error raised above</span>
-<span id="L242" class="LineNr">242 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> <a href='010vm.cc.html#L19'>recipe</a> callee_header = is_literal<span class="Delimiter">(</span>callee<span class="Delimiter">)</span> ? get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> callee<span class="Delimiter">.</span>value<span class="Delimiter">)</span> : <a href='072recipe.cc.html#L275'>from_reagent</a><span class="Delimiter">(</span>inst<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="L243" class="LineNr">243 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!callee_header<span class="Delimiter">.</span>has_header<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L244" class="LineNr">244 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='072recipe.cc.html#L264'>is_indirect_call_with_ingredients</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L245" class="LineNr">245 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip callee</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; min<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> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>callee_header<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span>+<span class="Comment">/*</span><span class="Comment">skip callee</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L246" class="LineNr">246 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_coercible<span class="Delimiter">(</span>callee_header<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i-<span class="Comment">/*</span><span class="Comment">skip callee</span><span class="Comment">*/</span><span class="Constant">1</span><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="L247" class="LineNr">247 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L174'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ingredient &quot;</span> &lt;&lt; i-<span class="Comment">/*</span><span class="Comment">skip callee</span><span class="Comment">*/</span><span class="Constant">1</span> &lt;&lt; <span class="Constant">&quot; has the wrong type at '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</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="L248" class="LineNr">248 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L249" class="LineNr">249 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L250" class="LineNr">250 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='072recipe.cc.html#L269'>is_indirect_call_with_products</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L251" class="LineNr">251 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>callee_header<span class="Delimiter">.</span>products<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L252" class="LineNr">252 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_dummy<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 class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L253" class="LineNr">253 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_coercible<span class="Delimiter">(</span>callee_header<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<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="L254" class="LineNr">254 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L174'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot; has the wrong type at '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</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="L255" class="LineNr">255 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L256" class="LineNr">256 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L257" class="LineNr">257 </span>  <span class="Delimiter">}</span>
-<span id="L258" class="LineNr">258 </span><span class="Delimiter">}</span>
-<span id="L259" class="LineNr">259 </span>
-<span id="L260" class="LineNr">260 </span><span class="Normal">bool</span> <a href='072recipe.cc.html#L260'>is_indirect_call</a><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="Delimiter">{</span>
-<span id="L261" class="LineNr">261 </span>  <span class="Identifier">return</span> <a href='072recipe.cc.html#L264'>is_indirect_call_with_ingredients</a><span class="Delimiter">(</span>r<span class="Delimiter">)</span> || <a href='072recipe.cc.html#L269'>is_indirect_call_with_products</a><span class="Delimiter">(</span>r<span class="Delimiter">);</span>
-<span id="L262" class="LineNr">262 </span><span class="Delimiter">}</span>
-<span id="L263" class="LineNr">263 </span>
-<span id="L264" class="LineNr">264 </span><span class="Normal">bool</span> <a href='072recipe.cc.html#L264'>is_indirect_call_with_ingredients</a><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="Delimiter">{</span>
-<span id="L265" class="LineNr">265 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>r == CALL<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L266" class="LineNr">266 </span>  <span class="Comment">// End is_indirect_call_with_ingredients Special-cases</span>
-<span id="L267" class="LineNr">267 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L268" class="LineNr">268 </span><span class="Delimiter">}</span>
-<span id="L269" class="LineNr">269 </span><span class="Normal">bool</span> <a href='072recipe.cc.html#L269'>is_indirect_call_with_products</a><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="Delimiter">{</span>
-<span id="L270" class="LineNr">270 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>r == CALL<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L271" class="LineNr">271 </span>  <span class="Comment">// End is_indirect_call_with_products Special-cases</span>
-<span id="L272" class="LineNr">272 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L273" class="LineNr">273 </span><span class="Delimiter">}</span>
-<span id="L274" class="LineNr">274 </span>
-<span id="L275" class="LineNr">275 </span><span class="muRecipe"><a href='010vm.cc.html#L19'>recipe</a></span> <a href='072recipe.cc.html#L275'>from_reagent</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L276" class="LineNr">276 </span>  assert<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L277" class="LineNr">277 </span>  <a href='010vm.cc.html#L19'>recipe</a> result_header<span class="Delimiter">;</span>  <span class="Comment">// will contain only ingredients and products, nothing else</span>
-<span id="L278" class="LineNr">278 </span>  result_header<span class="Delimiter">.</span>has_header = <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L279" class="LineNr">279 </span>  <span class="Comment">// Begin Reagent-&gt;Recipe(r, recipe_header)</span>
-<span id="L280" class="LineNr">280 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L281" class="LineNr">281 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;recipe&quot;</span><span class="Delimiter">);</span>
-<span id="L282" class="LineNr">282 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> result_header<span class="Delimiter">;</span>
-<span id="L283" class="LineNr">283 </span>  <span class="Delimiter">}</span>
-<span id="L284" class="LineNr">284 </span>  <span class="Normal">const</span> type_tree* root_type = r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom ? r<span class="Delimiter">.</span>type : r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">;</span>
-<span id="L285" class="LineNr">285 </span>  assert<span class="Delimiter">(</span>root_type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L286" class="LineNr">286 </span>  assert<span class="Delimiter">(</span>root_type<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;recipe&quot;</span><span class="Delimiter">);</span>
-<span id="L287" class="LineNr">287 </span>  <span class="Normal">const</span> type_tree* curr = r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">;</span>
-<span id="L288" class="LineNr">288 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">nada</span><span class="Comment">*/</span><span class="Delimiter">;</span>  curr &amp;&amp; !curr<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">;</span>  curr = curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L289" class="LineNr">289 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom &amp;&amp; curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;-&gt;&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L290" class="LineNr">290 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr = curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">;</span>  <span class="Comment">// skip delimiter</span>
-<span id="L291" class="LineNr">291 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">goto</span> read_products<span class="Delimiter">;</span>
-<span id="L292" class="LineNr">292 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L293" class="LineNr">293 </span>  <span class="Conceal">¦</span> result_header<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='072recipe.cc.html#L337'>next_recipe_reagent</a><span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">));</span>
-<span id="L294" class="LineNr">294 </span>  <span class="Delimiter">}</span>
-<span id="L295" class="LineNr">295 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L296" class="LineNr">296 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L297" class="LineNr">297 </span>  <span class="Conceal">¦</span> result_header<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='072recipe.cc.html#L337'>next_recipe_reagent</a><span class="Delimiter">(</span>curr<span class="Delimiter">));</span>
-<span id="L298" class="LineNr">298 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> result_header<span class="Delimiter">;</span>  <span class="Comment">// no products</span>
-<span id="L299" class="LineNr">299 </span>  <span class="Delimiter">}</span>
-<span id="L300" class="LineNr">300 </span>  <span class="Normal">read_products</span>:
-<span id="L301" class="LineNr">301 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">nada</span><span class="Comment">*/</span><span class="Delimiter">;</span>  curr &amp;&amp; !curr<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">;</span>  curr = curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span>
-<span id="L302" class="LineNr">302 </span>  <span class="Conceal">¦</span> result_header<span class="Delimiter">.</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='072recipe.cc.html#L337'>next_recipe_reagent</a><span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">));</span>
-<span id="L303" class="LineNr">303 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L304" class="LineNr">304 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L305" class="LineNr">305 </span>  <span class="Conceal">¦</span> result_header<span class="Delimiter">.</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='072recipe.cc.html#L337'>next_recipe_reagent</a><span class="Delimiter">(</span>curr<span class="Delimiter">));</span>
-<span id="L306" class="LineNr">306 </span>  <span class="Delimiter">}</span>
-<span id="L307" class="LineNr">307 </span>  <span class="Identifier">return</span> result_header<span class="Delimiter">;</span>
-<span id="L308" class="LineNr">308 </span><span class="Delimiter">}</span>
-<span id="L309" class="LineNr">309 </span>
-<span id="L310" class="LineNr">310 </span><span class="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
-<span id="L311" class="LineNr">311 </span><span class="Normal">void</span> <a href='072recipe.cc.html#L311'>test_from_reagent_atomic</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L312" class="LineNr">312 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;{f: recipe}&quot;</span><span class="Delimiter">);</span>
-<span id="L313" class="LineNr">313 </span>  <a href='010vm.cc.html#L19'>recipe</a> r_header = <a href='072recipe.cc.html#L275'>from_reagent</a><span class="Delimiter">(</span>a<span class="Delimiter">);</span>
-<span id="L314" class="LineNr">314 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>r_header<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L315" class="LineNr">315 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>r_header<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L316" class="LineNr">316 </span><span class="Delimiter">}</span>
-<span id="L317" class="LineNr">317 </span><span class="Normal">void</span> <a href='072recipe.cc.html#L317'>test_from_reagent_non_atomic</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L318" class="LineNr">318 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;{f: (recipe number -&gt; number)}&quot;</span><span class="Delimiter">);</span>
-<span id="L319" class="LineNr">319 </span>  <a href='010vm.cc.html#L19'>recipe</a> r_header = <a href='072recipe.cc.html#L275'>from_reagent</a><span class="Delimiter">(</span>a<span class="Delimiter">);</span>
-<span id="L320" class="LineNr">320 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>r_header<span class="Delimiter">.</span>ingredients<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L321" class="LineNr">321 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>r_header<span class="Delimiter">.</span>products<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L322" class="LineNr">322 </span><span class="Delimiter">}</span>
-<span id="L323" class="LineNr">323 </span><span class="Normal">void</span> <a href='072recipe.cc.html#L323'>test_from_reagent_reads_ingredient_at_end</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L324" class="LineNr">324 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;{f: (recipe number number)}&quot;</span><span class="Delimiter">);</span>
-<span id="L325" class="LineNr">325 </span>  <a href='010vm.cc.html#L19'>recipe</a> r_header = <a href='072recipe.cc.html#L275'>from_reagent</a><span class="Delimiter">(</span>a<span class="Delimiter">);</span>
-<span id="L326" class="LineNr">326 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>r_header<span class="Delimiter">.</span>ingredients<span class="Delimiter">),</span> <span class="Constant">2</span><span class="Delimiter">);</span>
-<span id="L327" class="LineNr">327 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>r_header<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L328" class="LineNr">328 </span><span class="Delimiter">}</span>
-<span id="L329" class="LineNr">329 </span><span class="Normal">void</span> <a href='072recipe.cc.html#L329'>test_from_reagent_reads_sole_ingredient_at_end</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L330" class="LineNr">330 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;{f: (recipe number)}&quot;</span><span class="Delimiter">);</span>
-<span id="L331" class="LineNr">331 </span>  <a href='010vm.cc.html#L19'>recipe</a> r_header = <a href='072recipe.cc.html#L275'>from_reagent</a><span class="Delimiter">(</span>a<span class="Delimiter">);</span>
-<span id="L332" class="LineNr">332 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>r_header<span class="Delimiter">.</span>ingredients<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L333" class="LineNr">333 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>r_header<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L334" class="LineNr">334 </span><span class="Delimiter">}</span>
-<span id="L335" class="LineNr">335 </span>
-<span id="L336" class="LineNr">336 </span><span class="Delimiter">:(code)</span>
-<span id="L337" class="LineNr">337 </span>reagent <a href='072recipe.cc.html#L337'>next_recipe_reagent</a><span class="Delimiter">(</span><span class="Normal">const</span> type_tree* curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L338" class="LineNr">338 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">)</span> <span class="Identifier">return</span> reagent<span class="Delimiter">(</span><span class="Constant">&quot;recipe:&quot;</span>+curr<span class="Delimiter">-&gt;</span>name<span class="Delimiter">);</span>
-<span id="L339" class="LineNr">339 </span>  reagent result<span class="Delimiter">;</span>
-<span id="L340" class="LineNr">340 </span>  result<span class="Delimiter">.</span>name = <span class="Constant">&quot;recipe&quot;</span><span class="Delimiter">;</span>
-<span id="L341" class="LineNr">341 </span>  result<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*curr<span class="Delimiter">);</span>
-<span id="L342" class="LineNr">342 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L343" class="LineNr">343 </span><span class="Delimiter">}</span>
-<span id="L344" class="LineNr">344 </span>
-<span id="L345" class="LineNr">345 </span><span class="Normal">bool</span> <a href='072recipe.cc.html#L345'>is_mu_recipe</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L346" class="LineNr">346 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!r<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L347" class="LineNr">347 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L348" class="LineNr">348 </span>  <span class="Conceal">¦</span> <span class="Comment">// End is_mu_recipe Atom Cases(r)</span>
-<span id="L349" class="LineNr">349 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;recipe-literal&quot;</span><span class="Delimiter">;</span>
-<span id="L350" class="LineNr">350 </span>  <span class="Delimiter">}</span>
-<span id="L351" class="LineNr">351 </span>  <span class="Identifier">return</span> r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom &amp;&amp; r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;recipe&quot;</span><span class="Delimiter">;</span>
-<span id="L352" class="LineNr">352 </span><span class="Delimiter">}</span>
-<span id="L353" class="LineNr">353 </span>
-<span id="L354" class="LineNr">354 </span><span class="Delimiter">:(scenario copy_typecheck_recipe_variable)</span>
-<span id="L355" class="LineNr">355 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L356" class="LineNr">356 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L357" class="LineNr">357 </span>  <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>  <span class="Comment"># abc def</span>
-<span id="L358" class="LineNr">358 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> number<span class="muRecipe"> -&gt; </span>number<span class="Delimiter">)}</span><span class="Special"> &lt;- </span>copy f  <span class="Comment"># store literal in a matching variable</span>
-<span id="L359" class="LineNr">359 </span>  <span class="Delimiter">{</span><span class="Constant">2</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> boolean<span class="muRecipe"> -&gt; </span>boolean<span class="Delimiter">)}</span><span class="Special"> &lt;- </span>copy <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> number<span class="muRecipe"> -&gt; </span>number<span class="Delimiter">)}</span>  <span class="Comment"># mismatch between recipe variables</span>
-<span id="L360" class="LineNr">360 </span>]
-<span id="L361" class="LineNr">361 </span><span class="muRecipe">def</span> f x:num<span class="muRecipe"> -&gt; </span>y:num [
-<span id="L362" class="LineNr">362 </span>  local-scope
-<span id="L363" class="LineNr">363 </span>  load-ingredients
-<span id="L364" class="LineNr">364 </span>  y<span class="Special"> &lt;- </span>copy x
-<span id="L365" class="LineNr">365 </span>]
-<span id="L366" class="LineNr">366 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: can't copy '{1: (recipe number -&gt; number)}' to '{2: (recipe boolean -&gt; boolean)}'; types don't match</span>
-<span id="L367" class="LineNr">367 </span>
-<span id="L368" class="LineNr">368 </span><span class="Delimiter">:(scenario copy_typecheck_recipe_variable_2)</span>
-<span id="L369" class="LineNr">369 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L370" class="LineNr">370 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L371" class="LineNr">371 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> number<span class="muRecipe"> -&gt; </span>number<span class="Delimiter">)}</span><span class="Special"> &lt;- </span>copy f  <span class="Comment"># mismatch with a recipe literal</span>
-<span id="L372" class="LineNr">372 </span>]
-<span id="L373" class="LineNr">373 </span><span class="muRecipe">def</span> f x:<span class="Normal">bool</span><span class="muRecipe"> -&gt; </span>y:<span class="Normal">bool</span> [
-<span id="L374" class="LineNr">374 </span>  local-scope
-<span id="L375" class="LineNr">375 </span>  load-ingredients
-<span id="L376" class="LineNr">376 </span>  y<span class="Special"> &lt;- </span>copy x
-<span id="L377" class="LineNr">377 </span>]
-<span id="L378" class="LineNr">378 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: can't copy 'f' to '{1: (recipe number -&gt; number)}'; types don't match</span>
-<span id="L379" class="LineNr">379 </span>
-<span id="L380" class="LineNr">380 </span><span class="Delimiter">:(before &quot;End Matching Types For Literal(to)&quot;)</span>
-<span id="L381" class="LineNr">381 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='072recipe.cc.html#L345'>is_mu_recipe</a><span class="Delimiter">(</span>to<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L382" class="LineNr">382 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> from<span class="Delimiter">.</span>value<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L383" class="LineNr">383 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L174'>raise</a> &lt;&lt; <span class="Constant">&quot;trying to store <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; from<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; into &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>to<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but there's no such recipe</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L384" class="LineNr">384 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L385" class="LineNr">385 </span>  <span class="Delimiter">}</span>
-<span id="L386" class="LineNr">386 </span>  <span class="Normal">const</span> recipe&amp; rrhs = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> from<span class="Delimiter">.</span>value<span class="Delimiter">);</span>
-<span id="L387" class="LineNr">387 </span>  <span class="Normal">const</span> recipe&amp; rlhs = <a href='072recipe.cc.html#L275'>from_reagent</a><span class="Delimiter">(</span>to<span class="Delimiter">);</span>
-<span id="L388" class="LineNr">388 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>rlhs<span class="Delimiter">.</span>ingredients<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>rrhs<span class="Delimiter">.</span>ingredients<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L389" class="LineNr">389 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_match<span class="Delimiter">(</span>rlhs<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> rrhs<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span>
-<span id="L390" class="LineNr">390 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L391" class="LineNr">391 </span>  <span class="Delimiter">}</span>
-<span id="L392" class="LineNr">392 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>rlhs<span class="Delimiter">.</span>products<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>rrhs<span class="Delimiter">.</span>products<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L393" class="LineNr">393 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_match<span class="Delimiter">(</span>rlhs<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> rrhs<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span>
-<span id="L394" class="LineNr">394 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L395" class="LineNr">395 </span>  <span class="Delimiter">}</span>
-<span id="L396" class="LineNr">396 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L397" class="LineNr">397 </span><span class="Delimiter">}</span>
-<span id="L398" class="LineNr">398 </span>
-<span id="L399" class="LineNr">399 </span><span class="Delimiter">:(scenario call_variable_compound_ingredient)</span>
-<span id="L400" class="LineNr">400 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L401" class="LineNr">401 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> <span class="Delimiter">(</span><a href='043space.cc.html#L82'>address</a> number<span class="Delimiter">)</span><span class="muRecipe"> -&gt; </span>number<span class="Delimiter">)}</span><span class="Special"> &lt;- </span>copy f
-<span id="L402" class="LineNr">402 </span>  <span class="Constant">2</span>:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L403" class="LineNr">403 </span>  <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>call <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> <span class="Delimiter">(</span><a href='043space.cc.html#L82'>address</a> number<span class="Delimiter">)</span><span class="muRecipe"> -&gt; </span>number<span class="Delimiter">)},</span> <span class="Constant">2</span>:&amp;:num
-<span id="L404" class="LineNr">404 </span>]
-<span id="L405" class="LineNr">405 </span><span class="muRecipe">def</span> f x:&amp;:num<span class="muRecipe"> -&gt; </span>y:num [
-<span id="L406" class="LineNr">406 </span>  local-scope
-<span id="L407" class="LineNr">407 </span>  load-ingredients
-<span id="L408" class="LineNr">408 </span>  y<span class="Special"> &lt;- </span>copy x
-<span id="L409" class="LineNr">409 </span>]
-<span id="L410" class="LineNr">410 </span>$error: <span class="Constant">0</span>
-<span id="L411" class="LineNr">411 </span>
-<span id="L412" class="LineNr">412 </span><span class="Comment">//: make sure we don't accidentally break on a recipe literal</span>
-<span id="L413" class="LineNr">413 </span><span class="Delimiter">:(scenario jump_forbidden_on_recipe_literals)</span>
-<span id="L414" class="LineNr">414 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L415" class="LineNr">415 </span><span class="muRecipe">def</span> foo [
-<span id="L416" class="LineNr">416 </span>  local-scope
-<span id="L417" class="LineNr">417 </span>]
-<span id="L418" class="LineNr">418 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L419" class="LineNr">419 </span>  local-scope
-<span id="L420" class="LineNr">420 </span>  <span class="Delimiter">{</span>
-<span id="L421" class="LineNr">421 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span>-<span class="Normal">if</span> foo
-<span id="L422" class="LineNr">422 </span>  <span class="Delimiter">}</span>
-<span id="L423" class="LineNr">423 </span>]
-<span id="L424" class="LineNr">424 </span><span class="Comment"># error should be as if foo is not a recipe</span>
-<span id="L425" class="LineNr">425 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: missing type for 'foo' in 'break-if foo'</span>
-<span id="L426" class="LineNr">426 </span>
-<span id="L427" class="LineNr">427 </span><span class="Delimiter">:(before &quot;End JUMP_IF Checks&quot;)</span>
-<span id="L428" class="LineNr">428 </span><a href='072recipe.cc.html#L432'>check_for_recipe_literals</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">));</span>
-<span id="L429" class="LineNr">429 </span><span class="Delimiter">:(before &quot;End JUMP_UNLESS Checks&quot;)</span>
-<span id="L430" class="LineNr">430 </span><a href='072recipe.cc.html#L432'>check_for_recipe_literals</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">));</span>
-<span id="L431" class="LineNr">431 </span><span class="Delimiter">:(code)</span>
-<span id="L432" class="LineNr">432 </span><span class="Normal">void</span> <a href='072recipe.cc.html#L432'>check_for_recipe_literals</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; caller<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L433" class="LineNr">433 </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>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L434" class="LineNr">434 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='072recipe.cc.html#L345'>is_mu_recipe</a><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 class="Delimiter">{</span>
-<span id="L435" class="LineNr">435 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L174'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;missing type for '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;' in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</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="L436" class="LineNr">436 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_present_in_ingredients<span class="Delimiter">(</span>caller<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">))</span>
-<span id="L437" class="LineNr">437 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L174'>raise</a> &lt;&lt; <span class="Constant">&quot;  did you forget 'load-ingredients'?</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="L438" class="LineNr">438 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L439" class="LineNr">439 </span>  <span class="Delimiter">}</span>
-<span id="L440" class="LineNr">440 </span><span class="Delimiter">}</span>
-<span id="L441" class="LineNr">441 </span>
-<span id="L442" class="LineNr">442 </span><span class="Delimiter">:(scenario load_ingredients_missing_error_3)</span>
-<span id="L443" class="LineNr">443 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L444" class="LineNr">444 </span><span class="muRecipe">def</span> foo <span class="Delimiter">{</span>f: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> num<span class="muRecipe"> -&gt; </span>num<span class="Delimiter">)}</span> [
-<span id="L445" class="LineNr">445 </span>  local-scope
-<span id="L446" class="LineNr">446 </span>  <span class="Normal">b</span>:num<span class="Special"> &lt;- </span>call f<span class="Delimiter">,</span> <span class="Constant">1</span>
-<span id="L447" class="LineNr">447 </span>]
-<span id="L448" class="LineNr">448 </span><span class="traceContains">+error: foo: missing type for 'f' in 'b:num &lt;- call f, 1'</span>
-<span id="L449" class="LineNr">449 </span><span class="traceContains">+error:   did you forget 'load-ingredients'?</span>
-<span id="L450" class="LineNr">450 </span>
-<span id="L451" class="LineNr">451 </span><span class="Delimiter">:(before &quot;End Mu Types Initialization&quot;)</span>
-<span id="L452" class="LineNr">452 </span><a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_abbreviations<span class="Delimiter">,</span> <span class="Constant">&quot;function&quot;</span><span class="Delimiter">,</span> <a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span><span class="Constant">&quot;recipe&quot;</span><span class="Delimiter">));</span>
-<span id="L453" class="LineNr">453 </span>
-<span id="L454" class="LineNr">454 </span><span class="Delimiter">:(scenario call_function)</span>
-<span id="L455" class="LineNr">455 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L456" class="LineNr">456 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>function number<span class="muRecipe"> -&gt; </span>number<span class="Delimiter">)}</span><span class="Special"> &lt;- </span>copy f
-<span id="L457" class="LineNr">457 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>call <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>function number<span class="muRecipe"> -&gt; </span>number<span class="Delimiter">)},</span> <span class="Constant">34</span>
-<span id="L458" class="LineNr">458 </span>]
-<span id="L459" class="LineNr">459 </span><span class="muRecipe">def</span> f x:num<span class="muRecipe"> -&gt; </span>y:num [
-<span id="L460" class="LineNr">460 </span>  local-scope
-<span id="L461" class="LineNr">461 </span>  load-ingredients
-<span id="L462" class="LineNr">462 </span>  y<span class="Special"> &lt;- </span>copy x
-<span id="L463" class="LineNr">463 </span>]
-<span id="L464" class="LineNr">464 </span><span class="traceContains">+mem: storing 34 in location 2</span>
+<span id="L213" class="LineNr">213 </span><span class="Normal">bool</span> <a href='072recipe.cc.html#L213'>is_recipe_literal</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L214" class="LineNr">214 </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>name == <span class="Constant">&quot;recipe-literal&quot;</span><span class="Delimiter">;</span>
+<span id="L215" class="LineNr">215 </span><span class="Delimiter">}</span>
+<span id="L216" class="LineNr">216 </span><span class="Normal">void</span> <a href='072recipe.cc.html#L216'>resolve_indirect_ambiguous_call</a><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="L217" class="LineNr">217 </span>  <a href='010vm.cc.html#L32'>instruction</a> inst2<span class="Delimiter">;</span>
+<span id="L218" class="LineNr">218 </span>  inst2<span class="Delimiter">.</span>name = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">;</span>
+<span id="L219" class="LineNr">219 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='010vm.cc.html#L19'>recipe</a></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>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L220" class="LineNr">220 </span>  <span class="Conceal">¦</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="L221" class="LineNr">221 </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>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L222" class="LineNr">222 </span>  <span class="Conceal">¦</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="L223" class="LineNr">223 </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="L224" class="LineNr">224 </span>  inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name = inst2<span class="Delimiter">.</span>name<span class="Delimiter">;</span>
+<span id="L225" class="LineNr">225 </span>  inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='010vm.cc.html#L65'>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="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="Delimiter">:(after &quot;Transform.push_back(check_instruction)&quot;)</span>
+<span id="L229" class="LineNr">229 </span>Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='072recipe.cc.html#L231'>check_indirect_calls_against_header</a><span class="Delimiter">);</span>  <span class="Comment">// idempotent</span>
+<span id="L230" class="LineNr">230 </span><span class="Delimiter">:(code)</span>
+<span id="L231" class="LineNr">231 </span><span class="Normal">void</span> <a href='072recipe.cc.html#L231'>check_indirect_calls_against_header</a><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="Delimiter">{</span>
+<span id="L232" class="LineNr">232 </span>  <a href='003trace.cc.html#L167'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- type-check 'call' instructions inside <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
+<span id="L233" class="LineNr">233 </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="L234" class="LineNr">234 </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>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L235" class="LineNr">235 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> instruction&amp; inst = caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L236" class="LineNr">236 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!is_indirect_call<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L237" class="LineNr">237 </span>  <span class="Conceal">¦</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="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// error raised above</span>
+<span id="L238" class="LineNr">238 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> reagent&amp; callee = inst<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="L239" class="LineNr">239 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_recipe<span class="Delimiter">(</span>callee<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// error raised above</span>
+<span id="L240" class="LineNr">240 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> <a href='010vm.cc.html#L19'>recipe</a> callee_header = is_literal<span class="Delimiter">(</span>callee<span class="Delimiter">)</span> ? get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> callee<span class="Delimiter">.</span>value<span class="Delimiter">)</span> : <a href='072recipe.cc.html#L273'>from_reagent</a><span class="Delimiter">(</span>inst<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="L241" class="LineNr">241 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!callee_header<span class="Delimiter">.</span>has_header<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L242" class="LineNr">242 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='072recipe.cc.html#L262'>is_indirect_call_with_ingredients</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L243" class="LineNr">243 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip callee</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; min<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> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>callee_header<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span>+<span class="Comment">/*</span><span class="Comment">skip callee</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L244" class="LineNr">244 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_coercible<span class="Delimiter">(</span>callee_header<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i-<span class="Comment">/*</span><span class="Comment">skip callee</span><span class="Comment">*/</span><span class="Constant">1</span><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="L245" class="LineNr">245 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L174'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ingredient &quot;</span> &lt;&lt; i-<span class="Comment">/*</span><span class="Comment">skip callee</span><span class="Comment">*/</span><span class="Constant">1</span> &lt;&lt; <span class="Constant">&quot; has the wrong type at '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</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="L246" class="LineNr">246 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L247" class="LineNr">247 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L248" class="LineNr">248 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='072recipe.cc.html#L267'>is_indirect_call_with_products</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L249" class="LineNr">249 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>callee_header<span class="Delimiter">.</span>products<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L250" class="LineNr">250 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_dummy<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 class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L251" class="LineNr">251 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_coercible<span class="Delimiter">(</span>callee_header<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<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="L252" class="LineNr">252 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L174'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot; has the wrong type at '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</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="L253" class="LineNr">253 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L254" class="LineNr">254 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L255" class="LineNr">255 </span>  <span class="Delimiter">}</span>
+<span id="L256" class="LineNr">256 </span><span class="Delimiter">}</span>
+<span id="L257" class="LineNr">257 </span>
+<span id="L258" class="LineNr">258 </span><span class="Normal">bool</span> <a href='072recipe.cc.html#L258'>is_indirect_call</a><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="Delimiter">{</span>
+<span id="L259" class="LineNr">259 </span>  <span class="Identifier">return</span> <a href='072recipe.cc.html#L262'>is_indirect_call_with_ingredients</a><span class="Delimiter">(</span>r<span class="Delimiter">)</span> || <a href='072recipe.cc.html#L267'>is_indirect_call_with_products</a><span class="Delimiter">(</span>r<span class="Delimiter">);</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="Normal">bool</span> <a href='072recipe.cc.html#L262'>is_indirect_call_with_ingredients</a><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="Delimiter">{</span>
+<span id="L263" class="LineNr">263 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>r == CALL<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L264" class="LineNr">264 </span>  <span class="Comment">// End is_indirect_call_with_ingredients Special-cases</span>
+<span id="L265" class="LineNr">265 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L266" class="LineNr">266 </span><span class="Delimiter">}</span>
+<span id="L267" class="LineNr">267 </span><span class="Normal">bool</span> <a href='072recipe.cc.html#L267'>is_indirect_call_with_products</a><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="Delimiter">{</span>
+<span id="L268" class="LineNr">268 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>r == CALL<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L269" class="LineNr">269 </span>  <span class="Comment">// End is_indirect_call_with_products Special-cases</span>
+<span id="L270" class="LineNr">270 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L271" class="LineNr">271 </span><span class="Delimiter">}</span>
+<span id="L272" class="LineNr">272 </span>
+<span id="L273" class="LineNr">273 </span><span class="muRecipe"><a href='010vm.cc.html#L19'>recipe</a></span> <a href='072recipe.cc.html#L273'>from_reagent</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L274" class="LineNr">274 </span>  assert<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L275" class="LineNr">275 </span>  <a href='010vm.cc.html#L19'>recipe</a> result_header<span class="Delimiter">;</span>  <span class="Comment">// will contain only ingredients and products, nothing else</span>
+<span id="L276" class="LineNr">276 </span>  result_header<span class="Delimiter">.</span>has_header = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L277" class="LineNr">277 </span>  <span class="Comment">// Begin Reagent-&gt;Recipe(r, recipe_header)</span>
+<span id="L278" class="LineNr">278 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L279" class="LineNr">279 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;recipe&quot;</span><span class="Delimiter">);</span>
+<span id="L280" class="LineNr">280 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> result_header<span class="Delimiter">;</span>
+<span id="L281" class="LineNr">281 </span>  <span class="Delimiter">}</span>
+<span id="L282" class="LineNr">282 </span>  <span class="Normal">const</span> type_tree* root_type = r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom ? r<span class="Delimiter">.</span>type : r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">;</span>
+<span id="L283" class="LineNr">283 </span>  assert<span class="Delimiter">(</span>root_type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L284" class="LineNr">284 </span>  assert<span class="Delimiter">(</span>root_type<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;recipe&quot;</span><span class="Delimiter">);</span>
+<span id="L285" class="LineNr">285 </span>  <span class="Normal">const</span> type_tree* curr = r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">;</span>
+<span id="L286" class="LineNr">286 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">nada</span><span class="Comment">*/</span><span class="Delimiter">;</span>  curr &amp;&amp; !curr<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">;</span>  curr = curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L287" class="LineNr">287 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom &amp;&amp; curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;-&gt;&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L288" class="LineNr">288 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr = curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">;</span>  <span class="Comment">// skip delimiter</span>
+<span id="L289" class="LineNr">289 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">goto</span> read_products<span class="Delimiter">;</span>
+<span id="L290" class="LineNr">290 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L291" class="LineNr">291 </span>  <span class="Conceal">¦</span> result_header<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='072recipe.cc.html#L335'>next_recipe_reagent</a><span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">));</span>
+<span id="L292" class="LineNr">292 </span>  <span class="Delimiter">}</span>
+<span id="L293" class="LineNr">293 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L294" class="LineNr">294 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L295" class="LineNr">295 </span>  <span class="Conceal">¦</span> result_header<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='072recipe.cc.html#L335'>next_recipe_reagent</a><span class="Delimiter">(</span>curr<span class="Delimiter">));</span>
+<span id="L296" class="LineNr">296 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> result_header<span class="Delimiter">;</span>  <span class="Comment">// no products</span>
+<span id="L297" class="LineNr">297 </span>  <span class="Delimiter">}</span>
+<span id="L298" class="LineNr">298 </span>  <span class="Normal">read_products</span>:
+<span id="L299" class="LineNr">299 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">nada</span><span class="Comment">*/</span><span class="Delimiter">;</span>  curr &amp;&amp; !curr<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">;</span>  curr = curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span>
+<span id="L300" class="LineNr">300 </span>  <span class="Conceal">¦</span> result_header<span class="Delimiter">.</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='072recipe.cc.html#L335'>next_recipe_reagent</a><span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">));</span>
+<span id="L301" class="LineNr">301 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L302" class="LineNr">302 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L303" class="LineNr">303 </span>  <span class="Conceal">¦</span> result_header<span class="Delimiter">.</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='072recipe.cc.html#L335'>next_recipe_reagent</a><span class="Delimiter">(</span>curr<span class="Delimiter">));</span>
+<span id="L304" class="LineNr">304 </span>  <span class="Delimiter">}</span>
+<span id="L305" class="LineNr">305 </span>  <span class="Identifier">return</span> result_header<span class="Delimiter">;</span>
+<span id="L306" class="LineNr">306 </span><span class="Delimiter">}</span>
+<span id="L307" class="LineNr">307 </span>
+<span id="L308" class="LineNr">308 </span><span class="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
+<span id="L309" class="LineNr">309 </span><span class="Normal">void</span> <a href='072recipe.cc.html#L309'>test_from_reagent_atomic</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L310" class="LineNr">310 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;{f: recipe}&quot;</span><span class="Delimiter">);</span>
+<span id="L311" class="LineNr">311 </span>  <a href='010vm.cc.html#L19'>recipe</a> r_header = <a href='072recipe.cc.html#L273'>from_reagent</a><span class="Delimiter">(</span>a<span class="Delimiter">);</span>
+<span id="L312" class="LineNr">312 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>r_header<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L313" class="LineNr">313 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>r_header<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L314" class="LineNr">314 </span><span class="Delimiter">}</span>
+<span id="L315" class="LineNr">315 </span><span class="Normal">void</span> <a href='072recipe.cc.html#L315'>test_from_reagent_non_atomic</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L316" class="LineNr">316 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;{f: (recipe number -&gt; number)}&quot;</span><span class="Delimiter">);</span>
+<span id="L317" class="LineNr">317 </span>  <a href='010vm.cc.html#L19'>recipe</a> r_header = <a href='072recipe.cc.html#L273'>from_reagent</a><span class="Delimiter">(</span>a<span class="Delimiter">);</span>
+<span id="L318" class="LineNr">318 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>r_header<span class="Delimiter">.</span>ingredients<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L319" class="LineNr">319 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>r_header<span class="Delimiter">.</span>products<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L320" class="LineNr">320 </span><span class="Delimiter">}</span>
+<span id="L321" class="LineNr">321 </span><span class="Normal">void</span> <a href='072recipe.cc.html#L321'>test_from_reagent_reads_ingredient_at_end</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L322" class="LineNr">322 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;{f: (recipe number number)}&quot;</span><span class="Delimiter">);</span>
+<span id="L323" class="LineNr">323 </span>  <a href='010vm.cc.html#L19'>recipe</a> r_header = <a href='072recipe.cc.html#L273'>from_reagent</a><span class="Delimiter">(</span>a<span class="Delimiter">);</span>
+<span id="L324" class="LineNr">324 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>r_header<span class="Delimiter">.</span>ingredients<span class="Delimiter">),</span> <span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L325" class="LineNr">325 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>r_header<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L326" class="LineNr">326 </span><span class="Delimiter">}</span>
+<span id="L327" class="LineNr">327 </span><span class="Normal">void</span> <a href='072recipe.cc.html#L327'>test_from_reagent_reads_sole_ingredient_at_end</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L328" class="LineNr">328 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;{f: (recipe number)}&quot;</span><span class="Delimiter">);</span>
+<span id="L329" class="LineNr">329 </span>  <a href='010vm.cc.html#L19'>recipe</a> r_header = <a href='072recipe.cc.html#L273'>from_reagent</a><span class="Delimiter">(</span>a<span class="Delimiter">);</span>
+<span id="L330" class="LineNr">330 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>r_header<span class="Delimiter">.</span>ingredients<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L331" class="LineNr">331 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>r_header<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L332" class="LineNr">332 </span><span class="Delimiter">}</span>
+<span id="L333" class="LineNr">333 </span>
+<span id="L334" class="LineNr">334 </span><span class="Delimiter">:(code)</span>
+<span id="L335" class="LineNr">335 </span>reagent <a href='072recipe.cc.html#L335'>next_recipe_reagent</a><span class="Delimiter">(</span><span class="Normal">const</span> type_tree* curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L336" class="LineNr">336 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">)</span> <span class="Identifier">return</span> reagent<span class="Delimiter">(</span><span class="Constant">&quot;recipe:&quot;</span>+curr<span class="Delimiter">-&gt;</span>name<span class="Delimiter">);</span>
+<span id="L337" class="LineNr">337 </span>  reagent result<span class="Delimiter">;</span>
+<span id="L338" class="LineNr">338 </span>  result<span class="Delimiter">.</span>name = <span class="Constant">&quot;recipe&quot;</span><span class="Delimiter">;</span>
+<span id="L339" class="LineNr">339 </span>  result<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*curr<span class="Delimiter">);</span>
+<span id="L340" class="LineNr">340 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L341" class="LineNr">341 </span><span class="Delimiter">}</span>
+<span id="L342" class="LineNr">342 </span>
+<span id="L343" class="LineNr">343 </span><span class="Normal">bool</span> <a href='072recipe.cc.html#L343'>is_mu_recipe</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L344" class="LineNr">344 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!r<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L345" class="LineNr">345 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L346" class="LineNr">346 </span>  <span class="Conceal">¦</span> <span class="Comment">// End is_mu_recipe Atom Cases(r)</span>
+<span id="L347" class="LineNr">347 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;recipe-literal&quot;</span><span class="Delimiter">;</span>
+<span id="L348" class="LineNr">348 </span>  <span class="Delimiter">}</span>
+<span id="L349" class="LineNr">349 </span>  <span class="Identifier">return</span> r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom &amp;&amp; r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;recipe&quot;</span><span class="Delimiter">;</span>
+<span id="L350" class="LineNr">350 </span><span class="Delimiter">}</span>
+<span id="L351" class="LineNr">351 </span>
+<span id="L352" class="LineNr">352 </span><span class="Delimiter">:(scenario copy_typecheck_recipe_variable)</span>
+<span id="L353" class="LineNr">353 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L354" class="LineNr">354 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L355" class="LineNr">355 </span>  <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>  <span class="Comment"># abc def</span>
+<span id="L356" class="LineNr">356 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> number<span class="muRecipe"> -&gt; </span>number<span class="Delimiter">)}</span><span class="Special"> &lt;- </span>copy f  <span class="Comment"># store literal in a matching variable</span>
+<span id="L357" class="LineNr">357 </span>  <span class="Delimiter">{</span><span class="Constant">2</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> boolean<span class="muRecipe"> -&gt; </span>boolean<span class="Delimiter">)}</span><span class="Special"> &lt;- </span>copy <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> number<span class="muRecipe"> -&gt; </span>number<span class="Delimiter">)}</span>  <span class="Comment"># mismatch between recipe variables</span>
+<span id="L358" class="LineNr">358 </span>]
+<span id="L359" class="LineNr">359 </span><span class="muRecipe">def</span> f x:num<span class="muRecipe"> -&gt; </span>y:num [
+<span id="L360" class="LineNr">360 </span>  local-scope
+<span id="L361" class="LineNr">361 </span>  load-ingredients
+<span id="L362" class="LineNr">362 </span>  y<span class="Special"> &lt;- </span>copy x
+<span id="L363" class="LineNr">363 </span>]
+<span id="L364" class="LineNr">364 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: can't copy '{1: (recipe number -&gt; number)}' to '{2: (recipe boolean -&gt; boolean)}'; types don't match</span>
+<span id="L365" class="LineNr">365 </span>
+<span id="L366" class="LineNr">366 </span><span class="Delimiter">:(scenario copy_typecheck_recipe_variable_2)</span>
+<span id="L367" class="LineNr">367 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L368" class="LineNr">368 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L369" class="LineNr">369 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> number<span class="muRecipe"> -&gt; </span>number<span class="Delimiter">)}</span><span class="Special"> &lt;- </span>copy f  <span class="Comment"># mismatch with a recipe literal</span>
+<span id="L370" class="LineNr">370 </span>]
+<span id="L371" class="LineNr">371 </span><span class="muRecipe">def</span> f x:<span class="Normal">bool</span><span class="muRecipe"> -&gt; </span>y:<span class="Normal">bool</span> [
+<span id="L372" class="LineNr">372 </span>  local-scope
+<span id="L373" class="LineNr">373 </span>  load-ingredients
+<span id="L374" class="LineNr">374 </span>  y<span class="Special"> &lt;- </span>copy x
+<span id="L375" class="LineNr">375 </span>]
+<span id="L376" class="LineNr">376 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: can't copy 'f' to '{1: (recipe number -&gt; number)}'; types don't match</span>
+<span id="L377" class="LineNr">377 </span>
+<span id="L378" class="LineNr">378 </span><span class="Delimiter">:(before &quot;End Matching Types For Literal(to)&quot;)</span>
+<span id="L379" class="LineNr">379 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='072recipe.cc.html#L343'>is_mu_recipe</a><span class="Delimiter">(</span>to<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L380" class="LineNr">380 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> from<span class="Delimiter">.</span>value<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L381" class="LineNr">381 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L174'>raise</a> &lt;&lt; <span class="Constant">&quot;trying to store <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; from<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; into &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>to<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but there's no such recipe</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L382" class="LineNr">382 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L383" class="LineNr">383 </span>  <span class="Delimiter">}</span>
+<span id="L384" class="LineNr">384 </span>  <span class="Normal">const</span> recipe&amp; rrhs = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> from<span class="Delimiter">.</span>value<span class="Delimiter">);</span>
+<span id="L385" class="LineNr">385 </span>  <span class="Normal">const</span> recipe&amp; rlhs = <a href='072recipe.cc.html#L273'>from_reagent</a><span class="Delimiter">(</span>to<span class="Delimiter">);</span>
+<span id="L386" class="LineNr">386 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>rlhs<span class="Delimiter">.</span>ingredients<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>rrhs<span class="Delimiter">.</span>ingredients<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L387" class="LineNr">387 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_match<span class="Delimiter">(</span>rlhs<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> rrhs<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span>
+<span id="L388" class="LineNr">388 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L389" class="LineNr">389 </span>  <span class="Delimiter">}</span>
+<span id="L390" class="LineNr">390 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>rlhs<span class="Delimiter">.</span>products<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>rrhs<span class="Delimiter">.</span>products<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L391" class="LineNr">391 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_match<span class="Delimiter">(</span>rlhs<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> rrhs<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span>
+<span id="L392" class="LineNr">392 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L393" class="LineNr">393 </span>  <span class="Delimiter">}</span>
+<span id="L394" class="LineNr">394 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L395" class="LineNr">395 </span><span class="Delimiter">}</span>
+<span id="L396" class="LineNr">396 </span>
+<span id="L397" class="LineNr">397 </span><span class="Delimiter">:(scenario call_variable_compound_ingredient)</span>
+<span id="L398" class="LineNr">398 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L399" class="LineNr">399 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> <span class="Delimiter">(</span><a href='043space.cc.html#L82'>address</a> number<span class="Delimiter">)</span><span class="muRecipe"> -&gt; </span>number<span class="Delimiter">)}</span><span class="Special"> &lt;- </span>copy f
+<span id="L400" class="LineNr">400 </span>  <span class="Constant">2</span>:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L401" class="LineNr">401 </span>  <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>call <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> <span class="Delimiter">(</span><a href='043space.cc.html#L82'>address</a> number<span class="Delimiter">)</span><span class="muRecipe"> -&gt; </span>number<span class="Delimiter">)},</span> <span class="Constant">2</span>:&amp;:num
+<span id="L402" class="LineNr">402 </span>]
+<span id="L403" class="LineNr">403 </span><span class="muRecipe">def</span> f x:&amp;:num<span class="muRecipe"> -&gt; </span>y:num [
+<span id="L404" class="LineNr">404 </span>  local-scope
+<span id="L405" class="LineNr">405 </span>  load-ingredients
+<span id="L406" class="LineNr">406 </span>  y<span class="Special"> &lt;- </span>copy x
+<span id="L407" class="LineNr">407 </span>]
+<span id="L408" class="LineNr">408 </span>$error: <span class="Constant">0</span>
+<span id="L409" class="LineNr">409 </span>
+<span id="L410" class="LineNr">410 </span><span class="Comment">//: make sure we don't accidentally break on a recipe literal</span>
+<span id="L411" class="LineNr">411 </span><span class="Delimiter">:(scenario jump_forbidden_on_recipe_literals)</span>
+<span id="L412" class="LineNr">412 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L413" class="LineNr">413 </span><span class="muRecipe">def</span> foo [
+<span id="L414" class="LineNr">414 </span>  local-scope
+<span id="L415" class="LineNr">415 </span>]
+<span id="L416" class="LineNr">416 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L417" class="LineNr">417 </span>  local-scope
+<span id="L418" class="LineNr">418 </span>  <span class="Delimiter">{</span>
+<span id="L419" class="LineNr">419 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span>-<span class="Normal">if</span> foo
+<span id="L420" class="LineNr">420 </span>  <span class="Delimiter">}</span>
+<span id="L421" class="LineNr">421 </span>]
+<span id="L422" class="LineNr">422 </span><span class="Comment"># error should be as if foo is not a recipe</span>
+<span id="L423" class="LineNr">423 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: missing type for 'foo' in 'break-if foo'</span>
+<span id="L424" class="LineNr">424 </span>
+<span id="L425" class="LineNr">425 </span><span class="Delimiter">:(before &quot;End JUMP_IF Checks&quot;)</span>
+<span id="L426" class="LineNr">426 </span><a href='072recipe.cc.html#L430'>check_for_recipe_literals</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">));</span>
+<span id="L427" class="LineNr">427 </span><span class="Delimiter">:(before &quot;End JUMP_UNLESS Checks&quot;)</span>
+<span id="L428" class="LineNr">428 </span><a href='072recipe.cc.html#L430'>check_for_recipe_literals</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">));</span>
+<span id="L429" class="LineNr">429 </span><span class="Delimiter">:(code)</span>
+<span id="L430" class="LineNr">430 </span><span class="Normal">void</span> <a href='072recipe.cc.html#L430'>check_for_recipe_literals</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; caller<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L431" class="LineNr">431 </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>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L432" class="LineNr">432 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='072recipe.cc.html#L343'>is_mu_recipe</a><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 class="Delimiter">{</span>
+<span id="L433" class="LineNr">433 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L174'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;missing type for '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;' in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</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="L434" class="LineNr">434 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_present_in_ingredients<span class="Delimiter">(</span>caller<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">))</span>
+<span id="L435" class="LineNr">435 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L174'>raise</a> &lt;&lt; <span class="Constant">&quot;  did you forget 'load-ingredients'?</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="L436" class="LineNr">436 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L437" class="LineNr">437 </span>  <span class="Delimiter">}</span>
+<span id="L438" class="LineNr">438 </span><span class="Delimiter">}</span>
+<span id="L439" class="LineNr">439 </span>
+<span id="L440" class="LineNr">440 </span><span class="Delimiter">:(scenario load_ingredients_missing_error_3)</span>
+<span id="L441" class="LineNr">441 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L442" class="LineNr">442 </span><span class="muRecipe">def</span> foo <span class="Delimiter">{</span>f: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> num<span class="muRecipe"> -&gt; </span>num<span class="Delimiter">)}</span> [
+<span id="L443" class="LineNr">443 </span>  local-scope
+<span id="L444" class="LineNr">444 </span>  <span class="Normal">b</span>:num<span class="Special"> &lt;- </span>call f<span class="Delimiter">,</span> <span class="Constant">1</span>
+<span id="L445" class="LineNr">445 </span>]
+<span id="L446" class="LineNr">446 </span><span class="traceContains">+error: foo: missing type for 'f' in 'b:num &lt;- call f, 1'</span>
+<span id="L447" class="LineNr">447 </span><span class="traceContains">+error:   did you forget 'load-ingredients'?</span>
+<span id="L448" class="LineNr">448 </span>
+<span id="L449" class="LineNr">449 </span><span class="Delimiter">:(before &quot;End Mu Types Initialization&quot;)</span>
+<span id="L450" class="LineNr">450 </span><a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_abbreviations<span class="Delimiter">,</span> <span class="Constant">&quot;function&quot;</span><span class="Delimiter">,</span> <a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span><span class="Constant">&quot;recipe&quot;</span><span class="Delimiter">));</span>
+<span id="L451" class="LineNr">451 </span>
+<span id="L452" class="LineNr">452 </span><span class="Delimiter">:(scenario call_function)</span>
+<span id="L453" class="LineNr">453 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L454" class="LineNr">454 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>function number<span class="muRecipe"> -&gt; </span>number<span class="Delimiter">)}</span><span class="Special"> &lt;- </span>copy f
+<span id="L455" class="LineNr">455 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>call <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>function number<span class="muRecipe"> -&gt; </span>number<span class="Delimiter">)},</span> <span class="Constant">34</span>
+<span id="L456" class="LineNr">456 </span>]
+<span id="L457" class="LineNr">457 </span><span class="muRecipe">def</span> f x:num<span class="muRecipe"> -&gt; </span>y:num [
+<span id="L458" class="LineNr">458 </span>  local-scope
+<span id="L459" class="LineNr">459 </span>  load-ingredients
+<span id="L460" class="LineNr">460 </span>  y<span class="Special"> &lt;- </span>copy x
+<span id="L461" class="LineNr">461 </span>]
+<span id="L462" class="LineNr">462 </span><span class="traceContains">+mem: storing 34 in location 2</span>
 </pre>
 </body>
 </html>
diff --git a/html/073scheduler.cc.html b/html/073scheduler.cc.html
index c6b093d8..82b30a58 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.LineNr { color: #444444; }
 .SalientComment { color: #00ffff; }
 .muRecipe { color: #ff8700; }
-.LineNr { color: #444444; }
+.cSpecial { color: #008000; }
+.Identifier { color: #c0a020; }
+.Delimiter { color: #800080; }
 .traceContains { color: #008000; }
+.Conceal { color: #4e4e4e; }
 .traceAbsent { color: #c00000; }
-.Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.cSpecial { color: #008000; }
-.Conceal { color: #4e4e4e; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
 -->
 </style>
 
@@ -315,7 +315,7 @@ if ('onhashchange' in window) {
 <span id="L250" class="LineNr">250 </span><span class="traceContains">+error: f1: ingredient 0 has the wrong type at 'start-running f2, 3'</span>
 <span id="L251" class="LineNr">251 </span>
 <span id="L252" class="LineNr">252 </span><span class="Comment">// 'start-running' only uses the ingredients of the callee, not its products</span>
-<span id="L253" class="LineNr">253 </span><span class="Delimiter">:(before &quot;End <a href='072recipe.cc.html#L264'>is_indirect_call_with_ingredients</a> Special-cases&quot;)</span>
+<span id="L253" class="LineNr">253 </span><span class="Delimiter">:(before &quot;End <a href='072recipe.cc.html#L262'>is_indirect_call_with_ingredients</a> Special-cases&quot;)</span>
 <span id="L254" class="LineNr">254 </span><span class="Normal">if</span> <span class="Delimiter">(</span>r == START_RUNNING<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L255" class="LineNr">255 </span>
 <span id="L256" class="LineNr">256 </span><span class="Comment">//: refcounting management when starting up new routines</span>
diff --git a/html/074wait.cc.html b/html/074wait.cc.html
index 6991a951..02633390 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.LineNr { color: #444444; }
 .SalientComment { color: #00ffff; }
 .muRecipe { color: #ff8700; }
+.cSpecial { color: #008000; }
 .muData { color: #ffff00; }
-.LineNr { color: #444444; }
-.traceContains { color: #008000; }
+.Identifier { color: #c0a020; }
 .Delimiter { color: #800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 .Conceal { color: #4e4e4e; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/075channel.mu.html b/html/075channel.mu.html
index 034410bf..d294b7cb 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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,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; }
-.Conceal { color: #4e4e4e; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
-.Delimiter { color: #800080; }
+.Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .SalientComment { color: #00ffff; }
+.muData { color: #ffff00; }
+.Delimiter { color: #800080; }
+.muControl { color: #c0a020; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muRecipe { color: #ff8700; }
-.muControl { color: #c0a020; }
+.Special { color: #c00000; }
 .CommentedCode { color: #6c6c6c; }
-.muData { color: #ffff00; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
@@ -441,7 +441,7 @@ if ('onhashchange' in window) {
 <span id="L377" class="LineNr">377 </span>]
 <span id="L378" class="LineNr">378 </span>
 <span id="L379" class="LineNr">379 </span><span class="Comment"># A full channel has first-free just before first-full, wasting one slot.</span>
-<span id="L380" class="LineNr">380 </span><span class="Comment"># (Other alternatives: <a href="https://www.snellman.net/blog/archive/2016-12-13-ring-buffers)">https://www.snellman.net/blog/archive/2016-12-13-ring-buffers)</a></span>
+<span id="L380" class="LineNr">380 </span><span class="Comment"># (Other alternatives: <a href="https://www.snellman.net/blog/archive/2016-12-13-ring-buffers">https://www.snellman.net/blog/archive/2016-12-13-ring-buffers</a>)</span>
 <span id="L381" class="LineNr">381 </span><span class="muRecipe">def</span> <a href='075channel.mu.html#L381'>channel-full?</a> chan:&amp;:channel:_elem<span class="muRecipe"> -&gt; </span>result:bool [
 <span id="L382" class="LineNr">382 </span>  <span class="Constant">local-scope</span>
 <span id="L383" class="LineNr">383 </span>  <span class="Constant">load-inputs</span>
diff --git a/html/076continuation.cc.html b/html/076continuation.cc.html
index eca16757..00b353f9 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
-.Conceal { color: #4e4e4e; }
 .traceAbsent { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
+.Conceal { color: #4e4e4e; }
+.traceContains { color: #008000; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
@@ -115,7 +115,7 @@ if ('onhashchange' in window) {
 <span id="L51" class="LineNr"> 51 </span>Type[continuation]<span class="Delimiter">.</span>name = <span class="Constant">&quot;continuation&quot;</span><span class="Delimiter">;</span>
 <span id="L52" class="LineNr"> 52 </span>
 <span id="L53" class="LineNr"> 53 </span><span class="Comment">//: A continuation can be called like a recipe.</span>
-<span id="L54" class="LineNr"> 54 </span><span class="Delimiter">:(before &quot;End <a href='072recipe.cc.html#L345'>is_mu_recipe</a> Atom Cases(r)&quot;)</span>
+<span id="L54" class="LineNr"> 54 </span><span class="Delimiter">:(before &quot;End <a href='072recipe.cc.html#L343'>is_mu_recipe</a> Atom Cases(r)&quot;)</span>
 <span id="L55" class="LineNr"> 55 </span><span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;continuation&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L56" class="LineNr"> 56 </span>
 <span id="L57" class="LineNr"> 57 </span><span class="Comment">//: However, it can't be type-checked like most recipes. Pretend it's like a</span>
@@ -128,7 +128,7 @@ if ('onhashchange' in window) {
 <span id="L64" class="LineNr"> 64 </span>
 <span id="L65" class="LineNr"> 65 </span><span class="Delimiter">:(scenario delimited_continuation)</span>
 <span id="L66" class="LineNr"> 66 </span><span class="muRecipe"><a href='010vm.cc.html#L19'>recipe</a></span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L67" class="LineNr"> 67 </span>  <span class="Constant">1</span>:continuation<span class="Special"> &lt;- </span>call-with-continuation-mark f<span class="Delimiter">,</span> <span class="Constant">77</span>  <span class="Comment"># 77 is an argument to f</span>
+<span id="L67" class="LineNr"> 67 </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">77</span>  <span class="Comment"># 77 is an argument to f</span>
 <span id="L68" class="LineNr"> 68 </span>  <span class="Constant">2</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">5</span>
 <span id="L69" class="LineNr"> 69 </span>  <span class="Delimiter">{</span>
 <span id="L70" class="LineNr"> 70 </span>  <span class="Conceal">¦</span> <span class="Constant">2</span>:number<span class="Special"> &lt;- </span>call <span class="Constant">1</span>:continuation<span class="Delimiter">,</span> <span class="Constant">2</span>:number  <span class="Comment"># jump to 'return-continuation-until-mark' below</span>
@@ -144,7 +144,7 @@ if ('onhashchange' in window) {
 <span id="L80" class="LineNr"> 80 </span>]
 <span id="L81" class="LineNr"> 81 </span><span class="muRecipe"><a href='010vm.cc.html#L19'>recipe</a></span> g [
 <span id="L82" class="LineNr"> 82 </span>  <span class="Constant">21</span>:number<span class="Special"> &lt;- </span>next-ingredient
-<span id="L83" class="LineNr"> 83 </span>  <span class="Constant">22</span>:number<span class="Special"> &lt;- </span><span class="Identifier">return</span>-continuation-until-mark
+<span id="L83" class="LineNr"> 83 </span>  <span class="Constant">22</span>:number<span class="Special"> &lt;- </span><span class="Identifier">return</span>-continuation-until-mark <span class="Constant">233</span>/mark
 <span id="L84" class="LineNr"> 84 </span>  <span class="Constant">23</span>:number<span class="Special"> &lt;- </span>add <span class="Constant">22</span>:number<span class="Delimiter">,</span> <span class="Constant">1</span>
 <span id="L85" class="LineNr"> 85 </span>  <span class="Identifier">return</span> <span class="Constant">23</span>:number
 <span id="L86" class="LineNr"> 86 </span>]
@@ -172,9 +172,9 @@ if ('onhashchange' in window) {
 <span id="L108" class="LineNr">108 </span><span class="traceAbsent">-mem: storing 9 in location 2</span>
 <span id="L109" class="LineNr">109 </span>
 <span id="L110" class="LineNr">110 </span><span class="Delimiter">:(before &quot;End call Fields&quot;)</span>
-<span id="L111" class="LineNr">111 </span><span class="Normal">bool</span> is_base_of_continuation<span class="Delimiter">;</span>
+<span id="L111" class="LineNr">111 </span><span class="Normal">int</span> is_base_of_continuation<span class="Delimiter">;</span>
 <span id="L112" class="LineNr">112 </span><span class="Delimiter">:(before &quot;End call Constructor&quot;)</span>
-<span id="L113" class="LineNr">113 </span>is_base_of_continuation = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L113" class="LineNr">113 </span>is_base_of_continuation = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L114" class="LineNr">114 </span>
 <span id="L115" class="LineNr">115 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Declarations&quot;)</span>
 <span id="L116" class="LineNr">116 </span>CALL_WITH_CONTINUATION_MARK<span class="Delimiter">,</span>
@@ -194,272 +194,321 @@ if ('onhashchange' in window) {
 <span id="L130" class="LineNr">130 </span>  <span class="Conceal">¦</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="L131" class="LineNr">131 </span>  <span class="Delimiter">}</span>
 <span id="L132" class="LineNr">132 </span>  <span class="Normal">const</span> instruction&amp; caller_instruction = <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">();</span>
-<span id="L133" class="LineNr">133 </span>  Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>is_base_of_continuation = <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L134" class="LineNr">134 </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">0</span><span class="Delimiter">).</span>name]<span class="Delimiter">));</span>
-<span id="L135" class="LineNr">135 </span>  ingredients<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">());</span>  <span class="Comment">// drop the callee</span>
-<span id="L136" class="LineNr">136 </span>  finish_call_housekeeping<span class="Delimiter">(</span>caller_instruction<span class="Delimiter">,</span> ingredients<span class="Delimiter">);</span>
-<span id="L137" class="LineNr">137 </span>  <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L138" class="LineNr">138 </span><span class="Delimiter">}</span>
-<span id="L139" class="LineNr">139 </span>
-<span id="L140" class="LineNr">140 </span><span class="Comment">//: save the slice of current call stack until the 'call-with-continuation-mark'</span>
-<span id="L141" class="LineNr">141 </span><span class="Comment">//: call, and return it as the result.</span>
-<span id="L142" class="LineNr">142 </span><span class="Comment">//: todo: implement delimited continuations in Mu's memory</span>
-<span id="L143" class="LineNr">143 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L144" class="LineNr">144 </span><span class="Normal">struct</span> delimited_continuation <span class="Delimiter">{</span>
-<span id="L145" class="LineNr">145 </span>  call_stack frames<span class="Delimiter">;</span>
-<span id="L146" class="LineNr">146 </span>  <span class="Normal">int</span> nrefs<span class="Delimiter">;</span>
-<span id="L147" class="LineNr">147 </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="L148" class="LineNr">148 </span><span class="Delimiter">};</span>
-<span id="L149" class="LineNr">149 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L150" class="LineNr">150 </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="L151" class="LineNr">151 </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="L152" class="LineNr">152 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L153" class="LineNr">153 </span>Delimited_continuation<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
-<span id="L154" class="LineNr">154 </span>Next_delimited_continuation_id = <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L155" class="LineNr">155 </span>
-<span id="L156" class="LineNr">156 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Declarations&quot;)</span>
-<span id="L157" class="LineNr">157 </span>RETURN_CONTINUATION_UNTIL_MARK<span class="Delimiter">,</span>
-<span id="L158" class="LineNr">158 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Numbers&quot;)</span>
-<span id="L159" class="LineNr">159 </span>Recipe_ordinal[<span class="Constant">&quot;return-continuation-until-mark&quot;</span>] = RETURN_CONTINUATION_UNTIL_MARK<span class="Delimiter">;</span>
-<span id="L160" class="LineNr">160 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
-<span id="L161" class="LineNr">161 </span><span class="Normal">case</span> RETURN_CONTINUATION_UNTIL_MARK: <span class="Delimiter">{</span>
-<span id="L162" class="LineNr">162 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L163" class="LineNr">163 </span><span class="Delimiter">}</span>
-<span id="L164" class="LineNr">164 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
-<span id="L165" class="LineNr">165 </span><span class="Normal">case</span> RETURN_CONTINUATION_UNTIL_MARK: <span class="Delimiter">{</span>
-<span id="L166" class="LineNr">166 </span>  <span class="Comment">// I don't know how to think about next-ingredient in combination with</span>
-<span id="L167" class="LineNr">167 </span>  <span class="Comment">// continuations, so seems cleaner to just kill it. Functions have to read</span>
-<span id="L168" class="LineNr">168 </span>  <span class="Comment">// their inputs before ever returning a continuation.</span>
-<span id="L169" class="LineNr">169 </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="L170" class="LineNr">170 </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="L171" class="LineNr">171 </span>  <span class="Comment">// copy the current call stack until the most recent marked call</span>
-<span id="L172" class="LineNr">172 </span>  call_stack::iterator find_base_of_continuation<span class="Delimiter">(</span>call_stack&amp; c<span class="Delimiter">);</span>  <span class="Comment">// manual prototype containing '::'</span>
-<span id="L173" class="LineNr">173 </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 id="L174" class="LineNr">174 </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="L175" class="LineNr">175 </span>  <span class="Conceal">¦</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="L176" class="LineNr">176 </span>  <span class="Conceal">¦</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="L177" class="LineNr">177 </span>  <span class="Conceal">¦</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="L178" class="LineNr">178 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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="L179" class="LineNr">179 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L180" class="LineNr">180 </span>  <span class="Delimiter">}</span>
-<span id="L181" class="LineNr">181 </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="L182" class="LineNr">182 </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="L183" class="LineNr">183 </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="L184" class="LineNr">184 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L185" class="LineNr">185 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> --Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">;</span>
-<span id="L186" class="LineNr">186 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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="L187" class="LineNr">187 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L188" class="LineNr">188 </span>  <span class="Conceal">¦</span> Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>pop_front<span class="Delimiter">();</span>
-<span id="L189" class="LineNr">189 </span>  <span class="Delimiter">}</span>
-<span id="L190" class="LineNr">190 </span>  <span class="Comment">// return it as the result of the marked call</span>
-<span id="L191" class="LineNr">191 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L192" class="LineNr">192 </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="L193" class="LineNr">193 </span>  <span class="Comment">// return any other ingredients passed in</span>
-<span id="L194" class="LineNr">194 </span>  copy<span class="Delimiter">(</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="L195" class="LineNr">195 </span>  ++Next_delimited_continuation_id<span class="Delimiter">;</span>
-<span id="L196" class="LineNr">196 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// continue to process rest of marked call</span>
-<span id="L197" class="LineNr">197 </span><span class="Delimiter">}</span>
-<span id="L198" class="LineNr">198 </span>
-<span id="L199" class="LineNr">199 </span><span class="Delimiter">:(code)</span>
-<span id="L200" class="LineNr">200 </span>call_stack::iterator find_base_of_continuation<span class="Delimiter">(</span>call_stack&amp; c<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L201" class="LineNr">201 </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="L202" class="LineNr">202 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>is_base_of_continuation<span class="Delimiter">)</span> <span class="Identifier">return</span> p<span class="Delimiter">;</span>
-<span id="L203" class="LineNr">203 </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="L204" class="LineNr">204 </span><span class="Delimiter">}</span>
-<span id="L205" class="LineNr">205 </span>
-<span id="L206" class="LineNr">206 </span><span class="Comment">//: overload 'call' for continuations</span>
-<span id="L207" class="LineNr">207 </span><span class="Delimiter">:(after &quot;Begin Call&quot;)</span>
-<span id="L208" class="LineNr">208 </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="L209" class="LineNr">209 </span>  <span class="Comment">// copy multiple calls on to current call stack</span>
-<span id="L210" class="LineNr">210 </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="L211" class="LineNr">211 </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="L212" class="LineNr">212 </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="L213" class="LineNr">213 </span>  <span class="Conceal">¦</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="L214" class="LineNr">214 </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="L215" class="LineNr">215 </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 class="Delimiter">{</span>
-<span id="L216" class="LineNr">216 </span>  <span class="Conceal">¦</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="L217" class="LineNr">217 </span>  <span class="Conceal">¦</span> <span class="Comment">// ensure that the presence of a continuation keeps its stack frames from being reclaimed</span>
-<span id="L218" class="LineNr">218 </span>  <span class="Conceal">¦</span> <a href='036refcount.cc.html#L50'>increment_refcount</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>default_space<span class="Delimiter">);</span>
-<span id="L219" class="LineNr">219 </span>  <span class="Delimiter">}</span>
-<span id="L220" class="LineNr">220 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L221" class="LineNr">221 </span>  <span class="Conceal">¦</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="L222" class="LineNr">222 </span>  <span class="Conceal">¦</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="L223" class="LineNr">223 </span>  <span class="Conceal">¦</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="L224" class="LineNr">224 </span>  <span class="Delimiter">}</span>
-<span id="L225" class="LineNr">225 </span>  <span class="Comment">// no call housekeeping; continuations don't support next-ingredient</span>
-<span id="L226" class="LineNr">226 </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="L227" class="LineNr">227 </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="L228" class="LineNr">228 </span><span class="Delimiter">}</span>
-<span id="L229" class="LineNr">229 </span>
-<span id="L230" class="LineNr">230 </span><span class="Delimiter">:(scenario continuations_can_return_values)</span>
-<span id="L231" class="LineNr">231 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L232" class="LineNr">232 </span>  local-scope
-<span id="L233" class="LineNr">233 </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 f
-<span id="L234" class="LineNr">234 </span>]
-<span id="L235" class="LineNr">235 </span><span class="muRecipe">def</span> f [
-<span id="L236" class="LineNr">236 </span>  local-scope
-<span id="L237" class="LineNr">237 </span>  g
-<span id="L238" class="LineNr">238 </span>]
-<span id="L239" class="LineNr">239 </span><span class="muRecipe">def</span> g [
-<span id="L240" class="LineNr">240 </span>  local-scope
-<span id="L241" class="LineNr">241 </span>  <span class="Identifier">return</span>-continuation-until-mark <span class="Constant">34</span>
-<span id="L242" class="LineNr">242 </span>  stash [continuation called]
-<span id="L243" class="LineNr">243 </span>]
-<span id="L244" class="LineNr">244 </span><span class="Comment"># entering main</span>
-<span id="L245" class="LineNr">245 </span><span class="traceContains">+mem: new alloc: 1000</span>
-<span id="L246" class="LineNr">246 </span><span class="traceContains">+run: {k: &quot;continuation&quot;}, {1: &quot;number&quot;, &quot;raw&quot;: ()} &lt;- call-with-continuation-mark {f: &quot;recipe-literal&quot;}</span>
-<span id="L247" class="LineNr">247 </span><span class="Comment"># entering f</span>
-<span id="L248" class="LineNr">248 </span><span class="traceContains">+mem: new alloc: 1004</span>
-<span id="L249" class="LineNr">249 </span><span class="Comment"># entering g</span>
-<span id="L250" class="LineNr">250 </span><span class="traceContains">+mem: new alloc: 1007</span>
-<span id="L251" class="LineNr">251 </span><span class="Comment"># return control to main</span>
-<span id="L252" class="LineNr">252 </span><span class="traceContains">+run: return-continuation-until-mark {34: &quot;literal&quot;}</span>
-<span id="L253" class="LineNr">253 </span><span class="Comment"># no allocs abandoned yet</span>
-<span id="L254" class="LineNr">254 </span><span class="traceContains">+mem: storing 34 in location 1</span>
-<span id="L255" class="LineNr">255 </span><span class="Comment"># end of main</span>
-<span id="L256" class="LineNr">256 </span><span class="Comment"># make sure no memory leaks..</span>
-<span id="L257" class="LineNr">257 </span><span class="traceContains">+mem: trying to reclaim local k:continuation</span>
-<span id="L258" class="LineNr">258 </span><span class="traceContains">+mem: automatically abandoning 1007</span>
-<span id="L259" class="LineNr">259 </span><span class="traceContains">+mem: automatically abandoning 1004</span>
-<span id="L260" class="LineNr">260 </span><span class="traceContains">+mem: automatically abandoning 1000</span>
-<span id="L261" class="LineNr">261 </span><span class="Comment"># ..even though we never called the continuation</span>
-<span id="L262" class="LineNr">262 </span><span class="traceAbsent">-app: continuation called</span>
-<span id="L263" class="LineNr">263 </span>
-<span id="L264" class="LineNr">264 </span><span class="Comment">//: Allow shape-shifting recipes to return continuations.</span>
-<span id="L265" class="LineNr">265 </span>
-<span id="L266" class="LineNr">266 </span><span class="Delimiter">:(scenario call_shape_shifting_recipe_with_continuation_mark)</span>
-<span id="L267" class="LineNr">267 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L268" class="LineNr">268 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>call-with-continuation-mark f<span class="Delimiter">,</span> <span class="Constant">34</span>
-<span id="L269" class="LineNr">269 </span>]
-<span id="L270" class="LineNr">270 </span><span class="muRecipe">def</span> f x:_elem<span class="muRecipe"> -&gt; </span>y:_elem [
-<span id="L271" class="LineNr">271 </span>  local-scope
-<span id="L272" class="LineNr">272 </span>  load-ingredients
-<span id="L273" class="LineNr">273 </span>  y<span class="Special"> &lt;- </span>copy x
-<span id="L274" class="LineNr">274 </span>]
-<span id="L275" class="LineNr">275 </span><span class="traceContains">+mem: storing 34 in location 1</span>
-<span id="L276" class="LineNr">276 </span>
-<span id="L277" class="LineNr">277 </span><span class="Delimiter">:(before &quot;End resolve_ambiguous_call(r, index, inst, caller_recipe) Special-cases&quot;)</span>
-<span id="L278" class="LineNr">278 </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> &amp;&amp; <a href='072recipe.cc.html#L213'>first_ingredient_is_recipe_literal</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L279" class="LineNr">279 </span>  <a href='072recipe.cc.html#L218'>resolve_indirect_ambiguous_call</a><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="L280" class="LineNr">280 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L281" class="LineNr">281 </span><span class="Delimiter">}</span>
-<span id="L282" class="LineNr">282 </span>
-<span id="L283" class="LineNr">283 </span><span class="Delimiter">:(scenario call_shape_shifting_recipe_with_continuation_mark_and_no_outputs)</span>
-<span id="L284" class="LineNr">284 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L285" class="LineNr">285 </span>  <span class="Constant">1</span>:continuation<span class="Special"> &lt;- </span>call-with-continuation-mark f<span class="Delimiter">,</span> <span class="Constant">34</span>
-<span id="L286" class="LineNr">286 </span>]
-<span id="L287" class="LineNr">287 </span><span class="muRecipe">def</span> f x:_elem [
-<span id="L288" class="LineNr">288 </span>  local-scope
-<span id="L289" class="LineNr">289 </span>  load-ingredients
-<span id="L290" class="LineNr">290 </span>  <span class="Identifier">return</span>-continuation-until-mark
-<span id="L291" class="LineNr">291 </span>]
-<span id="L292" class="LineNr">292 </span>$error: <span class="Constant">0</span>
-<span id="L293" class="LineNr">293 </span>
-<span id="L294" class="LineNr">294 </span><span class="Comment">//: Ensure that the presence of a continuation keeps its stack frames from being reclaimed.</span>
-<span id="L295" class="LineNr">295 </span>
-<span id="L296" class="LineNr">296 </span><span class="Delimiter">:(scenario continuations_preserve_local_scopes)</span>
-<span id="L297" class="LineNr">297 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L298" class="LineNr">298 </span>  local-scope
-<span id="L299" class="LineNr">299 </span>  <span class="Normal">k</span>:continuation<span class="Special"> &lt;- </span>call-with-continuation-mark f
-<span id="L300" class="LineNr">300 </span>  call k
-<span id="L301" class="LineNr">301 </span>  <span class="Identifier">return</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 [
-<span id="L304" class="LineNr">304 </span>  local-scope
-<span id="L305" class="LineNr">305 </span>  g
-<span id="L306" class="LineNr">306 </span>]
-<span id="L307" class="LineNr">307 </span><span class="muRecipe">def</span> g [
-<span id="L308" class="LineNr">308 </span>  local-scope
-<span id="L309" class="LineNr">309 </span>  <span class="Identifier">return</span>-continuation-until-mark
-<span id="L310" class="LineNr">310 </span>  add <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span>
-<span id="L311" class="LineNr">311 </span>]
-<span id="L312" class="LineNr">312 </span><span class="Comment"># entering main</span>
-<span id="L313" class="LineNr">313 </span><span class="traceContains">+mem: new alloc: 1000</span>
-<span id="L314" class="LineNr">314 </span><span class="traceContains">+run: {k: &quot;continuation&quot;} &lt;- call-with-continuation-mark {f: &quot;recipe-literal&quot;}</span>
-<span id="L315" class="LineNr">315 </span><span class="Comment"># entering f</span>
-<span id="L316" class="LineNr">316 </span><span class="traceContains">+mem: new alloc: 1004</span>
-<span id="L317" class="LineNr">317 </span><span class="Comment"># entering g</span>
-<span id="L318" class="LineNr">318 </span><span class="traceContains">+mem: new alloc: 1007</span>
-<span id="L319" class="LineNr">319 </span><span class="Comment"># return control to main</span>
-<span id="L320" class="LineNr">320 </span><span class="traceContains">+run: return-continuation-until-mark</span>
-<span id="L321" class="LineNr">321 </span><span class="Comment"># no allocs abandoned yet</span>
-<span id="L322" class="LineNr">322 </span><span class="Comment"># finish running main</span>
-<span id="L323" class="LineNr">323 </span><span class="traceContains">+run: call {k: &quot;continuation&quot;}</span>
-<span id="L324" class="LineNr">324 </span><span class="traceContains">+run: add {1: &quot;literal&quot;}, {1: &quot;literal&quot;}</span>
-<span id="L325" class="LineNr">325 </span><span class="traceContains">+run: return {34: &quot;literal&quot;}</span>
-<span id="L326" class="LineNr">326 </span><span class="Comment"># now k is reclaimed</span>
-<span id="L327" class="LineNr">327 </span><span class="traceContains">+mem: trying to reclaim local k:continuation</span>
-<span id="L328" class="LineNr">328 </span><span class="Comment"># at this point all allocs in the continuation are abandoned</span>
-<span id="L329" class="LineNr">329 </span><span class="traceContains">+mem: automatically abandoning 1007</span>
-<span id="L330" class="LineNr">330 </span><span class="traceContains">+mem: automatically abandoning 1004</span>
-<span id="L331" class="LineNr">331 </span><span class="Comment"># finally the alloc for main is abandoned</span>
-<span id="L332" class="LineNr">332 </span><span class="traceContains">+mem: automatically abandoning 1000</span>
-<span id="L333" class="LineNr">333 </span>
-<span id="L334" class="LineNr">334 </span><span class="Delimiter">:(before &quot;End Increment Refcounts(canonized_x)&quot;)</span>
-<span id="L335" class="LineNr">335 </span><span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_continuation<span class="Delimiter">(</span>canonized_x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L336" class="LineNr">336 </span>  <span class="Normal">int</span> continuation_id = data<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L337" class="LineNr">337 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>continuation_id == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L338" class="LineNr">338 </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="L339" class="LineNr">339 </span>  <span class="Conceal">¦</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;missing delimited continuation: &quot;</span> &lt;&lt; canonized_x<span class="Delimiter">.</span>name &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L340" class="LineNr">340 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L341" class="LineNr">341 </span>  <span class="Delimiter">}</span>
-<span id="L342" class="LineNr">342 </span>  delimited_continuation&amp; curr = get<span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> continuation_id<span class="Delimiter">);</span>
-<span id="L343" class="LineNr">343 </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;incrementing refcount of continuation &quot;</span> &lt;&lt; continuation_id &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>nrefs &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <span class="Constant">1</span>+curr<span class="Delimiter">.</span>nrefs &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
-<span id="L344" class="LineNr">344 </span>  ++curr<span class="Delimiter">.</span>nrefs<span class="Delimiter">;</span>
-<span id="L345" class="LineNr">345 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L346" class="LineNr">346 </span><span class="Delimiter">}</span>
-<span id="L347" class="LineNr">347 </span>
-<span id="L348" class="LineNr">348 </span><span class="Delimiter">:(before &quot;End Decrement Refcounts(canonized_x)&quot;)</span>
-<span id="L349" class="LineNr">349 </span><span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_continuation<span class="Delimiter">(</span>canonized_x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L350" class="LineNr">350 </span>  <span class="Normal">int</span> continuation_id = <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> canonized_x<span class="Delimiter">.</span>value<span class="Delimiter">);</span>
-<span id="L351" class="LineNr">351 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>continuation_id == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L352" class="LineNr">352 </span>  delimited_continuation&amp; curr = get<span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> continuation_id<span class="Delimiter">);</span>
-<span id="L353" class="LineNr">353 </span>  assert<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>nrefs &gt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L354" class="LineNr">354 </span>  --curr<span class="Delimiter">.</span>nrefs<span class="Delimiter">;</span>
-<span id="L355" class="LineNr">355 </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;decrementing refcount of continuation &quot;</span> &lt;&lt; continuation_id &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; <span class="Constant">1</span>+curr<span class="Delimiter">.</span>nrefs &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>nrefs &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
-<span id="L356" class="LineNr">356 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>nrefs &gt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L357" class="LineNr">357 </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;reclaiming continuation &quot;</span> &lt;&lt; continuation_id &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
-<span id="L358" class="LineNr">358 </span>  <span class="Comment">// temporarily push the stack frames for the continuation to the call stack before reclaiming their spaces</span>
-<span id="L359" class="LineNr">359 </span>  <span class="Comment">// (because reclaim_default_space() relies on the default-space being reclaimed being at the top of the stack)</span>
-<span id="L360" class="LineNr">360 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::const_iterator p = curr<span class="Delimiter">.</span>frames<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != curr<span class="Delimiter">.</span>frames<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="L361" class="LineNr">361 </span>  <span class="Conceal">¦</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="L362" class="LineNr">362 </span>  <span class="Conceal">¦</span> <a href='043space.cc.html#L244'>reclaim_default_space</a><span class="Delimiter">();</span>
-<span id="L363" class="LineNr">363 </span>  <span class="Conceal">¦</span> Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>pop_front<span class="Delimiter">();</span>
-<span id="L364" class="LineNr">364 </span>  <span class="Delimiter">}</span>
-<span id="L365" class="LineNr">365 </span>  Delimited_continuation<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>continuation_id<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>
-<span id="L369" class="LineNr">369 </span><span class="Delimiter">:(scenario continuations_can_be_copied)</span>
-<span id="L370" class="LineNr">370 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L371" class="LineNr">371 </span>  local-scope
-<span id="L372" class="LineNr">372 </span>  <span class="Normal">k</span>:continuation<span class="Special"> &lt;- </span>call-with-continuation-mark f
-<span id="L373" class="LineNr">373 </span>  <span class="Normal">k2</span>:continuation<span class="Special"> &lt;- </span>copy k
-<span id="L374" class="LineNr">374 </span>  <span class="Comment"># reclaiming k and k2 shouldn't delete f's local scope twice</span>
-<span id="L375" class="LineNr">375 </span>]
-<span id="L376" class="LineNr">376 </span><span class="muRecipe">def</span> f [
-<span id="L377" class="LineNr">377 </span>  local-scope
-<span id="L378" class="LineNr">378 </span>  load-ingredients
-<span id="L379" class="LineNr">379 </span>  <span class="Identifier">return</span>-continuation-until-mark
-<span id="L380" class="LineNr">380 </span>  <span class="Identifier">return</span> <span class="Constant">0</span>
-<span id="L381" class="LineNr">381 </span>]
-<span id="L382" class="LineNr">382 </span>$error: <span class="Constant">0</span>
-<span id="L383" class="LineNr">383 </span>
-<span id="L384" class="LineNr">384 </span><span class="Delimiter">:(code)</span>
-<span id="L385" class="LineNr">385 </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="L386" class="LineNr">386 </span>  canonize_type<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
-<span id="L387" class="LineNr">387 </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="L388" class="LineNr">388 </span><span class="Delimiter">}</span>
-<span id="L389" class="LineNr">389 </span>
-<span id="L390" class="LineNr">390 </span><span class="Comment">// helper for debugging</span>
-<span id="L391" class="LineNr">391 </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="L392" class="LineNr">392 </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="L393" class="LineNr">393 </span>  <span class="Conceal">¦</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="L394" class="LineNr">394 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L395" class="LineNr">395 </span>  <span class="Delimiter">}</span>
-<span id="L396" class="LineNr">396 </span>  delimited_continuation&amp; curr = get<span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> continuation_id<span class="Delimiter">);</span>
-<span id="L397" class="LineNr">397 </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="L398" class="LineNr">398 </span><span class="Delimiter">}</span>
+<span id="L133" class="LineNr">133 </span>  Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>is_base_of_continuation = <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="L134" class="LineNr">134 </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="L135" class="LineNr">135 </span>  ingredients<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">());</span>  <span class="Comment">// drop the mark</span>
+<span id="L136" class="LineNr">136 </span>  ingredients<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">());</span>  <span class="Comment">// drop the callee</span>
+<span id="L137" class="LineNr">137 </span>  finish_call_housekeeping<span class="Delimiter">(</span>caller_instruction<span class="Delimiter">,</span> ingredients<span class="Delimiter">);</span>
+<span id="L138" class="LineNr">138 </span>  <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L139" class="LineNr">139 </span><span class="Delimiter">}</span>
+<span id="L140" class="LineNr">140 </span>
+<span id="L141" class="LineNr">141 </span><span class="Comment">//: save the slice of current call stack until the 'call-with-continuation-mark'</span>
+<span id="L142" class="LineNr">142 </span><span class="Comment">//: call, and return it as the result.</span>
+<span id="L143" class="LineNr">143 </span><span class="Comment">//: todo: implement delimited continuations in Mu's memory</span>
+<span id="L144" class="LineNr">144 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L145" class="LineNr">145 </span><span class="Normal">struct</span> delimited_continuation <span class="Delimiter">{</span>
+<span id="L146" class="LineNr">146 </span>  call_stack frames<span class="Delimiter">;</span>
+<span id="L147" class="LineNr">147 </span>  <span class="Normal">int</span> nrefs<span class="Delimiter">;</span>
+<span id="L148" class="LineNr">148 </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="L149" class="LineNr">149 </span><span class="Delimiter">};</span>
+<span id="L150" class="LineNr">150 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L151" class="LineNr">151 </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="L152" class="LineNr">152 </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="L153" class="LineNr">153 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
+<span id="L154" class="LineNr">154 </span>Delimited_continuation<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L155" class="LineNr">155 </span>Next_delimited_continuation_id = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L156" class="LineNr">156 </span>
+<span id="L157" class="LineNr">157 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Declarations&quot;)</span>
+<span id="L158" class="LineNr">158 </span>RETURN_CONTINUATION_UNTIL_MARK<span class="Delimiter">,</span>
+<span id="L159" class="LineNr">159 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Numbers&quot;)</span>
+<span id="L160" class="LineNr">160 </span>Recipe_ordinal[<span class="Constant">&quot;return-continuation-until-mark&quot;</span>] = RETURN_CONTINUATION_UNTIL_MARK<span class="Delimiter">;</span>
+<span id="L161" class="LineNr">161 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
+<span id="L162" class="LineNr">162 </span><span class="Normal">case</span> RETURN_CONTINUATION_UNTIL_MARK: <span class="Delimiter">{</span>
+<span id="L163" class="LineNr">163 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L164" class="LineNr">164 </span><span class="Delimiter">}</span>
+<span id="L165" class="LineNr">165 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
+<span id="L166" class="LineNr">166 </span><span class="Normal">case</span> RETURN_CONTINUATION_UNTIL_MARK: <span class="Delimiter">{</span>
+<span id="L167" class="LineNr">167 </span>  <span class="Comment">// I don't know how to think about next-ingredient in combination with</span>
+<span id="L168" class="LineNr">168 </span>  <span class="Comment">// continuations, so seems cleaner to just kill it. Functions have to read</span>
+<span id="L169" class="LineNr">169 </span>  <span class="Comment">// their inputs before ever returning a continuation.</span>
+<span id="L170" class="LineNr">170 </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="L171" class="LineNr">171 </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="L172" class="LineNr">172 </span>  <span class="Comment">// copy the current call stack until the most recent marked call</span>
+<span id="L173" class="LineNr">173 </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="L174" class="LineNr">174 </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 identifier</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="L175" class="LineNr">175 </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="L176" class="LineNr">176 </span>  <span class="Conceal">¦</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="L177" class="LineNr">177 </span>  <span class="Conceal">¦</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="L178" class="LineNr">178 </span>  <span class="Conceal">¦</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="L179" class="LineNr">179 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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="L180" class="LineNr">180 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L181" class="LineNr">181 </span>  <span class="Delimiter">}</span>
+<span id="L182" class="LineNr">182 </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="L183" class="LineNr">183 </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="L184" class="LineNr">184 </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="L185" class="LineNr">185 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L186" class="LineNr">186 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> --Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">;</span>
+<span id="L187" class="LineNr">187 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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="L188" class="LineNr">188 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L189" class="LineNr">189 </span>  <span class="Conceal">¦</span> Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>pop_front<span class="Delimiter">();</span>
+<span id="L190" class="LineNr">190 </span>  <span class="Delimiter">}</span>
+<span id="L191" class="LineNr">191 </span>  <span class="Comment">// return it as the result of the marked call</span>
+<span id="L192" class="LineNr">192 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L193" class="LineNr">193 </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="L194" class="LineNr">194 </span>  <span class="Comment">// return any other ingredients passed in</span>
+<span id="L195" class="LineNr">195 </span>  copy<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip mark identifier</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="L196" class="LineNr">196 </span>  ++Next_delimited_continuation_id<span class="Delimiter">;</span>
+<span id="L197" class="LineNr">197 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// continue to process rest of marked call</span>
+<span id="L198" class="LineNr">198 </span><span class="Delimiter">}</span>
+<span id="L199" class="LineNr">199 </span>
+<span id="L200" class="LineNr">200 </span><span class="Delimiter">:(code)</span>
+<span id="L201" class="LineNr">201 </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<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L202" class="LineNr">202 </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="L203" class="LineNr">203 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>is_base_of_continuation == mark<span class="Delimiter">)</span> <span class="Identifier">return</span> p<span class="Delimiter">;</span>
+<span id="L204" class="LineNr">204 </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="L205" class="LineNr">205 </span><span class="Delimiter">}</span>
+<span id="L206" class="LineNr">206 </span>
+<span id="L207" class="LineNr">207 </span><span class="Comment">//: overload 'call' for continuations</span>
+<span id="L208" class="LineNr">208 </span><span class="Delimiter">:(after &quot;Begin Call&quot;)</span>
+<span id="L209" class="LineNr">209 </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="L210" class="LineNr">210 </span>  <span class="Comment">// copy multiple calls on to current call stack</span>
+<span id="L211" class="LineNr">211 </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="L212" class="LineNr">212 </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="L213" class="LineNr">213 </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="L214" class="LineNr">214 </span>  <span class="Conceal">¦</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="L215" class="LineNr">215 </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="L216" class="LineNr">216 </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 class="Delimiter">{</span>
+<span id="L217" class="LineNr">217 </span>  <span class="Conceal">¦</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="L218" class="LineNr">218 </span>  <span class="Conceal">¦</span> <span class="Comment">// ensure that the presence of a continuation keeps its stack frames from being reclaimed</span>
+<span id="L219" class="LineNr">219 </span>  <span class="Conceal">¦</span> <a href='036refcount.cc.html#L50'>increment_refcount</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>default_space<span class="Delimiter">);</span>
+<span id="L220" class="LineNr">220 </span>  <span class="Delimiter">}</span>
+<span id="L221" class="LineNr">221 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L222" class="LineNr">222 </span>  <span class="Conceal">¦</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="L223" class="LineNr">223 </span>  <span class="Conceal">¦</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="L224" class="LineNr">224 </span>  <span class="Conceal">¦</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="L225" class="LineNr">225 </span>  <span class="Delimiter">}</span>
+<span id="L226" class="LineNr">226 </span>  <span class="Comment">// no call housekeeping; continuations don't support next-ingredient</span>
+<span id="L227" class="LineNr">227 </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="L228" class="LineNr">228 </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="L229" class="LineNr">229 </span><span class="Delimiter">}</span>
+<span id="L230" class="LineNr">230 </span>
+<span id="L231" class="LineNr">231 </span><span class="Delimiter">:(scenario continuations_can_return_values)</span>
+<span id="L232" class="LineNr">232 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L233" class="LineNr">233 </span>  local-scope
+<span id="L234" class="LineNr">234 </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="L235" class="LineNr">235 </span>]
+<span id="L236" class="LineNr">236 </span><span class="muRecipe">def</span> f [
+<span id="L237" class="LineNr">237 </span>  local-scope
+<span id="L238" class="LineNr">238 </span>  g
+<span id="L239" class="LineNr">239 </span>]
+<span id="L240" class="LineNr">240 </span><span class="muRecipe">def</span> g [
+<span id="L241" class="LineNr">241 </span>  local-scope
+<span id="L242" class="LineNr">242 </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="L243" class="LineNr">243 </span>  stash [continuation called]
+<span id="L244" class="LineNr">244 </span>]
+<span id="L245" class="LineNr">245 </span><span class="Comment"># entering main</span>
+<span id="L246" class="LineNr">246 </span><span class="traceContains">+mem: new alloc: 1000</span>
+<span id="L247" class="LineNr">247 </span><span class="traceContains">+run: {k: &quot;continuation&quot;}, {1: &quot;number&quot;, &quot;raw&quot;: ()} &lt;- call-with-continuation-mark {233: &quot;literal&quot;, &quot;mark&quot;: ()}, {f: &quot;recipe-literal&quot;}</span>
+<span id="L248" class="LineNr">248 </span><span class="Comment"># entering f</span>
+<span id="L249" class="LineNr">249 </span><span class="traceContains">+mem: new alloc: 1004</span>
+<span id="L250" class="LineNr">250 </span><span class="Comment"># entering g</span>
+<span id="L251" class="LineNr">251 </span><span class="traceContains">+mem: new alloc: 1007</span>
+<span id="L252" class="LineNr">252 </span><span class="Comment"># return control to main</span>
+<span id="L253" class="LineNr">253 </span><span class="traceContains">+run: return-continuation-until-mark {233: &quot;literal&quot;, &quot;mark&quot;: ()}, {34: &quot;literal&quot;}</span>
+<span id="L254" class="LineNr">254 </span><span class="Comment"># no allocs abandoned yet</span>
+<span id="L255" class="LineNr">255 </span><span class="traceContains">+mem: storing 34 in location 1</span>
+<span id="L256" class="LineNr">256 </span><span class="Comment"># end of main</span>
+<span id="L257" class="LineNr">257 </span><span class="Comment"># make sure no memory leaks..</span>
+<span id="L258" class="LineNr">258 </span><span class="traceContains">+mem: trying to reclaim local k:continuation</span>
+<span id="L259" class="LineNr">259 </span><span class="traceContains">+mem: automatically abandoning 1007</span>
+<span id="L260" class="LineNr">260 </span><span class="traceContains">+mem: automatically abandoning 1004</span>
+<span id="L261" class="LineNr">261 </span><span class="traceContains">+mem: automatically abandoning 1000</span>
+<span id="L262" class="LineNr">262 </span><span class="Comment"># ..even though we never called the continuation</span>
+<span id="L263" class="LineNr">263 </span><span class="traceAbsent">-app: continuation called</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="L270" class="LineNr">270 </span>]
+<span id="L271" class="LineNr">271 </span><span class="muRecipe">def</span> f [
+<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="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="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#L213'>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>  <span class="Conceal">¦</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>  <span class="Conceal">¦</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#L65'>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="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="L335" class="LineNr">335 </span>  local-scope
+<span id="L336" class="LineNr">336 </span>  load-inputs
+<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="Comment">//: Ensure that the presence of a continuation keeps its stack frames from being reclaimed.</span>
+<span id="L344" class="LineNr">344 </span>
+<span id="L345" class="LineNr">345 </span><span class="Delimiter">:(scenario continuations_preserve_local_scopes)</span>
+<span id="L346" class="LineNr">346 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L347" class="LineNr">347 </span>  local-scope
+<span id="L348" class="LineNr">348 </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> f
+<span id="L349" class="LineNr">349 </span>  call k
+<span id="L350" class="LineNr">350 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
+<span id="L351" class="LineNr">351 </span>]
+<span id="L352" class="LineNr">352 </span><span class="muRecipe">def</span> f [
+<span id="L353" class="LineNr">353 </span>  local-scope
+<span id="L354" class="LineNr">354 </span>  g
+<span id="L355" class="LineNr">355 </span>]
+<span id="L356" class="LineNr">356 </span><span class="muRecipe">def</span> g [
+<span id="L357" class="LineNr">357 </span>  local-scope
+<span id="L358" class="LineNr">358 </span>  <span class="Identifier">return</span>-continuation-until-mark <span class="Constant">233</span>/mark
+<span id="L359" class="LineNr">359 </span>  add <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span>
+<span id="L360" class="LineNr">360 </span>]
+<span id="L361" class="LineNr">361 </span><span class="Comment"># entering main</span>
+<span id="L362" class="LineNr">362 </span><span class="traceContains">+mem: new alloc: 1000</span>
+<span id="L363" class="LineNr">363 </span><span class="traceContains">+run: {k: &quot;continuation&quot;} &lt;- call-with-continuation-mark {233: &quot;literal&quot;, &quot;mark&quot;: ()}, {f: &quot;recipe-literal&quot;}</span>
+<span id="L364" class="LineNr">364 </span><span class="Comment"># entering f</span>
+<span id="L365" class="LineNr">365 </span><span class="traceContains">+mem: new alloc: 1004</span>
+<span id="L366" class="LineNr">366 </span><span class="Comment"># entering g</span>
+<span id="L367" class="LineNr">367 </span><span class="traceContains">+mem: new alloc: 1007</span>
+<span id="L368" class="LineNr">368 </span><span class="Comment"># return control to main</span>
+<span id="L369" class="LineNr">369 </span><span class="traceContains">+run: return-continuation-until-mark {233: &quot;literal&quot;, &quot;mark&quot;: ()}</span>
+<span id="L370" class="LineNr">370 </span><span class="Comment"># no allocs abandoned yet</span>
+<span id="L371" class="LineNr">371 </span><span class="Comment"># finish running main</span>
+<span id="L372" class="LineNr">372 </span><span class="traceContains">+run: call {k: &quot;continuation&quot;}</span>
+<span id="L373" class="LineNr">373 </span><span class="traceContains">+run: add {1: &quot;literal&quot;}, {1: &quot;literal&quot;}</span>
+<span id="L374" class="LineNr">374 </span><span class="traceContains">+run: return {34: &quot;literal&quot;}</span>
+<span id="L375" class="LineNr">375 </span><span class="Comment"># now k is reclaimed</span>
+<span id="L376" class="LineNr">376 </span><span class="traceContains">+mem: trying to reclaim local k:continuation</span>
+<span id="L377" class="LineNr">377 </span><span class="Comment"># at this point all allocs in the continuation are abandoned</span>
+<span id="L378" class="LineNr">378 </span><span class="traceContains">+mem: automatically abandoning 1007</span>
+<span id="L379" class="LineNr">379 </span><span class="traceContains">+mem: automatically abandoning 1004</span>
+<span id="L380" class="LineNr">380 </span><span class="Comment"># finally the alloc for main is abandoned</span>
+<span id="L381" class="LineNr">381 </span><span class="traceContains">+mem: automatically abandoning 1000</span>
+<span id="L382" class="LineNr">382 </span>
+<span id="L383" class="LineNr">383 </span><span class="Delimiter">:(before &quot;End Increment Refcounts(canonized_x)&quot;)</span>
+<span id="L384" class="LineNr">384 </span><span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_continuation<span class="Delimiter">(</span>canonized_x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L385" class="LineNr">385 </span>  <span class="Normal">int</span> continuation_id = data<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L386" class="LineNr">386 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>continuation_id == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L387" class="LineNr">387 </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="L388" class="LineNr">388 </span>  <span class="Conceal">¦</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;missing delimited continuation: &quot;</span> &lt;&lt; canonized_x<span class="Delimiter">.</span>name &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L389" class="LineNr">389 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L390" class="LineNr">390 </span>  <span class="Delimiter">}</span>
+<span id="L391" class="LineNr">391 </span>  delimited_continuation&amp; curr = get<span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> continuation_id<span class="Delimiter">);</span>
+<span id="L392" class="LineNr">392 </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;incrementing refcount of continuation &quot;</span> &lt;&lt; continuation_id &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>nrefs &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <span class="Constant">1</span>+curr<span class="Delimiter">.</span>nrefs &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
+<span id="L393" class="LineNr">393 </span>  ++curr<span class="Delimiter">.</span>nrefs<span class="Delimiter">;</span>
+<span id="L394" class="LineNr">394 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L395" class="LineNr">395 </span><span class="Delimiter">}</span>
+<span id="L396" class="LineNr">396 </span>
+<span id="L397" class="LineNr">397 </span><span class="Delimiter">:(before &quot;End Decrement Refcounts(canonized_x)&quot;)</span>
+<span id="L398" class="LineNr">398 </span><span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_continuation<span class="Delimiter">(</span>canonized_x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L399" class="LineNr">399 </span>  <span class="Normal">int</span> continuation_id = <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> canonized_x<span class="Delimiter">.</span>value<span class="Delimiter">);</span>
+<span id="L400" class="LineNr">400 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>continuation_id == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L401" class="LineNr">401 </span>  delimited_continuation&amp; curr = get<span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> continuation_id<span class="Delimiter">);</span>
+<span id="L402" class="LineNr">402 </span>  assert<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>nrefs &gt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L403" class="LineNr">403 </span>  --curr<span class="Delimiter">.</span>nrefs<span class="Delimiter">;</span>
+<span id="L404" class="LineNr">404 </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;decrementing refcount of continuation &quot;</span> &lt;&lt; continuation_id &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; <span class="Constant">1</span>+curr<span class="Delimiter">.</span>nrefs &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>nrefs &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
+<span id="L405" class="LineNr">405 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>nrefs &gt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L406" class="LineNr">406 </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;reclaiming continuation &quot;</span> &lt;&lt; continuation_id &lt;&lt; <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span>
+<span id="L407" class="LineNr">407 </span>  <span class="Comment">// temporarily push the stack frames for the continuation to the call stack before reclaiming their spaces</span>
+<span id="L408" class="LineNr">408 </span>  <span class="Comment">// (because reclaim_default_space() relies on the default-space being reclaimed being at the top of the stack)</span>
+<span id="L409" class="LineNr">409 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::const_iterator p = curr<span class="Delimiter">.</span>frames<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != curr<span class="Delimiter">.</span>frames<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="L410" class="LineNr">410 </span>  <span class="Conceal">¦</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="L411" class="LineNr">411 </span>  <span class="Conceal">¦</span> <a href='043space.cc.html#L244'>reclaim_default_space</a><span class="Delimiter">();</span>
+<span id="L412" class="LineNr">412 </span>  <span class="Conceal">¦</span> Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>pop_front<span class="Delimiter">();</span>
+<span id="L413" class="LineNr">413 </span>  <span class="Delimiter">}</span>
+<span id="L414" class="LineNr">414 </span>  Delimited_continuation<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>continuation_id<span class="Delimiter">);</span>
+<span id="L415" class="LineNr">415 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L416" class="LineNr">416 </span><span class="Delimiter">}</span>
+<span id="L417" class="LineNr">417 </span>
+<span id="L418" class="LineNr">418 </span><span class="Delimiter">:(scenario continuations_can_be_copied)</span>
+<span id="L419" class="LineNr">419 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L420" class="LineNr">420 </span>  local-scope
+<span id="L421" class="LineNr">421 </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> f
+<span id="L422" class="LineNr">422 </span>  <span class="Normal">k2</span>:continuation<span class="Special"> &lt;- </span>copy k
+<span id="L423" class="LineNr">423 </span>  <span class="Comment"># reclaiming k and k2 shouldn't delete f's local scope twice</span>
+<span id="L424" class="LineNr">424 </span>]
+<span id="L425" class="LineNr">425 </span><span class="muRecipe">def</span> f [
+<span id="L426" class="LineNr">426 </span>  local-scope
+<span id="L427" class="LineNr">427 </span>  load-ingredients
+<span id="L428" class="LineNr">428 </span>  <span class="Identifier">return</span>-continuation-until-mark <span class="Constant">233</span>/mark
+<span id="L429" class="LineNr">429 </span>  <span class="Identifier">return</span> <span class="Constant">0</span>
+<span id="L430" class="LineNr">430 </span>]
+<span id="L431" class="LineNr">431 </span>$error: <span class="Constant">0</span>
+<span id="L432" class="LineNr">432 </span>
+<span id="L433" class="LineNr">433 </span><span class="Delimiter">:(code)</span>
+<span id="L434" class="LineNr">434 </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="L435" class="LineNr">435 </span>  canonize_type<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
+<span id="L436" class="LineNr">436 </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="L437" class="LineNr">437 </span><span class="Delimiter">}</span>
+<span id="L438" class="LineNr">438 </span>
+<span id="L439" class="LineNr">439 </span><span class="Comment">// helper for debugging</span>
+<span id="L440" class="LineNr">440 </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="L441" class="LineNr">441 </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="L442" class="LineNr">442 </span>  <span class="Conceal">¦</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="L443" class="LineNr">443 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L444" class="LineNr">444 </span>  <span class="Delimiter">}</span>
+<span id="L445" class="LineNr">445 </span>  delimited_continuation&amp; curr = get<span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> continuation_id<span class="Delimiter">);</span>
+<span id="L446" class="LineNr">446 </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="L447" class="LineNr">447 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/080display.cc.html b/html/080display.cc.html
index c33970d4..0b843d3e 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
 .Conceal { color: #4e4e4e; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .PreProc { color: #800080; }
+.Delimiter { color: #800080; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/081print.mu.html b/html/081print.mu.html
index 253d913e..a7e278be 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Conceal { color: #4e4e4e; }
-.muRecipe { color: #ff8700; }
 .Special { color: #c00000; }
+.muData { color: #ffff00; }
+.LineNr { color: #444444; }
+.muScenario { color: #00af00; }
 .Delimiter { color: #800080; }
+.muControl { color: #c0a020; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Conceal { color: #4e4e4e; }
 .CommentedCode { color: #6c6c6c; }
-.muControl { color: #c0a020; }
-.muScenario { color: #00af00; }
-.muData { color: #ffff00; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/082scenario_screen.cc.html b/html/082scenario_screen.cc.html
index 7f2cf6bf..6ede4d94 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.LineNr { color: #444444; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color: #444444; }
+.cSpecial { color: #008000; }
+.Identifier { color: #c0a020; }
+.Delimiter { color: #800080; }
 .traceContains { color: #008000; }
+.Conceal { color: #4e4e4e; }
 .traceAbsent { color: #c00000; }
-.Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.cSpecial { color: #008000; }
-.Conceal { color: #4e4e4e; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
 -->
 </style>
 
@@ -80,8 +80,8 @@ if ('onhashchange' in window) {
 <span id="L15" class="LineNr"> 15 </span>  local-scope
 <span id="L16" class="LineNr"> 16 </span>  assume-screen <span class="Constant">5</span>/width<span class="Delimiter">,</span> <span class="Constant">3</span>/height
 <span id="L17" class="LineNr"> 17 </span>  run [
-<span id="L18" class="LineNr"> 18 </span>  <span class="Conceal">¦</span> <span class="Normal">a</span>:<span class="Normal">char</span><span class="Special"> &lt;- </span>copy <span class="Constant">97</span>/a
-<span id="L19" class="LineNr"> 19 </span>  <span class="Conceal">¦</span> <span class="Normal">screen</span>:&amp;:screen<span class="Special"> &lt;- </span>print screen:&amp;:screen<span class="Delimiter">,</span> a
+<span id="L18" class="LineNr"> 18 </span>  <span class="Conceal">¦</span> a:<span class="Normal">char</span><span class="Special"> &lt;- </span>copy <span class="Constant">97</span>/a
+<span id="L19" class="LineNr"> 19 </span>  <span class="Conceal">¦</span> screen:&amp;:screen<span class="Special"> &lt;- </span>print screen:&amp;:screen<span class="Delimiter">,</span> a
 <span id="L20" class="LineNr"> 20 </span>  ]
 <span id="L21" class="LineNr"> 21 </span>  screen-should-contain [
 <span id="L22" class="LineNr"> 22 </span>  <span class="Comment">#  01234</span>
@@ -98,10 +98,10 @@ if ('onhashchange' in window) {
 <span id="L33" class="LineNr"> 33 </span>  local-scope
 <span id="L34" class="LineNr"> 34 </span>  assume-screen <span class="Constant">5</span>/width<span class="Delimiter">,</span> <span class="Constant">3</span>/height
 <span id="L35" class="LineNr"> 35 </span>  run [
-<span id="L36" class="LineNr"> 36 </span>  <span class="Conceal">¦</span> <span class="Normal">lambda</span>:<span class="Normal">char</span><span class="Special"> &lt;- </span>copy <span class="Constant">955</span>/greek-small-lambda
-<span id="L37" class="LineNr"> 37 </span>  <span class="Conceal">¦</span> <span class="Normal">screen</span>:&amp;:screen<span class="Special"> &lt;- </span>print screen:&amp;:screen<span class="Delimiter">,</span> lambda
-<span id="L38" class="LineNr"> 38 </span>  <span class="Conceal">¦</span> <span class="Normal">a</span>:<span class="Normal">char</span><span class="Special"> &lt;- </span>copy <span class="Constant">97</span>/a
-<span id="L39" class="LineNr"> 39 </span>  <span class="Conceal">¦</span> <span class="Normal">screen</span>:&amp;:screen<span class="Special"> &lt;- </span>print screen:&amp;:screen<span class="Delimiter">,</span> a
+<span id="L36" class="LineNr"> 36 </span>  <span class="Conceal">¦</span> lambda:<span class="Normal">char</span><span class="Special"> &lt;- </span>copy <span class="Constant">955</span>/greek-small-lambda
+<span id="L37" class="LineNr"> 37 </span>  <span class="Conceal">¦</span> screen:&amp;:screen<span class="Special"> &lt;- </span>print screen:&amp;:screen<span class="Delimiter">,</span> lambda
+<span id="L38" class="LineNr"> 38 </span>  <span class="Conceal">¦</span> a:<span class="Normal">char</span><span class="Special"> &lt;- </span>copy <span class="Constant">97</span>/a
+<span id="L39" class="LineNr"> 39 </span>  <span class="Conceal">¦</span> screen:&amp;:screen<span class="Special"> &lt;- </span>print screen:&amp;:screen<span class="Delimiter">,</span> a
 <span id="L40" class="LineNr"> 40 </span>  ]
 <span id="L41" class="LineNr"> 41 </span>  screen-should-contain [
 <span id="L42" class="LineNr"> 42 </span>  <span class="Comment">#  01234</span>
@@ -117,10 +117,10 @@ if ('onhashchange' in window) {
 <span id="L52" class="LineNr"> 52 </span>  local-scope
 <span id="L53" class="LineNr"> 53 </span>  assume-screen <span class="Constant">5</span>/width<span class="Delimiter">,</span> <span class="Constant">3</span>/height
 <span id="L54" class="LineNr"> 54 </span>  run [
-<span id="L55" class="LineNr"> 55 </span>  <span class="Conceal">¦</span> <span class="Normal">lambda</span>:<span class="Normal">char</span><span class="Special"> &lt;- </span>copy <span class="Constant">955</span>/greek-small-lambda
-<span id="L56" class="LineNr"> 56 </span>  <span class="Conceal">¦</span> <span class="Normal">screen</span>:&amp;:screen<span class="Special"> &lt;- </span>print screen:&amp;:screen<span class="Delimiter">,</span> lambda<span class="Delimiter">,</span> <span class="Constant">1</span>/red
-<span id="L57" class="LineNr"> 57 </span>  <span class="Conceal">¦</span> <span class="Normal">a</span>:<span class="Normal">char</span><span class="Special"> &lt;- </span>copy <span class="Constant">97</span>/a
-<span id="L58" class="LineNr"> 58 </span>  <span class="Conceal">¦</span> <span class="Normal">screen</span>:&amp;:screen<span class="Special"> &lt;- </span>print screen:&amp;:screen<span class="Delimiter">,</span> a<span class="Delimiter">,</span> <span class="Constant">7</span>/white
+<span id="L55" class="LineNr"> 55 </span>  <span class="Conceal">¦</span> lambda:<span class="Normal">char</span><span class="Special"> &lt;- </span>copy <span class="Constant">955</span>/greek-small-lambda
+<span id="L56" class="LineNr"> 56 </span>  <span class="Conceal">¦</span> screen:&amp;:screen<span class="Special"> &lt;- </span>print screen:&amp;:screen<span class="Delimiter">,</span> lambda<span class="Delimiter">,</span> <span class="Constant">1</span>/red
+<span id="L57" class="LineNr"> 57 </span>  <span class="Conceal">¦</span> a:<span class="Normal">char</span><span class="Special"> &lt;- </span>copy <span class="Constant">97</span>/a
+<span id="L58" class="LineNr"> 58 </span>  <span class="Conceal">¦</span> screen:&amp;:screen<span class="Special"> &lt;- </span>print screen:&amp;:screen<span class="Delimiter">,</span> a<span class="Delimiter">,</span> <span class="Constant">7</span>/white
 <span id="L59" class="LineNr"> 59 </span>  ]
 <span id="L60" class="LineNr"> 60 </span>  <span class="Comment"># screen-should-contain shows everything</span>
 <span id="L61" class="LineNr"> 61 </span>  screen-should-contain [
@@ -154,8 +154,8 @@ if ('onhashchange' in window) {
 <span id="L89" class="LineNr"> 89 </span>  local-scope
 <span id="L90" class="LineNr"> 90 </span>  assume-screen <span class="Constant">5</span>/width<span class="Delimiter">,</span> <span class="Constant">3</span>/height
 <span id="L91" class="LineNr"> 91 </span>  run [
-<span id="L92" class="LineNr"> 92 </span>  <span class="Conceal">¦</span> <span class="Normal">a</span>:<span class="Normal">char</span><span class="Special"> &lt;- </span>copy <span class="Constant">97</span>/a
-<span id="L93" class="LineNr"> 93 </span>  <span class="Conceal">¦</span> <span class="Normal">screen</span>:&amp;:screen<span class="Special"> &lt;- </span>print screen:&amp;:screen<span class="Delimiter">,</span> a
+<span id="L92" class="LineNr"> 92 </span>  <span class="Conceal">¦</span> a:<span class="Normal">char</span><span class="Special"> &lt;- </span>copy <span class="Constant">97</span>/a
+<span id="L93" class="LineNr"> 93 </span>  <span class="Conceal">¦</span> screen:&amp;:screen<span class="Special"> &lt;- </span>print screen:&amp;:screen<span class="Delimiter">,</span> a
 <span id="L94" class="LineNr"> 94 </span>  ]
 <span id="L95" class="LineNr"> 95 </span>  screen-should-contain [
 <span id="L96" class="LineNr"> 96 </span>  <span class="Comment">#  01234</span>
@@ -174,8 +174,8 @@ if ('onhashchange' in window) {
 <span id="L109" class="LineNr">109 </span>  local-scope
 <span id="L110" class="LineNr">110 </span>  assume-screen <span class="Constant">5</span>/width<span class="Delimiter">,</span> <span class="Constant">3</span>/height
 <span id="L111" class="LineNr">111 </span>  run [
-<span id="L112" class="LineNr">112 </span>  <span class="Conceal">¦</span> <span class="Normal">a</span>:<span class="Normal">char</span><span class="Special"> &lt;- </span>copy <span class="Constant">97</span>/a
-<span id="L113" class="LineNr">113 </span>  <span class="Conceal">¦</span> <span class="Normal">screen</span>:&amp;:screen<span class="Special"> &lt;- </span>print screen:&amp;:screen<span class="Delimiter">,</span> a<span class="Delimiter">,</span> <span class="Constant">1</span>/red
+<span id="L112" class="LineNr">112 </span>  <span class="Conceal">¦</span> a:<span class="Normal">char</span><span class="Special"> &lt;- </span>copy <span class="Constant">97</span>/a
+<span id="L113" class="LineNr">113 </span>  <span class="Conceal">¦</span> screen:&amp;:screen<span class="Special"> &lt;- </span>print screen:&amp;:screen<span class="Delimiter">,</span> a<span class="Delimiter">,</span> <span class="Constant">1</span>/red
 <span id="L114" class="LineNr">114 </span>  ]
 <span id="L115" class="LineNr">115 </span>  screen-should-contain-in-color <span class="Constant">2</span>/green<span class="Delimiter">,</span> [
 <span id="L116" class="LineNr">116 </span>  <span class="Comment">#  01234</span>
diff --git a/html/083scenario_screen_test.mu.html b/html/083scenario_screen_test.mu.html
index 32fc1012..0b02262a 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Conceal { color: #4e4e4e; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
+.Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 -->
 </style>
 
diff --git a/html/084console.mu.html b/html/084console.mu.html
index 42963a93..635710f5 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.muData { color: #ffff00; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
-.muData { color: #ffff00; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/085scenario_console.cc.html b/html/085scenario_console.cc.html
index 2ee54ca4..f186df95 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muScenario { color: #00af00; }
 .Conceal { color: #4e4e4e; }
-.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; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/086scenario_console_test.mu.html b/html/086scenario_console_test.mu.html
index 9045b45b..008e2db6 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Conceal { color: #4e4e4e; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
+.Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 -->
 </style>
 
diff --git a/html/087file.cc.html b/html/087file.cc.html
index 11aaa14c..2e279a33 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
 .Conceal { color: #4e4e4e; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
+.PreProc { color: #800080; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/088file.mu.html b/html/088file.mu.html
index bc975087..33d5c04d 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.muData { color: #ffff00; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
-.muData { color: #ffff00; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
@@ -204,7 +204,7 @@ if ('onhashchange' in window) {
 <span id="L143" class="LineNr">143 </span>  <span class="Delimiter">}</span>
 <span id="L144" class="LineNr">144 </span>  close sink-file
 <span id="L145" class="LineNr">145 </span>  <span class="Comment"># make sure to wait for the file to be actually written to disk</span>
-<span id="L146" class="LineNr">146 </span>  <span class="Comment"># (Mu practices structured concurrency: <a href="http://250bpm.com/blog:71)">http://250bpm.com/blog:71)</a></span>
+<span id="L146" class="LineNr">146 </span>  <span class="Comment"># (Mu practices structured concurrency: <a href="http://250bpm.com/blog:71">http://250bpm.com/blog:71</a>)</span>
 <span id="L147" class="LineNr">147 </span>  wait-for-routine write-routine
 <span id="L148" class="LineNr">148 </span>]
 <span id="L149" class="LineNr">149 </span>
diff --git a/html/089scenario_filesystem.cc.html b/html/089scenario_filesystem.cc.html
index 9f98685a..3b6f54ac 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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=">
@@ -16,15 +16,15 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
+.Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
+.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; }
+.Special { color: #c00000; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/090scenario_filesystem_test.mu.html b/html/090scenario_filesystem_test.mu.html
index 111095f9..343ea40d 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Conceal { color: #4e4e4e; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
+.Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 -->
 </style>
 
diff --git a/html/091socket.cc.html b/html/091socket.cc.html
index 9ab16aeb..883fdbcd 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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=">
@@ -16,16 +16,16 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .Conceal { color: #4e4e4e; }
-.CommentedCode { color: #6c6c6c; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
+.PreProc { color: #800080; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
 .Constant { color: #00a0a0; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
 .cSpecial { color: #008000; }
+.CommentedCode { color: #6c6c6c; }
 -->
 </style>
 
diff --git a/html/092socket.mu.html b/html/092socket.mu.html
index 10daadb9..3f847cf9 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Conceal { color: #4e4e4e; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
+.Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muRecipe { color: #ff8700; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
-.muData { color: #ffff00; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/099hardware_checks.cc.html b/html/099hardware_checks.cc.html
index 2b9c9a61..8b6e9b91 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
 .Conceal { color: #4e4e4e; }
 .traceContains { color: #008000; }
-.Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
+.muRecipe { color: #ff8700; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
 .cSpecial { color: #008000; }
+.Special { color: #c00000; }
 -->
 </style>
 
diff --git a/html/100trace_browser.cc.html b/html/100trace_browser.cc.html
index 0904f4b0..622093b4 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.Identifier { color: #c0a020; }
 .Constant { color: #00a0a0; }
-.Conceal { color: #4e4e4e; }
+.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; }
-.cSpecial { color: #008000; }
+.Conceal { color: #4e4e4e; }
 -->
 </style>
 
diff --git a/html/101run_sandboxed.cc.html b/html/101run_sandboxed.cc.html
index f18b38c7..5e56fb93 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.traceContains { color: #008000; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
 .CommentedCode { color: #6c6c6c; }
+.Constant { color: #00a0a0; }
+.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; }
+.Special { color: #c00000; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
@@ -459,9 +459,9 @@ if ('onhashchange' in window) {
 <span id="L395" class="LineNr">395 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L396" class="LineNr">396 </span>  <span class="Comment"># try to interactively add 2 and 2</span>
 <span id="L397" class="LineNr">397 </span>  <span class="Constant">1</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [
-<span id="L398" class="LineNr">398 </span>  <span class="Conceal">¦</span> <span class="Normal">x</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [a]
-<span id="L399" class="LineNr">399 </span>  <span class="Conceal">¦</span> <span class="Normal">y</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [b]
-<span id="L400" class="LineNr">400 </span>  <span class="Conceal">¦</span> <span class="Normal">z</span>:text<span class="Special"> &lt;- </span>append x:text<span class="Delimiter">,</span> y:text
+<span id="L398" class="LineNr">398 </span>  <span class="Conceal">¦</span> x:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [a]
+<span id="L399" class="LineNr">399 </span>  <span class="Conceal">¦</span> y:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [b]
+<span id="L400" class="LineNr">400 </span>  <span class="Conceal">¦</span> z:text<span class="Special"> &lt;- </span>append x:text<span class="Delimiter">,</span> y:text
 <span id="L401" class="LineNr">401 </span>  ]
 <span id="L402" class="LineNr">402 </span>  <span class="Constant">2</span>:text<span class="Special"> &lt;- </span>run-sandboxed <span class="Constant">1</span>:text
 <span id="L403" class="LineNr">403 </span>  <span class="Constant">10</span>:@:<span class="Normal">char</span><span class="Special"> &lt;- </span>copy *<span class="Constant">2</span>:text
@@ -648,12 +648,12 @@ if ('onhashchange' in window) {
 <span id="L584" class="LineNr">584 </span>  local-scope
 <span id="L585" class="LineNr">585 </span>  <span class="Normal">x</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [
 <span id="L586" class="LineNr">586 </span>  <span class="Conceal">¦</span> container foo [
-<span id="L587" class="LineNr">587 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">x</span>:num
-<span id="L588" class="LineNr">588 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">y</span>:num
+<span id="L587" class="LineNr">587 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> x:num
+<span id="L588" class="LineNr">588 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> y:num
 <span id="L589" class="LineNr">589 </span>  <span class="Conceal">¦</span> ]
 <span id="L590" class="LineNr">590 </span>  <span class="Conceal">¦</span> <a href='010vm.cc.html#L19'>recipe</a> bar [
 <span id="L591" class="LineNr">591 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> local-scope
-<span id="L592" class="LineNr">592 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">x</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span>
+<span id="L592" class="LineNr">592 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> x:foo<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span>
 <span id="L593" class="LineNr">593 </span>  <span class="Conceal">¦</span> ]
 <span id="L594" class="LineNr">594 </span>  ]
 <span id="L595" class="LineNr">595 </span>  <span class="Comment"># save warning addresses in locations of type 'number' to avoid spurious changes to them due to 'abandon'</span>
diff --git a/html/998check_type_pointers.cc.html b/html/998check_type_pointers.cc.html
index 0c26fe83..b782cabf 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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,9 +15,9 @@ 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; }
 .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 9aa79d6b..553e6321 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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=">
@@ -16,11 +16,11 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .Constant { color: #00a0a0; }
-.SalientComment { color: #00ffff; }
+.LineNr { color: #444444; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
diff --git a/html/channel.mu.html b/html/channel.mu.html
index 13dd7638..42f5a909 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/chessboard.mu.html b/html/chessboard.mu.html
index 77d0c653..4f99bb58 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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,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; }
 .muScenario { color: #00af00; }
 .Conceal { color: #4e4e4e; }
+.CommentedCode { color: #6c6c6c; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
+.muData { color: #ffff00; }
 .SalientComment { color: #00ffff; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.CommentedCode { color: #6c6c6c; }
-.muData { color: #ffff00; }
-.muControl { color: #c0a020; }
 .Special { color: #c00000; }
+.muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/console.mu.html b/html/console.mu.html
index 46e4284e..5b6682c1 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
 .Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/continuation1.mu.html b/html/continuation1.mu.html
index d0ec20a1..aa2ab50a 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
@@ -70,7 +70,7 @@ if ('onhashchange' in window) {
 <span id="L12" class="LineNr">12 </span>
 <span id="L13" class="LineNr">13 </span><span class="muRecipe">def</span> <a href='continuation1.mu.html#L13'>main</a> [
 <span id="L14" class="LineNr">14 </span>  <span class="Constant">local-scope</span>
-<span id="L15" class="LineNr">15 </span>  k:continuation <span class="Special">&lt;-</span> call-with-continuation-mark <a href='continuation1.mu.html#L20'>create-yielder</a>
+<span id="L15" class="LineNr">15 </span>  k:continuation <span class="Special">&lt;-</span> call-with-continuation-mark <span class="Constant">100/mark</span>, <a href='continuation1.mu.html#L20'>create-yielder</a>
 <span id="L16" class="LineNr">16 </span>  x:num <span class="Special">&lt;-</span> call k  <span class="Comment"># should return 1</span>
 <span id="L17" class="LineNr">17 </span>  $print x <span class="Constant">10/newline</span>
 <span id="L18" class="LineNr">18 </span>]
@@ -78,7 +78,7 @@ if ('onhashchange' in window) {
 <span id="L20" class="LineNr">20 </span><span class="muRecipe">def</span> <a href='continuation1.mu.html#L20'>create-yielder</a><span class="muRecipe"> -&gt; </span>n:num [
 <span id="L21" class="LineNr">21 </span>  <span class="Constant">local-scope</span>
 <span id="L22" class="LineNr">22 </span>  <span class="Constant">load-inputs</span>
-<span id="L23" class="LineNr">23 </span>  return-continuation-until-mark
+<span id="L23" class="LineNr">23 </span>  return-continuation-until-mark <span class="Constant">100/mark</span>
 <span id="L24" class="LineNr">24 </span>  <span class="muControl">return</span><span class="Constant"> 1</span>
 <span id="L25" class="LineNr">25 </span>]
 </pre>
diff --git a/html/continuation2.mu.html b/html/continuation2.mu.html
index 823b5227..f30381ff 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
@@ -77,7 +77,7 @@ if ('onhashchange' in window) {
 <span id="L17" class="LineNr">17 </span>  l <span class="Special">&lt;-</span> push<span class="Constant"> 3</span>, l
 <span id="L18" class="LineNr">18 </span>  l <span class="Special">&lt;-</span> push<span class="Constant"> 2</span>, l
 <span id="L19" class="LineNr">19 </span>  l <span class="Special">&lt;-</span> push<span class="Constant"> 1</span>, l
-<span id="L20" class="LineNr">20 </span>  k:continuation <span class="Special">&lt;-</span> call-with-continuation-mark <a href='continuation2.mu.html#L29'>create-yielder</a>, l
+<span id="L20" class="LineNr">20 </span>  k:continuation <span class="Special">&lt;-</span> call-with-continuation-mark <span class="Constant">100/mark</span>, <a href='continuation2.mu.html#L29'>create-yielder</a>, l
 <span id="L21" class="LineNr">21 </span>  <span class="Delimiter">{</span>
 <span id="L22" class="LineNr">22 </span>  <span class="Conceal">¦</span> x:num, done?:bool <span class="Special">&lt;-</span> call k
 <span id="L23" class="LineNr">23 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
@@ -89,9 +89,9 @@ if ('onhashchange' in window) {
 <span id="L29" class="LineNr">29 </span><span class="muRecipe">def</span> <a href='continuation2.mu.html#L29'>create-yielder</a> l:&amp;:<a href='064list.mu.html#L6'>list</a>:num<span class="muRecipe"> -&gt; </span>n:num, done?:bool [
 <span id="L30" class="LineNr">30 </span>  <span class="Constant">local-scope</span>
 <span id="L31" class="LineNr">31 </span>  <span class="Constant">load-inputs</span>
-<span id="L32" class="LineNr">32 </span>  return-continuation-until-mark
-<span id="L33" class="LineNr">33 </span>  done? <span class="Special">&lt;-</span> equal l,<span class="Constant"> 0</span>
-<span id="L34" class="LineNr">34 </span>  <span class="muControl">return-if</span> done?,<span class="Constant"> 0</span>
+<span id="L32" class="LineNr">32 </span>  return-continuation-until-mark <span class="Constant">100/mark</span>
+<span id="L33" class="LineNr">33 </span>  done? <span class="Special">&lt;-</span> equal l, <span class="Constant">0/nil</span>
+<span id="L34" class="LineNr">34 </span>  <span class="muControl">return-if</span> done?, <span class="Constant">0/false</span>
 <span id="L35" class="LineNr">35 </span>  n <span class="Special">&lt;-</span> first l
 <span id="L36" class="LineNr">36 </span>  l <span class="Special">&lt;-</span> <a href='064list.mu.html#L24'>rest</a> l
 <span id="L37" class="LineNr">37 </span>]
diff --git a/html/continuation3.mu.html b/html/continuation3.mu.html
index 318d01b3..928e3ec6 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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,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; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
@@ -74,7 +74,7 @@ if ('onhashchange' in window) {
 <span id="L17" class="LineNr">17 </span><span class="muRecipe">def</span> <a href='continuation3.mu.html#L17'>main</a> [
 <span id="L18" class="LineNr">18 </span>  <span class="Constant">local-scope</span>
 <span id="L19" class="LineNr">19 </span>  $print <span class="Constant">[caller 0]</span> <span class="Constant">10/newline</span>
-<span id="L20" class="LineNr">20 </span>  k:continuation <span class="Special">&lt;-</span> call-with-continuation-mark <a href='continuation3.mu.html#L27'>f</a>
+<span id="L20" class="LineNr">20 </span>  k:continuation <span class="Special">&lt;-</span> call-with-continuation-mark <span class="Constant">100/mark</span>, <a href='continuation3.mu.html#L27'>f</a>
 <span id="L21" class="LineNr">21 </span>  $print <span class="Constant">[caller 1]</span> <span class="Constant">10/newline</span>
 <span id="L22" class="LineNr">22 </span>  k <span class="Special">&lt;-</span> call k
 <span id="L23" class="LineNr">23 </span>  $print <span class="Constant">[caller 2]</span> <span class="Constant">10/newline</span>
@@ -84,9 +84,9 @@ if ('onhashchange' in window) {
 <span id="L27" class="LineNr">27 </span><span class="muRecipe">def</span> <a href='continuation3.mu.html#L27'>f</a> [
 <span id="L28" class="LineNr">28 </span>  <span class="Constant">local-scope</span>
 <span id="L29" class="LineNr">29 </span>  $print <span class="Constant">[callee 0]</span> <span class="Constant">10/newline</span>
-<span id="L30" class="LineNr">30 </span>  return-continuation-until-mark
+<span id="L30" class="LineNr">30 </span>  return-continuation-until-mark <span class="Constant">100/mark</span>
 <span id="L31" class="LineNr">31 </span>  $print <span class="Constant">[callee 1]</span> <span class="Constant">10/newline</span>
-<span id="L32" class="LineNr">32 </span>  return-continuation-until-mark
+<span id="L32" class="LineNr">32 </span>  return-continuation-until-mark <span class="Constant">100/mark</span>
 <span id="L33" class="LineNr">33 </span>  $print <span class="Constant">[callee 2]</span> <span class="Constant">10/newline</span>
 <span id="L34" class="LineNr">34 </span>]
 </pre>
diff --git a/html/continuation4.mu.html b/html/continuation4.mu.html
index 89fbcd3a..c0be8dc7 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
@@ -79,7 +79,7 @@ if ('onhashchange' in window) {
 <span id="L19" class="LineNr">19 </span>  l <span class="Special">&lt;-</span> push<span class="Constant"> 3</span>, l
 <span id="L20" class="LineNr">20 </span>  l <span class="Special">&lt;-</span> push<span class="Constant"> 2</span>, l
 <span id="L21" class="LineNr">21 </span>  l <span class="Special">&lt;-</span> push<span class="Constant"> 1</span>, l
-<span id="L22" class="LineNr">22 </span>  k:continuation, x:num, done?:bool <span class="Special">&lt;-</span> call-with-continuation-mark <a href='continuation4.mu.html#L31'>create-yielder</a>, l
+<span id="L22" class="LineNr">22 </span>  k:continuation, x:num, done?:bool <span class="Special">&lt;-</span> call-with-continuation-mark <span class="Constant">100/mark</span>, <a href='continuation4.mu.html#L31'>create-yielder</a>, l
 <span id="L23" class="LineNr">23 </span>  <span class="Delimiter">{</span>
 <span id="L24" class="LineNr">24 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
 <span id="L25" class="LineNr">25 </span>  <span class="Conceal">¦</span> $print x <span class="Constant">10/newline</span>
@@ -96,13 +96,13 @@ if ('onhashchange' in window) {
 <span id="L36" class="LineNr">36 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
 <span id="L37" class="LineNr">37 </span>  <span class="Conceal">¦</span> n <span class="Special">&lt;-</span> first l
 <span id="L38" class="LineNr">38 </span>  <span class="Conceal">¦</span> l <span class="Special">&lt;-</span> <a href='064list.mu.html#L24'>rest</a> l
-<span id="L39" class="LineNr">39 </span>  <span class="Conceal">¦</span> return-continuation-until-mark n, done?
+<span id="L39" class="LineNr">39 </span>  <span class="Conceal">¦</span> return-continuation-until-mark <span class="Constant">100/mark</span>, n, done?
 <span id="L40" class="LineNr">40 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
 <span id="L41" class="LineNr">41 </span>  <span class="Delimiter">}</span>
 <span id="L42" class="LineNr">42 </span>  <span class="Comment"># A function that returns continuations shouldn't get the opportunity to</span>
 <span id="L43" class="LineNr">43 </span>  <span class="Comment"># return. Calling functions should stop calling its continuation after this</span>
 <span id="L44" class="LineNr">44 </span>  <span class="Comment"># point.</span>
-<span id="L45" class="LineNr">45 </span>  return-continuation-until-mark<span class="Constant"> -1</span>, done?
+<span id="L45" class="LineNr">45 </span>  return-continuation-until-mark <span class="Constant">100/mark</span>,<span class="Constant"> -1</span>, done?
 <span id="L46" class="LineNr">46 </span>  assert <span class="Constant">0/false</span>, <span class="Constant">[called too many times, ran out of continuations to return]</span>
 <span id="L47" class="LineNr">47 </span>]
 </pre>
diff --git a/html/continuation5.mu.html b/html/continuation5.mu.html
index 961eea7a..65a30cf1 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
@@ -80,7 +80,7 @@ if ('onhashchange' in window) {
 <span id="L20" class="LineNr">20 </span>  l <span class="Special">&lt;-</span> push<span class="Constant"> 3</span>, l
 <span id="L21" class="LineNr">21 </span>  l <span class="Special">&lt;-</span> push<span class="Constant"> 2</span>, l
 <span id="L22" class="LineNr">22 </span>  l <span class="Special">&lt;-</span> push<span class="Constant"> 1</span>, l
-<span id="L23" class="LineNr">23 </span>  k:continuation, x:num, done?:bool <span class="Special">&lt;-</span> call-with-continuation-mark <a href='continuation5.mu.html#L34'>create-yielder</a>, l
+<span id="L23" class="LineNr">23 </span>  k:continuation, x:num, done?:bool <span class="Special">&lt;-</span> call-with-continuation-mark <span class="Constant">100/mark</span>, <a href='continuation5.mu.html#L34'>create-yielder</a>, l
 <span id="L24" class="LineNr">24 </span>  a:num <span class="Special">&lt;-</span> copy<span class="Constant"> 1</span>
 <span id="L25" class="LineNr">25 </span>  <span class="Delimiter">{</span>
 <span id="L26" class="LineNr">26 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
@@ -101,10 +101,10 @@ if ('onhashchange' in window) {
 <span id="L41" class="LineNr">41 </span>  <span class="Conceal">¦</span> n <span class="Special">&lt;-</span> first l
 <span id="L42" class="LineNr">42 </span>  <span class="Conceal">¦</span> l <span class="Special">&lt;-</span> <a href='064list.mu.html#L24'>rest</a> l
 <span id="L43" class="LineNr">43 </span>  <span class="Conceal">¦</span> n <span class="Special">&lt;-</span> add n, a
-<span id="L44" class="LineNr">44 </span>  <span class="Conceal">¦</span> a <span class="Special">&lt;-</span> return-continuation-until-mark n, done?  <span class="Comment"># pause/resume</span>
+<span id="L44" class="LineNr">44 </span>  <span class="Conceal">¦</span> a <span class="Special">&lt;-</span> return-continuation-until-mark <span class="Constant">100/mark</span>, n, done?  <span class="Comment"># pause/resume</span>
 <span id="L45" class="LineNr">45 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
 <span id="L46" class="LineNr">46 </span>  <span class="Delimiter">}</span>
-<span id="L47" class="LineNr">47 </span>  return-continuation-until-mark<span class="Constant"> -1</span>, done?
+<span id="L47" class="LineNr">47 </span>  return-continuation-until-mark <span class="Constant">100/mark</span>,<span class="Constant"> -1</span>, done?
 <span id="L48" class="LineNr">48 </span>  assert <span class="Constant">0/false</span>, <span class="Constant">[called too many times, ran out of continuations to return]</span>
 <span id="L49" class="LineNr">49 </span>]
 </pre>
diff --git a/html/counters.mu.html b/html/counters.mu.html
index bc824899..9af69f56 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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,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; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/display.mu.html b/html/display.mu.html
index 1010e09e..1c44402f 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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,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; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/edit/001-editor.mu.html b/html/edit/001-editor.mu.html
index 2f22aa64..73ae7ae3 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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,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; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.CommentedCode { color: #6c6c6c; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
-.SalientComment { color: #00ffff; }
+.muData { color: #ffff00; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.CommentedCode { color: #6c6c6c; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
-.muData { color: #ffff00; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/edit/002-typing.mu.html b/html/edit/002-typing.mu.html
index 459e32c0..e05555a2 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
-.SalientComment { color: #00ffff; }
+.muData { color: #ffff00; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
-.muData { color: #ffff00; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/edit/003-shortcuts.mu.html b/html/edit/003-shortcuts.mu.html
index 68459fda..89d573d7 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Conceal { color: #4e4e4e; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
+.Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
-.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muRecipe { color: #ff8700; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/edit/004-programming-environment.mu.html b/html/edit/004-programming-environment.mu.html
index 703e71e6..04eb525e 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
-.muScenario { color: #00af00; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.muData { color: #ffff00; }
+.LineNr { color: #444444; }
+.muScenario { color: #00af00; }
 .Delimiter { color: #800080; }
-.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
-.muData { color: #ffff00; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/edit/005-sandbox.mu.html b/html/edit/005-sandbox.mu.html
index 51d920f8..f91232db 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
-.Conceal { color: #4e4e4e; }
+.muData { color: #ffff00; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
-.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Conceal { color: #4e4e4e; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
-.muData { color: #ffff00; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/edit/006-sandbox-copy.mu.html b/html/edit/006-sandbox-copy.mu.html
index fc003903..bcc6e301 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Conceal { color: #4e4e4e; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
+.Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
-.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muRecipe { color: #ff8700; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/edit/007-sandbox-delete.mu.html b/html/edit/007-sandbox-delete.mu.html
index c8fde128..524a7fca 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Conceal { color: #4e4e4e; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
+.Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
-.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muRecipe { color: #ff8700; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/edit/008-sandbox-edit.mu.html b/html/edit/008-sandbox-edit.mu.html
index 7f6028a7..40bc00ef 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Conceal { color: #4e4e4e; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
+.Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
-.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muRecipe { color: #ff8700; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/edit/009-sandbox-test.mu.html b/html/edit/009-sandbox-test.mu.html
index e311f2c0..2934ebd7 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Conceal { color: #4e4e4e; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
+.Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
-.SalientComment { color: #00ffff; }
+.muData { color: #ffff00; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muRecipe { color: #ff8700; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
-.muData { color: #ffff00; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/edit/010-sandbox-trace.mu.html b/html/edit/010-sandbox-trace.mu.html
index 8f907fa7..10435b66 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Conceal { color: #4e4e4e; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
+.Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
-.SalientComment { color: #00ffff; }
+.muData { color: #ffff00; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muRecipe { color: #ff8700; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
-.muData { color: #ffff00; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/edit/011-errors.mu.html b/html/edit/011-errors.mu.html
index 8519462b..13c73c2b 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
-.muScenario { color: #00af00; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.muData { color: #ffff00; }
+.LineNr { color: #444444; }
+.muScenario { color: #00af00; }
 .Delimiter { color: #800080; }
-.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
-.muData { color: #ffff00; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/edit/012-editor-undo.mu.html b/html/edit/012-editor-undo.mu.html
index 0bda1aaf..0a88703f 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Conceal { color: #4e4e4e; }
-.muRecipe { color: #ff8700; }
 .Special { color: #c00000; }
+.muData { color: #ffff00; }
+.LineNr { color: #444444; }
+.muScenario { color: #00af00; }
 .Delimiter { color: #800080; }
-.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
+.Conceal { color: #4e4e4e; }
 .muControl { color: #c0a020; }
-.muScenario { color: #00af00; }
-.muData { color: #ffff00; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/example1.mu.html b/html/example1.mu.html
index 2ff1fd66..8be293b2 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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,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; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
-.Constant { color: #00a0a0; }
 .LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/factorial.mu.html b/html/factorial.mu.html
index 9a02e01f..e5ac5761 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/filesystem.mu.html b/html/filesystem.mu.html
index 13db4aef..4a64232e 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/fork.mu.html b/html/fork.mu.html
index 08224504..7eeb180c 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
 .Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
-.Constant { color: #00a0a0; }
 .muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/http-client.mu.html b/html/http-client.mu.html
index 91e04cbe..c83886f4 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/http-server.mu.html b/html/http-server.mu.html
index c8aa3c67..50e1d022 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/immutable-error.mu.html b/html/immutable-error.mu.html
index 92113108..e9145618 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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,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; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/lambda-to-mu.mu.html b/html/lambda-to-mu.mu.html
index c6502d25..c15a22b1 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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,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; }
-.Conceal { color: #4e4e4e; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
+.Conceal { color: #4e4e4e; }
+.CommentedCode { color: #6c6c6c; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
-.SalientComment { color: #00ffff; }
+.muData { color: #ffff00; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muRecipe { color: #ff8700; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
-.CommentedCode { color: #6c6c6c; }
-.muData { color: #ffff00; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/mutable.mu.html b/html/mutable.mu.html
index eea20c1b..0b3daa5a 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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,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; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/nqueens.mu.html b/html/nqueens.mu.html
index 4fc263e0..ac2fe88c 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.muData { color: #ffff00; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .muControl { color: #c0a020; }
-.muData { color: #ffff00; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/real-files.mu.html b/html/real-files.mu.html
index c72cb608..f74c5582 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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,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; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/same-fringe.mu.html b/html/same-fringe.mu.html
index bc49aae9..433af545 100644
--- a/html/same-fringe.mu.html
+++ b/html/same-fringe.mu.html
@@ -67,32 +67,32 @@ if ('onhashchange' in window) {
 <span id="L6" class="LineNr"> 6 </span><span class="Comment"># (i.e. that the two given trees x and y have the same leaves, in the same</span>
 <span id="L7" class="LineNr"> 7 </span><span class="Comment"># order from left to right)</span>
 <span id="L8" class="LineNr"> 8 </span>
-<span id="L9" class="LineNr"> 9 </span><span class="muData">container</span> tree:_elem [
+<span id="L9" class="LineNr"> 9 </span><span class="muData">container</span> <a href='same-fringe.mu.html#L9'>tree</a>:_elem [
 <span id="L10" class="LineNr">10 </span>  val:_elem
-<span id="L11" class="LineNr">11 </span>  left:&amp;:tree:_elem
-<span id="L12" class="LineNr">12 </span>  right:&amp;:tree:_elem
+<span id="L11" class="LineNr">11 </span>  left:&amp;:<a href='same-fringe.mu.html#L9'>tree</a>:_elem
+<span id="L12" class="LineNr">12 </span>  right:&amp;:<a href='same-fringe.mu.html#L9'>tree</a>:_elem
 <span id="L13" class="LineNr">13 </span>]
 <span id="L14" class="LineNr">14 </span>
-<span id="L15" class="LineNr">15 </span><span class="muRecipe">def</span> main [
+<span id="L15" class="LineNr">15 </span><span class="muRecipe">def</span> <a href='same-fringe.mu.html#L15'>main</a> [
 <span id="L16" class="LineNr">16 </span>  <span class="Constant">local-scope</span>
 <span id="L17" class="LineNr">17 </span>  <span class="Comment"># x: ((a b) c)</span>
 <span id="L18" class="LineNr">18 </span>  <span class="Comment"># y: (a (b c))</span>
-<span id="L19" class="LineNr">19 </span>  a:&amp;:tree:num <span class="Special">&lt;-</span> new-tree<span class="Constant"> 3</span>
-<span id="L20" class="LineNr">20 </span>  b:&amp;:tree:num <span class="Special">&lt;-</span> new-tree<span class="Constant"> 4</span>
-<span id="L21" class="LineNr">21 </span>  c:&amp;:tree:num <span class="Special">&lt;-</span> new-tree<span class="Constant"> 5</span>
-<span id="L22" class="LineNr">22 </span>  x1:&amp;:tree:num <span class="Special">&lt;-</span> new-tree a, b
-<span id="L23" class="LineNr">23 </span>  x:&amp;:tree:num <span class="Special">&lt;-</span> new-tree x1, c
-<span id="L24" class="LineNr">24 </span>  y1:&amp;:tree:num <span class="Special">&lt;-</span> new-tree b, c
-<span id="L25" class="LineNr">25 </span>  y:&amp;:tree:num <span class="Special">&lt;-</span> new-tree a, y1
-<span id="L26" class="LineNr">26 </span>  result:bool <span class="Special">&lt;-</span> same-fringe x, y
+<span id="L19" class="LineNr">19 </span>  a:&amp;:<a href='same-fringe.mu.html#L9'>tree</a>:num <span class="Special">&lt;-</span> new-tree<span class="Constant"> 3</span>
+<span id="L20" class="LineNr">20 </span>  b:&amp;:<a href='same-fringe.mu.html#L9'>tree</a>:num <span class="Special">&lt;-</span> new-tree<span class="Constant"> 4</span>
+<span id="L21" class="LineNr">21 </span>  c:&amp;:<a href='same-fringe.mu.html#L9'>tree</a>:num <span class="Special">&lt;-</span> new-tree<span class="Constant"> 5</span>
+<span id="L22" class="LineNr">22 </span>  x1:&amp;:<a href='same-fringe.mu.html#L9'>tree</a>:num <span class="Special">&lt;-</span> new-tree a, b
+<span id="L23" class="LineNr">23 </span>  x:&amp;:<a href='same-fringe.mu.html#L9'>tree</a>:num <span class="Special">&lt;-</span> new-tree x1, c
+<span id="L24" class="LineNr">24 </span>  y1:&amp;:<a href='same-fringe.mu.html#L9'>tree</a>:num <span class="Special">&lt;-</span> new-tree b, c
+<span id="L25" class="LineNr">25 </span>  y:&amp;:<a href='same-fringe.mu.html#L9'>tree</a>:num <span class="Special">&lt;-</span> new-tree a, y1
+<span id="L26" class="LineNr">26 </span>  result:bool <span class="Special">&lt;-</span> <a href='same-fringe.mu.html#L30'>same-fringe</a> x, y
 <span id="L27" class="LineNr">27 </span>  $print result <span class="Constant">10/newline</span>
 <span id="L28" class="LineNr">28 </span>]
 <span id="L29" class="LineNr">29 </span>
-<span id="L30" class="LineNr">30 </span><span class="muRecipe">def</span> same-fringe a:&amp;:tree:_elem, b:&amp;:tree:_elem<span class="muRecipe"> -&gt; </span>result:bool [
+<span id="L30" class="LineNr">30 </span><span class="muRecipe">def</span> <a href='same-fringe.mu.html#L30'>same-fringe</a> a:&amp;:<a href='same-fringe.mu.html#L9'>tree</a>:_elem, b:&amp;:<a href='same-fringe.mu.html#L9'>tree</a>:_elem<span class="muRecipe"> -&gt; </span>result:bool [
 <span id="L31" class="LineNr">31 </span>  <span class="Constant">local-scope</span>
 <span id="L32" class="LineNr">32 </span>  <span class="Constant">load-inputs</span>
-<span id="L33" class="LineNr">33 </span>  k1:continuation <span class="Special">&lt;-</span> call-with-continuation-mark process, a
-<span id="L34" class="LineNr">34 </span>  k2:continuation <span class="Special">&lt;-</span> call-with-continuation-mark process, b
+<span id="L33" class="LineNr">33 </span>  k1:continuation <span class="Special">&lt;-</span> call-with-continuation-mark <span class="Constant">100/mark</span>, <a href='same-fringe.mu.html#L48'>process</a>, a
+<span id="L34" class="LineNr">34 </span>  k2:continuation <span class="Special">&lt;-</span> call-with-continuation-mark <span class="Constant">100/mark</span>, <a href='same-fringe.mu.html#L48'>process</a>, b
 <span id="L35" class="LineNr">35 </span>  <span class="Delimiter">{</span>
 <span id="L36" class="LineNr">36 </span>  <span class="Conceal">¦</span> k1, x:_elem, a-done?:bool <span class="Special">&lt;-</span> call k1
 <span id="L37" class="LineNr">37 </span>  <span class="Conceal">¦</span> k2, y:_elem, b-done?:bool <span class="Special">&lt;-</span> call k2
@@ -106,42 +106,42 @@ if ('onhashchange' in window) {
 <span id="L45" class="LineNr">45 </span>]
 <span id="L46" class="LineNr">46 </span>
 <span id="L47" class="LineNr">47 </span><span class="Comment"># harness around traversal</span>
-<span id="L48" class="LineNr">48 </span><span class="muRecipe">def</span> process t:&amp;:tree:_elem [
+<span id="L48" class="LineNr">48 </span><span class="muRecipe">def</span> <a href='same-fringe.mu.html#L48'>process</a> t:&amp;:<a href='same-fringe.mu.html#L9'>tree</a>:_elem [
 <span id="L49" class="LineNr">49 </span>  <span class="Constant">local-scope</span>
 <span id="L50" class="LineNr">50 </span>  <span class="Constant">load-inputs</span>
-<span id="L51" class="LineNr">51 </span>  return-continuation-until-mark  <span class="Comment"># initial</span>
-<span id="L52" class="LineNr">52 </span>  traverse t
+<span id="L51" class="LineNr">51 </span>  return-continuation-until-mark <span class="Constant">100/mark</span>  <span class="Comment"># initial</span>
+<span id="L52" class="LineNr">52 </span>  <a href='same-fringe.mu.html#L59'>traverse</a> t
 <span id="L53" class="LineNr">53 </span>  zero-val:&amp;:_elem <span class="Special">&lt;-</span> new <span class="Constant">_elem:type</span>
-<span id="L54" class="LineNr">54 </span>  return-continuation-until-mark *zero-val, <span class="Constant">1/done</span>  <span class="Comment"># final</span>
+<span id="L54" class="LineNr">54 </span>  return-continuation-until-mark <span class="Constant">100/mark</span>, *zero-val, <span class="Constant">1/done</span>  <span class="Comment"># final</span>
 <span id="L55" class="LineNr">55 </span>  assert <span class="Constant">0/false</span>, <span class="Constant">[continuation called past done]</span>
 <span id="L56" class="LineNr">56 </span>]
 <span id="L57" class="LineNr">57 </span>
 <span id="L58" class="LineNr">58 </span><span class="Comment"># core traversal</span>
-<span id="L59" class="LineNr">59 </span><span class="muRecipe">def</span> traverse t:&amp;:tree:_elem [
+<span id="L59" class="LineNr">59 </span><span class="muRecipe">def</span> <a href='same-fringe.mu.html#L59'>traverse</a> t:&amp;:<a href='same-fringe.mu.html#L9'>tree</a>:_elem [
 <span id="L60" class="LineNr">60 </span>  <span class="Constant">local-scope</span>
 <span id="L61" class="LineNr">61 </span>  <span class="Constant">load-inputs</span>
 <span id="L62" class="LineNr">62 </span>  <span class="muControl">return-unless</span> t
-<span id="L63" class="LineNr">63 </span>  l:&amp;:tree:_elem <span class="Special">&lt;-</span> get *t, <span class="Constant">left:offset</span>
-<span id="L64" class="LineNr">64 </span>  traverse l
-<span id="L65" class="LineNr">65 </span>  r:&amp;:tree:_elem <span class="Special">&lt;-</span> get *t, <span class="Constant">right:offset</span>
-<span id="L66" class="LineNr">66 </span>  traverse r
+<span id="L63" class="LineNr">63 </span>  l:&amp;:<a href='same-fringe.mu.html#L9'>tree</a>:_elem <span class="Special">&lt;-</span> get *t, <span class="Constant">left:offset</span>
+<span id="L64" class="LineNr">64 </span>  <a href='same-fringe.mu.html#L59'>traverse</a> l
+<span id="L65" class="LineNr">65 </span>  r:&amp;:<a href='same-fringe.mu.html#L9'>tree</a>:_elem <span class="Special">&lt;-</span> get *t, <span class="Constant">right:offset</span>
+<span id="L66" class="LineNr">66 </span>  <a href='same-fringe.mu.html#L59'>traverse</a> r
 <span id="L67" class="LineNr">67 </span>  <span class="muControl">return-if</span> l
 <span id="L68" class="LineNr">68 </span>  <span class="muControl">return-if</span> r
 <span id="L69" class="LineNr">69 </span>  <span class="Comment"># leaf</span>
 <span id="L70" class="LineNr">70 </span>  v:_elem <span class="Special">&lt;-</span> get *t, <span class="Constant">val:offset</span>
-<span id="L71" class="LineNr">71 </span>  return-continuation-until-mark v, <span class="Constant">0/not-done</span>
+<span id="L71" class="LineNr">71 </span>  return-continuation-until-mark <span class="Constant">100/mark</span>, v, <span class="Constant">0/not-done</span>
 <span id="L72" class="LineNr">72 </span>]
 <span id="L73" class="LineNr">73 </span>
 <span id="L74" class="LineNr">74 </span><span class="Comment"># details</span>
 <span id="L75" class="LineNr">75 </span>
-<span id="L76" class="LineNr">76 </span><span class="muRecipe">def</span> new-tree x:_elem<span class="muRecipe"> -&gt; </span>result:&amp;:tree:_elem [
+<span id="L76" class="LineNr">76 </span><span class="muRecipe">def</span> new-tree x:_elem<span class="muRecipe"> -&gt; </span>result:&amp;:<a href='same-fringe.mu.html#L9'>tree</a>:_elem [
 <span id="L77" class="LineNr">77 </span>  <span class="Constant">local-scope</span>
 <span id="L78" class="LineNr">78 </span>  <span class="Constant">load-inputs</span>
 <span id="L79" class="LineNr">79 </span>  result <span class="Special">&lt;-</span> new <span class="Delimiter">{</span>(tree _elem): type<span class="Delimiter">}</span>
 <span id="L80" class="LineNr">80 </span>  put *result, <span class="Constant">val:offset</span>, x
 <span id="L81" class="LineNr">81 </span>]
 <span id="L82" class="LineNr">82 </span>
-<span id="L83" class="LineNr">83 </span><span class="muRecipe">def</span> new-tree l:&amp;:tree:_elem, r:&amp;:tree:_elem<span class="muRecipe"> -&gt; </span>result:&amp;:tree:_elem [
+<span id="L83" class="LineNr">83 </span><span class="muRecipe">def</span> new-tree l:&amp;:<a href='same-fringe.mu.html#L9'>tree</a>:_elem, r:&amp;:<a href='same-fringe.mu.html#L9'>tree</a>:_elem<span class="muRecipe"> -&gt; </span>result:&amp;:<a href='same-fringe.mu.html#L9'>tree</a>:_elem [
 <span id="L84" class="LineNr">84 </span>  <span class="Constant">local-scope</span>
 <span id="L85" class="LineNr">85 </span>  <span class="Constant">load-inputs</span>
 <span id="L86" class="LineNr">86 </span>  result <span class="Special">&lt;-</span> new <span class="Delimiter">{</span>(tree _elem): type<span class="Delimiter">}</span>
diff --git a/html/screen.mu.html b/html/screen.mu.html
index 74f00d11..fb2b9a5d 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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,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; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/static-dispatch.mu.html b/html/static-dispatch.mu.html
index 26aa6263..5ab4d626 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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,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; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/subx/000organization.cc.html b/html/subx/000organization.cc.html
index 573b80d7..4e1190cd 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Delimiter { color: #800080; }
 .Conceal { color: #4e4e4e; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
+.PreProc { color: #800080; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
+.Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/subx/001help.cc.html b/html/subx/001help.cc.html
index 44a4d3af..a96cc59d 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.Conceal { color: #4e4e4e; }
+.cSpecial { color: #008000; }
+.PreProc { color: #800080; }
+.LineNr { color: #444444; }
 .SalientComment { color: #00ffff; }
+.Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
+.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; }
+.Conceal { color: #4e4e4e; }
 .CommentedCode { color: #6c6c6c; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
@@ -173,16 +173,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="Conceal">¦</span> <span class="Normal">case</span> <span class="Constant">SIGABRT</span>:
-<span id="L113" class="LineNr">113 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> #ifndef __APPLE__</span>
+<span id="L113" class="LineNr">113 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> #ifndef __APPLE__
 <span id="L114" class="LineNr">114 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</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>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</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">  </span><span class="Conceal">¦</span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> #endif</span>
+<span id="L116" class="LineNr">116 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> #endif
 <span id="L117" class="LineNr">117 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L118" class="LineNr">118 </span>  <span class="Conceal">¦</span> <span class="Normal">case</span> <span class="Constant">SIGILL</span>:
-<span id="L119" class="LineNr">119 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> #ifdef __APPLE__</span>
+<span id="L119" class="LineNr">119 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> #ifdef __APPLE__
 <span id="L120" class="LineNr">120 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</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>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</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">  </span><span class="Conceal">¦</span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> #endif</span>
+<span id="L122" class="LineNr">122 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> #endif
 <span id="L123" class="LineNr">123 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L124" class="LineNr">124 </span>  <span class="Conceal">¦</span> <span class="Normal">default</span>:
 <span id="L125" class="LineNr">125 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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 35c4add2..cfbb0a7b 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
 .Conceal { color: #4e4e4e; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
+.PreProc { color: #800080; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
-.CommentedCode { color: #6c6c6c; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
 .cSpecial { color: #008000; }
+.CommentedCode { color: #6c6c6c; }
 -->
 </style>
 
@@ -75,7 +75,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 e0d93f96..6850dfad 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
 .Conceal { color: #4e4e4e; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
+.PreProc { color: #800080; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
 .cSpecial { color: #008000; }
 -->
 </style>
@@ -218,7 +218,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(__VA_ARGS__)</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="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>
@@ -275,7 +275,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"> __VA_ARGS__)</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="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>
@@ -295,7 +295,7 @@ if ('onhashchange' in window) {
 <span id="L234" class="LineNr">234 </span><span class="PreProc">  </span><span class="Conceal">¦</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(__VA_ARGS__))</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="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 621dab4d..10ce2b51 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.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 1efe4533..f1dbbeeb 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Conceal { color: #4e4e4e; }
-.SalientComment { color: #00ffff; }
-.Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
+.PreProc { color: #800080; }
+.Delimiter { color: #800080; }
+.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; }
+.SalientComment { color: #00ffff; }
 .traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/subx/011direct_addressing.cc.html b/html/subx/011direct_addressing.cc.html
index 7c348d47..810eea89 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.Conceal { color: #4e4e4e; }
+.traceContains { color: #008000; }
+.PreProc { color: #800080; }
 .LineNr { color: #444444; }
-.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
-.Delimiter { color: #800080; }
+.SalientComment { color: #00ffff; }
+.Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.cSpecial { color: #008000; }
-.Conceal { color: #4e4e4e; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
+.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
-.traceContains { color: #008000; }
-.PreProc { color: #800080; }
+.cSpecial { color: #008000; }
+.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
 -->
 </style>
 
diff --git a/html/subx/012indirect_addressing.cc.html b/html/subx/012indirect_addressing.cc.html
index 11eb2746..e202704a 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
+.Conceal { color: #4e4e4e; }
+.traceContains { color: #008000; }
+.PreProc { color: #800080; }
 .LineNr { color: #444444; }
-.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
+.SalientComment { color: #00ffff; }
+.Identifier { color: #c0a020; }
 .traceAbsent { color: #c00000; }
-.Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
-.Conceal { color: #4e4e4e; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
+.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.Identifier { color: #c0a020; }
-.PreProc { color: #800080; }
+.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 e8c646aa..d08b09af 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.traceContains { color: #008000; }
+.PreProc { color: #800080; }
+.LineNr { color: #444444; }
 .SalientComment { color: #00ffff; }
+.Identifier { color: #c0a020; }
+.Constant { color: #00a0a0; }
+.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; }
+.Special { color: #c00000; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/subx/014jump_relative.cc.html b/html/subx/014jump_relative.cc.html
index 72671ac4..6373952c 100644
--- a/html/subx/014jump_relative.cc.html
+++ b/html/subx/014jump_relative.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/014jump_relative.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Conceal { color: #4e4e4e; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
+.traceContains { color: #008000; }
+.PreProc { color: #800080; }
 .LineNr { color: #444444; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Identifier { color: #c0a020; }
+.Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 .traceAbsent { color: #c00000; }
-.PreProc { color: #800080; }
 .Special { color: #c00000; }
-.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/subx/015jump_relative.cc.html b/html/subx/015jump_relative.cc.html
index 329138e1..0cffa748 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Conceal { color: #4e4e4e; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
+.traceContains { color: #008000; }
+.PreProc { color: #800080; }
 .LineNr { color: #444444; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Identifier { color: #c0a020; }
+.Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 .traceAbsent { color: #c00000; }
-.PreProc { color: #800080; }
 .Special { color: #c00000; }
-.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/subx/016functions.cc.html b/html/subx/016functions.cc.html
index ee7a2311..ae3c762e 100644
--- a/html/subx/016functions.cc.html
+++ b/html/subx/016functions.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/016functions.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.SalientComment { color: #00ffff; }
-.Delimiter { color: #800080; }
+.traceContains { color: #008000; }
+.PreProc { color: #800080; }
 .LineNr { color: #444444; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Identifier { color: #c0a020; }
+.Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.PreProc { color: #800080; }
-.traceContains { color: #008000; }
+.SalientComment { color: #00ffff; }
+.Special { color: #c00000; }
 -->
 </style>
 
diff --git a/html/tangle.mu.html b/html/tangle.mu.html
index 65336b80..3f9de231 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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; }
-.muRecipe { color: #ff8700; }
-.muControl { color: #c0a020; }
 .Conceal { color: #4e4e4e; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
-.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
+.muControl { color: #c0a020; }
+.muRecipe { color: #ff8700; }
 -->
 </style>
 
diff --git a/html/x.mu.html b/html/x.mu.html
index 2581c401..f0197e7b 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/7.4">
+<meta name="Generator" content="Vim/8.0">
 <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,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; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
+.muRecipe { color: #ff8700; }
 -->
 </style>