about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--html/001help.cc.html4
-rw-r--r--html/003trace.cc.html49
-rw-r--r--html/010vm.cc.html38
-rw-r--r--html/011load.cc.html10
-rw-r--r--html/014literal_string.cc.html12
-rw-r--r--html/017parse_tree.cc.html2
-rw-r--r--html/018type_abbreviations.cc.html2
-rw-r--r--html/020run.cc.html768
-rw-r--r--html/021check_instruction.cc.html22
-rw-r--r--html/022arithmetic.cc.html8
-rw-r--r--html/024jump.cc.html18
-rw-r--r--html/026call.cc.html222
-rw-r--r--html/027call_ingredient.cc.html34
-rw-r--r--html/028call_return.cc.html128
-rw-r--r--html/029tools.cc.html26
-rw-r--r--html/030container.cc.html28
-rw-r--r--html/031merge.cc.html2
-rw-r--r--html/032array.cc.html56
-rw-r--r--html/033exclusive_container.cc.html22
-rw-r--r--html/034address.cc.html60
-rw-r--r--html/035lookup.cc.html124
-rw-r--r--html/036refcount.cc.html2109
-rw-r--r--html/037abandon.cc.html120
-rw-r--r--html/038new_text.cc.html18
-rw-r--r--html/039location_array.cc.html110
-rw-r--r--html/042name.cc.html371
-rw-r--r--html/043space.cc.html906
-rw-r--r--html/044space_surround.cc.html12
-rw-r--r--html/045closure_name.cc.html321
-rw-r--r--html/046check_type_by_name.cc.html243
-rw-r--r--html/050scenario.cc.html64
-rw-r--r--html/053recipe_header.cc.html20
-rw-r--r--html/054static_dispatch.cc.html948
-rw-r--r--html/055shape_shifting_container.cc.html50
-rw-r--r--html/056shape_shifting_recipe.cc.html1969
-rw-r--r--html/057immutable.cc.html10
-rw-r--r--html/058to_text.cc.html2
-rw-r--r--html/060rewrite_literal_string.cc.html4
-rw-r--r--html/061text.mu.html6
-rw-r--r--html/062convert_ingredients_to_text.cc.html71
-rw-r--r--html/069hash.cc.html8
-rw-r--r--html/071deep_copy.cc.html433
-rw-r--r--html/072recipe.cc.html12
-rw-r--r--html/073scheduler.cc.html8
-rw-r--r--html/074wait.cc.html8
-rw-r--r--html/076continuation.cc.html16
-rw-r--r--html/082scenario_screen.cc.html32
-rw-r--r--html/085scenario_console.cc.html4
-rw-r--r--html/087file.cc.html12
-rw-r--r--html/089scenario_filesystem.cc.html8
-rw-r--r--html/091socket.cc.html4
-rw-r--r--html/099hardware_checks.cc.html4
-rw-r--r--html/101run_sandboxed.cc.html14
-rw-r--r--html/counters.mu.html2
54 files changed, 4816 insertions, 4738 deletions
diff --git a/html/001help.cc.html b/html/001help.cc.html
index d1995143..f04fd9dd 100644
--- a/html/001help.cc.html
+++ b/html/001help.cc.html
@@ -319,6 +319,10 @@ if ('onhashchange' in window) {
 <span id="L256" class="LineNr">256 </span><span class="Normal">using</span> std::string<span class="Delimiter">;</span>
 <span id="L257" class="LineNr">257 </span>
 <span id="L258" class="LineNr">258 </span><span class="PreProc">#define unused  __attribute__((unused))</span>
+<span id="L259" class="LineNr">259 </span>
+<span id="L260" class="LineNr">260 </span><span class="PreProc">#include </span><span class="Constant">&lt;algorithm&gt;</span>
+<span id="L261" class="LineNr">261 </span><span class="Normal">using</span> std::min<span class="Delimiter">;</span>
+<span id="L262" class="LineNr">262 </span><span class="Normal">using</span> std::max<span class="Delimiter">;</span>
 </pre>
 </body>
 </html>
diff --git a/html/003trace.cc.html b/html/003trace.cc.html
index 614b9eeb..b374865a 100644
--- a/html/003trace.cc.html
+++ b/html/003trace.cc.html
@@ -447,31 +447,30 @@ if ('onhashchange' in window) {
 <span id="L386" class="LineNr">386 </span><span class="Normal">using</span> std::map<span class="Delimiter">;</span>
 <span id="L387" class="LineNr">387 </span><span class="PreProc">#include </span><span class="Constant">&lt;set&gt;</span>
 <span id="L388" class="LineNr">388 </span><span class="Normal">using</span> std::set<span class="Delimiter">;</span>
-<span id="L389" class="LineNr">389 </span><span class="PreProc">#include </span><span class="Constant">&lt;algorithm&gt;</span>
-<span id="L390" class="LineNr">390 </span>
-<span id="L391" class="LineNr">391 </span><span class="PreProc">#include </span><span class="Constant">&lt;sstream&gt;</span>
-<span id="L392" class="LineNr">392 </span><span class="Normal">using</span> std::istringstream<span class="Delimiter">;</span>
-<span id="L393" class="LineNr">393 </span><span class="Normal">using</span> std::ostringstream<span class="Delimiter">;</span>
-<span id="L394" class="LineNr">394 </span>
-<span id="L395" class="LineNr">395 </span><span class="PreProc">#include </span><span class="Constant">&lt;fstream&gt;</span>
-<span id="L396" class="LineNr">396 </span><span class="Normal">using</span> std::ifstream<span class="Delimiter">;</span>
-<span id="L397" class="LineNr">397 </span><span class="Normal">using</span> std::ofstream<span class="Delimiter">;</span>
-<span id="L398" class="LineNr">398 </span>
-<span id="L399" class="LineNr">399 </span><span class="PreProc">#include </span><span class="Constant">&quot;termbox/termbox.h&quot;</span>
-<span id="L400" class="LineNr">400 </span>
-<span id="L401" class="LineNr">401 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L402" class="LineNr">402 </span><span class="Comment">//: In future layers we'll use the depth field as follows:</span>
-<span id="L403" class="LineNr">403 </span><span class="Comment">//:</span>
-<span id="L404" class="LineNr">404 </span><span class="Comment">//: Errors will be depth 0.</span>
-<span id="L405" class="LineNr">405 </span><span class="Comment">//: Mu 'applications' will be able to use depths 1-100 as they like.</span>
-<span id="L406" class="LineNr">406 </span><span class="Comment">//: Primitive statements will occupy 101-9989</span>
-<span id="L407" class="LineNr">407 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> Initial_callstack_depth = <span class="Constant">101</span><span class="Delimiter">;</span>
-<span id="L408" class="LineNr">408 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> Max_callstack_depth = <span class="Constant">9989</span><span class="Delimiter">;</span>
-<span id="L409" class="LineNr">409 </span><span class="Comment">//: Finally, details of primitive Mu statements will occupy depth 9990-9999</span>
-<span id="L410" class="LineNr">410 </span><span class="Comment">//: (more on that later as well)</span>
-<span id="L411" class="LineNr">411 </span><span class="Comment">//:</span>
-<span id="L412" class="LineNr">412 </span><span class="Comment">//: This framework should help us hide some details at each level, mixing</span>
-<span id="L413" class="LineNr">413 </span><span class="Comment">//: static ideas like layers with the dynamic notion of call-stack depth.</span>
+<span id="L389" class="LineNr">389 </span>
+<span id="L390" class="LineNr">390 </span><span class="PreProc">#include </span><span class="Constant">&lt;sstream&gt;</span>
+<span id="L391" class="LineNr">391 </span><span class="Normal">using</span> std::istringstream<span class="Delimiter">;</span>
+<span id="L392" class="LineNr">392 </span><span class="Normal">using</span> std::ostringstream<span class="Delimiter">;</span>
+<span id="L393" class="LineNr">393 </span>
+<span id="L394" class="LineNr">394 </span><span class="PreProc">#include </span><span class="Constant">&lt;fstream&gt;</span>
+<span id="L395" class="LineNr">395 </span><span class="Normal">using</span> std::ifstream<span class="Delimiter">;</span>
+<span id="L396" class="LineNr">396 </span><span class="Normal">using</span> std::ofstream<span class="Delimiter">;</span>
+<span id="L397" class="LineNr">397 </span>
+<span id="L398" class="LineNr">398 </span><span class="PreProc">#include </span><span class="Constant">&quot;termbox/termbox.h&quot;</span>
+<span id="L399" class="LineNr">399 </span>
+<span id="L400" class="LineNr">400 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L401" class="LineNr">401 </span><span class="Comment">//: In future layers we'll use the depth field as follows:</span>
+<span id="L402" class="LineNr">402 </span><span class="Comment">//:</span>
+<span id="L403" class="LineNr">403 </span><span class="Comment">//: Errors will be depth 0.</span>
+<span id="L404" class="LineNr">404 </span><span class="Comment">//: Mu 'applications' will be able to use depths 1-100 as they like.</span>
+<span id="L405" class="LineNr">405 </span><span class="Comment">//: Primitive statements will occupy 101-9989</span>
+<span id="L406" class="LineNr">406 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> Initial_callstack_depth = <span class="Constant">101</span><span class="Delimiter">;</span>
+<span id="L407" class="LineNr">407 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> Max_callstack_depth = <span class="Constant">9989</span><span class="Delimiter">;</span>
+<span id="L408" class="LineNr">408 </span><span class="Comment">//: Finally, details of primitive Mu statements will occupy depth 9990-9999</span>
+<span id="L409" class="LineNr">409 </span><span class="Comment">//: (more on that later as well)</span>
+<span id="L410" class="LineNr">410 </span><span class="Comment">//:</span>
+<span id="L411" class="LineNr">411 </span><span class="Comment">//: This framework should help us hide some details at each level, mixing</span>
+<span id="L412" class="LineNr">412 </span><span class="Comment">//: static ideas like layers with the dynamic notion of call-stack depth.</span>
 </pre>
 </body>
 </html>
diff --git a/html/010vm.cc.html b/html/010vm.cc.html
index acef2133..0f2aa4a5 100644
--- a/html/010vm.cc.html
+++ b/html/010vm.cc.html
@@ -198,8 +198,8 @@ if ('onhashchange' in window) {
 <span id="L134" class="LineNr">134 </span>  <a href='010vm.cc.html#L123'>type_ordinal</a> number = <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
 <span id="L135" class="LineNr">135 </span>  <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> number<span class="Delimiter">).</span>name = <span class="Constant">&quot;number&quot;</span><span class="Delimiter">;</span>
 <span id="L136" class="LineNr">136 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;location&quot;</span><span class="Delimiter">,</span> number<span class="Delimiter">);</span>  <span class="Comment">// synonym of number to indicate we only care about its size</span>
-<span id="L137" class="LineNr">137 </span>  <a href='010vm.cc.html#L123'>type_ordinal</a> address = <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
-<span id="L138" class="LineNr">138 </span>  <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> address<span class="Delimiter">).</span>name = <span class="Constant">&quot;address&quot;</span><span class="Delimiter">;</span>
+<span id="L137" class="LineNr">137 </span>  <a href='010vm.cc.html#L123'>type_ordinal</a> <a href='043space.cc.html#L83'>address</a> = <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
+<span id="L138" class="LineNr">138 </span>  <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> <a href='043space.cc.html#L83'>address</a><span class="Delimiter">).</span>name = <span class="Constant">&quot;address&quot;</span><span class="Delimiter">;</span>
 <span id="L139" class="LineNr">139 </span>  <a href='010vm.cc.html#L123'>type_ordinal</a> boolean = <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;boolean&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
 <span id="L140" class="LineNr">140 </span>  <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> boolean<span class="Delimiter">).</span>name = <span class="Constant">&quot;boolean&quot;</span><span class="Delimiter">;</span>
 <span id="L141" class="LineNr">141 </span>  <a href='010vm.cc.html#L123'>type_ordinal</a> character = <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;character&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
@@ -498,32 +498,32 @@ if ('onhashchange' in window) {
 <span id="L434" class="LineNr">434 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
 <span id="L435" class="LineNr">435 </span><span class="Delimiter">}</span>
 <span id="L436" class="LineNr">436 </span><span class="Normal">void</span> test_compare_atom_with_non_atom<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L437" class="LineNr">437 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:address:number&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:boolean&quot;</span><span class="Delimiter">);</span>
+<span id="L437" class="LineNr">437 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L83'>address</a>:number&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:boolean&quot;</span><span class="Delimiter">);</span>
 <span id="L438" class="LineNr">438 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
 <span id="L439" class="LineNr">439 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
 <span id="L440" class="LineNr">440 </span><span class="Delimiter">}</span>
 <span id="L441" class="LineNr">441 </span><span class="Normal">void</span> test_compare_lists_with_identical_structure<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L442" class="LineNr">442 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:address:address&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:address:boolean&quot;</span><span class="Delimiter">);</span>
+<span id="L442" class="LineNr">442 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L83'>address</a>:address&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:<a href='043space.cc.html#L83'>address</a>:boolean&quot;</span><span class="Delimiter">);</span>
 <span id="L443" class="LineNr">443 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
 <span id="L444" class="LineNr">444 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
 <span id="L445" class="LineNr">445 </span><span class="Delimiter">}</span>
 <span id="L446" class="LineNr">446 </span><span class="Normal">void</span> test_compare_identical_lists<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L447" class="LineNr">447 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:address:boolean&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:address:boolean&quot;</span><span class="Delimiter">);</span>
+<span id="L447" class="LineNr">447 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L83'>address</a>:boolean&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:<a href='043space.cc.html#L83'>address</a>:boolean&quot;</span><span class="Delimiter">);</span>
 <span id="L448" class="LineNr">448 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
 <span id="L449" class="LineNr">449 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
 <span id="L450" class="LineNr">450 </span><span class="Delimiter">}</span>
 <span id="L451" class="LineNr">451 </span><span class="Normal">void</span> test_compare_list_with_extra_element<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L452" class="LineNr">452 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:address:address&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:address:address:number&quot;</span><span class="Delimiter">);</span>
+<span id="L452" class="LineNr">452 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L83'>address</a>:address&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:<a href='043space.cc.html#L83'>address</a>:<a href='043space.cc.html#L83'>address</a>:number&quot;</span><span class="Delimiter">);</span>
 <span id="L453" class="LineNr">453 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
 <span id="L454" class="LineNr">454 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
 <span id="L455" class="LineNr">455 </span><span class="Delimiter">}</span>
 <span id="L456" class="LineNr">456 </span><span class="Normal">void</span> test_compare_list_with_smaller_left_but_larger_right<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L457" class="LineNr">457 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:address:number&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:character:array&quot;</span><span class="Delimiter">);</span>
+<span id="L457" class="LineNr">457 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L83'>address</a>:number&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:character:array&quot;</span><span class="Delimiter">);</span>
 <span id="L458" class="LineNr">458 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
 <span id="L459" class="LineNr">459 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
 <span id="L460" class="LineNr">460 </span><span class="Delimiter">}</span>
 <span id="L461" class="LineNr">461 </span><span class="Normal">void</span> test_compare_list_with_smaller_left_but_larger_right_identical_types<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L462" class="LineNr">462 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:address:boolean&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:boolean:address&quot;</span><span class="Delimiter">);</span>
+<span id="L462" class="LineNr">462 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L83'>address</a>:boolean&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:boolean:address&quot;</span><span class="Delimiter">);</span>
 <span id="L463" class="LineNr">463 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
 <span id="L464" class="LineNr">464 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
 <span id="L465" class="LineNr">465 </span><span class="Delimiter">}</span>
@@ -658,11 +658,11 @@ if ('onhashchange' in window) {
 <span id="L594" class="LineNr">594 </span><span class="Comment">//: Use inspect() only for emitting a canonical format that can be parsed back</span>
 <span id="L595" class="LineNr">595 </span><span class="Comment">//: into the value.</span>
 <span id="L596" class="LineNr">596 </span>
-<span id="L597" class="LineNr">597 </span>string <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> recipe&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L597" class="LineNr">597 </span>string <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> recipe&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L598" class="LineNr">598 </span>  ostringstream out<span class="Delimiter">;</span>
 <span id="L599" class="LineNr">599 </span>  out &lt;&lt; <span class="Constant">&quot;recipe &quot;</span> &lt;&lt; r<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L600" class="LineNr">600 </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>r<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L601" class="LineNr">601 </span>  <span class="Conceal">¦</span> out &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L601" class="LineNr">601 </span>  <span class="Conceal">¦</span> out &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L602" class="LineNr">602 </span>  out &lt;&lt; <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L603" class="LineNr">603 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
 <span id="L604" class="LineNr">604 </span><span class="Delimiter">}</span>
@@ -682,7 +682,7 @@ if ('onhashchange' in window) {
 <span id="L618" class="LineNr">618 </span>  <span class="Comment">// Begin debug_string(recipe x)</span>
 <span id="L619" class="LineNr">619 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> index = <span class="Constant">0</span><span class="Delimiter">;</span>  index &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L620" class="LineNr">620 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> instruction&amp; inst = x<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>index<span class="Delimiter">);</span>
-<span id="L621" class="LineNr">621 </span>  <span class="Conceal">¦</span> out &lt;&lt; <span class="Constant">&quot;inst: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L621" class="LineNr">621 </span>  <span class="Conceal">¦</span> out &lt;&lt; <span class="Constant">&quot;inst: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L622" class="LineNr">622 </span>  <span class="Conceal">¦</span> out &lt;&lt; <span class="Constant">&quot;  ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L623" class="LineNr">623 </span>  <span class="Conceal">¦</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 id="L624" class="LineNr">624 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> out &lt;&lt; <span class="Constant">&quot;    &quot;</span> &lt;&lt; debug_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
@@ -711,30 +711,30 @@ if ('onhashchange' in window) {
 <span id="L647" class="LineNr">647 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
 <span id="L648" class="LineNr">648 </span><span class="Delimiter">}</span>
 <span id="L649" class="LineNr">649 </span>
-<span id="L650" class="LineNr">650 </span>string <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L650" class="LineNr">650 </span>string <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L651" class="LineNr">651 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>is_label<span class="Delimiter">)</span> <span class="Identifier">return</span> inst<span class="Delimiter">.</span>label<span class="Delimiter">;</span>
 <span id="L652" class="LineNr">652 </span>  ostringstream out<span class="Delimiter">;</span>
 <span id="L653" class="LineNr">653 </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 class="Delimiter">{</span>
 <span id="L654" class="LineNr">654 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">&quot;, &quot;</span><span class="Delimiter">;</span>
-<span id="L655" class="LineNr">655 </span>  <span class="Conceal">¦</span> out &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><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="L655" class="LineNr">655 </span>  <span class="Conceal">¦</span> out &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><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="L656" class="LineNr">656 </span>  <span class="Delimiter">}</span>
 <span id="L657" class="LineNr">657 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> out &lt;&lt; <span class="Constant">&quot; &lt;- &quot;</span><span class="Delimiter">;</span>
 <span id="L658" class="LineNr">658 </span>  out &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
 <span id="L659" class="LineNr">659 </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="L660" class="LineNr">660 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">&quot;, &quot;</span><span class="Delimiter">;</span>
-<span id="L661" class="LineNr">661 </span>  <span class="Conceal">¦</span> out &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</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 id="L661" class="LineNr">661 </span>  <span class="Conceal">¦</span> out &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</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 id="L662" class="LineNr">662 </span>  <span class="Delimiter">}</span>
 <span id="L663" class="LineNr">663 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
 <span id="L664" class="LineNr">664 </span><span class="Delimiter">}</span>
 <span id="L665" class="LineNr">665 </span>
-<span id="L666" class="LineNr">666 </span>string <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L666" class="LineNr">666 </span>string <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L667" class="LineNr">667 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_dummy<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;_&quot;</span><span class="Delimiter">;</span>
 <span id="L668" class="LineNr">668 </span>  ostringstream out<span class="Delimiter">;</span>
 <span id="L669" class="LineNr">669 </span>  out &lt;&lt; <span class="Constant">&quot;{&quot;</span><span class="Delimiter">;</span>
 <span id="L670" class="LineNr">670 </span>  out &lt;&lt; r<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
 <span id="L671" class="LineNr">671 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L672" class="LineNr">672 </span>  <span class="Conceal">¦</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>r<span class="Delimiter">.</span>properties<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L673" class="LineNr">673 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> out &lt;&lt; <span class="Constant">&quot;, </span><span class="cSpecial">\&quot;</span><span class="Constant">&quot;</span> &lt;&lt; r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>first &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\&quot;</span><span class="Constant">: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">);</span>
+<span id="L673" class="LineNr">673 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> out &lt;&lt; <span class="Constant">&quot;, </span><span class="cSpecial">\&quot;</span><span class="Constant">&quot;</span> &lt;&lt; r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>first &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\&quot;</span><span class="Constant">: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">);</span>
 <span id="L674" class="LineNr">674 </span>  <span class="Delimiter">}</span>
 <span id="L675" class="LineNr">675 </span>  out &lt;&lt; <span class="Constant">&quot;}&quot;</span><span class="Delimiter">;</span>
 <span id="L676" class="LineNr">676 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
@@ -747,11 +747,11 @@ if ('onhashchange' in window) {
 <span id="L683" class="LineNr">683 </span>
 <span id="L684" class="LineNr">684 </span>string debug_string<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L685" class="LineNr">685 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L686" class="LineNr">686 </span>  out &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>value &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; -- &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">);</span>
+<span id="L686" class="LineNr">686 </span>  out &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>value &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; -- &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">);</span>
 <span id="L687" class="LineNr">687 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
 <span id="L688" class="LineNr">688 </span><span class="Delimiter">}</span>
 <span id="L689" class="LineNr">689 </span>
-<span id="L690" class="LineNr">690 </span>string <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> string_tree* property<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L690" class="LineNr">690 </span>string <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> string_tree* property<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L691" class="LineNr">691 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!property<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">&quot;()&quot;</span><span class="Delimiter">;</span>
 <span id="L692" class="LineNr">692 </span>  ostringstream out<span class="Delimiter">;</span>
 <span id="L693" class="LineNr">693 </span>  dump<span class="Delimiter">(</span>property<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
@@ -779,7 +779,7 @@ if ('onhashchange' in window) {
 <span id="L715" class="LineNr">715 </span>  out &lt;&lt; <span class="Constant">')'</span><span class="Delimiter">;</span>
 <span id="L716" class="LineNr">716 </span><span class="Delimiter">}</span>
 <span id="L717" class="LineNr">717 </span>
-<span id="L718" class="LineNr">718 </span>string <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L718" class="LineNr">718 </span>string <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L719" class="LineNr">719 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type == <span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">&quot;()&quot;</span><span class="Delimiter">;</span>
 <span id="L720" class="LineNr">720 </span>  ostringstream out<span class="Delimiter">;</span>
 <span id="L721" class="LineNr">721 </span>  dump<span class="Delimiter">(</span>type<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
diff --git a/html/011load.cc.html b/html/011load.cc.html
index b332e42b..79e5215c 100644
--- a/html/011load.cc.html
+++ b/html/011load.cc.html
@@ -152,7 +152,7 @@ if ('onhashchange' in window) {
 <span id="L88" class="LineNr"> 88 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='011load.cc.html#L96'>next_instruction</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> &amp;curr<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L89" class="LineNr"> 89 </span>  <span class="Conceal">¦</span> curr<span class="Delimiter">.</span>original_string = to_original_string<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
 <span id="L90" class="LineNr"> 90 </span>  <span class="Conceal">¦</span> <span class="Comment">// End Rewrite Instruction(curr, recipe result)</span>
-<span id="L91" class="LineNr"> 91 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;after rewriting: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>curr<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L91" class="LineNr"> 91 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;after rewriting: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>curr<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L92" class="LineNr"> 92 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span>is_empty<span class="Delimiter">())</span> result<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
 <span id="L93" class="LineNr"> 93 </span>  <span class="Delimiter">}</span>
 <span id="L94" class="LineNr"> 94 </span><span class="Delimiter">}</span>
@@ -216,9 +216,9 @@ if ('onhashchange' in window) {
 <span id="L152" class="LineNr">152 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction: &quot;</span> &lt;&lt; curr<span class="Delimiter">-&gt;</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L153" class="LineNr">153 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  number of ingredients: &quot;</span> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>ingredients<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L154" class="LineNr">154 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;reagent&gt;::iterator p = curr<span class="Delimiter">-&gt;</span>ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != curr<span class="Delimiter">-&gt;</span>ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L155" class="LineNr">155 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  ingredient: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>*p<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L155" class="LineNr">155 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  ingredient: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>*p<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L156" class="LineNr">156 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;reagent&gt;::iterator p = curr<span class="Delimiter">-&gt;</span>products<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != curr<span class="Delimiter">-&gt;</span>products<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L157" class="LineNr">157 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  product: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>*p<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L157" class="LineNr">157 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  product: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>*p<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L158" class="LineNr">158 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L159" class="LineNr">159 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;9: unbalanced '[' for <a href='010vm.cc.html#L19'>recipe</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L160" class="LineNr">160 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
@@ -400,7 +400,7 @@ if ('onhashchange' in window) {
 <span id="L336" class="LineNr">336 </span>
 <span id="L337" class="LineNr">337 </span><span class="Delimiter">:(scenario parse_multiple_types)</span>
 <span id="L338" class="LineNr">338 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L339" class="LineNr">339 </span>  <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:address:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span><span class="Delimiter">,</span> <span class="Constant">4</span>:number
+<span id="L339" class="LineNr">339 </span>  <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span><span class="Delimiter">,</span> <span class="Constant">4</span>:number
 <span id="L340" class="LineNr">340 </span>]
 <span id="L341" class="LineNr">341 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
 <span id="L342" class="LineNr">342 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;}</span>
@@ -410,7 +410,7 @@ if ('onhashchange' in window) {
 <span id="L346" class="LineNr">346 </span>
 <span id="L347" class="LineNr">347 </span><span class="Delimiter">:(scenario parse_properties)</span>
 <span id="L348" class="LineNr">348 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L349" class="LineNr">349 </span>  <span class="Constant">1</span>:address:number/lookup<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
+<span id="L349" class="LineNr">349 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:number/lookup<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
 <span id="L350" class="LineNr">350 </span>]
 <span id="L351" class="LineNr">351 </span><span class="traceContains">+parse:   product: {1: (&quot;address&quot; &quot;number&quot;), &quot;lookup&quot;: ()}</span>
 <span id="L352" class="LineNr">352 </span>
diff --git a/html/014literal_string.cc.html b/html/014literal_string.cc.html
index 3dded1d8..508b4862 100644
--- a/html/014literal_string.cc.html
+++ b/html/014literal_string.cc.html
@@ -72,13 +72,13 @@ if ('onhashchange' in window) {
 <span id="L9" class="LineNr">  9 </span><span class="Delimiter">:(scenarios load)</span>
 <span id="L10" class="LineNr"> 10 </span><span class="Delimiter">:(scenario string_literal)</span>
 <span id="L11" class="LineNr"> 11 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L12" class="LineNr"> 12 </span>  <span class="Constant">1</span>:address:array:character<span class="Special"> &lt;- </span>copy [abc def]
+<span id="L12" class="LineNr"> 12 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:character<span class="Special"> &lt;- </span>copy [abc def]
 <span id="L13" class="LineNr"> 13 </span>]
 <span id="L14" class="LineNr"> 14 </span><span class="traceContains">+parse:   ingredient: {&quot;abc def&quot;: &quot;literal-string&quot;}</span>
 <span id="L15" class="LineNr"> 15 </span>
 <span id="L16" class="LineNr"> 16 </span><span class="Delimiter">:(scenario string_literal_with_colons)</span>
 <span id="L17" class="LineNr"> 17 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L18" class="LineNr"> 18 </span>  <span class="Constant">1</span>:address:array:character<span class="Special"> &lt;- </span>copy [abc:def/ghi]
+<span id="L18" class="LineNr"> 18 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:character<span class="Special"> &lt;- </span>copy [abc:def/ghi]
 <span id="L19" class="LineNr"> 19 </span>]
 <span id="L20" class="LineNr"> 20 </span><span class="traceContains">+parse:   ingredient: {&quot;abc:def/ghi&quot;: &quot;literal-string&quot;}</span>
 <span id="L21" class="LineNr"> 21 </span>
@@ -232,26 +232,26 @@ if ('onhashchange' in window) {
 <span id="L169" class="LineNr">169 </span>
 <span id="L170" class="LineNr">170 </span><span class="Delimiter">:(scenario string_literal_nested)</span>
 <span id="L171" class="LineNr">171 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L172" class="LineNr">172 </span>  <span class="Constant">1</span>:address:array:character<span class="Special"> &lt;- </span>copy [abc [def]]
+<span id="L172" class="LineNr">172 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:character<span class="Special"> &lt;- </span>copy [abc [def]]
 <span id="L173" class="LineNr">173 </span>]
 <span id="L174" class="LineNr">174 </span><span class="traceContains">+parse:   ingredient: {&quot;abc [def]&quot;: &quot;literal-string&quot;}</span>
 <span id="L175" class="LineNr">175 </span>
 <span id="L176" class="LineNr">176 </span><span class="Delimiter">:(scenario string_literal_escaped)</span>
 <span id="L177" class="LineNr">177 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L178" class="LineNr">178 </span>  <span class="Constant">1</span>:address:array:character<span class="Special"> &lt;- </span>copy [abc \[def]
+<span id="L178" class="LineNr">178 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:character<span class="Special"> &lt;- </span>copy [abc \[def]
 <span id="L179" class="LineNr">179 </span>]
 <span id="L180" class="LineNr">180 </span><span class="traceContains">+parse:   ingredient: {&quot;abc [def&quot;: &quot;literal-string&quot;}</span>
 <span id="L181" class="LineNr">181 </span>
 <span id="L182" class="LineNr">182 </span><span class="Delimiter">:(scenario string_literal_escaped_twice)</span>
 <span id="L183" class="LineNr">183 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L184" class="LineNr">184 </span>  <span class="Constant">1</span>:address:array:character<span class="Special"> &lt;- </span>copy [
+<span id="L184" class="LineNr">184 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:character<span class="Special"> &lt;- </span>copy [
 <span id="L185" class="LineNr">185 </span>abc \\[def]
 <span id="L186" class="LineNr">186 </span>]
 <span id="L187" class="LineNr">187 </span><span class="traceContains">+parse:   ingredient: {&quot;\nabc \[def&quot;: &quot;literal-string&quot;}</span>
 <span id="L188" class="LineNr">188 </span>
 <span id="L189" class="LineNr">189 </span><span class="Delimiter">:(scenario string_literal_and_comment)</span>
 <span id="L190" class="LineNr">190 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L191" class="LineNr">191 </span>  <span class="Constant">1</span>:address:array:character<span class="Special"> &lt;- </span>copy [abc]  <span class="Comment"># comment</span>
+<span id="L191" class="LineNr">191 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:character<span class="Special"> &lt;- </span>copy [abc]  <span class="Comment"># comment</span>
 <span id="L192" class="LineNr">192 </span>]
 <span id="L193" class="LineNr">193 </span><span class="traceContains">+parse: --- defining <a href='000organization.cc.html#L113'>main</a></span>
 <span id="L194" class="LineNr">194 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
diff --git a/html/017parse_tree.cc.html b/html/017parse_tree.cc.html
index 0867993b..31ae7e61 100644
--- a/html/017parse_tree.cc.html
+++ b/html/017parse_tree.cc.html
@@ -148,7 +148,7 @@ if ('onhashchange' in window) {
 <span id="L84" class="LineNr"> 84 </span><span class="Delimiter">:(scenario dilated_reagent_with_type_tree)</span>
 <span id="L85" class="LineNr"> 85 </span><span class="Special">% Hide_errors = true;  // 'map' isn't defined yet</span>
 <span id="L86" class="LineNr"> 86 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L87" class="LineNr"> 87 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>foo <span class="Delimiter">(</span>address array character<span class="Delimiter">)</span> <span class="Delimiter">(</span>bar number<span class="Delimiter">))}</span><span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L87" class="LineNr"> 87 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>foo <span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a> array character<span class="Delimiter">)</span> <span class="Delimiter">(</span>bar number<span class="Delimiter">))}</span><span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
 <span id="L88" class="LineNr"> 88 </span>]
 <span id="L89" class="LineNr"> 89 </span><span class="Comment"># just to avoid errors</span>
 <span id="L90" class="LineNr"> 90 </span><span class="muData">container</span> foo [
diff --git a/html/018type_abbreviations.cc.html b/html/018type_abbreviations.cc.html
index 67df9193..c7103cb5 100644
--- a/html/018type_abbreviations.cc.html
+++ b/html/018type_abbreviations.cc.html
@@ -156,7 +156,7 @@ if ('onhashchange' in window) {
 <span id="L91" class="LineNr"> 91 </span><span class="traceContains">+error: 'type' conflict: 'foo' defined as both 'bar' and 'baz'</span>
 <span id="L92" class="LineNr"> 92 </span>
 <span id="L93" class="LineNr"> 93 </span><span class="Delimiter">:(scenario type_abbreviation_for_compound)</span>
-<span id="L94" class="LineNr"> 94 </span><span class="muData">type</span> foo = address:number
+<span id="L94" class="LineNr"> 94 </span><span class="muData">type</span> foo = <a href='043space.cc.html#L83'>address</a>:number
 <span id="L95" class="LineNr"> 95 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L96" class="LineNr"> 96 </span>  <span class="Normal">a</span>:foo<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="L97" class="LineNr"> 97 </span>]
diff --git a/html/020run.cc.html b/html/020run.cc.html
index 418d1eae..ad332815 100644
--- a/html/020run.cc.html
+++ b/html/020run.cc.html
@@ -129,8 +129,8 @@ if ('onhashchange' in window) {
 <span id="L62" class="LineNr"> 62 </span><span class="Normal">void</span> run_current_routine<span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L63" class="LineNr"> 63 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='073scheduler.cc.html#L28'>should_continue_running</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">))</span> <span class="Delimiter">{</span>  <span class="Comment">// beware: may modify Current_routine</span>
 <span id="L64" class="LineNr"> 64 </span>  <span class="Conceal">¦</span> <span class="Comment">// Running One Instruction</span>
-<span id="L65" class="LineNr"> 65 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>is_label<span class="Delimiter">)</span> <span class="Delimiter">{</span> ++current_step_index<span class="Delimiter">();</span>  <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Delimiter">}</span>
-<span id="L66" class="LineNr"> 66 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span>Initial_callstack_depth + Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L65" class="LineNr"> 65 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>is_label<span class="Delimiter">)</span> <span class="Delimiter">{</span> ++current_step_index<span class="Delimiter">();</span>  <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Delimiter">}</span>
+<span id="L66" class="LineNr"> 66 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span>Initial_callstack_depth + Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L67" class="LineNr"> 67 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">)</span> != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L68" class="LineNr"> 68 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;something wrote to location 0; this should never happen</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L69" class="LineNr"> 69 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
@@ -138,8 +138,8 @@ if ('onhashchange' in window) {
 <span id="L71" class="LineNr"> 71 </span>  <span class="Conceal">¦</span> <span class="Comment">// read all ingredients from memory, each potentially spanning multiple locations</span>
 <span id="L72" class="LineNr"> 72 </span>  <span class="Conceal">¦</span> vector&lt;vector&lt;<span class="Normal">double</span>&gt; &gt; ingredients<span class="Delimiter">;</span>
 <span id="L73" class="LineNr"> 73 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>should_copy_ingredients<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L74" class="LineNr"> 74 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L75" class="LineNr"> 75 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>read_memory<span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)));</span>
+<span id="L74" class="LineNr"> 74 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L75" class="LineNr"> 75 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>read_memory<span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)));</span>
 <span id="L76" class="LineNr"> 76 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L77" class="LineNr"> 77 </span>  <span class="Conceal">¦</span> <span class="Comment">// instructions below will write to 'products'</span>
 <span id="L78" class="LineNr"> 78 </span>  <span class="Conceal">¦</span> vector&lt;vector&lt;<span class="Normal">double</span>&gt; &gt; products<span class="Delimiter">;</span>
@@ -149,7 +149,7 @@ if ('onhashchange' in window) {
 <span id="L82" class="LineNr"> 82 </span>  <span class="Conceal">¦</span> <span class="Comment">//: instruction.</span>
 <span id="L83" class="LineNr"> 83 </span>  <span class="Conceal">¦</span> <span class="Normal">bool</span> write_products = <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L84" class="LineNr"> 84 </span>  <span class="Conceal">¦</span> <span class="Normal">bool</span> fall_through_to_next_instruction = <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L85" class="LineNr"> 85 </span>  <span class="Conceal">¦</span> <span class="Normal">switch</span> <span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>operation<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L85" class="LineNr"> 85 </span>  <span class="Conceal">¦</span> <span class="Normal">switch</span> <span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>operation<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L86" class="LineNr"> 86 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// Primitive Recipe Implementations</span>
 <span id="L87" class="LineNr"> 87 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">case</span> <a href='010vm.cc.html#L189'>COPY</a>: <span class="Delimiter">{</span>
 <span id="L88" class="LineNr"> 88 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</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#L197'>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>
@@ -157,20 +157,20 @@ if ('onhashchange' in window) {
 <span id="L90" class="LineNr"> 90 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L91" class="LineNr"> 91 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// End Primitive Recipe Implementations</span>
 <span id="L92" class="LineNr"> 92 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">default</span>: <span class="Delimiter">{</span>
-<span id="L93" class="LineNr"> 93 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> cout &lt;&lt; <span class="Constant">&quot;not a primitive op: &quot;</span> &lt;&lt; <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>operation &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> cout &lt;&lt; <span class="Constant">&quot;not a primitive op: &quot;</span> &lt;&lt; <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>operation &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L94" class="LineNr"> 94 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L95" class="LineNr"> 95 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L96" class="LineNr"> 96 </span>  <span class="Conceal">¦</span> <span class="Comment">//: used by a later layer</span>
 <span id="L97" class="LineNr"> 97 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>write_products<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L98" class="LineNr"> 98 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> Writing_products_of_instruction = <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L99" class="LineNr"> 99 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>products<span class="Delimiter">)</span> &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L100" class="LineNr">100 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>products<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: failed to write to all products in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
-<span id="L101" class="LineNr">101 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L102" class="LineNr">102 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L103" class="LineNr">103 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</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><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L104" class="LineNr">104 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> write_memory<span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L105" class="LineNr">105 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L106" class="LineNr">106 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> Writing_products_of_instruction = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L98" class="LineNr"> 98 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>products<span class="Delimiter">)</span> &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L99" class="LineNr"> 99 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>products<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: failed to write to all products in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L100" class="LineNr">100 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L101" class="LineNr">101 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L102" class="LineNr">102 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</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><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// Writing Instruction Product(i)</span>
+<span id="L104" class="LineNr">104 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> write_memory<span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L105" class="LineNr">105 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L106" class="LineNr">106 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L107" class="LineNr">107 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L108" class="LineNr">108 </span>  <span class="Conceal">¦</span> <span class="Comment">// End Running One Instruction</span>
 <span id="L109" class="LineNr">109 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>fall_through_to_next_instruction<span class="Delimiter">)</span>
@@ -178,378 +178,376 @@ if ('onhashchange' in window) {
 <span id="L111" class="LineNr">111 </span>  <span class="Delimiter">}</span>
 <span id="L112" class="LineNr">112 </span>  <span class="Normal">stop_running_current_routine</span>:<span class="Delimiter">;</span>
 <span id="L113" class="LineNr">113 </span><span class="Delimiter">}</span>
-<span id="L114" class="LineNr">114 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L115" class="LineNr">115 </span><span class="Normal">bool</span> Writing_products_of_instruction = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L116" class="LineNr">116 </span>
-<span id="L117" class="LineNr">117 </span><span class="Delimiter">:(code)</span>
-<span id="L118" class="LineNr">118 </span><span class="Comment">//: hook replaced in a later layer</span>
-<span id="L119" class="LineNr">119 </span><span class="Normal">bool</span> <a href='073scheduler.cc.html#L28'>should_continue_running</a><span class="Delimiter">(</span><span class="Normal">const</span> routine* current_routine<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L120" class="LineNr">120 </span>  assert<span class="Delimiter">(</span>current_routine == Current_routine<span class="Delimiter">);</span>  <span class="Comment">// argument passed in just to make caller readable above</span>
-<span id="L121" class="LineNr">121 </span>  <span class="Identifier">return</span> !Current_routine<span class="Delimiter">-&gt;</span>completed<span class="Delimiter">();</span>
-<span id="L122" class="LineNr">122 </span><span class="Delimiter">}</span>
-<span id="L123" class="LineNr">123 </span>
-<span id="L124" class="LineNr">124 </span><span class="Normal">bool</span> should_copy_ingredients<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L125" class="LineNr">125 </span>  <span class="Comment">// End should_copy_ingredients Special-cases</span>
-<span id="L126" class="LineNr">126 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L127" class="LineNr">127 </span><span class="Delimiter">}</span>
-<span id="L128" class="LineNr">128 </span>
-<span id="L129" class="LineNr">129 </span><span class="Comment">//: Some helpers.</span>
-<span id="L130" class="LineNr">130 </span><span class="Comment">//: Important that they return references into the current routine.</span>
-<span id="L131" class="LineNr">131 </span>
-<span id="L132" class="LineNr">132 </span><span class="Comment">//: hook replaced in a later layer</span>
-<span id="L133" class="LineNr">133 </span><span class="Normal">int</span>&amp; <a href='026call.cc.html#L80'>current_step_index</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L134" class="LineNr">134 </span>  <span class="Identifier">return</span> Current_routine<span class="Delimiter">-&gt;</span>running_step_index<span class="Delimiter">;</span>
-<span id="L135" class="LineNr">135 </span><span class="Delimiter">}</span>
-<span id="L136" class="LineNr">136 </span>
-<span id="L137" class="LineNr">137 </span><span class="Comment">//: hook replaced in a later layer</span>
-<span id="L138" class="LineNr">138 </span><a href='010vm.cc.html#L14'>recipe_ordinal</a> <a href='026call.cc.html#L81'>currently_running_recipe</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L139" class="LineNr">139 </span>  <span class="Identifier">return</span> Current_routine<span class="Delimiter">-&gt;</span>running_recipe<span class="Delimiter">;</span>
-<span id="L140" class="LineNr">140 </span><span class="Delimiter">}</span>
-<span id="L141" class="LineNr">141 </span>
-<span id="L142" class="LineNr">142 </span><span class="Comment">//: hook replaced in a later layer</span>
-<span id="L143" class="LineNr">143 </span><span class="Normal">const</span> string&amp; <a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L144" class="LineNr">144 </span>  <span class="Identifier">return</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> Current_routine<span class="Delimiter">-&gt;</span>running_recipe<span class="Delimiter">).</span>name<span class="Delimiter">;</span>
-<span id="L145" class="LineNr">145 </span><span class="Delimiter">}</span>
-<span id="L146" class="LineNr">146 </span>
-<span id="L147" class="LineNr">147 </span><span class="Comment">//: hook replaced in a later layer</span>
-<span id="L148" class="LineNr">148 </span><span class="Normal">const</span> recipe&amp; <a href='026call.cc.html#L82'>current_recipe</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L149" class="LineNr">149 </span>  <span class="Identifier">return</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> Current_routine<span class="Delimiter">-&gt;</span>running_recipe<span class="Delimiter">);</span>
-<span id="L150" class="LineNr">150 </span><span class="Delimiter">}</span>
-<span id="L151" class="LineNr">151 </span>
-<span id="L152" class="LineNr">152 </span><span class="Comment">//: hook replaced in a later layer</span>
-<span id="L153" class="LineNr">153 </span><span class="Normal">const</span> instruction&amp; <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L154" class="LineNr">154 </span>  <span class="Identifier">return</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> Current_routine<span class="Delimiter">-&gt;</span>running_recipe<span class="Delimiter">).</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>running_step_index<span class="Delimiter">);</span>
-<span id="L155" class="LineNr">155 </span><span class="Delimiter">}</span>
-<span id="L156" class="LineNr">156 </span>
-<span id="L157" class="LineNr">157 </span><span class="Comment">//: hook replaced in a later layer</span>
-<span id="L158" class="LineNr">158 </span><span class="Normal">bool</span> routine::completed<span class="Delimiter">()</span> <span class="Normal">const</span> <span class="Delimiter">{</span>
-<span id="L159" class="LineNr">159 </span>  <span class="Identifier">return</span> running_step_index &gt;= <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> running_recipe<span class="Delimiter">).</span>steps<span class="Delimiter">);</span>
-<span id="L160" class="LineNr">160 </span><span class="Delimiter">}</span>
-<span id="L161" class="LineNr">161 </span>
-<span id="L162" class="LineNr">162 </span><span class="Comment">//: hook replaced in a later layer</span>
-<span id="L163" class="LineNr">163 </span><span class="Normal">const</span> vector&lt;instruction&gt;&amp; routine::steps<span class="Delimiter">()</span> <span class="Normal">const</span> <span class="Delimiter">{</span>
-<span id="L164" class="LineNr">164 </span>  <span class="Identifier">return</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> running_recipe<span class="Delimiter">).</span>steps<span class="Delimiter">;</span>
-<span id="L165" class="LineNr">165 </span><span class="Delimiter">}</span>
+<span id="L114" class="LineNr">114 </span>
+<span id="L115" class="LineNr">115 </span><span class="Delimiter">:(code)</span>
+<span id="L116" class="LineNr">116 </span><span class="Comment">//: hook replaced in a later layer</span>
+<span id="L117" class="LineNr">117 </span><span class="Normal">bool</span> <a href='073scheduler.cc.html#L28'>should_continue_running</a><span class="Delimiter">(</span><span class="Normal">const</span> routine* current_routine<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L118" class="LineNr">118 </span>  assert<span class="Delimiter">(</span>current_routine == Current_routine<span class="Delimiter">);</span>  <span class="Comment">// argument passed in just to make caller readable above</span>
+<span id="L119" class="LineNr">119 </span>  <span class="Identifier">return</span> !Current_routine<span class="Delimiter">-&gt;</span>completed<span class="Delimiter">();</span>
+<span id="L120" class="LineNr">120 </span><span class="Delimiter">}</span>
+<span id="L121" class="LineNr">121 </span>
+<span id="L122" class="LineNr">122 </span><span class="Normal">bool</span> should_copy_ingredients<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L123" class="LineNr">123 </span>  <span class="Comment">// End should_copy_ingredients Special-cases</span>
+<span id="L124" class="LineNr">124 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L125" class="LineNr">125 </span><span class="Delimiter">}</span>
+<span id="L126" class="LineNr">126 </span>
+<span id="L127" class="LineNr">127 </span><span class="Comment">//: Some helpers.</span>
+<span id="L128" class="LineNr">128 </span><span class="Comment">//: Important that they return references into the current routine.</span>
+<span id="L129" class="LineNr">129 </span>
+<span id="L130" class="LineNr">130 </span><span class="Comment">//: hook replaced in a later layer</span>
+<span id="L131" class="LineNr">131 </span><span class="Normal">int</span>&amp; <a href='026call.cc.html#L82'>current_step_index</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L132" class="LineNr">132 </span>  <span class="Identifier">return</span> Current_routine<span class="Delimiter">-&gt;</span>running_step_index<span class="Delimiter">;</span>
+<span id="L133" class="LineNr">133 </span><span class="Delimiter">}</span>
+<span id="L134" class="LineNr">134 </span>
+<span id="L135" class="LineNr">135 </span><span class="Comment">//: hook replaced in a later layer</span>
+<span id="L136" class="LineNr">136 </span><a href='010vm.cc.html#L14'>recipe_ordinal</a> <a href='026call.cc.html#L83'>currently_running_recipe</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L137" class="LineNr">137 </span>  <span class="Identifier">return</span> Current_routine<span class="Delimiter">-&gt;</span>running_recipe<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">//: hook replaced in a later layer</span>
+<span id="L141" class="LineNr">141 </span><span class="Normal">const</span> string&amp; <a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L142" class="LineNr">142 </span>  <span class="Identifier">return</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> Current_routine<span class="Delimiter">-&gt;</span>running_recipe<span class="Delimiter">).</span>name<span class="Delimiter">;</span>
+<span id="L143" class="LineNr">143 </span><span class="Delimiter">}</span>
+<span id="L144" class="LineNr">144 </span>
+<span id="L145" class="LineNr">145 </span><span class="Comment">//: hook replaced in a later layer</span>
+<span id="L146" class="LineNr">146 </span><span class="Normal">const</span> recipe&amp; <a href='026call.cc.html#L84'>current_recipe</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L147" class="LineNr">147 </span>  <span class="Identifier">return</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> Current_routine<span class="Delimiter">-&gt;</span>running_recipe<span class="Delimiter">);</span>
+<span id="L148" class="LineNr">148 </span><span class="Delimiter">}</span>
+<span id="L149" class="LineNr">149 </span>
+<span id="L150" class="LineNr">150 </span><span class="Comment">//: hook replaced in a later layer</span>
+<span id="L151" class="LineNr">151 </span><span class="Normal">const</span> instruction&amp; <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L152" class="LineNr">152 </span>  <span class="Identifier">return</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> Current_routine<span class="Delimiter">-&gt;</span>running_recipe<span class="Delimiter">).</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>running_step_index<span class="Delimiter">);</span>
+<span id="L153" class="LineNr">153 </span><span class="Delimiter">}</span>
+<span id="L154" class="LineNr">154 </span>
+<span id="L155" class="LineNr">155 </span><span class="Comment">//: hook replaced in a later layer</span>
+<span id="L156" class="LineNr">156 </span><span class="Normal">bool</span> routine::completed<span class="Delimiter">()</span> <span class="Normal">const</span> <span class="Delimiter">{</span>
+<span id="L157" class="LineNr">157 </span>  <span class="Identifier">return</span> running_step_index &gt;= <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> running_recipe<span class="Delimiter">).</span>steps<span class="Delimiter">);</span>
+<span id="L158" class="LineNr">158 </span><span class="Delimiter">}</span>
+<span id="L159" class="LineNr">159 </span>
+<span id="L160" class="LineNr">160 </span><span class="Comment">//: hook replaced in a later layer</span>
+<span id="L161" class="LineNr">161 </span><span class="Normal">const</span> vector&lt;instruction&gt;&amp; routine::steps<span class="Delimiter">()</span> <span class="Normal">const</span> <span class="Delimiter">{</span>
+<span id="L162" class="LineNr">162 </span>  <span class="Identifier">return</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> running_recipe<span class="Delimiter">).</span>steps<span class="Delimiter">;</span>
+<span id="L163" class="LineNr">163 </span><span class="Delimiter">}</span>
+<span id="L164" class="LineNr">164 </span>
+<span id="L165" class="LineNr">165 </span><span class="SalientComment">//:: Startup flow</span>
 <span id="L166" class="LineNr">166 </span>
-<span id="L167" class="LineNr">167 </span><span class="SalientComment">//:: Startup flow</span>
-<span id="L168" class="LineNr">168 </span>
-<span id="L169" class="LineNr">169 </span><span class="Comment">//: Step 1: load all .mu files with numeric prefixes (in order)</span>
-<span id="L170" class="LineNr">170 </span><span class="Delimiter">:(before &quot;End Load Recipes&quot;)</span>
-<span id="L171" class="LineNr">171 </span><span class="Comment">// Load Mu Prelude</span>
-<span id="L172" class="LineNr">172 </span><span class="CommentedCode">//? Save_trace = true;</span>
-<span id="L173" class="LineNr">173 </span><span class="CommentedCode">//? START_TRACING_UNTIL_END_OF_SCOPE;</span>
-<span id="L174" class="LineNr">174 </span>load_file_or_directory<span class="Delimiter">(</span><span class="Constant">&quot;core.mu&quot;</span><span class="Delimiter">);</span>
-<span id="L175" class="LineNr">175 </span><span class="CommentedCode">//? DUMP(&quot;&quot;);</span>
-<span id="L176" class="LineNr">176 </span><span class="CommentedCode">//? exit(0);</span>
-<span id="L177" class="LineNr">177 </span>
-<span id="L178" class="LineNr">178 </span><span class="Comment">//: Step 2: load any .mu files provided at the commandline</span>
-<span id="L179" class="LineNr">179 </span><span class="Delimiter">:(before &quot;End Commandline Parsing&quot;)</span>
-<span id="L180" class="LineNr">180 </span><span class="Comment">// Check For .mu Files</span>
-<span id="L181" class="LineNr">181 </span><span class="CommentedCode">//? START_TRACING_UNTIL_END_OF_SCOPE</span>
-<span id="L182" class="LineNr">182 </span><span class="CommentedCode">//? Dump_trace = true;</span>
-<span id="L183" class="LineNr">183 </span><span class="Normal">if</span> <span class="Delimiter">(</span>argc &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L184" class="LineNr">184 </span>  <span class="Comment">// skip argv[0]</span>
-<span id="L185" class="LineNr">185 </span>  ++argv<span class="Delimiter">;</span>
-<span id="L186" class="LineNr">186 </span>  --argc<span class="Delimiter">;</span>
-<span id="L187" class="LineNr">187 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>argc &gt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L188" class="LineNr">188 </span>  <span class="Conceal">¦</span> <span class="Comment">// ignore argv past '--'; that's commandline args for 'main'</span>
-<span id="L189" class="LineNr">189 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>string<span class="Delimiter">(</span>*argv<span class="Delimiter">)</span> == <span class="Constant">&quot;--&quot;</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L190" class="LineNr">190 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L77'>starts_with</a><span class="Delimiter">(</span>*argv<span class="Delimiter">,</span> <span class="Constant">&quot;--&quot;</span><span class="Delimiter">))</span>
-<span id="L191" class="LineNr">191 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;treating &quot;</span> &lt;&lt; *argv &lt;&lt; <span class="Constant">&quot; as a file rather than an option</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L192" class="LineNr">192 </span>  <span class="Conceal">¦</span> load_file_or_directory<span class="Delimiter">(</span>*argv<span class="Delimiter">);</span>
-<span id="L193" class="LineNr">193 </span>  <span class="Conceal">¦</span> --argc<span class="Delimiter">;</span>
-<span id="L194" class="LineNr">194 </span>  <span class="Conceal">¦</span> ++argv<span class="Delimiter">;</span>
-<span id="L195" class="LineNr">195 </span>  <span class="Delimiter">}</span>
-<span id="L196" class="LineNr">196 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Run_tests<span class="Delimiter">)</span> Recipe<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;main&quot;</span><span class="Delimiter">));</span>
-<span id="L197" class="LineNr">197 </span><span class="Delimiter">}</span>
-<span id="L198" class="LineNr">198 </span><a href='012transform.cc.html#L46'>transform_all</a><span class="Delimiter">();</span>
-<span id="L199" class="LineNr">199 </span><span class="CommentedCode">//? cerr &lt;&lt; to_original_string(get(Type_ordinal, &quot;editor&quot;)) &lt;&lt; '\n';</span>
-<span id="L200" class="LineNr">200 </span><span class="CommentedCode">//? cerr &lt;&lt; to_original_string(get(Recipe, get(Recipe_ordinal, &quot;event-loop&quot;))) &lt;&lt; '\n';</span>
-<span id="L201" class="LineNr">201 </span><span class="CommentedCode">//? DUMP(&quot;&quot;);</span>
-<span id="L202" class="LineNr">202 </span><span class="CommentedCode">//? exit(0);</span>
-<span id="L203" class="LineNr">203 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L192'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L204" class="LineNr">204 </span>save_snapshots<span class="Delimiter">();</span>
-<span id="L205" class="LineNr">205 </span>
-<span id="L206" class="LineNr">206 </span><span class="Comment">//: Step 3: if we aren't running tests, locate a recipe called 'main' and</span>
-<span id="L207" class="LineNr">207 </span><span class="Comment">//: start running it.</span>
-<span id="L208" class="LineNr">208 </span><span class="Delimiter">:(before &quot;End Main&quot;)</span>
-<span id="L209" class="LineNr">209 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!Run_tests &amp;&amp; contains_key<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;main&quot;</span><span class="Delimiter">)</span> &amp;&amp; contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;main&quot;</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L210" class="LineNr">210 </span>  <span class="Comment">// Running Main</span>
-<span id="L211" class="LineNr">211 </span>  <a href='000organization.cc.html#L134'>reset</a><span class="Delimiter">();</span>
-<span id="L212" class="LineNr">212 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Start_tracing<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L213" class="LineNr">213 </span>  <span class="Conceal">¦</span> Trace_stream = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span>
-<span id="L214" class="LineNr">214 </span>  <span class="Conceal">¦</span> Save_trace = <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L215" class="LineNr">215 </span>  <span class="Delimiter">}</span>
-<span id="L216" class="LineNr">216 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;=== Starting to run&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L217" class="LineNr">217 </span>  assert<span class="Delimiter">(</span>Num_calls_to_transform_all == <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L218" class="LineNr">218 </span>  <a href='073scheduler.cc.html#L122'>run_main</a><span class="Delimiter">(</span>argc<span class="Delimiter">,</span> argv<span class="Delimiter">);</span>
-<span id="L219" class="LineNr">219 </span><span class="Delimiter">}</span>
-<span id="L220" class="LineNr">220 </span><span class="Delimiter">:(code)</span>
-<span id="L221" class="LineNr">221 </span><span class="Normal">void</span> <a href='073scheduler.cc.html#L122'>run_main</a><span class="Delimiter">(</span><span class="Normal">int</span> argc<span class="Delimiter">,</span> <span class="Normal">char</span>* argv[]<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L222" class="LineNr">222 </span>  <a href='010vm.cc.html#L14'>recipe_ordinal</a> r = get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;main&quot;</span><span class="Delimiter">);</span>
-<span id="L223" class="LineNr">223 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">)</span> run<span class="Delimiter">(</span>r<span class="Delimiter">);</span>
-<span id="L224" class="LineNr">224 </span><span class="Delimiter">}</span>
-<span id="L225" class="LineNr">225 </span>
-<span id="L226" class="LineNr">226 </span><span class="Comment">//: By default we don't maintain the trace while running main because its</span>
-<span id="L227" class="LineNr">227 </span><span class="Comment">//: overheads can grow rapidly. However, it's useful when debugging.</span>
-<span id="L228" class="LineNr">228 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L229" class="LineNr">229 </span><span class="Normal">bool</span> Start_tracing = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L230" class="LineNr">230 </span><span class="Delimiter">:(before &quot;End Commandline Options(*arg)&quot;)</span>
-<span id="L231" class="LineNr">231 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L73'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">&quot;--trace&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L232" class="LineNr">232 </span>  Start_tracing = <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L233" class="LineNr">233 </span><span class="Delimiter">}</span>
-<span id="L234" class="LineNr">234 </span>
-<span id="L235" class="LineNr">235 </span><span class="Delimiter">:(code)</span>
-<span id="L236" class="LineNr">236 </span><span class="Normal">void</span> cleanup_main<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L237" class="LineNr">237 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Save_trace &amp;&amp; Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L238" class="LineNr">238 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;writing <a href='003trace.cc.html#L161'>trace</a> to 'last_run'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L239" class="LineNr">239 </span>  <span class="Conceal">¦</span> ofstream fout<span class="Delimiter">(</span><span class="Constant">&quot;last_run&quot;</span><span class="Delimiter">);</span>
-<span id="L240" class="LineNr">240 </span>  <span class="Conceal">¦</span> fout &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L143'>readable_contents</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L241" class="LineNr">241 </span>  <span class="Conceal">¦</span> fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
-<span id="L242" class="LineNr">242 </span>  <span class="Delimiter">}</span>
-<span id="L243" class="LineNr">243 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Normal">delete</span> Trace_stream<span class="Delimiter">,</span> Trace_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L244" class="LineNr">244 </span><span class="Delimiter">}</span>
-<span id="L245" class="LineNr">245 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L246" class="LineNr">246 </span>atexit<span class="Delimiter">(</span>cleanup_main<span class="Delimiter">);</span>
-<span id="L247" class="LineNr">247 </span>
-<span id="L248" class="LineNr">248 </span><span class="Delimiter">:(code)</span>
-<span id="L249" class="LineNr">249 </span><span class="Normal">void</span> load_file_or_directory<span class="Delimiter">(</span>string filename<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L250" class="LineNr">250 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_directory<span class="Delimiter">(</span>filename<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L251" class="LineNr">251 </span>  <span class="Conceal">¦</span> load_all<span class="Delimiter">(</span>filename<span class="Delimiter">);</span>
-<span id="L252" class="LineNr">252 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L253" class="LineNr">253 </span>  <span class="Delimiter">}</span>
-<span id="L254" class="LineNr">254 </span>  ifstream fin<span class="Delimiter">(</span>filename<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
-<span id="L255" class="LineNr">255 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!fin<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L256" class="LineNr">256 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;no such file '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  <span class="Comment">// don't raise, just warn. just in case it's just a name for a scenario to run.</span>
-<span id="L257" class="LineNr">257 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L258" class="LineNr">258 </span>  <span class="Delimiter">}</span>
-<span id="L259" class="LineNr">259 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9990</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;=== &quot;</span> &lt;&lt; filename &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L260" class="LineNr">260 </span>  load<span class="Delimiter">(</span>fin<span class="Delimiter">);</span>
-<span id="L261" class="LineNr">261 </span>  fin<span class="Delimiter">.</span>close<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> is_directory<span class="Delimiter">(</span>string path<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L265" class="LineNr">265 </span>  <span class="Normal">struct</span> stat info<span class="Delimiter">;</span>
-<span id="L266" class="LineNr">266 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>stat<span class="Delimiter">(</span>path<span class="Delimiter">.</span>c_str<span class="Delimiter">(),</span> &amp;info<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// error</span>
-<span id="L267" class="LineNr">267 </span>  <span class="Identifier">return</span> info<span class="Delimiter">.</span>st_mode &amp; S_IFDIR<span class="Delimiter">;</span>
-<span id="L268" class="LineNr">268 </span><span class="Delimiter">}</span>
-<span id="L269" class="LineNr">269 </span>
-<span id="L270" class="LineNr">270 </span><span class="Normal">void</span> load_all<span class="Delimiter">(</span>string dir<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L271" class="LineNr">271 </span>  dirent** files<span class="Delimiter">;</span>
-<span id="L272" class="LineNr">272 </span>  <span class="Normal">int</span> num_files = scandir<span class="Delimiter">(</span>dir<span class="Delimiter">.</span>c_str<span class="Delimiter">(),</span> &amp;files<span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">,</span> alphasort<span class="Delimiter">);</span>
-<span id="L273" class="LineNr">273 </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; num_files<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L274" class="LineNr">274 </span>  <span class="Conceal">¦</span> string curr_file = files[i]<span class="Delimiter">-&gt;</span>d_name<span class="Delimiter">;</span>
-<span id="L275" class="LineNr">275 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>isdigit<span class="Delimiter">(</span>curr_file<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span>
-<span id="L276" class="LineNr">276 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> load_file_or_directory<span class="Delimiter">(</span>dir+<span class="Constant">'/'</span>+curr_file<span class="Delimiter">);</span>
-<span id="L277" class="LineNr">277 </span>  <span class="Conceal">¦</span> free<span class="Delimiter">(</span>files[i]<span class="Delimiter">);</span>
-<span id="L278" class="LineNr">278 </span>  <span class="Conceal">¦</span> files[i] = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L279" class="LineNr">279 </span>  <span class="Delimiter">}</span>
-<span id="L280" class="LineNr">280 </span>  free<span class="Delimiter">(</span>files<span class="Delimiter">);</span>
-<span id="L281" class="LineNr">281 </span><span class="Delimiter">}</span>
-<span id="L282" class="LineNr">282 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L283" class="LineNr">283 </span><span class="PreProc">#include </span><span class="Constant">&lt;dirent.h&gt;</span>
-<span id="L284" class="LineNr">284 </span><span class="PreProc">#include </span><span class="Constant">&lt;sys/stat.h&gt;</span>
+<span id="L167" class="LineNr">167 </span><span class="Comment">//: Step 1: load all .mu files with numeric prefixes (in order)</span>
+<span id="L168" class="LineNr">168 </span><span class="Delimiter">:(before &quot;End Load Recipes&quot;)</span>
+<span id="L169" class="LineNr">169 </span><span class="Comment">// Load Mu Prelude</span>
+<span id="L170" class="LineNr">170 </span><span class="CommentedCode">//? Save_trace = true;</span>
+<span id="L171" class="LineNr">171 </span><span class="CommentedCode">//? START_TRACING_UNTIL_END_OF_SCOPE;</span>
+<span id="L172" class="LineNr">172 </span>load_file_or_directory<span class="Delimiter">(</span><span class="Constant">&quot;core.mu&quot;</span><span class="Delimiter">);</span>
+<span id="L173" class="LineNr">173 </span><span class="CommentedCode">//? DUMP(&quot;&quot;);</span>
+<span id="L174" class="LineNr">174 </span><span class="CommentedCode">//? exit(0);</span>
+<span id="L175" class="LineNr">175 </span>
+<span id="L176" class="LineNr">176 </span><span class="Comment">//: Step 2: load any .mu files provided at the commandline</span>
+<span id="L177" class="LineNr">177 </span><span class="Delimiter">:(before &quot;End Commandline Parsing&quot;)</span>
+<span id="L178" class="LineNr">178 </span><span class="Comment">// Check For .mu Files</span>
+<span id="L179" class="LineNr">179 </span><span class="CommentedCode">//? START_TRACING_UNTIL_END_OF_SCOPE</span>
+<span id="L180" class="LineNr">180 </span><span class="CommentedCode">//? Dump_trace = true;</span>
+<span id="L181" class="LineNr">181 </span><span class="Normal">if</span> <span class="Delimiter">(</span>argc &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L182" class="LineNr">182 </span>  <span class="Comment">// skip argv[0]</span>
+<span id="L183" class="LineNr">183 </span>  ++argv<span class="Delimiter">;</span>
+<span id="L184" class="LineNr">184 </span>  --argc<span class="Delimiter">;</span>
+<span id="L185" class="LineNr">185 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>argc &gt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L186" class="LineNr">186 </span>  <span class="Conceal">¦</span> <span class="Comment">// ignore argv past '--'; that's commandline args for 'main'</span>
+<span id="L187" class="LineNr">187 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>string<span class="Delimiter">(</span>*argv<span class="Delimiter">)</span> == <span class="Constant">&quot;--&quot;</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L188" class="LineNr">188 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L77'>starts_with</a><span class="Delimiter">(</span>*argv<span class="Delimiter">,</span> <span class="Constant">&quot;--&quot;</span><span class="Delimiter">))</span>
+<span id="L189" class="LineNr">189 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;treating &quot;</span> &lt;&lt; *argv &lt;&lt; <span class="Constant">&quot; as a file rather than an option</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L190" class="LineNr">190 </span>  <span class="Conceal">¦</span> load_file_or_directory<span class="Delimiter">(</span>*argv<span class="Delimiter">);</span>
+<span id="L191" class="LineNr">191 </span>  <span class="Conceal">¦</span> --argc<span class="Delimiter">;</span>
+<span id="L192" class="LineNr">192 </span>  <span class="Conceal">¦</span> ++argv<span class="Delimiter">;</span>
+<span id="L193" class="LineNr">193 </span>  <span class="Delimiter">}</span>
+<span id="L194" class="LineNr">194 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Run_tests<span class="Delimiter">)</span> Recipe<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;main&quot;</span><span class="Delimiter">));</span>
+<span id="L195" class="LineNr">195 </span><span class="Delimiter">}</span>
+<span id="L196" class="LineNr">196 </span><a href='012transform.cc.html#L46'>transform_all</a><span class="Delimiter">();</span>
+<span id="L197" class="LineNr">197 </span><span class="CommentedCode">//? cerr &lt;&lt; to_original_string(get(Type_ordinal, &quot;editor&quot;)) &lt;&lt; '\n';</span>
+<span id="L198" class="LineNr">198 </span><span class="CommentedCode">//? cerr &lt;&lt; to_original_string(get(Recipe, get(Recipe_ordinal, &quot;event-loop&quot;))) &lt;&lt; '\n';</span>
+<span id="L199" class="LineNr">199 </span><span class="CommentedCode">//? DUMP(&quot;&quot;);</span>
+<span id="L200" class="LineNr">200 </span><span class="CommentedCode">//? exit(0);</span>
+<span id="L201" class="LineNr">201 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L192'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L202" class="LineNr">202 </span>save_snapshots<span class="Delimiter">();</span>
+<span id="L203" class="LineNr">203 </span>
+<span id="L204" class="LineNr">204 </span><span class="Comment">//: Step 3: if we aren't running tests, locate a recipe called 'main' and</span>
+<span id="L205" class="LineNr">205 </span><span class="Comment">//: start running it.</span>
+<span id="L206" class="LineNr">206 </span><span class="Delimiter">:(before &quot;End Main&quot;)</span>
+<span id="L207" class="LineNr">207 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!Run_tests &amp;&amp; contains_key<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;main&quot;</span><span class="Delimiter">)</span> &amp;&amp; contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;main&quot;</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
+<span id="L208" class="LineNr">208 </span>  <span class="Comment">// Running Main</span>
+<span id="L209" class="LineNr">209 </span>  <a href='000organization.cc.html#L134'>reset</a><span class="Delimiter">();</span>
+<span id="L210" class="LineNr">210 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Start_tracing<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L211" class="LineNr">211 </span>  <span class="Conceal">¦</span> Trace_stream = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span>
+<span id="L212" class="LineNr">212 </span>  <span class="Conceal">¦</span> Save_trace = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L213" class="LineNr">213 </span>  <span class="Delimiter">}</span>
+<span id="L214" class="LineNr">214 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;=== Starting to run&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L215" class="LineNr">215 </span>  assert<span class="Delimiter">(</span>Num_calls_to_transform_all == <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L216" class="LineNr">216 </span>  <a href='073scheduler.cc.html#L122'>run_main</a><span class="Delimiter">(</span>argc<span class="Delimiter">,</span> argv<span class="Delimiter">);</span>
+<span id="L217" class="LineNr">217 </span><span class="Delimiter">}</span>
+<span id="L218" class="LineNr">218 </span><span class="Delimiter">:(code)</span>
+<span id="L219" class="LineNr">219 </span><span class="Normal">void</span> <a href='073scheduler.cc.html#L122'>run_main</a><span class="Delimiter">(</span><span class="Normal">int</span> argc<span class="Delimiter">,</span> <span class="Normal">char</span>* argv[]<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L220" class="LineNr">220 </span>  <a href='010vm.cc.html#L14'>recipe_ordinal</a> r = get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;main&quot;</span><span class="Delimiter">);</span>
+<span id="L221" class="LineNr">221 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">)</span> run<span class="Delimiter">(</span>r<span class="Delimiter">);</span>
+<span id="L222" class="LineNr">222 </span><span class="Delimiter">}</span>
+<span id="L223" class="LineNr">223 </span>
+<span id="L224" class="LineNr">224 </span><span class="Comment">//: By default we don't maintain the trace while running main because its</span>
+<span id="L225" class="LineNr">225 </span><span class="Comment">//: overheads can grow rapidly. However, it's useful when debugging.</span>
+<span id="L226" class="LineNr">226 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L227" class="LineNr">227 </span><span class="Normal">bool</span> Start_tracing = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L228" class="LineNr">228 </span><span class="Delimiter">:(before &quot;End Commandline Options(*arg)&quot;)</span>
+<span id="L229" class="LineNr">229 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L73'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">&quot;--trace&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L230" class="LineNr">230 </span>  Start_tracing = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L231" class="LineNr">231 </span><span class="Delimiter">}</span>
+<span id="L232" class="LineNr">232 </span>
+<span id="L233" class="LineNr">233 </span><span class="Delimiter">:(code)</span>
+<span id="L234" class="LineNr">234 </span><span class="Normal">void</span> cleanup_main<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L235" class="LineNr">235 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Save_trace &amp;&amp; Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L236" class="LineNr">236 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;writing <a href='003trace.cc.html#L161'>trace</a> to 'last_run'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L237" class="LineNr">237 </span>  <span class="Conceal">¦</span> ofstream fout<span class="Delimiter">(</span><span class="Constant">&quot;last_run&quot;</span><span class="Delimiter">);</span>
+<span id="L238" class="LineNr">238 </span>  <span class="Conceal">¦</span> fout &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L143'>readable_contents</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L239" class="LineNr">239 </span>  <span class="Conceal">¦</span> fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
+<span id="L240" class="LineNr">240 </span>  <span class="Delimiter">}</span>
+<span id="L241" class="LineNr">241 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Normal">delete</span> Trace_stream<span class="Delimiter">,</span> Trace_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L242" class="LineNr">242 </span><span class="Delimiter">}</span>
+<span id="L243" class="LineNr">243 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L244" class="LineNr">244 </span>atexit<span class="Delimiter">(</span>cleanup_main<span class="Delimiter">);</span>
+<span id="L245" class="LineNr">245 </span>
+<span id="L246" class="LineNr">246 </span><span class="Delimiter">:(code)</span>
+<span id="L247" class="LineNr">247 </span><span class="Normal">void</span> load_file_or_directory<span class="Delimiter">(</span>string filename<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L248" class="LineNr">248 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_directory<span class="Delimiter">(</span>filename<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L249" class="LineNr">249 </span>  <span class="Conceal">¦</span> load_all<span class="Delimiter">(</span>filename<span class="Delimiter">);</span>
+<span id="L250" class="LineNr">250 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L251" class="LineNr">251 </span>  <span class="Delimiter">}</span>
+<span id="L252" class="LineNr">252 </span>  ifstream fin<span class="Delimiter">(</span>filename<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
+<span id="L253" class="LineNr">253 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!fin<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L254" class="LineNr">254 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;no such file '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  <span class="Comment">// don't raise, just warn. just in case it's just a name for a scenario to run.</span>
+<span id="L255" class="LineNr">255 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L256" class="LineNr">256 </span>  <span class="Delimiter">}</span>
+<span id="L257" class="LineNr">257 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9990</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;=== &quot;</span> &lt;&lt; filename &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L258" class="LineNr">258 </span>  load<span class="Delimiter">(</span>fin<span class="Delimiter">);</span>
+<span id="L259" class="LineNr">259 </span>  fin<span class="Delimiter">.</span>close<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> is_directory<span class="Delimiter">(</span>string path<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L263" class="LineNr">263 </span>  <span class="Normal">struct</span> stat info<span class="Delimiter">;</span>
+<span id="L264" class="LineNr">264 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>stat<span class="Delimiter">(</span>path<span class="Delimiter">.</span>c_str<span class="Delimiter">(),</span> &amp;info<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// error</span>
+<span id="L265" class="LineNr">265 </span>  <span class="Identifier">return</span> info<span class="Delimiter">.</span>st_mode &amp; S_IFDIR<span class="Delimiter">;</span>
+<span id="L266" class="LineNr">266 </span><span class="Delimiter">}</span>
+<span id="L267" class="LineNr">267 </span>
+<span id="L268" class="LineNr">268 </span><span class="Normal">void</span> load_all<span class="Delimiter">(</span>string dir<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L269" class="LineNr">269 </span>  dirent** files<span class="Delimiter">;</span>
+<span id="L270" class="LineNr">270 </span>  <span class="Normal">int</span> num_files = scandir<span class="Delimiter">(</span>dir<span class="Delimiter">.</span>c_str<span class="Delimiter">(),</span> &amp;files<span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">,</span> alphasort<span class="Delimiter">);</span>
+<span id="L271" class="LineNr">271 </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; num_files<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L272" class="LineNr">272 </span>  <span class="Conceal">¦</span> string curr_file = files[i]<span class="Delimiter">-&gt;</span>d_name<span class="Delimiter">;</span>
+<span id="L273" class="LineNr">273 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>isdigit<span class="Delimiter">(</span>curr_file<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span>
+<span id="L274" class="LineNr">274 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> load_file_or_directory<span class="Delimiter">(</span>dir+<span class="Constant">'/'</span>+curr_file<span class="Delimiter">);</span>
+<span id="L275" class="LineNr">275 </span>  <span class="Conceal">¦</span> free<span class="Delimiter">(</span>files[i]<span class="Delimiter">);</span>
+<span id="L276" class="LineNr">276 </span>  <span class="Conceal">¦</span> files[i] = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L277" class="LineNr">277 </span>  <span class="Delimiter">}</span>
+<span id="L278" class="LineNr">278 </span>  free<span class="Delimiter">(</span>files<span class="Delimiter">);</span>
+<span id="L279" class="LineNr">279 </span><span class="Delimiter">}</span>
+<span id="L280" class="LineNr">280 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L281" class="LineNr">281 </span><span class="PreProc">#include </span><span class="Constant">&lt;dirent.h&gt;</span>
+<span id="L282" class="LineNr">282 </span><span class="PreProc">#include </span><span class="Constant">&lt;sys/stat.h&gt;</span>
+<span id="L283" class="LineNr">283 </span>
+<span id="L284" class="LineNr">284 </span><span class="SalientComment">//:: Reading from memory, writing to memory.</span>
 <span id="L285" class="LineNr">285 </span>
-<span id="L286" class="LineNr">286 </span><span class="SalientComment">//:: Reading from memory, writing to memory.</span>
-<span id="L287" class="LineNr">287 </span>
-<span id="L288" class="LineNr">288 </span><span class="Delimiter">:(code)</span>
-<span id="L289" class="LineNr">289 </span>vector&lt;<span class="Normal">double</span>&gt; read_memory<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="L290" class="LineNr">290 </span>  <span class="Comment">// Begin Preprocess read_memory(x)</span>
-<span id="L291" class="LineNr">291 </span>  vector&lt;<span class="Normal">double</span>&gt; result<span class="Delimiter">;</span>
-<span id="L292" class="LineNr">292 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L293" class="LineNr">293 </span>  <span class="Conceal">¦</span> result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>x<span class="Delimiter">.</span>value<span class="Delimiter">);</span>
-<span id="L294" class="LineNr">294 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L295" class="LineNr">295 </span>  <span class="Delimiter">}</span>
-<span id="L296" class="LineNr">296 </span>  <span class="Comment">// End Preprocess read_memory(x)</span>
-<span id="L297" class="LineNr">297 </span>  <span class="Normal">int</span> size = size_of<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
-<span id="L298" class="LineNr">298 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> offset = <span class="Constant">0</span><span class="Delimiter">;</span>  offset &lt; size<span class="Delimiter">;</span>  ++offset<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L299" class="LineNr">299 </span>  <span class="Conceal">¦</span> <span class="Normal">double</span> val = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> x<span class="Delimiter">.</span>value+offset<span class="Delimiter">);</span>
-<span id="L300" class="LineNr">300 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;location &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>value+offset &lt;&lt; <span class="Constant">&quot; is &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>val<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L301" class="LineNr">301 </span>  <span class="Conceal">¦</span> result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>val<span class="Delimiter">);</span>
-<span id="L302" class="LineNr">302 </span>  <span class="Delimiter">}</span>
-<span id="L303" class="LineNr">303 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L304" class="LineNr">304 </span><span class="Delimiter">}</span>
-<span id="L305" class="LineNr">305 </span>
-<span id="L306" class="LineNr">306 </span><span class="Normal">void</span> write_memory<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="Normal">const</span> vector&lt;<span class="Normal">double</span>&gt;&amp; data<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L307" class="LineNr">307 </span>  assert<span class="Delimiter">(</span>Current_routine<span class="Delimiter">);</span>  <span class="Comment">// run-time only</span>
-<span id="L308" class="LineNr">308 </span>  <span class="Comment">// Begin Preprocess write_memory(x, data)</span>
-<span id="L309" class="LineNr">309 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L310" class="LineNr">310 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;can't write to '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'; no type</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L311" class="LineNr">311 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L312" class="LineNr">312 </span>  <span class="Delimiter">}</span>
-<span id="L313" class="LineNr">313 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_dummy<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L314" class="LineNr">314 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L315" class="LineNr">315 </span>  <span class="Comment">// End Preprocess write_memory(x, data)</span>
-<span id="L316" class="LineNr">316 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>value == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L317" class="LineNr">317 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;can't write to location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L318" class="LineNr">318 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L319" class="LineNr">319 </span>  <span class="Delimiter">}</span>
-<span id="L320" class="LineNr">320 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>size_mismatch<span class="Delimiter">(</span>x<span class="Delimiter">,</span> data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L321" class="LineNr">321 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;size mismatch in storing to '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; size_of<span class="Delimiter">(</span>x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>data<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;) at '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
-<span id="L322" class="LineNr">322 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L323" class="LineNr">323 </span>  <span class="Delimiter">}</span>
-<span id="L324" class="LineNr">324 </span>  <span class="Comment">// End write_memory(x) Special-cases</span>
-<span id="L325" class="LineNr">325 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> offset = <span class="Constant">0</span><span class="Delimiter">;</span>  offset &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>data<span class="Delimiter">);</span>  ++offset<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L326" class="LineNr">326 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>x<span class="Delimiter">.</span>value+offset &gt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L327" class="LineNr">327 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>offset<span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>value+offset &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L328" class="LineNr">328 </span>  <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> x<span class="Delimiter">.</span>value+offset<span class="Delimiter">,</span> data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>offset<span class="Delimiter">));</span>
-<span id="L329" class="LineNr">329 </span>  <span class="Delimiter">}</span>
-<span id="L330" class="LineNr">330 </span><span class="Delimiter">}</span>
-<span id="L331" class="LineNr">331 </span>
-<span id="L332" class="LineNr">332 </span><span class="Delimiter">:(code)</span>
-<span id="L333" class="LineNr">333 </span><span class="Normal">int</span> size_of<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L334" class="LineNr">334 </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">0</span><span class="Delimiter">;</span>
-<span id="L335" class="LineNr">335 </span>  <span class="Comment">// End size_of(reagent r) Special-cases</span>
-<span id="L336" class="LineNr">336 </span>  <span class="Identifier">return</span> size_of<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L337" class="LineNr">337 </span><span class="Delimiter">}</span>
-<span id="L338" class="LineNr">338 </span><span class="Normal">int</span> size_of<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L339" class="LineNr">339 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L340" class="LineNr">340 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L341" class="LineNr">341 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>value == -<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// error value, but we'll raise it elsewhere</span>
-<span id="L342" class="LineNr">342 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L343" class="LineNr">343 </span>  <span class="Conceal">¦</span> <span class="Comment">// End size_of(type) Atom Special-cases</span>
-<span id="L344" class="LineNr">344 </span>  <span class="Delimiter">}</span>
-<span id="L345" class="LineNr">345 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L346" class="LineNr">346 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L347" class="LineNr">347 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L348" class="LineNr">348 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L349" class="LineNr">349 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L350" class="LineNr">350 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value == get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L351" class="LineNr">351 </span>  <span class="Conceal">¦</span> <span class="Comment">// End size_of(type) Non-atom Special-cases</span>
-<span id="L352" class="LineNr">352 </span>  <span class="Delimiter">}</span>
-<span id="L353" class="LineNr">353 </span>  <span class="Comment">// End size_of(type) Special-cases</span>
-<span id="L354" class="LineNr">354 </span>  <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L355" class="LineNr">355 </span><span class="Delimiter">}</span>
-<span id="L356" class="LineNr">356 </span>
-<span id="L357" class="LineNr">357 </span><span class="Normal">bool</span> size_mismatch<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">const</span> vector&lt;<span class="Normal">double</span>&gt;&amp; data<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L358" class="LineNr">358 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L359" class="LineNr">359 </span>  <span class="Comment">// End size_mismatch(x) Special-cases</span>
-<span id="L360" class="LineNr">360 </span><span class="CommentedCode">//?   if (size_of(x) != SIZE(data)) cerr &lt;&lt; size_of(x) &lt;&lt; &quot; vs &quot; &lt;&lt; SIZE(data) &lt;&lt; '\n';</span>
-<span id="L361" class="LineNr">361 </span>  <span class="Identifier">return</span> size_of<span class="Delimiter">(</span>x<span class="Delimiter">)</span> != <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>data<span class="Delimiter">);</span>
-<span id="L362" class="LineNr">362 </span><span class="Delimiter">}</span>
-<span id="L363" class="LineNr">363 </span>
-<span id="L364" class="LineNr">364 </span><span class="Normal">bool</span> is_literal<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L365" class="LineNr">365 </span>  <span class="Identifier">return</span> is_literal<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L366" class="LineNr">366 </span><span class="Delimiter">}</span>
-<span id="L367" class="LineNr">367 </span><span class="Normal">bool</span> is_literal<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L368" class="LineNr">368 </span>  <span class="Normal">if</span> <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="L369" class="LineNr">369 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L370" class="LineNr">370 </span>  <span class="Identifier">return</span> type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L371" class="LineNr">371 </span><span class="Delimiter">}</span>
-<span id="L372" class="LineNr">372 </span>
-<span id="L373" class="LineNr">373 </span><span class="Normal">bool</span> scalar<span class="Delimiter">(</span><span class="Normal">const</span> vector&lt;<span class="Normal">int</span>&gt;&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L374" class="LineNr">374 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L375" class="LineNr">375 </span><span class="Delimiter">}</span>
-<span id="L376" class="LineNr">376 </span><span class="Normal">bool</span> scalar<span class="Delimiter">(</span><span class="Normal">const</span> vector&lt;<span class="Normal">double</span>&gt;&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L377" class="LineNr">377 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L378" class="LineNr">378 </span><span class="Delimiter">}</span>
-<span id="L379" class="LineNr">379 </span>
-<span id="L380" class="LineNr">380 </span><span class="Comment">// helper for tests</span>
-<span id="L381" class="LineNr">381 </span><span class="Normal">void</span> run<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; form<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L382" class="LineNr">382 </span>  vector&lt;recipe_ordinal&gt; tmp = load<span class="Delimiter">(</span>form<span class="Delimiter">);</span>
-<span id="L383" class="LineNr">383 </span>  <a href='012transform.cc.html#L46'>transform_all</a><span class="Delimiter">();</span>
-<span id="L384" class="LineNr">384 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L385" class="LineNr">385 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L192'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L386" class="LineNr">386 </span>  <span class="Comment">// if a test defines main, it probably wants to start there regardless of</span>
-<span id="L387" class="LineNr">387 </span>  <span class="Comment">// definition order</span>
-<span id="L388" class="LineNr">388 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;main&quot;</span><span class="Delimiter">)))</span>
-<span id="L389" class="LineNr">389 </span>  <span class="Conceal">¦</span> run<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;main&quot;</span><span class="Delimiter">));</span>
-<span id="L390" class="LineNr">390 </span>  <span class="Normal">else</span>
-<span id="L391" class="LineNr">391 </span>  <span class="Conceal">¦</span> run<span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>front<span class="Delimiter">());</span>
-<span id="L392" class="LineNr">392 </span><span class="Delimiter">}</span>
-<span id="L393" class="LineNr">393 </span>
-<span id="L394" class="LineNr">394 </span><span class="Delimiter">:(scenario run_label)</span>
-<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>  +foo
-<span id="L397" class="LineNr">397 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
-<span id="L398" class="LineNr">398 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:num
-<span id="L399" class="LineNr">399 </span>]
-<span id="L400" class="LineNr">400 </span><span class="traceContains">+run: {1: &quot;number&quot;} &lt;- copy {23: &quot;literal&quot;}</span>
-<span id="L401" class="LineNr">401 </span><span class="traceContains">+run: {2: &quot;number&quot;} &lt;- copy {1: &quot;number&quot;}</span>
-<span id="L402" class="LineNr">402 </span><span class="traceAbsent">-run: +foo</span>
-<span id="L403" class="LineNr">403 </span>
-<span id="L404" class="LineNr">404 </span><span class="Delimiter">:(scenario run_dummy)</span>
-<span id="L405" class="LineNr">405 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L406" class="LineNr">406 </span>  _<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L407" class="LineNr">407 </span>]
-<span id="L408" class="LineNr">408 </span><span class="traceContains">+run: _ &lt;- copy {0: &quot;literal&quot;}</span>
-<span id="L409" class="LineNr">409 </span>
-<span id="L410" class="LineNr">410 </span><span class="Delimiter">:(scenario write_to_0_disallowed)</span>
-<span id="L411" class="LineNr">411 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L412" class="LineNr">412 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L413" class="LineNr">413 </span>  <span class="Constant">0</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L414" class="LineNr">414 </span>]
-<span id="L415" class="LineNr">415 </span><span class="traceAbsent">-mem: storing 34 in location 0</span>
-<span id="L416" class="LineNr">416 </span>
-<span id="L417" class="LineNr">417 </span><span class="Comment">//: Mu is robust to various combinations of commas and spaces. You just have</span>
-<span id="L418" class="LineNr">418 </span><span class="Comment">//: to put spaces around the '&lt;-'.</span>
-<span id="L419" class="LineNr">419 </span>
-<span id="L420" class="LineNr">420 </span><span class="Delimiter">:(scenario comma_without_space)</span>
-<span id="L421" class="LineNr">421 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L422" class="LineNr">422 </span>  <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">2</span><span class="Delimiter">,</span><span class="Constant">2</span>
-<span id="L423" class="LineNr">423 </span>]
-<span id="L424" class="LineNr">424 </span><span class="traceContains">+mem: storing 2 in location 1</span>
-<span id="L425" class="LineNr">425 </span>
-<span id="L426" class="LineNr">426 </span><span class="Delimiter">:(scenario space_without_comma)</span>
-<span id="L427" class="LineNr">427 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L428" class="LineNr">428 </span>  <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">2</span> <span class="Constant">2</span>
-<span id="L429" class="LineNr">429 </span>]
-<span id="L430" class="LineNr">430 </span><span class="traceContains">+mem: storing 2 in location 1</span>
-<span id="L431" class="LineNr">431 </span>
-<span id="L432" class="LineNr">432 </span><span class="Delimiter">:(scenario comma_before_space)</span>
-<span id="L433" class="LineNr">433 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L434" class="LineNr">434 </span>  <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">2</span>
-<span id="L435" class="LineNr">435 </span>]
-<span id="L436" class="LineNr">436 </span><span class="traceContains">+mem: storing 2 in location 1</span>
-<span id="L437" class="LineNr">437 </span>
-<span id="L438" class="LineNr">438 </span><span class="Delimiter">:(scenario comma_after_space)</span>
-<span id="L439" class="LineNr">439 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L440" class="LineNr">440 </span>  <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">2</span> <span class="Delimiter">,</span><span class="Constant">2</span>
-<span id="L441" class="LineNr">441 </span>]
-<span id="L442" class="LineNr">442 </span><span class="traceContains">+mem: storing 2 in location 1</span>
-<span id="L443" class="LineNr">443 </span>
-<span id="L444" class="LineNr">444 </span><span class="SalientComment">//:: Counters for trying to understand where Mu programs are spending their</span>
-<span id="L445" class="LineNr">445 </span><span class="SalientComment">//:: time.</span>
-<span id="L446" class="LineNr">446 </span>
-<span id="L447" class="LineNr">447 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L448" class="LineNr">448 </span><span class="Normal">bool</span> Run_profiler = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L449" class="LineNr">449 </span><span class="Comment">// We'll key profile information by recipe_ordinal rather than name because</span>
-<span id="L450" class="LineNr">450 </span><span class="Comment">// it's more efficient, and because later layers will show more than just the</span>
-<span id="L451" class="LineNr">451 </span><span class="Comment">// name of a recipe.</span>
-<span id="L452" class="LineNr">452 </span><span class="Comment">//</span>
-<span id="L453" class="LineNr">453 </span><span class="Comment">// One drawback: if you're clearing recipes your profile will be inaccurate.</span>
-<span id="L454" class="LineNr">454 </span><span class="Comment">// So far that happens in tests, and in 'run-sandboxed' in a later layer.</span>
-<span id="L455" class="LineNr">455 </span>map&lt;recipe_ordinal<span class="Delimiter">,</span> <span class="Normal">int</span>&gt; Instructions_running<span class="Delimiter">;</span>
-<span id="L456" class="LineNr">456 </span><span class="Delimiter">:(before &quot;End Commandline Options(*arg)&quot;)</span>
-<span id="L457" class="LineNr">457 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L73'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">&quot;--profile&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L458" class="LineNr">458 </span>  Run_profiler = <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L459" class="LineNr">459 </span><span class="Delimiter">}</span>
-<span id="L460" class="LineNr">460 </span><span class="Delimiter">:(after &quot;Running One Instruction&quot;)</span>
-<span id="L461" class="LineNr">461 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Run_profiler<span class="Delimiter">)</span> Instructions_running[currently_running_recipe<span class="Delimiter">()</span>]++<span class="Delimiter">;</span>
-<span id="L462" class="LineNr">462 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L463" class="LineNr">463 </span>atexit<span class="Delimiter">(</span>dump_profile<span class="Delimiter">);</span>
-<span id="L464" class="LineNr">464 </span><span class="Delimiter">:(code)</span>
-<span id="L465" class="LineNr">465 </span><span class="Normal">void</span> dump_profile<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L466" class="LineNr">466 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Run_profiler<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L467" class="LineNr">467 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Run_tests<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L468" class="LineNr">468 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;It's not a good idea to profile a run with tests, since tests can create conflicting recipes and mislead you. To try it anyway, comment out this check in the code.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L469" class="LineNr">469 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L470" class="LineNr">470 </span>  <span class="Delimiter">}</span>
-<span id="L471" class="LineNr">471 </span>  ofstream fout<span class="Delimiter">;</span>
-<span id="L472" class="LineNr">472 </span>  fout<span class="Delimiter">.</span>open<span class="Delimiter">(</span><span class="Constant">&quot;profile.instructions&quot;</span><span class="Delimiter">);</span>
-<span id="L473" class="LineNr">473 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>fout<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L474" class="LineNr">474 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;recipe_ordinal<span class="Delimiter">,</span> <span class="Normal">int</span>&gt;::iterator p = Instructions_running<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Instructions_running<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L475" class="LineNr">475 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> fout &lt;&lt; std::setw<span class="Delimiter">(</span><span class="Constant">9</span><span class="Delimiter">)</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>second &lt;&lt; <span class="Constant">' '</span> &lt;&lt; header_label<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L476" class="LineNr">476 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L477" class="LineNr">477 </span>  <span class="Delimiter">}</span>
-<span id="L478" class="LineNr">478 </span>  fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
-<span id="L479" class="LineNr">479 </span>  <span class="Comment">// End dump_profile</span>
-<span id="L480" class="LineNr">480 </span><span class="Delimiter">}</span>
-<span id="L481" class="LineNr">481 </span>
-<span id="L482" class="LineNr">482 </span><span class="Comment">// overridden in a later layer</span>
-<span id="L483" class="LineNr">483 </span>string header_label<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="L484" class="LineNr">484 </span>  <span class="Identifier">return</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">;</span>
-<span id="L485" class="LineNr">485 </span><span class="Delimiter">}</span>
+<span id="L286" class="LineNr">286 </span><span class="Delimiter">:(code)</span>
+<span id="L287" class="LineNr">287 </span>vector&lt;<span class="Normal">double</span>&gt; read_memory<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="L288" class="LineNr">288 </span>  <span class="Comment">// Begin Preprocess read_memory(x)</span>
+<span id="L289" class="LineNr">289 </span>  vector&lt;<span class="Normal">double</span>&gt; result<span class="Delimiter">;</span>
+<span id="L290" class="LineNr">290 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L291" class="LineNr">291 </span>  <span class="Conceal">¦</span> result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>x<span class="Delimiter">.</span>value<span class="Delimiter">);</span>
+<span id="L292" class="LineNr">292 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L293" class="LineNr">293 </span>  <span class="Delimiter">}</span>
+<span id="L294" class="LineNr">294 </span>  <span class="Comment">// End Preprocess read_memory(x)</span>
+<span id="L295" class="LineNr">295 </span>  <span class="Normal">int</span> size = size_of<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
+<span id="L296" class="LineNr">296 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> offset = <span class="Constant">0</span><span class="Delimiter">;</span>  offset &lt; size<span class="Delimiter">;</span>  ++offset<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L297" class="LineNr">297 </span>  <span class="Conceal">¦</span> <span class="Normal">double</span> val = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> x<span class="Delimiter">.</span>value+offset<span class="Delimiter">);</span>
+<span id="L298" class="LineNr">298 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;location &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>value+offset &lt;&lt; <span class="Constant">&quot; is &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>val<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L299" class="LineNr">299 </span>  <span class="Conceal">¦</span> result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>val<span class="Delimiter">);</span>
+<span id="L300" class="LineNr">300 </span>  <span class="Delimiter">}</span>
+<span id="L301" class="LineNr">301 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L302" class="LineNr">302 </span><span class="Delimiter">}</span>
+<span id="L303" class="LineNr">303 </span>
+<span id="L304" class="LineNr">304 </span><span class="Normal">void</span> write_memory<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="Normal">const</span> vector&lt;<span class="Normal">double</span>&gt;&amp; data<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L305" class="LineNr">305 </span>  assert<span class="Delimiter">(</span>Current_routine<span class="Delimiter">);</span>  <span class="Comment">// run-time only</span>
+<span id="L306" class="LineNr">306 </span>  <span class="Comment">// Begin Preprocess write_memory(x, data)</span>
+<span id="L307" class="LineNr">307 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L308" class="LineNr">308 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;can't write to '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'; no type</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L309" class="LineNr">309 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L310" class="LineNr">310 </span>  <span class="Delimiter">}</span>
+<span id="L311" class="LineNr">311 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_dummy<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L312" class="LineNr">312 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L313" class="LineNr">313 </span>  <span class="Comment">// End Preprocess write_memory(x, data)</span>
+<span id="L314" class="LineNr">314 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>value == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L315" class="LineNr">315 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;can't write to location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L316" class="LineNr">316 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L317" class="LineNr">317 </span>  <span class="Delimiter">}</span>
+<span id="L318" class="LineNr">318 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>size_mismatch<span class="Delimiter">(</span>x<span class="Delimiter">,</span> data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L319" class="LineNr">319 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;size mismatch in storing to '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; size_of<span class="Delimiter">(</span>x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>data<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;) at '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L320" class="LineNr">320 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L321" class="LineNr">321 </span>  <span class="Delimiter">}</span>
+<span id="L322" class="LineNr">322 </span>  <span class="Comment">// End write_memory(x) Special-cases</span>
+<span id="L323" class="LineNr">323 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> offset = <span class="Constant">0</span><span class="Delimiter">;</span>  offset &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>data<span class="Delimiter">);</span>  ++offset<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L324" class="LineNr">324 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>x<span class="Delimiter">.</span>value+offset &gt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L325" class="LineNr">325 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>offset<span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>value+offset &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L326" class="LineNr">326 </span>  <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> x<span class="Delimiter">.</span>value+offset<span class="Delimiter">,</span> data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>offset<span class="Delimiter">));</span>
+<span id="L327" class="LineNr">327 </span>  <span class="Delimiter">}</span>
+<span id="L328" class="LineNr">328 </span><span class="Delimiter">}</span>
+<span id="L329" class="LineNr">329 </span>
+<span id="L330" class="LineNr">330 </span><span class="Delimiter">:(code)</span>
+<span id="L331" class="LineNr">331 </span><span class="Normal">int</span> size_of<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L332" class="LineNr">332 </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">0</span><span class="Delimiter">;</span>
+<span id="L333" class="LineNr">333 </span>  <span class="Comment">// End size_of(reagent r) Special-cases</span>
+<span id="L334" class="LineNr">334 </span>  <span class="Identifier">return</span> size_of<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L335" class="LineNr">335 </span><span class="Delimiter">}</span>
+<span id="L336" class="LineNr">336 </span><span class="Normal">int</span> size_of<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L337" class="LineNr">337 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L338" class="LineNr">338 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L339" class="LineNr">339 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>value == -<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// error value, but we'll raise it elsewhere</span>
+<span id="L340" class="LineNr">340 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L341" class="LineNr">341 </span>  <span class="Conceal">¦</span> <span class="Comment">// End size_of(type) Atom Special-cases</span>
+<span id="L342" class="LineNr">342 </span>  <span class="Delimiter">}</span>
+<span id="L343" class="LineNr">343 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L344" class="LineNr">344 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L345" class="LineNr">345 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L346" class="LineNr">346 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L347" class="LineNr">347 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L348" class="LineNr">348 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value == get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L349" class="LineNr">349 </span>  <span class="Conceal">¦</span> <span class="Comment">// End size_of(type) Non-atom Special-cases</span>
+<span id="L350" class="LineNr">350 </span>  <span class="Delimiter">}</span>
+<span id="L351" class="LineNr">351 </span>  <span class="Comment">// End size_of(type) Special-cases</span>
+<span id="L352" class="LineNr">352 </span>  <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L353" class="LineNr">353 </span><span class="Delimiter">}</span>
+<span id="L354" class="LineNr">354 </span>
+<span id="L355" class="LineNr">355 </span><span class="Normal">bool</span> size_mismatch<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">const</span> vector&lt;<span class="Normal">double</span>&gt;&amp; data<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L356" class="LineNr">356 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L357" class="LineNr">357 </span>  <span class="Comment">// End size_mismatch(x) Special-cases</span>
+<span id="L358" class="LineNr">358 </span><span class="CommentedCode">//?   if (size_of(x) != SIZE(data)) cerr &lt;&lt; size_of(x) &lt;&lt; &quot; vs &quot; &lt;&lt; SIZE(data) &lt;&lt; '\n';</span>
+<span id="L359" class="LineNr">359 </span>  <span class="Identifier">return</span> size_of<span class="Delimiter">(</span>x<span class="Delimiter">)</span> != <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>data<span class="Delimiter">);</span>
+<span id="L360" class="LineNr">360 </span><span class="Delimiter">}</span>
+<span id="L361" class="LineNr">361 </span>
+<span id="L362" class="LineNr">362 </span><span class="Normal">bool</span> is_literal<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L363" class="LineNr">363 </span>  <span class="Identifier">return</span> is_literal<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L364" class="LineNr">364 </span><span class="Delimiter">}</span>
+<span id="L365" class="LineNr">365 </span><span class="Normal">bool</span> is_literal<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L366" class="LineNr">366 </span>  <span class="Normal">if</span> <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="L367" class="LineNr">367 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L368" class="LineNr">368 </span>  <span class="Identifier">return</span> type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L369" class="LineNr">369 </span><span class="Delimiter">}</span>
+<span id="L370" class="LineNr">370 </span>
+<span id="L371" class="LineNr">371 </span><span class="Normal">bool</span> scalar<span class="Delimiter">(</span><span class="Normal">const</span> vector&lt;<span class="Normal">int</span>&gt;&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L372" class="LineNr">372 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L373" class="LineNr">373 </span><span class="Delimiter">}</span>
+<span id="L374" class="LineNr">374 </span><span class="Normal">bool</span> scalar<span class="Delimiter">(</span><span class="Normal">const</span> vector&lt;<span class="Normal">double</span>&gt;&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L375" class="LineNr">375 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L376" class="LineNr">376 </span><span class="Delimiter">}</span>
+<span id="L377" class="LineNr">377 </span>
+<span id="L378" class="LineNr">378 </span><span class="Comment">// helper for tests</span>
+<span id="L379" class="LineNr">379 </span><span class="Normal">void</span> run<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; form<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L380" class="LineNr">380 </span>  vector&lt;recipe_ordinal&gt; tmp = load<span class="Delimiter">(</span>form<span class="Delimiter">);</span>
+<span id="L381" class="LineNr">381 </span>  <a href='012transform.cc.html#L46'>transform_all</a><span class="Delimiter">();</span>
+<span id="L382" class="LineNr">382 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L383" class="LineNr">383 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L192'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L384" class="LineNr">384 </span>  <span class="Comment">// if a test defines main, it probably wants to start there regardless of</span>
+<span id="L385" class="LineNr">385 </span>  <span class="Comment">// definition order</span>
+<span id="L386" class="LineNr">386 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;main&quot;</span><span class="Delimiter">)))</span>
+<span id="L387" class="LineNr">387 </span>  <span class="Conceal">¦</span> run<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;main&quot;</span><span class="Delimiter">));</span>
+<span id="L388" class="LineNr">388 </span>  <span class="Normal">else</span>
+<span id="L389" class="LineNr">389 </span>  <span class="Conceal">¦</span> run<span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>front<span class="Delimiter">());</span>
+<span id="L390" class="LineNr">390 </span><span class="Delimiter">}</span>
+<span id="L391" class="LineNr">391 </span>
+<span id="L392" class="LineNr">392 </span><span class="Delimiter">:(scenario run_label)</span>
+<span id="L393" class="LineNr">393 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L394" class="LineNr">394 </span>  +foo
+<span id="L395" class="LineNr">395 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
+<span id="L396" class="LineNr">396 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:num
+<span id="L397" class="LineNr">397 </span>]
+<span id="L398" class="LineNr">398 </span><span class="traceContains">+run: {1: &quot;number&quot;} &lt;- copy {23: &quot;literal&quot;}</span>
+<span id="L399" class="LineNr">399 </span><span class="traceContains">+run: {2: &quot;number&quot;} &lt;- copy {1: &quot;number&quot;}</span>
+<span id="L400" class="LineNr">400 </span><span class="traceAbsent">-run: +foo</span>
+<span id="L401" class="LineNr">401 </span>
+<span id="L402" class="LineNr">402 </span><span class="Delimiter">:(scenario run_dummy)</span>
+<span id="L403" class="LineNr">403 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L404" class="LineNr">404 </span>  _<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L405" class="LineNr">405 </span>]
+<span id="L406" class="LineNr">406 </span><span class="traceContains">+run: _ &lt;- copy {0: &quot;literal&quot;}</span>
+<span id="L407" class="LineNr">407 </span>
+<span id="L408" class="LineNr">408 </span><span class="Delimiter">:(scenario write_to_0_disallowed)</span>
+<span id="L409" class="LineNr">409 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L410" class="LineNr">410 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L411" class="LineNr">411 </span>  <span class="Constant">0</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L412" class="LineNr">412 </span>]
+<span id="L413" class="LineNr">413 </span><span class="traceAbsent">-mem: storing 34 in location 0</span>
+<span id="L414" class="LineNr">414 </span>
+<span id="L415" class="LineNr">415 </span><span class="Comment">//: Mu is robust to various combinations of commas and spaces. You just have</span>
+<span id="L416" class="LineNr">416 </span><span class="Comment">//: to put spaces around the '&lt;-'.</span>
+<span id="L417" class="LineNr">417 </span>
+<span id="L418" class="LineNr">418 </span><span class="Delimiter">:(scenario comma_without_space)</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>  <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">2</span><span class="Delimiter">,</span><span class="Constant">2</span>
+<span id="L421" class="LineNr">421 </span>]
+<span id="L422" class="LineNr">422 </span><span class="traceContains">+mem: storing 2 in location 1</span>
+<span id="L423" class="LineNr">423 </span>
+<span id="L424" class="LineNr">424 </span><span class="Delimiter">:(scenario space_without_comma)</span>
+<span id="L425" class="LineNr">425 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L426" class="LineNr">426 </span>  <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">2</span> <span class="Constant">2</span>
+<span id="L427" class="LineNr">427 </span>]
+<span id="L428" class="LineNr">428 </span><span class="traceContains">+mem: storing 2 in location 1</span>
+<span id="L429" class="LineNr">429 </span>
+<span id="L430" class="LineNr">430 </span><span class="Delimiter">:(scenario comma_before_space)</span>
+<span id="L431" class="LineNr">431 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L432" class="LineNr">432 </span>  <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">2</span>
+<span id="L433" class="LineNr">433 </span>]
+<span id="L434" class="LineNr">434 </span><span class="traceContains">+mem: storing 2 in location 1</span>
+<span id="L435" class="LineNr">435 </span>
+<span id="L436" class="LineNr">436 </span><span class="Delimiter">:(scenario comma_after_space)</span>
+<span id="L437" class="LineNr">437 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L438" class="LineNr">438 </span>  <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">2</span> <span class="Delimiter">,</span><span class="Constant">2</span>
+<span id="L439" class="LineNr">439 </span>]
+<span id="L440" class="LineNr">440 </span><span class="traceContains">+mem: storing 2 in location 1</span>
+<span id="L441" class="LineNr">441 </span>
+<span id="L442" class="LineNr">442 </span><span class="SalientComment">//:: Counters for trying to understand where Mu programs are spending their</span>
+<span id="L443" class="LineNr">443 </span><span class="SalientComment">//:: time.</span>
+<span id="L444" class="LineNr">444 </span>
+<span id="L445" class="LineNr">445 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L446" class="LineNr">446 </span><span class="Normal">bool</span> Run_profiler = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L447" class="LineNr">447 </span><span class="Comment">// We'll key profile information by recipe_ordinal rather than name because</span>
+<span id="L448" class="LineNr">448 </span><span class="Comment">// it's more efficient, and because later layers will show more than just the</span>
+<span id="L449" class="LineNr">449 </span><span class="Comment">// name of a recipe.</span>
+<span id="L450" class="LineNr">450 </span><span class="Comment">//</span>
+<span id="L451" class="LineNr">451 </span><span class="Comment">// One drawback: if you're clearing recipes your profile will be inaccurate.</span>
+<span id="L452" class="LineNr">452 </span><span class="Comment">// So far that happens in tests, and in 'run-sandboxed' in a later layer.</span>
+<span id="L453" class="LineNr">453 </span>map&lt;recipe_ordinal<span class="Delimiter">,</span> <span class="Normal">int</span>&gt; Instructions_running<span class="Delimiter">;</span>
+<span id="L454" class="LineNr">454 </span><span class="Delimiter">:(before &quot;End Commandline Options(*arg)&quot;)</span>
+<span id="L455" class="LineNr">455 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L73'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">&quot;--profile&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L456" class="LineNr">456 </span>  Run_profiler = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L457" class="LineNr">457 </span><span class="Delimiter">}</span>
+<span id="L458" class="LineNr">458 </span><span class="Delimiter">:(after &quot;Running One Instruction&quot;)</span>
+<span id="L459" class="LineNr">459 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Run_profiler<span class="Delimiter">)</span> Instructions_running[currently_running_recipe<span class="Delimiter">()</span>]++<span class="Delimiter">;</span>
+<span id="L460" class="LineNr">460 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L461" class="LineNr">461 </span>atexit<span class="Delimiter">(</span>dump_profile<span class="Delimiter">);</span>
+<span id="L462" class="LineNr">462 </span><span class="Delimiter">:(code)</span>
+<span id="L463" class="LineNr">463 </span><span class="Normal">void</span> dump_profile<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L464" class="LineNr">464 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Run_profiler<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L465" class="LineNr">465 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Run_tests<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L466" class="LineNr">466 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;It's not a good idea to profile a run with tests, since tests can create conflicting recipes and mislead you. To try it anyway, comment out this check in the code.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L467" class="LineNr">467 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L468" class="LineNr">468 </span>  <span class="Delimiter">}</span>
+<span id="L469" class="LineNr">469 </span>  ofstream fout<span class="Delimiter">;</span>
+<span id="L470" class="LineNr">470 </span>  fout<span class="Delimiter">.</span>open<span class="Delimiter">(</span><span class="Constant">&quot;profile.instructions&quot;</span><span class="Delimiter">);</span>
+<span id="L471" class="LineNr">471 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>fout<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L472" class="LineNr">472 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;recipe_ordinal<span class="Delimiter">,</span> <span class="Normal">int</span>&gt;::iterator p = Instructions_running<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Instructions_running<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L473" class="LineNr">473 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> fout &lt;&lt; std::setw<span class="Delimiter">(</span><span class="Constant">9</span><span class="Delimiter">)</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>second &lt;&lt; <span class="Constant">' '</span> &lt;&lt; header_label<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L474" class="LineNr">474 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L475" class="LineNr">475 </span>  <span class="Delimiter">}</span>
+<span id="L476" class="LineNr">476 </span>  fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
+<span id="L477" class="LineNr">477 </span>  <span class="Comment">// End dump_profile</span>
+<span id="L478" class="LineNr">478 </span><span class="Delimiter">}</span>
+<span id="L479" class="LineNr">479 </span>
+<span id="L480" class="LineNr">480 </span><span class="Comment">// overridden in a later layer</span>
+<span id="L481" class="LineNr">481 </span>string header_label<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="L482" class="LineNr">482 </span>  <span class="Identifier">return</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">;</span>
+<span id="L483" class="LineNr">483 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/021check_instruction.cc.html b/html/021check_instruction.cc.html
index d9d3a922..f4f738ab 100644
--- a/html/021check_instruction.cc.html
+++ b/html/021check_instruction.cc.html
@@ -130,14 +130,14 @@ if ('onhashchange' in window) {
 <span id="L67" class="LineNr"> 67 </span><span class="Delimiter">:(scenario write_scalar_to_address_disallowed)</span>
 <span id="L68" class="LineNr"> 68 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L69" class="LineNr"> 69 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L70" class="LineNr"> 70 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L70" class="LineNr"> 70 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
 <span id="L71" class="LineNr"> 71 </span>]
-<span id="L72" class="LineNr"> 72 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: can't copy '34' to '1:address:num'; types don't match</span>
+<span id="L72" class="LineNr"> 72 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: can't copy '34' to '1:<a href='043space.cc.html#L83'>address</a>:num'; types don't match</span>
 <span id="L73" class="LineNr"> 73 </span>
 <span id="L74" class="LineNr"> 74 </span><span class="Delimiter">:(scenario write_address_to_number_allowed)</span>
 <span id="L75" class="LineNr"> 75 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L76" class="LineNr"> 76 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">12</span>/unsafe
-<span id="L77" class="LineNr"> 77 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:address:num
+<span id="L76" class="LineNr"> 76 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">12</span>/unsafe
+<span id="L77" class="LineNr"> 77 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
 <span id="L78" class="LineNr"> 78 </span>]
 <span id="L79" class="LineNr"> 79 </span><span class="traceContains">+mem: storing 12 in location 2</span>
 <span id="L80" class="LineNr"> 80 </span>$error: <span class="Constant">0</span>
@@ -145,10 +145,10 @@ if ('onhashchange' in window) {
 <span id="L82" class="LineNr"> 82 </span><span class="Delimiter">:(scenario write_address_to_character_disallowed)</span>
 <span id="L83" class="LineNr"> 83 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L84" class="LineNr"> 84 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L85" class="LineNr"> 85 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">12</span>/unsafe
-<span id="L86" class="LineNr"> 86 </span>  <span class="Constant">2</span>:<span class="Normal">char</span><span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:address:num
+<span id="L85" class="LineNr"> 85 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">12</span>/unsafe
+<span id="L86" class="LineNr"> 86 </span>  <span class="Constant">2</span>:<span class="Normal">char</span><span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
 <span id="L87" class="LineNr"> 87 </span>]
-<span id="L88" class="LineNr"> 88 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: can't copy '1:address:num' to '2:char'; types don't match</span>
+<span id="L88" class="LineNr"> 88 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: can't copy '1:<a href='043space.cc.html#L83'>address</a>:num' to '2:char'; types don't match</span>
 <span id="L89" class="LineNr"> 89 </span>
 <span id="L90" class="LineNr"> 90 </span><span class="Delimiter">:(scenario write_boolean_to_number_allowed)</span>
 <span id="L91" class="LineNr"> 91 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
@@ -239,10 +239,10 @@ if ('onhashchange' in window) {
 <span id="L176" class="LineNr">176 </span><span class="Normal">void</span> <a href='021check_instruction.cc.html#L176'>test_type_abbreviations_match_raw_types</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L177" class="LineNr">177 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_abbreviations<span class="Delimiter">,</span> <span class="Constant">&quot;text&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;address:array:character&quot;</span><span class="Delimiter">));</span>
 <span id="L178" class="LineNr">178 </span>  <span class="Comment">// a has type (address buffer (address array character))</span>
-<span id="L179" class="LineNr">179 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:address:buffer:text&quot;</span><span class="Delimiter">);</span>
+<span id="L179" class="LineNr">179 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L83'>address</a>:buffer:text&quot;</span><span class="Delimiter">);</span>
 <span id="L180" class="LineNr">180 </span>  expand_type_abbreviations<span class="Delimiter">(</span>a<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
 <span id="L181" class="LineNr">181 </span>  <span class="Comment">// b has type (address buffer address array character)</span>
-<span id="L182" class="LineNr">182 </span>  reagent b<span class="Delimiter">(</span><span class="Constant">&quot;b:address:buffer:address:array:character&quot;</span><span class="Delimiter">);</span>
+<span id="L182" class="LineNr">182 </span>  reagent b<span class="Delimiter">(</span><span class="Constant">&quot;b:<a href='043space.cc.html#L83'>address</a>:buffer:<a href='043space.cc.html#L83'>address</a>:array:character&quot;</span><span class="Delimiter">);</span>
 <span id="L183" class="LineNr">183 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>types_strictly_match<span class="Delimiter">(</span>a<span class="Delimiter">,</span> b<span class="Delimiter">));</span>
 <span id="L184" class="LineNr">184 </span>  <span class="Normal">delete</span> Type_abbreviations[<span class="Constant">&quot;text&quot;</span>]<span class="Delimiter">;</span>
 <span id="L185" class="LineNr">185 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_abbreviations<span class="Delimiter">,</span> <span class="Constant">&quot;text&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">);</span>
@@ -263,7 +263,7 @@ if ('onhashchange' in window) {
 <span id="L200" class="LineNr">200 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<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="L201" class="LineNr">201 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L202" class="LineNr">202 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L203" class="LineNr">203 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L203" class="LineNr">203 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L204" class="LineNr">204 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L205" class="LineNr">205 </span>  <span class="Delimiter">}</span>
 <span id="L206" class="LineNr">206 </span>  <span class="Identifier">return</span> type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value == get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;array&quot;</span><span class="Delimiter">);</span>
@@ -278,7 +278,7 @@ if ('onhashchange' in window) {
 <span id="L215" class="LineNr">215 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<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="L216" class="LineNr">216 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L217" class="LineNr">217 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L218" class="LineNr">218 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L218" class="LineNr">218 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L219" class="LineNr">219 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L220" class="LineNr">220 </span>  <span class="Delimiter">}</span>
 <span id="L221" class="LineNr">221 </span>  <span class="Identifier">return</span> type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value == get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">);</span>
diff --git a/html/022arithmetic.cc.html b/html/022arithmetic.cc.html
index 8efefbe6..e8f8eb5c 100644
--- a/html/022arithmetic.cc.html
+++ b/html/022arithmetic.cc.html
@@ -128,7 +128,7 @@ if ('onhashchange' in window) {
 <span id="L64" class="LineNr"> 64 </span><span class="Delimiter">:(scenario add_checks_return_type)</span>
 <span id="L65" class="LineNr"> 65 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L66" class="LineNr"> 66 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L67" class="LineNr"> 67 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>add <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">2</span>
+<span id="L67" class="LineNr"> 67 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>add <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">2</span>
 <span id="L68" class="LineNr"> 68 </span>]
 <span id="L69" class="LineNr"> 69 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: 'add' should yield a number, but got '1:address:num'</span>
 <span id="L70" class="LineNr"> 70 </span>
@@ -337,7 +337,7 @@ if ('onhashchange' in window) {
 <span id="L273" class="LineNr">273 </span>  <span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span> a = <span class="Normal">static_cast</span>&lt;<span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span>&gt;<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="L274" class="LineNr">274 </span>  <span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span> b = <span class="Normal">static_cast</span>&lt;<span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span>&gt;<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L275" class="LineNr">275 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>b == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L276" class="LineNr">276 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;divide by zero in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L276" class="LineNr">276 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;divide by zero in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
 <span id="L277" class="LineNr">277 </span>  <span class="Conceal">¦</span> products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L278" class="LineNr">278 </span>  <span class="Conceal">¦</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><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L279" class="LineNr">279 </span>  <span class="Conceal">¦</span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
@@ -419,7 +419,7 @@ if ('onhashchange' in window) {
 <span id="L355" class="LineNr">355 </span>  <span class="Normal">int</span> b = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L356" class="LineNr">356 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L357" class="LineNr">357 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>b &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L358" class="LineNr">358 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;second ingredient can't be negative in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L358" class="LineNr">358 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;second ingredient can't be negative in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L359" class="LineNr">359 </span>  <span class="Conceal">¦</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><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L360" class="LineNr">360 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L361" class="LineNr">361 </span>  <span class="Delimiter">}</span>
@@ -490,7 +490,7 @@ if ('onhashchange' in window) {
 <span id="L426" class="LineNr">426 </span>  <span class="Normal">int</span> b = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L427" class="LineNr">427 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L428" class="LineNr">428 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>b &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L429" class="LineNr">429 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;second ingredient can't be negative in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L429" class="LineNr">429 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;second ingredient can't be negative in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L430" class="LineNr">430 </span>  <span class="Conceal">¦</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><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L431" class="LineNr">431 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L432" class="LineNr">432 </span>  <span class="Delimiter">}</span>
diff --git a/html/024jump.cc.html b/html/024jump.cc.html
index 33b69e86..b9978d43 100644
--- a/html/024jump.cc.html
+++ b/html/024jump.cc.html
@@ -91,9 +91,9 @@ if ('onhashchange' in window) {
 <span id="L27" class="LineNr"> 27 </span><span class="Delimiter">}</span>
 <span id="L28" class="LineNr"> 28 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L29" class="LineNr"> 29 </span><span class="Normal">case</span> JUMP: <span class="Delimiter">{</span>
-<span id="L30" class="LineNr"> 30 </span>  assert<span class="Delimiter">(</span><a href='026call.cc.html#L85'>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>initialized<span class="Delimiter">);</span>
-<span id="L31" class="LineNr"> 31 </span>  <a href='026call.cc.html#L80'>current_step_index</a><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 class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L32" class="LineNr"> 32 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to <a href='010vm.cc.html#L32'>instruction</a> &quot;</span> &lt;&lt; <a href='026call.cc.html#L80'>current_step_index</a><span class="Delimiter">()</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L30" class="LineNr"> 30 </span>  assert<span class="Delimiter">(</span><a href='026call.cc.html#L87'>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>initialized<span class="Delimiter">);</span>
+<span id="L31" class="LineNr"> 31 </span>  <a href='026call.cc.html#L82'>current_step_index</a><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 class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L32" class="LineNr"> 32 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to <a href='010vm.cc.html#L32'>instruction</a> &quot;</span> &lt;&lt; <a href='026call.cc.html#L82'>current_step_index</a><span class="Delimiter">()</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L33" class="LineNr"> 33 </span>  <span class="Comment">// skip rest of this instruction</span>
 <span id="L34" class="LineNr"> 34 </span>  write_products = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L35" class="LineNr"> 35 </span>  fall_through_to_next_instruction = <span class="Constant">false</span><span class="Delimiter">;</span>
@@ -138,13 +138,13 @@ if ('onhashchange' in window) {
 <span id="L74" class="LineNr"> 74 </span><span class="Delimiter">}</span>
 <span id="L75" class="LineNr"> 75 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L76" class="LineNr"> 76 </span><span class="Normal">case</span> JUMP_IF: <span class="Delimiter">{</span>
-<span id="L77" class="LineNr"> 77 </span>  assert<span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>initialized<span class="Delimiter">);</span>
+<span id="L77" class="LineNr"> 77 </span>  assert<span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>initialized<span class="Delimiter">);</span>
 <span id="L78" class="LineNr"> 78 </span>  <span class="Normal">if</span> <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 class="Delimiter">{</span>
 <span id="L79" class="LineNr"> 79 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump-if fell through&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L80" class="LineNr"> 80 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L81" class="LineNr"> 81 </span>  <span class="Delimiter">}</span>
-<span id="L82" class="LineNr"> 82 </span>  <a href='026call.cc.html#L80'>current_step_index</a><span class="Delimiter">()</span> += ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span>+<span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L83" class="LineNr"> 83 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to <a href='010vm.cc.html#L32'>instruction</a> &quot;</span> &lt;&lt; <a href='026call.cc.html#L80'>current_step_index</a><span class="Delimiter">()</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L82" class="LineNr"> 82 </span>  <a href='026call.cc.html#L82'>current_step_index</a><span class="Delimiter">()</span> += ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span>+<span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L83" class="LineNr"> 83 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to <a href='010vm.cc.html#L32'>instruction</a> &quot;</span> &lt;&lt; <a href='026call.cc.html#L82'>current_step_index</a><span class="Delimiter">()</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L84" class="LineNr"> 84 </span>  <span class="Comment">// skip rest of this instruction</span>
 <span id="L85" class="LineNr"> 85 </span>  write_products = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L86" class="LineNr"> 86 </span>  fall_through_to_next_instruction = <span class="Constant">false</span><span class="Delimiter">;</span>
@@ -194,13 +194,13 @@ if ('onhashchange' in window) {
 <span id="L130" class="LineNr">130 </span><span class="Delimiter">}</span>
 <span id="L131" class="LineNr">131 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L132" class="LineNr">132 </span><span class="Normal">case</span> JUMP_UNLESS: <span class="Delimiter">{</span>
-<span id="L133" class="LineNr">133 </span>  assert<span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>initialized<span class="Delimiter">);</span>
+<span id="L133" class="LineNr">133 </span>  assert<span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>initialized<span class="Delimiter">);</span>
 <span id="L134" class="LineNr">134 </span>  <span class="Normal">if</span> <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 class="Delimiter">{</span>
 <span id="L135" class="LineNr">135 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump-unless fell through&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L136" class="LineNr">136 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L137" class="LineNr">137 </span>  <span class="Delimiter">}</span>
-<span id="L138" class="LineNr">138 </span>  <a href='026call.cc.html#L80'>current_step_index</a><span class="Delimiter">()</span> += ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span>+<span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L139" class="LineNr">139 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to <a href='010vm.cc.html#L32'>instruction</a> &quot;</span> &lt;&lt; <a href='026call.cc.html#L80'>current_step_index</a><span class="Delimiter">()</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L138" class="LineNr">138 </span>  <a href='026call.cc.html#L82'>current_step_index</a><span class="Delimiter">()</span> += ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span>+<span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L139" class="LineNr">139 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to <a href='010vm.cc.html#L32'>instruction</a> &quot;</span> &lt;&lt; <a href='026call.cc.html#L82'>current_step_index</a><span class="Delimiter">()</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L140" class="LineNr">140 </span>  <span class="Comment">// skip rest of this instruction</span>
 <span id="L141" class="LineNr">141 </span>  write_products = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L142" class="LineNr">142 </span>  fall_through_to_next_instruction = <span class="Constant">false</span><span class="Delimiter">;</span>
diff --git a/html/026call.cc.html b/html/026call.cc.html
index fbc28c61..ae15c156 100644
--- a/html/026call.cc.html
+++ b/html/026call.cc.html
@@ -16,6 +16,7 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .SalientComment { color: #00ffff; }
+.CommentedCode { color: #6c6c6c; }
 .muRecipe { color: #ff8700; }
 .LineNr { color: #444444; }
 .traceContains { color: #008000; }
@@ -134,93 +135,140 @@ if ('onhashchange' in window) {
 <span id="L69" class="LineNr"> 69 </span>
 <span id="L70" class="LineNr"> 70 </span><span class="SalientComment">//:: now update routine's helpers</span>
 <span id="L71" class="LineNr"> 71 </span>
-<span id="L72" class="LineNr"> 72 </span><span class="Delimiter">:(delete{} &quot;int&amp; current_step_index()&quot;)</span>
-<span id="L73" class="LineNr"> 73 </span><span class="Delimiter">:(delete{} &quot;recipe_ordinal currently_running_recipe()&quot;)</span>
-<span id="L74" class="LineNr"> 74 </span><span class="Delimiter">:(delete{} &quot;const string&amp; current_recipe_name()&quot;)</span>
-<span id="L75" class="LineNr"> 75 </span><span class="Delimiter">:(delete{} &quot;const recipe&amp; current_recipe()&quot;)</span>
-<span id="L76" class="LineNr"> 76 </span><span class="Delimiter">:(delete{} &quot;const instruction&amp; current_instruction()&quot;)</span>
-<span id="L77" class="LineNr"> 77 </span>
-<span id="L78" class="LineNr"> 78 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L79" class="LineNr"> 79 </span><span class="PreProc">#define current_call() Current_routine</span><span class="Delimiter">-&gt;</span><span class="PreProc">calls</span><span class="Delimiter">.</span><span class="PreProc">front()</span>
-<span id="L80" class="LineNr"> 80 </span><span class="PreProc">#define current_step_index() current_call()</span><span class="Delimiter">.</span><span class="PreProc">running_step_index</span>
-<span id="L81" class="LineNr"> 81 </span><span class="PreProc">#define currently_running_recipe() current_call()</span><span class="Delimiter">.</span><span class="PreProc">running_recipe</span>
-<span id="L82" class="LineNr"> 82 </span><span class="PreProc">#define current_recipe() get(Recipe</span><span class="Delimiter">,</span><span class="PreProc"> currently_running_recipe())</span>
-<span id="L83" class="LineNr"> 83 </span><span class="PreProc">#define current_recipe_name() current_recipe()</span><span class="Delimiter">.</span><span class="PreProc">name</span>
-<span id="L84" class="LineNr"> 84 </span><span class="PreProc">#define to_instruction(call) get(Recipe</span><span class="Delimiter">,</span><span class="PreProc"> (call)</span><span class="Delimiter">.</span><span class="PreProc">running_recipe)</span><span class="Delimiter">.</span><span class="PreProc">steps</span><span class="Delimiter">.</span><span class="PreProc">at((call)</span><span class="Delimiter">.</span><span class="PreProc">running_step_index)</span>
-<span id="L85" class="LineNr"> 85 </span><span class="PreProc">#define current_instruction() to_instruction(current_call())</span>
-<span id="L86" class="LineNr"> 86 </span>
-<span id="L87" class="LineNr"> 87 </span><span class="Delimiter">:(after &quot;Defined Recipe Checks&quot;)</span>
-<span id="L88" class="LineNr"> 88 </span><span class="Comment">// not a primitive; check that it's present in the book of recipes</span>
-<span id="L89" class="LineNr"> 89 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>operation<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L90" class="LineNr"> 90 </span>  <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;undefined operation 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#L197'>end</a><span class="Delimiter">();</span>
-<span id="L91" class="LineNr"> 91 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L92" class="LineNr"> 92 </span><span class="Delimiter">}</span>
-<span id="L93" class="LineNr"> 93 </span><span class="Delimiter">:(replace{} &quot;default:&quot; following &quot;End Primitive Recipe Implementations&quot;)</span>
-<span id="L94" class="LineNr"> 94 </span><span class="Normal">default</span>: <span class="Delimiter">{</span>
-<span id="L95" class="LineNr"> 95 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>operation<span class="Delimiter">))</span> <span class="Delimiter">{</span>  <span class="Comment">// error already raised in Checks above</span>
-<span id="L96" class="LineNr"> 96 </span>  <span class="Conceal">¦</span> <span class="Comment">// not a primitive; look up the book of recipes</span>
-<span id="L97" class="LineNr"> 97 </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="L98" class="LineNr"> 98 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">;</span>
-<span id="L99" class="LineNr"> 99 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;incrementing callstack depth to &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L100" class="LineNr">100 </span>  <span class="Conceal">¦</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="L101" class="LineNr">101 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L102" class="LineNr">102 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> call&amp; caller_frame = <a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">();</span>
-<span id="L103" class="LineNr">103 </span>  <span class="Conceal">¦</span> Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>push_front<span class="Delimiter">(</span>call<span class="Delimiter">(</span><a href='026call.cc.html#L84'>to_instruction</a><span class="Delimiter">(</span>caller_frame<span class="Delimiter">).</span>operation<span class="Delimiter">));</span>
-<span id="L104" class="LineNr">104 </span>  <span class="Conceal">¦</span> finish_call_housekeeping<span class="Delimiter">(</span><a href='026call.cc.html#L84'>to_instruction</a><span class="Delimiter">(</span>caller_frame<span class="Delimiter">),</span> ingredients<span class="Delimiter">);</span>
-<span id="L105" class="LineNr">105 </span>  <span class="Conceal">¦</span> <span class="Comment">// not done with caller</span>
-<span id="L106" class="LineNr">106 </span>  <span class="Conceal">¦</span> write_products = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L107" class="LineNr">107 </span>  <span class="Conceal">¦</span> fall_through_to_next_instruction = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L108" class="LineNr">108 </span>  <span class="Conceal">¦</span> <span class="Comment">// End Non-primitive Call(caller_frame)</span>
-<span id="L109" class="LineNr">109 </span>  <span class="Delimiter">}</span>
-<span id="L110" class="LineNr">110 </span><span class="Delimiter">}</span>
-<span id="L111" class="LineNr">111 </span><span class="Delimiter">:(code)</span>
-<span id="L112" class="LineNr">112 </span><span class="Normal">void</span> finish_call_housekeeping<span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; call_instruction<span class="Delimiter">,</span> <span class="Normal">const</span> vector&lt;vector&lt;<span class="Normal">double</span>&gt; &gt;&amp; ingredients<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L113" class="LineNr">113 </span>  <span class="Comment">// End Call Housekeeping</span>
-<span id="L114" class="LineNr">114 </span><span class="Delimiter">}</span>
-<span id="L115" class="LineNr">115 </span>
-<span id="L116" class="LineNr">116 </span><span class="Delimiter">:(scenario calling_undefined_recipe_fails)</span>
-<span id="L117" class="LineNr">117 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L118" class="LineNr">118 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L119" class="LineNr">119 </span>  foo
-<span id="L120" class="LineNr">120 </span>]
-<span id="L121" class="LineNr">121 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: undefined operation in 'foo'</span>
-<span id="L122" class="LineNr">122 </span>
-<span id="L123" class="LineNr">123 </span><span class="Delimiter">:(scenario calling_undefined_recipe_handles_missing_result)</span>
-<span id="L124" class="LineNr">124 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L125" class="LineNr">125 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L126" class="LineNr">126 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>foo
-<span id="L127" class="LineNr">127 </span>]
-<span id="L128" class="LineNr">128 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: undefined operation in 'x:num &lt;- foo'</span>
-<span id="L129" class="LineNr">129 </span>
-<span id="L130" class="LineNr">130 </span><span class="SalientComment">//:: finally, we need to fix the termination conditions for the run loop</span>
-<span id="L131" class="LineNr">131 </span>
-<span id="L132" class="LineNr">132 </span><span class="Delimiter">:(replace{} &quot;bool routine::completed() const&quot;)</span>
-<span id="L133" class="LineNr">133 </span><span class="Normal">bool</span> routine::completed<span class="Delimiter">()</span> <span class="Normal">const</span> <span class="Delimiter">{</span>
-<span id="L134" class="LineNr">134 </span>  <span class="Identifier">return</span> calls<span class="Delimiter">.</span>empty<span class="Delimiter">();</span>
-<span id="L135" class="LineNr">135 </span><span class="Delimiter">}</span>
-<span id="L136" class="LineNr">136 </span>
-<span id="L137" class="LineNr">137 </span><span class="Delimiter">:(replace{} &quot;const vector&lt;instruction&gt;&amp; routine::steps() const&quot;)</span>
-<span id="L138" class="LineNr">138 </span><span class="Normal">const</span> vector&lt;instruction&gt;&amp; routine::steps<span class="Delimiter">()</span> <span class="Normal">const</span> <span class="Delimiter">{</span>
-<span id="L139" class="LineNr">139 </span>  assert<span class="Delimiter">(</span>!calls<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L140" class="LineNr">140 </span>  <span class="Identifier">return</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>running_recipe<span class="Delimiter">).</span>steps<span class="Delimiter">;</span>
-<span id="L141" class="LineNr">141 </span><span class="Delimiter">}</span>
-<span id="L142" class="LineNr">142 </span>
-<span id="L143" class="LineNr">143 </span><span class="Delimiter">:(after &quot;Running One Instruction&quot;)</span>
-<span id="L144" class="LineNr">144 </span><span class="Comment">// when we reach the end of one call, we may reach the end of the one below</span>
-<span id="L145" class="LineNr">145 </span><span class="Comment">// it, and the one below that, and so on</span>
-<span id="L146" class="LineNr">146 </span><span class="Normal">while</span> <span class="Delimiter">(</span><a href='026call.cc.html#L80'>current_step_index</a><span class="Delimiter">()</span> &gt;= <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>steps<span class="Delimiter">()))</span> <span class="Delimiter">{</span>
-<span id="L147" class="LineNr">147 </span>  <span class="Comment">// Falling Through End Of Recipe</span>
-<span id="L148" class="LineNr">148 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L149" class="LineNr">149 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;fall-through: exiting &quot;</span> &lt;&lt; <a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot;; decrementing callstack depth from &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L150" class="LineNr">150 </span>  <span class="Conceal">¦</span> --Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">;</span>
-<span id="L151" class="LineNr">151 </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="L152" class="LineNr">152 </span>  <span class="Delimiter">}</span>
-<span id="L153" class="LineNr">153 </span>  Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>pop_front<span class="Delimiter">();</span>
-<span id="L154" class="LineNr">154 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">goto</span> stop_running_current_routine<span class="Delimiter">;</span>
-<span id="L155" class="LineNr">155 </span>  <span class="Comment">// Complete Call Fallthrough</span>
-<span id="L156" class="LineNr">156 </span>  <span class="Comment">// todo: fail if no products returned</span>
-<span id="L157" class="LineNr">157 </span>  ++current_step_index<span class="Delimiter">();</span>
-<span id="L158" class="LineNr">158 </span><span class="Delimiter">}</span>
+<span id="L72" class="LineNr"> 72 </span><span class="Comment">//: macro versions for a slight speedup</span>
+<span id="L73" class="LineNr"> 73 </span>
+<span id="L74" class="LineNr"> 74 </span><span class="Delimiter">:(delete{} &quot;int&amp; current_step_index()&quot;)</span>
+<span id="L75" class="LineNr"> 75 </span><span class="Delimiter">:(delete{} &quot;recipe_ordinal currently_running_recipe()&quot;)</span>
+<span id="L76" class="LineNr"> 76 </span><span class="Delimiter">:(delete{} &quot;const string&amp; current_recipe_name()&quot;)</span>
+<span id="L77" class="LineNr"> 77 </span><span class="Delimiter">:(delete{} &quot;const recipe&amp; current_recipe()&quot;)</span>
+<span id="L78" class="LineNr"> 78 </span><span class="Delimiter">:(delete{} &quot;const instruction&amp; current_instruction()&quot;)</span>
+<span id="L79" class="LineNr"> 79 </span>
+<span id="L80" class="LineNr"> 80 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L81" class="LineNr"> 81 </span><span class="PreProc">#define current_call() Current_routine</span><span class="Delimiter">-&gt;</span><span class="PreProc">calls</span><span class="Delimiter">.</span><span class="PreProc">front()</span>
+<span id="L82" class="LineNr"> 82 </span><span class="PreProc">#define current_step_index() current_call()</span><span class="Delimiter">.</span><span class="PreProc">running_step_index</span>
+<span id="L83" class="LineNr"> 83 </span><span class="PreProc">#define currently_running_recipe() current_call()</span><span class="Delimiter">.</span><span class="PreProc">running_recipe</span>
+<span id="L84" class="LineNr"> 84 </span><span class="PreProc">#define current_recipe() get(Recipe</span><span class="Delimiter">,</span><span class="PreProc"> currently_running_recipe())</span>
+<span id="L85" class="LineNr"> 85 </span><span class="PreProc">#define current_recipe_name() current_recipe()</span><span class="Delimiter">.</span><span class="PreProc">name</span>
+<span id="L86" class="LineNr"> 86 </span><span class="PreProc">#define to_instruction(call) get(Recipe</span><span class="Delimiter">,</span><span class="PreProc"> (call)</span><span class="Delimiter">.</span><span class="PreProc">running_recipe)</span><span class="Delimiter">.</span><span class="PreProc">steps</span><span class="Delimiter">.</span><span class="PreProc">at((call)</span><span class="Delimiter">.</span><span class="PreProc">running_step_index)</span>
+<span id="L87" class="LineNr"> 87 </span><span class="PreProc">#define current_instruction() to_instruction(current_call())</span>
+<span id="L88" class="LineNr"> 88 </span>
+<span id="L89" class="LineNr"> 89 </span><span class="Comment">//: function versions for debugging</span>
+<span id="L90" class="LineNr"> 90 </span>
+<span id="L91" class="LineNr"> 91 </span><span class="Delimiter">:(code)</span>
+<span id="L92" class="LineNr"> 92 </span><span class="CommentedCode">//? :(before &quot;End Globals&quot;)</span>
+<span id="L93" class="LineNr"> 93 </span><span class="CommentedCode">//? bool Foo2 = false;</span>
+<span id="L94" class="LineNr"> 94 </span><span class="CommentedCode">//? :(code)</span>
+<span id="L95" class="LineNr"> 95 </span><span class="CommentedCode">//? call&amp; current_call() {</span>
+<span id="L96" class="LineNr"> 96 </span><span class="CommentedCode">//?   if (Foo2) cerr &lt;&lt; __FUNCTION__ &lt;&lt; '\n';</span>
+<span id="L97" class="LineNr"> 97 </span><span class="CommentedCode">//?   return Current_routine-&gt;calls.front();</span>
+<span id="L98" class="LineNr"> 98 </span><span class="CommentedCode">//? }</span>
+<span id="L99" class="LineNr"> 99 </span><span class="CommentedCode">//? :(replace{} &quot;int&amp; current_step_index()&quot;)</span>
+<span id="L100" class="LineNr">100 </span><span class="CommentedCode">//? int&amp; current_step_index() {</span>
+<span id="L101" class="LineNr">101 </span><span class="CommentedCode">//?   assert(!Current_routine-&gt;calls.empty());</span>
+<span id="L102" class="LineNr">102 </span><span class="CommentedCode">//?   if (Foo2) cerr &lt;&lt; __FUNCTION__ &lt;&lt; '\n';</span>
+<span id="L103" class="LineNr">103 </span><span class="CommentedCode">//?   return current_call().running_step_index;</span>
+<span id="L104" class="LineNr">104 </span><span class="CommentedCode">//? }</span>
+<span id="L105" class="LineNr">105 </span><span class="CommentedCode">//? :(replace{} &quot;recipe_ordinal currently_running_recipe()&quot;)</span>
+<span id="L106" class="LineNr">106 </span><span class="CommentedCode">//? recipe_ordinal currently_running_recipe() {</span>
+<span id="L107" class="LineNr">107 </span><span class="CommentedCode">//?   assert(!Current_routine-&gt;calls.empty());</span>
+<span id="L108" class="LineNr">108 </span><span class="CommentedCode">//?   if (Foo2) cerr &lt;&lt; __FUNCTION__ &lt;&lt; '\n';</span>
+<span id="L109" class="LineNr">109 </span><span class="CommentedCode">//?   return current_call().running_recipe;</span>
+<span id="L110" class="LineNr">110 </span><span class="CommentedCode">//? }</span>
+<span id="L111" class="LineNr">111 </span><span class="CommentedCode">//? :(replace{} &quot;const string&amp; current_recipe_name()&quot;)</span>
+<span id="L112" class="LineNr">112 </span><span class="CommentedCode">//? const string&amp; current_recipe_name() {</span>
+<span id="L113" class="LineNr">113 </span><span class="CommentedCode">//?   assert(!Current_routine-&gt;calls.empty());</span>
+<span id="L114" class="LineNr">114 </span><span class="CommentedCode">//?   if (Foo2) cerr &lt;&lt; __FUNCTION__ &lt;&lt; '\n';</span>
+<span id="L115" class="LineNr">115 </span><span class="CommentedCode">//?   return get(Recipe, current_call().running_recipe).name;</span>
+<span id="L116" class="LineNr">116 </span><span class="CommentedCode">//? }</span>
+<span id="L117" class="LineNr">117 </span><span class="CommentedCode">//? :(replace{} &quot;const recipe&amp; current_recipe()&quot;)</span>
+<span id="L118" class="LineNr">118 </span><span class="CommentedCode">//? const recipe&amp; current_recipe() {</span>
+<span id="L119" class="LineNr">119 </span><span class="CommentedCode">//?   assert(!Current_routine-&gt;calls.empty());</span>
+<span id="L120" class="LineNr">120 </span><span class="CommentedCode">//?   if (Foo2) cerr &lt;&lt; __FUNCTION__ &lt;&lt; '\n';</span>
+<span id="L121" class="LineNr">121 </span><span class="CommentedCode">//?   return get(Recipe, current_call().running_recipe);</span>
+<span id="L122" class="LineNr">122 </span><span class="CommentedCode">//? }</span>
+<span id="L123" class="LineNr">123 </span><span class="CommentedCode">//? :(replace{} &quot;const instruction&amp; current_instruction()&quot;)</span>
+<span id="L124" class="LineNr">124 </span><span class="CommentedCode">//? const instruction&amp; current_instruction() {</span>
+<span id="L125" class="LineNr">125 </span><span class="CommentedCode">//?   assert(!Current_routine-&gt;calls.empty());</span>
+<span id="L126" class="LineNr">126 </span><span class="CommentedCode">//?   if (Foo2) cerr &lt;&lt; __FUNCTION__ &lt;&lt; '\n';</span>
+<span id="L127" class="LineNr">127 </span><span class="CommentedCode">//?   return to_instruction(current_call());</span>
+<span id="L128" class="LineNr">128 </span><span class="CommentedCode">//? }</span>
+<span id="L129" class="LineNr">129 </span><span class="CommentedCode">//? :(code)</span>
+<span id="L130" class="LineNr">130 </span><span class="CommentedCode">//? const instruction&amp; to_instruction(const call&amp; call) {</span>
+<span id="L131" class="LineNr">131 </span><span class="CommentedCode">//?   return get(Recipe, call.running_recipe).steps.at(call.running_step_index);</span>
+<span id="L132" class="LineNr">132 </span><span class="CommentedCode">//? }</span>
+<span id="L133" class="LineNr">133 </span>
+<span id="L134" class="LineNr">134 </span><span class="Delimiter">:(after &quot;Defined Recipe Checks&quot;)</span>
+<span id="L135" class="LineNr">135 </span><span class="Comment">// not a primitive; check that it's present in the book of recipes</span>
+<span id="L136" class="LineNr">136 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>operation<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L137" class="LineNr">137 </span>  <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;undefined operation 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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L138" class="LineNr">138 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L139" class="LineNr">139 </span><span class="Delimiter">}</span>
+<span id="L140" class="LineNr">140 </span><span class="Delimiter">:(replace{} &quot;default:&quot; following &quot;End Primitive Recipe Implementations&quot;)</span>
+<span id="L141" class="LineNr">141 </span><span class="Normal">default</span>: <span class="Delimiter">{</span>
+<span id="L142" class="LineNr">142 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>operation<span class="Delimiter">))</span> <span class="Delimiter">{</span>  <span class="Comment">// error already raised in Checks above</span>
+<span id="L143" class="LineNr">143 </span>  <span class="Conceal">¦</span> <span class="Comment">// not a primitive; look up the book of recipes</span>
+<span id="L144" class="LineNr">144 </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="L145" class="LineNr">145 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">;</span>
+<span id="L146" class="LineNr">146 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;incrementing callstack depth to &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L147" class="LineNr">147 </span>  <span class="Conceal">¦</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="L148" class="LineNr">148 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L149" class="LineNr">149 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> call&amp; caller_frame = <a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">();</span>
+<span id="L150" class="LineNr">150 </span>  <span class="Conceal">¦</span> Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>push_front<span class="Delimiter">(</span>call<span class="Delimiter">(</span><a href='026call.cc.html#L86'>to_instruction</a><span class="Delimiter">(</span>caller_frame<span class="Delimiter">).</span>operation<span class="Delimiter">));</span>
+<span id="L151" class="LineNr">151 </span>  <span class="Conceal">¦</span> finish_call_housekeeping<span class="Delimiter">(</span><a href='026call.cc.html#L86'>to_instruction</a><span class="Delimiter">(</span>caller_frame<span class="Delimiter">),</span> ingredients<span class="Delimiter">);</span>
+<span id="L152" class="LineNr">152 </span>  <span class="Conceal">¦</span> <span class="Comment">// not done with caller</span>
+<span id="L153" class="LineNr">153 </span>  <span class="Conceal">¦</span> write_products = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L154" class="LineNr">154 </span>  <span class="Conceal">¦</span> fall_through_to_next_instruction = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L155" class="LineNr">155 </span>  <span class="Conceal">¦</span> <span class="Comment">// End Non-primitive Call(caller_frame)</span>
+<span id="L156" class="LineNr">156 </span>  <span class="Delimiter">}</span>
+<span id="L157" class="LineNr">157 </span><span class="Delimiter">}</span>
+<span id="L158" class="LineNr">158 </span><span class="Delimiter">:(code)</span>
+<span id="L159" class="LineNr">159 </span><span class="Normal">void</span> finish_call_housekeeping<span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; call_instruction<span class="Delimiter">,</span> <span class="Normal">const</span> vector&lt;vector&lt;<span class="Normal">double</span>&gt; &gt;&amp; ingredients<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L160" class="LineNr">160 </span>  <span class="Comment">// End Call Housekeeping</span>
+<span id="L161" class="LineNr">161 </span><span class="Delimiter">}</span>
+<span id="L162" class="LineNr">162 </span>
+<span id="L163" class="LineNr">163 </span><span class="Delimiter">:(scenario calling_undefined_recipe_fails)</span>
+<span id="L164" class="LineNr">164 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L165" class="LineNr">165 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L166" class="LineNr">166 </span>  foo
+<span id="L167" class="LineNr">167 </span>]
+<span id="L168" class="LineNr">168 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: undefined operation in 'foo'</span>
+<span id="L169" class="LineNr">169 </span>
+<span id="L170" class="LineNr">170 </span><span class="Delimiter">:(scenario calling_undefined_recipe_handles_missing_result)</span>
+<span id="L171" class="LineNr">171 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L172" class="LineNr">172 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L173" class="LineNr">173 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>foo
+<span id="L174" class="LineNr">174 </span>]
+<span id="L175" class="LineNr">175 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: undefined operation in 'x:num &lt;- foo'</span>
+<span id="L176" class="LineNr">176 </span>
+<span id="L177" class="LineNr">177 </span><span class="SalientComment">//:: finally, we need to fix the termination conditions for the run loop</span>
+<span id="L178" class="LineNr">178 </span>
+<span id="L179" class="LineNr">179 </span><span class="Delimiter">:(replace{} &quot;bool routine::completed() const&quot;)</span>
+<span id="L180" class="LineNr">180 </span><span class="Normal">bool</span> routine::completed<span class="Delimiter">()</span> <span class="Normal">const</span> <span class="Delimiter">{</span>
+<span id="L181" class="LineNr">181 </span>  <span class="Identifier">return</span> calls<span class="Delimiter">.</span>empty<span class="Delimiter">();</span>
+<span id="L182" class="LineNr">182 </span><span class="Delimiter">}</span>
+<span id="L183" class="LineNr">183 </span>
+<span id="L184" class="LineNr">184 </span><span class="Delimiter">:(replace{} &quot;const vector&lt;instruction&gt;&amp; routine::steps() const&quot;)</span>
+<span id="L185" class="LineNr">185 </span><span class="Normal">const</span> vector&lt;instruction&gt;&amp; routine::steps<span class="Delimiter">()</span> <span class="Normal">const</span> <span class="Delimiter">{</span>
+<span id="L186" class="LineNr">186 </span>  assert<span class="Delimiter">(</span>!calls<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L187" class="LineNr">187 </span>  <span class="Identifier">return</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>running_recipe<span class="Delimiter">).</span>steps<span class="Delimiter">;</span>
+<span id="L188" class="LineNr">188 </span><span class="Delimiter">}</span>
+<span id="L189" class="LineNr">189 </span>
+<span id="L190" class="LineNr">190 </span><span class="Delimiter">:(after &quot;Running One Instruction&quot;)</span>
+<span id="L191" class="LineNr">191 </span><span class="Comment">// when we reach the end of one call, we may reach the end of the one below</span>
+<span id="L192" class="LineNr">192 </span><span class="Comment">// it, and the one below that, and so on</span>
+<span id="L193" class="LineNr">193 </span><span class="Normal">while</span> <span class="Delimiter">(</span><a href='026call.cc.html#L82'>current_step_index</a><span class="Delimiter">()</span> &gt;= <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>steps<span class="Delimiter">()))</span> <span class="Delimiter">{</span>
+<span id="L194" class="LineNr">194 </span>  <span class="Comment">// Falling Through End Of Recipe</span>
+<span id="L195" class="LineNr">195 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L196" class="LineNr">196 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;fall-through: exiting &quot;</span> &lt;&lt; <a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot;; decrementing callstack depth from &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L197" class="LineNr">197 </span>  <span class="Conceal">¦</span> --Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">;</span>
+<span id="L198" class="LineNr">198 </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="L199" class="LineNr">199 </span>  <span class="Delimiter">}</span>
+<span id="L200" class="LineNr">200 </span>  Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>pop_front<span class="Delimiter">();</span>
+<span id="L201" class="LineNr">201 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">goto</span> stop_running_current_routine<span class="Delimiter">;</span>
+<span id="L202" class="LineNr">202 </span>  <span class="Comment">// Complete Call Fallthrough</span>
+<span id="L203" class="LineNr">203 </span>  <span class="Comment">// todo: fail if no products returned</span>
+<span id="L204" class="LineNr">204 </span>  ++current_step_index<span class="Delimiter">();</span>
+<span id="L205" class="LineNr">205 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/027call_ingredient.cc.html b/html/027call_ingredient.cc.html
index ef710043..3353aadb 100644
--- a/html/027call_ingredient.cc.html
+++ b/html/027call_ingredient.cc.html
@@ -92,10 +92,10 @@ if ('onhashchange' in window) {
 <span id="L29" class="LineNr"> 29 </span>
 <span id="L30" class="LineNr"> 30 </span><span class="Delimiter">:(before &quot;End Call Housekeeping&quot;)</span>
 <span id="L31" class="LineNr"> 31 </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>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L32" class="LineNr"> 32 </span>  <a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L32" class="LineNr"> 32 </span>  <a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
 <span id="L33" class="LineNr"> 33 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> ingredient = call_instruction<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L34" class="LineNr"> 34 </span>  <span class="Comment">// End Compute Call Ingredient</span>
-<span id="L35" class="LineNr"> 35 </span>  <a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>ingredient<span class="Delimiter">);</span>
+<span id="L35" class="LineNr"> 35 </span>  <a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>ingredient<span class="Delimiter">);</span>
 <span id="L36" class="LineNr"> 36 </span>  <span class="Comment">// End Populate Call Ingredient</span>
 <span id="L37" class="LineNr"> 37 </span><span class="Delimiter">}</span>
 <span id="L38" class="LineNr"> 38 </span>
@@ -114,33 +114,33 @@ if ('onhashchange' in window) {
 <span id="L51" class="LineNr"> 51 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L52" class="LineNr"> 52 </span><span class="Normal">case</span> NEXT_INGREDIENT: <span class="Delimiter">{</span>
 <span id="L53" class="LineNr"> 53 </span>  assert<span class="Delimiter">(</span>!Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L54" class="LineNr"> 54 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>next_ingredient_to_process &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L55" class="LineNr"> 55 </span>  <span class="Conceal">¦</span> reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> product = <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L54" class="LineNr"> 54 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>next_ingredient_to_process &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L55" class="LineNr"> 55 </span>  <span class="Conceal">¦</span> reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> product = <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L56" class="LineNr"> 56 </span>  <span class="Conceal">¦</span> <span class="Comment">// End Preprocess NEXT_INGREDIENT product</span>
-<span id="L57" class="LineNr"> 57 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">()</span> == <span class="Constant">&quot;main&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L57" class="LineNr"> 57 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">()</span> == <span class="Constant">&quot;main&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L58" class="LineNr"> 58 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// no ingredient types since the call might be implicit; assume ingredients are always strings</span>
 <span id="L59" class="LineNr"> 59 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// todo: how to test this?</span>
 <span id="L60" class="LineNr"> 60 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_text<span class="Delimiter">(</span>product<span class="Delimiter">))</span>
 <span id="L61" class="LineNr"> 61 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;main: wrong type for ingredient '&quot;</span> &lt;&lt; product<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L62" class="LineNr"> 62 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L63" class="LineNr"> 63 </span>  <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_coercible<span class="Delimiter">(</span>product<span class="Delimiter">,</span>
-<span id="L64" class="LineNr"> 64 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span>         <a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>next_ingredient_to_process<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L65" class="LineNr"> 65 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;wrong type for ingredient '&quot;</span> &lt;&lt; product<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L64" class="LineNr"> 64 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span>         <a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>next_ingredient_to_process<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
+<span id="L65" class="LineNr"> 65 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;wrong type for ingredient '&quot;</span> &lt;&lt; product<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L66" class="LineNr"> 66 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// End next-ingredient Type Mismatch Error</span>
 <span id="L67" class="LineNr"> 67 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L68" class="LineNr"> 68 </span>  <span class="Conceal">¦</span> products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>
-<span id="L69" class="LineNr"> 69 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">.</span>at<span class="Delimiter">(</span><a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>next_ingredient_to_process<span class="Delimiter">));</span>
+<span id="L69" class="LineNr"> 69 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">.</span>at<span class="Delimiter">(</span><a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>next_ingredient_to_process<span class="Delimiter">));</span>
 <span id="L70" class="LineNr"> 70 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>products<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">);</span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>  <span class="Comment">// push a new vector</span>
 <span id="L71" class="LineNr"> 71 </span>  <span class="Conceal">¦</span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L72" class="LineNr"> 72 </span>  <span class="Conceal">¦</span> ++current_call<span class="Delimiter">().</span>next_ingredient_to_process<span class="Delimiter">;</span>
 <span id="L73" class="LineNr"> 73 </span>  <span class="Delimiter">}</span>
 <span id="L74" class="LineNr"> 74 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L75" class="LineNr"> 75 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">)</span> &lt; <span class="Constant">2</span><span class="Delimiter">)</span>
-<span id="L76" class="LineNr"> 76 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;no ingredient to save in '&quot;</span> &lt;&lt; current_instruction<span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L77" class="LineNr"> 77 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L75" class="LineNr"> 75 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">)</span> &lt; <span class="Constant">2</span><span class="Delimiter">)</span>
+<span id="L76" class="LineNr"> 76 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;no ingredient to save in '&quot;</span> &lt;&lt; current_instruction<span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L77" class="LineNr"> 77 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L78" class="LineNr"> 78 </span>  <span class="Conceal">¦</span> products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L79" class="LineNr"> 79 </span>  <span class="Conceal">¦</span> <span class="Comment">// pad the first product with sufficient zeros to match its type</span>
-<span id="L80" class="LineNr"> 80 </span>  <span class="Conceal">¦</span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>resize<span class="Delimiter">(</span>size_of<span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)));</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="Conceal">¦</span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>resize<span class="Delimiter">(</span>size_of<span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)));</span>
 <span id="L81" class="LineNr"> 81 </span>  <span class="Conceal">¦</span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L82" class="LineNr"> 82 </span>  <span class="Delimiter">}</span>
 <span id="L83" class="LineNr"> 83 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -181,7 +181,7 @@ if ('onhashchange' in window) {
 <span id="L118" class="LineNr">118 </span><span class="Delimiter">}</span>
 <span id="L119" class="LineNr">119 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L120" class="LineNr">120 </span><span class="Normal">case</span> REWIND_INGREDIENTS: <span class="Delimiter">{</span>
-<span id="L121" class="LineNr">121 </span>  <a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>next_ingredient_to_process = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L121" class="LineNr">121 </span>  <a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>next_ingredient_to_process = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L122" class="LineNr">122 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L123" class="LineNr">123 </span><span class="Delimiter">}</span>
 <span id="L124" class="LineNr">124 </span>
@@ -214,16 +214,16 @@ if ('onhashchange' in window) {
 <span id="L151" class="LineNr">151 </span><span class="Delimiter">}</span>
 <span id="L152" class="LineNr">152 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L153" class="LineNr">153 </span><span class="Normal">case</span> INGREDIENT: <span class="Delimiter">{</span>
-<span id="L154" class="LineNr">154 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<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> &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L155" class="LineNr">155 </span>  <span class="Conceal">¦</span> <a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>next_ingredient_to_process = 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="L154" class="LineNr">154 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<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> &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L155" class="LineNr">155 </span>  <span class="Conceal">¦</span> <a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>next_ingredient_to_process = 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="L156" class="LineNr">156 </span>  <span class="Conceal">¦</span> products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>
-<span id="L157" class="LineNr">157 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">.</span>at<span class="Delimiter">(</span><a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>next_ingredient_to_process<span class="Delimiter">));</span>
+<span id="L157" class="LineNr">157 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">.</span>at<span class="Delimiter">(</span><a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>next_ingredient_to_process<span class="Delimiter">));</span>
 <span id="L158" class="LineNr">158 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>products<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">);</span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>  <span class="Comment">// push a new vector</span>
 <span id="L159" class="LineNr">159 </span>  <span class="Conceal">¦</span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L160" class="LineNr">160 </span>  <span class="Conceal">¦</span> ++current_call<span class="Delimiter">().</span>next_ingredient_to_process<span class="Delimiter">;</span>
 <span id="L161" class="LineNr">161 </span>  <span class="Delimiter">}</span>
 <span id="L162" class="LineNr">162 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L163" class="LineNr">163 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L163" class="LineNr">163 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L164" class="LineNr">164 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L165" class="LineNr">165 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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><span class="Constant">0</span><span class="Delimiter">);</span>  <span class="Comment">// todo: will fail noisily if we try to read a compound value</span>
 <span id="L166" class="LineNr">166 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
diff --git a/html/028call_return.cc.html b/html/028call_return.cc.html
index 97a3e847..dfbe030e 100644
--- a/html/028call_return.cc.html
+++ b/html/028call_return.cc.html
@@ -98,9 +98,9 @@ if ('onhashchange' in window) {
 <span id="L35" class="LineNr"> 35 </span><span class="Delimiter">}</span>
 <span id="L36" class="LineNr"> 36 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L37" class="LineNr"> 37 </span><span class="Normal">case</span> RETURN: <span class="Delimiter">{</span>
-<span id="L38" class="LineNr"> 38 </span>  <span class="Comment">// Starting Reply</span>
+<span id="L38" class="LineNr"> 38 </span>  <span class="Comment">// Begin Return</span>
 <span id="L39" class="LineNr"> 39 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L40" class="LineNr"> 40 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>name &lt;&lt; <span class="Constant">&quot;: decrementing callstack depth from &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L40" class="LineNr"> 40 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>name &lt;&lt; <span class="Constant">&quot;: decrementing callstack depth from &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L41" class="LineNr"> 41 </span>  <span class="Conceal">¦</span> --Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">;</span>
 <span id="L42" class="LineNr"> 42 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L43" class="LineNr"> 43 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
@@ -111,10 +111,10 @@ if ('onhashchange' in window) {
 <span id="L48" class="LineNr"> 48 </span>  <span class="Comment">// just in case 'main' returns a value, drop it for now</span>
 <span id="L49" class="LineNr"> 49 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">goto</span> stop_running_current_routine<span class="Delimiter">;</span>
 <span id="L50" class="LineNr"> 50 </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>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L51" class="LineNr"> 51 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot; is &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L51" class="LineNr"> 51 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot; is &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L52" class="LineNr"> 52 </span>  <span class="Comment">// make return products available to caller</span>
 <span id="L53" class="LineNr"> 53 </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#L197'>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="L54" class="LineNr"> 54 </span>  <span class="Comment">// End Reply</span>
+<span id="L54" class="LineNr"> 54 </span>  <span class="Comment">// End Return</span>
 <span id="L55" class="LineNr"> 55 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// continue to process rest of *caller* instruction</span>
 <span id="L56" class="LineNr"> 56 </span><span class="Delimiter">}</span>
 <span id="L57" class="LineNr"> 57 </span>
@@ -130,7 +130,7 @@ if ('onhashchange' in window) {
 <span id="L67" class="LineNr"> 67 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> instruction&amp; caller_instruction = caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L68" class="LineNr"> 68 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>caller_instruction<span class="Delimiter">.</span>is_label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L69" class="LineNr"> 69 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>caller_instruction<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L70" class="LineNr"> 70 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>caller_instruction<span class="Delimiter">.</span>operation &lt; <a href='010vm.cc.html#L191'>MAX_PRIMITIVE_RECIPES</a><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L70" class="LineNr"> 70 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='028call_return.cc.html#L114'>is_primitive</a><span class="Delimiter">(</span>caller_instruction<span class="Delimiter">.</span>operation<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L71" class="LineNr"> 71 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> recipe&amp; callee = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> caller_instruction<span class="Delimiter">.</span>operation<span class="Delimiter">);</span>
 <span id="L72" class="LineNr"> 72 </span>  <span class="Conceal">¦</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>callee<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L73" class="LineNr"> 73 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">const</span> instruction&amp; return_inst = callee<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
@@ -174,65 +174,69 @@ if ('onhashchange' in window) {
 <span id="L111" class="LineNr">111 </span>  <span class="Delimiter">}</span>
 <span id="L112" class="LineNr">112 </span><span class="Delimiter">}</span>
 <span id="L113" class="LineNr">113 </span>
-<span id="L114" class="LineNr">114 </span><span class="Delimiter">:(scenario return_type_mismatch)</span>
-<span id="L115" class="LineNr">115 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L116" class="LineNr">116 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L117" class="LineNr">117 </span>  <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>f <span class="Constant">2</span>
-<span id="L118" class="LineNr">118 </span>]
-<span id="L119" class="LineNr">119 </span><span class="muRecipe">def</span> f [
-<span id="L120" class="LineNr">120 </span>  <span class="Constant">12</span>:num<span class="Special"> &lt;- </span>next-ingredient
-<span id="L121" class="LineNr">121 </span>  <span class="Constant">13</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
-<span id="L122" class="LineNr">122 </span>  <span class="Constant">14</span>:point<span class="Special"> &lt;- </span>copy <span class="Constant">12</span>:point/<span class="Special">raw</span>
-<span id="L123" class="LineNr">123 </span>  <span class="Identifier">return</span> <span class="Constant">14</span>:point
-<span id="L124" class="LineNr">124 </span>]
-<span id="L125" class="LineNr">125 </span><span class="traceContains">+error: f: return ingredient '14:point' can't be saved in '3:num'</span>
-<span id="L126" class="LineNr">126 </span>
-<span id="L127" class="LineNr">127 </span><span class="Comment">//: In Mu we'd like to assume that any instruction doesn't modify its</span>
-<span id="L128" class="LineNr">128 </span><span class="Comment">//: ingredients unless they're also products. The /same-as-ingredient inside</span>
-<span id="L129" class="LineNr">129 </span><span class="Comment">//: the recipe's 'return' indicates that an ingredient is intended to be</span>
-<span id="L130" class="LineNr">130 </span><span class="Comment">//: modified in place, and will help catch accidental misuse of such</span>
-<span id="L131" class="LineNr">131 </span><span class="Comment">//: 'ingredient-products' (sometimes called in-out parameters in other</span>
-<span id="L132" class="LineNr">132 </span><span class="Comment">//: languages).</span>
-<span id="L133" class="LineNr">133 </span>
-<span id="L134" class="LineNr">134 </span><span class="Delimiter">:(scenario return_same_as_ingredient)</span>
-<span id="L135" class="LineNr">135 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L136" class="LineNr">136 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L137" class="LineNr">137 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L138" class="LineNr">138 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>test1 <span class="Constant">1</span>:num  <span class="Comment"># call with different ingredient and product</span>
-<span id="L139" class="LineNr">139 </span>]
-<span id="L140" class="LineNr">140 </span><span class="muRecipe">def</span> test1 [
-<span id="L141" class="LineNr">141 </span>  <span class="Constant">10</span>:num<span class="Special"> &lt;- </span>next-ingredient
-<span id="L142" class="LineNr">142 </span>  <span class="Identifier">return</span> <span class="Constant">10</span>:num/same-as-ingredient:<span class="Constant">0</span>
+<span id="L114" class="LineNr">114 </span><span class="Normal">bool</span> <a href='028call_return.cc.html#L114'>is_primitive</a><span class="Delimiter">(</span><a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L115" class="LineNr">115 </span>  <span class="Identifier">return</span> r &lt; <a href='010vm.cc.html#L191'>MAX_PRIMITIVE_RECIPES</a><span class="Delimiter">;</span>
+<span id="L116" class="LineNr">116 </span><span class="Delimiter">}</span>
+<span id="L117" class="LineNr">117 </span>
+<span id="L118" class="LineNr">118 </span><span class="Delimiter">:(scenario return_type_mismatch)</span>
+<span id="L119" class="LineNr">119 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L120" class="LineNr">120 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L121" class="LineNr">121 </span>  <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>f <span class="Constant">2</span>
+<span id="L122" class="LineNr">122 </span>]
+<span id="L123" class="LineNr">123 </span><span class="muRecipe">def</span> f [
+<span id="L124" class="LineNr">124 </span>  <span class="Constant">12</span>:num<span class="Special"> &lt;- </span>next-ingredient
+<span id="L125" class="LineNr">125 </span>  <span class="Constant">13</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
+<span id="L126" class="LineNr">126 </span>  <span class="Constant">14</span>:point<span class="Special"> &lt;- </span>copy <span class="Constant">12</span>:point/<span class="Special">raw</span>
+<span id="L127" class="LineNr">127 </span>  <span class="Identifier">return</span> <span class="Constant">14</span>:point
+<span id="L128" class="LineNr">128 </span>]
+<span id="L129" class="LineNr">129 </span><span class="traceContains">+error: f: return ingredient '14:point' can't be saved in '3:num'</span>
+<span id="L130" class="LineNr">130 </span>
+<span id="L131" class="LineNr">131 </span><span class="Comment">//: In Mu we'd like to assume that any instruction doesn't modify its</span>
+<span id="L132" class="LineNr">132 </span><span class="Comment">//: ingredients unless they're also products. The /same-as-ingredient inside</span>
+<span id="L133" class="LineNr">133 </span><span class="Comment">//: the recipe's 'return' indicates that an ingredient is intended to be</span>
+<span id="L134" class="LineNr">134 </span><span class="Comment">//: modified in place, and will help catch accidental misuse of such</span>
+<span id="L135" class="LineNr">135 </span><span class="Comment">//: 'ingredient-products' (sometimes called in-out parameters in other</span>
+<span id="L136" class="LineNr">136 </span><span class="Comment">//: languages).</span>
+<span id="L137" class="LineNr">137 </span>
+<span id="L138" class="LineNr">138 </span><span class="Delimiter">:(scenario return_same_as_ingredient)</span>
+<span id="L139" class="LineNr">139 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L140" class="LineNr">140 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L141" class="LineNr">141 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L142" class="LineNr">142 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>test1 <span class="Constant">1</span>:num  <span class="Comment"># call with different ingredient and product</span>
 <span id="L143" class="LineNr">143 </span>]
-<span id="L144" class="LineNr">144 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: '2:num &lt;- test1 1:num' should write to '1:num' rather than '2:num'</span>
-<span id="L145" class="LineNr">145 </span>
-<span id="L146" class="LineNr">146 </span><span class="Delimiter">:(scenario return_same_as_ingredient_dummy)</span>
-<span id="L147" class="LineNr">147 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L148" class="LineNr">148 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L149" class="LineNr">149 </span>  _<span class="Special"> &lt;- </span>test1 <span class="Constant">1</span>:num  <span class="Comment"># call with different ingredient and product</span>
-<span id="L150" class="LineNr">150 </span>]
-<span id="L151" class="LineNr">151 </span><span class="muRecipe">def</span> test1 [
-<span id="L152" class="LineNr">152 </span>  <span class="Constant">10</span>:num<span class="Special"> &lt;- </span>next-ingredient
-<span id="L153" class="LineNr">153 </span>  <span class="Identifier">return</span> <span class="Constant">10</span>:num/same-as-ingredient:<span class="Constant">0</span>
+<span id="L144" class="LineNr">144 </span><span class="muRecipe">def</span> test1 [
+<span id="L145" class="LineNr">145 </span>  <span class="Constant">10</span>:num<span class="Special"> &lt;- </span>next-ingredient
+<span id="L146" class="LineNr">146 </span>  <span class="Identifier">return</span> <span class="Constant">10</span>:num/same-as-ingredient:<span class="Constant">0</span>
+<span id="L147" class="LineNr">147 </span>]
+<span id="L148" class="LineNr">148 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: '2:num &lt;- test1 1:num' should write to '1:num' rather than '2:num'</span>
+<span id="L149" class="LineNr">149 </span>
+<span id="L150" class="LineNr">150 </span><span class="Delimiter">:(scenario return_same_as_ingredient_dummy)</span>
+<span id="L151" class="LineNr">151 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L152" class="LineNr">152 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L153" class="LineNr">153 </span>  _<span class="Special"> &lt;- </span>test1 <span class="Constant">1</span>:num  <span class="Comment"># call with different ingredient and product</span>
 <span id="L154" class="LineNr">154 </span>]
-<span id="L155" class="LineNr">155 </span>$error: <span class="Constant">0</span>
-<span id="L156" class="LineNr">156 </span>
-<span id="L157" class="LineNr">157 </span><span class="Delimiter">:(code)</span>
-<span id="L158" class="LineNr">158 </span>string <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> vector&lt;<span class="Normal">double</span>&gt;&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L159" class="LineNr">159 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">&quot;[]&quot;</span><span class="Delimiter">;</span>
-<span id="L160" class="LineNr">160 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L161" class="LineNr">161 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L162" class="LineNr">162 </span>  <span class="Conceal">¦</span> out &lt;&lt; no_scientific<span class="Delimiter">(</span>in<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
-<span id="L163" class="LineNr">163 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L164" class="LineNr">164 </span>  <span class="Delimiter">}</span>
-<span id="L165" class="LineNr">165 </span>  out &lt;&lt; <span class="Constant">&quot;[&quot;</span><span class="Delimiter">;</span>
-<span id="L166" class="LineNr">166 </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>in<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L167" class="LineNr">167 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">&quot;, &quot;</span><span class="Delimiter">;</span>
-<span id="L168" class="LineNr">168 </span>  <span class="Conceal">¦</span> out &lt;&lt; no_scientific<span class="Delimiter">(</span>in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L169" class="LineNr">169 </span>  <span class="Delimiter">}</span>
-<span id="L170" class="LineNr">170 </span>  out &lt;&lt; <span class="Constant">&quot;]&quot;</span><span class="Delimiter">;</span>
-<span id="L171" class="LineNr">171 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L172" class="LineNr">172 </span><span class="Delimiter">}</span>
+<span id="L155" class="LineNr">155 </span><span class="muRecipe">def</span> test1 [
+<span id="L156" class="LineNr">156 </span>  <span class="Constant">10</span>:num<span class="Special"> &lt;- </span>next-ingredient
+<span id="L157" class="LineNr">157 </span>  <span class="Identifier">return</span> <span class="Constant">10</span>:num/same-as-ingredient:<span class="Constant">0</span>
+<span id="L158" class="LineNr">158 </span>]
+<span id="L159" class="LineNr">159 </span>$error: <span class="Constant">0</span>
+<span id="L160" class="LineNr">160 </span>
+<span id="L161" class="LineNr">161 </span><span class="Delimiter">:(code)</span>
+<span id="L162" class="LineNr">162 </span>string <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> vector&lt;<span class="Normal">double</span>&gt;&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L163" class="LineNr">163 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">&quot;[]&quot;</span><span class="Delimiter">;</span>
+<span id="L164" class="LineNr">164 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L165" class="LineNr">165 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L166" class="LineNr">166 </span>  <span class="Conceal">¦</span> out &lt;&lt; no_scientific<span class="Delimiter">(</span>in<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
+<span id="L167" class="LineNr">167 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L168" class="LineNr">168 </span>  <span class="Delimiter">}</span>
+<span id="L169" class="LineNr">169 </span>  out &lt;&lt; <span class="Constant">&quot;[&quot;</span><span class="Delimiter">;</span>
+<span id="L170" class="LineNr">170 </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>in<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L171" class="LineNr">171 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">&quot;, &quot;</span><span class="Delimiter">;</span>
+<span id="L172" class="LineNr">172 </span>  <span class="Conceal">¦</span> out &lt;&lt; no_scientific<span class="Delimiter">(</span>in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L173" class="LineNr">173 </span>  <span class="Delimiter">}</span>
+<span id="L174" class="LineNr">174 </span>  out &lt;&lt; <span class="Constant">&quot;]&quot;</span><span class="Delimiter">;</span>
+<span id="L175" class="LineNr">175 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L176" class="LineNr">176 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/029tools.cc.html b/html/029tools.cc.html
index ec7975b7..11de6fb4 100644
--- a/html/029tools.cc.html
+++ b/html/029tools.cc.html
@@ -94,11 +94,11 @@ if ('onhashchange' in window) {
 <span id="L29" class="LineNr"> 29 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L30" class="LineNr"> 30 </span><span class="Normal">case</span> TRACE: <span class="Delimiter">{</span>
 <span id="L31" class="LineNr"> 31 </span>  <span class="Normal">int</span> depth = 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="L32" class="LineNr"> 32 </span>  string label = <a href='026call.cc.html#L85'>current_instruction</a><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="L32" class="LineNr"> 32 </span>  string label = <a href='026call.cc.html#L87'>current_instruction</a><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="L33" class="LineNr"> 33 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L34" class="LineNr"> 34 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">2</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L34" class="LineNr"> 34 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">2</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">2</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
-<span id="L36" class="LineNr"> 36 </span>  <span class="Conceal">¦</span> out &lt;&lt; inspect<span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L36" class="LineNr"> 36 </span>  <span class="Conceal">¦</span> out &lt;&lt; inspect<span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
 <span id="L37" class="LineNr"> 37 </span>  <span class="Delimiter">}</span>
 <span id="L38" class="LineNr"> 38 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span>depth<span class="Delimiter">,</span> label<span class="Delimiter">)</span> &lt;&lt; out<span class="Delimiter">.</span>str<span class="Delimiter">()</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L39" class="LineNr"> 39 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -117,9 +117,9 @@ if ('onhashchange' in window) {
 <span id="L52" class="LineNr"> 52 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L53" class="LineNr"> 53 </span><span class="Normal">case</span> STASH: <span class="Delimiter">{</span>
 <span id="L54" class="LineNr"> 54 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L55" class="LineNr"> 55 </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><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L55" class="LineNr"> 55 </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><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L56" class="LineNr"> 56 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>i<span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
-<span id="L57" class="LineNr"> 57 </span>  <span class="Conceal">¦</span> out &lt;&lt; inspect<span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L57" class="LineNr"> 57 </span>  <span class="Conceal">¦</span> out &lt;&lt; inspect<span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
 <span id="L58" class="LineNr"> 58 </span>  <span class="Delimiter">}</span>
 <span id="L59" class="LineNr"> 59 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;app&quot;</span><span class="Delimiter">)</span> &lt;&lt; out<span class="Delimiter">.</span>str<span class="Delimiter">()</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L60" class="LineNr"> 60 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -215,7 +215,7 @@ if ('onhashchange' in window) {
 <span id="L150" class="LineNr">150 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L165'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L151" class="LineNr">151 </span>  <span class="Delimiter">}</span>
 <span id="L152" class="LineNr">152 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L153" class="LineNr">153 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L165'>DUMP</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>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>name<span class="Delimiter">);</span>
+<span id="L153" class="LineNr">153 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L165'>DUMP</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>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>name<span class="Delimiter">);</span>
 <span id="L154" class="LineNr">154 </span>  <span class="Delimiter">}</span>
 <span id="L155" class="LineNr">155 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L156" class="LineNr">156 </span><span class="Delimiter">}</span>
@@ -265,10 +265,10 @@ if ('onhashchange' in window) {
 <span id="L200" class="LineNr">200 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L201" class="LineNr">201 </span><span class="Normal">case</span> _PRINT: <span class="Delimiter">{</span>
 <span id="L202" class="LineNr">202 </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>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L203" class="LineNr">203 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><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="L204" class="LineNr">204 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;$print: &quot;</span> &lt;&lt; <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L205" class="LineNr">205 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!has_property<span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> <span class="Constant">&quot;newline&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L206" class="LineNr">206 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> cout &lt;&lt; <a href='026call.cc.html#L85'>current_instruction</a><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="L203" class="LineNr">203 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><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="L204" class="LineNr">204 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;$print: &quot;</span> &lt;&lt; <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L205" class="LineNr">205 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!has_property<span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> <span class="Constant">&quot;newline&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L206" class="LineNr">206 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> cout &lt;&lt; <a href='026call.cc.html#L87'>current_instruction</a><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="L207" class="LineNr">207 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L208" class="LineNr">208 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// hack: '$print 10' prints '10', but '$print 10/newline' prints '\n'</span>
 <span id="L209" class="LineNr">209 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// End $print 10/newline Special-cases</span>
@@ -320,7 +320,7 @@ if ('onhashchange' in window) {
 <span id="L255" class="LineNr">255 </span><span class="Delimiter">}</span>
 <span id="L256" class="LineNr">256 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L257" class="LineNr">257 </span><span class="Normal">case</span> _SYSTEM: <span class="Delimiter">{</span>
-<span id="L258" class="LineNr">258 </span>  <span class="Normal">int</span> status = system<span class="Delimiter">(</span><a href='026call.cc.html#L85'>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>name<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
+<span id="L258" class="LineNr">258 </span>  <span class="Normal">int</span> status = system<span class="Delimiter">(</span><a href='026call.cc.html#L87'>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>name<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
 <span id="L259" class="LineNr">259 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L260" class="LineNr">260 </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>status<span class="Delimiter">);</span>
 <span id="L261" class="LineNr">261 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -359,8 +359,8 @@ if ('onhashchange' in window) {
 <span id="L294" class="LineNr">294 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L295" class="LineNr">295 </span><span class="Normal">case</span> _LOG: <span class="Delimiter">{</span>
 <span id="L296" class="LineNr">296 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L297" class="LineNr">297 </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><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L298" class="LineNr">298 </span>  <span class="Conceal">¦</span> out &lt;&lt; inspect<span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L297" class="LineNr">297 </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><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L298" class="LineNr">298 </span>  <span class="Conceal">¦</span> out &lt;&lt; inspect<span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
 <span id="L299" class="LineNr">299 </span>  <span class="Delimiter">}</span>
 <span id="L300" class="LineNr">300 </span>  LOG &lt;&lt; out<span class="Delimiter">.</span>str<span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L301" class="LineNr">301 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/030container.cc.html b/html/030container.cc.html
index 1427b05c..49fcfbd2 100644
--- a/html/030container.cc.html
+++ b/html/030container.cc.html
@@ -243,7 +243,7 @@ if ('onhashchange' in window) {
 <span id="L176" class="LineNr">176 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- compute container sizes for &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L177" class="LineNr">177 </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="L178" class="LineNr">178 </span>  <span class="Conceal">¦</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="L179" class="LineNr">179 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;- compute container sizes for &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L179" class="LineNr">179 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;- compute container sizes for &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L180" class="LineNr">180 </span>  <span class="Conceal">¦</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 id="L181" class="LineNr">181 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> compute_container_sizes<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="Constant">&quot; in '&quot;</span>+to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span>+<span class="Constant">&quot;'&quot;</span><span class="Delimiter">);</span>
 <span id="L182" class="LineNr">182 </span>  <span class="Conceal">¦</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>
@@ -264,13 +264,13 @@ if ('onhashchange' in window) {
 <span id="L197" class="LineNr">197 </span>
 <span id="L198" class="LineNr">198 </span><span class="Normal">void</span> compute_container_sizes<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">,</span> set&lt;type_tree&gt;&amp; pending_metadata<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L199" class="LineNr">199 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L200" class="LineNr">200 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compute container sizes for &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L200" class="LineNr">200 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compute container sizes for &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L201" class="LineNr">201 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> type<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L202" class="LineNr">202 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>pending_metadata<span class="Delimiter">,</span> *type<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L203" class="LineNr">203 </span>  pending_metadata<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>*type<span class="Delimiter">);</span>
 <span id="L204" class="LineNr">204 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L205" class="LineNr">205 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L206" class="LineNr">206 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; location_for_error_messages &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L206" class="LineNr">206 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; location_for_error_messages &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L207" class="LineNr">207 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L208" class="LineNr">208 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L209" class="LineNr">209 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;address&quot;</span><span class="Delimiter">)</span>
@@ -390,7 +390,7 @@ if ('onhashchange' in window) {
 <span id="L323" class="LineNr">323 </span>  <span class="Comment">// define a container containing an address to itself</span>
 <span id="L324" class="LineNr">324 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L325" class="LineNr">325 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L326" class="LineNr">326 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  y:address:foo</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L326" class="LineNr">326 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  y:<a href='043space.cc.html#L83'>address</a>:foo</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L327" class="LineNr">327 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L328" class="LineNr">328 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
 <span id="L329" class="LineNr">329 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
@@ -402,7 +402,7 @@ if ('onhashchange' in window) {
 <span id="L335" class="LineNr">335 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:point&quot;</span><span class="Delimiter">);</span>
 <span id="L336" class="LineNr">336 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
 <span id="L337" class="LineNr">337 </span>  <span class="Comment">// scanning an address to the container precomputes the size of the container</span>
-<span id="L338" class="LineNr">338 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:address:point&quot;</span><span class="Delimiter">);</span>
+<span id="L338" class="LineNr">338 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L83'>address</a>:point&quot;</span><span class="Delimiter">);</span>
 <span id="L339" class="LineNr">339 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L340" class="LineNr">340 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
 <span id="L341" class="LineNr">341 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span>size<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>
@@ -469,11 +469,11 @@ if ('onhashchange' in window) {
 <span id="L402" class="LineNr">402 </span><span class="Delimiter">}</span>
 <span id="L403" class="LineNr">403 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L404" class="LineNr">404 </span><span class="Normal">case</span> GET: <span class="Delimiter">{</span>
-<span id="L405" class="LineNr">405 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> base = <a href='026call.cc.html#L85'>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 id="L405" class="LineNr">405 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> base = <a href='026call.cc.html#L87'>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 id="L406" class="LineNr">406 </span>  <span class="Comment">// Update GET base in Run</span>
 <span id="L407" class="LineNr">407 </span>  <span class="Normal">int</span> base_address = base<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
 <span id="L408" class="LineNr">408 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base_address == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L409" class="LineNr">409 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L409" class="LineNr">409 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
 <span id="L410" class="LineNr">410 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L411" class="LineNr">411 </span>  <span class="Delimiter">}</span>
 <span id="L412" class="LineNr">412 </span>  <span class="Normal">const</span> type_tree* base_type = base<span class="Delimiter">.</span>type<span class="Delimiter">;</span>
@@ -542,7 +542,7 @@ if ('onhashchange' in window) {
 <span id="L475" class="LineNr">475 </span>  <span class="Constant">12</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
 <span id="L476" class="LineNr">476 </span>  <span class="Constant">13</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
 <span id="L477" class="LineNr">477 </span>  <span class="Constant">14</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">36</span>
-<span id="L478" class="LineNr">478 </span>  <span class="Constant">15</span>:address:num<span class="Special"> &lt;- </span>get <span class="Constant">12</span>:point-number/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1:offset</span>
+<span id="L478" class="LineNr">478 </span>  <span class="Constant">15</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>get <span class="Constant">12</span>:point-number/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1:offset</span>
 <span id="L479" class="LineNr">479 </span>]
 <span id="L480" class="LineNr">480 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: 'get 12:point-number/raw, 1:offset' should write to number but '15' has type (address number)</span>
 <span id="L481" class="LineNr">481 </span>
@@ -625,19 +625,19 @@ if ('onhashchange' in window) {
 <span id="L558" class="LineNr">558 </span><span class="Delimiter">}</span>
 <span id="L559" class="LineNr">559 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L560" class="LineNr">560 </span><span class="Normal">case</span> PUT: <span class="Delimiter">{</span>
-<span id="L561" class="LineNr">561 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> base = <a href='026call.cc.html#L85'>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 id="L561" class="LineNr">561 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> base = <a href='026call.cc.html#L87'>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 id="L562" class="LineNr">562 </span>  <span class="Comment">// Update PUT base in Run</span>
 <span id="L563" class="LineNr">563 </span>  <span class="Normal">int</span> base_address = base<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
 <span id="L564" class="LineNr">564 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base_address == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L565" class="LineNr">565 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L565" class="LineNr">565 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
 <span id="L566" class="LineNr">566 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L567" class="LineNr">567 </span>  <span class="Delimiter">}</span>
 <span id="L568" class="LineNr">568 </span>  <span class="Normal">const</span> type_tree* base_type = base<span class="Delimiter">.</span>type<span class="Delimiter">;</span>
 <span id="L569" class="LineNr">569 </span>  <span class="Comment">// Update PUT base_type in Run</span>
 <span id="L570" class="LineNr">570 </span>  <span class="Normal">int</span> offset = ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L571" class="LineNr">571 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>offset &lt; <span class="Constant">0</span> || offset &gt;= <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>elements<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// copied from Check above</span>
-<span id="L572" class="LineNr">572 </span>  <span class="Normal">int</span> address = base_address + base<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>offset<span class="Delimiter">.</span>at<span class="Delimiter">(</span>offset<span class="Delimiter">);</span>
-<span id="L573" class="LineNr">573 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address to copy to is &quot;</span> &lt;&lt; address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L572" class="LineNr">572 </span>  <span class="Normal">int</span> <a href='043space.cc.html#L83'>address</a> = base_address + base<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>offset<span class="Delimiter">.</span>at<span class="Delimiter">(</span>offset<span class="Delimiter">);</span>
+<span id="L573" class="LineNr">573 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address to copy to is &quot;</span> &lt;&lt; <a href='043space.cc.html#L83'>address</a> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L574" class="LineNr">574 </span>  <span class="Comment">// optimization: directly write the element rather than updating 'product'</span>
 <span id="L575" class="LineNr">575 </span>  <span class="Comment">// and writing the entire container</span>
 <span id="L576" class="LineNr">576 </span>  <span class="Comment">// Write Memory in PUT in Run</span>
@@ -774,7 +774,7 @@ if ('onhashchange' in window) {
 <span id="L707" class="LineNr">707 </span>  <span class="Conceal">¦</span> info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span>element<span class="Delimiter">));</span>
 <span id="L708" class="LineNr">708 </span>  <span class="Conceal">¦</span> expand_type_abbreviations<span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>back<span class="Delimiter">().</span>type<span class="Delimiter">);</span>  <span class="Comment">// todo: use abbreviation before declaration</span>
 <span id="L709" class="LineNr">709 </span>  <span class="Conceal">¦</span> <a href='030container.cc.html#L715'>replace_unknown_types_with_unique_ordinals</a><span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>back<span class="Delimiter">().</span>type<span class="Delimiter">,</span> info<span class="Delimiter">);</span>
-<span id="L710" class="LineNr">710 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  element: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>back<span class="Delimiter">())</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L710" class="LineNr">710 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  element: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>back<span class="Delimiter">())</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L711" class="LineNr">711 </span>  <span class="Conceal">¦</span> <span class="Comment">// End Load Container Element Definition</span>
 <span id="L712" class="LineNr">712 </span>  <span class="Delimiter">}</span>
 <span id="L713" class="LineNr">713 </span><span class="Delimiter">}</span>
@@ -938,7 +938,7 @@ if ('onhashchange' in window) {
 <span id="L871" class="LineNr">871 </span>
 <span id="L872" class="LineNr">872 </span><span class="Delimiter">:(scenario container_with_compound_field_type)</span>
 <span id="L873" class="LineNr">873 </span><span class="muData">container</span> foo [
-<span id="L874" class="LineNr">874 </span>  <span class="Delimiter">{</span>x: <span class="Delimiter">(</span>address array <span class="Delimiter">(</span>address array character<span class="Delimiter">))}</span>
+<span id="L874" class="LineNr">874 </span>  <span class="Delimiter">{</span>x: <span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a> array <span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a> array character<span class="Delimiter">))}</span>
 <span id="L875" class="LineNr">875 </span>]
 <span id="L876" class="LineNr">876 </span>$error: <span class="Constant">0</span>
 <span id="L877" class="LineNr">877 </span>
diff --git a/html/031merge.cc.html b/html/031merge.cc.html
index 20dfa354..ff2a2334 100644
--- a/html/031merge.cc.html
+++ b/html/031merge.cc.html
@@ -226,7 +226,7 @@ if ('onhashchange' in window) {
 <span id="L161" class="LineNr">161 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>top<span class="Delimiter">().</span>container_element_index == <span class="Constant">0</span> &amp;&amp; <a href='021check_instruction.cc.html#L108'>types_coercible</a><span class="Delimiter">(</span>container<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>ingredient_index<span class="Delimiter">)))</span>
 <span id="L162" class="LineNr">162 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L163" class="LineNr">163 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">const</span> reagent&amp; expected_ingredient = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>container<span class="Delimiter">.</span>type<span class="Delimiter">,</span> state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>top<span class="Delimiter">().</span>container_element_index<span class="Delimiter">);</span>
-<span id="L164" class="LineNr">164 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking container &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>container<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; || &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>expected_ingredient<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; vs ingredient &quot;</span> &lt;&lt; ingredient_index &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L164" class="LineNr">164 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking container &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>container<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; || &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>expected_ingredient<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; vs ingredient &quot;</span> &lt;&lt; ingredient_index &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L165" class="LineNr">165 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// if the current element is the ingredient we expect, move on to the next element/ingredient</span>
 <span id="L166" class="LineNr">166 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='021check_instruction.cc.html#L108'>types_coercible</a><span class="Delimiter">(</span>expected_ingredient<span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>ingredient_index<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
 <span id="L167" class="LineNr">167 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++ingredient_index<span class="Delimiter">;</span>
diff --git a/html/032array.cc.html b/html/032array.cc.html
index fab5ef56..82126414 100644
--- a/html/032array.cc.html
+++ b/html/032array.cc.html
@@ -114,7 +114,7 @@ if ('onhashchange' in window) {
 <span id="L49" class="LineNr"> 49 </span><span class="Delimiter">}</span>
 <span id="L50" class="LineNr"> 50 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L51" class="LineNr"> 51 </span><span class="Normal">case</span> CREATE_ARRAY: <span class="Delimiter">{</span>
-<span id="L52" class="LineNr"> 52 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> product = <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L52" class="LineNr"> 52 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> product = <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L53" class="LineNr"> 53 </span>  <span class="Comment">// Update CREATE_ARRAY product in Run</span>
 <span id="L54" class="LineNr"> 54 </span>  <span class="Normal">int</span> base_address = product<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
 <span id="L55" class="LineNr"> 55 </span>  type_tree* array_length_from_type = product<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>right<span class="Delimiter">;</span>
@@ -170,7 +170,7 @@ if ('onhashchange' in window) {
 <span id="L105" class="LineNr">105 </span><span class="Delimiter">:(before &quot;End size_of(reagent r) Special-cases&quot;)</span>
 <span id="L106" class="LineNr">106 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!r<span class="Delimiter">.</span>type<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>atom &amp;&amp; r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value == get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;array&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L107" class="LineNr">107 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L108" class="LineNr">108 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; r<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' is an array of what?</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L108" class="LineNr">108 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; r<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' is an array of what?</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L109" class="LineNr">109 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L110" class="LineNr">110 </span>  <span class="Delimiter">}</span>
 <span id="L111" class="LineNr">111 </span>  <span class="Identifier">return</span> <span class="Comment">/*</span><span class="Comment">space for length</span><span class="Comment">*/</span><span class="Constant">1</span> + <a href='032array.cc.html#L397'>array_length</a><span class="Delimiter">(</span>r<span class="Delimiter">)</span>*size_of<span class="Delimiter">(</span><a href='032array.cc.html#L381'>array_element</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
@@ -185,7 +185,7 @@ if ('onhashchange' in window) {
 <span id="L120" class="LineNr">120 </span>  <span class="Conceal">¦</span> <span class="Comment">// get size from type</span>
 <span id="L121" class="LineNr">121 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> <a href='002test.cc.html#L91'>to_integer</a><span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name<span class="Delimiter">);</span>
 <span id="L122" class="LineNr">122 </span>  <span class="Delimiter">}</span>
-<span id="L123" class="LineNr">123 </span>  cerr &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L123" class="LineNr">123 </span>  cerr &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L124" class="LineNr">124 </span>  assert<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">);</span>
 <span id="L125" class="LineNr">125 </span><span class="Delimiter">}</span>
 <span id="L126" class="LineNr">126 </span>
@@ -238,8 +238,8 @@ if ('onhashchange' in window) {
 <span id="L173" class="LineNr">173 </span><span class="Comment">//: disable the size mismatch check for 'merge' instructions since containers</span>
 <span id="L174" class="LineNr">174 </span><span class="Comment">//: can contain arrays, and since we already do plenty of checking for them</span>
 <span id="L175" class="LineNr">175 </span><span class="Delimiter">:(before &quot;End size_mismatch(x) Special-cases&quot;)</span>
-<span id="L176" class="LineNr">176 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>running_step_index &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> <a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>running_recipe<span class="Delimiter">).</span>steps<span class="Delimiter">)</span>
-<span id="L177" class="LineNr">177 </span>  <span class="Conceal">¦</span> &amp;&amp; <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>operation == MERGE<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L176" class="LineNr">176 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>running_step_index &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> <a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>running_recipe<span class="Delimiter">).</span>steps<span class="Delimiter">)</span>
+<span id="L177" class="LineNr">177 </span>  <span class="Conceal">¦</span> &amp;&amp; <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>operation == MERGE<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L178" class="LineNr">178 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L179" class="LineNr">179 </span><span class="Delimiter">}</span>
 <span id="L180" class="LineNr">180 </span>
@@ -289,7 +289,7 @@ if ('onhashchange' in window) {
 <span id="L224" class="LineNr">224 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:point&quot;</span><span class="Delimiter">);</span>
 <span id="L225" class="LineNr">225 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
 <span id="L226" class="LineNr">226 </span>  <span class="Comment">// scanning an address to an array of the container precomputes the size of the container</span>
-<span id="L227" class="LineNr">227 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:address:array:point&quot;</span><span class="Delimiter">);</span>
+<span id="L227" class="LineNr">227 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L83'>address</a>:array:point&quot;</span><span class="Delimiter">);</span>
 <span id="L228" class="LineNr">228 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L229" class="LineNr">229 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
 <span id="L230" class="LineNr">230 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span>size<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>
@@ -313,7 +313,7 @@ if ('onhashchange' in window) {
 <span id="L248" class="LineNr">248 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:point&quot;</span><span class="Delimiter">);</span>
 <span id="L249" class="LineNr">249 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
 <span id="L250" class="LineNr">250 </span>  <span class="Comment">// scanning an address to an array of the container precomputes the size of the container</span>
-<span id="L251" class="LineNr">251 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:address:array:point:10&quot;</span><span class="Delimiter">);</span>
+<span id="L251" class="LineNr">251 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L83'>address</a>:array:point:10&quot;</span><span class="Delimiter">);</span>
 <span id="L252" class="LineNr">252 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L253" class="LineNr">253 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
 <span id="L254" class="LineNr">254 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span>size<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>
@@ -326,7 +326,7 @@ if ('onhashchange' in window) {
 <span id="L261" class="LineNr">261 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:point&quot;</span><span class="Delimiter">);</span>
 <span id="L262" class="LineNr">262 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
 <span id="L263" class="LineNr">263 </span>  <span class="Comment">// scanning repeated address and array types modifying the container precomputes the size of the container</span>
-<span id="L264" class="LineNr">264 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:address:array:address:array:point:10&quot;</span><span class="Delimiter">);</span>
+<span id="L264" class="LineNr">264 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L83'>address</a>:array:<a href='043space.cc.html#L83'>address</a>:array:point:10&quot;</span><span class="Delimiter">);</span>
 <span id="L265" class="LineNr">265 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L266" class="LineNr">266 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
 <span id="L267" class="LineNr">267 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span>size<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>
@@ -339,7 +339,7 @@ if ('onhashchange' in window) {
 <span id="L274" class="LineNr">274 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:point&quot;</span><span class="Delimiter">);</span>
 <span id="L275" class="LineNr">275 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
 <span id="L276" class="LineNr">276 </span>  <span class="Comment">// scanning address to array with a typo</span>
-<span id="L277" class="LineNr">277 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:address:array:adress:number&quot;</span><span class="Delimiter">);</span>
+<span id="L277" class="LineNr">277 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L83'>address</a>:array:adress:number&quot;</span><span class="Delimiter">);</span>
 <span id="L278" class="LineNr">278 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// should not crash</span>
 <span id="L279" class="LineNr">279 </span>  <span class="Comment">// no non-container types precomputed</span>
 <span id="L280" class="LineNr">280 </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>Container_metadata<span class="Delimiter">),</span> old_size<span class="Delimiter">);</span>
@@ -359,11 +359,11 @@ if ('onhashchange' in window) {
 <span id="L294" class="LineNr">294 </span>
 <span id="L295" class="LineNr">295 </span><span class="Delimiter">:(scenario index_compound_element)</span>
 <span id="L296" class="LineNr">296 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L297" class="LineNr">297 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span>address number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)}</span><span class="Special"> &lt;- </span>create-array
+<span id="L297" class="LineNr">297 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a> number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)}</span><span class="Special"> &lt;- </span>create-array
 <span id="L298" class="LineNr">298 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">14</span>
 <span id="L299" class="LineNr">299 </span>  <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">15</span>
 <span id="L300" class="LineNr">300 </span>  <span class="Constant">4</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">16</span>
-<span id="L301" class="LineNr">301 </span>  <span class="Constant">5</span>:address:num<span class="Special"> &lt;- </span>index <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span>address number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)},</span> <span class="Constant">0</span>
+<span id="L301" class="LineNr">301 </span>  <span class="Constant">5</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>index <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a> number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)},</span> <span class="Constant">0</span>
 <span id="L302" class="LineNr">302 </span>]
 <span id="L303" class="LineNr">303 </span><span class="traceContains">+mem: storing 14 in location 5</span>
 <span id="L304" class="LineNr">304 </span>
@@ -413,26 +413,26 @@ if ('onhashchange' in window) {
 <span id="L348" class="LineNr">348 </span><span class="Delimiter">}</span>
 <span id="L349" class="LineNr">349 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L350" class="LineNr">350 </span><span class="Normal">case</span> INDEX: <span class="Delimiter">{</span>
-<span id="L351" class="LineNr">351 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> base = <a href='026call.cc.html#L85'>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 id="L351" class="LineNr">351 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> base = <a href='026call.cc.html#L87'>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 id="L352" class="LineNr">352 </span>  <span class="Comment">// Update INDEX base in Run</span>
 <span id="L353" class="LineNr">353 </span>  <span class="Normal">int</span> base_address = base<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
-<span id="L354" class="LineNr">354 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;base address is &quot;</span> &lt;&lt; base_address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L354" class="LineNr">354 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;base <a href='043space.cc.html#L83'>address</a> is &quot;</span> &lt;&lt; base_address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L355" class="LineNr">355 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base_address == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L356" class="LineNr">356 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L356" class="LineNr">356 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
 <span id="L357" class="LineNr">357 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L358" class="LineNr">358 </span>  <span class="Delimiter">}</span>
-<span id="L359" class="LineNr">359 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> index = <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L359" class="LineNr">359 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> index = <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L360" class="LineNr">360 </span>  <span class="Comment">// Update INDEX index in Run</span>
 <span id="L361" class="LineNr">361 </span>  vector&lt;<span class="Normal">double</span>&gt; index_val<span class="Delimiter">(</span>read_memory<span class="Delimiter">(</span>index<span class="Delimiter">));</span>
 <span id="L362" class="LineNr">362 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &lt; <span class="Constant">0</span> || index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &gt;= <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> base_address<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L363" class="LineNr">363 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;invalid index &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot; in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L363" class="LineNr">363 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;invalid index &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot; in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
 <span id="L364" class="LineNr">364 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L365" class="LineNr">365 </span>  <span class="Delimiter">}</span>
 <span id="L366" class="LineNr">366 </span>  reagent<span class="Comment">/*</span><span class="Comment">local</span><span class="Comment">*/</span> element<span class="Delimiter">;</span>
 <span id="L367" class="LineNr">367 </span>  element<span class="Delimiter">.</span>type = <a href='032array.cc.html#L377'>copy_array_element</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
 <span id="L368" class="LineNr">368 </span>  element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>base_address + <span class="Comment">/*</span><span class="Comment">skip length</span><span class="Comment">*/</span><span class="Constant">1</span> + index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span>*size_of<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
 <span id="L369" class="LineNr">369 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address to copy is &quot;</span> &lt;&lt; element<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L370" class="LineNr">370 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;its type is &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L370" class="LineNr">370 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;its type is &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L371" class="LineNr">371 </span>  <span class="Comment">// Read element</span>
 <span id="L372" class="LineNr">372 </span>  products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>read_memory<span class="Delimiter">(</span>element<span class="Delimiter">));</span>
 <span id="L373" class="LineNr">373 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -477,7 +477,7 @@ if ('onhashchange' in window) {
 <span id="L412" class="LineNr">412 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">14</span><span class="Delimiter">);</span>
 <span id="L413" class="LineNr">413 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">15</span><span class="Delimiter">);</span>
 <span id="L414" class="LineNr">414 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">16</span><span class="Delimiter">);</span>
-<span id="L415" class="LineNr">415 </span>  reagent x<span class="Delimiter">(</span><span class="Constant">&quot;1:array:address:num&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// 3 types, but not a static array</span>
+<span id="L415" class="LineNr">415 </span>  reagent x<span class="Delimiter">(</span><span class="Constant">&quot;1:array:<a href='043space.cc.html#L83'>address</a>:num&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// 3 types, but not a static array</span>
 <span id="L416" class="LineNr">416 </span>  <a href='012transform.cc.html#L91'>populate_value</a><span class="Delimiter">(</span>x<span class="Delimiter">);</span>
 <span id="L417" class="LineNr">417 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='032array.cc.html#L397'>array_length</a><span class="Delimiter">(</span>x<span class="Delimiter">),</span> <span class="Constant">3</span><span class="Delimiter">);</span>
 <span id="L418" class="LineNr">418 </span><span class="Delimiter">}</span>
@@ -604,26 +604,26 @@ if ('onhashchange' in window) {
 <span id="L539" class="LineNr">539 </span><span class="Delimiter">}</span>
 <span id="L540" class="LineNr">540 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L541" class="LineNr">541 </span><span class="Normal">case</span> PUT_INDEX: <span class="Delimiter">{</span>
-<span id="L542" class="LineNr">542 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> base = <a href='026call.cc.html#L85'>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 id="L542" class="LineNr">542 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> base = <a href='026call.cc.html#L87'>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 id="L543" class="LineNr">543 </span>  <span class="Comment">// Update PUT_INDEX base in Run</span>
 <span id="L544" class="LineNr">544 </span>  <span class="Normal">int</span> base_address = base<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
 <span id="L545" class="LineNr">545 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base_address == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L546" class="LineNr">546 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L546" class="LineNr">546 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
 <span id="L547" class="LineNr">547 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L548" class="LineNr">548 </span>  <span class="Delimiter">}</span>
-<span id="L549" class="LineNr">549 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> index = <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L549" class="LineNr">549 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> index = <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L550" class="LineNr">550 </span>  <span class="Comment">// Update PUT_INDEX index in Run</span>
 <span id="L551" class="LineNr">551 </span>  vector&lt;<span class="Normal">double</span>&gt; index_val<span class="Delimiter">(</span>read_memory<span class="Delimiter">(</span>index<span class="Delimiter">));</span>
 <span id="L552" class="LineNr">552 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &lt; <span class="Constant">0</span> || index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &gt;= <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> base_address<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L553" class="LineNr">553 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;invalid index &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot; in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L553" class="LineNr">553 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;invalid index &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot; in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
 <span id="L554" class="LineNr">554 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L555" class="LineNr">555 </span>  <span class="Delimiter">}</span>
-<span id="L556" class="LineNr">556 </span>  <span class="Normal">int</span> address = base_address + <span class="Comment">/*</span><span class="Comment">skip length</span><span class="Comment">*/</span><span class="Constant">1</span> + index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span>*size_of<span class="Delimiter">(</span><a href='032array.cc.html#L381'>array_element</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L557" class="LineNr">557 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address to copy to is &quot;</span> &lt;&lt; address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L556" class="LineNr">556 </span>  <span class="Normal">int</span> <a href='043space.cc.html#L83'>address</a> = base_address + <span class="Comment">/*</span><span class="Comment">skip length</span><span class="Comment">*/</span><span class="Constant">1</span> + index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span>*size_of<span class="Delimiter">(</span><a href='032array.cc.html#L381'>array_element</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L557" class="LineNr">557 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address to copy to is &quot;</span> &lt;&lt; <a href='043space.cc.html#L83'>address</a> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L558" class="LineNr">558 </span>  <span class="Comment">// optimization: directly write the element rather than updating 'product'</span>
 <span id="L559" class="LineNr">559 </span>  <span class="Comment">// and writing the entire array</span>
 <span id="L560" class="LineNr">560 </span>  write_products = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L561" class="LineNr">561 </span>  vector&lt;<span class="Normal">double</span>&gt; value = read_memory<span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span>
+<span id="L561" class="LineNr">561 </span>  vector&lt;<span class="Normal">double</span>&gt; value = read_memory<span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span>
 <span id="L562" class="LineNr">562 </span>  <span class="Comment">// Write Memory in PUT_INDEX in Run</span>
 <span id="L563" class="LineNr">563 </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>value<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L564" class="LineNr">564 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>value<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; address+i &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
@@ -704,10 +704,10 @@ if ('onhashchange' in window) {
 <span id="L639" class="LineNr">639 </span><span class="Delimiter">}</span>
 <span id="L640" class="LineNr">640 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L641" class="LineNr">641 </span><span class="Normal">case</span> LENGTH: <span class="Delimiter">{</span>
-<span id="L642" class="LineNr">642 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> array = <a href='026call.cc.html#L85'>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 id="L642" class="LineNr">642 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> array = <a href='026call.cc.html#L87'>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 id="L643" class="LineNr">643 </span>  <span class="Comment">// Update LENGTH array in Run</span>
 <span id="L644" class="LineNr">644 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>array<span class="Delimiter">.</span>value == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L645" class="LineNr">645 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L645" class="LineNr">645 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
 <span id="L646" class="LineNr">646 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L647" class="LineNr">647 </span>  <span class="Delimiter">}</span>
 <span id="L648" class="LineNr">648 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
@@ -718,7 +718,7 @@ if ('onhashchange' in window) {
 <span id="L653" class="LineNr">653 </span><span class="Comment">//: optimization: none of the instructions in this layer use 'ingredients' so</span>
 <span id="L654" class="LineNr">654 </span><span class="Comment">//: stop copying potentially huge arrays into it.</span>
 <span id="L655" class="LineNr">655 </span><span class="Delimiter">:(before &quot;End should_copy_ingredients Special-cases&quot;)</span>
-<span id="L656" class="LineNr">656 </span><a href='010vm.cc.html#L14'>recipe_ordinal</a> r = <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>operation<span class="Delimiter">;</span>
+<span id="L656" class="LineNr">656 </span><a href='010vm.cc.html#L14'>recipe_ordinal</a> r = <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>operation<span class="Delimiter">;</span>
 <span id="L657" class="LineNr">657 </span><span class="Normal">if</span> <span class="Delimiter">(</span>r == CREATE_ARRAY || r == INDEX || r == PUT_INDEX || r == LENGTH<span class="Delimiter">)</span>
 <span id="L658" class="LineNr">658 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
 </pre>
diff --git a/html/033exclusive_container.cc.html b/html/033exclusive_container.cc.html
index e0ce1f54..88d8d090 100644
--- a/html/033exclusive_container.cc.html
+++ b/html/033exclusive_container.cc.html
@@ -199,7 +199,7 @@ if ('onhashchange' in window) {
 <span id="L134" class="LineNr">134 </span>  <span class="Delimiter">}</span>
 <span id="L135" class="LineNr">135 </span>  <span class="Normal">const</span> reagent&amp; variant = variant_type<span class="Delimiter">(</span>base<span class="Delimiter">,</span> offset<span class="Delimiter">.</span>value<span class="Delimiter">);</span>
 <span id="L136" class="LineNr">136 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!types_coercible<span class="Delimiter">(</span>product<span class="Delimiter">,</span> variant<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L137" class="LineNr">137 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>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;'maybe-convert &quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;' should write to &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but '&quot;</span> &lt;&lt; product<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' has type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>product<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L137" class="LineNr">137 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>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;'maybe-convert &quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;' should write to &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but '&quot;</span> &lt;&lt; product<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' has type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>product<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L138" class="LineNr">138 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L139" class="LineNr">139 </span>  <span class="Delimiter">}</span>
 <span id="L140" class="LineNr">140 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> status = inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
@@ -212,17 +212,17 @@ if ('onhashchange' in window) {
 <span id="L147" class="LineNr">147 </span><span class="Delimiter">}</span>
 <span id="L148" class="LineNr">148 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L149" class="LineNr">149 </span><span class="Normal">case</span> MAYBE_CONVERT: <span class="Delimiter">{</span>
-<span id="L150" class="LineNr">150 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> base = <a href='026call.cc.html#L85'>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 id="L150" class="LineNr">150 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> base = <a href='026call.cc.html#L87'>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 id="L151" class="LineNr">151 </span>  <span class="Comment">// Update MAYBE_CONVERT base in Run</span>
 <span id="L152" class="LineNr">152 </span>  <span class="Normal">int</span> base_address = base<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
 <span id="L153" class="LineNr">153 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base_address == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L154" class="LineNr">154 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L154" class="LineNr">154 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
 <span id="L155" class="LineNr">155 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L156" class="LineNr">156 </span>  <span class="Delimiter">}</span>
-<span id="L157" class="LineNr">157 </span>  <span class="Normal">int</span> tag = <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>value<span class="Delimiter">;</span>
-<span id="L158" class="LineNr">158 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> product = <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L157" class="LineNr">157 </span>  <span class="Normal">int</span> tag = <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>value<span class="Delimiter">;</span>
+<span id="L158" class="LineNr">158 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> product = <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L159" class="LineNr">159 </span>  <span class="Comment">// Update MAYBE_CONVERT product in Run</span>
-<span id="L160" class="LineNr">160 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> status = <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L160" class="LineNr">160 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> status = <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L161" class="LineNr">161 </span>  <span class="Comment">// Update MAYBE_CONVERT status in Run</span>
 <span id="L162" class="LineNr">162 </span>  <span class="Comment">// optimization: directly write results to only update first product when necessary</span>
 <span id="L163" class="LineNr">163 </span>  write_products = <span class="Constant">false</span><span class="Delimiter">;</span>
@@ -383,7 +383,7 @@ if ('onhashchange' in window) {
 <span id="L318" class="LineNr">318 </span><span class="Delimiter">:(before &quot;End <a href='031merge.cc.html#L142'>check_merge_call</a> Special-cases&quot;)</span>
 <span id="L319" class="LineNr">319 </span><span class="Normal">case</span> <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a>: <span class="Delimiter">{</span>
 <span id="L320" class="LineNr">320 </span>  assert<span class="Delimiter">(</span>state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>top<span class="Delimiter">().</span>container_element_index == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L321" class="LineNr">321 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking exclusive container &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>container<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; vs ingredient &quot;</span> &lt;&lt; ingredient_index &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L321" class="LineNr">321 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking exclusive container &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>container<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; vs ingredient &quot;</span> &lt;&lt; ingredient_index &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L322" class="LineNr">322 </span>  <span class="Comment">// easy case: exact match</span>
 <span id="L323" class="LineNr">323 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>types_strictly_match<span class="Delimiter">(</span>container<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>ingredient_index<span class="Delimiter">)))</span>
 <span id="L324" class="LineNr">324 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
@@ -502,11 +502,11 @@ if ('onhashchange' in window) {
 <span id="L437" class="LineNr">437 </span><span class="Comment">//: Since the different variants of an exclusive-container might have</span>
 <span id="L438" class="LineNr">438 </span><span class="Comment">//: different sizes, relax the size mismatch check for 'merge' instructions.</span>
 <span id="L439" class="LineNr">439 </span><span class="Delimiter">:(before &quot;End size_mismatch(x) Special-cases&quot;)</span>
-<span id="L440" class="LineNr">440 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L80'>current_step_index</a><span class="Delimiter">()</span> &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>steps<span class="Delimiter">())</span>
-<span id="L441" class="LineNr">441 </span>  <span class="Conceal">¦</span> &amp;&amp; <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>operation == MERGE
+<span id="L440" class="LineNr">440 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L82'>current_step_index</a><span class="Delimiter">()</span> &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>steps<span class="Delimiter">())</span>
+<span id="L441" class="LineNr">441 </span>  <span class="Conceal">¦</span> &amp;&amp; <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>operation == MERGE
 <span id="L442" class="LineNr">442 </span>  <span class="Conceal">¦</span> &amp;&amp; !current_instruction<span class="Delimiter">().</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span>
-<span id="L443" class="LineNr">443 </span>  <span class="Conceal">¦</span> &amp;&amp; <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L444" class="LineNr">444 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> x = <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L443" class="LineNr">443 </span>  <span class="Conceal">¦</span> &amp;&amp; <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L444" class="LineNr">444 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> x = <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L445" class="LineNr">445 </span>  <span class="Comment">// Update size_mismatch Check for MERGE(x)</span>
 <span id="L446" class="LineNr">446 </span>  <span class="Normal">const</span> type_tree* root_type = x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom ? x<span class="Delimiter">.</span>type : x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">;</span>
 <span id="L447" class="LineNr">447 </span>  assert<span class="Delimiter">(</span>root_type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
diff --git a/html/034address.cc.html b/html/034address.cc.html
index ae716fa4..7d5c45c8 100644
--- a/html/034address.cc.html
+++ b/html/034address.cc.html
@@ -97,8 +97,8 @@ if ('onhashchange' in window) {
 <span id="L33" class="LineNr"> 33 </span><span class="Comment">//:   b) If you allow data to be reclaimed, you have to be careful not to</span>
 <span id="L34" class="LineNr"> 34 </span><span class="Comment">//:   leave any stale addresses pointing at it. Otherwise your program might</span>
 <span id="L35" class="LineNr"> 35 </span><span class="Comment">//:   try to lookup such an address and find something unexpected. Such</span>
-<span id="L36" class="LineNr"> 36 </span><span class="Comment">//:   problems can be very hard to track down, and they can also be exploited</span>
-<span id="L37" class="LineNr"> 37 </span><span class="Comment">//:   to break into your computer over the network, etc.</span>
+<span id="L36" class="LineNr"> 36 </span><span class="Comment">//:   &quot;memory corruption&quot; problems can be very hard to track down, and they</span>
+<span id="L37" class="LineNr"> 37 </span><span class="Comment">//:   can also be exploited to break into your computer over the network, etc.</span>
 <span id="L38" class="LineNr"> 38 </span><span class="Comment">//:</span>
 <span id="L39" class="LineNr"> 39 </span><span class="Comment">//: To avoid these problems, we introduce the notion of a *reference count* or</span>
 <span id="L40" class="LineNr"> 40 </span><span class="Comment">//: refcount. The life cycle of a bit of data accessed through addresses looks</span>
@@ -187,18 +187,18 @@ if ('onhashchange' in window) {
 <span id="L123" class="LineNr">123 </span><span class="Comment"># call 'new' two times with identical types without modifying the results; you</span>
 <span id="L124" class="LineNr">124 </span><span class="Comment"># should get back different results</span>
 <span id="L125" class="LineNr">125 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L126" class="LineNr">126 </span>  <span class="Constant">1</span>:address:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L127" class="LineNr">127 </span>  <span class="Constant">2</span>:address:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L128" class="LineNr">128 </span>  <span class="Constant">3</span>:<span class="Normal">bool</span>/<span class="Special">raw &lt;- </span>equal <span class="Constant">1</span>:address:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">2</span>:address:num/<span class="Special">raw</span>
+<span id="L126" class="LineNr">126 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L127" class="LineNr">127 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L128" class="LineNr">128 </span>  <span class="Constant">3</span>:<span class="Normal">bool</span>/<span class="Special">raw &lt;- </span>equal <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:num/<span class="Special">raw</span>
 <span id="L129" class="LineNr">129 </span>]
 <span id="L130" class="LineNr">130 </span><span class="traceContains">+mem: storing 0 in location 3</span>
 <span id="L131" class="LineNr">131 </span>
 <span id="L132" class="LineNr">132 </span><span class="Delimiter">:(scenario new_array)</span>
 <span id="L133" class="LineNr">133 </span><span class="Comment"># call 'new' with a second ingredient to allocate an array of some type rather than a single copy</span>
 <span id="L134" class="LineNr">134 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L135" class="LineNr">135 </span>  <span class="Constant">1</span>:address:array:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">5</span>
-<span id="L136" class="LineNr">136 </span>  <span class="Constant">2</span>:address:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L137" class="LineNr">137 </span>  <span class="Constant">3</span>:num/<span class="Special">raw &lt;- </span>subtract <span class="Constant">2</span>:address:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:array:num/<span class="Special">raw</span>
+<span id="L135" class="LineNr">135 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">5</span>
+<span id="L136" class="LineNr">136 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L137" class="LineNr">137 </span>  <span class="Constant">3</span>:num/<span class="Special">raw &lt;- </span>subtract <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num/<span class="Special">raw</span>
 <span id="L138" class="LineNr">138 </span>]
 <span id="L139" class="LineNr">139 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;array&quot; &quot;number&quot;), &quot;raw&quot;: ()} &lt;- new {number: &quot;type&quot;}, {5: &quot;literal&quot;}</span>
 <span id="L140" class="LineNr">140 </span><span class="traceContains">+mem: array length is 5</span>
@@ -207,7 +207,7 @@ if ('onhashchange' in window) {
 <span id="L143" class="LineNr">143 </span>
 <span id="L144" class="LineNr">144 </span><span class="Delimiter">:(scenario dilated_reagent_with_new)</span>
 <span id="L145" class="LineNr">145 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L146" class="LineNr">146 </span>  <span class="Constant">1</span>:address:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>address number<span class="Delimiter">)</span>: type<span class="Delimiter">}</span>
+<span id="L146" class="LineNr">146 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span><a href='043space.cc.html#L83'>address</a> number<span class="Delimiter">)</span>: type<span class="Delimiter">}</span>
 <span id="L147" class="LineNr">147 </span>]
 <span id="L148" class="LineNr">148 </span><span class="traceContains">+new: size of '(address number)' is 1</span>
 <span id="L149" class="LineNr">149 </span>
@@ -271,7 +271,7 @@ if ('onhashchange' in window) {
 <span id="L207" class="LineNr">207 </span><span class="Normal">void</span> drop_from_type<span class="Delimiter">(</span>reagent&amp; r<span class="Delimiter">,</span> string expected_type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L208" class="LineNr">208 </span>  assert<span class="Delimiter">(</span>!r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
 <span id="L209" class="LineNr">209 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name != expected_type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L210" class="LineNr">210 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;can't drop2 &quot;</span> &lt;&lt; expected_type &lt;&lt; <span class="Constant">&quot; from '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L210" class="LineNr">210 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;can't drop2 &quot;</span> &lt;&lt; expected_type &lt;&lt; <span class="Constant">&quot; from '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L211" class="LineNr">211 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L212" class="LineNr">212 </span>  <span class="Delimiter">}</span>
 <span id="L213" class="LineNr">213 </span>  <span class="Comment">// r.type = r.type-&gt;right</span>
@@ -298,19 +298,19 @@ if ('onhashchange' in window) {
 <span id="L234" class="LineNr">234 </span><span class="Delimiter">:(scenario new_discerns_singleton_list_from_atom_container)</span>
 <span id="L235" class="LineNr">235 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L236" class="LineNr">236 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L237" class="LineNr">237 </span>  <span class="Constant">1</span>:address:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>num<span class="Delimiter">)</span>: type<span class="Delimiter">}</span>  <span class="Comment"># should be '{num: type}'</span>
+<span id="L237" class="LineNr">237 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>num<span class="Delimiter">)</span>: type<span class="Delimiter">}</span>  <span class="Comment"># should be '{num: type}'</span>
 <span id="L238" class="LineNr">238 </span>]
 <span id="L239" class="LineNr">239 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: product of 'new' has incorrect type: '1:address:num/raw &lt;- new {(num): type}'</span>
 <span id="L240" class="LineNr">240 </span>
 <span id="L241" class="LineNr">241 </span><span class="Delimiter">:(scenario new_with_type_abbreviation)</span>
 <span id="L242" class="LineNr">242 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L243" class="LineNr">243 </span>  <span class="Constant">1</span>:address:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">num:type</span>
+<span id="L243" class="LineNr">243 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">num:type</span>
 <span id="L244" class="LineNr">244 </span>]
 <span id="L245" class="LineNr">245 </span>$error: <span class="Constant">0</span>
 <span id="L246" class="LineNr">246 </span>
 <span id="L247" class="LineNr">247 </span><span class="Delimiter">:(scenario new_with_type_abbreviation_inside_compound)</span>
 <span id="L248" class="LineNr">248 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L249" class="LineNr">249 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>address address number<span class="Delimiter">),</span> <span class="Special">raw</span>: <span class="Delimiter">()}</span><span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>&amp; num<span class="Delimiter">)</span>: type<span class="Delimiter">}</span>
+<span id="L249" class="LineNr">249 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a> <a href='043space.cc.html#L83'>address</a> number<span class="Delimiter">),</span> <span class="Special">raw</span>: <span class="Delimiter">()}</span><span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>&amp; num<span class="Delimiter">)</span>: type<span class="Delimiter">}</span>
 <span id="L250" class="LineNr">250 </span>]
 <span id="L251" class="LineNr">251 </span>$error: <span class="Constant">0</span>
 <span id="L252" class="LineNr">252 </span>
@@ -382,7 +382,7 @@ if ('onhashchange' in window) {
 <span id="L318" class="LineNr">318 </span>  <span class="Conceal">¦</span> size = <span class="Comment">/*</span><span class="Comment">space for length</span><span class="Comment">*/</span><span class="Constant">1</span> + size*ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L319" class="LineNr">319 </span>  <span class="Delimiter">}</span>
 <span id="L320" class="LineNr">320 </span>  <span class="Normal">int</span> result = allocate<span class="Delimiter">(</span>size<span class="Delimiter">);</span>
-<span id="L321" class="LineNr">321 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L321" class="LineNr">321 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L322" class="LineNr">322 </span>  <span class="Conceal">¦</span> <span class="Comment">// initialize array length</span>
 <span id="L323" class="LineNr">323 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing &quot;</span> &lt;&lt; ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; result+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L324" class="LineNr">324 </span>  <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> result+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
@@ -405,9 +405,9 @@ if ('onhashchange' in window) {
 <span id="L341" class="LineNr">341 </span>  <span class="Normal">const</span> <span class="Normal">int</span> result = Current_routine<span class="Delimiter">-&gt;</span>alloc<span class="Delimiter">;</span>
 <span id="L342" class="LineNr">342 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new alloc: &quot;</span> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L343" class="LineNr">343 </span>  <span class="Comment">// initialize allocated space</span>
-<span id="L344" class="LineNr">344 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> address = result<span class="Delimiter">;</span>  address &lt; result+size<span class="Delimiter">;</span>  ++address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L345" class="LineNr">345 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0 in location &quot;</span> &lt;&lt; address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L346" class="LineNr">346 </span>  <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L344" class="LineNr">344 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> <a href='043space.cc.html#L83'>address</a> = result<span class="Delimiter">;</span>  <a href='043space.cc.html#L83'>address</a> &lt; result+size<span class="Delimiter">;</span>  ++address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L345" class="LineNr">345 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0 in location &quot;</span> &lt;&lt; <a href='043space.cc.html#L83'>address</a> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L346" class="LineNr">346 </span>  <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L347" class="LineNr">347 </span>  <span class="Delimiter">}</span>
 <span id="L348" class="LineNr">348 </span>  Current_routine<span class="Delimiter">-&gt;</span>alloc += size<span class="Delimiter">;</span>
 <span id="L349" class="LineNr">349 </span>  <span class="Comment">// no support yet for reclaiming memory between routines</span>
@@ -448,33 +448,33 @@ if ('onhashchange' in window) {
 <span id="L384" class="LineNr">384 </span><span class="Special">% Memory_allocated_until = 10;</span>
 <span id="L385" class="LineNr">385 </span><span class="Special">% put(Memory, Memory_allocated_until, 1);</span>
 <span id="L386" class="LineNr">386 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L387" class="LineNr">387 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L387" class="LineNr">387 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
 <span id="L388" class="LineNr">388 </span>]
 <span id="L389" class="LineNr">389 </span><span class="traceContains">+mem: storing 0 in location 10</span>
 <span id="L390" class="LineNr">390 </span>
 <span id="L391" class="LineNr">391 </span><span class="Delimiter">:(scenario new_size)</span>
 <span id="L392" class="LineNr">392 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L393" class="LineNr">393 </span>  <span class="Constant">11</span>:address:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L394" class="LineNr">394 </span>  <span class="Constant">12</span>:address:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L395" class="LineNr">395 </span>  <span class="Constant">13</span>:num/<span class="Special">raw &lt;- </span>subtract <span class="Constant">12</span>:address:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">11</span>:address:num/<span class="Special">raw</span>
+<span id="L393" class="LineNr">393 </span>  <span class="Constant">11</span>:<a href='043space.cc.html#L83'>address</a>:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L394" class="LineNr">394 </span>  <span class="Constant">12</span>:<a href='043space.cc.html#L83'>address</a>:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L395" class="LineNr">395 </span>  <span class="Constant">13</span>:num/<span class="Special">raw &lt;- </span>subtract <span class="Constant">12</span>:<a href='043space.cc.html#L83'>address</a>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">11</span>:<a href='043space.cc.html#L83'>address</a>:num/<span class="Special">raw</span>
 <span id="L396" class="LineNr">396 </span>]
 <span id="L397" class="LineNr">397 </span><span class="Comment"># size of number + refcount</span>
 <span id="L398" class="LineNr">398 </span><span class="traceContains">+mem: storing 2 in location 13</span>
 <span id="L399" class="LineNr">399 </span>
 <span id="L400" class="LineNr">400 </span><span class="Delimiter">:(scenario new_array_size)</span>
 <span id="L401" class="LineNr">401 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L402" class="LineNr">402 </span>  <span class="Constant">1</span>:address:array:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">5</span>
-<span id="L403" class="LineNr">403 </span>  <span class="Constant">2</span>:address:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L404" class="LineNr">404 </span>  <span class="Constant">3</span>:num/<span class="Special">raw &lt;- </span>subtract <span class="Constant">2</span>:address:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:array:num/<span class="Special">raw</span>
+<span id="L402" class="LineNr">402 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">5</span>
+<span id="L403" class="LineNr">403 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L404" class="LineNr">404 </span>  <span class="Constant">3</span>:num/<span class="Special">raw &lt;- </span>subtract <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num/<span class="Special">raw</span>
 <span id="L405" class="LineNr">405 </span>]
 <span id="L406" class="LineNr">406 </span><span class="Comment"># 5 locations for array contents + array length + refcount</span>
 <span id="L407" class="LineNr">407 </span><span class="traceContains">+mem: storing 7 in location 3</span>
 <span id="L408" class="LineNr">408 </span>
 <span id="L409" class="LineNr">409 </span><span class="Delimiter">:(scenario new_empty_array)</span>
 <span id="L410" class="LineNr">410 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L411" class="LineNr">411 </span>  <span class="Constant">1</span>:address:array:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">0</span>
-<span id="L412" class="LineNr">412 </span>  <span class="Constant">2</span>:address:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L413" class="LineNr">413 </span>  <span class="Constant">3</span>:num/<span class="Special">raw &lt;- </span>subtract <span class="Constant">2</span>:address:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:array:num/<span class="Special">raw</span>
+<span id="L411" class="LineNr">411 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">0</span>
+<span id="L412" class="LineNr">412 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L413" class="LineNr">413 </span>  <span class="Constant">3</span>:num/<span class="Special">raw &lt;- </span>subtract <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num/<span class="Special">raw</span>
 <span id="L414" class="LineNr">414 </span>]
 <span id="L415" class="LineNr">415 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;array&quot; &quot;number&quot;), &quot;raw&quot;: ()} &lt;- new {number: &quot;type&quot;}, {0: &quot;literal&quot;}</span>
 <span id="L416" class="LineNr">416 </span><span class="traceContains">+mem: array length is 0</span>
@@ -485,8 +485,8 @@ if ('onhashchange' in window) {
 <span id="L421" class="LineNr">421 </span><span class="Delimiter">:(scenario new_overflow)</span>
 <span id="L422" class="LineNr">422 </span><span class="Special">% Initial_memory_per_routine = 3;  // barely enough room for point allocation below</span>
 <span id="L423" class="LineNr">423 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L424" class="LineNr">424 </span>  <span class="Constant">1</span>:address:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L425" class="LineNr">425 </span>  <span class="Constant">2</span>:address:point/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">point:type</span>  <span class="Comment"># not enough room in initial page</span>
+<span id="L424" class="LineNr">424 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L425" class="LineNr">425 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:point/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">point:type</span>  <span class="Comment"># not enough room in initial page</span>
 <span id="L426" class="LineNr">426 </span>]
 <span id="L427" class="LineNr">427 </span><span class="traceContains">+new: routine allocated memory from 1000 to 1003</span>
 <span id="L428" class="LineNr">428 </span><span class="traceContains">+new: routine allocated memory from 1003 to 1006</span>
@@ -494,7 +494,7 @@ if ('onhashchange' in window) {
 <span id="L430" class="LineNr">430 </span><span class="Delimiter">:(scenario new_without_ingredient)</span>
 <span id="L431" class="LineNr">431 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L432" class="LineNr">432 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L433" class="LineNr">433 </span>  <span class="Constant">1</span>:address:number<span class="Special"> &lt;- </span><span class="Normal">new</span>  <span class="Comment"># missing ingredient</span>
+<span id="L433" class="LineNr">433 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:number<span class="Special"> &lt;- </span><span class="Normal">new</span>  <span class="Comment"># missing ingredient</span>
 <span id="L434" class="LineNr">434 </span>]
 <span id="L435" class="LineNr">435 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: 'new' requires one or two ingredients, but got '1:address:number &lt;- new'</span>
 </pre>
diff --git a/html/035lookup.cc.html b/html/035lookup.cc.html
index a4ee9480..175b0ad5 100644
--- a/html/035lookup.cc.html
+++ b/html/035lookup.cc.html
@@ -99,10 +99,10 @@ if ('onhashchange' in window) {
 <span id="L34" class="LineNr"> 34 </span>
 <span id="L35" class="LineNr"> 35 </span><span class="Delimiter">:(scenario copy_indirect)</span>
 <span id="L36" class="LineNr"> 36 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L37" class="LineNr"> 37 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L37" class="LineNr"> 37 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
 <span id="L38" class="LineNr"> 38 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
 <span id="L39" class="LineNr"> 39 </span>  <span class="Comment"># This loads location 1 as an address and looks up *that* location.</span>
-<span id="L40" class="LineNr"> 40 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:address:num/lookup
+<span id="L40" class="LineNr"> 40 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num/lookup
 <span id="L41" class="LineNr"> 41 </span>]
 <span id="L42" class="LineNr"> 42 </span><span class="Comment"># 1 contains 10. Skip refcount and lookup location 11.</span>
 <span id="L43" class="LineNr"> 43 </span><span class="traceContains">+mem: storing 34 in location 2</span>
@@ -114,8 +114,8 @@ if ('onhashchange' in window) {
 <span id="L49" class="LineNr"> 49 </span><span class="Comment">//: 'lookup' property</span>
 <span id="L50" class="LineNr"> 50 </span><span class="Delimiter">:(scenario store_indirect)</span>
 <span id="L51" class="LineNr"> 51 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L52" class="LineNr"> 52 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
-<span id="L53" class="LineNr"> 53 </span>  <span class="Constant">1</span>:address:num/lookup<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L53" class="LineNr"> 53 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num/lookup<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
 <span id="L54" class="LineNr"> 54 </span>]
 <span id="L55" class="LineNr"> 55 </span><span class="traceContains">+mem: storing 34 in location 11</span>
 <span id="L56" class="LineNr"> 56 </span>
@@ -126,37 +126,37 @@ if ('onhashchange' in window) {
 <span id="L61" class="LineNr"> 61 </span><span class="Delimiter">:(scenario store_to_0_fails)</span>
 <span id="L62" class="LineNr"> 62 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L63" class="LineNr"> 63 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L64" class="LineNr"> 64 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L65" class="LineNr"> 65 </span>  <span class="Constant">1</span>:address:num/lookup<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L64" class="LineNr"> 64 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L65" class="LineNr"> 65 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num/lookup<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
 <span id="L66" class="LineNr"> 66 </span>]
 <span id="L67" class="LineNr"> 67 </span><span class="traceAbsent">-mem: storing 34 in location 0</span>
-<span id="L68" class="LineNr"> 68 </span><span class="traceContains">+error: can't write to location 0 in '1:address:num/lookup &lt;- copy 34'</span>
+<span id="L68" class="LineNr"> 68 </span><span class="traceContains">+error: can't write to location 0 in '1:<a href='043space.cc.html#L83'>address</a>:num/lookup &lt;- copy 34'</span>
 <span id="L69" class="LineNr"> 69 </span>
 <span id="L70" class="LineNr"> 70 </span><span class="Comment">//: attempts to /lookup address 0 always loudly fail</span>
 <span id="L71" class="LineNr"> 71 </span><span class="Delimiter">:(scenario lookup_0_fails)</span>
 <span id="L72" class="LineNr"> 72 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L73" class="LineNr"> 73 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L74" class="LineNr"> 74 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L75" class="LineNr"> 75 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:address:num/lookup
+<span id="L74" class="LineNr"> 74 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L75" class="LineNr"> 75 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num/lookup
 <span id="L76" class="LineNr"> 76 </span>]
 <span id="L77" class="LineNr"> 77 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: tried to /lookup 0 in '2:num &lt;- copy 1:address:num/lookup'</span>
 <span id="L78" class="LineNr"> 78 </span>
 <span id="L79" class="LineNr"> 79 </span><span class="Delimiter">:(code)</span>
 <span id="L80" class="LineNr"> 80 </span><span class="Normal">void</span> canonize<span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L81" class="LineNr"> 81 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L82" class="LineNr"> 82 </span>  <span class="Comment">// End canonize(x) Special-cases</span>
+<span id="L82" class="LineNr"> 82 </span>  <span class="Comment">// Begin canonize(x) Lookups</span>
 <span id="L83" class="LineNr"> 83 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>x<span class="Delimiter">,</span> <span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">))</span>
 <span id="L84" class="LineNr"> 84 </span>  <span class="Conceal">¦</span> lookup_memory<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
 <span id="L85" class="LineNr"> 85 </span><span class="Delimiter">}</span>
 <span id="L86" class="LineNr"> 86 </span>
 <span id="L87" class="LineNr"> 87 </span><span class="Normal">void</span> lookup_memory<span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L88" class="LineNr"> 88 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type || x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom || x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value != get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L89" class="LineNr"> 89 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to /lookup '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' but it isn't an address</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L89" class="LineNr"> 89 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to /lookup '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' but it isn't an address</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L90" class="LineNr"> 90 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L91" class="LineNr"> 91 </span>  <span class="Delimiter">}</span>
 <span id="L92" class="LineNr"> 92 </span>  <span class="Comment">// compute value</span>
 <span id="L93" class="LineNr"> 93 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>value == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L94" class="LineNr"> 94 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to /lookup 0</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to /lookup 0</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L95" class="LineNr"> 95 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L96" class="LineNr"> 96 </span>  <span class="Delimiter">}</span>
 <span id="L97" class="LineNr"> 97 </span>  lookup_memory_core<span class="Delimiter">(</span>x<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">check_for_null</span><span class="Comment">*/</span><span class="Constant">true</span><span class="Delimiter">);</span>
@@ -173,7 +173,7 @@ if ('onhashchange' in window) {
 <span id="L108" class="LineNr">108 </span>  <span class="Delimiter">}</span>
 <span id="L109" class="LineNr">109 </span>  <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>check_for_null<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L110" class="LineNr">110 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">)</span>
-<span id="L111" class="LineNr">111 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to /lookup 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L111" class="LineNr">111 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to /lookup 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
 <span id="L112" class="LineNr">112 </span>  <span class="Conceal">¦</span> <span class="Normal">else</span>
 <span id="L113" class="LineNr">113 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;tried to /lookup 0</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L114" class="LineNr">114 </span>  <span class="Delimiter">}</span>
@@ -181,7 +181,7 @@ if ('onhashchange' in window) {
 <span id="L116" class="LineNr">116 </span><span class="Delimiter">}</span>
 <span id="L117" class="LineNr">117 </span>
 <span id="L118" class="LineNr">118 </span><span class="Normal">void</span> test_lookup_address_skips_refcount<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L119" class="LineNr">119 </span>  reagent x<span class="Delimiter">(</span><span class="Constant">&quot;*x:address:num&quot;</span><span class="Delimiter">);</span>
+<span id="L119" class="LineNr">119 </span>  reagent x<span class="Delimiter">(</span><span class="Constant">&quot;*x:<a href='043space.cc.html#L83'>address</a>:num&quot;</span><span class="Delimiter">);</span>
 <span id="L120" class="LineNr">120 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><span class="Constant">34</span><span class="Delimiter">);</span>  <span class="Comment">// unsafe</span>
 <span id="L121" class="LineNr">121 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">1000</span><span class="Delimiter">);</span>
 <span id="L122" class="LineNr">122 </span>  lookup_memory<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
@@ -191,7 +191,7 @@ if ('onhashchange' in window) {
 <span id="L126" class="LineNr">126 </span>
 <span id="L127" class="LineNr">127 </span><span class="Normal">void</span> test_lookup_zero_address_does_not_skip_refcount<span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L128" class="LineNr">128 </span>  Hide_errors = <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L129" class="LineNr">129 </span>  reagent x<span class="Delimiter">(</span><span class="Constant">&quot;*x:address:num&quot;</span><span class="Delimiter">);</span>
+<span id="L129" class="LineNr">129 </span>  reagent x<span class="Delimiter">(</span><span class="Constant">&quot;*x:<a href='043space.cc.html#L83'>address</a>:num&quot;</span><span class="Delimiter">);</span>
 <span id="L130" class="LineNr">130 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><span class="Constant">34</span><span class="Delimiter">);</span>  <span class="Comment">// unsafe</span>
 <span id="L131" class="LineNr">131 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L132" class="LineNr">132 </span>  lookup_memory<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
@@ -239,7 +239,7 @@ if ('onhashchange' in window) {
 <span id="L174" class="LineNr">174 </span><span class="Normal">bool</span> canonize_type<span class="Delimiter">(</span>reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L175" class="LineNr">175 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L176" class="LineNr">176 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!r<span class="Delimiter">.</span>type || r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom || !r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left || !r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom || r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value != get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L177" class="LineNr">177 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;cannot perform lookup on '&quot;</span> &lt;&lt; r<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' because it has non-address type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L177" class="LineNr">177 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;cannot perform lookup on '&quot;</span> &lt;&lt; r<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' because it has non-address type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L178" class="LineNr">178 </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="L179" class="LineNr">179 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L180" class="LineNr">180 </span>  <span class="Conceal">¦</span> drop_from_type<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">);</span>
@@ -264,32 +264,32 @@ if ('onhashchange' in window) {
 <span id="L199" class="LineNr">199 </span>
 <span id="L200" class="LineNr">200 </span><span class="Delimiter">:(scenario get_indirect)</span>
 <span id="L201" class="LineNr">201 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L202" class="LineNr">202 </span>  <span class="Constant">1</span>:address:point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L202" class="LineNr">202 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
 <span id="L203" class="LineNr">203 </span>  <span class="Comment"># 10 reserved for refcount</span>
 <span id="L204" class="LineNr">204 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
 <span id="L205" class="LineNr">205 </span>  <span class="Constant">12</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
-<span id="L206" class="LineNr">206 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>get <span class="Constant">1</span>:address:point/lookup<span class="Delimiter">,</span> <span class="Constant">0:offset</span>
+<span id="L206" class="LineNr">206 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>get <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:point/lookup<span class="Delimiter">,</span> <span class="Constant">0:offset</span>
 <span id="L207" class="LineNr">207 </span>]
 <span id="L208" class="LineNr">208 </span><span class="traceContains">+mem: storing 34 in location 2</span>
 <span id="L209" class="LineNr">209 </span>
 <span id="L210" class="LineNr">210 </span><span class="Delimiter">:(scenario get_indirect2)</span>
 <span id="L211" class="LineNr">211 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L212" class="LineNr">212 </span>  <span class="Constant">1</span>:address:point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L212" class="LineNr">212 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
 <span id="L213" class="LineNr">213 </span>  <span class="Comment"># 10 reserved for refcount</span>
 <span id="L214" class="LineNr">214 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
 <span id="L215" class="LineNr">215 </span>  <span class="Constant">12</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
-<span id="L216" class="LineNr">216 </span>  <span class="Constant">2</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>/unsafe
-<span id="L217" class="LineNr">217 </span>  <span class="Constant">2</span>:address:num/lookup<span class="Special"> &lt;- </span>get <span class="Constant">1</span>:address:point/lookup<span class="Delimiter">,</span> <span class="Constant">0:offset</span>
+<span id="L216" class="LineNr">216 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>/unsafe
+<span id="L217" class="LineNr">217 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:num/lookup<span class="Special"> &lt;- </span>get <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:point/lookup<span class="Delimiter">,</span> <span class="Constant">0:offset</span>
 <span id="L218" class="LineNr">218 </span>]
 <span id="L219" class="LineNr">219 </span><span class="traceContains">+mem: storing 34 in location 21</span>
 <span id="L220" class="LineNr">220 </span>
 <span id="L221" class="LineNr">221 </span><span class="Delimiter">:(scenario include_nonlookup_properties)</span>
 <span id="L222" class="LineNr">222 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L223" class="LineNr">223 </span>  <span class="Constant">1</span>:address:point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L223" class="LineNr">223 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
 <span id="L224" class="LineNr">224 </span>  <span class="Comment"># 10 reserved for refcount</span>
 <span id="L225" class="LineNr">225 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
 <span id="L226" class="LineNr">226 </span>  <span class="Constant">12</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
-<span id="L227" class="LineNr">227 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>get <span class="Constant">1</span>:address:point/lookup/foo<span class="Delimiter">,</span> <span class="Constant">0:offset</span>
+<span id="L227" class="LineNr">227 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>get <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:point/lookup/foo<span class="Delimiter">,</span> <span class="Constant">0:offset</span>
 <span id="L228" class="LineNr">228 </span>]
 <span id="L229" class="LineNr">229 </span><span class="traceContains">+mem: storing 34 in location 2</span>
 <span id="L230" class="LineNr">230 </span>
@@ -302,11 +302,11 @@ if ('onhashchange' in window) {
 <span id="L237" class="LineNr">237 </span>
 <span id="L238" class="LineNr">238 </span><span class="Delimiter">:(scenario put_indirect)</span>
 <span id="L239" class="LineNr">239 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L240" class="LineNr">240 </span>  <span class="Constant">1</span>:address:point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L240" class="LineNr">240 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
 <span id="L241" class="LineNr">241 </span>  <span class="Comment"># 10 reserved for refcount</span>
 <span id="L242" class="LineNr">242 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
 <span id="L243" class="LineNr">243 </span>  <span class="Constant">12</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
-<span id="L244" class="LineNr">244 </span>  <span class="Constant">1</span>:address:point/lookup<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> <span class="Constant">1</span>:address:point/lookup<span class="Delimiter">,</span> <span class="Constant">0:offset</span><span class="Delimiter">,</span> <span class="Constant">36</span>
+<span id="L244" class="LineNr">244 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:point/lookup<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:point/lookup<span class="Delimiter">,</span> <span class="Constant">0:offset</span><span class="Delimiter">,</span> <span class="Constant">36</span>
 <span id="L245" class="LineNr">245 </span>]
 <span id="L246" class="LineNr">246 </span><span class="traceContains">+mem: storing 36 in location 11</span>
 <span id="L247" class="LineNr">247 </span>
@@ -320,11 +320,11 @@ if ('onhashchange' in window) {
 <span id="L255" class="LineNr">255 </span><span class="Delimiter">:(scenario put_product_error_with_lookup)</span>
 <span id="L256" class="LineNr">256 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L257" class="LineNr">257 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L258" class="LineNr">258 </span>  <span class="Constant">1</span>:address:point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L258" class="LineNr">258 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
 <span id="L259" class="LineNr">259 </span>  <span class="Comment"># 10 reserved for refcount</span>
 <span id="L260" class="LineNr">260 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
 <span id="L261" class="LineNr">261 </span>  <span class="Constant">12</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
-<span id="L262" class="LineNr">262 </span>  <span class="Constant">1</span>:address:point<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> <span class="Constant">1</span>:address:point/lookup<span class="Delimiter">,</span> <span class="Constant">x:offset</span><span class="Delimiter">,</span> <span class="Constant">36</span>
+<span id="L262" class="LineNr">262 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:point<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:point/lookup<span class="Delimiter">,</span> <span class="Constant">x:offset</span><span class="Delimiter">,</span> <span class="Constant">36</span>
 <span id="L263" class="LineNr">263 </span>]
 <span id="L264" class="LineNr">264 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: product of 'put' must be first ingredient '1:address:point/lookup', but got '1:address:point'</span>
 <span id="L265" class="LineNr">265 </span>
@@ -355,8 +355,8 @@ if ('onhashchange' in window) {
 <span id="L290" class="LineNr">290 </span>  <span class="Constant">12</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">14</span>
 <span id="L291" class="LineNr">291 </span>  <span class="Constant">13</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">15</span>
 <span id="L292" class="LineNr">292 </span>  <span class="Constant">14</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">16</span>
-<span id="L293" class="LineNr">293 </span>  <span class="Constant">1</span>:address:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
-<span id="L294" class="LineNr">294 </span>  <span class="Constant">2</span>:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:address:array:num/lookup
+<span id="L293" class="LineNr">293 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L294" class="LineNr">294 </span>  <span class="Constant">2</span>:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num/lookup
 <span id="L295" class="LineNr">295 </span>]
 <span id="L296" class="LineNr">296 </span><span class="traceContains">+mem: storing 3 in location 2</span>
 <span id="L297" class="LineNr">297 </span><span class="traceContains">+mem: storing 14 in location 3</span>
@@ -366,8 +366,8 @@ if ('onhashchange' in window) {
 <span id="L301" class="LineNr">301 </span><span class="Delimiter">:(scenario create_array_indirect)</span>
 <span id="L302" class="LineNr">302 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L303" class="LineNr">303 </span>  <span class="Constant">1000</span>:num/<span class="Special">raw &lt;- </span>copy <span class="Constant">1</span>  <span class="Comment"># pretend refcount</span>
-<span id="L304" class="LineNr">304 </span>  <span class="Constant">1</span>:address:array:num:<span class="Constant">3</span><span class="Special"> &lt;- </span>copy <span class="Constant">1000</span>/unsafe  <span class="Comment"># pretend allocation</span>
-<span id="L305" class="LineNr">305 </span>  <span class="Constant">1</span>:address:array:num:<span class="Constant">3</span>/lookup<span class="Special"> &lt;- </span>create-array
+<span id="L304" class="LineNr">304 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num:<span class="Constant">3</span><span class="Special"> &lt;- </span>copy <span class="Constant">1000</span>/unsafe  <span class="Comment"># pretend allocation</span>
+<span id="L305" class="LineNr">305 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num:<span class="Constant">3</span>/lookup<span class="Special"> &lt;- </span>create-array
 <span id="L306" class="LineNr">306 </span>]
 <span id="L307" class="LineNr">307 </span><span class="traceContains">+mem: storing 3 in location 1001</span>
 <span id="L308" class="LineNr">308 </span>
@@ -383,8 +383,8 @@ if ('onhashchange' in window) {
 <span id="L318" class="LineNr">318 </span>  <span class="Constant">12</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">14</span>
 <span id="L319" class="LineNr">319 </span>  <span class="Constant">13</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">15</span>
 <span id="L320" class="LineNr">320 </span>  <span class="Constant">14</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">16</span>
-<span id="L321" class="LineNr">321 </span>  <span class="Constant">1</span>:address:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
-<span id="L322" class="LineNr">322 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>index <span class="Constant">1</span>:address:array:num/lookup<span class="Delimiter">,</span> <span class="Constant">1</span>
+<span id="L321" class="LineNr">321 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L322" class="LineNr">322 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>index <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num/lookup<span class="Delimiter">,</span> <span class="Constant">1</span>
 <span id="L323" class="LineNr">323 </span>]
 <span id="L324" class="LineNr">324 </span><span class="traceContains">+mem: storing 15 in location 2</span>
 <span id="L325" class="LineNr">325 </span>
@@ -407,8 +407,8 @@ if ('onhashchange' in window) {
 <span id="L342" class="LineNr">342 </span>  <span class="Constant">12</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">14</span>
 <span id="L343" class="LineNr">343 </span>  <span class="Constant">13</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">15</span>
 <span id="L344" class="LineNr">344 </span>  <span class="Constant">14</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">16</span>
-<span id="L345" class="LineNr">345 </span>  <span class="Constant">1</span>:address:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
-<span id="L346" class="LineNr">346 </span>  <span class="Constant">1</span>:address:array:num/lookup<span class="Special"> &lt;- </span>put-index <span class="Constant">1</span>:address:array:num/lookup<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">34</span>
+<span id="L345" class="LineNr">345 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L346" class="LineNr">346 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num/lookup<span class="Special"> &lt;- </span>put-index <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num/lookup<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">34</span>
 <span id="L347" class="LineNr">347 </span>]
 <span id="L348" class="LineNr">348 </span><span class="traceContains">+mem: storing 34 in location 13</span>
 <span id="L349" class="LineNr">349 </span>
@@ -418,10 +418,10 @@ if ('onhashchange' in window) {
 <span id="L353" class="LineNr">353 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">14</span>
 <span id="L354" class="LineNr">354 </span>  <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">15</span>
 <span id="L355" class="LineNr">355 </span>  <span class="Constant">4</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">16</span>
-<span id="L356" class="LineNr">356 </span>  <span class="Constant">5</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L356" class="LineNr">356 </span>  <span class="Constant">5</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
 <span id="L357" class="LineNr">357 </span>  <span class="Comment"># 10 reserved for refcount</span>
 <span id="L358" class="LineNr">358 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
-<span id="L359" class="LineNr">359 </span>  <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Special"> &lt;- </span>put-index <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">5</span>:address:num/lookup<span class="Delimiter">,</span> <span class="Constant">34</span>
+<span id="L359" class="LineNr">359 </span>  <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Special"> &lt;- </span>put-index <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">5</span>:<a href='043space.cc.html#L83'>address</a>:num/lookup<span class="Delimiter">,</span> <span class="Constant">34</span>
 <span id="L360" class="LineNr">360 </span>]
 <span id="L361" class="LineNr">361 </span><span class="traceContains">+mem: storing 34 in location 3</span>
 <span id="L362" class="LineNr">362 </span>
@@ -433,8 +433,8 @@ if ('onhashchange' in window) {
 <span id="L368" class="LineNr">368 </span>  <span class="Constant">12</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">14</span>
 <span id="L369" class="LineNr">369 </span>  <span class="Constant">13</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">15</span>
 <span id="L370" class="LineNr">370 </span>  <span class="Constant">14</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">16</span>
-<span id="L371" class="LineNr">371 </span>  <span class="Constant">1</span>:address:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
-<span id="L372" class="LineNr">372 </span>  <span class="Constant">1</span>:address:array:num<span class="Special"> &lt;- </span>put-index <span class="Constant">1</span>:address:array:num/lookup<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">34</span>
+<span id="L371" class="LineNr">371 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L372" class="LineNr">372 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num<span class="Special"> &lt;- </span>put-index <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num/lookup<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">34</span>
 <span id="L373" class="LineNr">373 </span>]
 <span id="L374" class="LineNr">374 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: product of 'put-index' must be first ingredient '1:address:array:num/lookup', but got '1:address:array:num'</span>
 <span id="L375" class="LineNr">375 </span>
@@ -450,11 +450,11 @@ if ('onhashchange' in window) {
 <span id="L385" class="LineNr">385 </span>
 <span id="L386" class="LineNr">386 </span><span class="Delimiter">:(scenario dilated_reagent_in_static_array)</span>
 <span id="L387" class="LineNr">387 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L388" class="LineNr">388 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span>address number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)}</span><span class="Special"> &lt;- </span>create-array
-<span id="L389" class="LineNr">389 </span>  <span class="Constant">5</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L390" class="LineNr">390 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span>address number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)}</span><span class="Special"> &lt;- </span>put-index <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span>address number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)},</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">5</span>:address:num
-<span id="L391" class="LineNr">391 </span>  *<span class="Constant">5</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L392" class="LineNr">392 </span>  <span class="Constant">6</span>:num<span class="Special"> &lt;- </span>copy *<span class="Constant">5</span>:address:num
+<span id="L388" class="LineNr">388 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a> number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)}</span><span class="Special"> &lt;- </span>create-array
+<span id="L389" class="LineNr">389 </span>  <span class="Constant">5</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L390" class="LineNr">390 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a> number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)}</span><span class="Special"> &lt;- </span>put-index <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a> number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)},</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">5</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L391" class="LineNr">391 </span>  *<span class="Constant">5</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L392" class="LineNr">392 </span>  <span class="Constant">6</span>:num<span class="Special"> &lt;- </span>copy *<span class="Constant">5</span>:<a href='043space.cc.html#L83'>address</a>:num
 <span id="L393" class="LineNr">393 </span>]
 <span id="L394" class="LineNr">394 </span><span class="traceContains">+run: creating array of size 4</span>
 <span id="L395" class="LineNr">395 </span><span class="traceContains">+mem: storing 34 in location 6</span>
@@ -478,8 +478,8 @@ if ('onhashchange' in window) {
 <span id="L413" class="LineNr">413 </span>  <span class="Constant">12</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">14</span>
 <span id="L414" class="LineNr">414 </span>  <span class="Constant">13</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">15</span>
 <span id="L415" class="LineNr">415 </span>  <span class="Constant">14</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">16</span>
-<span id="L416" class="LineNr">416 </span>  <span class="Constant">1</span>:address:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
-<span id="L417" class="LineNr">417 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>length <span class="Constant">1</span>:address:array:num/lookup
+<span id="L416" class="LineNr">416 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L417" class="LineNr">417 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>length <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num/lookup
 <span id="L418" class="LineNr">418 </span>]
 <span id="L419" class="LineNr">419 </span><span class="traceContains">+mem: storing 3 in location 2</span>
 <span id="L420" class="LineNr">420 </span>
@@ -492,8 +492,8 @@ if ('onhashchange' in window) {
 <span id="L427" class="LineNr">427 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L428" class="LineNr">428 </span>  <span class="Comment"># 10 reserved for refcount</span>
 <span id="L429" class="LineNr">429 </span>  <span class="Constant">11</span>:number-<span class="Normal">or</span>-point<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/number<span class="Delimiter">,</span> <span class="Constant">34</span>
-<span id="L430" class="LineNr">430 </span>  <span class="Constant">1</span>:address:number-<span class="Normal">or</span>-point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
-<span id="L431" class="LineNr">431 </span>  <span class="Constant">2</span>:num<span class="Delimiter">,</span> <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert <span class="Constant">1</span>:address:number-<span class="Normal">or</span>-point/lookup<span class="Delimiter">,</span> <span class="Constant">i:variant</span>
+<span id="L430" class="LineNr">430 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:number-<span class="Normal">or</span>-point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L431" class="LineNr">431 </span>  <span class="Constant">2</span>:num<span class="Delimiter">,</span> <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:number-<span class="Normal">or</span>-point/lookup<span class="Delimiter">,</span> <span class="Constant">i:variant</span>
 <span id="L432" class="LineNr">432 </span>]
 <span id="L433" class="LineNr">433 </span><span class="traceContains">+mem: storing 1 in location 3</span>
 <span id="L434" class="LineNr">434 </span><span class="traceContains">+mem: storing 34 in location 2</span>
@@ -502,9 +502,9 @@ if ('onhashchange' in window) {
 <span id="L437" class="LineNr">437 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L438" class="LineNr">438 </span>  <span class="Comment"># 10 reserved for refcount</span>
 <span id="L439" class="LineNr">439 </span>  <span class="Constant">11</span>:number-<span class="Normal">or</span>-point<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/number<span class="Delimiter">,</span> <span class="Constant">34</span>
-<span id="L440" class="LineNr">440 </span>  <span class="Constant">1</span>:address:number-<span class="Normal">or</span>-point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
-<span id="L441" class="LineNr">441 </span>  <span class="Constant">2</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>/unsafe
-<span id="L442" class="LineNr">442 </span>  <span class="Constant">2</span>:address:num/lookup<span class="Delimiter">,</span> <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert <span class="Constant">1</span>:address:number-<span class="Normal">or</span>-point/lookup<span class="Delimiter">,</span> <span class="Constant">i:variant</span>
+<span id="L440" class="LineNr">440 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:number-<span class="Normal">or</span>-point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L441" class="LineNr">441 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>/unsafe
+<span id="L442" class="LineNr">442 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:num/lookup<span class="Delimiter">,</span> <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:number-<span class="Normal">or</span>-point/lookup<span class="Delimiter">,</span> <span class="Constant">i:variant</span>
 <span id="L443" class="LineNr">443 </span>]
 <span id="L444" class="LineNr">444 </span><span class="traceContains">+mem: storing 1 in location 3</span>
 <span id="L445" class="LineNr">445 </span><span class="traceContains">+mem: storing 34 in location 21</span>
@@ -513,9 +513,9 @@ if ('onhashchange' in window) {
 <span id="L448" class="LineNr">448 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L449" class="LineNr">449 </span>  <span class="Comment"># 10 reserved for refcount</span>
 <span id="L450" class="LineNr">450 </span>  <span class="Constant">11</span>:number-<span class="Normal">or</span>-point<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/number<span class="Delimiter">,</span> <span class="Constant">34</span>
-<span id="L451" class="LineNr">451 </span>  <span class="Constant">1</span>:address:number-<span class="Normal">or</span>-point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
-<span id="L452" class="LineNr">452 </span>  <span class="Constant">2</span>:address:<span class="Normal">bool</span><span class="Special"> &lt;- </span>copy <span class="Constant">20</span>/unsafe
-<span id="L453" class="LineNr">453 </span>  <span class="Constant">3</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:address:<span class="Normal">bool</span>/lookup<span class="Special"> &lt;- </span>maybe-convert <span class="Constant">1</span>:address:number-<span class="Normal">or</span>-point/lookup<span class="Delimiter">,</span> <span class="Constant">i:variant</span>
+<span id="L451" class="LineNr">451 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:number-<span class="Normal">or</span>-point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L452" class="LineNr">452 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>copy <span class="Constant">20</span>/unsafe
+<span id="L453" class="LineNr">453 </span>  <span class="Constant">3</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:<span class="Normal">bool</span>/lookup<span class="Special"> &lt;- </span>maybe-convert <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:number-<span class="Normal">or</span>-point/lookup<span class="Delimiter">,</span> <span class="Constant">i:variant</span>
 <span id="L454" class="LineNr">454 </span>]
 <span id="L455" class="LineNr">455 </span><span class="traceContains">+mem: storing 1 in location 21</span>
 <span id="L456" class="LineNr">456 </span><span class="traceContains">+mem: storing 34 in location 3</span>
@@ -536,8 +536,8 @@ if ('onhashchange' in window) {
 <span id="L471" class="LineNr">471 </span>
 <span id="L472" class="LineNr">472 </span><span class="Delimiter">:(scenario merge_exclusive_container_indirect)</span>
 <span id="L473" class="LineNr">473 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L474" class="LineNr">474 </span>  <span class="Constant">1</span>:address:number-<span class="Normal">or</span>-point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
-<span id="L475" class="LineNr">475 </span>  <span class="Constant">1</span>:address:number-<span class="Normal">or</span>-point/lookup<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/number<span class="Delimiter">,</span> <span class="Constant">34</span>
+<span id="L474" class="LineNr">474 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:number-<span class="Normal">or</span>-point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L475" class="LineNr">475 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:number-<span class="Normal">or</span>-point/lookup<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/number<span class="Delimiter">,</span> <span class="Constant">34</span>
 <span id="L476" class="LineNr">476 </span>]
 <span id="L477" class="LineNr">477 </span><span class="Comment"># skip 10 for refcount</span>
 <span id="L478" class="LineNr">478 </span><span class="traceContains">+mem: storing 0 in location 11</span>
@@ -550,10 +550,10 @@ if ('onhashchange' in window) {
 <span id="L485" class="LineNr">485 </span>
 <span id="L486" class="LineNr">486 </span><span class="Delimiter">:(scenario lookup_abbreviation)</span>
 <span id="L487" class="LineNr">487 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L488" class="LineNr">488 </span>  <span class="Constant">1</span>:address:number<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L488" class="LineNr">488 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:number<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
 <span id="L489" class="LineNr">489 </span>  <span class="Comment"># 10 reserved for refcount</span>
 <span id="L490" class="LineNr">490 </span>  <span class="Constant">11</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L491" class="LineNr">491 </span>  <span class="Constant">3</span>:number<span class="Special"> &lt;- </span>copy *<span class="Constant">1</span>:address:number
+<span id="L491" class="LineNr">491 </span>  <span class="Constant">3</span>:number<span class="Special"> &lt;- </span>copy *<span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:number
 <span id="L492" class="LineNr">492 </span>]
 <span id="L493" class="LineNr">493 </span><span class="traceContains">+parse: ingredient: {1: (&quot;address&quot; &quot;number&quot;), &quot;lookup&quot;: ()}</span>
 <span id="L494" class="LineNr">494 </span><span class="traceContains">+mem: storing 34 in location 3</span>
@@ -576,9 +576,9 @@ if ('onhashchange' in window) {
 <span id="L511" class="LineNr">511 </span><a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;$dump&quot;</span><span class="Delimiter">,</span> _DUMP<span class="Delimiter">);</span>
 <span id="L512" class="LineNr">512 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L513" class="LineNr">513 </span><span class="Normal">case</span> _DUMP: <span class="Delimiter">{</span>
-<span id="L514" class="LineNr">514 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> after_canonize = <a href='026call.cc.html#L85'>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 id="L514" class="LineNr">514 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> after_canonize = <a href='026call.cc.html#L87'>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 id="L515" class="LineNr">515 </span>  canonize<span class="Delimiter">(</span>after_canonize<span class="Delimiter">);</span>
-<span id="L516" class="LineNr">516 </span>  cerr &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <a href='026call.cc.html#L85'>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>name &lt;&lt; <span class="Constant">' '</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='026call.cc.html#L85'>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> &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>after_canonize<span class="Delimiter">.</span>value<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> after_canonize<span class="Delimiter">.</span>value<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L516" class="LineNr">516 </span>  cerr &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <a href='026call.cc.html#L87'>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>name &lt;&lt; <span class="Constant">' '</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='026call.cc.html#L87'>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> &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>after_canonize<span class="Delimiter">.</span>value<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> after_canonize<span class="Delimiter">.</span>value<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L517" class="LineNr">517 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L518" class="LineNr">518 </span><span class="Delimiter">}</span>
 <span id="L519" class="LineNr">519 </span>
@@ -592,12 +592,12 @@ if ('onhashchange' in window) {
 <span id="L527" class="LineNr">527 </span><a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;$bar&quot;</span><span class="Delimiter">,</span> _BAR<span class="Delimiter">);</span>
 <span id="L528" class="LineNr">528 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L529" class="LineNr">529 </span><span class="Normal">case</span> _BAR: <span class="Delimiter">{</span>
-<span id="L530" class="LineNr">530 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L530" class="LineNr">530 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L531" class="LineNr">531 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>Bar != -<span class="Constant">1</span><span class="Delimiter">)</span> cerr &lt;&lt; Bar &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> Bar<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L532" class="LineNr">532 </span>  <span class="Conceal">¦</span> <span class="Normal">else</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L533" class="LineNr">533 </span>  <span class="Delimiter">}</span>
 <span id="L534" class="LineNr">534 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L535" class="LineNr">535 </span>  <span class="Conceal">¦</span> reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> tmp = <a href='026call.cc.html#L85'>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 id="L535" class="LineNr">535 </span>  <span class="Conceal">¦</span> reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> tmp = <a href='026call.cc.html#L87'>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 id="L536" class="LineNr">536 </span>  <span class="Conceal">¦</span> canonize<span class="Delimiter">(</span>tmp<span class="Delimiter">);</span>
 <span id="L537" class="LineNr">537 </span>  <span class="Conceal">¦</span> Bar = tmp<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
 <span id="L538" class="LineNr">538 </span>  <span class="Delimiter">}</span>
diff --git a/html/036refcount.cc.html b/html/036refcount.cc.html
index a630e068..f7dc5df7 100644
--- a/html/036refcount.cc.html
+++ b/html/036refcount.cc.html
@@ -68,10 +68,10 @@ if ('onhashchange' in window) {
 <span id="L3" class="LineNr">   3 </span>
 <span id="L4" class="LineNr">   4 </span><span class="Delimiter">:(scenario refcounts)</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>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">1000</span>/unsafe
-<span id="L7" class="LineNr">   7 </span>  <span class="Constant">2</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:address:num
-<span id="L8" class="LineNr">   8 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L9" class="LineNr">   9 </span>  <span class="Constant">2</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L6" class="LineNr">   6 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1000</span>/unsafe
+<span id="L7" class="LineNr">   7 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L8" class="LineNr">   8 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L9" class="LineNr">   9 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="L10" class="LineNr">  10 </span>]
 <span id="L11" class="LineNr">  11 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- copy {1000: &quot;literal&quot;, &quot;unsafe&quot;: ()}</span>
 <span id="L12" class="LineNr">  12 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -82,1067 +82,1064 @@ if ('onhashchange' in window) {
 <span id="L17" class="LineNr">  17 </span><span class="traceContains">+run: {2: (&quot;address&quot; &quot;number&quot;)} &lt;- copy {0: &quot;literal&quot;}</span>
 <span id="L18" class="LineNr">  18 </span><span class="traceContains">+mem: decrementing refcount of 1000: 1 -&gt; 0</span>
 <span id="L19" class="LineNr">  19 </span>
-<span id="L20" class="LineNr">  20 </span><span class="Delimiter">:(before &quot;End write_memory(x) Special-cases&quot;)</span>
-<span id="L21" class="LineNr">  21 </span><a href='036refcount.cc.html#L31'>update_any_refcounts</a><span class="Delimiter">(</span>x<span class="Delimiter">,</span> data<span class="Delimiter">);</span>
-<span id="L22" class="LineNr">  22 </span>
-<span id="L23" class="LineNr">  23 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L24" class="LineNr">  24 </span><span class="Normal">bool</span> Reclaim_memory = <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L25" class="LineNr">  25 </span><span class="Delimiter">:(before &quot;End Commandline Options(*arg)&quot;)</span>
-<span id="L26" class="LineNr">  26 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L73'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">&quot;--no-reclaim&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L27" class="LineNr">  27 </span>  cerr &lt;&lt; <span class="Constant">&quot;Disabling memory reclamation. Some tests will fail.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L28" class="LineNr">  28 </span>  Reclaim_memory = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L29" class="LineNr">  29 </span><span class="Delimiter">}</span>
-<span id="L30" class="LineNr">  30 </span><span class="Delimiter">:(code)</span>
-<span id="L31" class="LineNr">  31 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L31'>update_any_refcounts</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; canonized_x<span class="Delimiter">,</span> <span class="Normal">const</span> vector&lt;<span class="Normal">double</span>&gt;&amp; data<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L32" class="LineNr">  32 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Reclaim_memory<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L33" class="LineNr">  33 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!should_update_refcounts<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L34" class="LineNr">  34 </span>  <a href='036refcount.cc.html#L44'>increment_any_refcounts</a><span class="Delimiter">(</span>canonized_x<span class="Delimiter">,</span> data<span class="Delimiter">);</span>  <span class="Comment">// increment first so we don't reclaim on x &lt;- copy x</span>
-<span id="L35" class="LineNr">  35 </span>  <a href='036refcount.cc.html#L62'>decrement_any_refcounts</a><span class="Delimiter">(</span>canonized_x<span class="Delimiter">);</span>
-<span id="L36" class="LineNr">  36 </span><span class="Delimiter">}</span>
-<span id="L37" class="LineNr">  37 </span>
-<span id="L38" class="LineNr">  38 </span><span class="Comment">//: escape hatch for a later layer</span>
-<span id="L39" class="LineNr">  39 </span><span class="Normal">bool</span> <a href='036refcount.cc.html#L39'>should_update_refcounts</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L40" class="LineNr">  40 </span>  <span class="Comment">// End should_update_refcounts() Special-cases</span>
-<span id="L41" class="LineNr">  41 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L42" class="LineNr">  42 </span><span class="Delimiter">}</span>
-<span id="L43" class="LineNr">  43 </span>
-<span id="L44" class="LineNr">  44 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L44'>increment_any_refcounts</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; canonized_x<span class="Delimiter">,</span> <span class="Normal">const</span> vector&lt;<span class="Normal">double</span>&gt;&amp; data<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L45" class="LineNr">  45 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>canonized_x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L46" class="LineNr">  46 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>scalar<span class="Delimiter">(</span>data<span class="Delimiter">));</span>
-<span id="L47" class="LineNr">  47 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>!canonized_x<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>size<span class="Delimiter">);</span>
-<span id="L48" class="LineNr">  48 </span>  <span class="Conceal">¦</span> <a href='036refcount.cc.html#L53'>increment_refcount</a><span class="Delimiter">(</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
-<span id="L49" class="LineNr">  49 </span>  <span class="Delimiter">}</span>
-<span id="L50" class="LineNr">  50 </span>  <span class="Comment">// End Increment Refcounts(canonized_x)</span>
-<span id="L51" class="LineNr">  51 </span><span class="Delimiter">}</span>
-<span id="L52" class="LineNr">  52 </span>
-<span id="L53" class="LineNr">  53 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L53'>increment_refcount</a><span class="Delimiter">(</span><span class="Normal">int</span> new_address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L54" class="LineNr">  54 </span>  assert<span class="Delimiter">(</span>new_address &gt;= <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L55" class="LineNr">  55 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>new_address == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L56" class="LineNr">  56 </span>  ++Total_refcount_updates<span class="Delimiter">;</span>
-<span id="L57" class="LineNr">  57 </span>  <span class="Normal">int</span> new_refcount = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> new_address<span class="Delimiter">);</span>
-<span id="L58" class="LineNr">  58 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;incrementing refcount of &quot;</span> &lt;&lt; new_address &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; new_refcount &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; new_refcount+<span class="Constant">1</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L59" class="LineNr">  59 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> new_address<span class="Delimiter">,</span> new_refcount+<span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L60" class="LineNr">  60 </span><span class="Delimiter">}</span>
-<span id="L61" class="LineNr">  61 </span>
-<span id="L62" class="LineNr">  62 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L62'>decrement_any_refcounts</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; canonized_x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L63" class="LineNr">  63 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>canonized_x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L64" class="LineNr">  64 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>canonized_x<span class="Delimiter">.</span>value<span class="Delimiter">);</span>
-<span id="L65" class="LineNr">  65 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>!canonized_x<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>size<span class="Delimiter">);</span>
-<span id="L66" class="LineNr">  66 </span>  <span class="Conceal">¦</span> <a href='036refcount.cc.html#L71'>decrement_refcount</a><span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> canonized_x<span class="Delimiter">.</span>value<span class="Delimiter">),</span> <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">(</span>canonized_x<span class="Delimiter">.</span>type<span class="Delimiter">),</span> <a href='036refcount.cc.html#L92'>payload_size</a><span class="Delimiter">(</span>canonized_x<span class="Delimiter">));</span>
-<span id="L67" class="LineNr">  67 </span>  <span class="Delimiter">}</span>
-<span id="L68" class="LineNr">  68 </span>  <span class="Comment">// End Decrement Refcounts(canonized_x)</span>
-<span id="L69" class="LineNr">  69 </span><span class="Delimiter">}</span>
-<span id="L70" class="LineNr">  70 </span>
-<span id="L71" class="LineNr">  71 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L71'>decrement_refcount</a><span class="Delimiter">(</span><span class="Normal">int</span> old_address<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">,</span> <span class="Normal">int</span> <a href='036refcount.cc.html#L92'>payload_size</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L72" class="LineNr">  72 </span>  assert<span class="Delimiter">(</span>old_address &gt;= <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L73" class="LineNr">  73 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>old_address == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L74" class="LineNr">  74 </span>  ++Total_refcount_updates<span class="Delimiter">;</span>
-<span id="L75" class="LineNr">  75 </span>  <span class="Normal">int</span> old_refcount = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> old_address<span class="Delimiter">);</span>
-<span id="L76" class="LineNr">  76 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrementing refcount of &quot;</span> &lt;&lt; old_address &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; old_refcount &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; old_refcount-<span class="Constant">1</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L77" class="LineNr">  77 </span>  --old_refcount<span class="Delimiter">;</span>
-<span id="L78" class="LineNr">  78 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> old_address<span class="Delimiter">,</span> old_refcount<span class="Delimiter">);</span>
-<span id="L79" class="LineNr">  79 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>old_refcount &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L80" class="LineNr">  80 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;Negative refcount!!! &quot;</span> &lt;&lt; old_address &lt;&lt; <span class="Constant">' '</span> &lt;&lt; old_refcount &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L81" class="LineNr">  81 </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="L82" class="LineNr">  82 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;Saving <a href='003trace.cc.html#L161'>trace</a> to last_trace.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L83" class="LineNr">  83 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> ofstream fout<span class="Delimiter">(</span><span class="Constant">&quot;last_trace&quot;</span><span class="Delimiter">);</span>
-<span id="L84" class="LineNr">  84 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> fout &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L143'>readable_contents</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L85" class="LineNr">  85 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
-<span id="L86" class="LineNr">  86 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L87" class="LineNr">  87 </span>  <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L88" class="LineNr">  88 </span>  <span class="Delimiter">}</span>
-<span id="L89" class="LineNr">  89 </span>  <span class="Comment">// End Decrement Refcount(old_address, payload_type, payload_size)</span>
-<span id="L90" class="LineNr">  90 </span><span class="Delimiter">}</span>
-<span id="L91" class="LineNr">  91 </span>
-<span id="L92" class="LineNr">  92 </span><span class="Normal">int</span> <a href='036refcount.cc.html#L92'>payload_size</a><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="L93" class="LineNr">  93 </span>  x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
-<span id="L94" class="LineNr">  94 </span>  lookup_memory_core<span class="Delimiter">(</span>x<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">check for nulls</span><span class="Comment">*/</span><span class="Constant">false</span><span class="Delimiter">);</span>
-<span id="L95" class="LineNr">  95 </span>  <span class="Identifier">return</span> size_of<span class="Delimiter">(</span>x<span class="Delimiter">)</span> + <span class="Comment">/*</span><span class="Comment">refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L96" class="LineNr">  96 </span><span class="Delimiter">}</span>
-<span id="L97" class="LineNr">  97 </span>
-<span id="L98" class="LineNr">  98 </span><span class="Delimiter">:(scenario refcounts_reflexive)</span>
-<span id="L99" class="LineNr">  99 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L100" class="LineNr"> 100 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L101" class="LineNr"> 101 </span>  <span class="Comment"># idempotent copies leave refcount unchanged</span>
-<span id="L102" class="LineNr"> 102 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:address:num
-<span id="L103" class="LineNr"> 103 </span>]
-<span id="L104" class="LineNr"> 104 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L105" class="LineNr"> 105 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L106" class="LineNr"> 106 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- copy {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L107" class="LineNr"> 107 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L108" class="LineNr"> 108 </span><span class="traceContains">+mem: decrementing refcount of 1000: 2 -&gt; 1</span>
-<span id="L109" class="LineNr"> 109 </span>
-<span id="L110" class="LineNr"> 110 </span><span class="Delimiter">:(scenario refcounts_call)</span>
-<span id="L111" class="LineNr"> 111 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L112" class="LineNr"> 112 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L113" class="LineNr"> 113 </span>  <span class="Comment"># passing in addresses to recipes increments refcount</span>
-<span id="L114" class="LineNr"> 114 </span>  foo <span class="Constant">1</span>:address:num
-<span id="L115" class="LineNr"> 115 </span>  <span class="Comment"># return does NOT yet decrement refcount; memory must be explicitly managed</span>
-<span id="L116" class="LineNr"> 116 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L20" class="LineNr">  20 </span><span class="Delimiter">:(after &quot;Writing Instruction Product(i)&quot;)</span>
+<span id="L21" class="LineNr">  21 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='028call_return.cc.html#L114'>is_primitive</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>operation<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L22" class="LineNr">  22 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> tmp = <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L23" class="LineNr">  23 </span>  canonize<span class="Delimiter">(</span>tmp<span class="Delimiter">);</span>
+<span id="L24" class="LineNr">  24 </span>  <a href='036refcount.cc.html#L35'>update_any_refcounts</a><span class="Delimiter">(</span>tmp<span class="Delimiter">,</span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L25" class="LineNr">  25 </span><span class="Delimiter">}</span>
+<span id="L26" class="LineNr">  26 </span>
+<span id="L27" class="LineNr">  27 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L28" class="LineNr">  28 </span><span class="Normal">bool</span> Reclaim_memory = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L29" class="LineNr">  29 </span><span class="Delimiter">:(before &quot;End Commandline Options(*arg)&quot;)</span>
+<span id="L30" class="LineNr">  30 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L73'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">&quot;--no-reclaim&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L31" class="LineNr">  31 </span>  cerr &lt;&lt; <span class="Constant">&quot;Disabling memory reclamation. Some tests will fail.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L32" class="LineNr">  32 </span>  Reclaim_memory = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L33" class="LineNr">  33 </span><span class="Delimiter">}</span>
+<span id="L34" class="LineNr">  34 </span><span class="Delimiter">:(code)</span>
+<span id="L35" class="LineNr">  35 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L35'>update_any_refcounts</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; canonized_x<span class="Delimiter">,</span> <span class="Normal">const</span> vector&lt;<span class="Normal">double</span>&gt;&amp; data<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L36" class="LineNr">  36 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Reclaim_memory<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L37" class="LineNr">  37 </span>  <a href='036refcount.cc.html#L41'>increment_any_refcounts</a><span class="Delimiter">(</span>canonized_x<span class="Delimiter">,</span> data<span class="Delimiter">);</span>  <span class="Comment">// increment first so we don't reclaim on x &lt;- copy x</span>
+<span id="L38" class="LineNr">  38 </span>  <a href='036refcount.cc.html#L59'>decrement_any_refcounts</a><span class="Delimiter">(</span>canonized_x<span class="Delimiter">);</span>
+<span id="L39" class="LineNr">  39 </span><span class="Delimiter">}</span>
+<span id="L40" class="LineNr">  40 </span>
+<span id="L41" class="LineNr">  41 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L41'>increment_any_refcounts</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; canonized_x<span class="Delimiter">,</span> <span class="Normal">const</span> vector&lt;<span class="Normal">double</span>&gt;&amp; data<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L42" class="LineNr">  42 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>canonized_x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L43" class="LineNr">  43 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>scalar<span class="Delimiter">(</span>data<span class="Delimiter">));</span>
+<span id="L44" class="LineNr">  44 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>!canonized_x<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>size<span class="Delimiter">);</span>
+<span id="L45" class="LineNr">  45 </span>  <span class="Conceal">¦</span> <a href='036refcount.cc.html#L50'>increment_refcount</a><span class="Delimiter">(</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
+<span id="L46" class="LineNr">  46 </span>  <span class="Delimiter">}</span>
+<span id="L47" class="LineNr">  47 </span>  <span class="Comment">// End Increment Refcounts(canonized_x)</span>
+<span id="L48" class="LineNr">  48 </span><span class="Delimiter">}</span>
+<span id="L49" class="LineNr">  49 </span>
+<span id="L50" class="LineNr">  50 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L50'>increment_refcount</a><span class="Delimiter">(</span><span class="Normal">int</span> new_address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L51" class="LineNr">  51 </span>  assert<span class="Delimiter">(</span>new_address &gt;= <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L52" class="LineNr">  52 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>new_address == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L53" class="LineNr">  53 </span>  ++Total_refcount_updates<span class="Delimiter">;</span>
+<span id="L54" class="LineNr">  54 </span>  <span class="Normal">int</span> new_refcount = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> new_address<span class="Delimiter">);</span>
+<span id="L55" class="LineNr">  55 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;incrementing refcount of &quot;</span> &lt;&lt; new_address &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; new_refcount &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; new_refcount+<span class="Constant">1</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L56" class="LineNr">  56 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> new_address<span class="Delimiter">,</span> new_refcount+<span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L57" class="LineNr">  57 </span><span class="Delimiter">}</span>
+<span id="L58" class="LineNr">  58 </span>
+<span id="L59" class="LineNr">  59 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L59'>decrement_any_refcounts</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; canonized_x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L60" class="LineNr">  60 </span>  <span class="Comment">// Begin Decrement Refcounts(canonized_x)</span>
+<span id="L61" class="LineNr">  61 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>canonized_x<span class="Delimiter">)</span> &amp;&amp; canonized_x<span class="Delimiter">.</span>value != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L62" class="LineNr">  62 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>!canonized_x<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>size<span class="Delimiter">);</span>
+<span id="L63" class="LineNr">  63 </span>  <span class="Conceal">¦</span> <a href='036refcount.cc.html#L68'>decrement_refcount</a><span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> canonized_x<span class="Delimiter">.</span>value<span class="Delimiter">),</span> <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">(</span>canonized_x<span class="Delimiter">.</span>type<span class="Delimiter">),</span> <a href='036refcount.cc.html#L89'>payload_size</a><span class="Delimiter">(</span>canonized_x<span class="Delimiter">));</span>
+<span id="L64" class="LineNr">  64 </span>  <span class="Delimiter">}</span>
+<span id="L65" class="LineNr">  65 </span>  <span class="Comment">// End Decrement Refcounts(canonized_x)</span>
+<span id="L66" class="LineNr">  66 </span><span class="Delimiter">}</span>
+<span id="L67" class="LineNr">  67 </span>
+<span id="L68" class="LineNr">  68 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L68'>decrement_refcount</a><span class="Delimiter">(</span><span class="Normal">int</span> old_address<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">,</span> <span class="Normal">int</span> <a href='036refcount.cc.html#L89'>payload_size</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L69" class="LineNr">  69 </span>  assert<span class="Delimiter">(</span>old_address &gt;= <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L70" class="LineNr">  70 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>old_address == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L71" class="LineNr">  71 </span>  ++Total_refcount_updates<span class="Delimiter">;</span>
+<span id="L72" class="LineNr">  72 </span>  <span class="Normal">int</span> old_refcount = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> old_address<span class="Delimiter">);</span>
+<span id="L73" class="LineNr">  73 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrementing refcount of &quot;</span> &lt;&lt; old_address &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; old_refcount &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; old_refcount-<span class="Constant">1</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L74" class="LineNr">  74 </span>  --old_refcount<span class="Delimiter">;</span>
+<span id="L75" class="LineNr">  75 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> old_address<span class="Delimiter">,</span> old_refcount<span class="Delimiter">);</span>
+<span id="L76" class="LineNr">  76 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>old_refcount &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L77" class="LineNr">  77 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;Negative refcount!!! &quot;</span> &lt;&lt; old_address &lt;&lt; <span class="Constant">' '</span> &lt;&lt; old_refcount &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L78" class="LineNr">  78 </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="L79" class="LineNr">  79 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;Saving <a href='003trace.cc.html#L161'>trace</a> to last_trace.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L80" class="LineNr">  80 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> ofstream fout<span class="Delimiter">(</span><span class="Constant">&quot;last_trace&quot;</span><span class="Delimiter">);</span>
+<span id="L81" class="LineNr">  81 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> fout &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L143'>readable_contents</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L82" class="LineNr">  82 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
+<span id="L83" class="LineNr">  83 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L84" class="LineNr">  84 </span>  <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L85" class="LineNr">  85 </span>  <span class="Delimiter">}</span>
+<span id="L86" class="LineNr">  86 </span>  <span class="Comment">// End Decrement Refcount(old_address, payload_type, payload_size)</span>
+<span id="L87" class="LineNr">  87 </span><span class="Delimiter">}</span>
+<span id="L88" class="LineNr">  88 </span>
+<span id="L89" class="LineNr">  89 </span><span class="Normal">int</span> <a href='036refcount.cc.html#L89'>payload_size</a><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="L90" class="LineNr">  90 </span>  x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
+<span id="L91" class="LineNr">  91 </span>  lookup_memory_core<span class="Delimiter">(</span>x<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">check for nulls</span><span class="Comment">*/</span><span class="Constant">false</span><span class="Delimiter">);</span>
+<span id="L92" class="LineNr">  92 </span>  <span class="Identifier">return</span> size_of<span class="Delimiter">(</span>x<span class="Delimiter">)</span> + <span class="Comment">/*</span><span class="Comment">refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L93" class="LineNr">  93 </span><span class="Delimiter">}</span>
+<span id="L94" class="LineNr">  94 </span>
+<span id="L95" class="LineNr">  95 </span><span class="Delimiter">:(scenario refcounts_reflexive)</span>
+<span id="L96" class="LineNr">  96 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L97" class="LineNr">  97 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L98" class="LineNr">  98 </span>  <span class="Comment"># idempotent copies leave refcount unchanged</span>
+<span id="L99" class="LineNr">  99 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L100" class="LineNr"> 100 </span>]
+<span id="L101" class="LineNr"> 101 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L102" class="LineNr"> 102 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L103" class="LineNr"> 103 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- copy {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L104" class="LineNr"> 104 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L105" class="LineNr"> 105 </span><span class="traceContains">+mem: decrementing refcount of 1000: 2 -&gt; 1</span>
+<span id="L106" class="LineNr"> 106 </span>
+<span id="L107" class="LineNr"> 107 </span><span class="Delimiter">:(scenario refcounts_call)</span>
+<span id="L108" class="LineNr"> 108 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L109" class="LineNr"> 109 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L110" class="LineNr"> 110 </span>  <span class="Comment"># passing in addresses to recipes increments refcount</span>
+<span id="L111" class="LineNr"> 111 </span>  foo <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L112" class="LineNr"> 112 </span>  <span class="Comment"># return does NOT yet decrement refcount; memory must be explicitly managed</span>
+<span id="L113" class="LineNr"> 113 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L114" class="LineNr"> 114 </span>]
+<span id="L115" class="LineNr"> 115 </span><span class="muRecipe">def</span> foo [
+<span id="L116" class="LineNr"> 116 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>next-ingredient
 <span id="L117" class="LineNr"> 117 </span>]
-<span id="L118" class="LineNr"> 118 </span><span class="muRecipe">def</span> foo [
-<span id="L119" class="LineNr"> 119 </span>  <span class="Constant">2</span>:address:num<span class="Special"> &lt;- </span>next-ingredient
-<span id="L120" class="LineNr"> 120 </span>]
-<span id="L121" class="LineNr"> 121 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L122" class="LineNr"> 122 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L123" class="LineNr"> 123 </span><span class="traceContains">+run: foo {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L124" class="LineNr"> 124 </span><span class="Comment"># leave ambiguous precisely when the next increment happens</span>
-<span id="L125" class="LineNr"> 125 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L126" class="LineNr"> 126 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L127" class="LineNr"> 127 </span><span class="traceContains">+mem: decrementing refcount of 1000: 2 -&gt; 1</span>
+<span id="L118" class="LineNr"> 118 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L119" class="LineNr"> 119 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L120" class="LineNr"> 120 </span><span class="traceContains">+run: foo {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L121" class="LineNr"> 121 </span><span class="Comment"># leave ambiguous precisely when the next increment happens</span>
+<span id="L122" class="LineNr"> 122 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L123" class="LineNr"> 123 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L124" class="LineNr"> 124 </span><span class="traceContains">+mem: decrementing refcount of 1000: 2 -&gt; 1</span>
+<span id="L125" class="LineNr"> 125 </span>
+<span id="L126" class="LineNr"> 126 </span><span class="Comment">//: fix up any instructions that don't follow the usual flow of read_memory</span>
+<span id="L127" class="LineNr"> 127 </span><span class="Comment">//: before the RUN switch, and write_memory after</span>
 <span id="L128" class="LineNr"> 128 </span>
-<span id="L129" class="LineNr"> 129 </span><span class="Comment">//: fix up any instructions that don't follow the usual flow of read_memory</span>
-<span id="L130" class="LineNr"> 130 </span><span class="Comment">//: before the RUN switch, and write_memory after</span>
-<span id="L131" class="LineNr"> 131 </span>
-<span id="L132" class="LineNr"> 132 </span><span class="Delimiter">:(scenario refcounts_put)</span>
-<span id="L133" class="LineNr"> 133 </span><span class="muData">container</span> foo [
-<span id="L134" class="LineNr"> 134 </span>  <span class="Normal">x</span>:address:num
-<span id="L135" class="LineNr"> 135 </span>]
-<span id="L136" class="LineNr"> 136 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L137" class="LineNr"> 137 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L138" class="LineNr"> 138 </span>  <span class="Constant">2</span>:address:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
-<span id="L139" class="LineNr"> 139 </span>  *<span class="Constant">2</span>:address:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">2</span>:address:foo<span class="Delimiter">,</span> <span class="Constant">x:offset</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
-<span id="L140" class="LineNr"> 140 </span>]
-<span id="L141" class="LineNr"> 141 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L142" class="LineNr"> 142 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L143" class="LineNr"> 143 </span><span class="traceContains">+run: {2: (&quot;address&quot; &quot;foo&quot;)} &lt;- new {foo: &quot;type&quot;}</span>
-<span id="L144" class="LineNr"> 144 </span><span class="traceContains">+mem: incrementing refcount of 1002: 0 -&gt; 1</span>
-<span id="L145" class="LineNr"> 145 </span><span class="traceContains">+run: {2: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()} &lt;- <a href='001help.cc.html#L221'>put</a> {2: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()}, {x: &quot;offset&quot;}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L146" class="LineNr"> 146 </span><span class="Comment"># put increments refcount</span>
-<span id="L147" class="LineNr"> 147 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L148" class="LineNr"> 148 </span>
-<span id="L149" class="LineNr"> 149 </span><span class="Delimiter">:(after &quot;Write Memory in PUT in Run&quot;)</span>
-<span id="L150" class="LineNr"> 150 </span>reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> element = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">,</span> offset<span class="Delimiter">);</span>
-<span id="L151" class="LineNr"> 151 </span>assert<span class="Delimiter">(</span>!has_property<span class="Delimiter">(</span>element<span class="Delimiter">,</span> <span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">));</span>
-<span id="L152" class="LineNr"> 152 </span>element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>address<span class="Delimiter">);</span>
-<span id="L153" class="LineNr"> 153 </span><a href='036refcount.cc.html#L31'>update_any_refcounts</a><span class="Delimiter">(</span>element<span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span>
-<span id="L154" class="LineNr"> 154 </span>
-<span id="L155" class="LineNr"> 155 </span><span class="Delimiter">:(scenario refcounts_put_index)</span>
-<span id="L156" class="LineNr"> 156 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L157" class="LineNr"> 157 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L158" class="LineNr"> 158 </span>  <span class="Constant">2</span>:address:array:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>address number<span class="Delimiter">)</span>: type<span class="Delimiter">},</span> <span class="Constant">3</span>
-<span id="L159" class="LineNr"> 159 </span>  *<span class="Constant">2</span>:address:array:address:num<span class="Special"> &lt;- </span>put-index *<span class="Constant">2</span>:address:array:address:num<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
-<span id="L160" class="LineNr"> 160 </span>]
-<span id="L161" class="LineNr"> 161 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L162" class="LineNr"> 162 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L163" class="LineNr"> 163 </span><span class="traceContains">+run: {2: (&quot;address&quot; &quot;array&quot; &quot;address&quot; &quot;number&quot;)} &lt;- new {(address number): &quot;type&quot;}, {3: &quot;literal&quot;}</span>
-<span id="L164" class="LineNr"> 164 </span><span class="traceContains">+mem: incrementing refcount of 1002: 0 -&gt; 1</span>
-<span id="L165" class="LineNr"> 165 </span><span class="traceContains">+run: {2: (&quot;address&quot; &quot;array&quot; &quot;address&quot; &quot;number&quot;), &quot;lookup&quot;: ()} &lt;- put-index {2: (&quot;address&quot; &quot;array&quot; &quot;address&quot; &quot;number&quot;), &quot;lookup&quot;: ()}, {0: &quot;literal&quot;}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L166" class="LineNr"> 166 </span><span class="Comment"># put-index increments refcount</span>
-<span id="L167" class="LineNr"> 167 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L168" class="LineNr"> 168 </span>
-<span id="L169" class="LineNr"> 169 </span><span class="Delimiter">:(after &quot;Write Memory in PUT_INDEX in Run&quot;)</span>
-<span id="L170" class="LineNr"> 170 </span>reagent<span class="Comment">/*</span><span class="Comment">local</span><span class="Comment">*/</span> element<span class="Delimiter">;</span>
-<span id="L171" class="LineNr"> 171 </span>element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>address<span class="Delimiter">);</span>
-<span id="L172" class="LineNr"> 172 </span>element<span class="Delimiter">.</span>type = <a href='032array.cc.html#L377'>copy_array_element</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L173" class="LineNr"> 173 </span><a href='036refcount.cc.html#L31'>update_any_refcounts</a><span class="Delimiter">(</span>element<span class="Delimiter">,</span> value<span class="Delimiter">);</span>
-<span id="L174" class="LineNr"> 174 </span>
-<span id="L175" class="LineNr"> 175 </span><span class="Delimiter">:(scenario refcounts_maybe_convert)</span>
-<span id="L176" class="LineNr"> 176 </span><span class="muData">exclusive-container</span> foo [
-<span id="L177" class="LineNr"> 177 </span>  <span class="Normal">x</span>:num
-<span id="L178" class="LineNr"> 178 </span>  <span class="Normal">p</span>:address:num
-<span id="L179" class="LineNr"> 179 </span>]
-<span id="L180" class="LineNr"> 180 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L181" class="LineNr"> 181 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L182" class="LineNr"> 182 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/p<span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
-<span id="L183" class="LineNr"> 183 </span>  <span class="Constant">4</span>:address:num<span class="Delimiter">,</span> <span class="Constant">5</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert <span class="Constant">2</span>:foo<span class="Delimiter">,</span> <span class="Constant">1:variant/p</span>
-<span id="L184" class="LineNr"> 184 </span>]
-<span id="L185" class="LineNr"> 185 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L186" class="LineNr"> 186 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L187" class="LineNr"> 187 </span><span class="Comment"># merging in an address increments refcount</span>
-<span id="L188" class="LineNr"> 188 </span><span class="traceContains">+run: {2: &quot;foo&quot;} &lt;- merge {1: &quot;literal&quot;, &quot;p&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L189" class="LineNr"> 189 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L190" class="LineNr"> 190 </span><span class="traceContains">+run: {4: (&quot;address&quot; &quot;number&quot;)}, {5: &quot;boolean&quot;} &lt;- maybe-convert {2: &quot;foo&quot;}, {1: &quot;variant&quot;, &quot;p&quot;: ()}</span>
-<span id="L191" class="LineNr"> 191 </span><span class="Comment"># maybe-convert increments refcount on success</span>
-<span id="L192" class="LineNr"> 192 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
-<span id="L193" class="LineNr"> 193 </span>
-<span id="L194" class="LineNr"> 194 </span><span class="Delimiter">:(after &quot;Write Memory in Successful MAYBE_CONVERT&quot;)</span>
-<span id="L195" class="LineNr"> 195 </span><span class="Comment">// todo: double-check data here as well</span>
-<span id="L196" class="LineNr"> 196 </span>vector&lt;<span class="Normal">double</span>&gt; data<span class="Delimiter">;</span>
-<span id="L197" class="LineNr"> 197 </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; size_of<span class="Delimiter">(</span>product<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L198" class="LineNr"> 198 </span>  data<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> base_address+<span class="Comment">/*</span><span class="Comment">skip tag</span><span class="Comment">*/</span><span class="Constant">1</span>+i<span class="Delimiter">));</span>
-<span id="L199" class="LineNr"> 199 </span><a href='036refcount.cc.html#L31'>update_any_refcounts</a><span class="Delimiter">(</span>product<span class="Delimiter">,</span> data<span class="Delimiter">);</span>
-<span id="L200" class="LineNr"> 200 </span>
-<span id="L201" class="LineNr"> 201 </span><span class="SalientComment">//:: manage refcounts in instructions that copy multiple locations at a time</span>
-<span id="L202" class="LineNr"> 202 </span>
-<span id="L203" class="LineNr"> 203 </span><span class="Delimiter">:(scenario refcounts_copy_nested)</span>
-<span id="L204" class="LineNr"> 204 </span><span class="muData">container</span> foo [
-<span id="L205" class="LineNr"> 205 </span>  <span class="Normal">x</span>:address:num  <span class="Comment"># address inside container</span>
-<span id="L206" class="LineNr"> 206 </span>]
-<span id="L207" class="LineNr"> 207 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L208" class="LineNr"> 208 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L209" class="LineNr"> 209 </span>  <span class="Constant">2</span>:address:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
-<span id="L210" class="LineNr"> 210 </span>  *<span class="Constant">2</span>:address:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">2</span>:address:foo<span class="Delimiter">,</span> <span class="Constant">x:offset</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
-<span id="L211" class="LineNr"> 211 </span>  <span class="Constant">3</span>:foo<span class="Special"> &lt;- </span>copy *<span class="Constant">2</span>:address:foo
-<span id="L212" class="LineNr"> 212 </span>]
-<span id="L213" class="LineNr"> 213 </span><span class="traceContains">+transform: compute address offsets for container foo</span>
-<span id="L214" class="LineNr"> 214 </span><span class="traceContains">+transform: checking container foo, element 0</span>
-<span id="L215" class="LineNr"> 215 </span><span class="traceContains">+transform: address at offset 0</span>
-<span id="L216" class="LineNr"> 216 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L217" class="LineNr"> 217 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L218" class="LineNr"> 218 </span><span class="traceContains">+run: {2: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()} &lt;- <a href='001help.cc.html#L221'>put</a> {2: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()}, {x: &quot;offset&quot;}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L219" class="LineNr"> 219 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L220" class="LineNr"> 220 </span><span class="Comment"># copying a container increments refcounts of any contained addresses</span>
-<span id="L221" class="LineNr"> 221 </span><span class="traceContains">+run: {3: &quot;foo&quot;} &lt;- copy {2: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()}</span>
-<span id="L222" class="LineNr"> 222 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
-<span id="L223" class="LineNr"> 223 </span>
-<span id="L224" class="LineNr"> 224 </span><span class="Delimiter">:(before &quot;End type_tree Definition&quot;)</span>
-<span id="L225" class="LineNr"> 225 </span><span class="Normal">struct</span> address_element_info <span class="Delimiter">{</span>
-<span id="L226" class="LineNr"> 226 </span>  <span class="Comment">// Where inside a container type (after flattening nested containers!) the</span>
-<span id="L227" class="LineNr"> 227 </span>  <span class="Comment">// address lies</span>
-<span id="L228" class="LineNr"> 228 </span>  <span class="Normal">int</span> offset<span class="Delimiter">;</span>
-<span id="L229" class="LineNr"> 229 </span>
-<span id="L230" class="LineNr"> 230 </span>  <span class="Comment">// All the information we need to compute sizes of items inside an address</span>
-<span id="L231" class="LineNr"> 231 </span>  <span class="Comment">// inside a container. 'payload_type' doesn't need to be a full-scale</span>
-<span id="L232" class="LineNr"> 232 </span>  <span class="Comment">// reagent because an address inside a container can never be an array, and</span>
-<span id="L233" class="LineNr"> 233 </span>  <span class="Comment">// because arrays are the only type that need to know their location to</span>
-<span id="L234" class="LineNr"> 234 </span>  <span class="Comment">// compute their size.</span>
-<span id="L235" class="LineNr"> 235 </span>  <span class="Normal">const</span> type_tree* <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">;</span>
-<span id="L236" class="LineNr"> 236 </span>
-<span id="L237" class="LineNr"> 237 </span>  address_element_info<span class="Delimiter">(</span><span class="Normal">int</span> o<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* p<span class="Delimiter">);</span>
-<span id="L238" class="LineNr"> 238 </span>  address_element_info<span class="Delimiter">(</span><span class="Normal">const</span> address_element_info&amp; other<span class="Delimiter">);</span>
-<span id="L239" class="LineNr"> 239 </span>  <a href='036refcount.cc.html#L251'>~address_element_info</a><span class="Delimiter">();</span>
-<span id="L240" class="LineNr"> 240 </span>  address_element_info&amp; <span class="Normal">operator</span>=<span class="Delimiter">(</span><span class="Normal">const</span> address_element_info&amp; other<span class="Delimiter">);</span>
-<span id="L241" class="LineNr"> 241 </span><span class="Delimiter">};</span>
-<span id="L242" class="LineNr"> 242 </span><span class="Delimiter">:(code)</span>
-<span id="L243" class="LineNr"> 243 </span>address_element_info::address_element_info<span class="Delimiter">(</span><span class="Normal">int</span> o<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L244" class="LineNr"> 244 </span>  offset = o<span class="Delimiter">;</span>
-<span id="L245" class="LineNr"> 245 </span>  <a href='030container.cc.html#L238'>payload_type</a> = p<span class="Delimiter">;</span>
-<span id="L246" class="LineNr"> 246 </span><span class="Delimiter">}</span>
-<span id="L247" class="LineNr"> 247 </span>address_element_info::address_element_info<span class="Delimiter">(</span><span class="Normal">const</span> address_element_info&amp; other<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L248" class="LineNr"> 248 </span>  offset = other<span class="Delimiter">.</span>offset<span class="Delimiter">;</span>
-<span id="L249" class="LineNr"> 249 </span>  <a href='030container.cc.html#L238'>payload_type</a> = copy<span class="Delimiter">(</span>other<span class="Delimiter">.</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">);</span>
-<span id="L250" class="LineNr"> 250 </span><span class="Delimiter">}</span>
-<span id="L251" class="LineNr"> 251 </span>address_element_info::<a href='036refcount.cc.html#L251'>~address_element_info</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L252" class="LineNr"> 252 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L253" class="LineNr"> 253 </span>  <span class="Conceal">¦</span> <span class="Normal">delete</span> <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">;</span>
-<span id="L254" class="LineNr"> 254 </span>  <span class="Conceal">¦</span> <a href='030container.cc.html#L238'>payload_type</a> = <span class="Constant">NULL</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>address_element_info&amp; address_element_info::<span class="Normal">operator</span>=<span class="Delimiter">(</span><span class="Normal">const</span> address_element_info&amp; other<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L258" class="LineNr"> 258 </span>  offset = other<span class="Delimiter">.</span>offset<span class="Delimiter">;</span>
-<span id="L259" class="LineNr"> 259 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">)</span> <span class="Normal">delete</span> <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">;</span>
-<span id="L260" class="LineNr"> 260 </span>  <a href='030container.cc.html#L238'>payload_type</a> = copy<span class="Delimiter">(</span>other<span class="Delimiter">.</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">);</span>
-<span id="L261" class="LineNr"> 261 </span>  <span class="Identifier">return</span> *<span class="Normal">this</span><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="Delimiter">:(before &quot;End type_tree Definition&quot;)</span>
-<span id="L265" class="LineNr"> 265 </span><span class="Comment">// For exclusive containers we might sometimes have an address at some offset</span>
-<span id="L266" class="LineNr"> 266 </span><span class="Comment">// if some other offset has a specific tag. This struct encapsulates such</span>
-<span id="L267" class="LineNr"> 267 </span><span class="Comment">// guards.</span>
-<span id="L268" class="LineNr"> 268 </span><span class="Normal">struct</span> tag_condition_info <span class="Delimiter">{</span>
-<span id="L269" class="LineNr"> 269 </span>  <span class="Normal">int</span> offset<span class="Delimiter">;</span>
-<span id="L270" class="LineNr"> 270 </span>  <span class="Normal">int</span> tag<span class="Delimiter">;</span>
-<span id="L271" class="LineNr"> 271 </span>  tag_condition_info<span class="Delimiter">(</span><span class="Normal">int</span> o<span class="Delimiter">,</span> <span class="Normal">int</span> t<span class="Delimiter">)</span> :offset<span class="Delimiter">(</span>o<span class="Delimiter">),</span> tag<span class="Delimiter">(</span>t<span class="Delimiter">)</span> <span class="Delimiter">{}</span>
-<span id="L272" class="LineNr"> 272 </span><span class="Delimiter">};</span>
-<span id="L273" class="LineNr"> 273 </span>
-<span id="L274" class="LineNr"> 274 </span><span class="Delimiter">:(before &quot;End container_metadata Fields&quot;)</span>
-<span id="L275" class="LineNr"> 275 </span><span class="Comment">// a list of facts of the form:</span>
-<span id="L276" class="LineNr"> 276 </span><span class="Comment">//</span>
-<span id="L277" class="LineNr"> 277 </span><span class="Comment">//  IF offset o1 has tag t2 AND offset o2 has tag t2 AND .., THEN</span>
-<span id="L278" class="LineNr"> 278 </span><span class="Comment">//    for all address_element_infos:</span>
-<span id="L279" class="LineNr"> 279 </span><span class="Comment">//      you need to update refcounts for the address at offset pointing to a payload of type payload_type (just in case we need to abandon something in the process)</span>
-<span id="L280" class="LineNr"> 280 </span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt; address<span class="Delimiter">;</span>
-<span id="L281" class="LineNr"> 281 </span><span class="Delimiter">:(code)</span>
-<span id="L282" class="LineNr"> 282 </span><span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> set&lt;tag_condition_info&gt;&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> set&lt;tag_condition_info&gt;&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L283" class="LineNr"> 283 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>size<span class="Delimiter">()</span> != b<span class="Delimiter">.</span>size<span class="Delimiter">())</span> <span class="Identifier">return</span> a<span class="Delimiter">.</span>size<span class="Delimiter">()</span> &lt; b<span class="Delimiter">.</span>size<span class="Delimiter">();</span>
-<span id="L284" class="LineNr"> 284 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;tag_condition_info&gt;::const_iterator pa = a<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> pb = b<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  pa != a<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++pa<span class="Delimiter">,</span> ++pb<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L285" class="LineNr"> 285 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>pa<span class="Delimiter">-&gt;</span>offset != pb<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">)</span> <span class="Identifier">return</span> pa<span class="Delimiter">-&gt;</span>offset &lt; pb<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">;</span>
-<span id="L286" class="LineNr"> 286 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>pa<span class="Delimiter">-&gt;</span>tag != pb<span class="Delimiter">-&gt;</span>tag<span class="Delimiter">)</span> <span class="Identifier">return</span> pa<span class="Delimiter">-&gt;</span>tag &lt; pb<span class="Delimiter">-&gt;</span>tag<span class="Delimiter">;</span>
-<span id="L287" class="LineNr"> 287 </span>  <span class="Delimiter">}</span>
-<span id="L288" class="LineNr"> 288 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// equal</span>
-<span id="L289" class="LineNr"> 289 </span><span class="Delimiter">}</span>
-<span id="L290" class="LineNr"> 290 </span><span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> tag_condition_info&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> tag_condition_info&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L291" class="LineNr"> 291 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>offset != b<span class="Delimiter">.</span>offset<span class="Delimiter">)</span> <span class="Identifier">return</span> a<span class="Delimiter">.</span>offset &lt; b<span class="Delimiter">.</span>offset<span class="Delimiter">;</span>
-<span id="L292" class="LineNr"> 292 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>tag != b<span class="Delimiter">.</span>tag<span class="Delimiter">)</span> <span class="Identifier">return</span> a<span class="Delimiter">.</span>tag &lt; b<span class="Delimiter">.</span>tag<span class="Delimiter">;</span>
-<span id="L293" class="LineNr"> 293 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// equal</span>
-<span id="L294" class="LineNr"> 294 </span><span class="Delimiter">}</span>
-<span id="L295" class="LineNr"> 295 </span><span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> set&lt;address_element_info&gt;&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L296" class="LineNr"> 296 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>size<span class="Delimiter">()</span> != b<span class="Delimiter">.</span>size<span class="Delimiter">())</span> <span class="Identifier">return</span> a<span class="Delimiter">.</span>size<span class="Delimiter">()</span> &lt; b<span class="Delimiter">.</span>size<span class="Delimiter">();</span>
-<span id="L297" class="LineNr"> 297 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;address_element_info&gt;::const_iterator pa = a<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> pb = b<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  pa != a<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++pa<span class="Delimiter">,</span> ++pb<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L298" class="LineNr"> 298 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>pa<span class="Delimiter">-&gt;</span>offset != pb<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">)</span> <span class="Identifier">return</span> pa<span class="Delimiter">-&gt;</span>offset &lt; pb<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">;</span>
-<span id="L299" class="LineNr"> 299 </span>  <span class="Delimiter">}</span>
-<span id="L300" class="LineNr"> 300 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// equal</span>
-<span id="L301" class="LineNr"> 301 </span><span class="Delimiter">}</span>
-<span id="L302" class="LineNr"> 302 </span><span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> address_element_info&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> address_element_info&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L303" class="LineNr"> 303 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>offset != b<span class="Delimiter">.</span>offset<span class="Delimiter">)</span> <span class="Identifier">return</span> a<span class="Delimiter">.</span>offset &lt; b<span class="Delimiter">.</span>offset<span class="Delimiter">;</span>
-<span id="L304" class="LineNr"> 304 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// equal</span>
-<span id="L305" class="LineNr"> 305 </span><span class="Delimiter">}</span>
+<span id="L129" class="LineNr"> 129 </span><span class="Delimiter">:(scenario refcounts_put)</span>
+<span id="L130" class="LineNr"> 130 </span><span class="muData">container</span> foo [
+<span id="L131" class="LineNr"> 131 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L132" class="LineNr"> 132 </span>]
+<span id="L133" class="LineNr"> 133 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L134" class="LineNr"> 134 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L135" class="LineNr"> 135 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
+<span id="L136" class="LineNr"> 136 </span>  *<span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:foo<span class="Delimiter">,</span> <span class="Constant">x:offset</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L137" class="LineNr"> 137 </span>]
+<span id="L138" class="LineNr"> 138 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L139" class="LineNr"> 139 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L140" class="LineNr"> 140 </span><span class="traceContains">+run: {2: (&quot;address&quot; &quot;foo&quot;)} &lt;- new {foo: &quot;type&quot;}</span>
+<span id="L141" class="LineNr"> 141 </span><span class="traceContains">+mem: incrementing refcount of 1002: 0 -&gt; 1</span>
+<span id="L142" class="LineNr"> 142 </span><span class="traceContains">+run: {2: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()} &lt;- <a href='001help.cc.html#L221'>put</a> {2: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()}, {x: &quot;offset&quot;}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L143" class="LineNr"> 143 </span><span class="Comment"># put increments refcount</span>
+<span id="L144" class="LineNr"> 144 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L145" class="LineNr"> 145 </span>
+<span id="L146" class="LineNr"> 146 </span><span class="Delimiter">:(after &quot;Write Memory in PUT in Run&quot;)</span>
+<span id="L147" class="LineNr"> 147 </span>reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> element = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">,</span> offset<span class="Delimiter">);</span>
+<span id="L148" class="LineNr"> 148 </span>assert<span class="Delimiter">(</span>!has_property<span class="Delimiter">(</span>element<span class="Delimiter">,</span> <span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">));</span>
+<span id="L149" class="LineNr"> 149 </span>element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">);</span>
+<span id="L150" class="LineNr"> 150 </span><a href='036refcount.cc.html#L35'>update_any_refcounts</a><span class="Delimiter">(</span>element<span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span>
+<span id="L151" class="LineNr"> 151 </span>
+<span id="L152" class="LineNr"> 152 </span><span class="Delimiter">:(scenario refcounts_put_index)</span>
+<span id="L153" class="LineNr"> 153 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L154" class="LineNr"> 154 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L155" class="LineNr"> 155 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:array:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span><a href='043space.cc.html#L83'>address</a> number<span class="Delimiter">)</span>: type<span class="Delimiter">},</span> <span class="Constant">3</span>
+<span id="L156" class="LineNr"> 156 </span>  *<span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:array:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>put-index *<span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:array:<a href='043space.cc.html#L83'>address</a>:num<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L157" class="LineNr"> 157 </span>]
+<span id="L158" class="LineNr"> 158 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L159" class="LineNr"> 159 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L160" class="LineNr"> 160 </span><span class="traceContains">+run: {2: (&quot;address&quot; &quot;array&quot; &quot;address&quot; &quot;number&quot;)} &lt;- new {(address number): &quot;type&quot;}, {3: &quot;literal&quot;}</span>
+<span id="L161" class="LineNr"> 161 </span><span class="traceContains">+mem: incrementing refcount of 1002: 0 -&gt; 1</span>
+<span id="L162" class="LineNr"> 162 </span><span class="traceContains">+run: {2: (&quot;address&quot; &quot;array&quot; &quot;address&quot; &quot;number&quot;), &quot;lookup&quot;: ()} &lt;- put-index {2: (&quot;address&quot; &quot;array&quot; &quot;address&quot; &quot;number&quot;), &quot;lookup&quot;: ()}, {0: &quot;literal&quot;}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L163" class="LineNr"> 163 </span><span class="Comment"># put-index increments refcount</span>
+<span id="L164" class="LineNr"> 164 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L165" class="LineNr"> 165 </span>
+<span id="L166" class="LineNr"> 166 </span><span class="Delimiter">:(after &quot;Write Memory in PUT_INDEX in Run&quot;)</span>
+<span id="L167" class="LineNr"> 167 </span>reagent<span class="Comment">/*</span><span class="Comment">local</span><span class="Comment">*/</span> element<span class="Delimiter">;</span>
+<span id="L168" class="LineNr"> 168 </span>element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">);</span>
+<span id="L169" class="LineNr"> 169 </span>element<span class="Delimiter">.</span>type = <a href='032array.cc.html#L377'>copy_array_element</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L170" class="LineNr"> 170 </span><a href='036refcount.cc.html#L35'>update_any_refcounts</a><span class="Delimiter">(</span>element<span class="Delimiter">,</span> value<span class="Delimiter">);</span>
+<span id="L171" class="LineNr"> 171 </span>
+<span id="L172" class="LineNr"> 172 </span><span class="Delimiter">:(scenario refcounts_maybe_convert)</span>
+<span id="L173" class="LineNr"> 173 </span><span class="muData">exclusive-container</span> foo [
+<span id="L174" class="LineNr"> 174 </span>  <span class="Normal">x</span>:num
+<span id="L175" class="LineNr"> 175 </span>  <span class="Normal">p</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L176" class="LineNr"> 176 </span>]
+<span id="L177" class="LineNr"> 177 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L178" class="LineNr"> 178 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L179" class="LineNr"> 179 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/p<span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L180" class="LineNr"> 180 </span>  <span class="Constant">4</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Delimiter">,</span> <span class="Constant">5</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert <span class="Constant">2</span>:foo<span class="Delimiter">,</span> <span class="Constant">1:variant/p</span>
+<span id="L181" class="LineNr"> 181 </span>]
+<span id="L182" class="LineNr"> 182 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L183" class="LineNr"> 183 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L184" class="LineNr"> 184 </span><span class="Comment"># merging in an address increments refcount</span>
+<span id="L185" class="LineNr"> 185 </span><span class="traceContains">+run: {2: &quot;foo&quot;} &lt;- merge {1: &quot;literal&quot;, &quot;p&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L186" class="LineNr"> 186 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L187" class="LineNr"> 187 </span><span class="traceContains">+run: {4: (&quot;address&quot; &quot;number&quot;)}, {5: &quot;boolean&quot;} &lt;- maybe-convert {2: &quot;foo&quot;}, {1: &quot;variant&quot;, &quot;p&quot;: ()}</span>
+<span id="L188" class="LineNr"> 188 </span><span class="Comment"># maybe-convert increments refcount on success</span>
+<span id="L189" class="LineNr"> 189 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
+<span id="L190" class="LineNr"> 190 </span>
+<span id="L191" class="LineNr"> 191 </span><span class="Delimiter">:(after &quot;Write Memory in Successful MAYBE_CONVERT&quot;)</span>
+<span id="L192" class="LineNr"> 192 </span><span class="Comment">// todo: double-check data here as well</span>
+<span id="L193" class="LineNr"> 193 </span>vector&lt;<span class="Normal">double</span>&gt; data<span class="Delimiter">;</span>
+<span id="L194" class="LineNr"> 194 </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; size_of<span class="Delimiter">(</span>product<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L195" class="LineNr"> 195 </span>  data<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> base_address+<span class="Comment">/*</span><span class="Comment">skip tag</span><span class="Comment">*/</span><span class="Constant">1</span>+i<span class="Delimiter">));</span>
+<span id="L196" class="LineNr"> 196 </span><a href='036refcount.cc.html#L35'>update_any_refcounts</a><span class="Delimiter">(</span>product<span class="Delimiter">,</span> data<span class="Delimiter">);</span>
+<span id="L197" class="LineNr"> 197 </span>
+<span id="L198" class="LineNr"> 198 </span><span class="SalientComment">//:: manage refcounts in instructions that copy multiple locations at a time</span>
+<span id="L199" class="LineNr"> 199 </span>
+<span id="L200" class="LineNr"> 200 </span><span class="Delimiter">:(scenario refcounts_copy_nested)</span>
+<span id="L201" class="LineNr"> 201 </span><span class="muData">container</span> foo [
+<span id="L202" class="LineNr"> 202 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L83'>address</a>:num  <span class="Comment"># address inside container</span>
+<span id="L203" class="LineNr"> 203 </span>]
+<span id="L204" class="LineNr"> 204 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L205" class="LineNr"> 205 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L206" class="LineNr"> 206 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
+<span id="L207" class="LineNr"> 207 </span>  *<span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:foo<span class="Delimiter">,</span> <span class="Constant">x:offset</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L208" class="LineNr"> 208 </span>  <span class="Constant">3</span>:foo<span class="Special"> &lt;- </span>copy *<span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:foo
+<span id="L209" class="LineNr"> 209 </span>]
+<span id="L210" class="LineNr"> 210 </span><span class="traceContains">+transform: compute <a href='043space.cc.html#L83'>address</a> offsets for container foo</span>
+<span id="L211" class="LineNr"> 211 </span><span class="traceContains">+transform: checking container foo, element 0</span>
+<span id="L212" class="LineNr"> 212 </span><span class="traceContains">+transform: <a href='043space.cc.html#L83'>address</a> at offset 0</span>
+<span id="L213" class="LineNr"> 213 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L214" class="LineNr"> 214 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L215" class="LineNr"> 215 </span><span class="traceContains">+run: {2: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()} &lt;- <a href='001help.cc.html#L221'>put</a> {2: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()}, {x: &quot;offset&quot;}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L216" class="LineNr"> 216 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L217" class="LineNr"> 217 </span><span class="Comment"># copying a container increments refcounts of any contained addresses</span>
+<span id="L218" class="LineNr"> 218 </span><span class="traceContains">+run: {3: &quot;foo&quot;} &lt;- copy {2: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()}</span>
+<span id="L219" class="LineNr"> 219 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
+<span id="L220" class="LineNr"> 220 </span>
+<span id="L221" class="LineNr"> 221 </span><span class="Delimiter">:(before &quot;End type_tree Definition&quot;)</span>
+<span id="L222" class="LineNr"> 222 </span><span class="Normal">struct</span> address_element_info <span class="Delimiter">{</span>
+<span id="L223" class="LineNr"> 223 </span>  <span class="Comment">// Where inside a container type (after flattening nested containers!) the</span>
+<span id="L224" class="LineNr"> 224 </span>  <span class="Comment">// address lies</span>
+<span id="L225" class="LineNr"> 225 </span>  <span class="Normal">int</span> offset<span class="Delimiter">;</span>
+<span id="L226" class="LineNr"> 226 </span>
+<span id="L227" class="LineNr"> 227 </span>  <span class="Comment">// All the information we need to compute sizes of items inside an address</span>
+<span id="L228" class="LineNr"> 228 </span>  <span class="Comment">// inside a container. 'payload_type' doesn't need to be a full-scale</span>
+<span id="L229" class="LineNr"> 229 </span>  <span class="Comment">// reagent because an address inside a container can never be an array, and</span>
+<span id="L230" class="LineNr"> 230 </span>  <span class="Comment">// because arrays are the only type that need to know their location to</span>
+<span id="L231" class="LineNr"> 231 </span>  <span class="Comment">// compute their size.</span>
+<span id="L232" class="LineNr"> 232 </span>  <span class="Normal">const</span> type_tree* <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">;</span>
+<span id="L233" class="LineNr"> 233 </span>
+<span id="L234" class="LineNr"> 234 </span>  address_element_info<span class="Delimiter">(</span><span class="Normal">int</span> o<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* p<span class="Delimiter">);</span>
+<span id="L235" class="LineNr"> 235 </span>  address_element_info<span class="Delimiter">(</span><span class="Normal">const</span> address_element_info&amp; other<span class="Delimiter">);</span>
+<span id="L236" class="LineNr"> 236 </span>  <a href='036refcount.cc.html#L248'>~address_element_info</a><span class="Delimiter">();</span>
+<span id="L237" class="LineNr"> 237 </span>  address_element_info&amp; <span class="Normal">operator</span>=<span class="Delimiter">(</span><span class="Normal">const</span> address_element_info&amp; other<span class="Delimiter">);</span>
+<span id="L238" class="LineNr"> 238 </span><span class="Delimiter">};</span>
+<span id="L239" class="LineNr"> 239 </span><span class="Delimiter">:(code)</span>
+<span id="L240" class="LineNr"> 240 </span>address_element_info::address_element_info<span class="Delimiter">(</span><span class="Normal">int</span> o<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L241" class="LineNr"> 241 </span>  offset = o<span class="Delimiter">;</span>
+<span id="L242" class="LineNr"> 242 </span>  <a href='030container.cc.html#L238'>payload_type</a> = p<span class="Delimiter">;</span>
+<span id="L243" class="LineNr"> 243 </span><span class="Delimiter">}</span>
+<span id="L244" class="LineNr"> 244 </span>address_element_info::address_element_info<span class="Delimiter">(</span><span class="Normal">const</span> address_element_info&amp; other<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L245" class="LineNr"> 245 </span>  offset = other<span class="Delimiter">.</span>offset<span class="Delimiter">;</span>
+<span id="L246" class="LineNr"> 246 </span>  <a href='030container.cc.html#L238'>payload_type</a> = copy<span class="Delimiter">(</span>other<span class="Delimiter">.</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">);</span>
+<span id="L247" class="LineNr"> 247 </span><span class="Delimiter">}</span>
+<span id="L248" class="LineNr"> 248 </span>address_element_info::<a href='036refcount.cc.html#L248'>~address_element_info</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L249" class="LineNr"> 249 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L250" class="LineNr"> 250 </span>  <span class="Conceal">¦</span> <span class="Normal">delete</span> <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">;</span>
+<span id="L251" class="LineNr"> 251 </span>  <span class="Conceal">¦</span> <a href='030container.cc.html#L238'>payload_type</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L252" class="LineNr"> 252 </span>  <span class="Delimiter">}</span>
+<span id="L253" class="LineNr"> 253 </span><span class="Delimiter">}</span>
+<span id="L254" class="LineNr"> 254 </span>address_element_info&amp; address_element_info::<span class="Normal">operator</span>=<span class="Delimiter">(</span><span class="Normal">const</span> address_element_info&amp; other<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L255" class="LineNr"> 255 </span>  offset = other<span class="Delimiter">.</span>offset<span class="Delimiter">;</span>
+<span id="L256" class="LineNr"> 256 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">)</span> <span class="Normal">delete</span> <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">;</span>
+<span id="L257" class="LineNr"> 257 </span>  <a href='030container.cc.html#L238'>payload_type</a> = copy<span class="Delimiter">(</span>other<span class="Delimiter">.</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">);</span>
+<span id="L258" class="LineNr"> 258 </span>  <span class="Identifier">return</span> *<span class="Normal">this</span><span class="Delimiter">;</span>
+<span id="L259" class="LineNr"> 259 </span><span class="Delimiter">}</span>
+<span id="L260" class="LineNr"> 260 </span>
+<span id="L261" class="LineNr"> 261 </span><span class="Delimiter">:(before &quot;End type_tree Definition&quot;)</span>
+<span id="L262" class="LineNr"> 262 </span><span class="Comment">// For exclusive containers we might sometimes have an address at some offset</span>
+<span id="L263" class="LineNr"> 263 </span><span class="Comment">// if some other offset has a specific tag. This struct encapsulates such</span>
+<span id="L264" class="LineNr"> 264 </span><span class="Comment">// guards.</span>
+<span id="L265" class="LineNr"> 265 </span><span class="Normal">struct</span> tag_condition_info <span class="Delimiter">{</span>
+<span id="L266" class="LineNr"> 266 </span>  <span class="Normal">int</span> offset<span class="Delimiter">;</span>
+<span id="L267" class="LineNr"> 267 </span>  <span class="Normal">int</span> tag<span class="Delimiter">;</span>
+<span id="L268" class="LineNr"> 268 </span>  tag_condition_info<span class="Delimiter">(</span><span class="Normal">int</span> o<span class="Delimiter">,</span> <span class="Normal">int</span> t<span class="Delimiter">)</span> :offset<span class="Delimiter">(</span>o<span class="Delimiter">),</span> tag<span class="Delimiter">(</span>t<span class="Delimiter">)</span> <span class="Delimiter">{}</span>
+<span id="L269" class="LineNr"> 269 </span><span class="Delimiter">};</span>
+<span id="L270" class="LineNr"> 270 </span>
+<span id="L271" class="LineNr"> 271 </span><span class="Delimiter">:(before &quot;End container_metadata Fields&quot;)</span>
+<span id="L272" class="LineNr"> 272 </span><span class="Comment">// a list of facts of the form:</span>
+<span id="L273" class="LineNr"> 273 </span><span class="Comment">//</span>
+<span id="L274" class="LineNr"> 274 </span><span class="Comment">//  IF offset o1 has tag t2 AND offset o2 has tag t2 AND .., THEN</span>
+<span id="L275" class="LineNr"> 275 </span><span class="Comment">//    for all address_element_infos:</span>
+<span id="L276" class="LineNr"> 276 </span><span class="Comment">//      you need to update refcounts for the address at offset pointing to a payload of type payload_type (just in case we need to abandon something in the process)</span>
+<span id="L277" class="LineNr"> 277 </span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt; <a href='043space.cc.html#L83'>address</a><span class="Delimiter">;</span>
+<span id="L278" class="LineNr"> 278 </span><span class="Delimiter">:(code)</span>
+<span id="L279" class="LineNr"> 279 </span><span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> set&lt;tag_condition_info&gt;&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> set&lt;tag_condition_info&gt;&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L280" class="LineNr"> 280 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>size<span class="Delimiter">()</span> != b<span class="Delimiter">.</span>size<span class="Delimiter">())</span> <span class="Identifier">return</span> a<span class="Delimiter">.</span>size<span class="Delimiter">()</span> &lt; b<span class="Delimiter">.</span>size<span class="Delimiter">();</span>
+<span id="L281" class="LineNr"> 281 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;tag_condition_info&gt;::const_iterator pa = a<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> pb = b<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  pa != a<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++pa<span class="Delimiter">,</span> ++pb<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L282" class="LineNr"> 282 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>pa<span class="Delimiter">-&gt;</span>offset != pb<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">)</span> <span class="Identifier">return</span> pa<span class="Delimiter">-&gt;</span>offset &lt; pb<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">;</span>
+<span id="L283" class="LineNr"> 283 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>pa<span class="Delimiter">-&gt;</span>tag != pb<span class="Delimiter">-&gt;</span>tag<span class="Delimiter">)</span> <span class="Identifier">return</span> pa<span class="Delimiter">-&gt;</span>tag &lt; pb<span class="Delimiter">-&gt;</span>tag<span class="Delimiter">;</span>
+<span id="L284" class="LineNr"> 284 </span>  <span class="Delimiter">}</span>
+<span id="L285" class="LineNr"> 285 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// equal</span>
+<span id="L286" class="LineNr"> 286 </span><span class="Delimiter">}</span>
+<span id="L287" class="LineNr"> 287 </span><span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> tag_condition_info&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> tag_condition_info&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L288" class="LineNr"> 288 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>offset != b<span class="Delimiter">.</span>offset<span class="Delimiter">)</span> <span class="Identifier">return</span> a<span class="Delimiter">.</span>offset &lt; b<span class="Delimiter">.</span>offset<span class="Delimiter">;</span>
+<span id="L289" class="LineNr"> 289 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>tag != b<span class="Delimiter">.</span>tag<span class="Delimiter">)</span> <span class="Identifier">return</span> a<span class="Delimiter">.</span>tag &lt; b<span class="Delimiter">.</span>tag<span class="Delimiter">;</span>
+<span id="L290" class="LineNr"> 290 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// equal</span>
+<span id="L291" class="LineNr"> 291 </span><span class="Delimiter">}</span>
+<span id="L292" class="LineNr"> 292 </span><span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> set&lt;address_element_info&gt;&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L293" class="LineNr"> 293 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>size<span class="Delimiter">()</span> != b<span class="Delimiter">.</span>size<span class="Delimiter">())</span> <span class="Identifier">return</span> a<span class="Delimiter">.</span>size<span class="Delimiter">()</span> &lt; b<span class="Delimiter">.</span>size<span class="Delimiter">();</span>
+<span id="L294" class="LineNr"> 294 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;address_element_info&gt;::const_iterator pa = a<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> pb = b<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  pa != a<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++pa<span class="Delimiter">,</span> ++pb<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L295" class="LineNr"> 295 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>pa<span class="Delimiter">-&gt;</span>offset != pb<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">)</span> <span class="Identifier">return</span> pa<span class="Delimiter">-&gt;</span>offset &lt; pb<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">;</span>
+<span id="L296" class="LineNr"> 296 </span>  <span class="Delimiter">}</span>
+<span id="L297" class="LineNr"> 297 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// equal</span>
+<span id="L298" class="LineNr"> 298 </span><span class="Delimiter">}</span>
+<span id="L299" class="LineNr"> 299 </span><span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> address_element_info&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> address_element_info&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L300" class="LineNr"> 300 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>offset != b<span class="Delimiter">.</span>offset<span class="Delimiter">)</span> <span class="Identifier">return</span> a<span class="Delimiter">.</span>offset &lt; b<span class="Delimiter">.</span>offset<span class="Delimiter">;</span>
+<span id="L301" class="LineNr"> 301 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// equal</span>
+<span id="L302" class="LineNr"> 302 </span><span class="Delimiter">}</span>
+<span id="L303" class="LineNr"> 303 </span>
+<span id="L304" class="LineNr"> 304 </span><span class="Comment">//: populate metadata.address in a separate transform, because it requires</span>
+<span id="L305" class="LineNr"> 305 </span><span class="Comment">//: already knowing the sizes of all types</span>
 <span id="L306" class="LineNr"> 306 </span>
-<span id="L307" class="LineNr"> 307 </span><span class="Comment">//: populate metadata.address in a separate transform, because it requires</span>
-<span id="L308" class="LineNr"> 308 </span><span class="Comment">//: already knowing the sizes of all types</span>
-<span id="L309" class="LineNr"> 309 </span>
-<span id="L310" class="LineNr"> 310 </span><span class="Delimiter">:(after &quot;Transform.push_back(compute_container_sizes)&quot;)</span>
-<span id="L311" class="LineNr"> 311 </span>Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>compute_container_address_offsets<span class="Delimiter">);</span>  <span class="Comment">// idempotent</span>
-<span id="L312" class="LineNr"> 312 </span><span class="Delimiter">:(code)</span>
-<span id="L313" class="LineNr"> 313 </span><span class="Normal">void</span> compute_container_address_offsets<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="L314" class="LineNr"> 314 </span>  recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
-<span id="L315" class="LineNr"> 315 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- compute address offsets for &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L316" class="LineNr"> 316 </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="L317" class="LineNr"> 317 </span>  <span class="Conceal">¦</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="L318" class="LineNr"> 318 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;- compute address offsets for &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L319" class="LineNr"> 319 </span>  <span class="Conceal">¦</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 id="L320" class="LineNr"> 320 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> compute_container_address_offsets<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="Constant">&quot; in '&quot;</span>+inst<span class="Delimiter">.</span>original_string+<span class="Constant">&quot;'&quot;</span><span class="Delimiter">);</span>
-<span id="L321" class="LineNr"> 321 </span>  <span class="Conceal">¦</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="L322" class="LineNr"> 322 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> compute_container_address_offsets<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="Constant">&quot; in '&quot;</span>+inst<span class="Delimiter">.</span>original_string+<span class="Constant">&quot;'&quot;</span><span class="Delimiter">);</span>
-<span id="L323" class="LineNr"> 323 </span>  <span class="Delimiter">}</span>
-<span id="L324" class="LineNr"> 324 </span><span class="Delimiter">}</span>
-<span id="L325" class="LineNr"> 325 </span>
-<span id="L326" class="LineNr"> 326 </span><span class="Normal">void</span> compute_container_address_offsets<span class="Delimiter">(</span>reagent&amp; r<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L327" class="LineNr"> 327 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>r<span class="Delimiter">)</span> || is_dummy<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L328" class="LineNr"> 328 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
-<span id="L329" class="LineNr"> 329 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">))</span>
-<span id="L330" class="LineNr"> 330 </span>  <span class="Conceal">¦</span> r<span class="Delimiter">.</span>metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L331" class="LineNr"> 331 </span><span class="Delimiter">}</span>
-<span id="L332" class="LineNr"> 332 </span>
-<span id="L333" class="LineNr"> 333 </span><span class="Comment">// the recursive structure of this function needs to exactly match</span>
-<span id="L334" class="LineNr"> 334 </span><span class="Comment">// compute_container_sizes</span>
-<span id="L335" class="LineNr"> 335 </span><span class="Normal">void</span> compute_container_address_offsets<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L336" class="LineNr"> 336 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L337" class="LineNr"> 337 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L338" class="LineNr"> 338 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L339" class="LineNr"> 339 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; location_for_error_messages &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L340" class="LineNr"> 340 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L341" class="LineNr"> 341 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L342" class="LineNr"> 342 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;address&quot;</span><span class="Delimiter">)</span>
-<span id="L343" class="LineNr"> 343 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> compute_container_address_offsets<span class="Delimiter">(</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">(</span>type<span class="Delimiter">),</span> location_for_error_messages<span class="Delimiter">);</span>
-<span id="L344" class="LineNr"> 344 </span>  <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;array&quot;</span><span class="Delimiter">)</span>
-<span id="L345" class="LineNr"> 345 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> compute_container_address_offsets<span class="Delimiter">(</span><a href='032array.cc.html#L381'>array_element</a><span class="Delimiter">(</span>type<span class="Delimiter">),</span> location_for_error_messages<span class="Delimiter">);</span>
-<span id="L346" class="LineNr"> 346 </span>  <span class="Conceal">¦</span> <span class="Comment">// End compute_container_address_offsets Non-atom Special-cases</span>
-<span id="L347" class="LineNr"> 347 </span>  <span class="Delimiter">}</span>
-<span id="L348" class="LineNr"> 348 </span>  <span class="Normal">const</span> type_tree* base_type = type<span class="Delimiter">;</span>
-<span id="L349" class="LineNr"> 349 </span>  <span class="Comment">// Update base_type in compute_container_address_offsets</span>
-<span id="L350" class="LineNr"> 350 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// error raised elsewhere</span>
-<span id="L351" class="LineNr"> 351 </span>  type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L352" class="LineNr"> 352 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L353" class="LineNr"> 353 </span>  <span class="Conceal">¦</span> compute_container_address_offsets<span class="Delimiter">(</span>info<span class="Delimiter">,</span> type<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L307" class="LineNr"> 307 </span><span class="Delimiter">:(after &quot;Transform.push_back(compute_container_sizes)&quot;)</span>
+<span id="L308" class="LineNr"> 308 </span>Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>compute_container_address_offsets<span class="Delimiter">);</span>  <span class="Comment">// idempotent</span>
+<span id="L309" class="LineNr"> 309 </span><span class="Delimiter">:(code)</span>
+<span id="L310" class="LineNr"> 310 </span><span class="Normal">void</span> compute_container_address_offsets<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="L311" class="LineNr"> 311 </span>  recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
+<span id="L312" class="LineNr"> 312 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- compute <a href='043space.cc.html#L83'>address</a> offsets for &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L313" class="LineNr"> 313 </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="L314" class="LineNr"> 314 </span>  <span class="Conceal">¦</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="L315" class="LineNr"> 315 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;- compute <a href='043space.cc.html#L83'>address</a> offsets for &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L316" class="LineNr"> 316 </span>  <span class="Conceal">¦</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 id="L317" class="LineNr"> 317 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> compute_container_address_offsets<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="Constant">&quot; in '&quot;</span>+inst<span class="Delimiter">.</span>original_string+<span class="Constant">&quot;'&quot;</span><span class="Delimiter">);</span>
+<span id="L318" class="LineNr"> 318 </span>  <span class="Conceal">¦</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="L319" class="LineNr"> 319 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> compute_container_address_offsets<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="Constant">&quot; in '&quot;</span>+inst<span class="Delimiter">.</span>original_string+<span class="Constant">&quot;'&quot;</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="Delimiter">}</span>
+<span id="L322" class="LineNr"> 322 </span>
+<span id="L323" class="LineNr"> 323 </span><span class="Normal">void</span> compute_container_address_offsets<span class="Delimiter">(</span>reagent&amp; r<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L324" class="LineNr"> 324 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>r<span class="Delimiter">)</span> || is_dummy<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L325" class="LineNr"> 325 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L326" class="LineNr"> 326 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">))</span>
+<span id="L327" class="LineNr"> 327 </span>  <span class="Conceal">¦</span> r<span class="Delimiter">.</span>metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L328" class="LineNr"> 328 </span><span class="Delimiter">}</span>
+<span id="L329" class="LineNr"> 329 </span>
+<span id="L330" class="LineNr"> 330 </span><span class="Comment">// the recursive structure of this function needs to exactly match</span>
+<span id="L331" class="LineNr"> 331 </span><span class="Comment">// compute_container_sizes</span>
+<span id="L332" class="LineNr"> 332 </span><span class="Normal">void</span> compute_container_address_offsets<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L333" class="LineNr"> 333 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L334" class="LineNr"> 334 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L335" class="LineNr"> 335 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L336" class="LineNr"> 336 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; location_for_error_messages &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L337" class="LineNr"> 337 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L338" class="LineNr"> 338 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L339" class="LineNr"> 339 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;address&quot;</span><span class="Delimiter">)</span>
+<span id="L340" class="LineNr"> 340 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> compute_container_address_offsets<span class="Delimiter">(</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">(</span>type<span class="Delimiter">),</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L341" class="LineNr"> 341 </span>  <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;array&quot;</span><span class="Delimiter">)</span>
+<span id="L342" class="LineNr"> 342 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> compute_container_address_offsets<span class="Delimiter">(</span><a href='032array.cc.html#L381'>array_element</a><span class="Delimiter">(</span>type<span class="Delimiter">),</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L343" class="LineNr"> 343 </span>  <span class="Conceal">¦</span> <span class="Comment">// End compute_container_address_offsets Non-atom Special-cases</span>
+<span id="L344" class="LineNr"> 344 </span>  <span class="Delimiter">}</span>
+<span id="L345" class="LineNr"> 345 </span>  <span class="Normal">const</span> type_tree* base_type = type<span class="Delimiter">;</span>
+<span id="L346" class="LineNr"> 346 </span>  <span class="Comment">// Update base_type in compute_container_address_offsets</span>
+<span id="L347" class="LineNr"> 347 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// error raised elsewhere</span>
+<span id="L348" class="LineNr"> 348 </span>  type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
+<span id="L349" class="LineNr"> 349 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L350" class="LineNr"> 350 </span>  <span class="Conceal">¦</span> compute_container_address_offsets<span class="Delimiter">(</span>info<span class="Delimiter">,</span> type<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L351" class="LineNr"> 351 </span>  <span class="Delimiter">}</span>
+<span id="L352" class="LineNr"> 352 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L353" class="LineNr"> 353 </span>  <span class="Conceal">¦</span> <a href='036refcount.cc.html#L364'>compute_exclusive_container_address_offsets</a><span class="Delimiter">(</span>info<span class="Delimiter">,</span> type<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
 <span id="L354" class="LineNr"> 354 </span>  <span class="Delimiter">}</span>
-<span id="L355" class="LineNr"> 355 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L356" class="LineNr"> 356 </span>  <span class="Conceal">¦</span> <a href='036refcount.cc.html#L367'>compute_exclusive_container_address_offsets</a><span class="Delimiter">(</span>info<span class="Delimiter">,</span> type<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
-<span id="L357" class="LineNr"> 357 </span>  <span class="Delimiter">}</span>
-<span id="L358" class="LineNr"> 358 </span><span class="Delimiter">}</span>
-<span id="L359" class="LineNr"> 359 </span>
-<span id="L360" class="LineNr"> 360 </span><span class="Normal">void</span> compute_container_address_offsets<span class="Delimiter">(</span><span class="Normal">const</span> type_info&amp; container_info<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* full_type<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L361" class="LineNr"> 361 </span>  container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> full_type<span class="Delimiter">);</span>
-<span id="L362" class="LineNr"> 362 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!metadata<span class="Delimiter">.</span>address<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L363" class="LineNr"> 363 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9994</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compute address offsets for container &quot;</span> &lt;&lt; container_info<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L364" class="LineNr"> 364 </span>  <a href='036refcount.cc.html#L377'>append_addresses</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> full_type<span class="Delimiter">,</span> metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">(),</span> location_for_error_messages<span class="Delimiter">);</span>
-<span id="L365" class="LineNr"> 365 </span><span class="Delimiter">}</span>
-<span id="L366" class="LineNr"> 366 </span>
-<span id="L367" class="LineNr"> 367 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L367'>compute_exclusive_container_address_offsets</a><span class="Delimiter">(</span><span class="Normal">const</span> type_info&amp; exclusive_container_info<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* full_type<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L368" class="LineNr"> 368 </span>  container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> full_type<span class="Delimiter">);</span>
-<span id="L369" class="LineNr"> 369 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9994</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compute address offsets for exclusive container &quot;</span> &lt;&lt; exclusive_container_info<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L370" class="LineNr"> 370 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> tag = <span class="Constant">0</span><span class="Delimiter">;</span>  tag &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>exclusive_container_info<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++tag<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L371" class="LineNr"> 371 </span>  <span class="Conceal">¦</span> set&lt;tag_condition_info&gt; key<span class="Delimiter">;</span>
-<span id="L372" class="LineNr"> 372 </span>  <span class="Conceal">¦</span> key<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>tag_condition_info<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">tag is at offset</span><span class="Comment">*/</span><span class="Constant">0</span><span class="Delimiter">,</span> tag<span class="Delimiter">));</span>
-<span id="L373" class="LineNr"> 373 </span>  <span class="Conceal">¦</span> <a href='036refcount.cc.html#L377'>append_addresses</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip tag offset</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> variant_type<span class="Delimiter">(</span>full_type<span class="Delimiter">,</span> tag<span class="Delimiter">).</span>type<span class="Delimiter">,</span> metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
-<span id="L374" class="LineNr"> 374 </span>  <span class="Delimiter">}</span>
-<span id="L375" class="LineNr"> 375 </span><span class="Delimiter">}</span>
-<span id="L376" class="LineNr"> 376 </span>
-<span id="L377" class="LineNr"> 377 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L377'>append_addresses</a><span class="Delimiter">(</span><span class="Normal">int</span> base_offset<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* type<span class="Delimiter">,</span> map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt;&amp; out<span class="Delimiter">,</span> <span class="Normal">const</span> set&lt;tag_condition_info&gt;&amp; key<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L378" class="LineNr"> 378 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>type<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L379" class="LineNr"> 379 </span>  <span class="Conceal">¦</span> <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> key<span class="Delimiter">).</span>insert<span class="Delimiter">(</span>address_element_info<span class="Delimiter">(</span>base_offset<span class="Delimiter">,</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*payload_type<span class="Delimiter">(</span>type<span class="Delimiter">))));</span>
-<span id="L380" class="LineNr"> 380 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L381" class="LineNr"> 381 </span>  <span class="Delimiter">}</span>
-<span id="L382" class="LineNr"> 382 </span>  <span class="Normal">const</span> type_tree* base_type = type<span class="Delimiter">;</span>
-<span id="L383" class="LineNr"> 383 </span>  <span class="Comment">// Update base_type in append_container_address_offsets</span>
-<span id="L384" class="LineNr"> 384 </span>  <span class="Normal">const</span> type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L385" class="LineNr"> 385 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L386" class="LineNr"> 386 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> curr_index = <span class="Constant">0</span><span class="Delimiter">,</span> curr_offset = base_offset<span class="Delimiter">;</span>  curr_index &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++curr_index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L387" class="LineNr"> 387 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking container &quot;</span> &lt;&lt; base_type<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot;, element &quot;</span> &lt;&lt; curr_index &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L388" class="LineNr"> 388 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> element = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>type<span class="Delimiter">,</span> curr_index<span class="Delimiter">);</span>  <span class="Comment">// not base_type</span>
-<span id="L389" class="LineNr"> 389 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// Compute Container Address Offset(element)</span>
-<span id="L390" class="LineNr"> 390 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>element<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L391" class="LineNr"> 391 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address at offset &quot;</span> &lt;&lt; curr_offset &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L392" class="LineNr"> 392 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> key<span class="Delimiter">).</span>insert<span class="Delimiter">(</span>address_element_info<span class="Delimiter">(</span>curr_offset<span class="Delimiter">,</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*payload_type<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">))));</span>
-<span id="L393" class="LineNr"> 393 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++curr_offset<span class="Delimiter">;</span>
-<span id="L394" class="LineNr"> 394 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L395" class="LineNr"> 395 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_array<span class="Delimiter">(</span>element<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L396" class="LineNr"> 396 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr_offset += <span class="Comment">/*</span><span class="Comment">array length</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L397" class="LineNr"> 397 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">const</span> type_tree* array_element_type = <a href='032array.cc.html#L381'>array_element</a><span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L398" class="LineNr"> 398 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">int</span> array_element_size = size_of<span class="Delimiter">(</span>array_element_type<span class="Delimiter">);</span>
-<span id="L399" class="LineNr"> 399 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</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='032array.cc.html#L117'>static_array_length</a><span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L400" class="LineNr"> 400 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='036refcount.cc.html#L377'>append_addresses</a><span class="Delimiter">(</span>curr_offset<span class="Delimiter">,</span> array_element_type<span class="Delimiter">,</span> out<span class="Delimiter">,</span> key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
-<span id="L401" class="LineNr"> 401 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr_offset += array_element_size<span class="Delimiter">;</span>
-<span id="L402" class="LineNr"> 402 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L403" class="LineNr"> 403 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L404" class="LineNr"> 404 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_container<span class="Delimiter">(</span>element<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L405" class="LineNr"> 405 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='036refcount.cc.html#L377'>append_addresses</a><span class="Delimiter">(</span>curr_offset<span class="Delimiter">,</span> element<span class="Delimiter">.</span>type<span class="Delimiter">,</span> out<span class="Delimiter">,</span> key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
-<span id="L406" class="LineNr"> 406 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr_offset += size_of<span class="Delimiter">(</span>element<span class="Delimiter">);</span>
-<span id="L407" class="LineNr"> 407 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L408" class="LineNr"> 408 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_exclusive_container<span class="Delimiter">(</span>element<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L409" class="LineNr"> 409 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">const</span> type_tree* element_base_type = element<span class="Delimiter">.</span>type<span class="Delimiter">;</span>
-<span id="L410" class="LineNr"> 410 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// Update element_base_type For Exclusive Container in append_addresses</span>
-<span id="L411" class="LineNr"> 411 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">const</span> type_info&amp; element_info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> element_base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L412" class="LineNr"> 412 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> tag = <span class="Constant">0</span><span class="Delimiter">;</span>  tag &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>element_info<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++tag<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L413" class="LineNr"> 413 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> set&lt;tag_condition_info&gt; new_key = key<span class="Delimiter">;</span>
-<span id="L414" class="LineNr"> 414 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> new_key<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>tag_condition_info<span class="Delimiter">(</span>curr_offset<span class="Delimiter">,</span> tag<span class="Delimiter">));</span>
-<span id="L415" class="LineNr"> 415 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>out<span class="Delimiter">,</span> new_key<span class="Delimiter">))</span>
-<span id="L416" class="LineNr"> 416 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='036refcount.cc.html#L377'>append_addresses</a><span class="Delimiter">(</span>curr_offset+<span class="Comment">/*</span><span class="Comment">skip tag</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> variant_type<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">,</span> tag<span class="Delimiter">).</span>type<span class="Delimiter">,</span> out<span class="Delimiter">,</span> new_key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
-<span id="L417" class="LineNr"> 417 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L418" class="LineNr"> 418 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr_offset += size_of<span class="Delimiter">(</span>element<span class="Delimiter">);</span>
-<span id="L419" class="LineNr"> 419 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L420" class="LineNr"> 420 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L421" class="LineNr"> 421 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// non-address primitive</span>
-<span id="L422" class="LineNr"> 422 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++curr_offset<span class="Delimiter">;</span>
-<span id="L423" class="LineNr"> 423 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L424" class="LineNr"> 424 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L425" class="LineNr"> 425 </span>  <span class="Delimiter">}</span>
-<span id="L426" class="LineNr"> 426 </span>  <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L427" class="LineNr"> 427 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> tag = <span class="Constant">0</span><span class="Delimiter">;</span>  tag &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++tag<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L428" class="LineNr"> 428 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> set&lt;tag_condition_info&gt; new_key = key<span class="Delimiter">;</span>
-<span id="L429" class="LineNr"> 429 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> new_key<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>tag_condition_info<span class="Delimiter">(</span>base_offset<span class="Delimiter">,</span> tag<span class="Delimiter">));</span>
-<span id="L430" class="LineNr"> 430 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>out<span class="Delimiter">,</span> new_key<span class="Delimiter">))</span>
-<span id="L431" class="LineNr"> 431 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='036refcount.cc.html#L377'>append_addresses</a><span class="Delimiter">(</span>base_offset+<span class="Comment">/*</span><span class="Comment">skip tag</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> variant_type<span class="Delimiter">(</span>type<span class="Delimiter">,</span> tag<span class="Delimiter">).</span>type<span class="Delimiter">,</span> out<span class="Delimiter">,</span> new_key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
-<span id="L432" class="LineNr"> 432 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L433" class="LineNr"> 433 </span>  <span class="Delimiter">}</span>
-<span id="L434" class="LineNr"> 434 </span><span class="Delimiter">}</span>
-<span id="L435" class="LineNr"> 435 </span>
-<span id="L436" class="LineNr"> 436 </span><span class="Comment">//: for the following unit tests we'll do the work of the transform by hand</span>
-<span id="L437" class="LineNr"> 437 </span>
-<span id="L438" class="LineNr"> 438 </span><span class="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
-<span id="L439" class="LineNr"> 439 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L439'>test_container_address_offsets_empty</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L440" class="LineNr"> 440 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
-<span id="L441" class="LineNr"> 441 </span>  <span class="Comment">// define a container with no addresses</span>
-<span id="L442" class="LineNr"> 442 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:point&quot;</span><span class="Delimiter">);</span>
-<span id="L443" class="LineNr"> 443 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
-<span id="L444" class="LineNr"> 444 </span>  <span class="Comment">// scan</span>
-<span id="L445" class="LineNr"> 445 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L446" class="LineNr"> 446 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
-<span id="L447" class="LineNr"> 447 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
-<span id="L448" class="LineNr"> 448 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L449" class="LineNr"> 449 </span>  <span class="Comment">// the reagent we scanned knows it has no addresses</span>
-<span id="L450" class="LineNr"> 450 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L451" class="LineNr"> 451 </span>  <span class="Comment">// the global table contains an identical entry</span>
-<span id="L452" class="LineNr"> 452 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L453" class="LineNr"> 453 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span>address<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L454" class="LineNr"> 454 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
-<span id="L455" class="LineNr"> 455 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L456" class="LineNr"> 456 </span><span class="Delimiter">}</span>
-<span id="L457" class="LineNr"> 457 </span>
-<span id="L458" class="LineNr"> 458 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L458'>test_container_address_offsets</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L459" class="LineNr"> 459 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
-<span id="L460" class="LineNr"> 460 </span>  <span class="Comment">// define a container with an address at offset 0 that we have the size for</span>
-<span id="L461" class="LineNr"> 461 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L462" class="LineNr"> 462 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L463" class="LineNr"> 463 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L464" class="LineNr"> 464 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L465" class="LineNr"> 465 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
-<span id="L466" class="LineNr"> 466 </span>  <span class="Comment">// scan</span>
-<span id="L467" class="LineNr"> 467 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L468" class="LineNr"> 468 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
-<span id="L469" class="LineNr"> 469 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
-<span id="L470" class="LineNr"> 470 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L471" class="LineNr"> 471 </span>  <span class="Comment">// the reagent we scanned knows it has an address at offset 0</span>
-<span id="L472" class="LineNr"> 472 </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<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L473" class="LineNr"> 473 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
-<span id="L474" class="LineNr"> 474 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>  <span class="Comment">// unconditional for containers</span>
-<span id="L475" class="LineNr"> 475 </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>address_offsets<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L476" class="LineNr"> 476 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L477" class="LineNr"> 477 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L478" class="LineNr"> 478 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L479" class="LineNr"> 479 </span>  <span class="Comment">// the global table contains an identical entry</span>
-<span id="L480" class="LineNr"> 480 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L481" class="LineNr"> 481 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L482" class="LineNr"> 482 </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>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L483" class="LineNr"> 483 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L484" class="LineNr"> 484 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L485" class="LineNr"> 485 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L486" class="LineNr"> 486 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
-<span id="L487" class="LineNr"> 487 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L488" class="LineNr"> 488 </span><span class="Delimiter">}</span>
-<span id="L489" class="LineNr"> 489 </span>
-<span id="L490" class="LineNr"> 490 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L490'>test_container_address_offsets_2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L491" class="LineNr"> 491 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
-<span id="L492" class="LineNr"> 492 </span>  <span class="Comment">// define a container with an address at offset 1 that we have the size for</span>
-<span id="L493" class="LineNr"> 493 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L494" class="LineNr"> 494 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L495" class="LineNr"> 495 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  y:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L496" class="LineNr"> 496 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L497" class="LineNr"> 497 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L498" class="LineNr"> 498 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
-<span id="L499" class="LineNr"> 499 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
-<span id="L500" class="LineNr"> 500 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
-<span id="L501" class="LineNr"> 501 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L502" class="LineNr"> 502 </span>  <span class="Comment">// scan</span>
-<span id="L503" class="LineNr"> 503 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L504" class="LineNr"> 504 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
-<span id="L505" class="LineNr"> 505 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L506" class="LineNr"> 506 </span>  <span class="Comment">// the reagent we scanned knows it has an address at offset 1</span>
-<span id="L507" class="LineNr"> 507 </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<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L508" class="LineNr"> 508 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
-<span id="L509" class="LineNr"> 509 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L510" class="LineNr"> 510 </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>address_offsets<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L511" class="LineNr"> 511 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
-<span id="L512" class="LineNr"> 512 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L513" class="LineNr"> 513 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L514" class="LineNr"> 514 </span>  <span class="Comment">// the global table contains an identical entry</span>
-<span id="L515" class="LineNr"> 515 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L516" class="LineNr"> 516 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L517" class="LineNr"> 517 </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>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L518" class="LineNr"> 518 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
-<span id="L519" class="LineNr"> 519 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L520" class="LineNr"> 520 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L521" class="LineNr"> 521 </span><span class="Delimiter">}</span>
-<span id="L522" class="LineNr"> 522 </span>
-<span id="L523" class="LineNr"> 523 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L523'>test_container_address_offsets_nested</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L524" class="LineNr"> 524 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
-<span id="L525" class="LineNr"> 525 </span>  <span class="Comment">// define a container with a nested container containing an address</span>
-<span id="L526" class="LineNr"> 526 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L527" class="LineNr"> 527 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L528" class="LineNr"> 528 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  y:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L529" class="LineNr"> 529 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L530" class="LineNr"> 530 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;container bar [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L531" class="LineNr"> 531 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  p:point</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L532" class="LineNr"> 532 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  f:foo</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>  <span class="Comment">// nested container containing address</span>
-<span id="L533" class="LineNr"> 533 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L534" class="LineNr"> 534 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:bar&quot;</span><span class="Delimiter">);</span>
-<span id="L535" class="LineNr"> 535 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
-<span id="L536" class="LineNr"> 536 </span>  <span class="Comment">// global metadata contains entries for bar and included types: point and foo</span>
-<span id="L537" class="LineNr"> 537 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
-<span id="L538" class="LineNr"> 538 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L539" class="LineNr"> 539 </span>  <span class="Comment">// scan</span>
-<span id="L540" class="LineNr"> 540 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L541" class="LineNr"> 541 </span>  <span class="Comment">// the reagent we scanned knows it has an address at offset 2</span>
-<span id="L542" class="LineNr"> 542 </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<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L543" class="LineNr"> 543 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
-<span id="L544" class="LineNr"> 544 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L545" class="LineNr"> 545 </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>address_offsets<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L546" class="LineNr"> 546 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
-<span id="L547" class="LineNr"> 547 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L548" class="LineNr"> 548 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L549" class="LineNr"> 549 </span>  <span class="Comment">// the global table also knows its address offset</span>
-<span id="L550" class="LineNr"> 550 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L551" class="LineNr"> 551 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L552" class="LineNr"> 552 </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>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L553" class="LineNr"> 553 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
-<span id="L554" class="LineNr"> 554 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L555" class="LineNr"> 555 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L556" class="LineNr"> 556 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
-<span id="L557" class="LineNr"> 557 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L558" class="LineNr"> 558 </span><span class="Delimiter">}</span>
-<span id="L559" class="LineNr"> 559 </span>
-<span id="L560" class="LineNr"> 560 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L560'>test_container_address_offsets_from_address</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L561" class="LineNr"> 561 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
-<span id="L562" class="LineNr"> 562 </span>  <span class="Comment">// define a container with an address at offset 0</span>
-<span id="L563" class="LineNr"> 563 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L564" class="LineNr"> 564 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L565" class="LineNr"> 565 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L566" class="LineNr"> 566 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:address:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L567" class="LineNr"> 567 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
-<span id="L568" class="LineNr"> 568 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
-<span id="L569" class="LineNr"> 569 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
-<span id="L570" class="LineNr"> 570 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L571" class="LineNr"> 571 </span>  <span class="Comment">// scan an address to the container</span>
-<span id="L572" class="LineNr"> 572 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L573" class="LineNr"> 573 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
-<span id="L574" class="LineNr"> 574 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L575" class="LineNr"> 575 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
-<span id="L576" class="LineNr"> 576 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L577" class="LineNr"> 577 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L578" class="LineNr"> 578 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L579" class="LineNr"> 579 </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>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L580" class="LineNr"> 580 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L581" class="LineNr"> 581 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L582" class="LineNr"> 582 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L583" class="LineNr"> 583 </span><span class="Delimiter">}</span>
-<span id="L584" class="LineNr"> 584 </span>
-<span id="L585" class="LineNr"> 585 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L585'>test_container_address_offsets_from_array</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L586" class="LineNr"> 586 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
-<span id="L587" class="LineNr"> 587 </span>  <span class="Comment">// define a container with an address at offset 0</span>
-<span id="L588" class="LineNr"> 588 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L589" class="LineNr"> 589 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L590" class="LineNr"> 590 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L591" class="LineNr"> 591 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:array:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L592" class="LineNr"> 592 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
-<span id="L593" class="LineNr"> 593 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
-<span id="L594" class="LineNr"> 594 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
-<span id="L595" class="LineNr"> 595 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L596" class="LineNr"> 596 </span>  <span class="Comment">// scan an array of the container</span>
-<span id="L597" class="LineNr"> 597 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L598" class="LineNr"> 598 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
-<span id="L599" class="LineNr"> 599 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L600" class="LineNr"> 600 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
-<span id="L601" class="LineNr"> 601 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L602" class="LineNr"> 602 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L603" class="LineNr"> 603 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L604" class="LineNr"> 604 </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>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L605" class="LineNr"> 605 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L606" class="LineNr"> 606 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L607" class="LineNr"> 607 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L608" class="LineNr"> 608 </span><span class="Delimiter">}</span>
-<span id="L609" class="LineNr"> 609 </span>
-<span id="L610" class="LineNr"> 610 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L610'>test_container_address_offsets_from_address_to_array</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L611" class="LineNr"> 611 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
-<span id="L612" class="LineNr"> 612 </span>  <span class="Comment">// define a container with an address at offset 0</span>
-<span id="L613" class="LineNr"> 613 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L614" class="LineNr"> 614 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L615" class="LineNr"> 615 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L616" class="LineNr"> 616 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:address:array:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L617" class="LineNr"> 617 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
-<span id="L618" class="LineNr"> 618 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
-<span id="L619" class="LineNr"> 619 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
-<span id="L620" class="LineNr"> 620 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L621" class="LineNr"> 621 </span>  <span class="Comment">// scan an address to an array of the container</span>
-<span id="L622" class="LineNr"> 622 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L623" class="LineNr"> 623 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
-<span id="L624" class="LineNr"> 624 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L625" class="LineNr"> 625 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
-<span id="L626" class="LineNr"> 626 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L627" class="LineNr"> 627 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L628" class="LineNr"> 628 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L629" class="LineNr"> 629 </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>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L630" class="LineNr"> 630 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L631" class="LineNr"> 631 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L632" class="LineNr"> 632 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L633" class="LineNr"> 633 </span><span class="Delimiter">}</span>
-<span id="L634" class="LineNr"> 634 </span>
-<span id="L635" class="LineNr"> 635 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L635'>test_container_address_offsets_from_static_array</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L636" class="LineNr"> 636 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
-<span id="L637" class="LineNr"> 637 </span>  <span class="Comment">// define a container with an address at offset 0</span>
-<span id="L638" class="LineNr"> 638 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L639" class="LineNr"> 639 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L640" class="LineNr"> 640 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L641" class="LineNr"> 641 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:array:foo:10&quot;</span><span class="Delimiter">);</span>
-<span id="L642" class="LineNr"> 642 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
-<span id="L643" class="LineNr"> 643 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
-<span id="L644" class="LineNr"> 644 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
-<span id="L645" class="LineNr"> 645 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L646" class="LineNr"> 646 </span>  <span class="Comment">// scan a static array of the container</span>
-<span id="L647" class="LineNr"> 647 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L648" class="LineNr"> 648 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
-<span id="L649" class="LineNr"> 649 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L650" class="LineNr"> 650 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
-<span id="L651" class="LineNr"> 651 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L652" class="LineNr"> 652 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L653" class="LineNr"> 653 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L654" class="LineNr"> 654 </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>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L655" class="LineNr"> 655 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L656" class="LineNr"> 656 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L657" class="LineNr"> 657 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L658" class="LineNr"> 658 </span><span class="Delimiter">}</span>
-<span id="L659" class="LineNr"> 659 </span>
-<span id="L660" class="LineNr"> 660 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L660'>test_container_address_offsets_from_address_to_static_array</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L661" class="LineNr"> 661 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
-<span id="L662" class="LineNr"> 662 </span>  <span class="Comment">// define a container with an address at offset 0</span>
-<span id="L663" class="LineNr"> 663 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L664" class="LineNr"> 664 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L665" class="LineNr"> 665 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L666" class="LineNr"> 666 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:address:array:foo:10&quot;</span><span class="Delimiter">);</span>
-<span id="L667" class="LineNr"> 667 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
-<span id="L668" class="LineNr"> 668 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
-<span id="L669" class="LineNr"> 669 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
-<span id="L670" class="LineNr"> 670 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L671" class="LineNr"> 671 </span>  <span class="Comment">// scan an address to a static array of the container</span>
-<span id="L672" class="LineNr"> 672 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L673" class="LineNr"> 673 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
-<span id="L674" class="LineNr"> 674 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L675" class="LineNr"> 675 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
-<span id="L676" class="LineNr"> 676 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L677" class="LineNr"> 677 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L678" class="LineNr"> 678 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L679" class="LineNr"> 679 </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>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L680" class="LineNr"> 680 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L681" class="LineNr"> 681 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L682" class="LineNr"> 682 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L683" class="LineNr"> 683 </span><span class="Delimiter">}</span>
-<span id="L684" class="LineNr"> 684 </span>
-<span id="L685" class="LineNr"> 685 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L685'>test_container_address_offsets_from_repeated_address_and_array_types</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L686" class="LineNr"> 686 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
-<span id="L687" class="LineNr"> 687 </span>  <span class="Comment">// define a container with an address at offset 0</span>
-<span id="L688" class="LineNr"> 688 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L689" class="LineNr"> 689 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L690" class="LineNr"> 690 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L691" class="LineNr"> 691 </span>  <span class="Comment">// scan a deep nest of 'address' and 'array' types modifying a container</span>
-<span id="L692" class="LineNr"> 692 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:address:array:address:address:array:foo:10&quot;</span><span class="Delimiter">);</span>
-<span id="L693" class="LineNr"> 693 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
-<span id="L694" class="LineNr"> 694 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
-<span id="L695" class="LineNr"> 695 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
+<span id="L355" class="LineNr"> 355 </span><span class="Delimiter">}</span>
+<span id="L356" class="LineNr"> 356 </span>
+<span id="L357" class="LineNr"> 357 </span><span class="Normal">void</span> compute_container_address_offsets<span class="Delimiter">(</span><span class="Normal">const</span> type_info&amp; container_info<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* full_type<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L358" class="LineNr"> 358 </span>  container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> full_type<span class="Delimiter">);</span>
+<span id="L359" class="LineNr"> 359 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L360" class="LineNr"> 360 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9994</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compute <a href='043space.cc.html#L83'>address</a> offsets for container &quot;</span> &lt;&lt; container_info<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L361" class="LineNr"> 361 </span>  <a href='036refcount.cc.html#L374'>append_addresses</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> full_type<span class="Delimiter">,</span> metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">(),</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L362" class="LineNr"> 362 </span><span class="Delimiter">}</span>
+<span id="L363" class="LineNr"> 363 </span>
+<span id="L364" class="LineNr"> 364 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L364'>compute_exclusive_container_address_offsets</a><span class="Delimiter">(</span><span class="Normal">const</span> type_info&amp; exclusive_container_info<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* full_type<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L365" class="LineNr"> 365 </span>  container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> full_type<span class="Delimiter">);</span>
+<span id="L366" class="LineNr"> 366 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9994</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compute <a href='043space.cc.html#L83'>address</a> offsets for exclusive container &quot;</span> &lt;&lt; exclusive_container_info<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L367" class="LineNr"> 367 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> tag = <span class="Constant">0</span><span class="Delimiter">;</span>  tag &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>exclusive_container_info<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++tag<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L368" class="LineNr"> 368 </span>  <span class="Conceal">¦</span> set&lt;tag_condition_info&gt; key<span class="Delimiter">;</span>
+<span id="L369" class="LineNr"> 369 </span>  <span class="Conceal">¦</span> key<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>tag_condition_info<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">tag is at offset</span><span class="Comment">*/</span><span class="Constant">0</span><span class="Delimiter">,</span> tag<span class="Delimiter">));</span>
+<span id="L370" class="LineNr"> 370 </span>  <span class="Conceal">¦</span> <a href='036refcount.cc.html#L374'>append_addresses</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip tag offset</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> variant_type<span class="Delimiter">(</span>full_type<span class="Delimiter">,</span> tag<span class="Delimiter">).</span>type<span class="Delimiter">,</span> metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L371" class="LineNr"> 371 </span>  <span class="Delimiter">}</span>
+<span id="L372" class="LineNr"> 372 </span><span class="Delimiter">}</span>
+<span id="L373" class="LineNr"> 373 </span>
+<span id="L374" class="LineNr"> 374 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L374'>append_addresses</a><span class="Delimiter">(</span><span class="Normal">int</span> base_offset<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* type<span class="Delimiter">,</span> map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt;&amp; out<span class="Delimiter">,</span> <span class="Normal">const</span> set&lt;tag_condition_info&gt;&amp; key<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L375" class="LineNr"> 375 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>type<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L376" class="LineNr"> 376 </span>  <span class="Conceal">¦</span> <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> key<span class="Delimiter">).</span>insert<span class="Delimiter">(</span>address_element_info<span class="Delimiter">(</span>base_offset<span class="Delimiter">,</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*payload_type<span class="Delimiter">(</span>type<span class="Delimiter">))));</span>
+<span id="L377" class="LineNr"> 377 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L378" class="LineNr"> 378 </span>  <span class="Delimiter">}</span>
+<span id="L379" class="LineNr"> 379 </span>  <span class="Normal">const</span> type_tree* base_type = type<span class="Delimiter">;</span>
+<span id="L380" class="LineNr"> 380 </span>  <span class="Comment">// Update base_type in append_container_address_offsets</span>
+<span id="L381" class="LineNr"> 381 </span>  <span class="Normal">const</span> type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
+<span id="L382" class="LineNr"> 382 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L383" class="LineNr"> 383 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> curr_index = <span class="Constant">0</span><span class="Delimiter">,</span> curr_offset = base_offset<span class="Delimiter">;</span>  curr_index &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++curr_index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L384" class="LineNr"> 384 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking container &quot;</span> &lt;&lt; base_type<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot;, element &quot;</span> &lt;&lt; curr_index &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L385" class="LineNr"> 385 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> element = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>type<span class="Delimiter">,</span> curr_index<span class="Delimiter">);</span>  <span class="Comment">// not base_type</span>
+<span id="L386" class="LineNr"> 386 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// Compute Container Address Offset(element)</span>
+<span id="L387" class="LineNr"> 387 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>element<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L388" class="LineNr"> 388 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address at offset &quot;</span> &lt;&lt; curr_offset &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L389" class="LineNr"> 389 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> key<span class="Delimiter">).</span>insert<span class="Delimiter">(</span>address_element_info<span class="Delimiter">(</span>curr_offset<span class="Delimiter">,</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*payload_type<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">))));</span>
+<span id="L390" class="LineNr"> 390 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++curr_offset<span class="Delimiter">;</span>
+<span id="L391" class="LineNr"> 391 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L392" class="LineNr"> 392 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_array<span class="Delimiter">(</span>element<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L393" class="LineNr"> 393 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr_offset += <span class="Comment">/*</span><span class="Comment">array length</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L394" class="LineNr"> 394 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">const</span> type_tree* array_element_type = <a href='032array.cc.html#L381'>array_element</a><span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L395" class="LineNr"> 395 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">int</span> array_element_size = size_of<span class="Delimiter">(</span>array_element_type<span class="Delimiter">);</span>
+<span id="L396" class="LineNr"> 396 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</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='032array.cc.html#L117'>static_array_length</a><span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L397" class="LineNr"> 397 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='036refcount.cc.html#L374'>append_addresses</a><span class="Delimiter">(</span>curr_offset<span class="Delimiter">,</span> array_element_type<span class="Delimiter">,</span> out<span class="Delimiter">,</span> key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L398" class="LineNr"> 398 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr_offset += array_element_size<span class="Delimiter">;</span>
+<span id="L399" class="LineNr"> 399 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L400" class="LineNr"> 400 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L401" class="LineNr"> 401 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_container<span class="Delimiter">(</span>element<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L402" class="LineNr"> 402 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='036refcount.cc.html#L374'>append_addresses</a><span class="Delimiter">(</span>curr_offset<span class="Delimiter">,</span> element<span class="Delimiter">.</span>type<span class="Delimiter">,</span> out<span class="Delimiter">,</span> key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L403" class="LineNr"> 403 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr_offset += size_of<span class="Delimiter">(</span>element<span class="Delimiter">);</span>
+<span id="L404" class="LineNr"> 404 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L405" class="LineNr"> 405 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_exclusive_container<span class="Delimiter">(</span>element<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L406" class="LineNr"> 406 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">const</span> type_tree* element_base_type = element<span class="Delimiter">.</span>type<span class="Delimiter">;</span>
+<span id="L407" class="LineNr"> 407 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// Update element_base_type For Exclusive Container in append_addresses</span>
+<span id="L408" class="LineNr"> 408 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">const</span> type_info&amp; element_info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> element_base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
+<span id="L409" class="LineNr"> 409 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> tag = <span class="Constant">0</span><span class="Delimiter">;</span>  tag &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>element_info<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++tag<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L410" class="LineNr"> 410 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> set&lt;tag_condition_info&gt; new_key = key<span class="Delimiter">;</span>
+<span id="L411" class="LineNr"> 411 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> new_key<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>tag_condition_info<span class="Delimiter">(</span>curr_offset<span class="Delimiter">,</span> tag<span class="Delimiter">));</span>
+<span id="L412" class="LineNr"> 412 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>out<span class="Delimiter">,</span> new_key<span class="Delimiter">))</span>
+<span id="L413" class="LineNr"> 413 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='036refcount.cc.html#L374'>append_addresses</a><span class="Delimiter">(</span>curr_offset+<span class="Comment">/*</span><span class="Comment">skip tag</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> variant_type<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">,</span> tag<span class="Delimiter">).</span>type<span class="Delimiter">,</span> out<span class="Delimiter">,</span> new_key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L414" class="LineNr"> 414 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L415" class="LineNr"> 415 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr_offset += size_of<span class="Delimiter">(</span>element<span class="Delimiter">);</span>
+<span id="L416" class="LineNr"> 416 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L417" class="LineNr"> 417 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L418" class="LineNr"> 418 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// non-address primitive</span>
+<span id="L419" class="LineNr"> 419 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++curr_offset<span class="Delimiter">;</span>
+<span id="L420" class="LineNr"> 420 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L421" class="LineNr"> 421 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L422" class="LineNr"> 422 </span>  <span class="Delimiter">}</span>
+<span id="L423" class="LineNr"> 423 </span>  <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L424" class="LineNr"> 424 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> tag = <span class="Constant">0</span><span class="Delimiter">;</span>  tag &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++tag<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L425" class="LineNr"> 425 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> set&lt;tag_condition_info&gt; new_key = key<span class="Delimiter">;</span>
+<span id="L426" class="LineNr"> 426 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> new_key<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>tag_condition_info<span class="Delimiter">(</span>base_offset<span class="Delimiter">,</span> tag<span class="Delimiter">));</span>
+<span id="L427" class="LineNr"> 427 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>out<span class="Delimiter">,</span> new_key<span class="Delimiter">))</span>
+<span id="L428" class="LineNr"> 428 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='036refcount.cc.html#L374'>append_addresses</a><span class="Delimiter">(</span>base_offset+<span class="Comment">/*</span><span class="Comment">skip tag</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> variant_type<span class="Delimiter">(</span>type<span class="Delimiter">,</span> tag<span class="Delimiter">).</span>type<span class="Delimiter">,</span> out<span class="Delimiter">,</span> new_key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L429" class="LineNr"> 429 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L430" class="LineNr"> 430 </span>  <span class="Delimiter">}</span>
+<span id="L431" class="LineNr"> 431 </span><span class="Delimiter">}</span>
+<span id="L432" class="LineNr"> 432 </span>
+<span id="L433" class="LineNr"> 433 </span><span class="Comment">//: for the following unit tests we'll do the work of the transform by hand</span>
+<span id="L434" class="LineNr"> 434 </span>
+<span id="L435" class="LineNr"> 435 </span><span class="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
+<span id="L436" class="LineNr"> 436 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L436'>test_container_address_offsets_empty</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L437" class="LineNr"> 437 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
+<span id="L438" class="LineNr"> 438 </span>  <span class="Comment">// define a container with no addresses</span>
+<span id="L439" class="LineNr"> 439 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:point&quot;</span><span class="Delimiter">);</span>
+<span id="L440" class="LineNr"> 440 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
+<span id="L441" class="LineNr"> 441 </span>  <span class="Comment">// scan</span>
+<span id="L442" class="LineNr"> 442 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L443" class="LineNr"> 443 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
+<span id="L444" class="LineNr"> 444 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
+<span id="L445" class="LineNr"> 445 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L446" class="LineNr"> 446 </span>  <span class="Comment">// the reagent we scanned knows it has no addresses</span>
+<span id="L447" class="LineNr"> 447 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L448" class="LineNr"> 448 </span>  <span class="Comment">// the global table contains an identical entry</span>
+<span id="L449" class="LineNr"> 449 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L450" class="LineNr"> 450 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L451" class="LineNr"> 451 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
+<span id="L452" class="LineNr"> 452 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L453" class="LineNr"> 453 </span><span class="Delimiter">}</span>
+<span id="L454" class="LineNr"> 454 </span>
+<span id="L455" class="LineNr"> 455 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L455'>test_container_address_offsets</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L456" class="LineNr"> 456 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
+<span id="L457" class="LineNr"> 457 </span>  <span class="Comment">// define a container with an address at offset 0 that we have the size for</span>
+<span id="L458" class="LineNr"> 458 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L459" class="LineNr"> 459 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L83'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L460" class="LineNr"> 460 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L461" class="LineNr"> 461 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L462" class="LineNr"> 462 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
+<span id="L463" class="LineNr"> 463 </span>  <span class="Comment">// scan</span>
+<span id="L464" class="LineNr"> 464 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L465" class="LineNr"> 465 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
+<span id="L466" class="LineNr"> 466 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
+<span id="L467" class="LineNr"> 467 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L468" class="LineNr"> 468 </span>  <span class="Comment">// the reagent we scanned knows it has an address at offset 0</span>
+<span id="L469" class="LineNr"> 469 </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<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L470" class="LineNr"> 470 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
+<span id="L471" class="LineNr"> 471 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>  <span class="Comment">// unconditional for containers</span>
+<span id="L472" class="LineNr"> 472 </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>address_offsets<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L473" class="LineNr"> 473 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L474" class="LineNr"> 474 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L475" class="LineNr"> 475 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L476" class="LineNr"> 476 </span>  <span class="Comment">// the global table contains an identical entry</span>
+<span id="L477" class="LineNr"> 477 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L478" class="LineNr"> 478 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L479" class="LineNr"> 479 </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>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L480" class="LineNr"> 480 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L481" class="LineNr"> 481 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L482" class="LineNr"> 482 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L483" class="LineNr"> 483 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
+<span id="L484" class="LineNr"> 484 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L485" class="LineNr"> 485 </span><span class="Delimiter">}</span>
+<span id="L486" class="LineNr"> 486 </span>
+<span id="L487" class="LineNr"> 487 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L487'>test_container_address_offsets_2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L488" class="LineNr"> 488 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
+<span id="L489" class="LineNr"> 489 </span>  <span class="Comment">// define a container with an address at offset 1 that we have the size for</span>
+<span id="L490" class="LineNr"> 490 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L491" class="LineNr"> 491 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L492" class="LineNr"> 492 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  y:<a href='043space.cc.html#L83'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L493" class="LineNr"> 493 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L494" class="LineNr"> 494 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L495" class="LineNr"> 495 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
+<span id="L496" class="LineNr"> 496 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
+<span id="L497" class="LineNr"> 497 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
+<span id="L498" class="LineNr"> 498 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L499" class="LineNr"> 499 </span>  <span class="Comment">// scan</span>
+<span id="L500" class="LineNr"> 500 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L501" class="LineNr"> 501 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
+<span id="L502" class="LineNr"> 502 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L503" class="LineNr"> 503 </span>  <span class="Comment">// the reagent we scanned knows it has an address at offset 1</span>
+<span id="L504" class="LineNr"> 504 </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<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L505" class="LineNr"> 505 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
+<span id="L506" class="LineNr"> 506 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L507" class="LineNr"> 507 </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>address_offsets<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L508" class="LineNr"> 508 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
+<span id="L509" class="LineNr"> 509 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L510" class="LineNr"> 510 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L511" class="LineNr"> 511 </span>  <span class="Comment">// the global table contains an identical entry</span>
+<span id="L512" class="LineNr"> 512 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L513" class="LineNr"> 513 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L514" class="LineNr"> 514 </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>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L515" class="LineNr"> 515 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
+<span id="L516" class="LineNr"> 516 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L517" class="LineNr"> 517 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L518" class="LineNr"> 518 </span><span class="Delimiter">}</span>
+<span id="L519" class="LineNr"> 519 </span>
+<span id="L520" class="LineNr"> 520 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L520'>test_container_address_offsets_nested</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L521" class="LineNr"> 521 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
+<span id="L522" class="LineNr"> 522 </span>  <span class="Comment">// define a container with a nested container containing an address</span>
+<span id="L523" class="LineNr"> 523 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L524" class="LineNr"> 524 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L83'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L525" class="LineNr"> 525 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  y:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L526" class="LineNr"> 526 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L527" class="LineNr"> 527 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;container bar [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L528" class="LineNr"> 528 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  p:point</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L529" class="LineNr"> 529 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  f:foo</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>  <span class="Comment">// nested container containing address</span>
+<span id="L530" class="LineNr"> 530 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L531" class="LineNr"> 531 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:bar&quot;</span><span class="Delimiter">);</span>
+<span id="L532" class="LineNr"> 532 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
+<span id="L533" class="LineNr"> 533 </span>  <span class="Comment">// global metadata contains entries for bar and included types: point and foo</span>
+<span id="L534" class="LineNr"> 534 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
+<span id="L535" class="LineNr"> 535 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L536" class="LineNr"> 536 </span>  <span class="Comment">// scan</span>
+<span id="L537" class="LineNr"> 537 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L538" class="LineNr"> 538 </span>  <span class="Comment">// the reagent we scanned knows it has an address at offset 2</span>
+<span id="L539" class="LineNr"> 539 </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<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L540" class="LineNr"> 540 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
+<span id="L541" class="LineNr"> 541 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L542" class="LineNr"> 542 </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>address_offsets<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L543" class="LineNr"> 543 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
+<span id="L544" class="LineNr"> 544 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L545" class="LineNr"> 545 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L546" class="LineNr"> 546 </span>  <span class="Comment">// the global table also knows its address offset</span>
+<span id="L547" class="LineNr"> 547 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L548" class="LineNr"> 548 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L549" class="LineNr"> 549 </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>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L550" class="LineNr"> 550 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
+<span id="L551" class="LineNr"> 551 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L552" class="LineNr"> 552 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L553" class="LineNr"> 553 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
+<span id="L554" class="LineNr"> 554 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L555" class="LineNr"> 555 </span><span class="Delimiter">}</span>
+<span id="L556" class="LineNr"> 556 </span>
+<span id="L557" class="LineNr"> 557 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L557'>test_container_address_offsets_from_address</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L558" class="LineNr"> 558 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
+<span id="L559" class="LineNr"> 559 </span>  <span class="Comment">// define a container with an address at offset 0</span>
+<span id="L560" class="LineNr"> 560 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L561" class="LineNr"> 561 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L83'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L562" class="LineNr"> 562 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L563" class="LineNr"> 563 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L83'>address</a>:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L564" class="LineNr"> 564 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
+<span id="L565" class="LineNr"> 565 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
+<span id="L566" class="LineNr"> 566 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
+<span id="L567" class="LineNr"> 567 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L568" class="LineNr"> 568 </span>  <span class="Comment">// scan an address to the container</span>
+<span id="L569" class="LineNr"> 569 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L570" class="LineNr"> 570 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
+<span id="L571" class="LineNr"> 571 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L572" class="LineNr"> 572 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
+<span id="L573" class="LineNr"> 573 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L574" class="LineNr"> 574 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L575" class="LineNr"> 575 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L576" class="LineNr"> 576 </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>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L577" class="LineNr"> 577 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L578" class="LineNr"> 578 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L579" class="LineNr"> 579 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L580" class="LineNr"> 580 </span><span class="Delimiter">}</span>
+<span id="L581" class="LineNr"> 581 </span>
+<span id="L582" class="LineNr"> 582 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L582'>test_container_address_offsets_from_array</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L583" class="LineNr"> 583 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
+<span id="L584" class="LineNr"> 584 </span>  <span class="Comment">// define a container with an address at offset 0</span>
+<span id="L585" class="LineNr"> 585 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L586" class="LineNr"> 586 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L83'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L587" class="LineNr"> 587 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L588" class="LineNr"> 588 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:array:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L589" class="LineNr"> 589 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
+<span id="L590" class="LineNr"> 590 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
+<span id="L591" class="LineNr"> 591 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
+<span id="L592" class="LineNr"> 592 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L593" class="LineNr"> 593 </span>  <span class="Comment">// scan an array of the container</span>
+<span id="L594" class="LineNr"> 594 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L595" class="LineNr"> 595 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
+<span id="L596" class="LineNr"> 596 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L597" class="LineNr"> 597 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
+<span id="L598" class="LineNr"> 598 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L599" class="LineNr"> 599 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L600" class="LineNr"> 600 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L601" class="LineNr"> 601 </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>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L602" class="LineNr"> 602 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L603" class="LineNr"> 603 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L604" class="LineNr"> 604 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L605" class="LineNr"> 605 </span><span class="Delimiter">}</span>
+<span id="L606" class="LineNr"> 606 </span>
+<span id="L607" class="LineNr"> 607 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L607'>test_container_address_offsets_from_address_to_array</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L608" class="LineNr"> 608 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
+<span id="L609" class="LineNr"> 609 </span>  <span class="Comment">// define a container with an address at offset 0</span>
+<span id="L610" class="LineNr"> 610 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L611" class="LineNr"> 611 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L83'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L612" class="LineNr"> 612 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L613" class="LineNr"> 613 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L83'>address</a>:array:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L614" class="LineNr"> 614 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
+<span id="L615" class="LineNr"> 615 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
+<span id="L616" class="LineNr"> 616 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
+<span id="L617" class="LineNr"> 617 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L618" class="LineNr"> 618 </span>  <span class="Comment">// scan an address to an array of the container</span>
+<span id="L619" class="LineNr"> 619 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L620" class="LineNr"> 620 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
+<span id="L621" class="LineNr"> 621 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L622" class="LineNr"> 622 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
+<span id="L623" class="LineNr"> 623 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L624" class="LineNr"> 624 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L625" class="LineNr"> 625 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L626" class="LineNr"> 626 </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>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L627" class="LineNr"> 627 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L628" class="LineNr"> 628 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L629" class="LineNr"> 629 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L630" class="LineNr"> 630 </span><span class="Delimiter">}</span>
+<span id="L631" class="LineNr"> 631 </span>
+<span id="L632" class="LineNr"> 632 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L632'>test_container_address_offsets_from_static_array</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L633" class="LineNr"> 633 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
+<span id="L634" class="LineNr"> 634 </span>  <span class="Comment">// define a container with an address at offset 0</span>
+<span id="L635" class="LineNr"> 635 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L636" class="LineNr"> 636 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L83'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L637" class="LineNr"> 637 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L638" class="LineNr"> 638 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:array:foo:10&quot;</span><span class="Delimiter">);</span>
+<span id="L639" class="LineNr"> 639 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
+<span id="L640" class="LineNr"> 640 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
+<span id="L641" class="LineNr"> 641 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
+<span id="L642" class="LineNr"> 642 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L643" class="LineNr"> 643 </span>  <span class="Comment">// scan a static array of the container</span>
+<span id="L644" class="LineNr"> 644 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L645" class="LineNr"> 645 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
+<span id="L646" class="LineNr"> 646 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L647" class="LineNr"> 647 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
+<span id="L648" class="LineNr"> 648 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L649" class="LineNr"> 649 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L650" class="LineNr"> 650 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L651" class="LineNr"> 651 </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>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L652" class="LineNr"> 652 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L653" class="LineNr"> 653 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L654" class="LineNr"> 654 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L655" class="LineNr"> 655 </span><span class="Delimiter">}</span>
+<span id="L656" class="LineNr"> 656 </span>
+<span id="L657" class="LineNr"> 657 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L657'>test_container_address_offsets_from_address_to_static_array</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L658" class="LineNr"> 658 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
+<span id="L659" class="LineNr"> 659 </span>  <span class="Comment">// define a container with an address at offset 0</span>
+<span id="L660" class="LineNr"> 660 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L661" class="LineNr"> 661 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L83'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L662" class="LineNr"> 662 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L663" class="LineNr"> 663 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L83'>address</a>:array:foo:10&quot;</span><span class="Delimiter">);</span>
+<span id="L664" class="LineNr"> 664 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
+<span id="L665" class="LineNr"> 665 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
+<span id="L666" class="LineNr"> 666 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
+<span id="L667" class="LineNr"> 667 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L668" class="LineNr"> 668 </span>  <span class="Comment">// scan an address to a static array of the container</span>
+<span id="L669" class="LineNr"> 669 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L670" class="LineNr"> 670 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
+<span id="L671" class="LineNr"> 671 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L672" class="LineNr"> 672 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
+<span id="L673" class="LineNr"> 673 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L674" class="LineNr"> 674 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L675" class="LineNr"> 675 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L676" class="LineNr"> 676 </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>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L677" class="LineNr"> 677 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L678" class="LineNr"> 678 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L679" class="LineNr"> 679 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L680" class="LineNr"> 680 </span><span class="Delimiter">}</span>
+<span id="L681" class="LineNr"> 681 </span>
+<span id="L682" class="LineNr"> 682 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L682'>test_container_address_offsets_from_repeated_address_and_array_types</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L683" class="LineNr"> 683 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
+<span id="L684" class="LineNr"> 684 </span>  <span class="Comment">// define a container with an address at offset 0</span>
+<span id="L685" class="LineNr"> 685 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L686" class="LineNr"> 686 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L83'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L687" class="LineNr"> 687 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L688" class="LineNr"> 688 </span>  <span class="Comment">// scan a deep nest of 'address' and 'array' types modifying a container</span>
+<span id="L689" class="LineNr"> 689 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L83'>address</a>:array:<a href='043space.cc.html#L83'>address</a>:<a href='043space.cc.html#L83'>address</a>:array:foo:10&quot;</span><span class="Delimiter">);</span>
+<span id="L690" class="LineNr"> 690 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
+<span id="L691" class="LineNr"> 691 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
+<span id="L692" class="LineNr"> 692 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
+<span id="L693" class="LineNr"> 693 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L694" class="LineNr"> 694 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L695" class="LineNr"> 695 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
 <span id="L696" class="LineNr"> 696 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L697" class="LineNr"> 697 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L698" class="LineNr"> 698 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
-<span id="L699" class="LineNr"> 699 </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>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L700" class="LineNr"> 700 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
-<span id="L701" class="LineNr"> 701 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L702" class="LineNr"> 702 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L703" class="LineNr"> 703 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L704" class="LineNr"> 704 </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>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L705" class="LineNr"> 705 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L706" class="LineNr"> 706 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L707" class="LineNr"> 707 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L708" class="LineNr"> 708 </span><span class="Delimiter">}</span>
+<span id="L697" class="LineNr"> 697 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
+<span id="L698" class="LineNr"> 698 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L699" class="LineNr"> 699 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L700" class="LineNr"> 700 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L701" class="LineNr"> 701 </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>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L702" class="LineNr"> 702 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L703" class="LineNr"> 703 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L704" class="LineNr"> 704 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L705" class="LineNr"> 705 </span><span class="Delimiter">}</span>
+<span id="L706" class="LineNr"> 706 </span>
+<span id="L707" class="LineNr"> 707 </span><span class="Comment">//: use metadata.address to update refcounts within containers, arrays and</span>
+<span id="L708" class="LineNr"> 708 </span><span class="Comment">//: exclusive containers</span>
 <span id="L709" class="LineNr"> 709 </span>
-<span id="L710" class="LineNr"> 710 </span><span class="Comment">//: use metadata.address to update refcounts within containers, arrays and</span>
-<span id="L711" class="LineNr"> 711 </span><span class="Comment">//: exclusive containers</span>
-<span id="L712" class="LineNr"> 712 </span>
-<span id="L713" class="LineNr"> 713 </span><span class="Delimiter">:(before &quot;End Increment Refcounts(canonized_x)&quot;)</span>
-<span id="L714" class="LineNr"> 714 </span><span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_container<span class="Delimiter">(</span>canonized_x<span class="Delimiter">)</span> || is_mu_exclusive_container<span class="Delimiter">(</span>canonized_x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L715" class="LineNr"> 715 </span>  <span class="Normal">const</span> container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> canonized_x<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L716" class="LineNr"> 716 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt;::const_iterator p = metadata<span class="Delimiter">.</span>address<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != metadata<span class="Delimiter">.</span>address<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L717" class="LineNr"> 717 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!all_match<span class="Delimiter">(</span>data<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L718" class="LineNr"> 718 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;address_element_info&gt;::const_iterator info = p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  info != p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++info<span class="Delimiter">)</span>
-<span id="L719" class="LineNr"> 719 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='036refcount.cc.html#L53'>increment_refcount</a><span class="Delimiter">(</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>info<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">));</span>
-<span id="L720" class="LineNr"> 720 </span>  <span class="Delimiter">}</span>
-<span id="L721" class="LineNr"> 721 </span><span class="Delimiter">}</span>
-<span id="L722" class="LineNr"> 722 </span>
-<span id="L723" class="LineNr"> 723 </span><span class="Delimiter">:(before &quot;End Decrement Refcounts(canonized_x)&quot;)</span>
-<span id="L724" class="LineNr"> 724 </span><span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_container<span class="Delimiter">(</span>canonized_x<span class="Delimiter">)</span> || is_mu_exclusive_container<span class="Delimiter">(</span>canonized_x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L725" class="LineNr"> 725 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;need to read old value of '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>canonized_x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' to figure out what refcounts to decrement&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L726" class="LineNr"> 726 </span>  <span class="Comment">// read from canonized_x but without canonizing again</span>
-<span id="L727" class="LineNr"> 727 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> tmp = canonized_x<span class="Delimiter">;</span>
-<span id="L728" class="LineNr"> 728 </span>  tmp<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;raw&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
-<span id="L729" class="LineNr"> 729 </span>  vector&lt;<span class="Normal">double</span>&gt; data = read_memory<span class="Delimiter">(</span>tmp<span class="Delimiter">);</span>
-<span id="L730" class="LineNr"> 730 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done reading old value of '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>canonized_x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L731" class="LineNr"> 731 </span>  <span class="Normal">const</span> container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> canonized_x<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L732" class="LineNr"> 732 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt;::const_iterator p = metadata<span class="Delimiter">.</span>address<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != metadata<span class="Delimiter">.</span>address<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L733" class="LineNr"> 733 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!all_match<span class="Delimiter">(</span>data<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L734" class="LineNr"> 734 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;address_element_info&gt;::const_iterator info = p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  info != p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++info<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L735" class="LineNr"> 735 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">int</span> element_address = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> canonized_x<span class="Delimiter">.</span>value + info<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">);</span>
-<span id="L736" class="LineNr"> 736 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> reagent<span class="Comment">/*</span><span class="Comment">local</span><span class="Comment">*/</span> element<span class="Delimiter">;</span>
-<span id="L737" class="LineNr"> 737 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>element_address+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L738" class="LineNr"> 738 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> element<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">);</span>
-<span id="L739" class="LineNr"> 739 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='036refcount.cc.html#L71'>decrement_refcount</a><span class="Delimiter">(</span>element_address<span class="Delimiter">,</span> info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">,</span> size_of<span class="Delimiter">(</span>element<span class="Delimiter">)</span>+<span class="Comment">/*</span><span class="Comment">refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L740" class="LineNr"> 740 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L741" class="LineNr"> 741 </span>  <span class="Delimiter">}</span>
-<span id="L742" class="LineNr"> 742 </span><span class="Delimiter">}</span>
-<span id="L743" class="LineNr"> 743 </span>
-<span id="L744" class="LineNr"> 744 </span><span class="Delimiter">:(code)</span>
-<span id="L745" class="LineNr"> 745 </span><span class="Normal">bool</span> <a href='036refcount.cc.html#L745'>all_match</a><span class="Delimiter">(</span><span class="Normal">const</span> vector&lt;<span class="Normal">double</span>&gt;&amp; data<span class="Delimiter">,</span> <span class="Normal">const</span> set&lt;tag_condition_info&gt;&amp; conditions<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L746" class="LineNr"> 746 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;tag_condition_info&gt;::const_iterator p = conditions<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != conditions<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L747" class="LineNr"> 747 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">)</span> != p<span class="Delimiter">-&gt;</span>tag<span class="Delimiter">)</span>
-<span id="L748" class="LineNr"> 748 </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="L749" class="LineNr"> 749 </span>  <span class="Delimiter">}</span>
-<span id="L750" class="LineNr"> 750 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L751" class="LineNr"> 751 </span><span class="Delimiter">}</span>
-<span id="L752" class="LineNr"> 752 </span>
-<span id="L753" class="LineNr"> 753 </span><span class="Delimiter">:(scenario refcounts_put_container)</span>
-<span id="L754" class="LineNr"> 754 </span><span class="muData">container</span> foo [
-<span id="L755" class="LineNr"> 755 </span>  <span class="Normal">a</span>:bar  <span class="Comment"># contains an address</span>
+<span id="L710" class="LineNr"> 710 </span><span class="Delimiter">:(before &quot;End Increment Refcounts(canonized_x)&quot;)</span>
+<span id="L711" class="LineNr"> 711 </span><span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_container<span class="Delimiter">(</span>canonized_x<span class="Delimiter">)</span> || is_mu_exclusive_container<span class="Delimiter">(</span>canonized_x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L712" class="LineNr"> 712 </span>  <span class="Normal">const</span> container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> canonized_x<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L713" class="LineNr"> 713 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt;::const_iterator p = metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L714" class="LineNr"> 714 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!all_match<span class="Delimiter">(</span>data<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L715" class="LineNr"> 715 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;address_element_info&gt;::const_iterator info = p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  info != p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++info<span class="Delimiter">)</span>
+<span id="L716" class="LineNr"> 716 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='036refcount.cc.html#L50'>increment_refcount</a><span class="Delimiter">(</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>info<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">));</span>
+<span id="L717" class="LineNr"> 717 </span>  <span class="Delimiter">}</span>
+<span id="L718" class="LineNr"> 718 </span><span class="Delimiter">}</span>
+<span id="L719" class="LineNr"> 719 </span>
+<span id="L720" class="LineNr"> 720 </span><span class="Delimiter">:(before &quot;End Decrement Refcounts(canonized_x)&quot;)</span>
+<span id="L721" class="LineNr"> 721 </span><span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_container<span class="Delimiter">(</span>canonized_x<span class="Delimiter">)</span> || is_mu_exclusive_container<span class="Delimiter">(</span>canonized_x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L722" class="LineNr"> 722 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;need to read old value of '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>canonized_x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' to figure out what refcounts to decrement&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L723" class="LineNr"> 723 </span>  <span class="Comment">// read from canonized_x but without canonizing again</span>
+<span id="L724" class="LineNr"> 724 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> tmp = canonized_x<span class="Delimiter">;</span>
+<span id="L725" class="LineNr"> 725 </span>  tmp<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;raw&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
+<span id="L726" class="LineNr"> 726 </span>  vector&lt;<span class="Normal">double</span>&gt; data = read_memory<span class="Delimiter">(</span>tmp<span class="Delimiter">);</span>
+<span id="L727" class="LineNr"> 727 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done reading old value of '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>canonized_x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L728" class="LineNr"> 728 </span>  <span class="Normal">const</span> container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> canonized_x<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L729" class="LineNr"> 729 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt;::const_iterator p = metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L730" class="LineNr"> 730 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!all_match<span class="Delimiter">(</span>data<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L731" class="LineNr"> 731 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;address_element_info&gt;::const_iterator info = p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  info != p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++info<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L732" class="LineNr"> 732 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">int</span> element_address = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> canonized_x<span class="Delimiter">.</span>value + info<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">);</span>
+<span id="L733" class="LineNr"> 733 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> reagent<span class="Comment">/*</span><span class="Comment">local</span><span class="Comment">*/</span> element<span class="Delimiter">;</span>
+<span id="L734" class="LineNr"> 734 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>element_address+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L735" class="LineNr"> 735 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> element<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">);</span>
+<span id="L736" class="LineNr"> 736 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='036refcount.cc.html#L68'>decrement_refcount</a><span class="Delimiter">(</span>element_address<span class="Delimiter">,</span> info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">,</span> size_of<span class="Delimiter">(</span>element<span class="Delimiter">)</span>+<span class="Comment">/*</span><span class="Comment">refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L737" class="LineNr"> 737 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L738" class="LineNr"> 738 </span>  <span class="Delimiter">}</span>
+<span id="L739" class="LineNr"> 739 </span><span class="Delimiter">}</span>
+<span id="L740" class="LineNr"> 740 </span>
+<span id="L741" class="LineNr"> 741 </span><span class="Delimiter">:(code)</span>
+<span id="L742" class="LineNr"> 742 </span><span class="Normal">bool</span> <a href='036refcount.cc.html#L742'>all_match</a><span class="Delimiter">(</span><span class="Normal">const</span> vector&lt;<span class="Normal">double</span>&gt;&amp; data<span class="Delimiter">,</span> <span class="Normal">const</span> set&lt;tag_condition_info&gt;&amp; conditions<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L743" class="LineNr"> 743 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;tag_condition_info&gt;::const_iterator p = conditions<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != conditions<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L744" class="LineNr"> 744 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">)</span> != p<span class="Delimiter">-&gt;</span>tag<span class="Delimiter">)</span>
+<span id="L745" class="LineNr"> 745 </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="L746" class="LineNr"> 746 </span>  <span class="Delimiter">}</span>
+<span id="L747" class="LineNr"> 747 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L748" class="LineNr"> 748 </span><span class="Delimiter">}</span>
+<span id="L749" class="LineNr"> 749 </span>
+<span id="L750" class="LineNr"> 750 </span><span class="Delimiter">:(scenario refcounts_put_container)</span>
+<span id="L751" class="LineNr"> 751 </span><span class="muData">container</span> foo [
+<span id="L752" class="LineNr"> 752 </span>  <span class="Normal">a</span>:bar  <span class="Comment"># contains an address</span>
+<span id="L753" class="LineNr"> 753 </span>]
+<span id="L754" class="LineNr"> 754 </span><span class="muData">container</span> bar [
+<span id="L755" class="LineNr"> 755 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L83'>address</a>:num
 <span id="L756" class="LineNr"> 756 </span>]
-<span id="L757" class="LineNr"> 757 </span><span class="muData">container</span> bar [
-<span id="L758" class="LineNr"> 758 </span>  <span class="Normal">x</span>:address:num
-<span id="L759" class="LineNr"> 759 </span>]
-<span id="L760" class="LineNr"> 760 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L761" class="LineNr"> 761 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L762" class="LineNr"> 762 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:address:num
-<span id="L763" class="LineNr"> 763 </span>  <span class="Constant">3</span>:address:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
-<span id="L764" class="LineNr"> 764 </span>  *<span class="Constant">3</span>:address:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">3</span>:address:foo<span class="Delimiter">,</span> <span class="Constant">a:offset</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
-<span id="L765" class="LineNr"> 765 </span>]
-<span id="L766" class="LineNr"> 766 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L767" class="LineNr"> 767 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L768" class="LineNr"> 768 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L769" class="LineNr"> 769 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L770" class="LineNr"> 770 </span><span class="traceContains">+run: {3: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()} &lt;- <a href='001help.cc.html#L221'>put</a> {3: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()}, {a: &quot;offset&quot;}, {2: &quot;bar&quot;}</span>
-<span id="L771" class="LineNr"> 771 </span><span class="Comment"># put increments refcount inside container</span>
-<span id="L772" class="LineNr"> 772 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
-<span id="L773" class="LineNr"> 773 </span>
-<span id="L774" class="LineNr"> 774 </span><span class="Delimiter">:(scenario refcounts_put_index_array)</span>
-<span id="L775" class="LineNr"> 775 </span><span class="muData">container</span> bar [
-<span id="L776" class="LineNr"> 776 </span>  <span class="Normal">x</span>:address:num
-<span id="L777" class="LineNr"> 777 </span>]
-<span id="L778" class="LineNr"> 778 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L779" class="LineNr"> 779 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L780" class="LineNr"> 780 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:address:num
-<span id="L781" class="LineNr"> 781 </span>  <span class="Constant">3</span>:address:array:bar<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">bar:type</span><span class="Delimiter">,</span> <span class="Constant">3</span>
-<span id="L782" class="LineNr"> 782 </span>  *<span class="Constant">3</span>:address:array:bar<span class="Special"> &lt;- </span>put-index *<span class="Constant">3</span>:address:array:bar<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
-<span id="L783" class="LineNr"> 783 </span>]
-<span id="L784" class="LineNr"> 784 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L785" class="LineNr"> 785 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L786" class="LineNr"> 786 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L787" class="LineNr"> 787 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L788" class="LineNr"> 788 </span><span class="traceContains">+run: {3: (&quot;address&quot; &quot;array&quot; &quot;bar&quot;), &quot;lookup&quot;: ()} &lt;- put-index {3: (&quot;address&quot; &quot;array&quot; &quot;bar&quot;), &quot;lookup&quot;: ()}, {0: &quot;literal&quot;}, {2: &quot;bar&quot;}</span>
-<span id="L789" class="LineNr"> 789 </span><span class="Comment"># put-index increments refcount inside container</span>
-<span id="L790" class="LineNr"> 790 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
-<span id="L791" class="LineNr"> 791 </span>
-<span id="L792" class="LineNr"> 792 </span><span class="Delimiter">:(scenario refcounts_maybe_convert_container)</span>
-<span id="L793" class="LineNr"> 793 </span><span class="muData">exclusive-container</span> foo [
-<span id="L794" class="LineNr"> 794 </span>  <span class="Normal">a</span>:num
-<span id="L795" class="LineNr"> 795 </span>  <span class="Normal">b</span>:bar  <span class="Comment"># contains an address</span>
+<span id="L757" class="LineNr"> 757 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L758" class="LineNr"> 758 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L759" class="LineNr"> 759 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L760" class="LineNr"> 760 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L83'>address</a>:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
+<span id="L761" class="LineNr"> 761 </span>  *<span class="Constant">3</span>:<a href='043space.cc.html#L83'>address</a>:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">3</span>:<a href='043space.cc.html#L83'>address</a>:foo<span class="Delimiter">,</span> <span class="Constant">a:offset</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
+<span id="L762" class="LineNr"> 762 </span>]
+<span id="L763" class="LineNr"> 763 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L764" class="LineNr"> 764 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L765" class="LineNr"> 765 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L766" class="LineNr"> 766 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L767" class="LineNr"> 767 </span><span class="traceContains">+run: {3: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()} &lt;- <a href='001help.cc.html#L221'>put</a> {3: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()}, {a: &quot;offset&quot;}, {2: &quot;bar&quot;}</span>
+<span id="L768" class="LineNr"> 768 </span><span class="Comment"># put increments refcount inside container</span>
+<span id="L769" class="LineNr"> 769 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
+<span id="L770" class="LineNr"> 770 </span>
+<span id="L771" class="LineNr"> 771 </span><span class="Delimiter">:(scenario refcounts_put_index_array)</span>
+<span id="L772" class="LineNr"> 772 </span><span class="muData">container</span> bar [
+<span id="L773" class="LineNr"> 773 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L774" class="LineNr"> 774 </span>]
+<span id="L775" class="LineNr"> 775 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L776" class="LineNr"> 776 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L777" class="LineNr"> 777 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L778" class="LineNr"> 778 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L83'>address</a>:array:bar<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">bar:type</span><span class="Delimiter">,</span> <span class="Constant">3</span>
+<span id="L779" class="LineNr"> 779 </span>  *<span class="Constant">3</span>:<a href='043space.cc.html#L83'>address</a>:array:bar<span class="Special"> &lt;- </span>put-index *<span class="Constant">3</span>:<a href='043space.cc.html#L83'>address</a>:array:bar<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
+<span id="L780" class="LineNr"> 780 </span>]
+<span id="L781" class="LineNr"> 781 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L782" class="LineNr"> 782 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L783" class="LineNr"> 783 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L784" class="LineNr"> 784 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L785" class="LineNr"> 785 </span><span class="traceContains">+run: {3: (&quot;address&quot; &quot;array&quot; &quot;bar&quot;), &quot;lookup&quot;: ()} &lt;- put-index {3: (&quot;address&quot; &quot;array&quot; &quot;bar&quot;), &quot;lookup&quot;: ()}, {0: &quot;literal&quot;}, {2: &quot;bar&quot;}</span>
+<span id="L786" class="LineNr"> 786 </span><span class="Comment"># put-index increments refcount inside container</span>
+<span id="L787" class="LineNr"> 787 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
+<span id="L788" class="LineNr"> 788 </span>
+<span id="L789" class="LineNr"> 789 </span><span class="Delimiter">:(scenario refcounts_maybe_convert_container)</span>
+<span id="L790" class="LineNr"> 790 </span><span class="muData">exclusive-container</span> foo [
+<span id="L791" class="LineNr"> 791 </span>  <span class="Normal">a</span>:num
+<span id="L792" class="LineNr"> 792 </span>  <span class="Normal">b</span>:bar  <span class="Comment"># contains an address</span>
+<span id="L793" class="LineNr"> 793 </span>]
+<span id="L794" class="LineNr"> 794 </span><span class="muData">container</span> bar [
+<span id="L795" class="LineNr"> 795 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L83'>address</a>:num
 <span id="L796" class="LineNr"> 796 </span>]
-<span id="L797" class="LineNr"> 797 </span><span class="muData">container</span> bar [
-<span id="L798" class="LineNr"> 798 </span>  <span class="Normal">x</span>:address:num
-<span id="L799" class="LineNr"> 799 </span>]
-<span id="L800" class="LineNr"> 800 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L801" class="LineNr"> 801 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L802" class="LineNr"> 802 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:address:num
-<span id="L803" class="LineNr"> 803 </span>  <span class="Constant">3</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/b<span class="Delimiter">,</span> <span class="Constant">2</span>:bar
-<span id="L804" class="LineNr"> 804 </span>  <span class="Constant">5</span>:bar<span class="Delimiter">,</span> <span class="Constant">6</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert <span class="Constant">3</span>:foo<span class="Delimiter">,</span> <span class="Constant">1:variant/b</span>
-<span id="L805" class="LineNr"> 805 </span>]
-<span id="L806" class="LineNr"> 806 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L807" class="LineNr"> 807 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L808" class="LineNr"> 808 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L809" class="LineNr"> 809 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L810" class="LineNr"> 810 </span><span class="traceContains">+run: {3: &quot;foo&quot;} &lt;- merge {1: &quot;literal&quot;, &quot;b&quot;: ()}, {2: &quot;bar&quot;}</span>
-<span id="L811" class="LineNr"> 811 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
-<span id="L812" class="LineNr"> 812 </span><span class="traceContains">+run: {5: &quot;bar&quot;}, {6: &quot;boolean&quot;} &lt;- maybe-convert {3: &quot;foo&quot;}, {1: &quot;variant&quot;, &quot;b&quot;: ()}</span>
-<span id="L813" class="LineNr"> 813 </span><span class="traceContains">+mem: incrementing refcount of 1000: 3 -&gt; 4</span>
-<span id="L814" class="LineNr"> 814 </span>
-<span id="L815" class="LineNr"> 815 </span><span class="Delimiter">:(scenario refcounts_copy_doubly_nested)</span>
-<span id="L816" class="LineNr"> 816 </span><span class="muData">container</span> foo [
-<span id="L817" class="LineNr"> 817 </span>  <span class="Normal">a</span>:bar  <span class="Comment"># no addresses</span>
-<span id="L818" class="LineNr"> 818 </span>  <span class="Normal">b</span>:curr  <span class="Comment"># contains addresses</span>
-<span id="L819" class="LineNr"> 819 </span>]
-<span id="L820" class="LineNr"> 820 </span><span class="muData">container</span> bar [
-<span id="L821" class="LineNr"> 821 </span>  <span class="Normal">x</span>:num
-<span id="L822" class="LineNr"> 822 </span>  <span class="Normal">y</span>:num
-<span id="L823" class="LineNr"> 823 </span>]
-<span id="L824" class="LineNr"> 824 </span><span class="muData">container</span> curr [
-<span id="L825" class="LineNr"> 825 </span>  <span class="Normal">x</span>:num
-<span id="L826" class="LineNr"> 826 </span>  <span class="Normal">y</span>:address:num  <span class="Comment"># address inside container inside container</span>
-<span id="L827" class="LineNr"> 827 </span>]
-<span id="L828" class="LineNr"> 828 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L829" class="LineNr"> 829 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L830" class="LineNr"> 830 </span>  <span class="Constant">2</span>:address:curr<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">curr:type</span>
-<span id="L831" class="LineNr"> 831 </span>  *<span class="Constant">2</span>:address:curr<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">2</span>:address:curr<span class="Delimiter">,</span> <span class="Constant">1:offset/y</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
-<span id="L832" class="LineNr"> 832 </span>  <span class="Constant">3</span>:address:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
-<span id="L833" class="LineNr"> 833 </span>  *<span class="Constant">3</span>:address:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">3</span>:address:foo<span class="Delimiter">,</span> <span class="Constant">1:offset/b</span><span class="Delimiter">,</span> *<span class="Constant">2</span>:address:curr
-<span id="L834" class="LineNr"> 834 </span>  <span class="Constant">4</span>:foo<span class="Special"> &lt;- </span>copy *<span class="Constant">3</span>:address:foo
-<span id="L835" class="LineNr"> 835 </span>]
-<span id="L836" class="LineNr"> 836 </span><span class="traceContains">+transform: compute address offsets for container foo</span>
-<span id="L837" class="LineNr"> 837 </span><span class="traceContains">+transform: checking container foo, element 1</span>
-<span id="L838" class="LineNr"> 838 </span><span class="traceContains">+transform: address at offset 3</span>
-<span id="L839" class="LineNr"> 839 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L840" class="LineNr"> 840 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L841" class="LineNr"> 841 </span><span class="Comment"># storing an address in a container updates its refcount</span>
-<span id="L842" class="LineNr"> 842 </span><span class="traceContains">+run: {2: (&quot;address&quot; &quot;curr&quot;), &quot;lookup&quot;: ()} &lt;- <a href='001help.cc.html#L221'>put</a> {2: (&quot;address&quot; &quot;curr&quot;), &quot;lookup&quot;: ()}, {1: &quot;offset&quot;, &quot;y&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L843" class="LineNr"> 843 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L844" class="LineNr"> 844 </span><span class="Comment"># storing a container in a container updates refcounts of any contained addresses</span>
-<span id="L845" class="LineNr"> 845 </span><span class="traceContains">+run: {3: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()} &lt;- <a href='001help.cc.html#L221'>put</a> {3: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()}, {1: &quot;offset&quot;, &quot;b&quot;: ()}, {2: (&quot;address&quot; &quot;curr&quot;), &quot;lookup&quot;: ()}</span>
-<span id="L846" class="LineNr"> 846 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
-<span id="L847" class="LineNr"> 847 </span><span class="Comment"># copying a container containing a container containing an address updates refcount</span>
-<span id="L848" class="LineNr"> 848 </span><span class="traceContains">+run: {4: &quot;foo&quot;} &lt;- copy {3: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()}</span>
-<span id="L849" class="LineNr"> 849 </span><span class="traceContains">+mem: incrementing refcount of 1000: 3 -&gt; 4</span>
-<span id="L850" class="LineNr"> 850 </span>
-<span id="L851" class="LineNr"> 851 </span><span class="Delimiter">:(scenario refcounts_copy_exclusive_container_within_container)</span>
-<span id="L852" class="LineNr"> 852 </span><span class="muData">container</span> foo [
-<span id="L853" class="LineNr"> 853 </span>  <span class="Normal">a</span>:num
-<span id="L854" class="LineNr"> 854 </span>  <span class="Normal">b</span>:bar
-<span id="L855" class="LineNr"> 855 </span>]
-<span id="L856" class="LineNr"> 856 </span><span class="muData">exclusive-container</span> bar [
-<span id="L857" class="LineNr"> 857 </span>  <span class="Normal">x</span>:num
-<span id="L858" class="LineNr"> 858 </span>  <span class="Normal">y</span>:num
-<span id="L859" class="LineNr"> 859 </span>  <span class="Normal">z</span>:address:num
-<span id="L860" class="LineNr"> 860 </span>]
-<span id="L861" class="LineNr"> 861 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L862" class="LineNr"> 862 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L863" class="LineNr"> 863 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/x<span class="Delimiter">,</span> <span class="Constant">34</span>
-<span id="L864" class="LineNr"> 864 </span>  <span class="Constant">3</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">12</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
-<span id="L865" class="LineNr"> 865 </span>  <span class="Constant">5</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">35</span>
-<span id="L866" class="LineNr"> 866 </span>  <span class="Constant">6</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">13</span><span class="Delimiter">,</span> <span class="Constant">5</span>:bar
-<span id="L867" class="LineNr"> 867 </span>  <span class="Constant">8</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">2</span>/z<span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
-<span id="L868" class="LineNr"> 868 </span>  <span class="Constant">9</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">14</span><span class="Delimiter">,</span> <span class="Constant">8</span>:bar
-<span id="L869" class="LineNr"> 869 </span>  <span class="Constant">11</span>:foo<span class="Special"> &lt;- </span>copy <span class="Constant">9</span>:foo
-<span id="L870" class="LineNr"> 870 </span>]
-<span id="L871" class="LineNr"> 871 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L872" class="LineNr"> 872 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L873" class="LineNr"> 873 </span><span class="Comment"># no change while merging items of other types</span>
-<span id="L874" class="LineNr"> 874 </span><span class="traceContains">+run: {8: &quot;bar&quot;} &lt;- merge {2: &quot;literal&quot;, &quot;z&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L875" class="LineNr"> 875 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L876" class="LineNr"> 876 </span><span class="traceContains">+run: {9: &quot;foo&quot;} &lt;- merge {14: &quot;literal&quot;}, {8: &quot;bar&quot;}</span>
-<span id="L877" class="LineNr"> 877 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
-<span id="L878" class="LineNr"> 878 </span><span class="traceContains">+run: {11: &quot;foo&quot;} &lt;- copy {9: &quot;foo&quot;}</span>
-<span id="L879" class="LineNr"> 879 </span><span class="traceContains">+mem: incrementing refcount of 1000: 3 -&gt; 4</span>
-<span id="L880" class="LineNr"> 880 </span>
-<span id="L881" class="LineNr"> 881 </span><span class="Delimiter">:(scenario refcounts_copy_container_within_exclusive_container)</span>
-<span id="L882" class="LineNr"> 882 </span><span class="muData">exclusive-container</span> foo [
-<span id="L883" class="LineNr"> 883 </span>  <span class="Normal">a</span>:num
-<span id="L884" class="LineNr"> 884 </span>  <span class="Normal">b</span>:bar
-<span id="L885" class="LineNr"> 885 </span>]
-<span id="L886" class="LineNr"> 886 </span><span class="muData">container</span> bar [
-<span id="L887" class="LineNr"> 887 </span>  <span class="Normal">x</span>:num
-<span id="L888" class="LineNr"> 888 </span>  <span class="Normal">y</span>:num
-<span id="L889" class="LineNr"> 889 </span>  <span class="Normal">z</span>:address:num
-<span id="L890" class="LineNr"> 890 </span>]
-<span id="L891" class="LineNr"> 891 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L892" class="LineNr"> 892 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L893" class="LineNr"> 893 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/a<span class="Delimiter">,</span> <span class="Constant">34</span>
-<span id="L894" class="LineNr"> 894 </span>  <span class="Constant">6</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/a<span class="Delimiter">,</span> <span class="Constant">35</span>
-<span id="L895" class="LineNr"> 895 </span>  <span class="Constant">10</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">2</span>/x<span class="Delimiter">,</span> <span class="Constant">15</span>/y<span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
-<span id="L896" class="LineNr"> 896 </span>  <span class="Constant">13</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/b<span class="Delimiter">,</span> <span class="Constant">10</span>:bar
-<span id="L897" class="LineNr"> 897 </span>  <span class="Constant">17</span>:foo<span class="Special"> &lt;- </span>copy <span class="Constant">13</span>:foo
-<span id="L898" class="LineNr"> 898 </span>]
-<span id="L899" class="LineNr"> 899 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L900" class="LineNr"> 900 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L901" class="LineNr"> 901 </span><span class="Comment"># no change while merging items of other types</span>
-<span id="L902" class="LineNr"> 902 </span><span class="traceContains">+run: {10: &quot;bar&quot;} &lt;- merge {2: &quot;literal&quot;, &quot;x&quot;: ()}, {15: &quot;literal&quot;, &quot;y&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L903" class="LineNr"> 903 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L904" class="LineNr"> 904 </span><span class="traceContains">+run: {13: &quot;foo&quot;} &lt;- merge {1: &quot;literal&quot;, &quot;b&quot;: ()}, {10: &quot;bar&quot;}</span>
-<span id="L905" class="LineNr"> 905 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
-<span id="L906" class="LineNr"> 906 </span><span class="traceContains">+run: {17: &quot;foo&quot;} &lt;- copy {13: &quot;foo&quot;}</span>
-<span id="L907" class="LineNr"> 907 </span><span class="traceContains">+mem: incrementing refcount of 1000: 3 -&gt; 4</span>
-<span id="L908" class="LineNr"> 908 </span>
-<span id="L909" class="LineNr"> 909 </span><span class="Delimiter">:(scenario refcounts_copy_exclusive_container_within_exclusive_container)</span>
-<span id="L910" class="LineNr"> 910 </span><span class="muData">exclusive-container</span> foo [
-<span id="L911" class="LineNr"> 911 </span>  <span class="Normal">a</span>:num
-<span id="L912" class="LineNr"> 912 </span>  <span class="Normal">b</span>:bar
-<span id="L913" class="LineNr"> 913 </span>]
-<span id="L914" class="LineNr"> 914 </span><span class="muData">exclusive-container</span> bar [
-<span id="L915" class="LineNr"> 915 </span>  <span class="Normal">x</span>:num
-<span id="L916" class="LineNr"> 916 </span>  <span class="Normal">y</span>:address:num
-<span id="L917" class="LineNr"> 917 </span>]
-<span id="L918" class="LineNr"> 918 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L919" class="LineNr"> 919 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L920" class="LineNr"> 920 </span>  <span class="Constant">10</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/b<span class="Delimiter">,</span> <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
-<span id="L921" class="LineNr"> 921 </span>  <span class="Constant">20</span>:foo<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>:foo
-<span id="L922" class="LineNr"> 922 </span>]
-<span id="L923" class="LineNr"> 923 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L924" class="LineNr"> 924 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L925" class="LineNr"> 925 </span><span class="Comment"># no change while merging items of other types</span>
-<span id="L926" class="LineNr"> 926 </span><span class="traceContains">+run: {10: &quot;foo&quot;} &lt;- merge {1: &quot;literal&quot;, &quot;b&quot;: ()}, {1: &quot;literal&quot;, &quot;y&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L927" class="LineNr"> 927 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L928" class="LineNr"> 928 </span><span class="traceContains">+run: {20: &quot;foo&quot;} &lt;- copy {10: &quot;foo&quot;}</span>
-<span id="L929" class="LineNr"> 929 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
-<span id="L930" class="LineNr"> 930 </span>
-<span id="L931" class="LineNr"> 931 </span><span class="Delimiter">:(scenario refcounts_copy_array_within_container)</span>
-<span id="L932" class="LineNr"> 932 </span><span class="muData">container</span> foo [
-<span id="L933" class="LineNr"> 933 </span>  <span class="Normal">x</span>:address:array:num
-<span id="L934" class="LineNr"> 934 </span>]
-<span id="L935" class="LineNr"> 935 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L936" class="LineNr"> 936 </span>  <span class="Constant">1</span>:address:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">3</span>
-<span id="L937" class="LineNr"> 937 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:address:array:num
-<span id="L938" class="LineNr"> 938 </span>  <span class="Constant">3</span>:address:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">5</span>
-<span id="L939" class="LineNr"> 939 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">3</span>:address:array:num
-<span id="L940" class="LineNr"> 940 </span>]
-<span id="L941" class="LineNr"> 941 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;array&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}, {3: &quot;literal&quot;}</span>
-<span id="L942" class="LineNr"> 942 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L943" class="LineNr"> 943 </span><span class="traceContains">+run: {2: &quot;foo&quot;} &lt;- merge {1: (&quot;address&quot; &quot;array&quot; &quot;number&quot;)}</span>
-<span id="L944" class="LineNr"> 944 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L945" class="LineNr"> 945 </span><span class="traceContains">+run: {2: &quot;foo&quot;} &lt;- merge {3: (&quot;address&quot; &quot;array&quot; &quot;number&quot;)}</span>
-<span id="L946" class="LineNr"> 946 </span><span class="traceContains">+mem: decrementing refcount of 1000: 2 -&gt; 1</span>
-<span id="L947" class="LineNr"> 947 </span>
-<span id="L948" class="LineNr"> 948 </span><span class="Delimiter">:(scenario refcounts_copy_address_within_static_array_within_container)</span>
-<span id="L949" class="LineNr"> 949 </span><span class="muData">container</span> foo [
-<span id="L950" class="LineNr"> 950 </span>  <span class="Normal">a</span>:array:bar:<span class="Constant">3</span>
-<span id="L951" class="LineNr"> 951 </span>  <span class="Normal">b</span>:address:num
-<span id="L952" class="LineNr"> 952 </span>]
-<span id="L953" class="LineNr"> 953 </span><span class="muData">container</span> bar [
-<span id="L954" class="LineNr"> 954 </span>  <span class="Normal">y</span>:num
-<span id="L955" class="LineNr"> 955 </span>  <span class="Normal">z</span>:address:num
-<span id="L956" class="LineNr"> 956 </span>]
-<span id="L957" class="LineNr"> 957 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L958" class="LineNr"> 958 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L959" class="LineNr"> 959 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
-<span id="L960" class="LineNr"> 960 </span>  <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Special"> &lt;- </span>create-array
-<span id="L961" class="LineNr"> 961 </span>  put-index <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
-<span id="L962" class="LineNr"> 962 </span>  <span class="Constant">20</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
-<span id="L963" class="LineNr"> 963 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L964" class="LineNr"> 964 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
-<span id="L965" class="LineNr"> 965 </span>  put-index <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
-<span id="L966" class="LineNr"> 966 </span>  <span class="Constant">20</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
-<span id="L967" class="LineNr"> 967 </span>]
-<span id="L968" class="LineNr"> 968 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L969" class="LineNr"> 969 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L970" class="LineNr"> 970 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {34: &quot;literal&quot;}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L971" class="LineNr"> 971 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L972" class="LineNr"> 972 </span><span class="traceContains">+run: put-index {10: (&quot;array&quot; &quot;bar&quot; &quot;3&quot;)}, {1: &quot;literal&quot;}, {2: &quot;bar&quot;}</span>
-<span id="L973" class="LineNr"> 973 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
-<span id="L974" class="LineNr"> 974 </span><span class="traceContains">+run: {20: &quot;foo&quot;} &lt;- merge {10: (&quot;array&quot; &quot;bar&quot; &quot;3&quot;)}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L975" class="LineNr"> 975 </span><span class="traceContains">+mem: incrementing refcount of 1000: 3 -&gt; 4</span>
-<span id="L976" class="LineNr"> 976 </span><span class="traceContains">+mem: incrementing refcount of 1000: 4 -&gt; 5</span>
-<span id="L977" class="LineNr"> 977 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- copy {0: &quot;literal&quot;}</span>
-<span id="L978" class="LineNr"> 978 </span><span class="traceContains">+mem: decrementing refcount of 1000: 5 -&gt; 4</span>
-<span id="L979" class="LineNr"> 979 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {34: &quot;literal&quot;}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L980" class="LineNr"> 980 </span><span class="traceContains">+mem: decrementing refcount of 1000: 4 -&gt; 3</span>
-<span id="L981" class="LineNr"> 981 </span><span class="traceContains">+run: put-index {10: (&quot;array&quot; &quot;bar&quot; &quot;3&quot;)}, {1: &quot;literal&quot;}, {2: &quot;bar&quot;}</span>
-<span id="L982" class="LineNr"> 982 </span><span class="traceContains">+mem: decrementing refcount of 1000: 3 -&gt; 2</span>
-<span id="L983" class="LineNr"> 983 </span><span class="traceContains">+run: {20: &quot;foo&quot;} &lt;- merge {10: (&quot;array&quot; &quot;bar&quot; &quot;3&quot;)}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L984" class="LineNr"> 984 </span><span class="traceContains">+mem: decrementing refcount of 1000: 2 -&gt; 1</span>
-<span id="L985" class="LineNr"> 985 </span><span class="traceContains">+mem: decrementing refcount of 1000: 1 -&gt; 0</span>
-<span id="L986" class="LineNr"> 986 </span>
-<span id="L987" class="LineNr"> 987 </span><span class="Delimiter">:(scenario refcounts_handle_exclusive_containers_with_different_tags)</span>
-<span id="L988" class="LineNr"> 988 </span><span class="muData">container</span> foo1 [
-<span id="L989" class="LineNr"> 989 </span>  <span class="Normal">x</span>:address:num
-<span id="L990" class="LineNr"> 990 </span>  <span class="Normal">y</span>:num
-<span id="L991" class="LineNr"> 991 </span>]
-<span id="L992" class="LineNr"> 992 </span><span class="muData">container</span> foo2 [
-<span id="L993" class="LineNr"> 993 </span>  <span class="Normal">x</span>:num
-<span id="L994" class="LineNr"> 994 </span>  <span class="Normal">y</span>:address:num
-<span id="L995" class="LineNr"> 995 </span>]
-<span id="L996" class="LineNr"> 996 </span><span class="muData">exclusive-container</span> bar [
-<span id="L997" class="LineNr"> 997 </span>  <span class="Normal">a</span>:foo1
-<span id="L998" class="LineNr"> 998 </span>  <span class="Normal">b</span>:foo2
-<span id="L999" class="LineNr"> 999 </span>]
-<span id="L1000" class="LineNr">1000 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L1001" class="LineNr">1001 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">12000</span>/unsafe  <span class="Comment"># pretend allocation</span>
-<span id="L1002" class="LineNr">1002 </span>  *<span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L1003" class="LineNr">1003 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/foo1<span class="Delimiter">,</span> <span class="Constant">1</span>:address:num<span class="Delimiter">,</span> <span class="Constant">97</span>
-<span id="L1004" class="LineNr">1004 </span>  <span class="Constant">5</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">13000</span>/unsafe  <span class="Comment"># pretend allocation</span>
-<span id="L1005" class="LineNr">1005 </span>  *<span class="Constant">5</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
-<span id="L1006" class="LineNr">1006 </span>  <span class="Constant">6</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/foo2<span class="Delimiter">,</span> <span class="Constant">98</span><span class="Delimiter">,</span> <span class="Constant">5</span>:address:num
-<span id="L1007" class="LineNr">1007 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>copy <span class="Constant">6</span>:bar
-<span id="L1008" class="LineNr">1008 </span>]
-<span id="L1009" class="LineNr">1009 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {0: &quot;literal&quot;, &quot;foo1&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}, {97: &quot;literal&quot;}</span>
-<span id="L1010" class="LineNr">1010 </span><span class="traceContains">+mem: incrementing refcount of 12000: 1 -&gt; 2</span>
-<span id="L1011" class="LineNr">1011 </span><span class="traceContains">+run: {6: &quot;bar&quot;} &lt;- merge {1: &quot;literal&quot;, &quot;foo2&quot;: ()}, {98: &quot;literal&quot;}, {5: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L1012" class="LineNr">1012 </span><span class="traceContains">+mem: incrementing refcount of 13000: 1 -&gt; 2</span>
-<span id="L1013" class="LineNr">1013 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- copy {6: &quot;bar&quot;}</span>
-<span id="L1014" class="LineNr">1014 </span><span class="traceContains">+mem: incrementing refcount of 13000: 2 -&gt; 3</span>
-<span id="L1015" class="LineNr">1015 </span><span class="traceContains">+mem: decrementing refcount of 12000: 2 -&gt; 1</span>
-<span id="L1016" class="LineNr">1016 </span>
-<span id="L1017" class="LineNr">1017 </span><span class="Delimiter">:(code)</span>
-<span id="L1018" class="LineNr">1018 </span><span class="Normal">bool</span> is_mu_container<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L1019" class="LineNr">1019 </span>  <span class="Identifier">return</span> is_mu_container<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L1020" class="LineNr">1020 </span><span class="Delimiter">}</span>
-<span id="L1021" class="LineNr">1021 </span><span class="Normal">bool</span> is_mu_container<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L1022" class="LineNr">1022 </span>  <span class="Normal">if</span> <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="L1023" class="LineNr">1023 </span>  <span class="Comment">// End is_mu_container(type) Special-cases</span>
-<span id="L1024" class="LineNr">1024 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L1025" class="LineNr">1025 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// error raised elsewhere</span>
-<span id="L1026" class="LineNr">1026 </span>  type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L1027" class="LineNr">1027 </span>  <span class="Identifier">return</span> info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">;</span>
-<span id="L1028" class="LineNr">1028 </span><span class="Delimiter">}</span>
-<span id="L1029" class="LineNr">1029 </span>
-<span id="L1030" class="LineNr">1030 </span><span class="Normal">bool</span> is_mu_exclusive_container<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L1031" class="LineNr">1031 </span>  <span class="Identifier">return</span> is_mu_exclusive_container<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L1032" class="LineNr">1032 </span><span class="Delimiter">}</span>
-<span id="L1033" class="LineNr">1033 </span><span class="Normal">bool</span> is_mu_exclusive_container<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L1034" class="LineNr">1034 </span>  <span class="Normal">if</span> <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="L1035" class="LineNr">1035 </span>  <span class="Comment">// End is_mu_exclusive_container(type) Special-cases</span>
-<span id="L1036" class="LineNr">1036 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L1037" class="LineNr">1037 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// error raised elsewhere</span>
-<span id="L1038" class="LineNr">1038 </span>  type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L1039" class="LineNr">1039 </span>  <span class="Identifier">return</span> info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">;</span>
-<span id="L1040" class="LineNr">1040 </span><span class="Delimiter">}</span>
+<span id="L797" class="LineNr"> 797 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L798" class="LineNr"> 798 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L799" class="LineNr"> 799 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L800" class="LineNr"> 800 </span>  <span class="Constant">3</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/b<span class="Delimiter">,</span> <span class="Constant">2</span>:bar
+<span id="L801" class="LineNr"> 801 </span>  <span class="Constant">5</span>:bar<span class="Delimiter">,</span> <span class="Constant">6</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert <span class="Constant">3</span>:foo<span class="Delimiter">,</span> <span class="Constant">1:variant/b</span>
+<span id="L802" class="LineNr"> 802 </span>]
+<span id="L803" class="LineNr"> 803 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L804" class="LineNr"> 804 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L805" class="LineNr"> 805 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L806" class="LineNr"> 806 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L807" class="LineNr"> 807 </span><span class="traceContains">+run: {3: &quot;foo&quot;} &lt;- merge {1: &quot;literal&quot;, &quot;b&quot;: ()}, {2: &quot;bar&quot;}</span>
+<span id="L808" class="LineNr"> 808 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
+<span id="L809" class="LineNr"> 809 </span><span class="traceContains">+run: {5: &quot;bar&quot;}, {6: &quot;boolean&quot;} &lt;- maybe-convert {3: &quot;foo&quot;}, {1: &quot;variant&quot;, &quot;b&quot;: ()}</span>
+<span id="L810" class="LineNr"> 810 </span><span class="traceContains">+mem: incrementing refcount of 1000: 3 -&gt; 4</span>
+<span id="L811" class="LineNr"> 811 </span>
+<span id="L812" class="LineNr"> 812 </span><span class="Delimiter">:(scenario refcounts_copy_doubly_nested)</span>
+<span id="L813" class="LineNr"> 813 </span><span class="muData">container</span> foo [
+<span id="L814" class="LineNr"> 814 </span>  <span class="Normal">a</span>:bar  <span class="Comment"># no addresses</span>
+<span id="L815" class="LineNr"> 815 </span>  <span class="Normal">b</span>:curr  <span class="Comment"># contains addresses</span>
+<span id="L816" class="LineNr"> 816 </span>]
+<span id="L817" class="LineNr"> 817 </span><span class="muData">container</span> bar [
+<span id="L818" class="LineNr"> 818 </span>  <span class="Normal">x</span>:num
+<span id="L819" class="LineNr"> 819 </span>  <span class="Normal">y</span>:num
+<span id="L820" class="LineNr"> 820 </span>]
+<span id="L821" class="LineNr"> 821 </span><span class="muData">container</span> curr [
+<span id="L822" class="LineNr"> 822 </span>  <span class="Normal">x</span>:num
+<span id="L823" class="LineNr"> 823 </span>  <span class="Normal">y</span>:<a href='043space.cc.html#L83'>address</a>:num  <span class="Comment"># address inside container inside container</span>
+<span id="L824" class="LineNr"> 824 </span>]
+<span id="L825" class="LineNr"> 825 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L826" class="LineNr"> 826 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L827" class="LineNr"> 827 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:curr<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">curr:type</span>
+<span id="L828" class="LineNr"> 828 </span>  *<span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:curr<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:curr<span class="Delimiter">,</span> <span class="Constant">1:offset/y</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L829" class="LineNr"> 829 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L83'>address</a>:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
+<span id="L830" class="LineNr"> 830 </span>  *<span class="Constant">3</span>:<a href='043space.cc.html#L83'>address</a>:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">3</span>:<a href='043space.cc.html#L83'>address</a>:foo<span class="Delimiter">,</span> <span class="Constant">1:offset/b</span><span class="Delimiter">,</span> *<span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:curr
+<span id="L831" class="LineNr"> 831 </span>  <span class="Constant">4</span>:foo<span class="Special"> &lt;- </span>copy *<span class="Constant">3</span>:<a href='043space.cc.html#L83'>address</a>:foo
+<span id="L832" class="LineNr"> 832 </span>]
+<span id="L833" class="LineNr"> 833 </span><span class="traceContains">+transform: compute <a href='043space.cc.html#L83'>address</a> offsets for container foo</span>
+<span id="L834" class="LineNr"> 834 </span><span class="traceContains">+transform: checking container foo, element 1</span>
+<span id="L835" class="LineNr"> 835 </span><span class="traceContains">+transform: <a href='043space.cc.html#L83'>address</a> at offset 3</span>
+<span id="L836" class="LineNr"> 836 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L837" class="LineNr"> 837 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L838" class="LineNr"> 838 </span><span class="Comment"># storing an address in a container updates its refcount</span>
+<span id="L839" class="LineNr"> 839 </span><span class="traceContains">+run: {2: (&quot;address&quot; &quot;curr&quot;), &quot;lookup&quot;: ()} &lt;- <a href='001help.cc.html#L221'>put</a> {2: (&quot;address&quot; &quot;curr&quot;), &quot;lookup&quot;: ()}, {1: &quot;offset&quot;, &quot;y&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L840" class="LineNr"> 840 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L841" class="LineNr"> 841 </span><span class="Comment"># storing a container in a container updates refcounts of any contained addresses</span>
+<span id="L842" class="LineNr"> 842 </span><span class="traceContains">+run: {3: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()} &lt;- <a href='001help.cc.html#L221'>put</a> {3: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()}, {1: &quot;offset&quot;, &quot;b&quot;: ()}, {2: (&quot;address&quot; &quot;curr&quot;), &quot;lookup&quot;: ()}</span>
+<span id="L843" class="LineNr"> 843 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
+<span id="L844" class="LineNr"> 844 </span><span class="Comment"># copying a container containing a container containing an address updates refcount</span>
+<span id="L845" class="LineNr"> 845 </span><span class="traceContains">+run: {4: &quot;foo&quot;} &lt;- copy {3: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()}</span>
+<span id="L846" class="LineNr"> 846 </span><span class="traceContains">+mem: incrementing refcount of 1000: 3 -&gt; 4</span>
+<span id="L847" class="LineNr"> 847 </span>
+<span id="L848" class="LineNr"> 848 </span><span class="Delimiter">:(scenario refcounts_copy_exclusive_container_within_container)</span>
+<span id="L849" class="LineNr"> 849 </span><span class="muData">container</span> foo [
+<span id="L850" class="LineNr"> 850 </span>  <span class="Normal">a</span>:num
+<span id="L851" class="LineNr"> 851 </span>  <span class="Normal">b</span>:bar
+<span id="L852" class="LineNr"> 852 </span>]
+<span id="L853" class="LineNr"> 853 </span><span class="muData">exclusive-container</span> bar [
+<span id="L854" class="LineNr"> 854 </span>  <span class="Normal">x</span>:num
+<span id="L855" class="LineNr"> 855 </span>  <span class="Normal">y</span>:num
+<span id="L856" class="LineNr"> 856 </span>  <span class="Normal">z</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L857" class="LineNr"> 857 </span>]
+<span id="L858" class="LineNr"> 858 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L859" class="LineNr"> 859 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L860" class="LineNr"> 860 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/x<span class="Delimiter">,</span> <span class="Constant">34</span>
+<span id="L861" class="LineNr"> 861 </span>  <span class="Constant">3</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">12</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
+<span id="L862" class="LineNr"> 862 </span>  <span class="Constant">5</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">35</span>
+<span id="L863" class="LineNr"> 863 </span>  <span class="Constant">6</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">13</span><span class="Delimiter">,</span> <span class="Constant">5</span>:bar
+<span id="L864" class="LineNr"> 864 </span>  <span class="Constant">8</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">2</span>/z<span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L865" class="LineNr"> 865 </span>  <span class="Constant">9</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">14</span><span class="Delimiter">,</span> <span class="Constant">8</span>:bar
+<span id="L866" class="LineNr"> 866 </span>  <span class="Constant">11</span>:foo<span class="Special"> &lt;- </span>copy <span class="Constant">9</span>:foo
+<span id="L867" class="LineNr"> 867 </span>]
+<span id="L868" class="LineNr"> 868 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L869" class="LineNr"> 869 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L870" class="LineNr"> 870 </span><span class="Comment"># no change while merging items of other types</span>
+<span id="L871" class="LineNr"> 871 </span><span class="traceContains">+run: {8: &quot;bar&quot;} &lt;- merge {2: &quot;literal&quot;, &quot;z&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L872" class="LineNr"> 872 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L873" class="LineNr"> 873 </span><span class="traceContains">+run: {9: &quot;foo&quot;} &lt;- merge {14: &quot;literal&quot;}, {8: &quot;bar&quot;}</span>
+<span id="L874" class="LineNr"> 874 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
+<span id="L875" class="LineNr"> 875 </span><span class="traceContains">+run: {11: &quot;foo&quot;} &lt;- copy {9: &quot;foo&quot;}</span>
+<span id="L876" class="LineNr"> 876 </span><span class="traceContains">+mem: incrementing refcount of 1000: 3 -&gt; 4</span>
+<span id="L877" class="LineNr"> 877 </span>
+<span id="L878" class="LineNr"> 878 </span><span class="Delimiter">:(scenario refcounts_copy_container_within_exclusive_container)</span>
+<span id="L879" class="LineNr"> 879 </span><span class="muData">exclusive-container</span> foo [
+<span id="L880" class="LineNr"> 880 </span>  <span class="Normal">a</span>:num
+<span id="L881" class="LineNr"> 881 </span>  <span class="Normal">b</span>:bar
+<span id="L882" class="LineNr"> 882 </span>]
+<span id="L883" class="LineNr"> 883 </span><span class="muData">container</span> bar [
+<span id="L884" class="LineNr"> 884 </span>  <span class="Normal">x</span>:num
+<span id="L885" class="LineNr"> 885 </span>  <span class="Normal">y</span>:num
+<span id="L886" class="LineNr"> 886 </span>  <span class="Normal">z</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L887" class="LineNr"> 887 </span>]
+<span id="L888" class="LineNr"> 888 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L889" class="LineNr"> 889 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L890" class="LineNr"> 890 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/a<span class="Delimiter">,</span> <span class="Constant">34</span>
+<span id="L891" class="LineNr"> 891 </span>  <span class="Constant">6</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/a<span class="Delimiter">,</span> <span class="Constant">35</span>
+<span id="L892" class="LineNr"> 892 </span>  <span class="Constant">10</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">2</span>/x<span class="Delimiter">,</span> <span class="Constant">15</span>/y<span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L893" class="LineNr"> 893 </span>  <span class="Constant">13</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/b<span class="Delimiter">,</span> <span class="Constant">10</span>:bar
+<span id="L894" class="LineNr"> 894 </span>  <span class="Constant">17</span>:foo<span class="Special"> &lt;- </span>copy <span class="Constant">13</span>:foo
+<span id="L895" class="LineNr"> 895 </span>]
+<span id="L896" class="LineNr"> 896 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L897" class="LineNr"> 897 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L898" class="LineNr"> 898 </span><span class="Comment"># no change while merging items of other types</span>
+<span id="L899" class="LineNr"> 899 </span><span class="traceContains">+run: {10: &quot;bar&quot;} &lt;- merge {2: &quot;literal&quot;, &quot;x&quot;: ()}, {15: &quot;literal&quot;, &quot;y&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L900" class="LineNr"> 900 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L901" class="LineNr"> 901 </span><span class="traceContains">+run: {13: &quot;foo&quot;} &lt;- merge {1: &quot;literal&quot;, &quot;b&quot;: ()}, {10: &quot;bar&quot;}</span>
+<span id="L902" class="LineNr"> 902 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
+<span id="L903" class="LineNr"> 903 </span><span class="traceContains">+run: {17: &quot;foo&quot;} &lt;- copy {13: &quot;foo&quot;}</span>
+<span id="L904" class="LineNr"> 904 </span><span class="traceContains">+mem: incrementing refcount of 1000: 3 -&gt; 4</span>
+<span id="L905" class="LineNr"> 905 </span>
+<span id="L906" class="LineNr"> 906 </span><span class="Delimiter">:(scenario refcounts_copy_exclusive_container_within_exclusive_container)</span>
+<span id="L907" class="LineNr"> 907 </span><span class="muData">exclusive-container</span> foo [
+<span id="L908" class="LineNr"> 908 </span>  <span class="Normal">a</span>:num
+<span id="L909" class="LineNr"> 909 </span>  <span class="Normal">b</span>:bar
+<span id="L910" class="LineNr"> 910 </span>]
+<span id="L911" class="LineNr"> 911 </span><span class="muData">exclusive-container</span> bar [
+<span id="L912" class="LineNr"> 912 </span>  <span class="Normal">x</span>:num
+<span id="L913" class="LineNr"> 913 </span>  <span class="Normal">y</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L914" class="LineNr"> 914 </span>]
+<span id="L915" class="LineNr"> 915 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L916" class="LineNr"> 916 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L917" class="LineNr"> 917 </span>  <span class="Constant">10</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/b<span class="Delimiter">,</span> <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L918" class="LineNr"> 918 </span>  <span class="Constant">20</span>:foo<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>:foo
+<span id="L919" class="LineNr"> 919 </span>]
+<span id="L920" class="LineNr"> 920 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L921" class="LineNr"> 921 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L922" class="LineNr"> 922 </span><span class="Comment"># no change while merging items of other types</span>
+<span id="L923" class="LineNr"> 923 </span><span class="traceContains">+run: {10: &quot;foo&quot;} &lt;- merge {1: &quot;literal&quot;, &quot;b&quot;: ()}, {1: &quot;literal&quot;, &quot;y&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L924" class="LineNr"> 924 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L925" class="LineNr"> 925 </span><span class="traceContains">+run: {20: &quot;foo&quot;} &lt;- copy {10: &quot;foo&quot;}</span>
+<span id="L926" class="LineNr"> 926 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
+<span id="L927" class="LineNr"> 927 </span>
+<span id="L928" class="LineNr"> 928 </span><span class="Delimiter">:(scenario refcounts_copy_array_within_container)</span>
+<span id="L929" class="LineNr"> 929 </span><span class="muData">container</span> foo [
+<span id="L930" class="LineNr"> 930 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L83'>address</a>:array:num
+<span id="L931" class="LineNr"> 931 </span>]
+<span id="L932" class="LineNr"> 932 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L933" class="LineNr"> 933 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">3</span>
+<span id="L934" class="LineNr"> 934 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num
+<span id="L935" class="LineNr"> 935 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L83'>address</a>:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">5</span>
+<span id="L936" class="LineNr"> 936 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">3</span>:<a href='043space.cc.html#L83'>address</a>:array:num
+<span id="L937" class="LineNr"> 937 </span>]
+<span id="L938" class="LineNr"> 938 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;array&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}, {3: &quot;literal&quot;}</span>
+<span id="L939" class="LineNr"> 939 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L940" class="LineNr"> 940 </span><span class="traceContains">+run: {2: &quot;foo&quot;} &lt;- merge {1: (&quot;address&quot; &quot;array&quot; &quot;number&quot;)}</span>
+<span id="L941" class="LineNr"> 941 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L942" class="LineNr"> 942 </span><span class="traceContains">+run: {2: &quot;foo&quot;} &lt;- merge {3: (&quot;address&quot; &quot;array&quot; &quot;number&quot;)}</span>
+<span id="L943" class="LineNr"> 943 </span><span class="traceContains">+mem: decrementing refcount of 1000: 2 -&gt; 1</span>
+<span id="L944" class="LineNr"> 944 </span>
+<span id="L945" class="LineNr"> 945 </span><span class="Delimiter">:(scenario refcounts_copy_address_within_static_array_within_container)</span>
+<span id="L946" class="LineNr"> 946 </span><span class="muData">container</span> foo [
+<span id="L947" class="LineNr"> 947 </span>  <span class="Normal">a</span>:array:bar:<span class="Constant">3</span>
+<span id="L948" class="LineNr"> 948 </span>  <span class="Normal">b</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L949" class="LineNr"> 949 </span>]
+<span id="L950" class="LineNr"> 950 </span><span class="muData">container</span> bar [
+<span id="L951" class="LineNr"> 951 </span>  <span class="Normal">y</span>:num
+<span id="L952" class="LineNr"> 952 </span>  <span class="Normal">z</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L953" class="LineNr"> 953 </span>]
+<span id="L954" class="LineNr"> 954 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L955" class="LineNr"> 955 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L956" class="LineNr"> 956 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L957" class="LineNr"> 957 </span>  <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Special"> &lt;- </span>create-array
+<span id="L958" class="LineNr"> 958 </span>  put-index <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
+<span id="L959" class="LineNr"> 959 </span>  <span class="Constant">20</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L960" class="LineNr"> 960 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L961" class="LineNr"> 961 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L962" class="LineNr"> 962 </span>  put-index <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
+<span id="L963" class="LineNr"> 963 </span>  <span class="Constant">20</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L964" class="LineNr"> 964 </span>]
+<span id="L965" class="LineNr"> 965 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L966" class="LineNr"> 966 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L967" class="LineNr"> 967 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {34: &quot;literal&quot;}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L968" class="LineNr"> 968 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L969" class="LineNr"> 969 </span><span class="traceContains">+run: put-index {10: (&quot;array&quot; &quot;bar&quot; &quot;3&quot;)}, {1: &quot;literal&quot;}, {2: &quot;bar&quot;}</span>
+<span id="L970" class="LineNr"> 970 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
+<span id="L971" class="LineNr"> 971 </span><span class="traceContains">+run: {20: &quot;foo&quot;} &lt;- merge {10: (&quot;array&quot; &quot;bar&quot; &quot;3&quot;)}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L972" class="LineNr"> 972 </span><span class="traceContains">+mem: incrementing refcount of 1000: 3 -&gt; 4</span>
+<span id="L973" class="LineNr"> 973 </span><span class="traceContains">+mem: incrementing refcount of 1000: 4 -&gt; 5</span>
+<span id="L974" class="LineNr"> 974 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- copy {0: &quot;literal&quot;}</span>
+<span id="L975" class="LineNr"> 975 </span><span class="traceContains">+mem: decrementing refcount of 1000: 5 -&gt; 4</span>
+<span id="L976" class="LineNr"> 976 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {34: &quot;literal&quot;}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L977" class="LineNr"> 977 </span><span class="traceContains">+mem: decrementing refcount of 1000: 4 -&gt; 3</span>
+<span id="L978" class="LineNr"> 978 </span><span class="traceContains">+run: put-index {10: (&quot;array&quot; &quot;bar&quot; &quot;3&quot;)}, {1: &quot;literal&quot;}, {2: &quot;bar&quot;}</span>
+<span id="L979" class="LineNr"> 979 </span><span class="traceContains">+mem: decrementing refcount of 1000: 3 -&gt; 2</span>
+<span id="L980" class="LineNr"> 980 </span><span class="traceContains">+run: {20: &quot;foo&quot;} &lt;- merge {10: (&quot;array&quot; &quot;bar&quot; &quot;3&quot;)}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L981" class="LineNr"> 981 </span><span class="traceContains">+mem: decrementing refcount of 1000: 2 -&gt; 1</span>
+<span id="L982" class="LineNr"> 982 </span><span class="traceContains">+mem: decrementing refcount of 1000: 1 -&gt; 0</span>
+<span id="L983" class="LineNr"> 983 </span>
+<span id="L984" class="LineNr"> 984 </span><span class="Delimiter">:(scenario refcounts_handle_exclusive_containers_with_different_tags)</span>
+<span id="L985" class="LineNr"> 985 </span><span class="muData">container</span> foo1 [
+<span id="L986" class="LineNr"> 986 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L987" class="LineNr"> 987 </span>  <span class="Normal">y</span>:num
+<span id="L988" class="LineNr"> 988 </span>]
+<span id="L989" class="LineNr"> 989 </span><span class="muData">container</span> foo2 [
+<span id="L990" class="LineNr"> 990 </span>  <span class="Normal">x</span>:num
+<span id="L991" class="LineNr"> 991 </span>  <span class="Normal">y</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L992" class="LineNr"> 992 </span>]
+<span id="L993" class="LineNr"> 993 </span><span class="muData">exclusive-container</span> bar [
+<span id="L994" class="LineNr"> 994 </span>  <span class="Normal">a</span>:foo1
+<span id="L995" class="LineNr"> 995 </span>  <span class="Normal">b</span>:foo2
+<span id="L996" class="LineNr"> 996 </span>]
+<span id="L997" class="LineNr"> 997 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L998" class="LineNr"> 998 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">12000</span>/unsafe  <span class="Comment"># pretend allocation</span>
+<span id="L999" class="LineNr"> 999 </span>  *<span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L1000" class="LineNr">1000 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/foo1<span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Delimiter">,</span> <span class="Constant">97</span>
+<span id="L1001" class="LineNr">1001 </span>  <span class="Constant">5</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">13000</span>/unsafe  <span class="Comment"># pretend allocation</span>
+<span id="L1002" class="LineNr">1002 </span>  *<span class="Constant">5</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
+<span id="L1003" class="LineNr">1003 </span>  <span class="Constant">6</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/foo2<span class="Delimiter">,</span> <span class="Constant">98</span><span class="Delimiter">,</span> <span class="Constant">5</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L1004" class="LineNr">1004 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>copy <span class="Constant">6</span>:bar
+<span id="L1005" class="LineNr">1005 </span>]
+<span id="L1006" class="LineNr">1006 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {0: &quot;literal&quot;, &quot;foo1&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}, {97: &quot;literal&quot;}</span>
+<span id="L1007" class="LineNr">1007 </span><span class="traceContains">+mem: incrementing refcount of 12000: 1 -&gt; 2</span>
+<span id="L1008" class="LineNr">1008 </span><span class="traceContains">+run: {6: &quot;bar&quot;} &lt;- merge {1: &quot;literal&quot;, &quot;foo2&quot;: ()}, {98: &quot;literal&quot;}, {5: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L1009" class="LineNr">1009 </span><span class="traceContains">+mem: incrementing refcount of 13000: 1 -&gt; 2</span>
+<span id="L1010" class="LineNr">1010 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- copy {6: &quot;bar&quot;}</span>
+<span id="L1011" class="LineNr">1011 </span><span class="traceContains">+mem: incrementing refcount of 13000: 2 -&gt; 3</span>
+<span id="L1012" class="LineNr">1012 </span><span class="traceContains">+mem: decrementing refcount of 12000: 2 -&gt; 1</span>
+<span id="L1013" class="LineNr">1013 </span>
+<span id="L1014" class="LineNr">1014 </span><span class="Delimiter">:(code)</span>
+<span id="L1015" class="LineNr">1015 </span><span class="Normal">bool</span> is_mu_container<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L1016" class="LineNr">1016 </span>  <span class="Identifier">return</span> is_mu_container<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L1017" class="LineNr">1017 </span><span class="Delimiter">}</span>
+<span id="L1018" class="LineNr">1018 </span><span class="Normal">bool</span> is_mu_container<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L1019" class="LineNr">1019 </span>  <span class="Normal">if</span> <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="L1020" class="LineNr">1020 </span>  <span class="Comment">// End is_mu_container(type) Special-cases</span>
+<span id="L1021" class="LineNr">1021 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L1022" class="LineNr">1022 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// error raised elsewhere</span>
+<span id="L1023" class="LineNr">1023 </span>  type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
+<span id="L1024" class="LineNr">1024 </span>  <span class="Identifier">return</span> info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">;</span>
+<span id="L1025" class="LineNr">1025 </span><span class="Delimiter">}</span>
+<span id="L1026" class="LineNr">1026 </span>
+<span id="L1027" class="LineNr">1027 </span><span class="Normal">bool</span> is_mu_exclusive_container<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L1028" class="LineNr">1028 </span>  <span class="Identifier">return</span> is_mu_exclusive_container<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L1029" class="LineNr">1029 </span><span class="Delimiter">}</span>
+<span id="L1030" class="LineNr">1030 </span><span class="Normal">bool</span> is_mu_exclusive_container<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L1031" class="LineNr">1031 </span>  <span class="Normal">if</span> <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="L1032" class="LineNr">1032 </span>  <span class="Comment">// End is_mu_exclusive_container(type) Special-cases</span>
+<span id="L1033" class="LineNr">1033 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L1034" class="LineNr">1034 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// error raised elsewhere</span>
+<span id="L1035" class="LineNr">1035 </span>  type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
+<span id="L1036" class="LineNr">1036 </span>  <span class="Identifier">return</span> info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">;</span>
+<span id="L1037" class="LineNr">1037 </span><span class="Delimiter">}</span>
+<span id="L1038" class="LineNr">1038 </span>
+<span id="L1039" class="LineNr">1039 </span><span class="SalientComment">//:: Counters for trying to understand where Mu programs are spending time</span>
+<span id="L1040" class="LineNr">1040 </span><span class="SalientComment">//:: updating refcounts.</span>
 <span id="L1041" class="LineNr">1041 </span>
-<span id="L1042" class="LineNr">1042 </span><span class="SalientComment">//:: Counters for trying to understand where Mu programs are spending time</span>
-<span id="L1043" class="LineNr">1043 </span><span class="SalientComment">//:: updating refcounts.</span>
-<span id="L1044" class="LineNr">1044 </span>
-<span id="L1045" class="LineNr">1045 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L1046" class="LineNr">1046 </span><span class="Normal">int</span> Total_refcount_updates = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L1047" class="LineNr">1047 </span>map&lt;recipe_ordinal<span class="Delimiter">,</span> map&lt;<span class="Comment">/*</span><span class="Comment">step index</span><span class="Comment">*/</span><span class="Normal">int</span><span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">num refcount updates</span><span class="Comment">*/</span><span class="Normal">int</span>&gt; &gt; Num_refcount_updates<span class="Delimiter">;</span>
-<span id="L1048" class="LineNr">1048 </span><span class="Delimiter">:(after &quot;Running One Instruction&quot;)</span>
-<span id="L1049" class="LineNr">1049 </span><span class="Normal">int</span> initial_num_refcount_updates = Total_refcount_updates<span class="Delimiter">;</span>
-<span id="L1050" class="LineNr">1050 </span><span class="Delimiter">:(before &quot;End Running One Instruction&quot;)</span>
-<span id="L1051" class="LineNr">1051 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Run_profiler<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L1052" class="LineNr">1052 </span>  Num_refcount_updates[current_call<span class="Delimiter">().</span>running_recipe][current_call<span class="Delimiter">().</span>running_step_index]
-<span id="L1053" class="LineNr">1053 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> += <span class="Delimiter">(</span>Total_refcount_updates - initial_num_refcount_updates<span class="Delimiter">);</span>
-<span id="L1054" class="LineNr">1054 </span>  initial_num_refcount_updates = Total_refcount_updates<span class="Delimiter">;</span>
-<span id="L1055" class="LineNr">1055 </span><span class="Delimiter">}</span>
-<span id="L1056" class="LineNr">1056 </span><span class="Delimiter">:(before &quot;End Non-primitive Call(caller_frame)&quot;)</span>
-<span id="L1057" class="LineNr">1057 </span>Num_refcount_updates[caller_frame<span class="Delimiter">.</span>running_recipe][caller_frame<span class="Delimiter">.</span>running_step_index]
-<span id="L1058" class="LineNr">1058 </span>  <span class="Conceal">¦</span> += <span class="Delimiter">(</span>Total_refcount_updates - initial_num_refcount_updates<span class="Delimiter">);</span>
-<span id="L1059" class="LineNr">1059 </span>initial_num_refcount_updates = Total_refcount_updates<span class="Delimiter">;</span>
-<span id="L1060" class="LineNr">1060 </span><span class="Delimiter">:(after &quot;Starting Reply&quot;)</span>
-<span id="L1061" class="LineNr">1061 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Run_profiler<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L1062" class="LineNr">1062 </span>  Num_refcount_updates[current_call<span class="Delimiter">().</span>running_recipe][current_call<span class="Delimiter">().</span>running_step_index]
-<span id="L1063" class="LineNr">1063 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> += <span class="Delimiter">(</span>Total_refcount_updates - initial_num_refcount_updates<span class="Delimiter">);</span>
-<span id="L1064" class="LineNr">1064 </span>  initial_num_refcount_updates = Total_refcount_updates<span class="Delimiter">;</span>
-<span id="L1065" class="LineNr">1065 </span><span class="Delimiter">}</span>
-<span id="L1066" class="LineNr">1066 </span><span class="Delimiter">:(before &quot;End dump_profile&quot;)</span>
-<span id="L1067" class="LineNr">1067 </span>fout<span class="Delimiter">.</span>open<span class="Delimiter">(</span><span class="Constant">&quot;profile.refcounts&quot;</span><span class="Delimiter">);</span>
-<span id="L1068" class="LineNr">1068 </span><span class="Normal">if</span> <span class="Delimiter">(</span>fout<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L1069" class="LineNr">1069 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;recipe_ordinal<span class="Delimiter">,</span> recipe&gt;::iterator p = Recipe<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Recipe<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L1070" class="LineNr">1070 </span>  <span class="Conceal">¦</span> <a href='036refcount.cc.html#L1074'>dump_recipe_profile</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">,</span> fout<span class="Delimiter">);</span>
-<span id="L1071" class="LineNr">1071 </span><span class="Delimiter">}</span>
-<span id="L1072" class="LineNr">1072 </span>fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
-<span id="L1073" class="LineNr">1073 </span><span class="Delimiter">:(code)</span>
-<span id="L1074" class="LineNr">1074 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L1074'>dump_recipe_profile</a><span class="Delimiter">(</span><a href='010vm.cc.html#L14'>recipe_ordinal</a> ridx<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; r<span class="Delimiter">,</span> ostream&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L1075" class="LineNr">1075 </span>  out &lt;&lt; <span class="Constant">&quot;recipe &quot;</span> &lt;&lt; r<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L1076" class="LineNr">1076 </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>r<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L1077" class="LineNr">1077 </span>  <span class="Conceal">¦</span> out &lt;&lt; std::setw<span class="Delimiter">(</span><span class="Constant">6</span><span class="Delimiter">)</span> &lt;&lt; Num_refcount_updates[ridx][i] &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L1078" class="LineNr">1078 </span>  <span class="Delimiter">}</span>
-<span id="L1079" class="LineNr">1079 </span>  out &lt;&lt; <span class="Constant">&quot;]</span><span class="cSpecial">\n\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L1080" class="LineNr">1080 </span><span class="Delimiter">}</span>
+<span id="L1042" class="LineNr">1042 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L1043" class="LineNr">1043 </span><span class="Normal">int</span> Total_refcount_updates = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L1044" class="LineNr">1044 </span>map&lt;recipe_ordinal<span class="Delimiter">,</span> map&lt;<span class="Comment">/*</span><span class="Comment">step index</span><span class="Comment">*/</span><span class="Normal">int</span><span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">num refcount updates</span><span class="Comment">*/</span><span class="Normal">int</span>&gt; &gt; Num_refcount_updates<span class="Delimiter">;</span>
+<span id="L1045" class="LineNr">1045 </span><span class="Delimiter">:(after &quot;Running One Instruction&quot;)</span>
+<span id="L1046" class="LineNr">1046 </span><span class="Normal">int</span> initial_num_refcount_updates = Total_refcount_updates<span class="Delimiter">;</span>
+<span id="L1047" class="LineNr">1047 </span><span class="Delimiter">:(before &quot;End Running One Instruction&quot;)</span>
+<span id="L1048" class="LineNr">1048 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Run_profiler<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L1049" class="LineNr">1049 </span>  Num_refcount_updates[current_call<span class="Delimiter">().</span>running_recipe][current_call<span class="Delimiter">().</span>running_step_index]
+<span id="L1050" class="LineNr">1050 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> += <span class="Delimiter">(</span>Total_refcount_updates - initial_num_refcount_updates<span class="Delimiter">);</span>
+<span id="L1051" class="LineNr">1051 </span>  initial_num_refcount_updates = Total_refcount_updates<span class="Delimiter">;</span>
+<span id="L1052" class="LineNr">1052 </span><span class="Delimiter">}</span>
+<span id="L1053" class="LineNr">1053 </span><span class="Delimiter">:(before &quot;End Non-primitive Call(caller_frame)&quot;)</span>
+<span id="L1054" class="LineNr">1054 </span>Num_refcount_updates[caller_frame<span class="Delimiter">.</span>running_recipe][caller_frame<span class="Delimiter">.</span>running_step_index]
+<span id="L1055" class="LineNr">1055 </span>  <span class="Conceal">¦</span> += <span class="Delimiter">(</span>Total_refcount_updates - initial_num_refcount_updates<span class="Delimiter">);</span>
+<span id="L1056" class="LineNr">1056 </span>initial_num_refcount_updates = Total_refcount_updates<span class="Delimiter">;</span>
+<span id="L1057" class="LineNr">1057 </span><span class="Delimiter">:(after &quot;Begin Return&quot;)</span>
+<span id="L1058" class="LineNr">1058 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Run_profiler<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L1059" class="LineNr">1059 </span>  Num_refcount_updates[current_call<span class="Delimiter">().</span>running_recipe][current_call<span class="Delimiter">().</span>running_step_index]
+<span id="L1060" class="LineNr">1060 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> += <span class="Delimiter">(</span>Total_refcount_updates - initial_num_refcount_updates<span class="Delimiter">);</span>
+<span id="L1061" class="LineNr">1061 </span>  initial_num_refcount_updates = Total_refcount_updates<span class="Delimiter">;</span>
+<span id="L1062" class="LineNr">1062 </span><span class="Delimiter">}</span>
+<span id="L1063" class="LineNr">1063 </span><span class="Delimiter">:(before &quot;End dump_profile&quot;)</span>
+<span id="L1064" class="LineNr">1064 </span>fout<span class="Delimiter">.</span>open<span class="Delimiter">(</span><span class="Constant">&quot;profile.refcounts&quot;</span><span class="Delimiter">);</span>
+<span id="L1065" class="LineNr">1065 </span><span class="Normal">if</span> <span class="Delimiter">(</span>fout<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L1066" class="LineNr">1066 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;recipe_ordinal<span class="Delimiter">,</span> recipe&gt;::iterator p = Recipe<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Recipe<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L1067" class="LineNr">1067 </span>  <span class="Conceal">¦</span> <a href='036refcount.cc.html#L1071'>dump_recipe_profile</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">,</span> fout<span class="Delimiter">);</span>
+<span id="L1068" class="LineNr">1068 </span><span class="Delimiter">}</span>
+<span id="L1069" class="LineNr">1069 </span>fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
+<span id="L1070" class="LineNr">1070 </span><span class="Delimiter">:(code)</span>
+<span id="L1071" class="LineNr">1071 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L1071'>dump_recipe_profile</a><span class="Delimiter">(</span><a href='010vm.cc.html#L14'>recipe_ordinal</a> ridx<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; r<span class="Delimiter">,</span> ostream&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L1072" class="LineNr">1072 </span>  out &lt;&lt; <span class="Constant">&quot;recipe &quot;</span> &lt;&lt; r<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L1073" class="LineNr">1073 </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>r<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L1074" class="LineNr">1074 </span>  <span class="Conceal">¦</span> out &lt;&lt; std::setw<span class="Delimiter">(</span><span class="Constant">6</span><span class="Delimiter">)</span> &lt;&lt; Num_refcount_updates[ridx][i] &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L1075" class="LineNr">1075 </span>  <span class="Delimiter">}</span>
+<span id="L1076" class="LineNr">1076 </span>  out &lt;&lt; <span class="Constant">&quot;]</span><span class="cSpecial">\n\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L1077" class="LineNr">1077 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/037abandon.cc.html b/html/037abandon.cc.html
index 0a5eadc4..7af0b622 100644
--- a/html/037abandon.cc.html
+++ b/html/037abandon.cc.html
@@ -68,11 +68,11 @@ if ('onhashchange' in window) {
 <span id="L3" class="LineNr">  3 </span>
 <span id="L4" class="LineNr">  4 </span><span class="Delimiter">:(scenario new_reclaim)</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>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L7" class="LineNr">  7 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:address:num  <span class="Comment"># because 1 will get reset during abandon below</span>
-<span id="L8" class="LineNr">  8 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># abandon</span>
-<span id="L9" class="LineNr">  9 </span>  <span class="Constant">3</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>  <span class="Comment"># must be same size as abandoned memory to reuse</span>
-<span id="L10" class="LineNr"> 10 </span>  <span class="Constant">4</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3</span>:address:num
+<span id="L6" class="LineNr">  6 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L7" class="LineNr">  7 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num  <span class="Comment"># because 1 will get reset during abandon below</span>
+<span id="L8" class="LineNr">  8 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># abandon</span>
+<span id="L9" class="LineNr">  9 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>  <span class="Comment"># must be same size as abandoned memory to reuse</span>
+<span id="L10" class="LineNr"> 10 </span>  <span class="Constant">4</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3</span>:<a href='043space.cc.html#L83'>address</a>:num
 <span id="L11" class="LineNr"> 11 </span>  <span class="Constant">5</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>equal <span class="Constant">2</span>:num<span class="Delimiter">,</span> <span class="Constant">4</span>:num
 <span id="L12" class="LineNr"> 12 </span>]
 <span id="L13" class="LineNr"> 13 </span><span class="Comment"># both allocations should have returned the same address</span>
@@ -81,7 +81,7 @@ if ('onhashchange' in window) {
 <span id="L16" class="LineNr"> 16 </span><span class="Delimiter">:(before &quot;End Decrement Refcount(old_address, <a href='030container.cc.html#L238'>payload_type</a>, payload_size)&quot;)</span>
 <span id="L17" class="LineNr"> 17 </span><span class="Normal">if</span> <span class="Delimiter">(</span>old_refcount == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L18" class="LineNr"> 18 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;automatically abandoning &quot;</span> &lt;&lt; old_address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L19" class="LineNr"> 19 </span>  <a href='037abandon.cc.html#L28'>abandon</a><span class="Delimiter">(</span>old_address<span class="Delimiter">,</span> <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">,</span> <a href='036refcount.cc.html#L92'>payload_size</a><span class="Delimiter">);</span>
+<span id="L19" class="LineNr"> 19 </span>  <a href='037abandon.cc.html#L28'>abandon</a><span class="Delimiter">(</span>old_address<span class="Delimiter">,</span> <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">,</span> <a href='036refcount.cc.html#L89'>payload_size</a><span class="Delimiter">);</span>
 <span id="L20" class="LineNr"> 20 </span><span class="Delimiter">}</span>
 <span id="L21" class="LineNr"> 21 </span>
 <span id="L22" class="LineNr"> 22 </span><span class="Comment">//: When abandoning addresses we'll save them to a 'free list', segregated by size.</span>
@@ -90,8 +90,8 @@ if ('onhashchange' in window) {
 <span id="L25" class="LineNr"> 25 </span>map&lt;<span class="Normal">int</span><span class="Delimiter">,</span> <span class="Normal">int</span>&gt; free_list<span class="Delimiter">;</span>
 <span id="L26" class="LineNr"> 26 </span>
 <span id="L27" class="LineNr"> 27 </span><span class="Delimiter">:(code)</span>
-<span id="L28" class="LineNr"> 28 </span><span class="Normal">void</span> <a href='037abandon.cc.html#L28'>abandon</a><span class="Delimiter">(</span><span class="Normal">int</span> address<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">,</span> <span class="Normal">int</span> <a href='036refcount.cc.html#L92'>payload_size</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L29" class="LineNr"> 29 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;abandon&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;updating refcounts inside &quot;</span> &lt;&lt; address &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L28" class="LineNr"> 28 </span><span class="Normal">void</span> <a href='037abandon.cc.html#L28'>abandon</a><span class="Delimiter">(</span><span class="Normal">int</span> <a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">,</span> <span class="Normal">int</span> <a href='036refcount.cc.html#L89'>payload_size</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L29" class="LineNr"> 29 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;abandon&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;updating refcounts inside &quot;</span> &lt;&lt; <a href='043space.cc.html#L83'>address</a> &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L30" class="LineNr"> 30 </span><span class="CommentedCode">//?   Total_free += size;</span>
 <span id="L31" class="LineNr"> 31 </span><span class="CommentedCode">//?   ++Num_free;</span>
 <span id="L32" class="LineNr"> 32 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;abandon: &quot; &lt;&lt; size &lt;&lt; '\n';</span>
@@ -103,23 +103,23 @@ if ('onhashchange' in window) {
 <span id="L38" class="LineNr"> 38 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name != <span class="Constant">&quot;array&quot;</span><span class="Delimiter">);</span>
 <span id="L39" class="LineNr"> 39 </span>  <span class="Conceal">¦</span> <span class="Normal">int</span> element_size = size_of<span class="Delimiter">(</span>element<span class="Delimiter">);</span>
 <span id="L40" class="LineNr"> 40 </span>  <span class="Conceal">¦</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='032array.cc.html#L397'>array_length</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L41" class="LineNr"> 41 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>address + <span class="Comment">/*</span><span class="Comment">skip refcount and length</span><span class="Comment">*/</span><span class="Constant">2</span> + i*element_size<span class="Delimiter">);</span>
-<span id="L42" class="LineNr"> 42 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='036refcount.cc.html#L62'>decrement_any_refcounts</a><span class="Delimiter">(</span>element<span class="Delimiter">);</span>
+<span id="L41" class="LineNr"> 41 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a> + <span class="Comment">/*</span><span class="Comment">skip refcount and length</span><span class="Comment">*/</span><span class="Constant">2</span> + i*element_size<span class="Delimiter">);</span>
+<span id="L42" class="LineNr"> 42 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='036refcount.cc.html#L59'>decrement_any_refcounts</a><span class="Delimiter">(</span>element<span class="Delimiter">);</span>
 <span id="L43" class="LineNr"> 43 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L44" class="LineNr"> 44 </span>  <span class="Delimiter">}</span>
 <span id="L45" class="LineNr"> 45 </span>  <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_container<span class="Delimiter">(</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">)</span> || is_mu_exclusive_container<span class="Delimiter">(</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L46" class="LineNr"> 46 </span>  <span class="Conceal">¦</span> reagent tmp<span class="Delimiter">;</span>
 <span id="L47" class="LineNr"> 47 </span>  <span class="Conceal">¦</span> tmp<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*payload_type<span class="Delimiter">);</span>
-<span id="L48" class="LineNr"> 48 </span>  <span class="Conceal">¦</span> tmp<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>address + <span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L49" class="LineNr"> 49 </span>  <span class="Conceal">¦</span> <a href='036refcount.cc.html#L62'>decrement_any_refcounts</a><span class="Delimiter">(</span>tmp<span class="Delimiter">);</span>
+<span id="L48" class="LineNr"> 48 </span>  <span class="Conceal">¦</span> tmp<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a> + <span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L49" class="LineNr"> 49 </span>  <span class="Conceal">¦</span> <a href='036refcount.cc.html#L59'>decrement_any_refcounts</a><span class="Delimiter">(</span>tmp<span class="Delimiter">);</span>
 <span id="L50" class="LineNr"> 50 </span>  <span class="Delimiter">}</span>
 <span id="L51" class="LineNr"> 51 </span>  <span class="Comment">// clear memory</span>
-<span id="L52" class="LineNr"> 52 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> curr = address<span class="Delimiter">;</span>  curr &lt; address+payload_size<span class="Delimiter">;</span>  ++curr<span class="Delimiter">)</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> curr = <a href='043space.cc.html#L83'>address</a><span class="Delimiter">;</span>  curr &lt; address+payload_size<span class="Delimiter">;</span>  ++curr<span class="Delimiter">)</span>
 <span id="L53" class="LineNr"> 53 </span>  <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L54" class="LineNr"> 54 </span>  <span class="Comment">// append existing free list to address</span>
-<span id="L55" class="LineNr"> 55 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;abandon&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;saving &quot;</span> &lt;&lt; address &lt;&lt; <span class="Constant">&quot; in free-list of size &quot;</span> &lt;&lt; <a href='036refcount.cc.html#L92'>payload_size</a> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L56" class="LineNr"> 56 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address<span class="Delimiter">,</span> <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>free_list<span class="Delimiter">,</span> <a href='036refcount.cc.html#L92'>payload_size</a><span class="Delimiter">));</span>
-<span id="L57" class="LineNr"> 57 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>free_list<span class="Delimiter">,</span> <a href='036refcount.cc.html#L92'>payload_size</a><span class="Delimiter">,</span> address<span class="Delimiter">);</span>
+<span id="L55" class="LineNr"> 55 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;abandon&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;saving &quot;</span> &lt;&lt; <a href='043space.cc.html#L83'>address</a> &lt;&lt; <span class="Constant">&quot; in free-list of size &quot;</span> &lt;&lt; <a href='036refcount.cc.html#L89'>payload_size</a> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L56" class="LineNr"> 56 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>free_list<span class="Delimiter">,</span> <a href='036refcount.cc.html#L89'>payload_size</a><span class="Delimiter">));</span>
+<span id="L57" class="LineNr"> 57 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>free_list<span class="Delimiter">,</span> <a href='036refcount.cc.html#L89'>payload_size</a><span class="Delimiter">,</span> <a href='043space.cc.html#L83'>address</a><span class="Delimiter">);</span>
 <span id="L58" class="LineNr"> 58 </span><span class="Delimiter">}</span>
 <span id="L59" class="LineNr"> 59 </span>
 <span id="L60" class="LineNr"> 60 </span><span class="Delimiter">:(after &quot;Allocate Special-cases&quot;)</span>
@@ -131,7 +131,7 @@ if ('onhashchange' in window) {
 <span id="L66" class="LineNr"> 66 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> result<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L67" class="LineNr"> 67 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> curr = result<span class="Delimiter">;</span>  curr &lt; result+size<span class="Delimiter">;</span>  ++curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L68" class="LineNr"> 68 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">)</span> != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L69" class="LineNr"> 69 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;memory in free list was not zeroed out: &quot;</span> &lt;&lt; curr &lt;&lt; <span class="Constant">'/'</span> &lt;&lt; result &lt;&lt; <span class="Constant">&quot;; somebody wrote to us after free!!!</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L69" class="LineNr"> 69 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;memory in free list was not zeroed out: &quot;</span> &lt;&lt; curr &lt;&lt; <span class="Constant">'/'</span> &lt;&lt; result &lt;&lt; <span class="Constant">&quot;; somebody wrote to us after free!!!</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L70" class="LineNr"> 70 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// always fatal</span>
 <span id="L71" class="LineNr"> 71 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L72" class="LineNr"> 72 </span>  <span class="Delimiter">}</span>
@@ -140,11 +140,11 @@ if ('onhashchange' in window) {
 <span id="L75" class="LineNr"> 75 </span>
 <span id="L76" class="LineNr"> 76 </span><span class="Delimiter">:(scenario new_differing_size_no_reclaim)</span>
 <span id="L77" class="LineNr"> 77 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L78" class="LineNr"> 78 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L79" class="LineNr"> 79 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:address:num
-<span id="L80" class="LineNr"> 80 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># abandon</span>
-<span id="L81" class="LineNr"> 81 </span>  <span class="Constant">3</span>:address:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">2</span>  <span class="Comment"># different size</span>
-<span id="L82" class="LineNr"> 82 </span>  <span class="Constant">4</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3</span>:address:array:num
+<span id="L78" class="LineNr"> 78 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L79" class="LineNr"> 79 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L80" class="LineNr"> 80 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># abandon</span>
+<span id="L81" class="LineNr"> 81 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L83'>address</a>:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">2</span>  <span class="Comment"># different size</span>
+<span id="L82" class="LineNr"> 82 </span>  <span class="Constant">4</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3</span>:<a href='043space.cc.html#L83'>address</a>:array:num
 <span id="L83" class="LineNr"> 83 </span>  <span class="Constant">5</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>equal <span class="Constant">2</span>:num<span class="Delimiter">,</span> <span class="Constant">4</span>:num
 <span id="L84" class="LineNr"> 84 </span>]
 <span id="L85" class="LineNr"> 85 </span><span class="Comment"># no reuse</span>
@@ -152,11 +152,11 @@ if ('onhashchange' in window) {
 <span id="L87" class="LineNr"> 87 </span>
 <span id="L88" class="LineNr"> 88 </span><span class="Delimiter">:(scenario new_reclaim_array)</span>
 <span id="L89" class="LineNr"> 89 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L90" class="LineNr"> 90 </span>  <span class="Constant">1</span>:address:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">2</span>
-<span id="L91" class="LineNr"> 91 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:address:array:num
-<span id="L92" class="LineNr"> 92 </span>  <span class="Constant">1</span>:address:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># abandon</span>
-<span id="L93" class="LineNr"> 93 </span>  <span class="Constant">3</span>:address:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">2</span>  <span class="Comment"># same size</span>
-<span id="L94" class="LineNr"> 94 </span>  <span class="Constant">4</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3</span>:address:array:num
+<span id="L90" class="LineNr"> 90 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">2</span>
+<span id="L91" class="LineNr"> 91 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num
+<span id="L92" class="LineNr"> 92 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># abandon</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L83'>address</a>:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">2</span>  <span class="Comment"># same size</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="Constant">4</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3</span>:<a href='043space.cc.html#L83'>address</a>:array:num
 <span id="L95" class="LineNr"> 95 </span>  <span class="Constant">5</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>equal <span class="Constant">2</span>:num<span class="Delimiter">,</span> <span class="Constant">4</span>:num
 <span id="L96" class="LineNr"> 96 </span>]
 <span id="L97" class="LineNr"> 97 </span><span class="Comment"># both calls to new returned identical addresses</span>
@@ -164,10 +164,10 @@ if ('onhashchange' in window) {
 <span id="L99" class="LineNr"> 99 </span>
 <span id="L100" class="LineNr">100 </span><span class="Delimiter">:(scenario abandon_on_overwrite)</span>
 <span id="L101" class="LineNr">101 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L102" class="LineNr">102 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L102" class="LineNr">102 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
 <span id="L103" class="LineNr">103 </span>  <span class="Comment"># over-writing one allocation with another</span>
-<span id="L104" class="LineNr">104 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L105" class="LineNr">105 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L104" class="LineNr">104 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L105" class="LineNr">105 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="L106" class="LineNr">106 </span>]
 <span id="L107" class="LineNr">107 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L108" class="LineNr">108 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -176,15 +176,15 @@ if ('onhashchange' in window) {
 <span id="L111" class="LineNr">111 </span>
 <span id="L112" class="LineNr">112 </span><span class="Delimiter">:(scenario abandon_after_call)</span>
 <span id="L113" class="LineNr">113 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L114" class="LineNr">114 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
 <span id="L115" class="LineNr">115 </span>  <span class="Comment"># passing in addresses to recipes increments refcount</span>
-<span id="L116" class="LineNr">116 </span>  foo <span class="Constant">1</span>:address:num
-<span id="L117" class="LineNr">117 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L116" class="LineNr">116 </span>  foo <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L117" class="LineNr">117 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="L118" class="LineNr">118 </span>]
 <span id="L119" class="LineNr">119 </span><span class="muRecipe">def</span> foo [
-<span id="L120" class="LineNr">120 </span>  <span class="Constant">2</span>:address:num<span class="Special"> &lt;- </span>next-ingredient
+<span id="L120" class="LineNr">120 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>next-ingredient
 <span id="L121" class="LineNr">121 </span>  <span class="Comment"># return does NOT yet decrement refcount; memory must be explicitly managed</span>
-<span id="L122" class="LineNr">122 </span>  <span class="Constant">2</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L122" class="LineNr">122 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="L123" class="LineNr">123 </span>]
 <span id="L124" class="LineNr">124 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L125" class="LineNr">125 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -201,10 +201,10 @@ if ('onhashchange' in window) {
 <span id="L136" class="LineNr">136 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L137" class="LineNr">137 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">30</span>
 <span id="L138" class="LineNr">138 </span>  <span class="Comment"># allocate an array</span>
-<span id="L139" class="LineNr">139 </span>  <span class="Constant">10</span>:address:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">20</span>
-<span id="L140" class="LineNr">140 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>:address:array:num  <span class="Comment"># doesn't increment refcount</span>
+<span id="L139" class="LineNr">139 </span>  <span class="Constant">10</span>:<a href='043space.cc.html#L83'>address</a>:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">20</span>
+<span id="L140" class="LineNr">140 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>:<a href='043space.cc.html#L83'>address</a>:array:num  <span class="Comment"># doesn't increment refcount</span>
 <span id="L141" class="LineNr">141 </span>  <span class="Comment"># allocate another array in its place, implicitly freeing the previous allocation</span>
-<span id="L142" class="LineNr">142 </span>  <span class="Constant">10</span>:address:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">25</span>
+<span id="L142" class="LineNr">142 </span>  <span class="Constant">10</span>:<a href='043space.cc.html#L83'>address</a>:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">25</span>
 <span id="L143" class="LineNr">143 </span>]
 <span id="L144" class="LineNr">144 </span><span class="traceContains">+run: {10: (&quot;address&quot; &quot;array&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}, {25: &quot;literal&quot;}</span>
 <span id="L145" class="LineNr">145 </span><span class="Comment"># abandoned array is of old size (20, not 25)</span>
@@ -213,14 +213,14 @@ if ('onhashchange' in window) {
 <span id="L148" class="LineNr">148 </span><span class="Delimiter">:(scenario refcounts_abandon_address_in_container)</span>
 <span id="L149" class="LineNr">149 </span><span class="Comment"># container containing an address</span>
 <span id="L150" class="LineNr">150 </span><span class="muData">container</span> foo [
-<span id="L151" class="LineNr">151 </span>  <span class="Normal">x</span>:address:num
+<span id="L151" class="LineNr">151 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L83'>address</a>:num
 <span id="L152" class="LineNr">152 </span>]
 <span id="L153" class="LineNr">153 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L154" class="LineNr">154 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L155" class="LineNr">155 </span>  <span class="Constant">2</span>:address:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
-<span id="L156" class="LineNr">156 </span>  *<span class="Constant">2</span>:address:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">2</span>:address:foo<span class="Delimiter">,</span> <span class="Constant">x:offset</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
-<span id="L157" class="LineNr">157 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L158" class="LineNr">158 </span>  <span class="Constant">2</span>:address:foo<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L154" class="LineNr">154 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L155" class="LineNr">155 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
+<span id="L156" class="LineNr">156 </span>  *<span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:foo<span class="Delimiter">,</span> <span class="Constant">x:offset</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L157" class="LineNr">157 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L158" class="LineNr">158 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:foo<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="L159" class="LineNr">159 </span>]
 <span id="L160" class="LineNr">160 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L161" class="LineNr">161 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -242,11 +242,11 @@ if ('onhashchange' in window) {
 <span id="L177" class="LineNr">177 </span><span class="Comment"># todo: move past dilated reagent</span>
 <span id="L178" class="LineNr">178 </span><span class="Delimiter">:(scenario refcounts_abandon_address_in_array)</span>
 <span id="L179" class="LineNr">179 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L180" class="LineNr">180 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L181" class="LineNr">181 </span>  <span class="Constant">2</span>:address:array:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>address number<span class="Delimiter">)</span>: type<span class="Delimiter">},</span> <span class="Constant">3</span>
-<span id="L182" class="LineNr">182 </span>  *<span class="Constant">2</span>:address:array:address:num<span class="Special"> &lt;- </span>put-index *<span class="Constant">2</span>:address:array:address:num<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
-<span id="L183" class="LineNr">183 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L184" class="LineNr">184 </span>  <span class="Constant">2</span>:address:array:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L180" class="LineNr">180 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L181" class="LineNr">181 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:array:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span><a href='043space.cc.html#L83'>address</a> number<span class="Delimiter">)</span>: type<span class="Delimiter">},</span> <span class="Constant">3</span>
+<span id="L182" class="LineNr">182 </span>  *<span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:array:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>put-index *<span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:array:<a href='043space.cc.html#L83'>address</a>:num<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L183" class="LineNr">183 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L184" class="LineNr">184 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:array:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="L185" class="LineNr">185 </span>]
 <span id="L186" class="LineNr">186 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L187" class="LineNr">187 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -262,16 +262,16 @@ if ('onhashchange' in window) {
 <span id="L197" class="LineNr">197 </span><span class="Delimiter">:(scenario refcounts_abandon_address_in_container_in_array)</span>
 <span id="L198" class="LineNr">198 </span><span class="Comment"># container containing an address</span>
 <span id="L199" class="LineNr">199 </span><span class="muData">container</span> foo [
-<span id="L200" class="LineNr">200 </span>  <span class="Normal">x</span>:address:num
+<span id="L200" class="LineNr">200 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L83'>address</a>:num
 <span id="L201" class="LineNr">201 </span>]
 <span id="L202" class="LineNr">202 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L203" class="LineNr">203 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L204" class="LineNr">204 </span>  <span class="Constant">2</span>:address:array:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span><span class="Delimiter">,</span> <span class="Constant">3</span>
-<span id="L205" class="LineNr">205 </span>  <span class="Constant">3</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:address:num
-<span id="L206" class="LineNr">206 </span>  *<span class="Constant">2</span>:address:array:foo<span class="Special"> &lt;- </span>put-index *<span class="Constant">2</span>:address:array:foo<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">3</span>:foo
-<span id="L207" class="LineNr">207 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L203" class="LineNr">203 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L204" class="LineNr">204 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:array:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span><span class="Delimiter">,</span> <span class="Constant">3</span>
+<span id="L205" class="LineNr">205 </span>  <span class="Constant">3</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L206" class="LineNr">206 </span>  *<span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:array:foo<span class="Special"> &lt;- </span>put-index *<span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:array:foo<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">3</span>:foo
+<span id="L207" class="LineNr">207 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="L208" class="LineNr">208 </span>  <span class="Constant">3</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>
-<span id="L209" class="LineNr">209 </span>  <span class="Constant">2</span>:address:array:foo<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L209" class="LineNr">209 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L83'>address</a>:array:foo<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="L210" class="LineNr">210 </span>]
 <span id="L211" class="LineNr">211 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L212" class="LineNr">212 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -290,12 +290,12 @@ if ('onhashchange' in window) {
 <span id="L225" class="LineNr">225 </span>
 <span id="L226" class="LineNr">226 </span><span class="Delimiter">:(scenario refcounts_abandon_array_within_container)</span>
 <span id="L227" class="LineNr">227 </span><span class="muData">container</span> foo [
-<span id="L228" class="LineNr">228 </span>  <span class="Normal">x</span>:address:array:num
+<span id="L228" class="LineNr">228 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L83'>address</a>:array:num
 <span id="L229" class="LineNr">229 </span>]
 <span id="L230" class="LineNr">230 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L231" class="LineNr">231 </span>  <span class="Constant">1</span>:address:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">3</span>
-<span id="L232" class="LineNr">232 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:address:array:num
-<span id="L233" class="LineNr">233 </span>  <span class="Constant">1</span>:address:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L231" class="LineNr">231 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">3</span>
+<span id="L232" class="LineNr">232 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num
+<span id="L233" class="LineNr">233 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="L234" class="LineNr">234 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="L235" class="LineNr">235 </span>]
 <span id="L236" class="LineNr">236 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;array&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}, {3: &quot;literal&quot;}</span>
diff --git a/html/038new_text.cc.html b/html/038new_text.cc.html
index 51bdf5e5..7dab898f 100644
--- a/html/038new_text.cc.html
+++ b/html/038new_text.cc.html
@@ -92,9 +92,9 @@ if ('onhashchange' in window) {
 <span id="L27" class="LineNr"> 27 </span><span class="Delimiter">:(before &quot;Convert 'new' To 'allocate'&quot;)</span>
 <span id="L28" class="LineNr"> 28 </span><span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;new&quot;</span> &amp;&amp; !inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; <a href='014literal_string.cc.html#L126'>is_literal_text</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="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L29" class="LineNr"> 29 </span><span class="Delimiter">:(after &quot;case NEW&quot; following &quot;Primitive Recipe Implementations&quot;)</span>
-<span id="L30" class="LineNr"> 30 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='014literal_string.cc.html#L126'>is_literal_text</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>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="L30" class="LineNr"> 30 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='014literal_string.cc.html#L126'>is_literal_text</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>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="L31" class="LineNr"> 31 </span>  <span class="Conceal">¦</span> products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L32" class="LineNr"> 32 </span>  <span class="Conceal">¦</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><a href='038new_text.cc.html#L38'>new_mu_text</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>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>name<span class="Delimiter">));</span>
+<span id="L32" class="LineNr"> 32 </span>  <span class="Conceal">¦</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><a href='038new_text.cc.html#L38'>new_mu_text</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>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>name<span class="Delimiter">));</span>
 <span id="L33" class="LineNr"> 33 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new string alloc: &quot;</span> &lt;&lt; products<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#L197'>end</a><span class="Delimiter">();</span>
 <span id="L34" class="LineNr"> 34 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Delimiter">}</span>
@@ -152,7 +152,7 @@ if ('onhashchange' in window) {
 <span id="L87" class="LineNr"> 87 </span><span class="Delimiter">}</span>
 <span id="L88" class="LineNr"> 88 </span>
 <span id="L89" class="LineNr"> 89 </span><span class="Delimiter">:(before &quot;End $print Special-cases&quot;)</span>
-<span id="L90" class="LineNr"> 90 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='027call_ingredient.cc.html#L174'>is_mu_text</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><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="L90" class="LineNr"> 90 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='027call_ingredient.cc.html#L174'>is_mu_text</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><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="L91" class="LineNr"> 91 </span>  cout &lt;&lt; <a href='038new_text.cc.html#L143'>read_mu_text</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L92" class="LineNr"> 92 </span><span class="Delimiter">}</span>
 <span id="L93" class="LineNr"> 93 </span>
@@ -185,7 +185,7 @@ if ('onhashchange' in window) {
 <span id="L120" class="LineNr">120 </span><span class="Delimiter">:(scenario new_string_overflow)</span>
 <span id="L121" class="LineNr">121 </span><span class="Special">% Initial_memory_per_routine = 3;</span>
 <span id="L122" class="LineNr">122 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L123" class="LineNr">123 </span>  <span class="Constant">1</span>:address:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L123" class="LineNr">123 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L83'>address</a>:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
 <span id="L124" class="LineNr">124 </span>  <span class="Constant">2</span>:text/<span class="Special">raw &lt;- </span><span class="Normal">new</span> [a]  <span class="Comment"># not enough room in initial page, if you take the refcount and array length into account</span>
 <span id="L125" class="LineNr">125 </span>]
 <span id="L126" class="LineNr">126 </span><span class="traceContains">+new: routine allocated memory from 1000 to 1003</span>
@@ -205,10 +205,10 @@ if ('onhashchange' in window) {
 <span id="L140" class="LineNr">140 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L141" class="LineNr">141 </span><span class="Delimiter">}</span>
 <span id="L142" class="LineNr">142 </span>
-<span id="L143" class="LineNr">143 </span>string <a href='038new_text.cc.html#L143'>read_mu_text</a><span class="Delimiter">(</span><span class="Normal">int</span> address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L144" class="LineNr">144 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>address == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L143" class="LineNr">143 </span>string <a href='038new_text.cc.html#L143'>read_mu_text</a><span class="Delimiter">(</span><span class="Normal">int</span> <a href='043space.cc.html#L83'>address</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L144" class="LineNr">144 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a> == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
 <span id="L145" class="LineNr">145 </span>  ++address<span class="Delimiter">;</span>  <span class="Comment">// skip refcount</span>
-<span id="L146" class="LineNr">146 </span>  <span class="Normal">int</span> length = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address<span class="Delimiter">);</span>
+<span id="L146" class="LineNr">146 </span>  <span class="Normal">int</span> length = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <a href='043space.cc.html#L83'>address</a><span class="Delimiter">);</span>
 <span id="L147" class="LineNr">147 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>length == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
 <span id="L148" class="LineNr">148 </span>  <span class="Identifier">return</span> <a href='038new_text.cc.html#L151'>read_mu_characters</a><span class="Delimiter">(</span>address+<span class="Constant">1</span><span class="Delimiter">,</span> length<span class="Delimiter">);</span>
 <span id="L149" class="LineNr">149 </span><span class="Delimiter">}</span>
@@ -254,8 +254,8 @@ if ('onhashchange' in window) {
 <span id="L189" class="LineNr">189 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L190" class="LineNr">190 </span><span class="Normal">case</span> ASSERT: <span class="Delimiter">{</span>
 <span id="L191" class="LineNr">191 </span>  <span class="Normal">if</span> <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 class="Delimiter">{</span>
-<span id="L192" class="LineNr">192 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='014literal_string.cc.html#L126'>is_literal_text</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span>
-<span id="L193" class="LineNr">193 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L192" class="LineNr">192 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='014literal_string.cc.html#L126'>is_literal_text</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span>
+<span id="L193" class="LineNr">193 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L194" class="LineNr">194 </span>  <span class="Conceal">¦</span> <span class="Normal">else</span>
 <span id="L195" class="LineNr">195 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='038new_text.cc.html#L143'>read_mu_text</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L196" class="LineNr">196 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
diff --git a/html/039location_array.cc.html b/html/039location_array.cc.html
deleted file mode 100644
index 3d60ee07..00000000
--- a/html/039location_array.cc.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - 039location_array.cc</title>
-<meta name="Generator" content="Vim/7.4">
-<meta name="plugin-version" content="vim7.4_v2">
-<meta name="syntax" content="cpp">
-<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
-<style type="text/css">
-<!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-a { color:#eeeeee; text-decoration: none; }
-a:hover { text-decoration: underline; }
-* { font-size: 12pt; font-size: 1em; }
-.Constant { color: #00a0a0; }
-.Conceal { color: #4e4e4e; }
-.Delimiter { color: #800080; }
-.LineNr { color: #444444; }
-.Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.cSpecial { color: #008000; }
--->
-</style>
-
-<script type='text/javascript'>
-<!--
-
-/* function to open any folds containing a jumped-to line before jumping to it */
-function JumpToLine()
-{
-  var lineNum;
-  lineNum = window.location.hash;
-  lineNum = lineNum.substr(1); /* strip off '#' */
-
-  if (lineNum.indexOf('L') == -1) {
-    lineNum = 'L'+lineNum;
-  }
-  lineElem = document.getElementById(lineNum);
-  /* Always jump to new location even if the line was hidden inside a fold, or
-   * we corrected the raw number to a line ID.
-   */
-  if (lineElem) {
-    lineElem.scrollIntoView(true);
-  }
-  return true;
-}
-if ('onhashchange' in window) {
-  window.onhashchange = JumpToLine;
-}
-
--->
-</script>
-</head>
-<body onload='JumpToLine();'>
-<pre id='vimCodeElement'>
-<span id="L1" class="LineNr"> 1 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Declarations&quot;)</span>
-<span id="L2" class="LineNr"> 2 </span>TO_LOCATION_ARRAY<span class="Delimiter">,</span>
-<span id="L3" class="LineNr"> 3 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Numbers&quot;)</span>
-<span id="L4" class="LineNr"> 4 </span><a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;to-location-array&quot;</span><span class="Delimiter">,</span> TO_LOCATION_ARRAY<span class="Delimiter">);</span>
-<span id="L5" class="LineNr"> 5 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
-<span id="L6" class="LineNr"> 6 </span><span class="Normal">case</span> TO_LOCATION_ARRAY: <span class="Delimiter">{</span>
-<span id="L7" class="LineNr"> 7 </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="L8" class="LineNr"> 8 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_address_of_array_of_numbers<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L9" class="LineNr"> 9 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>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 of 'to-location-array' has incorrect type: '&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#L197'>end</a><span class="Delimiter">();</span>
-<span id="L10" class="LineNr">10 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L11" class="LineNr">11 </span>  <span class="Delimiter">}</span>
-<span id="L12" class="LineNr">12 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L13" class="LineNr">13 </span><span class="Delimiter">}</span>
-<span id="L14" class="LineNr">14 </span><span class="Delimiter">:(code)</span>
-<span id="L15" class="LineNr">15 </span><span class="Normal">bool</span> <a href='039location_array.cc.html#L15'>is_address_of_array_of_numbers</a><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="L16" class="LineNr">16 </span>  canonize_type<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
-<span id="L17" class="LineNr">17 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_compound_type_starting_with<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L18" class="LineNr">18 </span>  drop_from_type<span class="Delimiter">(</span>x<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">);</span>
-<span id="L19" class="LineNr">19 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_compound_type_starting_with<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">&quot;array&quot;</span><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L20" class="LineNr">20 </span>  drop_from_type<span class="Delimiter">(</span>x<span class="Delimiter">,</span> <span class="Constant">&quot;array&quot;</span><span class="Delimiter">);</span>
-<span id="L21" class="LineNr">21 </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;number&quot;</span><span class="Delimiter">);</span>
-<span id="L22" class="LineNr">22 </span><span class="Delimiter">}</span>
-<span id="L23" class="LineNr">23 </span><span class="Normal">bool</span> <a href='039location_array.cc.html#L23'>is_compound_type_starting_with</a><span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; expected_name<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L24" class="LineNr">24 </span>  <span class="Normal">if</span> <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="L25" class="LineNr">25 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L26" class="LineNr">26 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L27" class="LineNr">27 </span>  <span class="Identifier">return</span> type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value == get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> expected_name<span class="Delimiter">);</span>
-<span id="L28" class="LineNr">28 </span><span class="Delimiter">}</span>
-<span id="L29" class="LineNr">29 </span>
-<span id="L30" class="LineNr">30 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
-<span id="L31" class="LineNr">31 </span><span class="Normal">case</span> TO_LOCATION_ARRAY: <span class="Delimiter">{</span>
-<span id="L32" class="LineNr">32 </span>  <span class="Normal">int</span> array_size = <a href='001help.cc.html#L141'>SIZE</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 id="L33" class="LineNr">33 </span>  <span class="Normal">int</span> allocation_size = array_size + <span class="Comment">/*</span><span class="Comment">refcount and length</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">;</span>
-<span id="L34" class="LineNr">34 </span>  ensure_space<span class="Delimiter">(</span>allocation_size<span class="Delimiter">);</span>
-<span id="L35" class="LineNr">35 </span>  <span class="Normal">const</span> <span class="Normal">int</span> result = Current_routine<span class="Delimiter">-&gt;</span>alloc<span class="Delimiter">;</span>
-<span id="L36" class="LineNr">36 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L37" class="LineNr">37 </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>result<span class="Delimiter">);</span>
-<span id="L38" class="LineNr">38 </span>  <span class="Comment">// initialize array refcount</span>
-<span id="L39" class="LineNr">39 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> result<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L40" class="LineNr">40 </span>  <span class="Comment">// initialize array length</span>
-<span id="L41" class="LineNr">41 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> result+<span class="Constant">1</span><span class="Delimiter">,</span> array_size<span class="Delimiter">);</span>
-<span id="L42" class="LineNr">42 </span>  <span class="Comment">// now copy over data</span>
-<span id="L43" class="LineNr">43 </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; array_size<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span>
-<span id="L44" class="LineNr">44 </span>  <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> result+<span class="Constant">2</span>+i<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>i<span class="Delimiter">));</span>
-<span id="L45" class="LineNr">45 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L46" class="LineNr">46 </span><span class="Delimiter">}</span>
-</pre>
-</body>
-</html>
-<!-- vim: set foldmethod=manual : -->
diff --git a/html/042name.cc.html b/html/042name.cc.html
index 5ba9de66..7d046a9f 100644
--- a/html/042name.cc.html
+++ b/html/042name.cc.html
@@ -116,8 +116,8 @@ if ('onhashchange' in window) {
 <span id="L51" class="LineNr"> 51 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> reagent&amp; ingredient = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L52" class="LineNr"> 52 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// Begin transform_names Ingredient Special-cases(ingredient, inst, caller)</span>
 <span id="L53" class="LineNr"> 53 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='042name.cc.html#L99'>is_disqualified</a><span class="Delimiter">(</span>ingredient<span class="Delimiter">,</span> inst<span class="Delimiter">,</span> caller<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L54" class="LineNr"> 54 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='042name.cc.html#L141'>is_numeric_location</a><span class="Delimiter">(</span>ingredient<span class="Delimiter">))</span> numeric_locations_used = <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L55" class="LineNr"> 55 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='042name.cc.html#L148'>is_named_location</a><span class="Delimiter">(</span>ingredient<span class="Delimiter">))</span> names_used = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L54" class="LineNr"> 54 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='042name.cc.html#L148'>is_numeric_location</a><span class="Delimiter">(</span>ingredient<span class="Delimiter">))</span> numeric_locations_used = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L55" class="LineNr"> 55 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='042name.cc.html#L155'>is_named_location</a><span class="Delimiter">(</span>ingredient<span class="Delimiter">))</span> names_used = <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L56" class="LineNr"> 56 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L85'>is_integer</a><span class="Delimiter">(</span>ingredient<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L57" class="LineNr"> 57 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!already_transformed<span class="Delimiter">(</span>ingredient<span class="Delimiter">,</span> names<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L58" class="LineNr"> 58 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>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;tried to read ingredient '&quot;</span> &lt;&lt; ingredient<span class="Delimiter">.</span>name &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;' but it hasn't been written to yet</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
@@ -138,8 +138,8 @@ if ('onhashchange' in window) {
 <span id="L73" class="LineNr"> 73 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> reagent&amp; product = inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>out<span class="Delimiter">);</span>
 <span id="L74" class="LineNr"> 74 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// Begin transform_names Product Special-cases(product, inst, caller)</span>
 <span id="L75" class="LineNr"> 75 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='042name.cc.html#L99'>is_disqualified</a><span class="Delimiter">(</span>product<span class="Delimiter">,</span> inst<span class="Delimiter">,</span> caller<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L76" class="LineNr"> 76 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='042name.cc.html#L141'>is_numeric_location</a><span class="Delimiter">(</span>product<span class="Delimiter">))</span> numeric_locations_used = <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L77" class="LineNr"> 77 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='042name.cc.html#L148'>is_named_location</a><span class="Delimiter">(</span>product<span class="Delimiter">))</span> names_used = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L76" class="LineNr"> 76 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='042name.cc.html#L148'>is_numeric_location</a><span class="Delimiter">(</span>product<span class="Delimiter">))</span> numeric_locations_used = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L77" class="LineNr"> 77 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='042name.cc.html#L155'>is_named_location</a><span class="Delimiter">(</span>product<span class="Delimiter">))</span> names_used = <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L78" class="LineNr"> 78 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L85'>is_integer</a><span class="Delimiter">(</span>product<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L79" class="LineNr"> 79 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>names<span class="Delimiter">.</span>find<span class="Delimiter">(</span>product<span class="Delimiter">.</span>name<span class="Delimiter">)</span> == names<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L80" class="LineNr"> 80 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;name&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;assign &quot;</span> &lt;&lt; product<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; &quot;</span> &lt;&lt; curr_idx &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
@@ -183,7 +183,7 @@ if ('onhashchange' in window) {
 <span id="L118" class="LineNr">118 </span><span class="Delimiter">}</span>
 <span id="L119" class="LineNr">119 </span>
 <span id="L120" class="LineNr">120 </span><a href='010vm.cc.html#L123'>type_ordinal</a> <a href='042name.cc.html#L120'>skip_addresses</a><span class="Delimiter">(</span>type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L121" class="LineNr">121 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>type &amp;&amp; <a href='039location_array.cc.html#L23'>is_compound_type_starting_with</a><span class="Delimiter">(</span>type<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">))</span>
+<span id="L121" class="LineNr">121 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>type &amp;&amp; <a href='042name.cc.html#L133'>is_compound_type_starting_with</a><span class="Delimiter">(</span>type<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">))</span>
 <span id="L122" class="LineNr">122 </span>  <span class="Conceal">¦</span> type = type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">;</span>
 <span id="L123" class="LineNr">123 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span> -<span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// error handled elsewhere</span>
 <span id="L124" class="LineNr">124 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span> type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">;</span>
@@ -195,199 +195,206 @@ if ('onhashchange' in window) {
 <span id="L130" class="LineNr">130 </span>  <span class="Identifier">return</span> base_type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value<span class="Delimiter">;</span>
 <span id="L131" class="LineNr">131 </span><span class="Delimiter">}</span>
 <span id="L132" class="LineNr">132 </span>
-<span id="L133" class="LineNr">133 </span><span class="Normal">int</span> <a href='042name.cc.html#L133'>find_element_name</a><span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L123'>type_ordinal</a> t<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; name<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; recipe_name<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L134" class="LineNr">134 </span>  <span class="Normal">const</span> type_info&amp; container = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> t<span class="Delimiter">);</span>
-<span id="L135" class="LineNr">135 </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>container<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L136" class="LineNr">136 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>container<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name == name<span class="Delimiter">)</span> <span class="Identifier">return</span> i<span class="Delimiter">;</span>
-<span id="L137" class="LineNr">137 </span>  <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>recipe_name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;unknown element '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' in container '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> t<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L138" class="LineNr">138 </span>  <span class="Identifier">return</span> -<span class="Constant">1</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="Normal">bool</span> <a href='042name.cc.html#L141'>is_numeric_location</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L142" class="LineNr">142 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L143" class="LineNr">143 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='022arithmetic.cc.html#L108'>is_raw</a><span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L144" class="LineNr">144 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;0&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// used for chaining lexical scopes</span>
-<span id="L145" class="LineNr">145 </span>  <span class="Identifier">return</span> <a href='002test.cc.html#L85'>is_integer</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>name<span class="Delimiter">);</span>
+<span id="L133" class="LineNr">133 </span><span class="Normal">bool</span> <a href='042name.cc.html#L133'>is_compound_type_starting_with</a><span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; expected_name<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L134" class="LineNr">134 </span>  <span class="Normal">if</span> <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="L135" class="LineNr">135 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L136" class="LineNr">136 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L137" class="LineNr">137 </span>  <span class="Identifier">return</span> type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value == get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> expected_name<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="Normal">int</span> <a href='042name.cc.html#L140'>find_element_name</a><span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L123'>type_ordinal</a> t<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; name<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; recipe_name<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L141" class="LineNr">141 </span>  <span class="Normal">const</span> type_info&amp; container = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> t<span class="Delimiter">);</span>
+<span id="L142" class="LineNr">142 </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>container<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L143" class="LineNr">143 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>container<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name == name<span class="Delimiter">)</span> <span class="Identifier">return</span> i<span class="Delimiter">;</span>
+<span id="L144" class="LineNr">144 </span>  <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>recipe_name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;unknown element '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' in container '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> t<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L145" class="LineNr">145 </span>  <span class="Identifier">return</span> -<span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L146" class="LineNr">146 </span><span class="Delimiter">}</span>
 <span id="L147" class="LineNr">147 </span>
-<span id="L148" class="LineNr">148 </span><span class="Normal">bool</span> <a href='042name.cc.html#L148'>is_named_location</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L148" class="LineNr">148 </span><span class="Normal">bool</span> <a href='042name.cc.html#L148'>is_numeric_location</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L149" class="LineNr">149 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L150" class="LineNr">150 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='022arithmetic.cc.html#L108'>is_raw</a><span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L151" class="LineNr">151 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='042name.cc.html#L156'>is_special_name</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L152" class="LineNr">152 </span>  <span class="Identifier">return</span> !is_integer<span class="Delimiter">(</span>x<span class="Delimiter">.</span>name<span class="Delimiter">);</span>
+<span id="L151" class="LineNr">151 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;0&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// used for chaining lexical scopes</span>
+<span id="L152" class="LineNr">152 </span>  <span class="Identifier">return</span> <a href='002test.cc.html#L85'>is_integer</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>name<span class="Delimiter">);</span>
 <span id="L153" class="LineNr">153 </span><span class="Delimiter">}</span>
 <span id="L154" class="LineNr">154 </span>
-<span id="L155" class="LineNr">155 </span><span class="Comment">// all names here should either be disqualified or also in bind_special_scenario_names</span>
-<span id="L156" class="LineNr">156 </span><span class="Normal">bool</span> <a href='042name.cc.html#L156'>is_special_name</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L157" class="LineNr">157 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s == <span class="Constant">&quot;_&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L158" class="LineNr">158 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s == <span class="Constant">&quot;0&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L159" class="LineNr">159 </span>  <span class="Comment">// End is_special_name Special-cases</span>
-<span id="L160" class="LineNr">160 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L161" class="LineNr">161 </span><span class="Delimiter">}</span>
-<span id="L162" class="LineNr">162 </span>
-<span id="L163" class="LineNr">163 </span><span class="Delimiter">:(scenario transform_names_supports_containers)</span>
-<span id="L164" class="LineNr">164 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L165" class="LineNr">165 </span>  <span class="Normal">x</span>:point<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span>
-<span id="L166" class="LineNr">166 </span>  <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3</span>
-<span id="L167" class="LineNr">167 </span>]
-<span id="L168" class="LineNr">168 </span><span class="traceContains">+name: assign x 1</span>
-<span id="L169" class="LineNr">169 </span><span class="Comment"># skip location 2 because x occupies two locations</span>
-<span id="L170" class="LineNr">170 </span><span class="traceContains">+name: assign y 3</span>
-<span id="L171" class="LineNr">171 </span>
-<span id="L172" class="LineNr">172 </span><span class="Delimiter">:(scenario transform_names_supports_static_arrays)</span>
-<span id="L173" class="LineNr">173 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L174" class="LineNr">174 </span>  <span class="Normal">x</span>:@:num:<span class="Constant">3</span><span class="Special"> &lt;- </span>create-array
-<span id="L175" class="LineNr">175 </span>  <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3</span>
-<span id="L176" class="LineNr">176 </span>]
-<span id="L177" class="LineNr">177 </span><span class="traceContains">+name: assign x 1</span>
-<span id="L178" class="LineNr">178 </span><span class="Comment"># skip locations 2, 3, 4 because x occupies four locations</span>
-<span id="L179" class="LineNr">179 </span><span class="traceContains">+name: assign y 5</span>
-<span id="L180" class="LineNr">180 </span>
-<span id="L181" class="LineNr">181 </span><span class="Delimiter">:(scenario transform_names_passes_dummy)</span>
-<span id="L182" class="LineNr">182 </span><span class="Comment"># _ is just a dummy result that never gets consumed</span>
-<span id="L183" class="LineNr">183 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L184" class="LineNr">184 </span>  _<span class="Delimiter">,</span> x:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span>
-<span id="L185" class="LineNr">185 </span>]
-<span id="L186" class="LineNr">186 </span><span class="traceContains">+name: assign x 1</span>
-<span id="L187" class="LineNr">187 </span><span class="traceAbsent">-name: assign _ 1</span>
-<span id="L188" class="LineNr">188 </span>
-<span id="L189" class="LineNr">189 </span><span class="Comment">//: an escape hatch to suppress name conversion that we'll use later</span>
-<span id="L190" class="LineNr">190 </span><span class="Delimiter">:(scenarios run)</span>
-<span id="L191" class="LineNr">191 </span><span class="Delimiter">:(scenario transform_names_passes_raw)</span>
-<span id="L192" class="LineNr">192 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L193" class="LineNr">193 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L194" class="LineNr">194 </span>  <span class="Normal">x</span>:num/<span class="Special">raw &lt;- </span>copy <span class="Constant">0</span>
-<span id="L195" class="LineNr">195 </span>]
-<span id="L196" class="LineNr">196 </span><span class="traceAbsent">-name: assign x 1</span>
-<span id="L197" class="LineNr">197 </span><span class="traceContains">+error: can't write to location 0 in 'x:num/raw &lt;- copy 0'</span>
-<span id="L198" class="LineNr">198 </span>
-<span id="L199" class="LineNr">199 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L200" class="LineNr">200 </span><span class="Delimiter">:(scenario transform_names_fails_when_mixing_names_and_numeric_locations)</span>
-<span id="L201" class="LineNr">201 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L202" class="LineNr">202 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L203" class="LineNr">203 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:num
-<span id="L204" class="LineNr">204 </span>]
-<span id="L205" class="LineNr">205 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: mixing variable names and numeric addresses</span>
-<span id="L206" class="LineNr">206 </span>
-<span id="L207" class="LineNr">207 </span><span class="Delimiter">:(scenario transform_names_fails_when_mixing_names_and_numeric_locations_2)</span>
+<span id="L155" class="LineNr">155 </span><span class="Normal">bool</span> <a href='042name.cc.html#L155'>is_named_location</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L156" class="LineNr">156 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L157" class="LineNr">157 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='022arithmetic.cc.html#L108'>is_raw</a><span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L158" class="LineNr">158 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='042name.cc.html#L163'>is_special_name</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L159" class="LineNr">159 </span>  <span class="Identifier">return</span> !is_integer<span class="Delimiter">(</span>x<span class="Delimiter">.</span>name<span class="Delimiter">);</span>
+<span id="L160" class="LineNr">160 </span><span class="Delimiter">}</span>
+<span id="L161" class="LineNr">161 </span>
+<span id="L162" class="LineNr">162 </span><span class="Comment">// all names here should either be disqualified or also in bind_special_scenario_names</span>
+<span id="L163" class="LineNr">163 </span><span class="Normal">bool</span> <a href='042name.cc.html#L163'>is_special_name</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L164" class="LineNr">164 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s == <span class="Constant">&quot;_&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L165" class="LineNr">165 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s == <span class="Constant">&quot;0&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L166" class="LineNr">166 </span>  <span class="Comment">// End is_special_name Special-cases</span>
+<span id="L167" class="LineNr">167 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L168" class="LineNr">168 </span><span class="Delimiter">}</span>
+<span id="L169" class="LineNr">169 </span>
+<span id="L170" class="LineNr">170 </span><span class="Delimiter">:(scenario transform_names_supports_containers)</span>
+<span id="L171" class="LineNr">171 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L172" class="LineNr">172 </span>  <span class="Normal">x</span>:point<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span>
+<span id="L173" class="LineNr">173 </span>  <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3</span>
+<span id="L174" class="LineNr">174 </span>]
+<span id="L175" class="LineNr">175 </span><span class="traceContains">+name: assign x 1</span>
+<span id="L176" class="LineNr">176 </span><span class="Comment"># skip location 2 because x occupies two locations</span>
+<span id="L177" class="LineNr">177 </span><span class="traceContains">+name: assign y 3</span>
+<span id="L178" class="LineNr">178 </span>
+<span id="L179" class="LineNr">179 </span><span class="Delimiter">:(scenario transform_names_supports_static_arrays)</span>
+<span id="L180" class="LineNr">180 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L181" class="LineNr">181 </span>  <span class="Normal">x</span>:@:num:<span class="Constant">3</span><span class="Special"> &lt;- </span>create-array
+<span id="L182" class="LineNr">182 </span>  <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3</span>
+<span id="L183" class="LineNr">183 </span>]
+<span id="L184" class="LineNr">184 </span><span class="traceContains">+name: assign x 1</span>
+<span id="L185" class="LineNr">185 </span><span class="Comment"># skip locations 2, 3, 4 because x occupies four locations</span>
+<span id="L186" class="LineNr">186 </span><span class="traceContains">+name: assign y 5</span>
+<span id="L187" class="LineNr">187 </span>
+<span id="L188" class="LineNr">188 </span><span class="Delimiter">:(scenario transform_names_passes_dummy)</span>
+<span id="L189" class="LineNr">189 </span><span class="Comment"># _ is just a dummy result that never gets consumed</span>
+<span id="L190" class="LineNr">190 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L191" class="LineNr">191 </span>  _<span class="Delimiter">,</span> x:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span>
+<span id="L192" class="LineNr">192 </span>]
+<span id="L193" class="LineNr">193 </span><span class="traceContains">+name: assign x 1</span>
+<span id="L194" class="LineNr">194 </span><span class="traceAbsent">-name: assign _ 1</span>
+<span id="L195" class="LineNr">195 </span>
+<span id="L196" class="LineNr">196 </span><span class="Comment">//: an escape hatch to suppress name conversion that we'll use later</span>
+<span id="L197" class="LineNr">197 </span><span class="Delimiter">:(scenarios run)</span>
+<span id="L198" class="LineNr">198 </span><span class="Delimiter">:(scenario transform_names_passes_raw)</span>
+<span id="L199" class="LineNr">199 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L200" class="LineNr">200 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L201" class="LineNr">201 </span>  <span class="Normal">x</span>:num/<span class="Special">raw &lt;- </span>copy <span class="Constant">0</span>
+<span id="L202" class="LineNr">202 </span>]
+<span id="L203" class="LineNr">203 </span><span class="traceAbsent">-name: assign x 1</span>
+<span id="L204" class="LineNr">204 </span><span class="traceContains">+error: can't write to location 0 in 'x:num/raw &lt;- copy 0'</span>
+<span id="L205" class="LineNr">205 </span>
+<span id="L206" class="LineNr">206 </span><span class="Delimiter">:(scenarios transform)</span>
+<span id="L207" class="LineNr">207 </span><span class="Delimiter">:(scenario transform_names_fails_when_mixing_names_and_numeric_locations)</span>
 <span id="L208" class="LineNr">208 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L209" class="LineNr">209 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L210" class="LineNr">210 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
-<span id="L211" class="LineNr">211 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy x:num
-<span id="L212" class="LineNr">212 </span>]
-<span id="L213" class="LineNr">213 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: mixing variable names and numeric addresses</span>
-<span id="L214" class="LineNr">214 </span>
-<span id="L215" class="LineNr">215 </span><span class="Delimiter">:(scenario transform_names_does_not_fail_when_mixing_names_and_raw_locations)</span>
+<span id="L210" class="LineNr">210 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:num
+<span id="L211" class="LineNr">211 </span>]
+<span id="L212" class="LineNr">212 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: mixing variable names and numeric addresses</span>
+<span id="L213" class="LineNr">213 </span>
+<span id="L214" class="LineNr">214 </span><span class="Delimiter">:(scenario transform_names_fails_when_mixing_names_and_numeric_locations_2)</span>
+<span id="L215" class="LineNr">215 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L216" class="LineNr">216 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L217" class="LineNr">217 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:num/<span class="Special">raw</span>
-<span id="L218" class="LineNr">218 </span>]
-<span id="L219" class="LineNr">219 </span><span class="traceAbsent">-error: <a href='000organization.cc.html#L113'>main</a>: mixing variable names and numeric addresses</span>
-<span id="L220" class="LineNr">220 </span>$error: <span class="Constant">0</span>
+<span id="L217" class="LineNr">217 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
+<span id="L218" class="LineNr">218 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy x:num
+<span id="L219" class="LineNr">219 </span>]
+<span id="L220" class="LineNr">220 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: mixing variable names and numeric addresses</span>
 <span id="L221" class="LineNr">221 </span>
-<span id="L222" class="LineNr">222 </span><span class="Delimiter">:(scenario transform_names_does_not_fail_when_mixing_names_and_literals)</span>
+<span id="L222" class="LineNr">222 </span><span class="Delimiter">:(scenario transform_names_does_not_fail_when_mixing_names_and_raw_locations)</span>
 <span id="L223" class="LineNr">223 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L224" class="LineNr">224 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
+<span id="L224" class="LineNr">224 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:num/<span class="Special">raw</span>
 <span id="L225" class="LineNr">225 </span>]
 <span id="L226" class="LineNr">226 </span><span class="traceAbsent">-error: <a href='000organization.cc.html#L113'>main</a>: mixing variable names and numeric addresses</span>
 <span id="L227" class="LineNr">227 </span>$error: <span class="Constant">0</span>
 <span id="L228" class="LineNr">228 </span>
-<span id="L229" class="LineNr">229 </span><span class="SalientComment">//:: Support element names for containers in 'get' and 'get-location' and 'put'.</span>
-<span id="L230" class="LineNr">230 </span><span class="Comment">//: (get-location is implemented later)</span>
-<span id="L231" class="LineNr">231 </span>
-<span id="L232" class="LineNr">232 </span><span class="Delimiter">:(before &quot;End update GET offset_value in Check&quot;)</span>
-<span id="L233" class="LineNr">233 </span><span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L234" class="LineNr">234 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!offset<span class="Delimiter">.</span>initialized<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L235" class="LineNr">235 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;uninitialized offset '&quot;</span> &lt;&lt; offset<span class="Delimiter">.</span>name &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#L197'>end</a><span class="Delimiter">();</span>
-<span id="L236" class="LineNr">236 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L237" class="LineNr">237 </span>  <span class="Delimiter">}</span>
-<span id="L238" class="LineNr">238 </span>  offset_value = offset<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
-<span id="L239" class="LineNr">239 </span><span class="Delimiter">}</span>
-<span id="L240" class="LineNr">240 </span>
-<span id="L241" class="LineNr">241 </span><span class="Delimiter">:(scenario transform_names_transforms_container_elements)</span>
-<span id="L242" class="LineNr">242 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L243" class="LineNr">243 </span>  <span class="Normal">p</span>:&amp;:point<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L244" class="LineNr">244 </span>  <span class="Normal">a</span>:num<span class="Special"> &lt;- </span>get *p:&amp;:point<span class="Delimiter">,</span> <span class="Constant">y:offset</span>
-<span id="L245" class="LineNr">245 </span>  <span class="Normal">b</span>:num<span class="Special"> &lt;- </span>get *p:&amp;:point<span class="Delimiter">,</span> <span class="Constant">x:offset</span>
-<span id="L246" class="LineNr">246 </span>]
-<span id="L247" class="LineNr">247 </span><span class="traceContains">+name: element y of type point is at offset 1</span>
-<span id="L248" class="LineNr">248 </span><span class="traceContains">+name: element x of type point is at offset 0</span>
-<span id="L249" class="LineNr">249 </span>
-<span id="L250" class="LineNr">250 </span><span class="Delimiter">:(before &quot;End transform_names(inst) Special-cases&quot;)</span>
-<span id="L251" class="LineNr">251 </span><span class="Comment">// replace element names of containers with offsets</span>
-<span id="L252" class="LineNr">252 </span><span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;get&quot;</span> || inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;get-location&quot;</span> || inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;put&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L253" class="LineNr">253 </span>  <span class="Comment">//: avoid raising any errors here; later layers will support overloading new</span>
-<span id="L254" class="LineNr">254 </span>  <span class="Comment">//: instructions with the same names (static dispatch), which could lead to</span>
-<span id="L255" class="LineNr">255 </span>  <span class="Comment">//: spurious errors</span>
-<span id="L256" class="LineNr">256 </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> &lt; <span class="Constant">2</span><span class="Delimiter">)</span>
-<span id="L257" class="LineNr">257 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// error raised elsewhere</span>
-<span id="L258" class="LineNr">258 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span>
-<span id="L259" class="LineNr">259 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// error raised elsewhere</span>
-<span id="L260" class="LineNr">260 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<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>find_first_not_of<span class="Delimiter">(</span><span class="Constant">&quot;0123456789&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L261" class="LineNr">261 </span>  <span class="Conceal">¦</span> <span class="Comment">// since first non-address in base type must be a container, we don't have to canonize</span>
-<span id="L262" class="LineNr">262 </span>  <span class="Conceal">¦</span> <a href='010vm.cc.html#L123'>type_ordinal</a> base_type = <a href='042name.cc.html#L120'>skip_addresses</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>type<span class="Delimiter">);</span>
-<span id="L263" class="LineNr">263 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">))</span> <span class="Delimiter">{</span>  <span class="Comment">// otherwise we'll raise an error elsewhere</span>
-<span id="L264" class="LineNr">264 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='042name.cc.html#L133'>find_element_name</a><span class="Delimiter">(</span>base_type<span class="Delimiter">,</span> inst<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> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">));</span>
-<span id="L265" class="LineNr">265 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;name&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;element &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; of type &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; is at offset &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>value<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L266" class="LineNr">266 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L267" class="LineNr">267 </span>  <span class="Delimiter">}</span>
-<span id="L268" class="LineNr">268 </span><span class="Delimiter">}</span>
-<span id="L269" class="LineNr">269 </span>
-<span id="L270" class="LineNr">270 </span><span class="Delimiter">:(scenario missing_type_in_get)</span>
-<span id="L271" class="LineNr">271 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L272" class="LineNr">272 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L273" class="LineNr">273 </span>  get a<span class="Delimiter">,</span> <span class="Constant">x:offset</span>
-<span id="L274" class="LineNr">274 </span>]
-<span id="L275" class="LineNr">275 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: missing type for 'a' in 'get a, x:offset'</span>
+<span id="L229" class="LineNr">229 </span><span class="Delimiter">:(scenario transform_names_does_not_fail_when_mixing_names_and_literals)</span>
+<span id="L230" class="LineNr">230 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L231" class="LineNr">231 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
+<span id="L232" class="LineNr">232 </span>]
+<span id="L233" class="LineNr">233 </span><span class="traceAbsent">-error: <a href='000organization.cc.html#L113'>main</a>: mixing variable names and numeric addresses</span>
+<span id="L234" class="LineNr">234 </span>$error: <span class="Constant">0</span>
+<span id="L235" class="LineNr">235 </span>
+<span id="L236" class="LineNr">236 </span><span class="SalientComment">//:: Support element names for containers in 'get' and 'get-location' and 'put'.</span>
+<span id="L237" class="LineNr">237 </span><span class="Comment">//: (get-location is implemented later)</span>
+<span id="L238" class="LineNr">238 </span>
+<span id="L239" class="LineNr">239 </span><span class="Delimiter">:(before &quot;End update GET offset_value in Check&quot;)</span>
+<span id="L240" class="LineNr">240 </span><span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L241" class="LineNr">241 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!offset<span class="Delimiter">.</span>initialized<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L242" class="LineNr">242 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;uninitialized offset '&quot;</span> &lt;&lt; offset<span class="Delimiter">.</span>name &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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L243" class="LineNr">243 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L244" class="LineNr">244 </span>  <span class="Delimiter">}</span>
+<span id="L245" class="LineNr">245 </span>  offset_value = offset<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
+<span id="L246" class="LineNr">246 </span><span class="Delimiter">}</span>
+<span id="L247" class="LineNr">247 </span>
+<span id="L248" class="LineNr">248 </span><span class="Delimiter">:(scenario transform_names_transforms_container_elements)</span>
+<span id="L249" class="LineNr">249 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L250" class="LineNr">250 </span>  <span class="Normal">p</span>:&amp;:point<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L251" class="LineNr">251 </span>  <span class="Normal">a</span>:num<span class="Special"> &lt;- </span>get *p:&amp;:point<span class="Delimiter">,</span> <span class="Constant">y:offset</span>
+<span id="L252" class="LineNr">252 </span>  <span class="Normal">b</span>:num<span class="Special"> &lt;- </span>get *p:&amp;:point<span class="Delimiter">,</span> <span class="Constant">x:offset</span>
+<span id="L253" class="LineNr">253 </span>]
+<span id="L254" class="LineNr">254 </span><span class="traceContains">+name: element y of type point is at offset 1</span>
+<span id="L255" class="LineNr">255 </span><span class="traceContains">+name: element x of type point is at offset 0</span>
+<span id="L256" class="LineNr">256 </span>
+<span id="L257" class="LineNr">257 </span><span class="Delimiter">:(before &quot;End transform_names(inst) Special-cases&quot;)</span>
+<span id="L258" class="LineNr">258 </span><span class="Comment">// replace element names of containers with offsets</span>
+<span id="L259" class="LineNr">259 </span><span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;get&quot;</span> || inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;get-location&quot;</span> || inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;put&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L260" class="LineNr">260 </span>  <span class="Comment">//: avoid raising any errors here; later layers will support overloading new</span>
+<span id="L261" class="LineNr">261 </span>  <span class="Comment">//: instructions with the same names (static dispatch), which could lead to</span>
+<span id="L262" class="LineNr">262 </span>  <span class="Comment">//: spurious errors</span>
+<span id="L263" class="LineNr">263 </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> &lt; <span class="Constant">2</span><span class="Delimiter">)</span>
+<span id="L264" class="LineNr">264 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// error raised elsewhere</span>
+<span id="L265" class="LineNr">265 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span>
+<span id="L266" class="LineNr">266 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// error raised elsewhere</span>
+<span id="L267" class="LineNr">267 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<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>find_first_not_of<span class="Delimiter">(</span><span class="Constant">&quot;0123456789&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L268" class="LineNr">268 </span>  <span class="Conceal">¦</span> <span class="Comment">// since first non-address in base type must be a container, we don't have to canonize</span>
+<span id="L269" class="LineNr">269 </span>  <span class="Conceal">¦</span> <a href='010vm.cc.html#L123'>type_ordinal</a> base_type = <a href='042name.cc.html#L120'>skip_addresses</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>type<span class="Delimiter">);</span>
+<span id="L270" class="LineNr">270 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">))</span> <span class="Delimiter">{</span>  <span class="Comment">// otherwise we'll raise an error elsewhere</span>
+<span id="L271" class="LineNr">271 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='042name.cc.html#L140'>find_element_name</a><span class="Delimiter">(</span>base_type<span class="Delimiter">,</span> inst<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> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">));</span>
+<span id="L272" class="LineNr">272 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;name&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;element &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; of type &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; is at offset &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>value<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L273" class="LineNr">273 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L274" class="LineNr">274 </span>  <span class="Delimiter">}</span>
+<span id="L275" class="LineNr">275 </span><span class="Delimiter">}</span>
 <span id="L276" class="LineNr">276 </span>
-<span id="L277" class="LineNr">277 </span><span class="Comment">//: this test is actually illegal so can't call run</span>
-<span id="L278" class="LineNr">278 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L279" class="LineNr">279 </span><span class="Delimiter">:(scenario transform_names_handles_containers)</span>
-<span id="L280" class="LineNr">280 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L281" class="LineNr">281 </span>  <span class="Normal">a</span>:point<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>/unsafe
-<span id="L282" class="LineNr">282 </span>  <span class="Normal">b</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>/unsafe
-<span id="L283" class="LineNr">283 </span>]
-<span id="L284" class="LineNr">284 </span><span class="traceContains">+name: assign a 1</span>
-<span id="L285" class="LineNr">285 </span><span class="traceContains">+name: assign b 3</span>
-<span id="L286" class="LineNr">286 </span>
-<span id="L287" class="LineNr">287 </span><span class="SalientComment">//:: Support variant names for exclusive containers in 'maybe-convert'.</span>
-<span id="L288" class="LineNr">288 </span>
-<span id="L289" class="LineNr">289 </span><span class="Delimiter">:(scenarios run)</span>
-<span id="L290" class="LineNr">290 </span><span class="Delimiter">:(scenario transform_names_handles_exclusive_containers)</span>
-<span id="L291" class="LineNr">291 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L292" class="LineNr">292 </span>  <span class="Constant">12</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
-<span id="L293" class="LineNr">293 </span>  <span class="Constant">13</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
-<span id="L294" class="LineNr">294 </span>  <span class="Constant">14</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">36</span>
-<span id="L295" class="LineNr">295 </span>  <span class="Constant">20</span>:point<span class="Delimiter">,</span> <span class="Constant">22</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert <span class="Constant">12</span>:number-<span class="Normal">or</span>-point/unsafe<span class="Delimiter">,</span> <span class="Constant">p:variant</span>
-<span id="L296" class="LineNr">296 </span>]
-<span id="L297" class="LineNr">297 </span><span class="traceContains">+name: variant p of type number-or-point has tag 1</span>
-<span id="L298" class="LineNr">298 </span><span class="traceContains">+mem: storing 1 in location 22</span>
-<span id="L299" class="LineNr">299 </span><span class="traceContains">+mem: storing 35 in location 20</span>
-<span id="L300" class="LineNr">300 </span><span class="traceContains">+mem: storing 36 in location 21</span>
-<span id="L301" class="LineNr">301 </span>
-<span id="L302" class="LineNr">302 </span><span class="Delimiter">:(before &quot;End transform_names(inst) Special-cases&quot;)</span>
-<span id="L303" class="LineNr">303 </span><span class="Comment">// convert variant names of exclusive containers</span>
-<span id="L304" class="LineNr">304 </span><span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;maybe-convert&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L305" class="LineNr">305 </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> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L306" class="LineNr">306 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;exactly 2 ingredients expected 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#L197'>end</a><span class="Delimiter">();</span>
-<span id="L307" class="LineNr">307 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L308" class="LineNr">308 </span>  <span class="Delimiter">}</span>
-<span id="L309" class="LineNr">309 </span>  assert<span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)));</span>
-<span id="L310" class="LineNr">310 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<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>find_first_not_of<span class="Delimiter">(</span><span class="Constant">&quot;0123456789&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L311" class="LineNr">311 </span>  <span class="Conceal">¦</span> <span class="Comment">// since first non-address in base type must be an exclusive container, we don't have to canonize</span>
-<span id="L312" class="LineNr">312 </span>  <span class="Conceal">¦</span> <a href='010vm.cc.html#L123'>type_ordinal</a> base_type = <a href='042name.cc.html#L120'>skip_addresses</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>type<span class="Delimiter">);</span>
-<span id="L313" class="LineNr">313 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">))</span> <span class="Delimiter">{</span>  <span class="Comment">// otherwise we'll raise an error elsewhere</span>
-<span id="L314" class="LineNr">314 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='042name.cc.html#L133'>find_element_name</a><span class="Delimiter">(</span>base_type<span class="Delimiter">,</span> inst<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> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">));</span>
-<span id="L315" class="LineNr">315 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;name&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;variant &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; of type &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; has tag &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>value<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L316" class="LineNr">316 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L317" class="LineNr">317 </span>  <span class="Delimiter">}</span>
-<span id="L318" class="LineNr">318 </span><span class="Delimiter">}</span>
-<span id="L319" class="LineNr">319 </span>
-<span id="L320" class="LineNr">320 </span><span class="Delimiter">:(scenario missing_type_in_maybe_convert)</span>
-<span id="L321" class="LineNr">321 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L322" class="LineNr">322 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L323" class="LineNr">323 </span>  maybe-convert a<span class="Delimiter">,</span> <span class="Constant">x:variant</span>
-<span id="L324" class="LineNr">324 </span>]
-<span id="L325" class="LineNr">325 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: missing type for 'a' in 'maybe-convert a, x:variant'</span>
+<span id="L277" class="LineNr">277 </span><span class="Delimiter">:(scenario missing_type_in_get)</span>
+<span id="L278" class="LineNr">278 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L279" class="LineNr">279 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L280" class="LineNr">280 </span>  get a<span class="Delimiter">,</span> <span class="Constant">x:offset</span>
+<span id="L281" class="LineNr">281 </span>]
+<span id="L282" class="LineNr">282 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: missing type for 'a' in 'get a, x:offset'</span>
+<span id="L283" class="LineNr">283 </span>
+<span id="L284" class="LineNr">284 </span><span class="Comment">//: this test is actually illegal so can't call run</span>
+<span id="L285" class="LineNr">285 </span><span class="Delimiter">:(scenarios transform)</span>
+<span id="L286" class="LineNr">286 </span><span class="Delimiter">:(scenario transform_names_handles_containers)</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="Normal">a</span>:point<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>/unsafe
+<span id="L289" class="LineNr">289 </span>  <span class="Normal">b</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>/unsafe
+<span id="L290" class="LineNr">290 </span>]
+<span id="L291" class="LineNr">291 </span><span class="traceContains">+name: assign a 1</span>
+<span id="L292" class="LineNr">292 </span><span class="traceContains">+name: assign b 3</span>
+<span id="L293" class="LineNr">293 </span>
+<span id="L294" class="LineNr">294 </span><span class="SalientComment">//:: Support variant names for exclusive containers in 'maybe-convert'.</span>
+<span id="L295" class="LineNr">295 </span>
+<span id="L296" class="LineNr">296 </span><span class="Delimiter">:(scenarios run)</span>
+<span id="L297" class="LineNr">297 </span><span class="Delimiter">:(scenario transform_names_handles_exclusive_containers)</span>
+<span id="L298" class="LineNr">298 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L299" class="LineNr">299 </span>  <span class="Constant">12</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
+<span id="L300" class="LineNr">300 </span>  <span class="Constant">13</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
+<span id="L301" class="LineNr">301 </span>  <span class="Constant">14</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">36</span>
+<span id="L302" class="LineNr">302 </span>  <span class="Constant">20</span>:point<span class="Delimiter">,</span> <span class="Constant">22</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert <span class="Constant">12</span>:number-<span class="Normal">or</span>-point/unsafe<span class="Delimiter">,</span> <span class="Constant">p:variant</span>
+<span id="L303" class="LineNr">303 </span>]
+<span id="L304" class="LineNr">304 </span><span class="traceContains">+name: variant p of type number-or-point has tag 1</span>
+<span id="L305" class="LineNr">305 </span><span class="traceContains">+mem: storing 1 in location 22</span>
+<span id="L306" class="LineNr">306 </span><span class="traceContains">+mem: storing 35 in location 20</span>
+<span id="L307" class="LineNr">307 </span><span class="traceContains">+mem: storing 36 in location 21</span>
+<span id="L308" class="LineNr">308 </span>
+<span id="L309" class="LineNr">309 </span><span class="Delimiter">:(before &quot;End transform_names(inst) Special-cases&quot;)</span>
+<span id="L310" class="LineNr">310 </span><span class="Comment">// convert variant names of exclusive containers</span>
+<span id="L311" class="LineNr">311 </span><span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;maybe-convert&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L312" class="LineNr">312 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L313" class="LineNr">313 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;exactly 2 ingredients expected 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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L314" class="LineNr">314 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L315" class="LineNr">315 </span>  <span class="Delimiter">}</span>
+<span id="L316" class="LineNr">316 </span>  assert<span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)));</span>
+<span id="L317" class="LineNr">317 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<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>find_first_not_of<span class="Delimiter">(</span><span class="Constant">&quot;0123456789&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L318" class="LineNr">318 </span>  <span class="Conceal">¦</span> <span class="Comment">// since first non-address in base type must be an exclusive container, we don't have to canonize</span>
+<span id="L319" class="LineNr">319 </span>  <span class="Conceal">¦</span> <a href='010vm.cc.html#L123'>type_ordinal</a> base_type = <a href='042name.cc.html#L120'>skip_addresses</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>type<span class="Delimiter">);</span>
+<span id="L320" class="LineNr">320 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">))</span> <span class="Delimiter">{</span>  <span class="Comment">// otherwise we'll raise an error elsewhere</span>
+<span id="L321" class="LineNr">321 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='042name.cc.html#L140'>find_element_name</a><span class="Delimiter">(</span>base_type<span class="Delimiter">,</span> inst<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> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">));</span>
+<span id="L322" class="LineNr">322 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;name&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;variant &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; of type &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; has tag &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>value<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L323" class="LineNr">323 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L324" class="LineNr">324 </span>  <span class="Delimiter">}</span>
+<span id="L325" class="LineNr">325 </span><span class="Delimiter">}</span>
+<span id="L326" class="LineNr">326 </span>
+<span id="L327" class="LineNr">327 </span><span class="Delimiter">:(scenario missing_type_in_maybe_convert)</span>
+<span id="L328" class="LineNr">328 </span><span class="Special">% Hide_errors = true;</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>  maybe-convert a<span class="Delimiter">,</span> <span class="Constant">x:variant</span>
+<span id="L331" class="LineNr">331 </span>]
+<span id="L332" class="LineNr">332 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: missing type for 'a' in 'maybe-convert a, x:variant'</span>
 </pre>
 </body>
 </html>
diff --git a/html/043space.cc.html b/html/043space.cc.html
index 589bd60d..66900af8 100644
--- a/html/043space.cc.html
+++ b/html/043space.cc.html
@@ -67,446 +67,484 @@ if ('onhashchange' in window) {
 <span id="L1" class="LineNr">  1 </span><span class="Comment">//: Spaces help isolate recipes from each other. You can create them at will,</span>
 <span id="L2" class="LineNr">  2 </span><span class="Comment">//: and all addresses in arguments are implicitly based on the 'default-space'</span>
 <span id="L3" class="LineNr">  3 </span><span class="Comment">//: (unless they have the /raw property)</span>
-<span id="L4" class="LineNr">  4 </span>
-<span id="L5" class="LineNr">  5 </span><span class="Comment">//: A space is just an array of any scalar location.</span>
-<span id="L6" class="LineNr">  6 </span><span class="Delimiter">:(before &quot;End Mu Types Initialization&quot;)</span>
-<span id="L7" class="LineNr">  7 </span><a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_abbreviations<span class="Delimiter">,</span> <span class="Constant">&quot;space&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;address:array:location&quot;</span><span class="Delimiter">));</span>
-<span id="L8" class="LineNr">  8 </span><span class="Comment">//: Spaces are often called 'scopes' in other languages.</span>
-<span id="L9" class="LineNr">  9 </span><a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_abbreviations<span class="Delimiter">,</span> <span class="Constant">&quot;scope&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;address:array:location&quot;</span><span class="Delimiter">));</span>
-<span id="L10" class="LineNr"> 10 </span>
-<span id="L11" class="LineNr"> 11 </span><span class="Delimiter">:(scenario set_default_space)</span>
-<span id="L12" class="LineNr"> 12 </span><span class="Comment"># if default-space is 10, and if an array of 5 locals lies from location 12 to 16 (inclusive),</span>
-<span id="L13" class="LineNr"> 13 </span><span class="Comment"># then local 0 is really location 12, local 1 is really location 13, and so on.</span>
-<span id="L14" class="LineNr"> 14 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L15" class="LineNr"> 15 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use 'new'</span>
-<span id="L16" class="LineNr"> 16 </span>  <span class="Constant">10</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># refcount</span>
-<span id="L17" class="LineNr"> 17 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">5</span>  <span class="Comment"># length</span>
-<span id="L18" class="LineNr"> 18 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
-<span id="L19" class="LineNr"> 19 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
-<span id="L20" class="LineNr"> 20 </span>]
-<span id="L21" class="LineNr"> 21 </span><span class="traceContains">+mem: storing 23 in location 13</span>
-<span id="L22" class="LineNr"> 22 </span>
-<span id="L23" class="LineNr"> 23 </span><span class="Delimiter">:(scenario lookup_sidesteps_default_space)</span>
-<span id="L24" class="LineNr"> 24 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L25" class="LineNr"> 25 </span>  <span class="Comment"># pretend pointer from outside (2000 reserved for refcount)</span>
-<span id="L26" class="LineNr"> 26 </span>  <span class="Constant">2001</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L27" class="LineNr"> 27 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use 'new&quot;</span>
-<span id="L28" class="LineNr"> 28 </span>  <span class="Constant">1000</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># refcount</span>
-<span id="L29" class="LineNr"> 29 </span>  <span class="Constant">1001</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">5</span>  <span class="Comment"># length</span>
-<span id="L30" class="LineNr"> 30 </span>  <span class="Comment"># actual start of this recipe</span>
-<span id="L31" class="LineNr"> 31 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span>copy <span class="Constant">1000</span>/unsafe
-<span id="L32" class="LineNr"> 32 </span>  <span class="Constant">1</span>:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">2000</span>/unsafe  <span class="Comment"># even local variables always contain raw addresses</span>
-<span id="L33" class="LineNr"> 33 </span>  <span class="Constant">8</span>:num/<span class="Special">raw &lt;- </span>copy *<span class="Constant">1</span>:&amp;:num
-<span id="L34" class="LineNr"> 34 </span>]
-<span id="L35" class="LineNr"> 35 </span><span class="traceContains">+mem: storing 34 in location 8</span>
-<span id="L36" class="LineNr"> 36 </span>
-<span id="L37" class="LineNr"> 37 </span><span class="SalientComment">//:: first disable name conversion for 'default-space'</span>
-<span id="L38" class="LineNr"> 38 </span><span class="Delimiter">:(scenario convert_names_passes_default_space)</span>
-<span id="L39" class="LineNr"> 39 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L40" class="LineNr"> 40 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L41" class="LineNr"> 41 </span>  <span class="Normal">default</span>-space:num<span class="Delimiter">,</span> x:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span>
-<span id="L42" class="LineNr"> 42 </span>]
-<span id="L43" class="LineNr"> 43 </span><span class="traceContains">+name: assign x 1</span>
-<span id="L44" class="LineNr"> 44 </span><span class="traceAbsent">-name: assign default-space 1</span>
-<span id="L45" class="LineNr"> 45 </span>
-<span id="L46" class="LineNr"> 46 </span><span class="Delimiter">:(before &quot;End <a href='042name.cc.html#L99'>is_disqualified</a> Special-cases&quot;)</span>
-<span id="L47" class="LineNr"> 47 </span><span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">)</span>
-<span id="L48" class="LineNr"> 48 </span>  x<span class="Delimiter">.</span>initialized = <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L49" class="LineNr"> 49 </span><span class="Delimiter">:(before &quot;End <a href='042name.cc.html#L156'>is_special_name</a> Special-cases&quot;)</span>
-<span id="L50" class="LineNr"> 50 </span><span class="Normal">if</span> <span class="Delimiter">(</span>s == <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L4" class="LineNr">  4 </span><span class="Comment">//:</span>
+<span id="L5" class="LineNr">  5 </span><span class="Comment">//: Spaces are often called 'scopes' in other languages. Stack frames are a</span>
+<span id="L6" class="LineNr">  6 </span><span class="Comment">//: limited form of space that can't outlive callers.</span>
+<span id="L7" class="LineNr">  7 </span><span class="Comment">//:</span>
+<span id="L8" class="LineNr">  8 </span><span class="Comment">//: Warning: messing with 'default-space' can corrupt memory. Don't do things</span>
+<span id="L9" class="LineNr">  9 </span><span class="Comment">//: like initialize default-space with some other function's default-space.</span>
+<span id="L10" class="LineNr"> 10 </span><span class="Comment">//: Later we'll see how to chain spaces safely.</span>
+<span id="L11" class="LineNr"> 11 </span>
+<span id="L12" class="LineNr"> 12 </span><span class="Comment">//: Under the hood, a space is an array of locations in memory.</span>
+<span id="L13" class="LineNr"> 13 </span><span class="Delimiter">:(before &quot;End Mu Types Initialization&quot;)</span>
+<span id="L14" class="LineNr"> 14 </span><a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_abbreviations<span class="Delimiter">,</span> <span class="Constant">&quot;space&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;address:array:location&quot;</span><span class="Delimiter">));</span>
+<span id="L15" class="LineNr"> 15 </span>
+<span id="L16" class="LineNr"> 16 </span><span class="Delimiter">:(scenario set_default_space)</span>
+<span id="L17" class="LineNr"> 17 </span><span class="Comment"># if default-space is 10, and if an array of 5 locals lies from location 12 to 16 (inclusive),</span>
+<span id="L18" class="LineNr"> 18 </span><span class="Comment"># then local 0 is really location 12, local 1 is really location 13, and so on.</span>
+<span id="L19" class="LineNr"> 19 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L20" class="LineNr"> 20 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use 'new'</span>
+<span id="L21" class="LineNr"> 21 </span>  <span class="Constant">10</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># refcount</span>
+<span id="L22" class="LineNr"> 22 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">5</span>  <span class="Comment"># length</span>
+<span id="L23" class="LineNr"> 23 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L24" class="LineNr"> 24 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
+<span id="L25" class="LineNr"> 25 </span>]
+<span id="L26" class="LineNr"> 26 </span><span class="traceContains">+mem: storing 23 in location 13</span>
+<span id="L27" class="LineNr"> 27 </span>
+<span id="L28" class="LineNr"> 28 </span><span class="Delimiter">:(scenario lookup_sidesteps_default_space)</span>
+<span id="L29" class="LineNr"> 29 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L30" class="LineNr"> 30 </span>  <span class="Comment"># pretend pointer from outside (2000 reserved for refcount)</span>
+<span id="L31" class="LineNr"> 31 </span>  <span class="Constant">2001</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L32" class="LineNr"> 32 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use 'new'</span>
+<span id="L33" class="LineNr"> 33 </span>  <span class="Constant">1000</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># refcount</span>
+<span id="L34" class="LineNr"> 34 </span>  <span class="Constant">1001</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">5</span>  <span class="Comment"># length</span>
+<span id="L35" class="LineNr"> 35 </span>  <span class="Comment"># actual start of this recipe</span>
+<span id="L36" class="LineNr"> 36 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span>copy <span class="Constant">1000</span>/unsafe
+<span id="L37" class="LineNr"> 37 </span>  <span class="Constant">1</span>:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">2000</span>/unsafe  <span class="Comment"># even local variables always contain raw addresses</span>
+<span id="L38" class="LineNr"> 38 </span>  <span class="Constant">8</span>:num/<span class="Special">raw &lt;- </span>copy *<span class="Constant">1</span>:&amp;:num
+<span id="L39" class="LineNr"> 39 </span>]
+<span id="L40" class="LineNr"> 40 </span><span class="traceContains">+mem: storing 34 in location 8</span>
+<span id="L41" class="LineNr"> 41 </span>
+<span id="L42" class="LineNr"> 42 </span><span class="Comment">//: precondition: disable name conversion for 'default-space'</span>
+<span id="L43" class="LineNr"> 43 </span>
+<span id="L44" class="LineNr"> 44 </span><span class="Delimiter">:(scenario convert_names_passes_default_space)</span>
+<span id="L45" class="LineNr"> 45 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L46" class="LineNr"> 46 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L47" class="LineNr"> 47 </span>  <span class="Normal">default</span>-space:num<span class="Delimiter">,</span> x:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span>
+<span id="L48" class="LineNr"> 48 </span>]
+<span id="L49" class="LineNr"> 49 </span><span class="traceContains">+name: assign x 1</span>
+<span id="L50" class="LineNr"> 50 </span><span class="traceAbsent">-name: assign default-space 1</span>
 <span id="L51" class="LineNr"> 51 </span>
-<span id="L52" class="LineNr"> 52 </span><span class="SalientComment">//:: now implement space support</span>
-<span id="L53" class="LineNr"> 53 </span><span class="Delimiter">:(before &quot;End call Fields&quot;)</span>
-<span id="L54" class="LineNr"> 54 </span><span class="Normal">int</span> default_space<span class="Delimiter">;</span>
-<span id="L55" class="LineNr"> 55 </span><span class="Delimiter">:(before &quot;End call Constructor&quot;)</span>
-<span id="L56" class="LineNr"> 56 </span>default_space = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L52" class="LineNr"> 52 </span><span class="Delimiter">:(before &quot;End <a href='042name.cc.html#L99'>is_disqualified</a> Special-cases&quot;)</span>
+<span id="L53" class="LineNr"> 53 </span><span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">)</span>
+<span id="L54" class="LineNr"> 54 </span>  x<span class="Delimiter">.</span>initialized = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L55" class="LineNr"> 55 </span><span class="Delimiter">:(before &quot;End <a href='042name.cc.html#L163'>is_special_name</a> Special-cases&quot;)</span>
+<span id="L56" class="LineNr"> 56 </span><span class="Normal">if</span> <span class="Delimiter">(</span>s == <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L57" class="LineNr"> 57 </span>
-<span id="L58" class="LineNr"> 58 </span><span class="Delimiter">:(before &quot;End canonize(x) Special-cases&quot;)</span>
-<span id="L59" class="LineNr"> 59 </span>absolutize<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
-<span id="L60" class="LineNr"> 60 </span><span class="Delimiter">:(code)</span>
-<span id="L61" class="LineNr"> 61 </span><span class="Normal">void</span> absolutize<span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L62" class="LineNr"> 62 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='022arithmetic.cc.html#L108'>is_raw</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> || is_dummy<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L63" class="LineNr"> 63 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L64" class="LineNr"> 64 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>initialized<span class="Delimiter">)</span>
-<span id="L65" class="LineNr"> 65 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;: reagent not initialized: '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L66" class="LineNr"> 66 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>address<span class="Delimiter">(</span>x<span class="Delimiter">.</span>value<span class="Delimiter">,</span> space_base<span class="Delimiter">(</span>x<span class="Delimiter">)));</span>
-<span id="L67" class="LineNr"> 67 </span>  x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;raw&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
-<span id="L68" class="LineNr"> 68 </span>  assert<span class="Delimiter">(</span><a href='022arithmetic.cc.html#L108'>is_raw</a><span class="Delimiter">(</span>x<span class="Delimiter">));</span>
-<span id="L69" class="LineNr"> 69 </span><span class="Delimiter">}</span>
-<span id="L70" class="LineNr"> 70 </span>
-<span id="L71" class="LineNr"> 71 </span><span class="Comment">//: hook replaced in a later layer</span>
-<span id="L72" class="LineNr"> 72 </span><span class="Normal">int</span> space_base<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L73" class="LineNr"> 73 </span>  <span class="Identifier">return</span> <a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>default_space ? <span class="Delimiter">(</span><a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>default_space+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">)</span> : <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L74" class="LineNr"> 74 </span><span class="Delimiter">}</span>
-<span id="L75" class="LineNr"> 75 </span>
-<span id="L76" class="LineNr"> 76 </span><span class="Normal">int</span> address<span class="Delimiter">(</span><span class="Normal">int</span> offset<span class="Delimiter">,</span> <span class="Normal">int</span> base<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L77" class="LineNr"> 77 </span>  assert<span class="Delimiter">(</span>offset &gt;= <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L78" class="LineNr"> 78 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> offset<span class="Delimiter">;</span>  <span class="Comment">// raw</span>
-<span id="L79" class="LineNr"> 79 </span>  <span class="Normal">int</span> size = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> base<span class="Delimiter">);</span>
-<span id="L80" class="LineNr"> 80 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>offset &gt;= size<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L81" class="LineNr"> 81 </span>  <span class="Conceal">¦</span> <span class="Comment">// todo: test</span>
-<span id="L82" class="LineNr"> 82 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;location &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot; is out of bounds &quot;</span> &lt;&lt; size &lt;&lt; <span class="Constant">&quot; at &quot;</span> &lt;&lt; base &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L83" class="LineNr"> 83 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L84" class="LineNr"> 84 </span>  <span class="Delimiter">}</span>
-<span id="L85" class="LineNr"> 85 </span>  <span class="Identifier">return</span> base + <span class="Comment">/*</span><span class="Comment">skip length</span><span class="Comment">*/</span><span class="Constant">1</span> + offset<span class="Delimiter">;</span>
-<span id="L86" class="LineNr"> 86 </span><span class="Delimiter">}</span>
-<span id="L87" class="LineNr"> 87 </span>
-<span id="L88" class="LineNr"> 88 </span><span class="SalientComment">//:: reads and writes to the 'default-space' variable have special behavior</span>
-<span id="L89" class="LineNr"> 89 </span>
-<span id="L90" class="LineNr"> 90 </span><span class="Delimiter">:(after &quot;Begin Preprocess write_memory(x, data)&quot;)</span>
-<span id="L91" class="LineNr"> 91 </span><span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L92" class="LineNr"> 92 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!scalar<span class="Delimiter">(</span>data<span class="Delimiter">)</span> || !is_space<span class="Delimiter">(</span>x<span class="Delimiter">))</span>
-<span id="L93" class="LineNr"> 93 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'default-space' should be of type address:array:location, but is &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L94" class="LineNr"> 94 </span>  <a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>default_space = data<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L95" class="LineNr"> 95 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L96" class="LineNr"> 96 </span><span class="Delimiter">}</span>
-<span id="L97" class="LineNr"> 97 </span><span class="Delimiter">:(code)</span>
-<span id="L98" class="LineNr"> 98 </span><span class="Normal">bool</span> is_space<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L99" class="LineNr"> 99 </span>  <span class="Identifier">return</span> <a href='039location_array.cc.html#L15'>is_address_of_array_of_numbers</a><span class="Delimiter">(</span>r<span class="Delimiter">);</span>
-<span id="L100" class="LineNr">100 </span><span class="Delimiter">}</span>
-<span id="L101" class="LineNr">101 </span>
-<span id="L102" class="LineNr">102 </span><span class="Delimiter">:(scenario get_default_space)</span>
-<span id="L103" class="LineNr">103 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L104" class="LineNr">104 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
-<span id="L105" class="LineNr">105 </span>  <span class="Constant">1</span>:space/<span class="Special">raw &lt;- </span>copy <span class="Normal">default</span>-space:space
-<span id="L106" class="LineNr">106 </span>]
-<span id="L107" class="LineNr">107 </span><span class="traceContains">+mem: storing 10 in location 1</span>
-<span id="L108" class="LineNr">108 </span>
-<span id="L109" class="LineNr">109 </span><span class="Delimiter">:(after &quot;Begin Preprocess read_memory(x)&quot;)</span>
-<span id="L110" class="LineNr">110 </span><span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L111" class="LineNr">111 </span>  vector&lt;<span class="Normal">double</span>&gt; result<span class="Delimiter">;</span>
-<span id="L112" class="LineNr">112 </span>  result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>default_space<span class="Delimiter">);</span>
-<span id="L113" class="LineNr">113 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L58" class="LineNr"> 58 </span><span class="Comment">//: core implementation</span>
+<span id="L59" class="LineNr"> 59 </span>
+<span id="L60" class="LineNr"> 60 </span><span class="Delimiter">:(before &quot;End call Fields&quot;)</span>
+<span id="L61" class="LineNr"> 61 </span><span class="Normal">int</span> default_space<span class="Delimiter">;</span>
+<span id="L62" class="LineNr"> 62 </span><span class="Delimiter">:(before &quot;End call Constructor&quot;)</span>
+<span id="L63" class="LineNr"> 63 </span>default_space = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L64" class="LineNr"> 64 </span>
+<span id="L65" class="LineNr"> 65 </span><span class="Delimiter">:(before &quot;Begin canonize(x) Lookups&quot;)</span>
+<span id="L66" class="LineNr"> 66 </span><a href='043space.cc.html#L68'>absolutize</a><span class="Delimiter">(</span>x<span class="Delimiter">);</span>
+<span id="L67" class="LineNr"> 67 </span><span class="Delimiter">:(code)</span>
+<span id="L68" class="LineNr"> 68 </span><span class="Normal">void</span> <a href='043space.cc.html#L68'>absolutize</a><span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L69" class="LineNr"> 69 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='022arithmetic.cc.html#L108'>is_raw</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> || is_dummy<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L70" class="LineNr"> 70 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L71" class="LineNr"> 71 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>initialized<span class="Delimiter">)</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;: reagent not initialized: '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L73" class="LineNr"> 73 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>value<span class="Delimiter">,</span> <a href='043space.cc.html#L79'>space_base</a><span class="Delimiter">(</span>x<span class="Delimiter">)));</span>
+<span id="L74" class="LineNr"> 74 </span>  x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;raw&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
+<span id="L75" class="LineNr"> 75 </span>  assert<span class="Delimiter">(</span><a href='022arithmetic.cc.html#L108'>is_raw</a><span class="Delimiter">(</span>x<span class="Delimiter">));</span>
+<span id="L76" class="LineNr"> 76 </span><span class="Delimiter">}</span>
+<span id="L77" class="LineNr"> 77 </span>
+<span id="L78" class="LineNr"> 78 </span><span class="Comment">//: hook replaced in a later layer</span>
+<span id="L79" class="LineNr"> 79 </span><span class="Normal">int</span> <a href='043space.cc.html#L79'>space_base</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="Identifier">return</span> <a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>default_space ? <span class="Delimiter">(</span><a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>default_space+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">)</span> : <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L81" class="LineNr"> 81 </span><span class="Delimiter">}</span>
+<span id="L82" class="LineNr"> 82 </span>
+<span id="L83" class="LineNr"> 83 </span><span class="Normal">int</span> <a href='043space.cc.html#L83'>address</a><span class="Delimiter">(</span><span class="Normal">int</span> offset<span class="Delimiter">,</span> <span class="Normal">int</span> base<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L84" class="LineNr"> 84 </span>  assert<span class="Delimiter">(</span>offset &gt;= <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L85" class="LineNr"> 85 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> offset<span class="Delimiter">;</span>  <span class="Comment">// raw</span>
+<span id="L86" class="LineNr"> 86 </span>  <span class="Normal">int</span> size = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> base<span class="Delimiter">);</span>
+<span id="L87" class="LineNr"> 87 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>offset &gt;= size<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L88" class="LineNr"> 88 </span>  <span class="Conceal">¦</span> <span class="Comment">// todo: test</span>
+<span id="L89" class="LineNr"> 89 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot;: location &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot; is out of bounds &quot;</span> &lt;&lt; size &lt;&lt; <span class="Constant">&quot; at &quot;</span> &lt;&lt; base &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L90" class="LineNr"> 90 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L165'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L91" class="LineNr"> 91 </span>  <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L92" class="LineNr"> 92 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="Delimiter">}</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="Identifier">return</span> base + <span class="Comment">/*</span><span class="Comment">skip length</span><span class="Comment">*/</span><span class="Constant">1</span> + offset<span class="Delimiter">;</span>
+<span id="L95" class="LineNr"> 95 </span><span class="Delimiter">}</span>
+<span id="L96" class="LineNr"> 96 </span>
+<span id="L97" class="LineNr"> 97 </span><span class="Comment">//: reads and writes to the 'default-space' variable have special behavior</span>
+<span id="L98" class="LineNr"> 98 </span>
+<span id="L99" class="LineNr"> 99 </span><span class="Delimiter">:(after &quot;Begin Preprocess write_memory(x, data)&quot;)</span>
+<span id="L100" class="LineNr">100 </span><span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L101" class="LineNr">101 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!scalar<span class="Delimiter">(</span>data<span class="Delimiter">)</span> || !is_mu_space<span class="Delimiter">(</span>x<span class="Delimiter">))</span>
+<span id="L102" class="LineNr">102 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'default-space' should be of type <a href='043space.cc.html#L83'>address</a>:array:location, but is &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L103" class="LineNr">103 </span>  <a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>default_space = data<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L104" class="LineNr">104 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L105" class="LineNr">105 </span><span class="Delimiter">}</span>
+<span id="L106" class="LineNr">106 </span><span class="Delimiter">:(code)</span>
+<span id="L107" class="LineNr">107 </span><span class="Normal">bool</span> <a href='043space.cc.html#L107'>is_mu_space</a><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="L108" class="LineNr">108 </span>  canonize_type<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
+<span id="L109" class="LineNr">109 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_compound_type_starting_with<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L110" class="LineNr">110 </span>  drop_from_type<span class="Delimiter">(</span>x<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">);</span>
+<span id="L111" class="LineNr">111 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_compound_type_starting_with<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">&quot;array&quot;</span><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L112" class="LineNr">112 </span>  drop_from_type<span class="Delimiter">(</span>x<span class="Delimiter">,</span> <span class="Constant">&quot;array&quot;</span><span class="Delimiter">);</span>
+<span id="L113" class="LineNr">113 </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;location&quot;</span><span class="Delimiter">;</span>
 <span id="L114" class="LineNr">114 </span><span class="Delimiter">}</span>
 <span id="L115" class="LineNr">115 </span>
-<span id="L116" class="LineNr">116 </span><span class="SalientComment">//:: fix 'get'</span>
-<span id="L117" class="LineNr">117 </span>
-<span id="L118" class="LineNr">118 </span><span class="Delimiter">:(scenario lookup_sidesteps_default_space_in_get)</span>
-<span id="L119" class="LineNr">119 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L120" class="LineNr">120 </span>  <span class="Comment"># pretend pointer to container from outside (2000 reserved for refcount)</span>
-<span id="L121" class="LineNr">121 </span>  <span class="Constant">2001</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L122" class="LineNr">122 </span>  <span class="Constant">2002</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
-<span id="L123" class="LineNr">123 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use 'new'</span>
-<span id="L124" class="LineNr">124 </span>  <span class="Constant">1000</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># refcount</span>
-<span id="L125" class="LineNr">125 </span>  <span class="Constant">1001</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">5</span>  <span class="Comment"># length</span>
-<span id="L126" class="LineNr">126 </span>  <span class="Comment"># actual start of this recipe</span>
-<span id="L127" class="LineNr">127 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span>copy <span class="Constant">1000</span>/unsafe
-<span id="L128" class="LineNr">128 </span>  <span class="Constant">1</span>:&amp;:point<span class="Special"> &lt;- </span>copy <span class="Constant">2000</span>/unsafe
-<span id="L129" class="LineNr">129 </span>  <span class="Constant">9</span>:num/<span class="Special">raw &lt;- </span>get *<span class="Constant">1</span>:&amp;:point<span class="Delimiter">,</span> <span class="Constant">1:offset</span>
-<span id="L130" class="LineNr">130 </span>]
-<span id="L131" class="LineNr">131 </span><span class="traceContains">+mem: storing 35 in location 9</span>
-<span id="L132" class="LineNr">132 </span>
-<span id="L133" class="LineNr">133 </span><span class="Delimiter">:(before &quot;Read element&quot; following &quot;case GET:&quot;)</span>
-<span id="L134" class="LineNr">134 </span>element<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;raw&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
-<span id="L135" class="LineNr">135 </span>
-<span id="L136" class="LineNr">136 </span><span class="SalientComment">//:: fix 'index'</span>
-<span id="L137" class="LineNr">137 </span>
-<span id="L138" class="LineNr">138 </span><span class="Delimiter">:(scenario lookup_sidesteps_default_space_in_index)</span>
-<span id="L139" class="LineNr">139 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L140" class="LineNr">140 </span>  <span class="Comment"># pretend pointer to array from outside (2000 reserved for refcount)</span>
-<span id="L141" class="LineNr">141 </span>  <span class="Constant">2001</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">2</span>  <span class="Comment"># length</span>
-<span id="L142" class="LineNr">142 </span>  <span class="Constant">2002</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L143" class="LineNr">143 </span>  <span class="Constant">2003</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
-<span id="L144" class="LineNr">144 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use 'new'</span>
-<span id="L145" class="LineNr">145 </span>  <span class="Constant">1000</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># refcount</span>
-<span id="L146" class="LineNr">146 </span>  <span class="Constant">1001</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">5</span>  <span class="Comment"># length</span>
-<span id="L147" class="LineNr">147 </span>  <span class="Comment"># actual start of this recipe</span>
-<span id="L148" class="LineNr">148 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span>copy <span class="Constant">1000</span>/unsafe
-<span id="L149" class="LineNr">149 </span>  <span class="Constant">1</span>:&amp;:@:num<span class="Special"> &lt;- </span>copy <span class="Constant">2000</span>/unsafe
-<span id="L150" class="LineNr">150 </span>  <span class="Constant">9</span>:num/<span class="Special">raw &lt;- </span>index *<span class="Constant">1</span>:&amp;:@:num<span class="Delimiter">,</span> <span class="Constant">1</span>
-<span id="L151" class="LineNr">151 </span>]
-<span id="L152" class="LineNr">152 </span><span class="traceContains">+mem: storing 35 in location 9</span>
-<span id="L153" class="LineNr">153 </span>
-<span id="L154" class="LineNr">154 </span><span class="Delimiter">:(before &quot;Read element&quot; following &quot;case INDEX:&quot;)</span>
-<span id="L155" class="LineNr">155 </span>element<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;raw&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
-<span id="L156" class="LineNr">156 </span>
-<span id="L157" class="LineNr">157 </span><span class="SalientComment">//:: 'new-default-space' is a convenience operation to automatically deduce</span>
-<span id="L158" class="LineNr">158 </span><span class="SalientComment">//:: the amount of space to allocate in a default space with names</span>
-<span id="L159" class="LineNr">159 </span>
-<span id="L160" class="LineNr">160 </span><span class="Delimiter">:(scenario new_default_space)</span>
-<span id="L161" class="LineNr">161 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L162" class="LineNr">162 </span>  <span class="Normal">new</span>-<span class="Normal">default</span>-space
-<span id="L163" class="LineNr">163 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L164" class="LineNr">164 </span>  <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3</span>
+<span id="L116" class="LineNr">116 </span><span class="Delimiter">:(scenario get_default_space)</span>
+<span id="L117" class="LineNr">117 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L118" class="LineNr">118 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L119" class="LineNr">119 </span>  <span class="Constant">1</span>:space/<span class="Special">raw &lt;- </span>copy <span class="Normal">default</span>-space:space
+<span id="L120" class="LineNr">120 </span>]
+<span id="L121" class="LineNr">121 </span><span class="traceContains">+mem: storing 10 in location 1</span>
+<span id="L122" class="LineNr">122 </span>
+<span id="L123" class="LineNr">123 </span><span class="Delimiter">:(after &quot;Begin Preprocess read_memory(x)&quot;)</span>
+<span id="L124" class="LineNr">124 </span><span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L125" class="LineNr">125 </span>  vector&lt;<span class="Normal">double</span>&gt; result<span class="Delimiter">;</span>
+<span id="L126" class="LineNr">126 </span>  result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>default_space<span class="Delimiter">);</span>
+<span id="L127" class="LineNr">127 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L128" class="LineNr">128 </span><span class="Delimiter">}</span>
+<span id="L129" class="LineNr">129 </span>
+<span id="L130" class="LineNr">130 </span><span class="SalientComment">//:: fix 'get'</span>
+<span id="L131" class="LineNr">131 </span>
+<span id="L132" class="LineNr">132 </span><span class="Delimiter">:(scenario lookup_sidesteps_default_space_in_get)</span>
+<span id="L133" class="LineNr">133 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L134" class="LineNr">134 </span>  <span class="Comment"># pretend pointer to container from outside (2000 reserved for refcount)</span>
+<span id="L135" class="LineNr">135 </span>  <span class="Constant">2001</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L136" class="LineNr">136 </span>  <span class="Constant">2002</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
+<span id="L137" class="LineNr">137 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use 'new'</span>
+<span id="L138" class="LineNr">138 </span>  <span class="Constant">1000</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># refcount</span>
+<span id="L139" class="LineNr">139 </span>  <span class="Constant">1001</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">5</span>  <span class="Comment"># length</span>
+<span id="L140" class="LineNr">140 </span>  <span class="Comment"># actual start of this recipe</span>
+<span id="L141" class="LineNr">141 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span>copy <span class="Constant">1000</span>/unsafe
+<span id="L142" class="LineNr">142 </span>  <span class="Constant">1</span>:&amp;:point<span class="Special"> &lt;- </span>copy <span class="Constant">2000</span>/unsafe
+<span id="L143" class="LineNr">143 </span>  <span class="Constant">9</span>:num/<span class="Special">raw &lt;- </span>get *<span class="Constant">1</span>:&amp;:point<span class="Delimiter">,</span> <span class="Constant">1:offset</span>
+<span id="L144" class="LineNr">144 </span>]
+<span id="L145" class="LineNr">145 </span><span class="traceContains">+mem: storing 35 in location 9</span>
+<span id="L146" class="LineNr">146 </span>
+<span id="L147" class="LineNr">147 </span><span class="Delimiter">:(before &quot;Read element&quot; following &quot;case GET:&quot;)</span>
+<span id="L148" class="LineNr">148 </span>element<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;raw&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
+<span id="L149" class="LineNr">149 </span>
+<span id="L150" class="LineNr">150 </span><span class="SalientComment">//:: fix 'index'</span>
+<span id="L151" class="LineNr">151 </span>
+<span id="L152" class="LineNr">152 </span><span class="Delimiter">:(scenario lookup_sidesteps_default_space_in_index)</span>
+<span id="L153" class="LineNr">153 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L154" class="LineNr">154 </span>  <span class="Comment"># pretend pointer to array from outside (2000 reserved for refcount)</span>
+<span id="L155" class="LineNr">155 </span>  <span class="Constant">2001</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">2</span>  <span class="Comment"># length</span>
+<span id="L156" class="LineNr">156 </span>  <span class="Constant">2002</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L157" class="LineNr">157 </span>  <span class="Constant">2003</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
+<span id="L158" class="LineNr">158 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use 'new'</span>
+<span id="L159" class="LineNr">159 </span>  <span class="Constant">1000</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># refcount</span>
+<span id="L160" class="LineNr">160 </span>  <span class="Constant">1001</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">5</span>  <span class="Comment"># length</span>
+<span id="L161" class="LineNr">161 </span>  <span class="Comment"># actual start of this recipe</span>
+<span id="L162" class="LineNr">162 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span>copy <span class="Constant">1000</span>/unsafe
+<span id="L163" class="LineNr">163 </span>  <span class="Constant">1</span>:&amp;:@:num<span class="Special"> &lt;- </span>copy <span class="Constant">2000</span>/unsafe
+<span id="L164" class="LineNr">164 </span>  <span class="Constant">9</span>:num/<span class="Special">raw &lt;- </span>index *<span class="Constant">1</span>:&amp;:@:num<span class="Delimiter">,</span> <span class="Constant">1</span>
 <span id="L165" class="LineNr">165 </span>]
-<span id="L166" class="LineNr">166 </span><span class="Comment"># allocate space for x and y, as well as the chaining slot at 0</span>
-<span id="L167" class="LineNr">167 </span><span class="traceContains">+mem: array length is 3</span>
-<span id="L168" class="LineNr">168 </span>
-<span id="L169" class="LineNr">169 </span><span class="Delimiter">:(before &quot;End <a href='042name.cc.html#L99'>is_disqualified</a> Special-cases&quot;)</span>
-<span id="L170" class="LineNr">170 </span><span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;number-of-locals&quot;</span><span class="Delimiter">)</span>
-<span id="L171" class="LineNr">171 </span>  x<span class="Delimiter">.</span>initialized = <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L172" class="LineNr">172 </span><span class="Delimiter">:(before &quot;End <a href='042name.cc.html#L156'>is_special_name</a> Special-cases&quot;)</span>
-<span id="L173" class="LineNr">173 </span><span class="Normal">if</span> <span class="Delimiter">(</span>s == <span class="Constant">&quot;number-of-locals&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L174" class="LineNr">174 </span>
-<span id="L175" class="LineNr">175 </span><span class="Delimiter">:(before &quot;End Rewrite Instruction(curr, <a href='010vm.cc.html#L19'>recipe</a> result)&quot;)</span>
-<span id="L176" class="LineNr">176 </span><span class="Comment">// rewrite 'new-default-space' to</span>
-<span id="L177" class="LineNr">177 </span><span class="Comment">//   ```</span>
-<span id="L178" class="LineNr">178 </span><span class="Comment">//   default-space:space &lt;- new location:type, number-of-locals:literal</span>
-<span id="L179" class="LineNr">179 </span><span class="Comment">//   ```</span>
-<span id="L180" class="LineNr">180 </span><span class="Comment">// where number-of-locals is Name[recipe][&quot;&quot;]</span>
-<span id="L181" class="LineNr">181 </span><span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>name == <span class="Constant">&quot;new-default-space&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L182" class="LineNr">182 </span>  rewrite_default_space_instruction<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
-<span id="L183" class="LineNr">183 </span><span class="Delimiter">}</span>
-<span id="L184" class="LineNr">184 </span><span class="Delimiter">:(after &quot;Begin Preprocess read_memory(x)&quot;)</span>
-<span id="L185" class="LineNr">185 </span><span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;number-of-locals&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L186" class="LineNr">186 </span>  vector&lt;<span class="Normal">double</span>&gt; result<span class="Delimiter">;</span>
-<span id="L187" class="LineNr">187 </span>  result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>Name[get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span>][<span class="Constant">&quot;&quot;</span>]<span class="Delimiter">);</span>
-<span id="L188" class="LineNr">188 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">.</span>back<span class="Delimiter">()</span> == <span class="Constant">0</span><span class="Delimiter">)</span>
-<span id="L189" class="LineNr">189 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;no space allocated for default-space in <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; <a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot;; are you using names?</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L190" class="LineNr">190 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L191" class="LineNr">191 </span><span class="Delimiter">}</span>
-<span id="L192" class="LineNr">192 </span><span class="Delimiter">:(after &quot;Begin Preprocess write_memory(x, data)&quot;)</span>
-<span id="L193" class="LineNr">193 </span><span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;number-of-locals&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L194" class="LineNr">194 </span>  <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;can't write to special name 'number-of-locals'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L195" class="LineNr">195 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L196" class="LineNr">196 </span><span class="Delimiter">}</span>
-<span id="L197" class="LineNr">197 </span>
-<span id="L198" class="LineNr">198 </span><span class="SalientComment">//:: 'local-scope' is like 'new-default-space' except that we'll reclaim the</span>
-<span id="L199" class="LineNr">199 </span><span class="SalientComment">//:: default-space when the routine exits</span>
-<span id="L200" class="LineNr">200 </span>
-<span id="L201" class="LineNr">201 </span><span class="Delimiter">:(scenario local_scope)</span>
-<span id="L202" class="LineNr">202 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L203" class="LineNr">203 </span>  <span class="Constant">1</span>:&amp;:@:location<span class="Special"> &lt;- </span>foo
-<span id="L204" class="LineNr">204 </span>  <span class="Constant">2</span>:&amp;:@:location<span class="Special"> &lt;- </span>foo
-<span id="L205" class="LineNr">205 </span>  <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>equal <span class="Constant">1</span>:&amp;<span class="Delimiter">,</span> <span class="Constant">2</span>:&amp;
-<span id="L206" class="LineNr">206 </span>]
-<span id="L207" class="LineNr">207 </span><span class="muRecipe">def</span> foo [
-<span id="L208" class="LineNr">208 </span>  local-scope
-<span id="L209" class="LineNr">209 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L210" class="LineNr">210 </span>  <span class="Identifier">return</span> <span class="Normal">default</span>-space:space
-<span id="L211" class="LineNr">211 </span>]
-<span id="L212" class="LineNr">212 </span><span class="Comment"># both calls to foo should have received the same default-space</span>
-<span id="L213" class="LineNr">213 </span><span class="traceContains">+mem: storing 1 in location 3</span>
-<span id="L214" class="LineNr">214 </span>
-<span id="L215" class="LineNr">215 </span><span class="Delimiter">:(scenario local_scope_frees_up_addresses)</span>
-<span id="L216" class="LineNr">216 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L217" class="LineNr">217 </span>  local-scope
-<span id="L218" class="LineNr">218 </span>  <span class="Normal">x</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [abc]
-<span id="L219" class="LineNr">219 </span>]
-<span id="L220" class="LineNr">220 </span><span class="traceContains">+mem: clearing x:text</span>
-<span id="L221" class="LineNr">221 </span>
-<span id="L222" class="LineNr">222 </span><span class="Delimiter">:(before &quot;End Rewrite Instruction(curr, <a href='010vm.cc.html#L19'>recipe</a> result)&quot;)</span>
-<span id="L223" class="LineNr">223 </span><span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>name == <span class="Constant">&quot;local-scope&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L224" class="LineNr">224 </span>  rewrite_default_space_instruction<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
-<span id="L225" class="LineNr">225 </span><span class="Delimiter">}</span>
-<span id="L226" class="LineNr">226 </span>
-<span id="L227" class="LineNr">227 </span><span class="Comment">//: todo: do this in a transform, rather than magically in the 'return' instruction</span>
-<span id="L228" class="LineNr">228 </span><span class="Delimiter">:(after &quot;Falling Through End Of Recipe&quot;)</span>
-<span id="L229" class="LineNr">229 </span>try_reclaim_locals<span class="Delimiter">();</span>
-<span id="L230" class="LineNr">230 </span><span class="Delimiter">:(after &quot;Starting Reply&quot;)</span>
-<span id="L231" class="LineNr">231 </span>try_reclaim_locals<span class="Delimiter">();</span>
-<span id="L232" class="LineNr">232 </span>
-<span id="L233" class="LineNr">233 </span><span class="Delimiter">:(code)</span>
-<span id="L234" class="LineNr">234 </span><span class="Normal">void</span> try_reclaim_locals<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L235" class="LineNr">235 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Reclaim_memory<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L236" class="LineNr">236 </span>  <span class="Comment">// only reclaim routines starting with 'local-scope'</span>
-<span id="L237" class="LineNr">237 </span>  <span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r = get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">());</span>
-<span id="L238" class="LineNr">238 </span>  <span class="Normal">const</span> recipe&amp; exiting_recipe = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
-<span id="L239" class="LineNr">239 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>exiting_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L240" class="LineNr">240 </span>  <span class="Normal">const</span> instruction&amp; inst = exiting_recipe<span class="Delimiter">.</span>steps<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="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name_before_rewrite != <span class="Constant">&quot;local-scope&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L242" class="LineNr">242 </span>  <span class="Comment">// reclaim any local variables unless they're being returned</span>
-<span id="L243" class="LineNr">243 </span>  vector&lt;<span class="Normal">double</span>&gt; zeros<span class="Delimiter">;</span>
-<span id="L244" class="LineNr">244 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">leave default space for last</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>exiting_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L245" class="LineNr">245 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> instruction&amp; inst = exiting_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L246" class="LineNr">246 </span>  <span class="Conceal">¦</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 class="Delimiter">{</span>
-<span id="L247" class="LineNr">247 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">const</span> reagent&amp; product = inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L248" class="LineNr">248 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// local variables only</span>
-<span id="L249" class="LineNr">249 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>product<span class="Delimiter">,</span> <span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L250" class="LineNr">250 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>product<span class="Delimiter">,</span> <span class="Constant">&quot;raw&quot;</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// tests often want to check such locations after they run</span>
-<span id="L251" class="LineNr">251 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>escaping<span class="Delimiter">(</span>product<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L252" class="LineNr">252 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// End Checks For Reclaiming Locals</span>
-<span id="L253" class="LineNr">253 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;clearing &quot;</span> &lt;&lt; product<span class="Delimiter">.</span>original_string &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L254" class="LineNr">254 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> zeros<span class="Delimiter">.</span>resize<span class="Delimiter">(</span>size_of<span class="Delimiter">(</span>product<span class="Delimiter">));</span>
-<span id="L255" class="LineNr">255 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> write_memory<span class="Delimiter">(</span>product<span class="Delimiter">,</span> zeros<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>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;automatically abandoning &quot;</span> &lt;&lt; <a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>default_space &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L259" class="LineNr">259 </span>  <a href='037abandon.cc.html#L28'>abandon</a><span class="Delimiter">(</span><a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>default_space<span class="Delimiter">,</span>
-<span id="L260" class="LineNr">260 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">,</span>
-<span id="L261" class="LineNr">261 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">/*</span><span class="Comment">refcount</span><span class="Comment">*/</span><span class="Constant">1</span> + <span class="Comment">/*</span><span class="Comment">array length</span><span class="Comment">*/</span><span class="Constant">1</span> + <span class="Comment">/*</span><span class="Comment">number-of-locals</span><span class="Comment">*/</span>Name[r][<span class="Constant">&quot;&quot;</span>]<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="Comment">//: Reclaiming local variables above requires remembering what name an</span>
-<span id="L265" class="LineNr">265 </span><span class="Comment">//: instruction had before any rewrites or transforms.</span>
-<span id="L266" class="LineNr">266 </span><span class="Delimiter">:(before &quot;End <a href='010vm.cc.html#L32'>instruction</a> Fields&quot;)</span>
-<span id="L267" class="LineNr">267 </span>string name_before_rewrite<span class="Delimiter">;</span>
-<span id="L268" class="LineNr">268 </span><span class="Delimiter">:(before &quot;End <a href='010vm.cc.html#L32'>instruction</a> Clear&quot;)</span>
-<span id="L269" class="LineNr">269 </span>name_before_rewrite<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
-<span id="L270" class="LineNr">270 </span><span class="Delimiter">:(before &quot;End next_instruction(curr)&quot;)</span>
-<span id="L271" class="LineNr">271 </span>curr<span class="Delimiter">-&gt;</span>name_before_rewrite = curr<span class="Delimiter">-&gt;</span>name<span class="Delimiter">;</span>
-<span id="L272" class="LineNr">272 </span>
-<span id="L273" class="LineNr">273 </span><span class="Delimiter">:(code)</span>
-<span id="L274" class="LineNr">274 </span><span class="Comment">// is this reagent one of the values returned by the current (return) instruction?</span>
-<span id="L275" class="LineNr">275 </span><span class="Comment">// is the corresponding ingredient saved in the caller?</span>
-<span id="L276" class="LineNr">276 </span><span class="Normal">bool</span> escaping<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L277" class="LineNr">277 </span>  assert<span class="Delimiter">(</span>Current_routine<span class="Delimiter">);</span>  <span class="Comment">// run-time only</span>
-<span id="L278" class="LineNr">278 </span>  <span class="Comment">// nothing escapes when you fall through past end of recipe</span>
-<span id="L279" class="LineNr">279 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L80'>current_step_index</a><span class="Delimiter">()</span> &gt;= <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>steps<span class="Delimiter">()))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L280" class="LineNr">280 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">long</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><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L281" class="LineNr">281 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>r == <a href='026call.cc.html#L85'>current_instruction</a><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="L282" class="LineNr">282 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>caller_uses_product<span class="Delimiter">(</span>i<span class="Delimiter">))</span>
-<span id="L283" class="LineNr">283 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L284" class="LineNr">284 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L285" class="LineNr">285 </span>  <span class="Delimiter">}</span>
-<span id="L286" class="LineNr">286 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L287" class="LineNr">287 </span><span class="Delimiter">}</span>
-<span id="L288" class="LineNr">288 </span>
-<span id="L289" class="LineNr">289 </span><span class="Comment">//: since we don't decrement refcounts for escaping values above, make sure we</span>
-<span id="L290" class="LineNr">290 </span><span class="Comment">//: don't increment them when the caller saves them either</span>
-<span id="L291" class="LineNr">291 </span>
-<span id="L292" class="LineNr">292 </span><span class="Delimiter">:(before &quot;End should_update_refcounts() Special-cases&quot;)</span>
-<span id="L293" class="LineNr">293 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Writing_products_of_instruction<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L294" class="LineNr">294 </span>  <span class="Normal">const</span> instruction&amp; inst = <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">();</span>
-<span id="L295" class="LineNr">295 </span>  <span class="Comment">// should_update_refcounts() Special-cases When Writing Products Of Primitive Instructions</span>
-<span id="L296" class="LineNr">296 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation &lt; <a href='010vm.cc.html#L191'>MAX_PRIMITIVE_RECIPES</a><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L297" class="LineNr">297 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>operation<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L298" class="LineNr">298 </span>  <span class="Normal">const</span> recipe&amp; callee = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>operation<span class="Delimiter">);</span>
-<span id="L299" class="LineNr">299 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>callee<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L300" class="LineNr">300 </span>  <span class="Identifier">return</span> callee<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name_before_rewrite != <span class="Constant">&quot;local-scope&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// callees that call local-scope are already dealt with before return</span>
-<span id="L301" class="LineNr">301 </span><span class="Delimiter">}</span>
-<span id="L302" class="LineNr">302 </span>
-<span id="L303" class="LineNr">303 </span><span class="Delimiter">:(code)</span>
-<span id="L304" class="LineNr">304 </span><span class="Normal">bool</span> caller_uses_product<span class="Delimiter">(</span><span class="Normal">int</span> product_index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L305" class="LineNr">305 </span>  assert<span class="Delimiter">(</span>Current_routine<span class="Delimiter">);</span>  <span class="Comment">// run-time only</span>
-<span id="L306" class="LineNr">306 </span>  assert<span class="Delimiter">(</span>!Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L307" class="LineNr">307 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>size<span class="Delimiter">()</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L308" class="LineNr">308 </span>  <span class="Normal">const</span> call&amp; caller = *++Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
-<span id="L309" class="LineNr">309 </span>  <span class="Normal">const</span> instruction&amp; caller_inst = <a href='026call.cc.html#L84'>to_instruction</a><span class="Delimiter">(</span>caller<span class="Delimiter">);</span>
-<span id="L310" class="LineNr">310 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>product_index &gt;= <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller_inst<span class="Delimiter">.</span>products<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L311" class="LineNr">311 </span>  <span class="Identifier">return</span> !is_dummy<span class="Delimiter">(</span>caller_inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>product_index<span class="Delimiter">));</span>
-<span id="L312" class="LineNr">312 </span><span class="Delimiter">}</span>
-<span id="L313" class="LineNr">313 </span>
-<span id="L314" class="LineNr">314 </span><span class="Normal">void</span> rewrite_default_space_instruction<span class="Delimiter">(</span>instruction&amp; curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L315" class="LineNr">315 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
-<span id="L316" class="LineNr">316 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>curr<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' can't take any ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L317" class="LineNr">317 </span>  curr<span class="Delimiter">.</span>name = <span class="Constant">&quot;new&quot;</span><span class="Delimiter">;</span>
-<span id="L318" class="LineNr">318 </span>  <span class="Constant">curr.ingredients.push_back(reagent(&quot;location:type</span><span class="Constant">&quot;));</span>
-<span id="L319" class="LineNr">319 </span>  <span class="Constant">curr.ingredients.push_back(reagent(&quot;number-of-locals:literal</span><span class="Constant">&quot;));</span>
-<span id="L320" class="LineNr">320 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
-<span id="L321" class="LineNr">321 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;new-default-space can't take any results</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L322" class="LineNr">322 </span>  curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span><span class="Constant">&quot;default-space:space&quot;</span><span class="Delimiter">));</span>
-<span id="L323" class="LineNr">323 </span><span class="Delimiter">}</span>
-<span id="L324" class="LineNr">324 </span>
-<span id="L325" class="LineNr">325 </span><span class="Delimiter">:(scenario local_scope_frees_up_addresses_inside_containers)</span>
-<span id="L326" class="LineNr">326 </span><span class="muData">container</span> foo [
-<span id="L327" class="LineNr">327 </span>  <span class="Normal">x</span>:num
-<span id="L328" class="LineNr">328 </span>  <span class="Normal">y</span>:&amp;:num
-<span id="L329" class="LineNr">329 </span>]
-<span id="L330" class="LineNr">330 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L331" class="LineNr">331 </span>  local-scope
-<span id="L332" class="LineNr">332 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L333" class="LineNr">333 </span>  <span class="Normal">y</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> x:&amp;:num
-<span id="L334" class="LineNr">334 </span>  <span class="Comment"># x and y are both cleared when main returns</span>
-<span id="L335" class="LineNr">335 </span>]
-<span id="L336" class="LineNr">336 </span><span class="traceContains">+mem: clearing x:&amp;:num</span>
-<span id="L337" class="LineNr">337 </span><span class="traceContains">+mem: decrementing refcount of 1006: 2 -&gt; 1</span>
-<span id="L338" class="LineNr">338 </span><span class="traceContains">+mem: clearing y:foo</span>
-<span id="L339" class="LineNr">339 </span><span class="traceContains">+mem: decrementing refcount of 1006: 1 -&gt; 0</span>
-<span id="L340" class="LineNr">340 </span><span class="traceContains">+mem: automatically abandoning 1006</span>
-<span id="L341" class="LineNr">341 </span>
-<span id="L342" class="LineNr">342 </span><span class="Delimiter">:(scenario local_scope_returns_addresses_inside_containers)</span>
-<span id="L343" class="LineNr">343 </span><span class="muData">container</span> foo [
-<span id="L344" class="LineNr">344 </span>  <span class="Normal">x</span>:num
-<span id="L345" class="LineNr">345 </span>  <span class="Normal">y</span>:&amp;:num
-<span id="L346" class="LineNr">346 </span>]
-<span id="L347" class="LineNr">347 </span><span class="muRecipe">def</span> f [
-<span id="L348" class="LineNr">348 </span>  local-scope
-<span id="L349" class="LineNr">349 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L350" class="LineNr">350 </span>  *x:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">12</span>
-<span id="L351" class="LineNr">351 </span>  <span class="Normal">y</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> x:&amp;:num
-<span id="L352" class="LineNr">352 </span>  <span class="Comment"># since y is 'escaping' f, it should not be cleared</span>
-<span id="L353" class="LineNr">353 </span>  <span class="Identifier">return</span> y:foo
-<span id="L354" class="LineNr">354 </span>]
-<span id="L355" class="LineNr">355 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L356" class="LineNr">356 </span>  <span class="Constant">1</span>:foo<span class="Special"> &lt;- </span>f
-<span id="L357" class="LineNr">357 </span>  <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>get <span class="Constant">1</span>:foo<span class="Delimiter">,</span> <span class="Constant">x:offset</span>
-<span id="L358" class="LineNr">358 </span>  <span class="Constant">4</span>:&amp;:num<span class="Special"> &lt;- </span>get <span class="Constant">1</span>:foo<span class="Delimiter">,</span> <span class="Constant">y:offset</span>
-<span id="L359" class="LineNr">359 </span>  <span class="Constant">5</span>:num<span class="Special"> &lt;- </span>copy *<span class="Constant">4</span>:&amp;:num
-<span id="L360" class="LineNr">360 </span>  <span class="Constant">1</span>:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> <span class="Constant">1</span>:foo<span class="Delimiter">,</span> <span class="Constant">y:offset</span><span class="Delimiter">,</span> <span class="Constant">0</span>
-<span id="L361" class="LineNr">361 </span>  <span class="Constant">4</span>:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L362" class="LineNr">362 </span>]
-<span id="L363" class="LineNr">363 </span><span class="traceContains">+mem: storing 34 in location 1</span>
-<span id="L364" class="LineNr">364 </span><span class="traceContains">+mem: storing 1006 in location 2</span>
-<span id="L365" class="LineNr">365 </span><span class="traceContains">+mem: storing 34 in location 3</span>
-<span id="L366" class="LineNr">366 </span><span class="Comment"># refcount of 1:foo shouldn't include any stray ones from f</span>
-<span id="L367" class="LineNr">367 </span><span class="traceContains">+run: {4: (&quot;address&quot; &quot;number&quot;)} &lt;- get {1: &quot;foo&quot;}, {y: &quot;offset&quot;}</span>
-<span id="L368" class="LineNr">368 </span><span class="traceContains">+mem: incrementing refcount of 1006: 1 -&gt; 2</span>
-<span id="L369" class="LineNr">369 </span><span class="Comment"># 1:foo wasn't abandoned/cleared</span>
-<span id="L370" class="LineNr">370 </span><span class="traceContains">+run: {5: &quot;number&quot;} &lt;- copy {4: (&quot;address&quot; &quot;number&quot;), &quot;lookup&quot;: ()}</span>
-<span id="L371" class="LineNr">371 </span><span class="traceContains">+mem: storing 12 in location 5</span>
-<span id="L372" class="LineNr">372 </span><span class="traceContains">+run: {1: &quot;foo&quot;} &lt;- <a href='001help.cc.html#L221'>put</a> {1: &quot;foo&quot;}, {y: &quot;offset&quot;}, {0: &quot;literal&quot;}</span>
-<span id="L373" class="LineNr">373 </span><span class="traceContains">+mem: decrementing refcount of 1006: 2 -&gt; 1</span>
-<span id="L374" class="LineNr">374 </span><span class="traceContains">+run: {4: (&quot;address&quot; &quot;number&quot;)} &lt;- copy {0: &quot;literal&quot;}</span>
-<span id="L375" class="LineNr">375 </span><span class="traceContains">+mem: decrementing refcount of 1006: 1 -&gt; 0</span>
-<span id="L376" class="LineNr">376 </span><span class="traceContains">+mem: automatically abandoning 1006</span>
-<span id="L377" class="LineNr">377 </span>
-<span id="L378" class="LineNr">378 </span><span class="Delimiter">:(scenario local_scope_claims_return_values_when_not_saved)</span>
-<span id="L379" class="LineNr">379 </span><span class="muRecipe">def</span> f [
-<span id="L380" class="LineNr">380 </span>  local-scope
-<span id="L381" class="LineNr">381 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L382" class="LineNr">382 </span>  <span class="Identifier">return</span> x:&amp;:num
-<span id="L383" class="LineNr">383 </span>]
-<span id="L384" class="LineNr">384 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L385" class="LineNr">385 </span>  f  <span class="Comment"># doesn't save result</span>
+<span id="L166" class="LineNr">166 </span><span class="traceContains">+mem: storing 35 in location 9</span>
+<span id="L167" class="LineNr">167 </span>
+<span id="L168" class="LineNr">168 </span><span class="Delimiter">:(before &quot;Read element&quot; following &quot;case INDEX:&quot;)</span>
+<span id="L169" class="LineNr">169 </span>element<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;raw&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
+<span id="L170" class="LineNr">170 </span>
+<span id="L171" class="LineNr">171 </span><span class="SalientComment">//:: 'local-scope' is a convenience operation to automatically deduce</span>
+<span id="L172" class="LineNr">172 </span><span class="SalientComment">//:: the amount of space to allocate in a default space with names</span>
+<span id="L173" class="LineNr">173 </span>
+<span id="L174" class="LineNr">174 </span><span class="Delimiter">:(scenario local_scope)</span>
+<span id="L175" class="LineNr">175 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L176" class="LineNr">176 </span>  local-scope
+<span id="L177" class="LineNr">177 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L178" class="LineNr">178 </span>  <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3</span>
+<span id="L179" class="LineNr">179 </span>]
+<span id="L180" class="LineNr">180 </span><span class="Comment"># allocate space for x and y, as well as the chaining slot at 0</span>
+<span id="L181" class="LineNr">181 </span><span class="traceContains">+mem: array length is 3</span>
+<span id="L182" class="LineNr">182 </span>
+<span id="L183" class="LineNr">183 </span><span class="Delimiter">:(before &quot;End <a href='042name.cc.html#L99'>is_disqualified</a> Special-cases&quot;)</span>
+<span id="L184" class="LineNr">184 </span><span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;number-of-locals&quot;</span><span class="Delimiter">)</span>
+<span id="L185" class="LineNr">185 </span>  x<span class="Delimiter">.</span>initialized = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L186" class="LineNr">186 </span><span class="Delimiter">:(before &quot;End <a href='042name.cc.html#L163'>is_special_name</a> Special-cases&quot;)</span>
+<span id="L187" class="LineNr">187 </span><span class="Normal">if</span> <span class="Delimiter">(</span>s == <span class="Constant">&quot;number-of-locals&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L188" class="LineNr">188 </span>
+<span id="L189" class="LineNr">189 </span><span class="Delimiter">:(before &quot;End Rewrite Instruction(curr, <a href='010vm.cc.html#L19'>recipe</a> result)&quot;)</span>
+<span id="L190" class="LineNr">190 </span><span class="Comment">// rewrite 'local-scope' to</span>
+<span id="L191" class="LineNr">191 </span><span class="Comment">//   ```</span>
+<span id="L192" class="LineNr">192 </span><span class="Comment">//   default-space:space &lt;- new location:type, number-of-locals:literal</span>
+<span id="L193" class="LineNr">193 </span><span class="Comment">//   ```</span>
+<span id="L194" class="LineNr">194 </span><span class="Comment">// where number-of-locals is Name[recipe][&quot;&quot;]</span>
+<span id="L195" class="LineNr">195 </span><span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>name == <span class="Constant">&quot;local-scope&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L196" class="LineNr">196 </span>  <a href='043space.cc.html#L199'>rewrite_default_space_instruction</a><span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L197" class="LineNr">197 </span><span class="Delimiter">}</span>
+<span id="L198" class="LineNr">198 </span><span class="Delimiter">:(code)</span>
+<span id="L199" class="LineNr">199 </span><span class="Normal">void</span> <a href='043space.cc.html#L199'>rewrite_default_space_instruction</a><span class="Delimiter">(</span>instruction&amp; curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L200" class="LineNr">200 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
+<span id="L201" class="LineNr">201 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>curr<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' can't take any ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L202" class="LineNr">202 </span>  curr<span class="Delimiter">.</span>name = <span class="Constant">&quot;new&quot;</span><span class="Delimiter">;</span>
+<span id="L203" class="LineNr">203 </span>  <span class="Constant">curr.ingredients.push_back(reagent(&quot;location:type</span><span class="Constant">&quot;));</span>
+<span id="L204" class="LineNr">204 </span>  <span class="Constant">curr.ingredients.push_back(reagent(&quot;number-of-locals:literal</span><span class="Constant">&quot;));</span>
+<span id="L205" class="LineNr">205 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
+<span id="L206" class="LineNr">206 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;new-default-space can't take any results</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L207" class="LineNr">207 </span>  curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span><span class="Constant">&quot;default-space:space&quot;</span><span class="Delimiter">));</span>
+<span id="L208" class="LineNr">208 </span><span class="Delimiter">}</span>
+<span id="L209" class="LineNr">209 </span><span class="Delimiter">:(after &quot;Begin Preprocess read_memory(x)&quot;)</span>
+<span id="L210" class="LineNr">210 </span><span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;number-of-locals&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L211" class="LineNr">211 </span>  vector&lt;<span class="Normal">double</span>&gt; result<span class="Delimiter">;</span>
+<span id="L212" class="LineNr">212 </span>  result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>Name[get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span>][<span class="Constant">&quot;&quot;</span>]<span class="Delimiter">);</span>
+<span id="L213" class="LineNr">213 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">.</span>back<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#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;no space allocated for default-space in <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; <a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot;; are you using names?</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L215" class="LineNr">215 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L216" class="LineNr">216 </span><span class="Delimiter">}</span>
+<span id="L217" class="LineNr">217 </span><span class="Delimiter">:(after &quot;Begin Preprocess write_memory(x, data)&quot;)</span>
+<span id="L218" class="LineNr">218 </span><span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;number-of-locals&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L219" class="LineNr">219 </span>  <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;can't write to special name 'number-of-locals'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L220" class="LineNr">220 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L221" class="LineNr">221 </span><span class="Delimiter">}</span>
+<span id="L222" class="LineNr">222 </span>
+<span id="L223" class="LineNr">223 </span><span class="SalientComment">//:: try to reclaim the default-space when a recipe returns</span>
+<span id="L224" class="LineNr">224 </span>
+<span id="L225" class="LineNr">225 </span><span class="Delimiter">:(scenario local_scope_reclaimed_on_return)</span>
+<span id="L226" class="LineNr">226 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L227" class="LineNr">227 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>foo
+<span id="L228" class="LineNr">228 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>foo
+<span id="L229" class="LineNr">229 </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="L230" class="LineNr">230 </span>]
+<span id="L231" class="LineNr">231 </span><span class="muRecipe">def</span> foo [
+<span id="L232" class="LineNr">232 </span>  local-scope
+<span id="L233" class="LineNr">233 </span>  <span class="Normal">result</span>:num<span class="Special"> &lt;- </span>copy <span class="Normal">default</span>-space:space
+<span id="L234" class="LineNr">234 </span>  <span class="Identifier">return</span> result:num
+<span id="L235" class="LineNr">235 </span>]
+<span id="L236" class="LineNr">236 </span><span class="Comment"># both calls to foo should have received the same default-space</span>
+<span id="L237" class="LineNr">237 </span><span class="traceContains">+mem: storing 1 in location 3</span>
+<span id="L238" class="LineNr">238 </span>
+<span id="L239" class="LineNr">239 </span><span class="Comment">//: todo: do this in a transform, rather than magically in the 'return' instruction</span>
+<span id="L240" class="LineNr">240 </span><span class="Delimiter">:(after &quot;Falling Through End Of Recipe&quot;)</span>
+<span id="L241" class="LineNr">241 </span><a href='043space.cc.html#L245'>reclaim_default_space</a><span class="Delimiter">();</span>
+<span id="L242" class="LineNr">242 </span><span class="Delimiter">:(after &quot;Begin Return&quot;)</span>
+<span id="L243" class="LineNr">243 </span><a href='043space.cc.html#L245'>reclaim_default_space</a><span class="Delimiter">();</span>
+<span id="L244" class="LineNr">244 </span><span class="Delimiter">:(code)</span>
+<span id="L245" class="LineNr">245 </span><span class="Normal">void</span> <a href='043space.cc.html#L245'>reclaim_default_space</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L246" class="LineNr">246 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Reclaim_memory<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L247" class="LineNr">247 </span>  reagent default_space<span class="Delimiter">(</span><span class="Constant">&quot;default-space:<a href='043space.cc.html#L83'>address</a>:array:location&quot;</span><span class="Delimiter">);</span>
+<span id="L248" class="LineNr">248 </span>  <a href='036refcount.cc.html#L59'>decrement_any_refcounts</a><span class="Delimiter">(</span>default_space<span class="Delimiter">);</span>
+<span id="L249" class="LineNr">249 </span><span class="Delimiter">}</span>
+<span id="L250" class="LineNr">250 </span><span class="Delimiter">:(after &quot;Begin Decrement Refcounts(canonized_x)&quot;)</span>
+<span id="L251" class="LineNr">251 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='043space.cc.html#L107'>is_mu_space</a><span class="Delimiter">(</span>canonized_x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L252" class="LineNr">252 </span>  <span class="Normal">int</span> space_address = <span class="Delimiter">(</span>canonized_x<span class="Delimiter">.</span>name == <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">)</span> ? <a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>default_space : <a href='001help.cc.html#L228'>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="L253" class="LineNr">253 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>space_address == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L254" class="LineNr">254 </span>  <span class="Comment">// this branch relies on global state</span>
+<span id="L255" class="LineNr">255 </span>  string recipe_name<span class="Delimiter">;</span>
+<span id="L256" class="LineNr">256 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>canonized_x<span class="Delimiter">,</span> <span class="Constant">&quot;names&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L257" class="LineNr">257 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>property<span class="Delimiter">(</span>canonized_x<span class="Delimiter">,</span> <span class="Constant">&quot;names&quot;</span><span class="Delimiter">)-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L258" class="LineNr">258 </span>  <span class="Conceal">¦</span> recipe_name = property<span class="Delimiter">(</span>canonized_x<span class="Delimiter">,</span> <span class="Constant">&quot;names&quot;</span><span class="Delimiter">)-&gt;</span>value<span class="Delimiter">;</span>
+<span id="L259" class="LineNr">259 </span>  <span class="Delimiter">}</span>
+<span id="L260" class="LineNr">260 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L261" class="LineNr">261 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>canonized_x<span class="Delimiter">.</span>name != <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">)</span>
+<span id="L262" class="LineNr">262 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>canonized_x<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L263" class="LineNr">263 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>canonized_x<span class="Delimiter">.</span>name == <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">);</span>
+<span id="L264" class="LineNr">264 </span>  <span class="Conceal">¦</span> recipe_name = <a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">();</span>
+<span id="L265" class="LineNr">265 </span>  <span class="Delimiter">}</span>
+<span id="L266" class="LineNr">266 </span>  <span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> space_recipe_ordinal = get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> recipe_name<span class="Delimiter">);</span>
+<span id="L267" class="LineNr">267 </span>  <span class="Normal">const</span> recipe&amp; space_recipe = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> space_recipe_ordinal<span class="Delimiter">);</span>
+<span id="L268" class="LineNr">268 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>canonized_x<span class="Delimiter">.</span>name == <span class="Constant">&quot;default-space&quot;</span> &amp;&amp; !has_property<span class="Delimiter">(</span>canonized_x<span class="Delimiter">,</span> <span class="Constant">&quot;names&quot;</span><span class="Delimiter">)</span> &amp;&amp; !starts_by_setting_default_space<span class="Delimiter">(</span>space_recipe<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L269" class="LineNr">269 </span>  <span class="Comment">// Reclaim Space(space_address, space_recipe_ordinal, space_recipe)</span>
+<span id="L270" class="LineNr">270 </span>  <a href='036refcount.cc.html#L68'>decrement_refcount</a><span class="Delimiter">(</span>space_address<span class="Delimiter">,</span> canonized_x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">,</span>
+<span id="L271" class="LineNr">271 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">/*</span><span class="Comment">refcount</span><span class="Comment">*/</span><span class="Constant">1</span> + <span class="Comment">/*</span><span class="Comment">array length</span><span class="Comment">*/</span><span class="Constant">1</span> + <span class="Comment">/*</span><span class="Comment">number-of-locals</span><span class="Comment">*/</span>Name[space_recipe_ordinal][<span class="Constant">&quot;&quot;</span>]<span class="Delimiter">);</span>
+<span id="L272" class="LineNr">272 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L273" class="LineNr">273 </span><span class="Delimiter">}</span>
+<span id="L274" class="LineNr">274 </span><span class="Delimiter">:(code)</span>
+<span id="L275" class="LineNr">275 </span><span class="Normal">bool</span> <a href='043space.cc.html#L275'>starts_by_setting_default_space</a><span class="Delimiter">(</span><span class="Normal">const</span> recipe&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L276" class="LineNr">276 </span>  <span class="Identifier">return</span> !r<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>empty<span class="Delimiter">()</span>
+<span id="L277" class="LineNr">277 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> &amp;&amp; !r<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span>
+<span id="L278" class="LineNr">278 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> &amp;&amp; r<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name == <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">;</span>
+<span id="L279" class="LineNr">279 </span><span class="Delimiter">}</span>
+<span id="L280" class="LineNr">280 </span>
+<span id="L281" class="LineNr">281 </span><span class="Comment">//:</span>
+<span id="L282" class="LineNr">282 </span>
+<span id="L283" class="LineNr">283 </span><span class="Delimiter">:(scenario local_scope_reclaims_locals)</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>  local-scope
+<span id="L286" class="LineNr">286 </span>  <span class="Normal">x</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [abc]
+<span id="L287" class="LineNr">287 </span>]
+<span id="L288" class="LineNr">288 </span><span class="Comment"># x</span>
+<span id="L289" class="LineNr">289 </span><span class="traceContains">+mem: automatically abandoning 1004</span>
+<span id="L290" class="LineNr">290 </span><span class="Comment"># local-scope</span>
+<span id="L291" class="LineNr">291 </span><span class="traceContains">+mem: automatically abandoning 1000</span>
+<span id="L292" class="LineNr">292 </span>
+<span id="L293" class="LineNr">293 </span><span class="Delimiter">:(before &quot;Reclaim Space(space_address, space_recipe_ordinal, space_recipe)&quot;)</span>
+<span id="L294" class="LineNr">294 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> space_address<span class="Delimiter">)</span> &lt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L295" class="LineNr">295 </span>  set&lt;string&gt; reclaimed_locals<span class="Delimiter">;</span>
+<span id="L296" class="LineNr">296 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;trying to reclaim locals&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L297" class="LineNr">297 </span>  <span class="Comment">// update any refcounts for variables in the space -- in the context of the space</span>
+<span id="L298" class="LineNr">298 </span>  call_stack calls_stash = <a href='043space.cc.html#L319'>save_call_stack</a><span class="Delimiter">(</span>space_address<span class="Delimiter">,</span> space_recipe_ordinal<span class="Delimiter">);</span>
+<span id="L299" class="LineNr">299 </span>  Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>swap<span class="Delimiter">(</span>calls_stash<span class="Delimiter">);</span>
+<span id="L300" class="LineNr">300 </span>  <span class="Comment">// no early returns until we restore 'calls' below</span>
+<span id="L301" class="LineNr">301 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">leave default space for last</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>space_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L302" class="LineNr">302 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> instruction&amp; inst = space_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L303" class="LineNr">303 </span>  <span class="Conceal">¦</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 class="Delimiter">{</span>
+<span id="L304" class="LineNr">304 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> product = inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L305" class="LineNr">305 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>reclaimed_locals<span class="Delimiter">.</span>find<span class="Delimiter">(</span>product<span class="Delimiter">.</span>name<span class="Delimiter">)</span> != reclaimed_locals<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L306" class="LineNr">306 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> reclaimed_locals<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>product<span class="Delimiter">.</span>name<span class="Delimiter">);</span>
+<span id="L307" class="LineNr">307 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// local variables only</span>
+<span id="L308" class="LineNr">308 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>product<span class="Delimiter">,</span> <span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L309" class="LineNr">309 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>product<span class="Delimiter">,</span> <span class="Constant">&quot;raw&quot;</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// tests often want to check such locations after they run</span>
+<span id="L310" class="LineNr">310 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// End Checks For Reclaiming Locals</span>
+<span id="L311" class="LineNr">311 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;trying to reclaim local &quot;</span> &lt;&lt; product<span class="Delimiter">.</span>original_string &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L312" class="LineNr">312 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> canonize<span class="Delimiter">(</span>product<span class="Delimiter">);</span>
+<span id="L313" class="LineNr">313 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='036refcount.cc.html#L59'>decrement_any_refcounts</a><span class="Delimiter">(</span>product<span class="Delimiter">);</span>
+<span id="L314" class="LineNr">314 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L315" class="LineNr">315 </span>  <span class="Delimiter">}</span>
+<span id="L316" class="LineNr">316 </span>  Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>swap<span class="Delimiter">(</span>calls_stash<span class="Delimiter">);</span>  <span class="Comment">// restore</span>
+<span id="L317" class="LineNr">317 </span><span class="Delimiter">}</span>
+<span id="L318" class="LineNr">318 </span><span class="Delimiter">:(code)</span>
+<span id="L319" class="LineNr">319 </span>call_stack <a href='043space.cc.html#L319'>save_call_stack</a><span class="Delimiter">(</span><span class="Normal">int</span> space_address<span class="Delimiter">,</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> space_recipe_ordinal<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L320" class="LineNr">320 </span>  call dummy_call<span class="Delimiter">(</span>space_recipe_ordinal<span class="Delimiter">);</span>
+<span id="L321" class="LineNr">321 </span>  dummy_call<span class="Delimiter">.</span>default_space = space_address<span class="Delimiter">;</span>
+<span id="L322" class="LineNr">322 </span>  call_stack result<span class="Delimiter">;</span>
+<span id="L323" class="LineNr">323 </span>  result<span class="Delimiter">.</span>push_front<span class="Delimiter">(</span>dummy_call<span class="Delimiter">);</span>
+<span id="L324" class="LineNr">324 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L325" class="LineNr">325 </span><span class="Delimiter">}</span>
+<span id="L326" class="LineNr">326 </span>
+<span id="L327" class="LineNr">327 </span><span class="Delimiter">:(scenario local_variables_can_outlive_call)</span>
+<span id="L328" class="LineNr">328 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L329" class="LineNr">329 </span>  local-scope
+<span id="L330" class="LineNr">330 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">num:type</span>
+<span id="L331" class="LineNr">331 </span>  <span class="Normal">y</span>:space<span class="Special"> &lt;- </span>copy <span class="Normal">default</span>-space:space
+<span id="L332" class="LineNr">332 </span>]
+<span id="L333" class="LineNr">333 </span><span class="traceAbsent">-mem: automatically abandoning 1005</span>
+<span id="L334" class="LineNr">334 </span>
+<span id="L335" class="LineNr">335 </span><span class="Comment">//:</span>
+<span id="L336" class="LineNr">336 </span>
+<span id="L337" class="LineNr">337 </span><span class="Delimiter">:(scenario local_scope_does_not_reclaim_escaping_locals)</span>
+<span id="L338" class="LineNr">338 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L339" class="LineNr">339 </span>  <span class="Constant">1</span>:text<span class="Special"> &lt;- </span>foo
+<span id="L340" class="LineNr">340 </span>]
+<span id="L341" class="LineNr">341 </span><span class="muRecipe">def</span> foo [
+<span id="L342" class="LineNr">342 </span>  local-scope
+<span id="L343" class="LineNr">343 </span>  <span class="Normal">x</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [abc]
+<span id="L344" class="LineNr">344 </span>  <span class="Identifier">return</span> x:text
+<span id="L345" class="LineNr">345 </span>]
+<span id="L346" class="LineNr">346 </span><span class="Comment"># local-scope</span>
+<span id="L347" class="LineNr">347 </span><span class="traceContains">+mem: automatically abandoning 1000</span>
+<span id="L348" class="LineNr">348 </span><span class="Comment"># x</span>
+<span id="L349" class="LineNr">349 </span><span class="traceAbsent">-mem: automatically abandoning 1004</span>
+<span id="L350" class="LineNr">350 </span>
+<span id="L351" class="LineNr">351 </span><span class="Delimiter">:(after &quot;Begin Return&quot;)</span>  <span class="Comment">// before reclaiming default-space</span>
+<span id="L352" class="LineNr">352 </span><a href='043space.cc.html#L354'>increment_refcounts_of_return_ingredients</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">);</span>
+<span id="L353" class="LineNr">353 </span><span class="Delimiter">:(code)</span>
+<span id="L354" class="LineNr">354 </span><span class="Normal">void</span> <a href='043space.cc.html#L354'>increment_refcounts_of_return_ingredients</a><span class="Delimiter">(</span><span class="Normal">const</span> vector&lt;vector&lt;<span class="Normal">double</span>&gt; &gt;&amp; ingredients<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L355" class="LineNr">355 </span>  assert<span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>operation == RETURN<span class="Delimiter">);</span>
+<span id="L356" class="LineNr">356 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span>  <span class="Comment">// no caller to receive result</span>
+<span id="L357" class="LineNr">357 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L358" class="LineNr">358 </span>  <span class="Normal">const</span> instruction&amp; caller_instruction = <a href='026call.cc.html#L86'>to_instruction</a><span class="Delimiter">(</span>*++Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>begin<span class="Delimiter">());</span>
+<span id="L359" class="LineNr">359 </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; min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller_instruction<span class="Delimiter">.</span>products<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L360" class="LineNr">360 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!is_dummy<span class="Delimiter">(</span>caller_instruction<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
+<span id="L361" class="LineNr">361 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// no need to canonize ingredient because we ignore its value</span>
+<span id="L362" class="LineNr">362 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='036refcount.cc.html#L41'>increment_any_refcounts</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L363" class="LineNr">363 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L364" class="LineNr">364 </span>  <span class="Delimiter">}</span>
+<span id="L365" class="LineNr">365 </span><span class="Delimiter">}</span>
+<span id="L366" class="LineNr">366 </span>
+<span id="L367" class="LineNr">367 </span><span class="Comment">//:</span>
+<span id="L368" class="LineNr">368 </span>
+<span id="L369" class="LineNr">369 </span><span class="Delimiter">:(scenario local_scope_frees_up_addresses_inside_containers)</span>
+<span id="L370" class="LineNr">370 </span><span class="muData">container</span> foo [
+<span id="L371" class="LineNr">371 </span>  <span class="Normal">x</span>:num
+<span id="L372" class="LineNr">372 </span>  <span class="Normal">y</span>:&amp;:num
+<span id="L373" class="LineNr">373 </span>]
+<span id="L374" class="LineNr">374 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L375" class="LineNr">375 </span>  local-scope
+<span id="L376" class="LineNr">376 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L377" class="LineNr">377 </span>  <span class="Normal">y</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> x:&amp;:num
+<span id="L378" class="LineNr">378 </span>  <span class="Comment"># x and y are both cleared when main returns</span>
+<span id="L379" class="LineNr">379 </span>]
+<span id="L380" class="LineNr">380 </span><span class="traceContains">+mem: automatically abandoning 1006</span>
+<span id="L381" class="LineNr">381 </span>
+<span id="L382" class="LineNr">382 </span><span class="Delimiter">:(scenario local_scope_returns_addresses_inside_containers)</span>
+<span id="L383" class="LineNr">383 </span><span class="muData">container</span> foo [
+<span id="L384" class="LineNr">384 </span>  <span class="Normal">x</span>:num
+<span id="L385" class="LineNr">385 </span>  <span class="Normal">y</span>:&amp;:num
 <span id="L386" class="LineNr">386 </span>]
-<span id="L387" class="LineNr">387 </span><span class="Comment"># x reclaimed</span>
-<span id="L388" class="LineNr">388 </span><span class="traceContains">+mem: automatically abandoning 1004</span>
-<span id="L389" class="LineNr">389 </span><span class="Comment"># f's local scope reclaimed</span>
-<span id="L390" class="LineNr">390 </span><span class="traceContains">+mem: automatically abandoning 1000</span>
-<span id="L391" class="LineNr">391 </span>
-<span id="L392" class="LineNr">392 </span><span class="SalientComment">//:: all recipes must set default-space one way or another</span>
-<span id="L393" class="LineNr">393 </span>
-<span id="L394" class="LineNr">394 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L395" class="LineNr">395 </span><span class="Normal">bool</span> Hide_missing_default_space_errors = <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L396" class="LineNr">396 </span><span class="Delimiter">:(before &quot;End Checks&quot;)</span>
-<span id="L397" class="LineNr">397 </span>Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>check_default_space<span class="Delimiter">);</span>  <span class="Comment">// idempotent</span>
-<span id="L398" class="LineNr">398 </span><span class="Delimiter">:(code)</span>
-<span id="L399" class="LineNr">399 </span><span class="Normal">void</span> check_default_space<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="L400" class="LineNr">400 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Hide_missing_default_space_errors<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// skip previous core tests; this is only for Mu code</span>
-<span id="L401" class="LineNr">401 </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="L402" class="LineNr">402 </span>  <span class="Comment">// End check_default_space Special-cases</span>
-<span id="L403" class="LineNr">403 </span>  <span class="Comment">// assume recipes with only numeric addresses know what they're doing (usually tests)</span>
-<span id="L404" class="LineNr">404 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_non_special_name<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L405" class="LineNr">405 </span>  <a href='003trace.cc.html#L161'>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;--- check that <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; sets default-space&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L406" class="LineNr">406 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L407" class="LineNr">407 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span>
-<span id="L408" class="LineNr">408 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> || caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name != <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L409" class="LineNr">409 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; does not seem to start with 'local-scope' or 'default-space'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L410" class="LineNr">410 </span>  <span class="Delimiter">}</span>
-<span id="L411" class="LineNr">411 </span><span class="Delimiter">}</span>
-<span id="L412" class="LineNr">412 </span><span class="Delimiter">:(after &quot;Load Mu Prelude&quot;)</span>
-<span id="L413" class="LineNr">413 </span>Hide_missing_default_space_errors = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L414" class="LineNr">414 </span><span class="Delimiter">:(after &quot;Test Runs&quot;)</span>
-<span id="L415" class="LineNr">415 </span>Hide_missing_default_space_errors = <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L416" class="LineNr">416 </span><span class="Delimiter">:(after &quot;Running Main&quot;)</span>
-<span id="L417" class="LineNr">417 </span>Hide_missing_default_space_errors = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L418" class="LineNr">418 </span>
-<span id="L419" class="LineNr">419 </span><span class="Delimiter">:(code)</span>
-<span id="L420" class="LineNr">420 </span><span class="Normal">bool</span> contains_non_special_name<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="L421" class="LineNr">421 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">int</span>&gt;::iterator p = Name[r]<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Name[r]<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L422" class="LineNr">422 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L423" class="LineNr">423 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;stash_&quot;</span><span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// generated by rewrite_stashes_to_text (cross-layer)</span>
-<span id="L424" class="LineNr">424 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!is_special_name<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span>
-<span id="L425" class="LineNr">425 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L426" class="LineNr">426 </span>  <span class="Delimiter">}</span>
-<span id="L427" class="LineNr">427 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L428" class="LineNr">428 </span><span class="Delimiter">}</span>
-<span id="L429" class="LineNr">429 </span>
-<span id="L430" class="LineNr">430 </span><span class="Comment">// reagent comparison -- only between reagents in a single recipe</span>
-<span id="L431" class="LineNr">431 </span><span class="Normal">bool</span> <span class="Normal">operator</span>==<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> reagent&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L432" class="LineNr">432 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>name != b<span class="Delimiter">.</span>name<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L433" class="LineNr">433 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>property<span class="Delimiter">(</span>a<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">)</span> != property<span class="Delimiter">(</span>b<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L434" class="LineNr">434 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L435" class="LineNr">435 </span><span class="Delimiter">}</span>
-<span id="L436" class="LineNr">436 </span>
-<span id="L437" class="LineNr">437 </span><span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> reagent&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L438" class="LineNr">438 </span>  <span class="Normal">int</span> aspace = <span class="Constant">0</span><span class="Delimiter">,</span> bspace = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L439" class="LineNr">439 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>a<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">))</span> aspace = <a href='002test.cc.html#L91'>to_integer</a><span class="Delimiter">(</span>property<span class="Delimiter">(</span>a<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">)-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L440" class="LineNr">440 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>b<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">))</span> bspace = <a href='002test.cc.html#L91'>to_integer</a><span class="Delimiter">(</span>property<span class="Delimiter">(</span>b<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">)-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L441" class="LineNr">441 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>aspace != bspace<span class="Delimiter">)</span> <span class="Identifier">return</span> aspace &lt; bspace<span class="Delimiter">;</span>
-<span id="L442" class="LineNr">442 </span>  <span class="Identifier">return</span> a<span class="Delimiter">.</span>name &lt; b<span class="Delimiter">.</span>name<span class="Delimiter">;</span>
-<span id="L443" class="LineNr">443 </span><span class="Delimiter">}</span>
+<span id="L387" class="LineNr">387 </span><span class="muRecipe">def</span> f [
+<span id="L388" class="LineNr">388 </span>  local-scope
+<span id="L389" class="LineNr">389 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L390" class="LineNr">390 </span>  *x:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">12</span>
+<span id="L391" class="LineNr">391 </span>  <span class="Normal">y</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> x:&amp;:num
+<span id="L392" class="LineNr">392 </span>  <span class="Comment"># since y is 'escaping' f, it should not be cleared</span>
+<span id="L393" class="LineNr">393 </span>  <span class="Identifier">return</span> y:foo
+<span id="L394" class="LineNr">394 </span>]
+<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="Constant">1</span>:foo<span class="Special"> &lt;- </span>f
+<span id="L397" class="LineNr">397 </span>  <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>get <span class="Constant">1</span>:foo<span class="Delimiter">,</span> <span class="Constant">x:offset</span>
+<span id="L398" class="LineNr">398 </span>  <span class="Constant">4</span>:&amp;:num<span class="Special"> &lt;- </span>get <span class="Constant">1</span>:foo<span class="Delimiter">,</span> <span class="Constant">y:offset</span>
+<span id="L399" class="LineNr">399 </span>  <span class="Constant">5</span>:num<span class="Special"> &lt;- </span>copy *<span class="Constant">4</span>:&amp;:num
+<span id="L400" class="LineNr">400 </span>  <span class="Constant">1</span>:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> <span class="Constant">1</span>:foo<span class="Delimiter">,</span> <span class="Constant">y:offset</span><span class="Delimiter">,</span> <span class="Constant">0</span>
+<span id="L401" class="LineNr">401 </span>  <span class="Constant">4</span>:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L402" class="LineNr">402 </span>]
+<span id="L403" class="LineNr">403 </span><span class="traceContains">+mem: storing 34 in location 1</span>
+<span id="L404" class="LineNr">404 </span><span class="traceContains">+mem: storing 1006 in location 2</span>
+<span id="L405" class="LineNr">405 </span><span class="traceContains">+mem: storing 34 in location 3</span>
+<span id="L406" class="LineNr">406 </span><span class="Comment"># refcount of 1:foo shouldn't include any stray ones from f</span>
+<span id="L407" class="LineNr">407 </span><span class="traceContains">+run: {4: (&quot;address&quot; &quot;number&quot;)} &lt;- get {1: &quot;foo&quot;}, {y: &quot;offset&quot;}</span>
+<span id="L408" class="LineNr">408 </span><span class="traceContains">+mem: incrementing refcount of 1006: 1 -&gt; 2</span>
+<span id="L409" class="LineNr">409 </span><span class="Comment"># 1:foo wasn't abandoned/cleared</span>
+<span id="L410" class="LineNr">410 </span><span class="traceContains">+run: {5: &quot;number&quot;} &lt;- copy {4: (&quot;address&quot; &quot;number&quot;), &quot;lookup&quot;: ()}</span>
+<span id="L411" class="LineNr">411 </span><span class="traceContains">+mem: storing 12 in location 5</span>
+<span id="L412" class="LineNr">412 </span><span class="traceContains">+run: {1: &quot;foo&quot;} &lt;- <a href='001help.cc.html#L221'>put</a> {1: &quot;foo&quot;}, {y: &quot;offset&quot;}, {0: &quot;literal&quot;}</span>
+<span id="L413" class="LineNr">413 </span><span class="traceContains">+mem: decrementing refcount of 1006: 2 -&gt; 1</span>
+<span id="L414" class="LineNr">414 </span><span class="traceContains">+run: {4: (&quot;address&quot; &quot;number&quot;)} &lt;- copy {0: &quot;literal&quot;}</span>
+<span id="L415" class="LineNr">415 </span><span class="traceContains">+mem: decrementing refcount of 1006: 1 -&gt; 0</span>
+<span id="L416" class="LineNr">416 </span><span class="traceContains">+mem: automatically abandoning 1006</span>
+<span id="L417" class="LineNr">417 </span>
+<span id="L418" class="LineNr">418 </span><span class="Delimiter">:(scenario local_scope_claims_return_values_when_not_saved)</span>
+<span id="L419" class="LineNr">419 </span><span class="muRecipe">def</span> f [
+<span id="L420" class="LineNr">420 </span>  local-scope
+<span id="L421" class="LineNr">421 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L422" class="LineNr">422 </span>  <span class="Identifier">return</span> x:&amp;:num
+<span id="L423" class="LineNr">423 </span>]
+<span id="L424" class="LineNr">424 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L425" class="LineNr">425 </span>  f  <span class="Comment"># doesn't save result</span>
+<span id="L426" class="LineNr">426 </span>]
+<span id="L427" class="LineNr">427 </span><span class="Comment"># x reclaimed</span>
+<span id="L428" class="LineNr">428 </span><span class="traceContains">+mem: automatically abandoning 1004</span>
+<span id="L429" class="LineNr">429 </span><span class="Comment"># f's local scope reclaimed</span>
+<span id="L430" class="LineNr">430 </span><span class="traceContains">+mem: automatically abandoning 1000</span>
+<span id="L431" class="LineNr">431 </span>
+<span id="L432" class="LineNr">432 </span><span class="SalientComment">//:: all recipes must set default-space one way or another</span>
+<span id="L433" class="LineNr">433 </span>
+<span id="L434" class="LineNr">434 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L435" class="LineNr">435 </span><span class="Normal">bool</span> Hide_missing_default_space_errors = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L436" class="LineNr">436 </span><span class="Delimiter">:(before &quot;End Checks&quot;)</span>
+<span id="L437" class="LineNr">437 </span>Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>check_default_space<span class="Delimiter">);</span>  <span class="Comment">// idempotent</span>
+<span id="L438" class="LineNr">438 </span><span class="Delimiter">:(code)</span>
+<span id="L439" class="LineNr">439 </span><span class="Normal">void</span> check_default_space<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="L440" class="LineNr">440 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Hide_missing_default_space_errors<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// skip previous core tests; this is only for Mu code</span>
+<span id="L441" class="LineNr">441 </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="L442" class="LineNr">442 </span>  <span class="Comment">// End check_default_space Special-cases</span>
+<span id="L443" class="LineNr">443 </span>  <span class="Comment">// assume recipes with only numeric addresses know what they're doing (usually tests)</span>
+<span id="L444" class="LineNr">444 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_non_special_name<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L445" class="LineNr">445 </span>  <a href='003trace.cc.html#L161'>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;--- check that <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; sets default-space&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L446" class="LineNr">446 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L447" class="LineNr">447 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!starts_by_setting_default_space<span class="Delimiter">(</span>caller<span class="Delimiter">))</span>
+<span id="L448" class="LineNr">448 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; does not seem to start with 'local-scope' or 'default-space'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L449" class="LineNr">449 </span><span class="Delimiter">}</span>
+<span id="L450" class="LineNr">450 </span><span class="Delimiter">:(after &quot;Load Mu Prelude&quot;)</span>
+<span id="L451" class="LineNr">451 </span>Hide_missing_default_space_errors = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L452" class="LineNr">452 </span><span class="Delimiter">:(after &quot;Test Runs&quot;)</span>
+<span id="L453" class="LineNr">453 </span>Hide_missing_default_space_errors = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L454" class="LineNr">454 </span><span class="Delimiter">:(after &quot;Running Main&quot;)</span>
+<span id="L455" class="LineNr">455 </span>Hide_missing_default_space_errors = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L456" class="LineNr">456 </span>
+<span id="L457" class="LineNr">457 </span><span class="Delimiter">:(code)</span>
+<span id="L458" class="LineNr">458 </span><span class="Normal">bool</span> contains_non_special_name<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="L459" class="LineNr">459 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">int</span>&gt;::iterator p = Name[r]<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Name[r]<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L460" class="LineNr">460 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L461" class="LineNr">461 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;stash_&quot;</span><span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// generated by rewrite_stashes_to_text (cross-layer)</span>
+<span id="L462" class="LineNr">462 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!is_special_name<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span>
+<span id="L463" class="LineNr">463 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L464" class="LineNr">464 </span>  <span class="Delimiter">}</span>
+<span id="L465" class="LineNr">465 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L466" class="LineNr">466 </span><span class="Delimiter">}</span>
+<span id="L467" class="LineNr">467 </span>
+<span id="L468" class="LineNr">468 </span><span class="Comment">// reagent comparison -- only between reagents in a single recipe</span>
+<span id="L469" class="LineNr">469 </span><span class="Normal">bool</span> <span class="Normal">operator</span>==<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> reagent&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L470" class="LineNr">470 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>name != b<span class="Delimiter">.</span>name<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L471" class="LineNr">471 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>property<span class="Delimiter">(</span>a<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">)</span> != property<span class="Delimiter">(</span>b<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L472" class="LineNr">472 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L473" class="LineNr">473 </span><span class="Delimiter">}</span>
+<span id="L474" class="LineNr">474 </span>
+<span id="L475" class="LineNr">475 </span><span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> reagent&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L476" class="LineNr">476 </span>  <span class="Normal">int</span> aspace = <span class="Constant">0</span><span class="Delimiter">,</span> bspace = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L477" class="LineNr">477 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>a<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">))</span> aspace = <a href='002test.cc.html#L91'>to_integer</a><span class="Delimiter">(</span>property<span class="Delimiter">(</span>a<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">)-&gt;</span>value<span class="Delimiter">);</span>
+<span id="L478" class="LineNr">478 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>b<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">))</span> bspace = <a href='002test.cc.html#L91'>to_integer</a><span class="Delimiter">(</span>property<span class="Delimiter">(</span>b<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">)-&gt;</span>value<span class="Delimiter">);</span>
+<span id="L479" class="LineNr">479 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>aspace != bspace<span class="Delimiter">)</span> <span class="Identifier">return</span> aspace &lt; bspace<span class="Delimiter">;</span>
+<span id="L480" class="LineNr">480 </span>  <span class="Identifier">return</span> a<span class="Delimiter">.</span>name &lt; b<span class="Delimiter">.</span>name<span class="Delimiter">;</span>
+<span id="L481" class="LineNr">481 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/044space_surround.cc.html b/html/044space_surround.cc.html
index 524db0d9..f1f007b9 100644
--- a/html/044space_surround.cc.html
+++ b/html/044space_surround.cc.html
@@ -100,15 +100,15 @@ if ('onhashchange' in window) {
 <span id="L37" class="LineNr">37 </span><span class="Comment">//: one.</span>
 <span id="L38" class="LineNr">38 </span>
 <span id="L39" class="LineNr">39 </span><span class="Delimiter">:(replace{} &quot;int space_base(const reagent&amp; x)&quot;)</span>
-<span id="L40" class="LineNr">40 </span><span class="Normal">int</span> space_base<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L41" class="LineNr">41 </span>  <span class="Normal">int</span> base = <a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>default_space ? <span class="Delimiter">(</span><a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>default_space+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">)</span> : <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L42" class="LineNr">42 </span>  <span class="Identifier">return</span> space_base<span class="Delimiter">(</span>x<span class="Delimiter">,</span> space_index<span class="Delimiter">(</span>x<span class="Delimiter">),</span> base<span class="Delimiter">);</span>
+<span id="L40" class="LineNr">40 </span><span class="Normal">int</span> <a href='043space.cc.html#L79'>space_base</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L41" class="LineNr">41 </span>  <span class="Normal">int</span> base = <a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>default_space ? <span class="Delimiter">(</span><a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>default_space+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">)</span> : <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L42" class="LineNr">42 </span>  <span class="Identifier">return</span> <a href='043space.cc.html#L79'>space_base</a><span class="Delimiter">(</span>x<span class="Delimiter">,</span> space_index<span class="Delimiter">(</span>x<span class="Delimiter">),</span> base<span class="Delimiter">);</span>
 <span id="L43" class="LineNr">43 </span><span class="Delimiter">}</span>
 <span id="L44" class="LineNr">44 </span>
-<span id="L45" class="LineNr">45 </span><span class="Normal">int</span> space_base<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">int</span> space_index<span class="Delimiter">,</span> <span class="Normal">int</span> base<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L45" class="LineNr">45 </span><span class="Normal">int</span> <a href='043space.cc.html#L79'>space_base</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">int</span> space_index<span class="Delimiter">,</span> <span class="Normal">int</span> base<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L46" class="LineNr">46 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>space_index == <span class="Constant">0</span><span class="Delimiter">)</span>
 <span id="L47" class="LineNr">47 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> base<span class="Delimiter">;</span>
-<span id="L48" class="LineNr">48 </span>  <span class="Normal">int</span> result = space_base<span class="Delimiter">(</span>x<span class="Delimiter">,</span> space_index-<span class="Constant">1</span><span class="Delimiter">,</span> <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> base+<span class="Comment">/*</span><span class="Comment">skip length</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">))</span>+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L48" class="LineNr">48 </span>  <span class="Normal">int</span> result = <a href='043space.cc.html#L79'>space_base</a><span class="Delimiter">(</span>x<span class="Delimiter">,</span> space_index-<span class="Constant">1</span><span class="Delimiter">,</span> <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> base+<span class="Comment">/*</span><span class="Comment">skip length</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">))</span>+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L49" class="LineNr">49 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L50" class="LineNr">50 </span><span class="Delimiter">}</span>
 <span id="L51" class="LineNr">51 </span>
@@ -116,7 +116,7 @@ if ('onhashchange' in window) {
 <span id="L53" class="LineNr">53 </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>x<span class="Delimiter">.</span>properties<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L54" class="LineNr">54 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>first == <span class="Constant">&quot;space&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L55" class="LineNr">55 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second || x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span>
-<span id="L56" class="LineNr">56 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;/space metadata should take exactly one value in '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L56" class="LineNr">56 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;/space metadata should take exactly one value in '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L57" class="LineNr">57 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <a href='002test.cc.html#L91'>to_integer</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
 <span id="L58" class="LineNr">58 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L59" class="LineNr">59 </span>  <span class="Delimiter">}</span>
diff --git a/html/045closure_name.cc.html b/html/045closure_name.cc.html
index c526cdd9..ad68b75f 100644
--- a/html/045closure_name.cc.html
+++ b/html/045closure_name.cc.html
@@ -65,169 +65,172 @@ if ('onhashchange' in window) {
 <span id="L2" class="LineNr">  2 </span><span class="Comment">//: spaces together. When a variable has a property of /space:1, it looks up</span>
 <span id="L3" class="LineNr">  3 </span><span class="Comment">//: the variable in the chained/surrounding space. /space:2 looks up the</span>
 <span id="L4" class="LineNr">  4 </span><span class="Comment">//: surrounding space of the surrounding space, etc.</span>
-<span id="L5" class="LineNr">  5 </span>
-<span id="L6" class="LineNr">  6 </span><span class="Delimiter">:(scenario closure)</span>
-<span id="L7" class="LineNr">  7 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L8" class="LineNr">  8 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">location:type</span><span class="Delimiter">,</span> <span class="Constant">30</span>
-<span id="L9" class="LineNr">  9 </span>  <span class="Constant">1</span>:space/names:<span class="Normal">new</span>-counter<span class="Special"> &lt;- </span><span class="Normal">new</span>-counter
-<span id="L10" class="LineNr"> 10 </span>  <span class="Constant">2</span>:num/<span class="Special">raw &lt;- </span>increment-counter <span class="Constant">1</span>:space/names:<span class="Normal">new</span>-counter
-<span id="L11" class="LineNr"> 11 </span>  <span class="Constant">3</span>:num/<span class="Special">raw &lt;- </span>increment-counter <span class="Constant">1</span>:space/names:<span class="Normal">new</span>-counter
-<span id="L12" class="LineNr"> 12 </span>]
-<span id="L13" class="LineNr"> 13 </span><span class="muRecipe">def</span> <span class="Normal">new</span>-counter [
-<span id="L14" class="LineNr"> 14 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">location:type</span><span class="Delimiter">,</span> <span class="Constant">30</span>
-<span id="L15" class="LineNr"> 15 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
-<span id="L16" class="LineNr"> 16 </span>  <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3</span>  <span class="Comment"># variable that will be incremented</span>
-<span id="L17" class="LineNr"> 17 </span>  <span class="Identifier">return</span> <span class="Normal">default</span>-space:space
-<span id="L18" class="LineNr"> 18 </span>]
-<span id="L19" class="LineNr"> 19 </span><span class="muRecipe">def</span> increment-counter [
-<span id="L20" class="LineNr"> 20 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">location:type</span><span class="Delimiter">,</span> <span class="Constant">30</span>
-<span id="L21" class="LineNr"> 21 </span>  <span class="Constant">0</span>:space/names:<span class="Normal">new</span>-counter<span class="Special"> &lt;- </span>next-ingredient  <span class="Comment"># outer space must be created by 'new-counter' above</span>
-<span id="L22" class="LineNr"> 22 </span>  <span class="Normal">y</span>:num/space:<span class="Constant">1</span><span class="Special"> &lt;- </span>add y:num/space:<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span>  <span class="Comment"># increment</span>
-<span id="L23" class="LineNr"> 23 </span>  <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">234</span>  <span class="Comment"># dummy</span>
-<span id="L24" class="LineNr"> 24 </span>  <span class="Identifier">return</span> y:num/space:<span class="Constant">1</span>
-<span id="L25" class="LineNr"> 25 </span>]
-<span id="L26" class="LineNr"> 26 </span><span class="traceContains">+name: lexically surrounding space for <a href='010vm.cc.html#L19'>recipe</a> increment-counter comes from new-counter</span>
-<span id="L27" class="LineNr"> 27 </span><span class="traceContains">+mem: storing 5 in location 3</span>
-<span id="L28" class="LineNr"> 28 </span>
-<span id="L29" class="LineNr"> 29 </span><span class="Comment">//: To make this work, compute the recipe that provides names for the</span>
-<span id="L30" class="LineNr"> 30 </span><span class="Comment">//: surrounding space of each recipe.</span>
+<span id="L5" class="LineNr">  5 </span><span class="Comment">//:</span>
+<span id="L6" class="LineNr">  6 </span><span class="Comment">//: todo: warn on default-space abuse. default-space for one function should</span>
+<span id="L7" class="LineNr">  7 </span><span class="Comment">//: never come from another, otherwise memory will be corrupted.</span>
+<span id="L8" class="LineNr">  8 </span>
+<span id="L9" class="LineNr">  9 </span><span class="Delimiter">:(scenario closure)</span>
+<span id="L10" class="LineNr"> 10 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L11" class="LineNr"> 11 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">location:type</span><span class="Delimiter">,</span> <span class="Constant">30</span>
+<span id="L12" class="LineNr"> 12 </span>  <span class="Constant">1</span>:space/names:<span class="Normal">new</span>-counter<span class="Special"> &lt;- </span><span class="Normal">new</span>-counter
+<span id="L13" class="LineNr"> 13 </span>  <span class="Constant">2</span>:num/<span class="Special">raw &lt;- </span>increment-counter <span class="Constant">1</span>:space/names:<span class="Normal">new</span>-counter
+<span id="L14" class="LineNr"> 14 </span>  <span class="Constant">3</span>:num/<span class="Special">raw &lt;- </span>increment-counter <span class="Constant">1</span>:space/names:<span class="Normal">new</span>-counter
+<span id="L15" class="LineNr"> 15 </span>]
+<span id="L16" class="LineNr"> 16 </span><span class="muRecipe">def</span> <span class="Normal">new</span>-counter [
+<span id="L17" class="LineNr"> 17 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">location:type</span><span class="Delimiter">,</span> <span class="Constant">30</span>
+<span id="L18" class="LineNr"> 18 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
+<span id="L19" class="LineNr"> 19 </span>  <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3</span>  <span class="Comment"># variable that will be incremented</span>
+<span id="L20" class="LineNr"> 20 </span>  <span class="Identifier">return</span> <span class="Normal">default</span>-space:space
+<span id="L21" class="LineNr"> 21 </span>]
+<span id="L22" class="LineNr"> 22 </span><span class="muRecipe">def</span> increment-counter [
+<span id="L23" class="LineNr"> 23 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">location:type</span><span class="Delimiter">,</span> <span class="Constant">30</span>
+<span id="L24" class="LineNr"> 24 </span>  <span class="Constant">0</span>:space/names:<span class="Normal">new</span>-counter<span class="Special"> &lt;- </span>next-ingredient  <span class="Comment"># outer space must be created by 'new-counter' above</span>
+<span id="L25" class="LineNr"> 25 </span>  <span class="Normal">y</span>:num/space:<span class="Constant">1</span><span class="Special"> &lt;- </span>add y:num/space:<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span>  <span class="Comment"># increment</span>
+<span id="L26" class="LineNr"> 26 </span>  <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">234</span>  <span class="Comment"># dummy</span>
+<span id="L27" class="LineNr"> 27 </span>  <span class="Identifier">return</span> y:num/space:<span class="Constant">1</span>
+<span id="L28" class="LineNr"> 28 </span>]
+<span id="L29" class="LineNr"> 29 </span><span class="traceContains">+name: lexically surrounding space for <a href='010vm.cc.html#L19'>recipe</a> increment-counter comes from new-counter</span>
+<span id="L30" class="LineNr"> 30 </span><span class="traceContains">+mem: storing 5 in location 3</span>
 <span id="L31" class="LineNr"> 31 </span>
-<span id="L32" class="LineNr"> 32 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L33" class="LineNr"> 33 </span>map&lt;recipe_ordinal<span class="Delimiter">,</span> recipe_ordinal&gt; Surrounding_space<span class="Delimiter">;</span>
+<span id="L32" class="LineNr"> 32 </span><span class="Comment">//: To make this work, compute the recipe that provides names for the</span>
+<span id="L33" class="LineNr"> 33 </span><span class="Comment">//: surrounding space of each recipe.</span>
 <span id="L34" class="LineNr"> 34 </span>
-<span id="L35" class="LineNr"> 35 </span><span class="Delimiter">:(before &quot;Transform.push_back(transform_names)&quot;)</span>
-<span id="L36" class="LineNr"> 36 </span>Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='045closure_name.cc.html#L39'>collect_surrounding_spaces</a><span class="Delimiter">);</span>  <span class="Comment">// idempotent</span>
+<span id="L35" class="LineNr"> 35 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L36" class="LineNr"> 36 </span>map&lt;recipe_ordinal<span class="Delimiter">,</span> recipe_ordinal&gt; Surrounding_space<span class="Delimiter">;</span>
 <span id="L37" class="LineNr"> 37 </span>
-<span id="L38" class="LineNr"> 38 </span><span class="Delimiter">:(code)</span>
-<span id="L39" class="LineNr"> 39 </span><span class="Normal">void</span> <a href='045closure_name.cc.html#L39'>collect_surrounding_spaces</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="L40" class="LineNr"> 40 </span>  <a href='003trace.cc.html#L161'>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;--- collect surrounding spaces for <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#L197'>end</a><span class="Delimiter">();</span>
-<span id="L41" class="LineNr"> 41 </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>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L42" class="LineNr"> 42 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> instruction&amp; inst = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L43" class="LineNr"> 43 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>is_label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L44" class="LineNr"> 44 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L45" class="LineNr"> 45 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L46" class="LineNr"> 46 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">).</span>name != <span class="Constant">&quot;0&quot;</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L47" class="LineNr"> 47 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!is_space<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L48" class="LineNr"> 48 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;slot 0 should always have type address:array:location, but is '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<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#L197'>end</a><span class="Delimiter">();</span>
-<span id="L49" class="LineNr"> 49 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L50" class="LineNr"> 50 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L51" class="LineNr"> 51 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> string_tree* s = property<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">),</span> <span class="Constant">&quot;names&quot;</span><span class="Delimiter">);</span>
-<span id="L52" class="LineNr"> 52 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L53" class="LineNr"> 53 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;slot 0 requires a /names property in <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; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L54" class="LineNr"> 54 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L55" class="LineNr"> 55 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L56" class="LineNr"> 56 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!s<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;slot 0 should have a single value in /names, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<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#L197'>end</a><span class="Delimiter">();</span>
-<span id="L57" class="LineNr"> 57 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">const</span> string&amp; surrounding_recipe_name = s<span class="Delimiter">-&gt;</span>value<span class="Delimiter">;</span>
-<span id="L58" class="LineNr"> 58 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>surrounding_recipe_name<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L59" class="LineNr"> 59 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;slot 0 doesn't initialize its /names property in recipe '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L60" class="LineNr"> 60 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L61" class="LineNr"> 61 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L62" class="LineNr"> 62 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Surrounding_space<span class="Delimiter">,</span> r<span class="Delimiter">)</span>
-<span id="L63" class="LineNr"> 63 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> &amp;&amp; get<span class="Delimiter">(</span>Surrounding_space<span class="Delimiter">,</span> r<span class="Delimiter">)</span> != get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> surrounding_recipe_name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L64" class="LineNr"> 64 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;recipe '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' can have only one 'surrounding' <a href='010vm.cc.html#L19'>recipe</a> but has '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Surrounding_space<span class="Delimiter">,</span> r<span class="Delimiter">)).</span>name &lt;&lt; <span class="Constant">&quot;' and '&quot;</span> &lt;&lt; surrounding_recipe_name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L65" class="LineNr"> 65 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L66" class="LineNr"> 66 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L67" class="LineNr"> 67 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;name&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;lexically surrounding space for <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; <span class="Constant">&quot; comes from &quot;</span> &lt;&lt; surrounding_recipe_name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L68" class="LineNr"> 68 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> surrounding_recipe_name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L69" class="LineNr"> 69 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;can't find recipe providing surrounding space for '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'; looking for '&quot;</span> &lt;&lt; surrounding_recipe_name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L70" class="LineNr"> 70 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L71" class="LineNr"> 71 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L72" class="LineNr"> 72 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Surrounding_space<span class="Delimiter">,</span> r<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> surrounding_recipe_name<span class="Delimiter">));</span>
-<span id="L73" class="LineNr"> 73 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L74" class="LineNr"> 74 </span>  <span class="Delimiter">}</span>
-<span id="L75" class="LineNr"> 75 </span><span class="Delimiter">}</span>
-<span id="L76" class="LineNr"> 76 </span>
-<span id="L77" class="LineNr"> 77 </span><span class="Comment">//: Once surrounding spaces are available, transform_names uses them to handle</span>
-<span id="L78" class="LineNr"> 78 </span><span class="Comment">//: /space properties.</span>
+<span id="L38" class="LineNr"> 38 </span><span class="Delimiter">:(before &quot;Transform.push_back(transform_names)&quot;)</span>
+<span id="L39" class="LineNr"> 39 </span>Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='045closure_name.cc.html#L42'>collect_surrounding_spaces</a><span class="Delimiter">);</span>  <span class="Comment">// idempotent</span>
+<span id="L40" class="LineNr"> 40 </span>
+<span id="L41" class="LineNr"> 41 </span><span class="Delimiter">:(code)</span>
+<span id="L42" class="LineNr"> 42 </span><span class="Normal">void</span> <a href='045closure_name.cc.html#L42'>collect_surrounding_spaces</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="L43" class="LineNr"> 43 </span>  <a href='003trace.cc.html#L161'>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;--- collect surrounding spaces for <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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L44" class="LineNr"> 44 </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>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L45" class="LineNr"> 45 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> instruction&amp; inst = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L46" class="LineNr"> 46 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>is_label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L47" class="LineNr"> 47 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L48" class="LineNr"> 48 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L49" class="LineNr"> 49 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">).</span>name != <span class="Constant">&quot;0&quot;</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L50" class="LineNr"> 50 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_space<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
+<span id="L51" class="LineNr"> 51 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;slot 0 should always have type <a href='043space.cc.html#L83'>address</a>:array:location, but is '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L53" class="LineNr"> 53 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L54" class="LineNr"> 54 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> string_tree* s = property<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">),</span> <span class="Constant">&quot;names&quot;</span><span class="Delimiter">);</span>
+<span id="L55" class="LineNr"> 55 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L56" class="LineNr"> 56 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;slot 0 requires a /names property in <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; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L57" class="LineNr"> 57 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L58" class="LineNr"> 58 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L59" class="LineNr"> 59 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!s<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;slot 0 should have a single value in /names, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L60" class="LineNr"> 60 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">const</span> string&amp; surrounding_recipe_name = s<span class="Delimiter">-&gt;</span>value<span class="Delimiter">;</span>
+<span id="L61" class="LineNr"> 61 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>surrounding_recipe_name<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L62" class="LineNr"> 62 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;slot 0 doesn't initialize its /names property in recipe '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L63" class="LineNr"> 63 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L64" class="LineNr"> 64 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L65" class="LineNr"> 65 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Surrounding_space<span class="Delimiter">,</span> r<span class="Delimiter">)</span>
+<span id="L66" class="LineNr"> 66 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> &amp;&amp; get<span class="Delimiter">(</span>Surrounding_space<span class="Delimiter">,</span> r<span class="Delimiter">)</span> != get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> surrounding_recipe_name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L67" class="LineNr"> 67 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;recipe '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' can have only one 'surrounding' <a href='010vm.cc.html#L19'>recipe</a> but has '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Surrounding_space<span class="Delimiter">,</span> r<span class="Delimiter">)).</span>name &lt;&lt; <span class="Constant">&quot;' and '&quot;</span> &lt;&lt; surrounding_recipe_name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L68" class="LineNr"> 68 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L69" class="LineNr"> 69 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L70" class="LineNr"> 70 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;name&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;lexically surrounding space for <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; <span class="Constant">&quot; comes from &quot;</span> &lt;&lt; surrounding_recipe_name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L71" class="LineNr"> 71 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> surrounding_recipe_name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;can't find recipe providing surrounding space for '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'; looking for '&quot;</span> &lt;&lt; surrounding_recipe_name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L73" class="LineNr"> 73 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L74" class="LineNr"> 74 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L75" class="LineNr"> 75 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Surrounding_space<span class="Delimiter">,</span> r<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> surrounding_recipe_name<span class="Delimiter">));</span>
+<span id="L76" class="LineNr"> 76 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L77" class="LineNr"> 77 </span>  <span class="Delimiter">}</span>
+<span id="L78" class="LineNr"> 78 </span><span class="Delimiter">}</span>
 <span id="L79" class="LineNr"> 79 </span>
-<span id="L80" class="LineNr"> 80 </span><span class="Delimiter">:(replace{} &quot;int lookup_name(const reagent&amp; r, const <a href='010vm.cc.html#L14'>recipe_ordinal</a> default_recipe)&quot;)</span>
-<span id="L81" class="LineNr"> 81 </span><span class="Normal">int</span> lookup_name<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> default_recipe<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L82" class="LineNr"> 82 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_property<span class="Delimiter">(</span>x<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L83" class="LineNr"> 83 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>Name[default_recipe]<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;name not found: &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L84" class="LineNr"> 84 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> Name[default_recipe][x<span class="Delimiter">.</span>name]<span class="Delimiter">;</span>
-<span id="L85" class="LineNr"> 85 </span>  <span class="Delimiter">}</span>
-<span id="L86" class="LineNr"> 86 </span>  string_tree* p = property<span class="Delimiter">(</span>x<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">);</span>
-<span id="L87" class="LineNr"> 87 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!p || !p<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;/space property should have exactly one (non-negative integer) value</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L88" class="LineNr"> 88 </span>  <span class="Normal">int</span> n = <a href='002test.cc.html#L91'>to_integer</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L89" class="LineNr"> 89 </span>  assert<span class="Delimiter">(</span>n &gt;= <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L90" class="LineNr"> 90 </span>  <a href='010vm.cc.html#L14'>recipe_ordinal</a> surrounding_recipe = <a href='045closure_name.cc.html#L116'>lookup_surrounding_recipe</a><span class="Delimiter">(</span>default_recipe<span class="Delimiter">,</span> n<span class="Delimiter">);</span>
-<span id="L91" class="LineNr"> 91 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>surrounding_recipe == -<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">return</span> -<span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L92" class="LineNr"> 92 </span>  set&lt;recipe_ordinal&gt; done<span class="Delimiter">;</span>
-<span id="L93" class="LineNr"> 93 </span>  vector&lt;recipe_ordinal&gt; path<span class="Delimiter">;</span>
-<span id="L94" class="LineNr"> 94 </span>  <span class="Identifier">return</span> lookup_name<span class="Delimiter">(</span>x<span class="Delimiter">,</span> surrounding_recipe<span class="Delimiter">,</span> done<span class="Delimiter">,</span> path<span class="Delimiter">);</span>
-<span id="L95" class="LineNr"> 95 </span><span class="Delimiter">}</span>
-<span id="L96" class="LineNr"> 96 </span>
-<span id="L97" class="LineNr"> 97 </span><span class="Comment">// If the recipe we need to lookup this name in doesn't have names done yet,</span>
-<span id="L98" class="LineNr"> 98 </span><span class="Comment">// recursively call transform_names on it.</span>
-<span id="L99" class="LineNr"> 99 </span><span class="Normal">int</span> lookup_name<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">,</span> set&lt;recipe_ordinal&gt;&amp; done<span class="Delimiter">,</span> vector&lt;recipe_ordinal&gt;&amp; path<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L100" class="LineNr">100 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Name[r]<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> Name[r][x<span class="Delimiter">.</span>name]<span class="Delimiter">;</span>
-<span id="L101" class="LineNr">101 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>done<span class="Delimiter">,</span> r<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L102" class="LineNr">102 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;can't compute address of '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' because</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L103" class="LineNr">103 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>path<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L104" class="LineNr">104 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; path<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i-<span class="Constant">1</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; requires computing names of &quot;</span> &lt;&lt; path<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L105" class="LineNr">105 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L106" class="LineNr">106 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; path<span class="Delimiter">.</span>at<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>path<span class="Delimiter">)</span>-<span class="Constant">1</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; requires computing names of &quot;</span> &lt;&lt; r &lt;&lt; <span class="Constant">&quot;..ad infinitum</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L107" class="LineNr">107 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> -<span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L108" class="LineNr">108 </span>  <span class="Delimiter">}</span>
-<span id="L109" class="LineNr">109 </span>  done<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>r<span class="Delimiter">);</span>
-<span id="L110" class="LineNr">110 </span>  path<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>r<span class="Delimiter">);</span>
-<span id="L111" class="LineNr">111 </span>  <a href='042name.cc.html#L37'>transform_names</a><span class="Delimiter">(</span>r<span class="Delimiter">);</span>  <span class="Comment">// Not passing 'done' through. Might this somehow cause an infinite loop?</span>
-<span id="L112" class="LineNr">112 </span>  assert<span class="Delimiter">(</span>!Name[r]<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L113" class="LineNr">113 </span>  <span class="Identifier">return</span> Name[r][x<span class="Delimiter">.</span>name]<span class="Delimiter">;</span>
-<span id="L114" class="LineNr">114 </span><span class="Delimiter">}</span>
-<span id="L115" class="LineNr">115 </span>
-<span id="L116" class="LineNr">116 </span><a href='010vm.cc.html#L14'>recipe_ordinal</a> <a href='045closure_name.cc.html#L116'>lookup_surrounding_recipe</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> n<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L117" class="LineNr">117 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>n == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> r<span class="Delimiter">;</span>
-<span id="L118" class="LineNr">118 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Surrounding_space<span class="Delimiter">,</span> r<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L119" class="LineNr">119 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;don't know surrounding recipe of '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L120" class="LineNr">120 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> -<span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L121" class="LineNr">121 </span>  <span class="Delimiter">}</span>
-<span id="L122" class="LineNr">122 </span>  assert<span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Surrounding_space<span class="Delimiter">,</span> r<span class="Delimiter">));</span>
-<span id="L123" class="LineNr">123 </span>  <span class="Identifier">return</span> <a href='045closure_name.cc.html#L116'>lookup_surrounding_recipe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Surrounding_space<span class="Delimiter">,</span> r<span class="Delimiter">),</span> n-<span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L124" class="LineNr">124 </span><span class="Delimiter">}</span>
-<span id="L125" class="LineNr">125 </span>
-<span id="L126" class="LineNr">126 </span><span class="Comment">//: weaken use-before-set detection just a tad</span>
-<span id="L127" class="LineNr">127 </span><span class="Delimiter">:(replace{} &quot;bool already_transformed(const reagent&amp; r, const map&lt;string, int&gt;&amp; names)&quot;)</span>
-<span id="L128" class="LineNr">128 </span><span class="Normal">bool</span> already_transformed<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">int</span>&gt;&amp; names<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L129" class="LineNr">129 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L130" class="LineNr">130 </span>  <span class="Conceal">¦</span> string_tree* p = property<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">);</span>
-<span id="L131" class="LineNr">131 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!p || !p<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L132" class="LineNr">132 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;/space property should have exactly one (non-negative integer) value in '&quot;</span> &lt;&lt; r<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L133" class="LineNr">133 </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="L134" class="LineNr">134 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L135" class="LineNr">135 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>value != <span class="Constant">&quot;0&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L136" class="LineNr">136 </span>  <span class="Delimiter">}</span>
-<span id="L137" class="LineNr">137 </span>  <span class="Identifier">return</span> contains_key<span class="Delimiter">(</span>names<span class="Delimiter">,</span> r<span class="Delimiter">.</span>name<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="Delimiter">:(scenario missing_surrounding_space)</span>
-<span id="L141" class="LineNr">141 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L142" class="LineNr">142 </span><span class="muRecipe">def</span> f [
-<span id="L143" class="LineNr">143 </span>  local-scope
-<span id="L144" class="LineNr">144 </span>  <span class="Normal">x</span>:num/space:<span class="Constant">1</span><span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L145" class="LineNr">145 </span>]
-<span id="L146" class="LineNr">146 </span><span class="traceContains">+error: don't know surrounding recipe of 'f'</span>
-<span id="L147" class="LineNr">147 </span><span class="traceContains">+error: f: can't find a place to store 'x'</span>
-<span id="L148" class="LineNr">148 </span>
-<span id="L149" class="LineNr">149 </span><span class="Comment">//: extra test for try_reclaim_locals() from previous layers</span>
-<span id="L150" class="LineNr">150 </span><span class="Delimiter">:(scenario local_scope_ignores_nonlocal_spaces)</span>
-<span id="L151" class="LineNr">151 </span><span class="muRecipe">def</span> <span class="Normal">new</span>-scope [
-<span id="L152" class="LineNr">152 </span>  <span class="Normal">new</span>-<span class="Normal">default</span>-space
-<span id="L153" class="LineNr">153 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L154" class="LineNr">154 </span>  *x:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L155" class="LineNr">155 </span>  <span class="Identifier">return</span> <span class="Normal">default</span>-space:space
-<span id="L156" class="LineNr">156 </span>]
-<span id="L157" class="LineNr">157 </span><span class="muRecipe">def</span> use-scope [
-<span id="L158" class="LineNr">158 </span>  local-scope
-<span id="L159" class="LineNr">159 </span>  <span class="Normal">outer</span>:space<span class="Special"> &lt;- </span>next-ingredient
-<span id="L160" class="LineNr">160 </span>  <span class="Constant">0</span>:space/names:<span class="Normal">new</span>-scope<span class="Special"> &lt;- </span>copy outer:space
-<span id="L161" class="LineNr">161 </span>  <span class="Identifier">return</span> *x:&amp;:num/space:<span class="Constant">1</span>
-<span id="L162" class="LineNr">162 </span>]
-<span id="L163" class="LineNr">163 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L164" class="LineNr">164 </span>  <span class="Constant">1</span>:space/<span class="Special">raw &lt;- </span><span class="Normal">new</span>-scope
-<span id="L165" class="LineNr">165 </span>  <span class="Constant">2</span>:num/<span class="Special">raw &lt;- </span>use-scope <span class="Constant">1</span>:space/<span class="Special">raw</span>
-<span id="L166" class="LineNr">166 </span>]
-<span id="L167" class="LineNr">167 </span><span class="traceContains">+mem: storing 34 in location 2</span>
+<span id="L80" class="LineNr"> 80 </span><span class="Comment">//: Once surrounding spaces are available, transform_names uses them to handle</span>
+<span id="L81" class="LineNr"> 81 </span><span class="Comment">//: /space properties.</span>
+<span id="L82" class="LineNr"> 82 </span>
+<span id="L83" class="LineNr"> 83 </span><span class="Delimiter">:(replace{} &quot;int lookup_name(const reagent&amp; r, const <a href='010vm.cc.html#L14'>recipe_ordinal</a> default_recipe)&quot;)</span>
+<span id="L84" class="LineNr"> 84 </span><span class="Normal">int</span> lookup_name<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> default_recipe<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L85" class="LineNr"> 85 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_property<span class="Delimiter">(</span>x<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L86" class="LineNr"> 86 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>Name[default_recipe]<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;name not found: &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L87" class="LineNr"> 87 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> Name[default_recipe][x<span class="Delimiter">.</span>name]<span class="Delimiter">;</span>
+<span id="L88" class="LineNr"> 88 </span>  <span class="Delimiter">}</span>
+<span id="L89" class="LineNr"> 89 </span>  string_tree* p = property<span class="Delimiter">(</span>x<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">);</span>
+<span id="L90" class="LineNr"> 90 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!p || !p<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;/space property should have exactly one (non-negative integer) value</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L91" class="LineNr"> 91 </span>  <span class="Normal">int</span> n = <a href='002test.cc.html#L91'>to_integer</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
+<span id="L92" class="LineNr"> 92 </span>  assert<span class="Delimiter">(</span>n &gt;= <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L93" class="LineNr"> 93 </span>  <a href='010vm.cc.html#L14'>recipe_ordinal</a> surrounding_recipe = <a href='045closure_name.cc.html#L119'>lookup_surrounding_recipe</a><span class="Delimiter">(</span>default_recipe<span class="Delimiter">,</span> n<span class="Delimiter">);</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>surrounding_recipe == -<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">return</span> -<span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L95" class="LineNr"> 95 </span>  set&lt;recipe_ordinal&gt; done<span class="Delimiter">;</span>
+<span id="L96" class="LineNr"> 96 </span>  vector&lt;recipe_ordinal&gt; path<span class="Delimiter">;</span>
+<span id="L97" class="LineNr"> 97 </span>  <span class="Identifier">return</span> lookup_name<span class="Delimiter">(</span>x<span class="Delimiter">,</span> surrounding_recipe<span class="Delimiter">,</span> done<span class="Delimiter">,</span> path<span class="Delimiter">);</span>
+<span id="L98" class="LineNr"> 98 </span><span class="Delimiter">}</span>
+<span id="L99" class="LineNr"> 99 </span>
+<span id="L100" class="LineNr">100 </span><span class="Comment">// If the recipe we need to lookup this name in doesn't have names done yet,</span>
+<span id="L101" class="LineNr">101 </span><span class="Comment">// recursively call transform_names on it.</span>
+<span id="L102" class="LineNr">102 </span><span class="Normal">int</span> lookup_name<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">,</span> set&lt;recipe_ordinal&gt;&amp; done<span class="Delimiter">,</span> vector&lt;recipe_ordinal&gt;&amp; path<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Name[r]<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> Name[r][x<span class="Delimiter">.</span>name]<span class="Delimiter">;</span>
+<span id="L104" class="LineNr">104 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>done<span class="Delimiter">,</span> r<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L105" class="LineNr">105 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;can't compute address of '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' because</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L106" class="LineNr">106 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>path<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L107" class="LineNr">107 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; path<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i-<span class="Constant">1</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; requires computing names of &quot;</span> &lt;&lt; path<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L108" class="LineNr">108 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L109" class="LineNr">109 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; path<span class="Delimiter">.</span>at<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>path<span class="Delimiter">)</span>-<span class="Constant">1</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; requires computing names of &quot;</span> &lt;&lt; r &lt;&lt; <span class="Constant">&quot;..ad infinitum</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L110" class="LineNr">110 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> -<span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L111" class="LineNr">111 </span>  <span class="Delimiter">}</span>
+<span id="L112" class="LineNr">112 </span>  done<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>r<span class="Delimiter">);</span>
+<span id="L113" class="LineNr">113 </span>  path<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>r<span class="Delimiter">);</span>
+<span id="L114" class="LineNr">114 </span>  <a href='042name.cc.html#L37'>transform_names</a><span class="Delimiter">(</span>r<span class="Delimiter">);</span>  <span class="Comment">// Not passing 'done' through. Might this somehow cause an infinite loop?</span>
+<span id="L115" class="LineNr">115 </span>  assert<span class="Delimiter">(</span>!Name[r]<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L116" class="LineNr">116 </span>  <span class="Identifier">return</span> Name[r][x<span class="Delimiter">.</span>name]<span class="Delimiter">;</span>
+<span id="L117" class="LineNr">117 </span><span class="Delimiter">}</span>
+<span id="L118" class="LineNr">118 </span>
+<span id="L119" class="LineNr">119 </span><a href='010vm.cc.html#L14'>recipe_ordinal</a> <a href='045closure_name.cc.html#L119'>lookup_surrounding_recipe</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> n<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L120" class="LineNr">120 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>n == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> r<span class="Delimiter">;</span>
+<span id="L121" class="LineNr">121 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Surrounding_space<span class="Delimiter">,</span> r<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L122" class="LineNr">122 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;don't know surrounding recipe of '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L123" class="LineNr">123 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> -<span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L124" class="LineNr">124 </span>  <span class="Delimiter">}</span>
+<span id="L125" class="LineNr">125 </span>  assert<span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Surrounding_space<span class="Delimiter">,</span> r<span class="Delimiter">));</span>
+<span id="L126" class="LineNr">126 </span>  <span class="Identifier">return</span> <a href='045closure_name.cc.html#L119'>lookup_surrounding_recipe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Surrounding_space<span class="Delimiter">,</span> r<span class="Delimiter">),</span> n-<span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L127" class="LineNr">127 </span><span class="Delimiter">}</span>
+<span id="L128" class="LineNr">128 </span>
+<span id="L129" class="LineNr">129 </span><span class="Comment">//: weaken use-before-set detection just a tad</span>
+<span id="L130" class="LineNr">130 </span><span class="Delimiter">:(replace{} &quot;bool already_transformed(const reagent&amp; r, const map&lt;string, int&gt;&amp; names)&quot;)</span>
+<span id="L131" class="LineNr">131 </span><span class="Normal">bool</span> already_transformed<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">int</span>&gt;&amp; names<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L132" class="LineNr">132 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L133" class="LineNr">133 </span>  <span class="Conceal">¦</span> string_tree* p = property<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">);</span>
+<span id="L134" class="LineNr">134 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!p || !p<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L135" class="LineNr">135 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;/space property should have exactly one (non-negative integer) value in '&quot;</span> &lt;&lt; r<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L136" class="LineNr">136 </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="L137" class="LineNr">137 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L138" class="LineNr">138 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>value != <span class="Constant">&quot;0&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L139" class="LineNr">139 </span>  <span class="Delimiter">}</span>
+<span id="L140" class="LineNr">140 </span>  <span class="Identifier">return</span> contains_key<span class="Delimiter">(</span>names<span class="Delimiter">,</span> r<span class="Delimiter">.</span>name<span class="Delimiter">);</span>
+<span id="L141" class="LineNr">141 </span><span class="Delimiter">}</span>
+<span id="L142" class="LineNr">142 </span>
+<span id="L143" class="LineNr">143 </span><span class="Delimiter">:(scenario missing_surrounding_space)</span>
+<span id="L144" class="LineNr">144 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L145" class="LineNr">145 </span><span class="muRecipe">def</span> f [
+<span id="L146" class="LineNr">146 </span>  local-scope
+<span id="L147" class="LineNr">147 </span>  <span class="Normal">x</span>:num/space:<span class="Constant">1</span><span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L148" class="LineNr">148 </span>]
+<span id="L149" class="LineNr">149 </span><span class="traceContains">+error: don't know surrounding recipe of 'f'</span>
+<span id="L150" class="LineNr">150 </span><span class="traceContains">+error: f: can't find a place to store 'x'</span>
+<span id="L151" class="LineNr">151 </span>
+<span id="L152" class="LineNr">152 </span><span class="Comment">//: extra test for try_reclaim_locals() from previous layers</span>
+<span id="L153" class="LineNr">153 </span><span class="Delimiter">:(scenario local_scope_ignores_nonlocal_spaces)</span>
+<span id="L154" class="LineNr">154 </span><span class="muRecipe">def</span> <span class="Normal">new</span>-scope [
+<span id="L155" class="LineNr">155 </span>  local-scope
+<span id="L156" class="LineNr">156 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L157" class="LineNr">157 </span>  *x:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L158" class="LineNr">158 </span>  <span class="Identifier">return</span> <span class="Normal">default</span>-space:space
+<span id="L159" class="LineNr">159 </span>]
+<span id="L160" class="LineNr">160 </span><span class="muRecipe">def</span> use-scope [
+<span id="L161" class="LineNr">161 </span>  local-scope
+<span id="L162" class="LineNr">162 </span>  <span class="Normal">outer</span>:space/names:<span class="Normal">new</span>-scope<span class="Special"> &lt;- </span>next-ingredient
+<span id="L163" class="LineNr">163 </span>  <span class="Constant">0</span>:space/names:<span class="Normal">new</span>-scope<span class="Special"> &lt;- </span>copy outer:space
+<span id="L164" class="LineNr">164 </span>  <span class="Identifier">return</span> *x:&amp;:num/space:<span class="Constant">1</span>
+<span id="L165" class="LineNr">165 </span>]
+<span id="L166" class="LineNr">166 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L167" class="LineNr">167 </span>  <span class="Constant">1</span>:space/<span class="Special">raw &lt;- </span><span class="Normal">new</span>-scope
+<span id="L168" class="LineNr">168 </span>  <span class="Constant">2</span>:num/<span class="Special">raw &lt;- </span>use-scope <span class="Constant">1</span>:space/<span class="Special">raw</span>
+<span id="L169" class="LineNr">169 </span>]
+<span id="L170" class="LineNr">170 </span><span class="traceContains">+mem: storing 34 in location 2</span>
 </pre>
 </body>
 </html>
diff --git a/html/046check_type_by_name.cc.html b/html/046check_type_by_name.cc.html
index 929b7efd..2003837b 100644
--- a/html/046check_type_by_name.cc.html
+++ b/html/046check_type_by_name.cc.html
@@ -89,138 +89,147 @@ if ('onhashchange' in window) {
 <span id="L25" class="LineNr"> 25 </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="L26" class="LineNr"> 26 </span>  <span class="Conceal">¦</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="L27" class="LineNr"> 27 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> in = <span class="Constant">0</span><span class="Delimiter">;</span>  in &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L28" class="LineNr"> 28 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='046check_type_by_name.cc.html#L38'>deduce_missing_type</a><span class="Delimiter">(</span>known<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L29" class="LineNr"> 29 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='046check_type_by_name.cc.html#L49'>check_type</a><span class="Delimiter">(</span>known<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>in<span class="Delimiter">),</span> caller<span class="Delimiter">);</span>
+<span id="L28" class="LineNr"> 28 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='046check_type_by_name.cc.html#L38'>deduce_missing_type</a><span class="Delimiter">(</span>known<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>in<span class="Delimiter">),</span> caller<span class="Delimiter">);</span>
+<span id="L29" class="LineNr"> 29 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='046check_type_by_name.cc.html#L58'>check_type</a><span class="Delimiter">(</span>known<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>in<span class="Delimiter">),</span> caller<span class="Delimiter">);</span>
 <span id="L30" class="LineNr"> 30 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L31" class="LineNr"> 31 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> out = <span class="Constant">0</span><span class="Delimiter">;</span>  out &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L32" class="LineNr"> 32 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='046check_type_by_name.cc.html#L38'>deduce_missing_type</a><span class="Delimiter">(</span>known<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>out<span class="Delimiter">));</span>
-<span id="L33" class="LineNr"> 33 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='046check_type_by_name.cc.html#L49'>check_type</a><span class="Delimiter">(</span>known<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>out<span class="Delimiter">),</span> caller<span class="Delimiter">);</span>
+<span id="L32" class="LineNr"> 32 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='046check_type_by_name.cc.html#L38'>deduce_missing_type</a><span class="Delimiter">(</span>known<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>out<span class="Delimiter">),</span> caller<span class="Delimiter">);</span>
+<span id="L33" class="LineNr"> 33 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='046check_type_by_name.cc.html#L58'>check_type</a><span class="Delimiter">(</span>known<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>out<span class="Delimiter">),</span> caller<span class="Delimiter">);</span>
 <span id="L34" class="LineNr"> 34 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Delimiter">}</span>
 <span id="L36" class="LineNr"> 36 </span><span class="Delimiter">}</span>
 <span id="L37" class="LineNr"> 37 </span>
-<span id="L38" class="LineNr"> 38 </span><span class="Normal">void</span> <a href='046check_type_by_name.cc.html#L38'>deduce_missing_type</a><span class="Delimiter">(</span>set&lt;reagent&gt;&amp; known<span class="Delimiter">,</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L38" class="LineNr"> 38 </span><span class="Normal">void</span> <a href='046check_type_by_name.cc.html#L38'>deduce_missing_type</a><span class="Delimiter">(</span>set&lt;reagent&gt;&amp; known<span class="Delimiter">,</span> reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; caller<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L39" class="LineNr"> 39 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L40" class="LineNr"> 40 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='041jump_target.cc.html#L11'>is_jump_target</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L41" class="LineNr"> 41 </span>  <span class="Conceal">¦</span> x<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;label&quot;</span><span class="Delimiter">);</span>
 <span id="L42" class="LineNr"> 42 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L43" class="LineNr"> 43 </span>  <span class="Delimiter">}</span>
 <span id="L44" class="LineNr"> 44 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>known<span class="Delimiter">.</span>find<span class="Delimiter">(</span>x<span class="Delimiter">)</span> == known<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L45" class="LineNr"> 45 </span>  x<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*known<span class="Delimiter">.</span>find<span class="Delimiter">(</span>x<span class="Delimiter">)-&gt;</span>type<span class="Delimiter">);</span>
-<span id="L46" class="LineNr"> 46 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; &lt;= &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L47" class="LineNr"> 47 </span><span class="Delimiter">}</span>
-<span id="L48" class="LineNr"> 48 </span>
-<span id="L49" class="LineNr"> 49 </span><span class="Normal">void</span> <a href='046check_type_by_name.cc.html#L49'>check_type</a><span class="Delimiter">(</span>set&lt;reagent&gt;&amp; known<span class="Delimiter">,</span> <span class="Normal">const</span> reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; caller<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L50" class="LineNr"> 50 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L51" class="LineNr"> 51 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L85'>is_integer</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// if you use raw locations you're probably doing something unsafe</span>
-<span id="L52" class="LineNr"> 52 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// might get filled in by other logic later</span>
-<span id="L53" class="LineNr"> 53 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='041jump_target.cc.html#L11'>is_jump_target</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L54" class="LineNr"> 54 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom || x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name != <span class="Constant">&quot;label&quot;</span><span class="Delimiter">)</span>
-<span id="L55" class="LineNr"> 55 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>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;non-label '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' must begin with a letter</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L56" class="LineNr"> 56 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L57" class="LineNr"> 57 </span>  <span class="Delimiter">}</span>
-<span id="L58" class="LineNr"> 58 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>known<span class="Delimiter">.</span>find<span class="Delimiter">(</span>x<span class="Delimiter">)</span> == known<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L59" class="LineNr"> 59 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L60" class="LineNr"> 60 </span>  <span class="Conceal">¦</span> known<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
-<span id="L61" class="LineNr"> 61 </span>  <span class="Delimiter">}</span>
-<span id="L62" class="LineNr"> 62 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!types_strictly_match<span class="Delimiter">(</span>known<span class="Delimiter">.</span>find<span class="Delimiter">(</span>x<span class="Delimiter">)-&gt;</span>type<span class="Delimiter">,</span> x<span class="Delimiter">.</span>type<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L63" class="LineNr"> 63 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>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;'&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' used with multiple types</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L64" class="LineNr"> 64 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L65" class="LineNr"> 65 </span>  <span class="Delimiter">}</span>
-<span id="L66" class="LineNr"> 66 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_array<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L67" class="LineNr"> 67 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L68" class="LineNr"> 68 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>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;'&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: can't be just an array. What is it an array of?</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L69" class="LineNr"> 69 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L70" class="LineNr"> 70 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L71" class="LineNr"> 71 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L72" class="LineNr"> 72 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; can't determine the size of array variable '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'. Either allocate it separately and make the type of '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' an address, or specify the length of the array in the type of '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L73" class="LineNr"> 73 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L74" class="LineNr"> 74 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L75" class="LineNr"> 75 </span>  <span class="Delimiter">}</span>
-<span id="L76" class="LineNr"> 76 </span><span class="Delimiter">}</span>
-<span id="L77" class="LineNr"> 77 </span>
-<span id="L78" class="LineNr"> 78 </span><span class="Delimiter">:(scenario transform_fills_in_missing_types)</span>
-<span id="L79" class="LineNr"> 79 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L80" class="LineNr"> 80 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
-<span id="L81" class="LineNr"> 81 </span>  <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>add x<span class="Delimiter">,</span> <span class="Constant">1</span>
-<span id="L82" class="LineNr"> 82 </span>]
-<span id="L83" class="LineNr"> 83 </span><span class="Comment"># x is in location 1, y in location 2</span>
-<span id="L84" class="LineNr"> 84 </span><span class="traceContains">+mem: storing 2 in location 2</span>
-<span id="L85" class="LineNr"> 85 </span>
-<span id="L86" class="LineNr"> 86 </span><span class="Delimiter">:(scenario transform_fills_in_missing_types_in_product)</span>
-<span id="L87" class="LineNr"> 87 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L88" class="LineNr"> 88 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
-<span id="L89" class="LineNr"> 89 </span>  x<span class="Special"> &lt;- </span>copy <span class="Constant">2</span>
-<span id="L90" class="LineNr"> 90 </span>]
-<span id="L91" class="LineNr"> 91 </span><span class="Comment"># x is in location 1</span>
-<span id="L92" class="LineNr"> 92 </span><span class="traceContains">+mem: storing 2 in location 1</span>
-<span id="L93" class="LineNr"> 93 </span>
-<span id="L94" class="LineNr"> 94 </span><span class="Delimiter">:(scenario transform_fills_in_missing_types_in_product_and_ingredient)</span>
-<span id="L95" class="LineNr"> 95 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L96" class="LineNr"> 96 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
-<span id="L97" class="LineNr"> 97 </span>  x<span class="Special"> &lt;- </span>add x<span class="Delimiter">,</span> <span class="Constant">1</span>
-<span id="L98" class="LineNr"> 98 </span>]
-<span id="L99" class="LineNr"> 99 </span><span class="Comment"># x is in location 1</span>
-<span id="L100" class="LineNr">100 </span><span class="traceContains">+mem: storing 2 in location 1</span>
-<span id="L101" class="LineNr">101 </span>
-<span id="L102" class="LineNr">102 </span><span class="Delimiter">:(scenario transform_fills_in_missing_label_type)</span>
-<span id="L103" class="LineNr">103 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L104" class="LineNr">104 </span>  jump +target
-<span id="L105" class="LineNr">105 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L106" class="LineNr">106 </span>  +target
+<span id="L45" class="LineNr"> 45 </span>  <span class="Normal">const</span> reagent&amp; exemplar = *known<span class="Delimiter">.</span>find<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
+<span id="L46" class="LineNr"> 46 </span>  x<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*exemplar<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L47" class="LineNr"> 47 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; &lt;= &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L48" class="LineNr"> 48 </span>  <span class="Comment">// spaces are special; their type includes their /names property</span>
+<span id="L49" class="LineNr"> 49 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='043space.cc.html#L107'>is_mu_space</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> &amp;&amp; !has_property<span class="Delimiter">(</span>x<span class="Delimiter">,</span> <span class="Constant">&quot;names&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L50" class="LineNr"> 50 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!has_property<span class="Delimiter">(</span>exemplar<span class="Delimiter">,</span> <span class="Constant">&quot;names&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L51" class="LineNr"> 51 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>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 /names property for space variable '&quot;</span> &lt;&lt; exemplar<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L53" class="LineNr"> 53 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L54" class="LineNr"> 54 </span>  <span class="Conceal">¦</span> x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;names&quot;</span><span class="Delimiter">,</span> <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>*property<span class="Delimiter">(</span>exemplar<span class="Delimiter">,</span> <span class="Constant">&quot;names&quot;</span><span class="Delimiter">))));</span>
+<span id="L55" class="LineNr"> 55 </span>  <span class="Delimiter">}</span>
+<span id="L56" class="LineNr"> 56 </span><span class="Delimiter">}</span>
+<span id="L57" class="LineNr"> 57 </span>
+<span id="L58" class="LineNr"> 58 </span><span class="Normal">void</span> <a href='046check_type_by_name.cc.html#L58'>check_type</a><span class="Delimiter">(</span>set&lt;reagent&gt;&amp; known<span class="Delimiter">,</span> <span class="Normal">const</span> reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; caller<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L59" class="LineNr"> 59 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L60" class="LineNr"> 60 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L85'>is_integer</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// if you use raw locations you're probably doing something unsafe</span>
+<span id="L61" class="LineNr"> 61 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// might get filled in by other logic later</span>
+<span id="L62" class="LineNr"> 62 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='041jump_target.cc.html#L11'>is_jump_target</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L63" class="LineNr"> 63 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom || x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name != <span class="Constant">&quot;label&quot;</span><span class="Delimiter">)</span>
+<span id="L64" class="LineNr"> 64 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>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;non-label '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' must begin with a letter</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L65" class="LineNr"> 65 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L66" class="LineNr"> 66 </span>  <span class="Delimiter">}</span>
+<span id="L67" class="LineNr"> 67 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>known<span class="Delimiter">.</span>find<span class="Delimiter">(</span>x<span class="Delimiter">)</span> == known<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L68" class="LineNr"> 68 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L69" class="LineNr"> 69 </span>  <span class="Conceal">¦</span> known<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
+<span id="L70" class="LineNr"> 70 </span>  <span class="Delimiter">}</span>
+<span id="L71" class="LineNr"> 71 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!types_strictly_match<span class="Delimiter">(</span>known<span class="Delimiter">.</span>find<span class="Delimiter">(</span>x<span class="Delimiter">)-&gt;</span>type<span class="Delimiter">,</span> x<span class="Delimiter">.</span>type<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>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;'&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' used with multiple types</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L73" class="LineNr"> 73 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L74" class="LineNr"> 74 </span>  <span class="Delimiter">}</span>
+<span id="L75" class="LineNr"> 75 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_array<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L76" class="LineNr"> 76 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L77" class="LineNr"> 77 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>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;'&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: can't be just an array. What is it an array of?</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L78" class="LineNr"> 78 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L79" class="LineNr"> 79 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L81" class="LineNr"> 81 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; can't determine the size of array variable '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'. Either allocate it separately and make the type of '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' an address, or specify the length of the array in the type of '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L82" class="LineNr"> 82 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L83" class="LineNr"> 83 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L84" class="LineNr"> 84 </span>  <span class="Delimiter">}</span>
+<span id="L85" class="LineNr"> 85 </span><span class="Delimiter">}</span>
+<span id="L86" class="LineNr"> 86 </span>
+<span id="L87" class="LineNr"> 87 </span><span class="Delimiter">:(scenario transform_fills_in_missing_types)</span>
+<span id="L88" class="LineNr"> 88 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L89" class="LineNr"> 89 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
+<span id="L90" class="LineNr"> 90 </span>  <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>add x<span class="Delimiter">,</span> <span class="Constant">1</span>
+<span id="L91" class="LineNr"> 91 </span>]
+<span id="L92" class="LineNr"> 92 </span><span class="Comment"># x is in location 1, y in location 2</span>
+<span id="L93" class="LineNr"> 93 </span><span class="traceContains">+mem: storing 2 in location 2</span>
+<span id="L94" class="LineNr"> 94 </span>
+<span id="L95" class="LineNr"> 95 </span><span class="Delimiter">:(scenario transform_fills_in_missing_types_in_product)</span>
+<span id="L96" class="LineNr"> 96 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L97" class="LineNr"> 97 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
+<span id="L98" class="LineNr"> 98 </span>  x<span class="Special"> &lt;- </span>copy <span class="Constant">2</span>
+<span id="L99" class="LineNr"> 99 </span>]
+<span id="L100" class="LineNr">100 </span><span class="Comment"># x is in location 1</span>
+<span id="L101" class="LineNr">101 </span><span class="traceContains">+mem: storing 2 in location 1</span>
+<span id="L102" class="LineNr">102 </span>
+<span id="L103" class="LineNr">103 </span><span class="Delimiter">:(scenario transform_fills_in_missing_types_in_product_and_ingredient)</span>
+<span id="L104" class="LineNr">104 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L105" class="LineNr">105 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
+<span id="L106" class="LineNr">106 </span>  x<span class="Special"> &lt;- </span>add x<span class="Delimiter">,</span> <span class="Constant">1</span>
 <span id="L107" class="LineNr">107 </span>]
-<span id="L108" class="LineNr">108 </span><span class="traceAbsent">-mem: storing 0 in location 1</span>
-<span id="L109" class="LineNr">109 </span>
-<span id="L110" class="LineNr">110 </span><span class="Delimiter">:(scenario transform_fails_on_missing_types_in_first_mention)</span>
-<span id="L111" class="LineNr">111 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L108" class="LineNr">108 </span><span class="Comment"># x is in location 1</span>
+<span id="L109" class="LineNr">109 </span><span class="traceContains">+mem: storing 2 in location 1</span>
+<span id="L110" class="LineNr">110 </span>
+<span id="L111" class="LineNr">111 </span><span class="Delimiter">:(scenario transform_fills_in_missing_label_type)</span>
 <span id="L112" class="LineNr">112 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L113" class="LineNr">113 </span>  x<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
-<span id="L114" class="LineNr">114 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">2</span>
-<span id="L115" class="LineNr">115 </span>]
-<span id="L116" class="LineNr">116 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: missing type for 'x' in 'x &lt;- copy 1'</span>
-<span id="L117" class="LineNr">117 </span>
-<span id="L118" class="LineNr">118 </span><span class="Delimiter">:(scenario transform_fails_on_wrong_type_for_label)</span>
-<span id="L119" class="LineNr">119 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L120" class="LineNr">120 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L121" class="LineNr">121 </span>  +foo:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L122" class="LineNr">122 </span>]
-<span id="L123" class="LineNr">123 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: non-label '+foo' must begin with a letter</span>
-<span id="L124" class="LineNr">124 </span>
-<span id="L125" class="LineNr">125 </span><span class="Delimiter">:(scenario typo_in_address_type_fails)</span>
-<span id="L126" class="LineNr">126 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L127" class="LineNr">127 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L128" class="LineNr">128 </span>  <span class="Normal">y</span>:&amp;:charcter<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">character:type</span>
-<span id="L129" class="LineNr">129 </span>  *y<span class="Special"> &lt;- </span>copy <span class="Constant">67</span>
-<span id="L130" class="LineNr">130 </span>]
-<span id="L131" class="LineNr">131 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: unknown type charcter in 'y:&amp;:charcter &lt;- new character:type'</span>
-<span id="L132" class="LineNr">132 </span>
-<span id="L133" class="LineNr">133 </span><span class="Delimiter">:(scenario array_type_without_size_fails)</span>
-<span id="L134" class="LineNr">134 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L135" class="LineNr">135 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L136" class="LineNr">136 </span>  <span class="Normal">x</span>:@:num<span class="Special"> &lt;- </span>merge <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">12</span><span class="Delimiter">,</span> <span class="Constant">13</span>
-<span id="L137" class="LineNr">137 </span>]
-<span id="L138" class="LineNr">138 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a> can't determine the size of array variable 'x'. Either allocate it separately and make the type of 'x' an address, or specify the length of the array in the type of 'x'.</span>
-<span id="L139" class="LineNr">139 </span>
-<span id="L140" class="LineNr">140 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L141" class="LineNr">141 </span><span class="Delimiter">:(scenario transform_checks_types_of_identical_reagents_in_multiple_spaces)</span>
-<span id="L142" class="LineNr">142 </span><span class="muRecipe">def</span> foo [  <span class="Comment"># dummy</span>
-<span id="L143" class="LineNr">143 </span>]
+<span id="L113" class="LineNr">113 </span>  jump +target
+<span id="L114" class="LineNr">114 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L115" class="LineNr">115 </span>  +target
+<span id="L116" class="LineNr">116 </span>]
+<span id="L117" class="LineNr">117 </span><span class="traceAbsent">-mem: storing 0 in location 1</span>
+<span id="L118" class="LineNr">118 </span>
+<span id="L119" class="LineNr">119 </span><span class="Delimiter">:(scenario transform_fails_on_missing_types_in_first_mention)</span>
+<span id="L120" class="LineNr">120 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L121" class="LineNr">121 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L122" class="LineNr">122 </span>  x<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
+<span id="L123" class="LineNr">123 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">2</span>
+<span id="L124" class="LineNr">124 </span>]
+<span id="L125" class="LineNr">125 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: missing type for 'x' in 'x &lt;- copy 1'</span>
+<span id="L126" class="LineNr">126 </span>
+<span id="L127" class="LineNr">127 </span><span class="Delimiter">:(scenario transform_fails_on_wrong_type_for_label)</span>
+<span id="L128" class="LineNr">128 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L129" class="LineNr">129 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L130" class="LineNr">130 </span>  +foo:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L131" class="LineNr">131 </span>]
+<span id="L132" class="LineNr">132 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: non-label '+foo' must begin with a letter</span>
+<span id="L133" class="LineNr">133 </span>
+<span id="L134" class="LineNr">134 </span><span class="Delimiter">:(scenario typo_in_address_type_fails)</span>
+<span id="L135" class="LineNr">135 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L136" class="LineNr">136 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L137" class="LineNr">137 </span>  <span class="Normal">y</span>:&amp;:charcter<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">character:type</span>
+<span id="L138" class="LineNr">138 </span>  *y<span class="Special"> &lt;- </span>copy <span class="Constant">67</span>
+<span id="L139" class="LineNr">139 </span>]
+<span id="L140" class="LineNr">140 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: unknown type charcter in 'y:&amp;:charcter &lt;- new character:type'</span>
+<span id="L141" class="LineNr">141 </span>
+<span id="L142" class="LineNr">142 </span><span class="Delimiter">:(scenario array_type_without_size_fails)</span>
+<span id="L143" class="LineNr">143 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L144" class="LineNr">144 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L145" class="LineNr">145 </span>  local-scope
-<span id="L146" class="LineNr">146 </span>  <span class="Constant">0</span>:space/names:foo<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># specify surrounding space</span>
-<span id="L147" class="LineNr">147 </span>  <span class="Normal">x</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>copy <span class="Constant">1</span>/<span class="Constant">true</span>
-<span id="L148" class="LineNr">148 </span>  <span class="Normal">x</span>:num/space:<span class="Constant">1</span><span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L149" class="LineNr">149 </span>  x/space:<span class="Constant">1</span><span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
-<span id="L150" class="LineNr">150 </span>]
-<span id="L151" class="LineNr">151 </span>$error: <span class="Constant">0</span>
-<span id="L152" class="LineNr">152 </span>
-<span id="L153" class="LineNr">153 </span><span class="Delimiter">:(scenario transform_handles_empty_reagents)</span>
-<span id="L154" class="LineNr">154 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L155" class="LineNr">155 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L156" class="LineNr">156 </span>  add *
-<span id="L157" class="LineNr">157 </span>]
-<span id="L158" class="LineNr">158 </span><span class="traceContains">+error: illegal name '*'</span>
-<span id="L159" class="LineNr">159 </span><span class="Comment"># no crash</span>
+<span id="L145" class="LineNr">145 </span>  <span class="Normal">x</span>:@:num<span class="Special"> &lt;- </span>merge <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">12</span><span class="Delimiter">,</span> <span class="Constant">13</span>
+<span id="L146" class="LineNr">146 </span>]
+<span id="L147" class="LineNr">147 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a> can't determine the size of array variable 'x'. Either allocate it separately and make the type of 'x' an address, or specify the length of the array in the type of 'x'.</span>
+<span id="L148" class="LineNr">148 </span>
+<span id="L149" class="LineNr">149 </span><span class="Delimiter">:(scenarios transform)</span>
+<span id="L150" class="LineNr">150 </span><span class="Delimiter">:(scenario transform_checks_types_of_identical_reagents_in_multiple_spaces)</span>
+<span id="L151" class="LineNr">151 </span><span class="muRecipe">def</span> foo [  <span class="Comment"># dummy</span>
+<span id="L152" class="LineNr">152 </span>]
+<span id="L153" class="LineNr">153 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L154" class="LineNr">154 </span>  local-scope
+<span id="L155" class="LineNr">155 </span>  <span class="Constant">0</span>:space/names:foo<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># specify surrounding space</span>
+<span id="L156" class="LineNr">156 </span>  <span class="Normal">x</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>copy <span class="Constant">1</span>/<span class="Constant">true</span>
+<span id="L157" class="LineNr">157 </span>  <span class="Normal">x</span>:num/space:<span class="Constant">1</span><span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L158" class="LineNr">158 </span>  x/space:<span class="Constant">1</span><span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
+<span id="L159" class="LineNr">159 </span>]
+<span id="L160" class="LineNr">160 </span>$error: <span class="Constant">0</span>
+<span id="L161" class="LineNr">161 </span>
+<span id="L162" class="LineNr">162 </span><span class="Delimiter">:(scenario transform_handles_empty_reagents)</span>
+<span id="L163" class="LineNr">163 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L164" class="LineNr">164 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L165" class="LineNr">165 </span>  add *
+<span id="L166" class="LineNr">166 </span>]
+<span id="L167" class="LineNr">167 </span><span class="traceContains">+error: illegal name '*'</span>
+<span id="L168" class="LineNr">168 </span><span class="Comment"># no crash</span>
 </pre>
 </body>
 </html>
diff --git a/html/050scenario.cc.html b/html/050scenario.cc.html
index 503afcc0..698ac6c8 100644
--- a/html/050scenario.cc.html
+++ b/html/050scenario.cc.html
@@ -338,7 +338,7 @@ if ('onhashchange' in window) {
 <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="Comment">//: Test.</span>
-<span id="L274" class="LineNr">274 </span><span class="Delimiter">:(before &quot;End <a href='042name.cc.html#L156'>is_special_name</a> Special-cases&quot;)</span>
+<span id="L274" class="LineNr">274 </span><span class="Delimiter">:(before &quot;End <a href='042name.cc.html#L163'>is_special_name</a> Special-cases&quot;)</span>
 <span id="L275" class="LineNr">275 </span><span class="Normal">if</span> <span class="Delimiter">(</span>s == <span class="Constant">&quot;__maybe_make_raw_test__&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L276" class="LineNr">276 </span><span class="Delimiter">:(before &quot;End Special Scenario Variable Names(r)&quot;)</span>
 <span id="L277" class="LineNr">277 </span><span class="Comment">//: ugly: we only need this for this one test, but need to define it for all time</span>
@@ -457,7 +457,7 @@ if ('onhashchange' in window) {
 <span id="L390" class="LineNr">390 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L391" class="LineNr">391 </span><span class="Normal">case</span> MEMORY_SHOULD_CONTAIN: <span class="Delimiter">{</span>
 <span id="L392" class="LineNr">392 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Passed<span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L393" class="LineNr">393 </span>  check_memory<span class="Delimiter">(</span><a href='026call.cc.html#L85'>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>name<span class="Delimiter">);</span>
+<span id="L393" class="LineNr">393 </span>  check_memory<span class="Delimiter">(</span><a href='026call.cc.html#L87'>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>name<span class="Delimiter">);</span>
 <span id="L394" class="LineNr">394 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L395" class="LineNr">395 </span><span class="Delimiter">}</span>
 <span id="L396" class="LineNr">396 </span>
@@ -472,44 +472,44 @@ if ('onhashchange' in window) {
 <span id="L405" class="LineNr">405 </span>  <span class="Conceal">¦</span> string lhs = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L406" class="LineNr">406 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>lhs<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L407" class="LineNr">407 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L408" class="LineNr">408 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L197'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L408" class="LineNr">408 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L197'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L409" class="LineNr">409 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L410" class="LineNr">410 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L411" class="LineNr">411 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!is_integer<span class="Delimiter">(</span>lhs<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L412" class="LineNr">412 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='046check_type_by_name.cc.html#L49'>check_type</a><span class="Delimiter">(</span>lhs<span class="Delimiter">,</span> in<span class="Delimiter">);</span>
+<span id="L412" class="LineNr">412 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='046check_type_by_name.cc.html#L58'>check_type</a><span class="Delimiter">(</span>lhs<span class="Delimiter">,</span> in<span class="Delimiter">);</span>
 <span id="L413" class="LineNr">413 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L414" class="LineNr">414 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L415" class="LineNr">415 </span>  <span class="Conceal">¦</span> <span class="Normal">int</span> address = <a href='002test.cc.html#L91'>to_integer</a><span class="Delimiter">(</span>lhs<span class="Delimiter">);</span>
+<span id="L415" class="LineNr">415 </span>  <span class="Conceal">¦</span> <span class="Normal">int</span> <a href='043space.cc.html#L83'>address</a> = <a href='002test.cc.html#L91'>to_integer</a><span class="Delimiter">(</span>lhs<span class="Delimiter">);</span>
 <span id="L416" class="LineNr">416 </span>  <span class="Conceal">¦</span> <a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L417" class="LineNr">417 </span>  <span class="Conceal">¦</span> string _assign<span class="Delimiter">;</span>  in &gt;&gt; _assign<span class="Delimiter">;</span>  assert<span class="Delimiter">(</span>_assign == <span class="Constant">&quot;&lt;-&quot;</span><span class="Delimiter">);</span>
 <span id="L418" class="LineNr">418 </span>  <span class="Conceal">¦</span> <a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L419" class="LineNr">419 </span>  <span class="Conceal">¦</span> string rhs = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L420" class="LineNr">420 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>rhs<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L421" class="LineNr">421 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L422" class="LineNr">422 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L197'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L422" class="LineNr">422 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L197'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L423" class="LineNr">423 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L424" class="LineNr">424 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L425" class="LineNr">425 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!is_integer<span class="Delimiter">(</span>rhs<span class="Delimiter">)</span> &amp;&amp; !is_noninteger<span class="Delimiter">(</span>rhs<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L426" class="LineNr">426 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L427" class="LineNr">427 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;location '&quot;</span> &lt;&lt; address &lt;&lt; <span class="Constant">&quot;' can't contain non-number &quot;</span> &lt;&lt; rhs &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L427" class="LineNr">427 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;location '&quot;</span> &lt;&lt; address &lt;&lt; <span class="Constant">&quot;' can't contain non-number &quot;</span> &lt;&lt; rhs &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L428" class="LineNr">428 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L429" class="LineNr">429 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L430" class="LineNr">430 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L431" class="LineNr">431 </span>  <span class="Conceal">¦</span> <span class="Normal">double</span> value = <a href='015literal_noninteger.cc.html#L26'>to_double</a><span class="Delimiter">(</span>rhs<span class="Delimiter">);</span>
-<span id="L432" class="LineNr">432 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>locations_checked<span class="Delimiter">,</span> address<span class="Delimiter">))</span>
-<span id="L433" class="LineNr">433 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;duplicate expectation for location '&quot;</span> &lt;&lt; address &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L434" class="LineNr">434 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking location &quot;</span> &lt;&lt; address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L435" class="LineNr">435 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address<span class="Delimiter">)</span> != value<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>contains_key<span class="Delimiter">(</span>locations_checked<span class="Delimiter">,</span> <a href='043space.cc.html#L83'>address</a><span class="Delimiter">))</span>
+<span id="L433" class="LineNr">433 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;duplicate expectation for location '&quot;</span> &lt;&lt; address &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L434" class="LineNr">434 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking location &quot;</span> &lt;&lt; <a href='043space.cc.html#L83'>address</a> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L435" class="LineNr">435 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <a href='043space.cc.html#L83'>address</a><span class="Delimiter">)</span> != value<span class="Delimiter">)</span> <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>!Hide_errors<span class="Delimiter">)</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L437" class="LineNr">437 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected location '&quot;</span> &lt;&lt; address &lt;&lt; <span class="Constant">&quot;' to contain &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>value<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but saw &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L437" class="LineNr">437 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected location '&quot;</span> &lt;&lt; address &lt;&lt; <span class="Constant">&quot;' to contain &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>value<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but saw &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <a href='043space.cc.html#L83'>address</a><span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L438" class="LineNr">438 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L439" class="LineNr">439 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L440" class="LineNr">440 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L441" class="LineNr">441 </span>  <span class="Conceal">¦</span> locations_checked<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>address<span class="Delimiter">);</span>
+<span id="L441" class="LineNr">441 </span>  <span class="Conceal">¦</span> locations_checked<span class="Delimiter">.</span>insert<span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">);</span>
 <span id="L442" class="LineNr">442 </span>  <span class="Delimiter">}</span>
 <span id="L443" class="LineNr">443 </span><span class="Delimiter">}</span>
 <span id="L444" class="LineNr">444 </span>
-<span id="L445" class="LineNr">445 </span><span class="Normal">void</span> <a href='046check_type_by_name.cc.html#L49'>check_type</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; lhs<span class="Delimiter">,</span> istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L445" class="LineNr">445 </span><span class="Normal">void</span> <a href='046check_type_by_name.cc.html#L58'>check_type</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; lhs<span class="Delimiter">,</span> istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L446" class="LineNr">446 </span>  reagent x<span class="Delimiter">(</span>lhs<span class="Delimiter">);</span>
 <span id="L447" class="LineNr">447 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_array<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &amp;&amp; is_mu_character<span class="Delimiter">(</span><a href='032array.cc.html#L381'>array_element</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
 <span id="L448" class="LineNr">448 </span>  <span class="Conceal">¦</span> x<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='002test.cc.html#L91'>to_integer</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>name<span class="Delimiter">));</span>
@@ -517,7 +517,7 @@ if ('onhashchange' in window) {
 <span id="L450" class="LineNr">450 </span>  <span class="Conceal">¦</span> string _assign = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L451" class="LineNr">451 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>_assign<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L452" class="LineNr">452 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L453" class="LineNr">453 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L197'>end</a> of file (2)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L453" class="LineNr">453 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L197'>end</a> of file (2)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L454" class="LineNr">454 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L455" class="LineNr">455 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L456" class="LineNr">456 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>_assign == <span class="Constant">&quot;&lt;-&quot;</span><span class="Delimiter">);</span>
@@ -525,18 +525,18 @@ if ('onhashchange' in window) {
 <span id="L458" class="LineNr">458 </span>  <span class="Conceal">¦</span> string literal = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L459" class="LineNr">459 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>literal<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L460" class="LineNr">460 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L461" class="LineNr">461 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L197'>end</a> of file (3)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L461" class="LineNr">461 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L197'>end</a> of file (3)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L462" class="LineNr">462 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L463" class="LineNr">463 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L464" class="LineNr">464 </span>  <span class="Conceal">¦</span> <span class="Normal">int</span> address = x<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
+<span id="L464" class="LineNr">464 </span>  <span class="Conceal">¦</span> <span class="Normal">int</span> <a href='043space.cc.html#L83'>address</a> = x<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
 <span id="L465" class="LineNr">465 </span>  <span class="Conceal">¦</span> <span class="Comment">// exclude quoting brackets</span>
 <span id="L466" class="LineNr">466 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>*literal<span class="Delimiter">.</span>begin<span class="Delimiter">()</span> != <span class="Constant">'['</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L467" class="LineNr">467 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;array:character types inside 'memory-should-contain' can only be compared with text literals surrounded by [], not '&quot;</span> &lt;&lt; literal &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L467" class="LineNr">467 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;array:character types inside 'memory-should-contain' can only be compared with text literals surrounded by [], not '&quot;</span> &lt;&lt; literal &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L468" class="LineNr">468 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L469" class="LineNr">469 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L470" class="LineNr">470 </span>  <span class="Conceal">¦</span> literal<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>literal<span class="Delimiter">.</span>begin<span class="Delimiter">());</span>
 <span id="L471" class="LineNr">471 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>*--literal<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">()</span> == <span class="Constant">']'</span><span class="Delimiter">);</span>  literal<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>--literal<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">());</span>
-<span id="L472" class="LineNr">472 </span>  <span class="Conceal">¦</span> check_mu_text<span class="Delimiter">(</span>address<span class="Delimiter">,</span> literal<span class="Delimiter">);</span>
+<span id="L472" class="LineNr">472 </span>  <span class="Conceal">¦</span> check_mu_text<span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> literal<span class="Delimiter">);</span>
 <span id="L473" class="LineNr">473 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L474" class="LineNr">474 </span>  <span class="Delimiter">}</span>
 <span id="L475" class="LineNr">475 </span>  <span class="Comment">// End Scenario Type Special-cases</span>
@@ -548,7 +548,7 @@ if ('onhashchange' in window) {
 <span id="L481" class="LineNr">481 </span>  <span class="Normal">int</span> <a href='032array.cc.html#L397'>array_length</a> = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> start<span class="Delimiter">));</span>
 <span id="L482" class="LineNr">482 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='032array.cc.html#L397'>array_length</a> != <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>literal<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L483" class="LineNr">483 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L484" class="LineNr">484 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected location '&quot;</span> &lt;&lt; start &lt;&lt; <span class="Constant">&quot;' to contain length &quot;</span> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>literal<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; of text [&quot;</span> &lt;&lt; literal &lt;&lt; <span class="Constant">&quot;] but saw &quot;</span> &lt;&lt; <a href='032array.cc.html#L397'>array_length</a> &lt;&lt; <span class="Constant">&quot; (for text [&quot;</span> &lt;&lt; <a href='038new_text.cc.html#L151'>read_mu_characters</a><span class="Delimiter">(</span>start+<span class="Comment">/*</span><span class="Comment">skip length</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> <a href='032array.cc.html#L397'>array_length</a><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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L484" class="LineNr">484 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected location '&quot;</span> &lt;&lt; start &lt;&lt; <span class="Constant">&quot;' to contain length &quot;</span> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>literal<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; of text [&quot;</span> &lt;&lt; literal &lt;&lt; <span class="Constant">&quot;] but saw &quot;</span> &lt;&lt; <a href='032array.cc.html#L397'>array_length</a> &lt;&lt; <span class="Constant">&quot; (for text [&quot;</span> &lt;&lt; <a href='038new_text.cc.html#L151'>read_mu_characters</a><span class="Delimiter">(</span>start+<span class="Comment">/*</span><span class="Comment">skip length</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> <a href='032array.cc.html#L397'>array_length</a><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#L197'>end</a><span class="Delimiter">();</span>
 <span id="L485" class="LineNr">485 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L486" class="LineNr">486 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L487" class="LineNr">487 </span>  <span class="Delimiter">}</span>
@@ -557,7 +557,7 @@ if ('onhashchange' in window) {
 <span id="L490" class="LineNr">490 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking location &quot;</span> &lt;&lt; curr+i &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L491" class="LineNr">491 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr+i<span class="Delimiter">)</span> != literal<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L492" class="LineNr">492 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L493" class="LineNr">493 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected location &quot;</span> &lt;&lt; <span class="Delimiter">(</span>curr+i<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to contain &quot;</span> &lt;&lt; literal<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but saw &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr+i<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L493" class="LineNr">493 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected location &quot;</span> &lt;&lt; <span class="Delimiter">(</span>curr+i<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to contain &quot;</span> &lt;&lt; literal<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but saw &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr+i<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L494" class="LineNr">494 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L495" class="LineNr">495 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L496" class="LineNr">496 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
@@ -665,7 +665,7 @@ if ('onhashchange' in window) {
 <span id="L598" class="LineNr">598 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L599" class="LineNr">599 </span><span class="Normal">case</span> TRACE_SHOULD_CONTAIN: <span class="Delimiter">{</span>
 <span id="L600" class="LineNr">600 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Passed<span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L601" class="LineNr">601 </span>  check_trace<span class="Delimiter">(</span><a href='026call.cc.html#L85'>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>name<span class="Delimiter">);</span>
+<span id="L601" class="LineNr">601 </span>  check_trace<span class="Delimiter">(</span><a href='026call.cc.html#L87'>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>name<span class="Delimiter">);</span>
 <span id="L602" class="LineNr">602 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L603" class="LineNr">603 </span><span class="Delimiter">}</span>
 <span id="L604" class="LineNr">604 </span>
@@ -685,7 +685,7 @@ if ('onhashchange' in window) {
 <span id="L618" class="LineNr">618 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L619" class="LineNr">619 </span>  <span class="Delimiter">}</span>
 <span id="L620" class="LineNr">620 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L621" class="LineNr">621 </span>  <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;missing [&quot;</span> &lt;&lt; expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>contents &lt;&lt; <span class="Constant">&quot;] &quot;</span>
+<span id="L621" class="LineNr">621 </span>  <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;missing [&quot;</span> &lt;&lt; expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>contents &lt;&lt; <span class="Constant">&quot;] &quot;</span>
 <span id="L622" class="LineNr">622 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> &lt;&lt; <span class="Constant">&quot;in <a href='003trace.cc.html#L161'>trace</a> with label '&quot;</span> &lt;&lt; expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>label &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L623" class="LineNr">623 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span>
 <span id="L624" class="LineNr">624 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L165'>DUMP</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>label<span class="Delimiter">);</span>
@@ -700,7 +700,7 @@ if ('onhashchange' in window) {
 <span id="L633" class="LineNr">633 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>empty<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L634" class="LineNr">634 </span>  <span class="Conceal">¦</span> <span class="Normal">int</span> delim = buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>find<span class="Delimiter">(</span><span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
 <span id="L635" class="LineNr">635 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>delim == -<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L636" class="LineNr">636 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;lines in 'trace-should-contain' should be of the form &lt;label&gt;: &lt;contents&gt;. Both parts are required.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L636" class="LineNr">636 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;lines in 'trace-should-contain' should be of the form &lt;label&gt;: &lt;contents&gt;. Both parts are required.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L637" class="LineNr">637 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> result<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
 <span id="L638" class="LineNr">638 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L639" class="LineNr">639 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
@@ -764,7 +764,7 @@ if ('onhashchange' in window) {
 <span id="L697" class="LineNr">697 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L698" class="LineNr">698 </span><span class="Normal">case</span> TRACE_SHOULD_NOT_CONTAIN: <span class="Delimiter">{</span>
 <span id="L699" class="LineNr">699 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Passed<span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L700" class="LineNr">700 </span>  check_trace_missing<span class="Delimiter">(</span><a href='026call.cc.html#L85'>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>name<span class="Delimiter">);</span>
+<span id="L700" class="LineNr">700 </span>  check_trace_missing<span class="Delimiter">(</span><a href='026call.cc.html#L87'>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>name<span class="Delimiter">);</span>
 <span id="L701" class="LineNr">701 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L702" class="LineNr">702 </span><span class="Delimiter">}</span>
 <span id="L703" class="LineNr">703 </span>
@@ -776,7 +776,7 @@ if ('onhashchange' in window) {
 <span id="L709" class="LineNr">709 </span>  vector&lt;trace_line&gt; lines = parse_trace<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L710" class="LineNr">710 </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>lines<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L711" class="LineNr">711 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span>lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>label<span class="Delimiter">,</span> lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>contents<span class="Delimiter">)</span> != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L712" class="LineNr">712 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;unexpected [&quot;</span> &lt;&lt; lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>contents &lt;&lt; <span class="Constant">&quot;] in <a href='003trace.cc.html#L161'>trace</a> with label '&quot;</span> &lt;&lt; lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>label &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L712" class="LineNr">712 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;unexpected [&quot;</span> &lt;&lt; lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>contents &lt;&lt; <span class="Constant">&quot;] in <a href='003trace.cc.html#L161'>trace</a> with label '&quot;</span> &lt;&lt; lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>label &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L713" class="LineNr">713 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L714" class="LineNr">714 </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="L715" class="LineNr">715 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
@@ -841,11 +841,11 @@ if ('onhashchange' in window) {
 <span id="L774" class="LineNr">774 </span><span class="Normal">case</span> CHECK_TRACE_COUNT_FOR_LABEL: <span class="Delimiter">{</span>
 <span id="L775" class="LineNr">775 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Passed<span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L776" class="LineNr">776 </span>  <span class="Normal">int</span> expected_count = 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="L777" class="LineNr">777 </span>  string label = <a href='026call.cc.html#L85'>current_instruction</a><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="L777" class="LineNr">777 </span>  string label = <a href='026call.cc.html#L87'>current_instruction</a><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="L778" class="LineNr">778 </span>  <span class="Normal">int</span> count = trace_count<span class="Delimiter">(</span>label<span class="Delimiter">);</span>
 <span id="L779" class="LineNr">779 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count != expected_count<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L780" class="LineNr">780 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L781" class="LineNr">781 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected &quot;</span> &lt;&lt; expected_count &lt;&lt; <span class="Constant">&quot; lines in <a href='003trace.cc.html#L161'>trace</a> with label '&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;' in <a href='003trace.cc.html#L161'>trace</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L781" class="LineNr">781 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected &quot;</span> &lt;&lt; expected_count &lt;&lt; <span class="Constant">&quot; lines in <a href='003trace.cc.html#L161'>trace</a> with label '&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;' in <a href='003trace.cc.html#L161'>trace</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L782" class="LineNr">782 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> <a href='003trace.cc.html#L165'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
 <span id="L783" class="LineNr">783 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L784" class="LineNr">784 </span>  <span class="Delimiter">}</span>
@@ -876,11 +876,11 @@ if ('onhashchange' in window) {
 <span id="L809" class="LineNr">809 </span><span class="Normal">case</span> CHECK_TRACE_COUNT_FOR_LABEL_GREATER_THAN: <span class="Delimiter">{</span>
 <span id="L810" class="LineNr">810 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Passed<span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L811" class="LineNr">811 </span>  <span class="Normal">int</span> expected_count = 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="L812" class="LineNr">812 </span>  string label = <a href='026call.cc.html#L85'>current_instruction</a><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="L812" class="LineNr">812 </span>  string label = <a href='026call.cc.html#L87'>current_instruction</a><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="L813" class="LineNr">813 </span>  <span class="Normal">int</span> count = trace_count<span class="Delimiter">(</span>label<span class="Delimiter">);</span>
 <span id="L814" class="LineNr">814 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count &lt;= expected_count<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L815" class="LineNr">815 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L816" class="LineNr">816 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected more than &quot;</span> &lt;&lt; expected_count &lt;&lt; <span class="Constant">&quot; lines in <a href='003trace.cc.html#L161'>trace</a> with label '&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;' in <a href='003trace.cc.html#L161'>trace</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L816" class="LineNr">816 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected more than &quot;</span> &lt;&lt; expected_count &lt;&lt; <span class="Constant">&quot; lines in <a href='003trace.cc.html#L161'>trace</a> with label '&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;' in <a href='003trace.cc.html#L161'>trace</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L817" class="LineNr">817 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L818" class="LineNr">818 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;trace contents:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L819" class="LineNr">819 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L165'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
@@ -914,11 +914,11 @@ if ('onhashchange' in window) {
 <span id="L847" class="LineNr">847 </span><span class="Normal">case</span> CHECK_TRACE_COUNT_FOR_LABEL_LESSER_THAN: <span class="Delimiter">{</span>
 <span id="L848" class="LineNr">848 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Passed<span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L849" class="LineNr">849 </span>  <span class="Normal">int</span> expected_count = 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="L850" class="LineNr">850 </span>  string label = <a href='026call.cc.html#L85'>current_instruction</a><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="L850" class="LineNr">850 </span>  string label = <a href='026call.cc.html#L87'>current_instruction</a><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="L851" class="LineNr">851 </span>  <span class="Normal">int</span> count = trace_count<span class="Delimiter">(</span>label<span class="Delimiter">);</span>
 <span id="L852" class="LineNr">852 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count &gt;= expected_count<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L853" class="LineNr">853 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L854" class="LineNr">854 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected less than &quot;</span> &lt;&lt; expected_count &lt;&lt; <span class="Constant">&quot; lines in <a href='003trace.cc.html#L161'>trace</a> with label '&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;' in <a href='003trace.cc.html#L161'>trace</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L854" class="LineNr">854 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected less than &quot;</span> &lt;&lt; expected_count &lt;&lt; <span class="Constant">&quot; lines in <a href='003trace.cc.html#L161'>trace</a> with label '&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;' in <a href='003trace.cc.html#L161'>trace</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L855" class="LineNr">855 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L856" class="LineNr">856 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;trace contents:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L857" class="LineNr">857 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L165'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
diff --git a/html/053recipe_header.cc.html b/html/053recipe_header.cc.html
index 587977ad..6591374c 100644
--- a/html/053recipe_header.cc.html
+++ b/html/053recipe_header.cc.html
@@ -270,9 +270,9 @@ if ('onhashchange' in window) {
 <span id="L204" class="LineNr">204 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L205" class="LineNr">205 </span><span class="Normal">case</span> NEXT_INGREDIENT_WITHOUT_TYPECHECKING: <span class="Delimiter">{</span>
 <span id="L206" class="LineNr">206 </span>  assert<span class="Delimiter">(</span>!Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L207" class="LineNr">207 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>next_ingredient_to_process &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L207" class="LineNr">207 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>next_ingredient_to_process &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L208" class="LineNr">208 </span>  <span class="Conceal">¦</span> products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>
-<span id="L209" class="LineNr">209 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">.</span>at<span class="Delimiter">(</span><a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>next_ingredient_to_process<span class="Delimiter">));</span>
+<span id="L209" class="LineNr">209 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">.</span>at<span class="Delimiter">(</span><a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>next_ingredient_to_process<span class="Delimiter">));</span>
 <span id="L210" class="LineNr">210 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>products<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">);</span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>  <span class="Comment">// push a new vector</span>
 <span id="L211" class="LineNr">211 </span>  <span class="Conceal">¦</span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L212" class="LineNr">212 </span>  <span class="Conceal">¦</span> ++current_call<span class="Delimiter">().</span>next_ingredient_to_process<span class="Delimiter">;</span>
@@ -280,7 +280,7 @@ if ('onhashchange' in window) {
 <span id="L214" class="LineNr">214 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
 <span id="L215" class="LineNr">215 </span>  <span class="Conceal">¦</span> products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L216" class="LineNr">216 </span>  <span class="Conceal">¦</span> <span class="Comment">// pad the first product with sufficient zeros to match its type</span>
-<span id="L217" class="LineNr">217 </span>  <span class="Conceal">¦</span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>resize<span class="Delimiter">(</span>size_of<span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)));</span>
+<span id="L217" class="LineNr">217 </span>  <span class="Conceal">¦</span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>resize<span class="Delimiter">(</span>size_of<span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)));</span>
 <span id="L218" class="LineNr">218 </span>  <span class="Conceal">¦</span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L219" class="LineNr">219 </span>  <span class="Delimiter">}</span>
 <span id="L220" class="LineNr">220 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -357,7 +357,7 @@ if ('onhashchange' in window) {
 <span id="L291" class="LineNr">291 </span>  <a href='003trace.cc.html#L161'>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 calls inside <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L292" class="LineNr">292 </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="L293" class="LineNr">293 </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="L294" class="LineNr">294 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation &lt; <a href='010vm.cc.html#L191'>MAX_PRIMITIVE_RECIPES</a><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L294" class="LineNr">294 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='028call_return.cc.html#L114'>is_primitive</a><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="L295" class="LineNr">295 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> recipe&amp; callee = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>operation<span class="Delimiter">);</span>
 <span id="L296" class="LineNr">296 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!callee<span class="Delimiter">.</span>has_header<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L297" class="LineNr">297 </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>ingredients<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>callee<span class="Delimiter">.</span>ingredients<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -423,7 +423,7 @@ if ('onhashchange' in window) {
 <span id="L357" class="LineNr">357 </span>]
 <span id="L358" class="LineNr">358 </span><span class="traceContains">+error: add2: replied with the wrong number of products at 'return z'</span>
 <span id="L359" class="LineNr">359 </span>
-<span id="L360" class="LineNr">360 </span><span class="Delimiter">:(scenario recipe_headers_are_checked_against_transformed_instructions)</span>
+<span id="L360" class="LineNr">360 </span><span class="Delimiter">:(scenario recipe_headers_are_checked_against_pre_transformed_instructions)</span>
 <span id="L361" class="LineNr">361 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L362" class="LineNr">362 </span><span class="muRecipe">def</span> foo<span class="muRecipe"> -&gt; </span>x:num [
 <span id="L363" class="LineNr">363 </span>  local-scope
@@ -515,7 +515,7 @@ if ('onhashchange' in window) {
 <span id="L449" class="LineNr">449 </span>  <span class="Delimiter">}</span>
 <span id="L450" class="LineNr">450 </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_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L451" class="LineNr">451 </span>  <span class="Conceal">¦</span> instruction&amp; inst = caller_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L452" class="LineNr">452 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L452" class="LineNr">452 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L453" class="LineNr">453 </span>  <span class="Conceal">¦</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="L454" class="LineNr">454 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</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>type<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L455" class="LineNr">455 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>header_type<span class="Delimiter">.</span>find<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> == header_type<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">())</span>
@@ -525,7 +525,7 @@ if ('onhashchange' in window) {
 <span id="L459" class="LineNr">459 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;type of &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; is &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L460" class="LineNr">460 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L461" class="LineNr">461 </span>  <span class="Conceal">¦</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 class="Delimiter">{</span>
-<span id="L462" class="LineNr">462 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  product: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L462" class="LineNr">462 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  product: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L463" class="LineNr">463 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L464" class="LineNr">464 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>header_type<span class="Delimiter">.</span>find<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">)</span> == header_type<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">())</span>
 <span id="L465" class="LineNr">465 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
@@ -692,7 +692,7 @@ if ('onhashchange' in window) {
 <span id="L626" class="LineNr">626 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name != <span class="Constant">&quot;main&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L627" class="LineNr">627 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;check <a href='010vm.cc.html#L19'>recipe</a> header constraints for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L628" class="LineNr">628 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!caller<span class="Delimiter">.</span>has_header<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L629" class="LineNr">629 </span>  reagent<span class="Comment">/*</span><span class="Comment">local</span><span class="Comment">*/</span> expected_ingredient<span class="Delimiter">(</span><span class="Constant">&quot;x:address:array:character&quot;</span><span class="Delimiter">);</span>
+<span id="L629" class="LineNr">629 </span>  reagent<span class="Comment">/*</span><span class="Comment">local</span><span class="Comment">*/</span> expected_ingredient<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L83'>address</a>:array:character&quot;</span><span class="Delimiter">);</span>
 <span id="L630" class="LineNr">630 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L631" class="LineNr">631 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_strictly_match<span class="Delimiter">(</span>expected_ingredient<span class="Delimiter">,</span> caller<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="L632" class="LineNr">632 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;ingredients of <a href='010vm.cc.html#L19'>recipe</a> 'main' must all be text (address:array:character)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
@@ -706,10 +706,6 @@ if ('onhashchange' in window) {
 <span id="L640" class="LineNr">640 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;recipe 'main' must return at most a single product, a number</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L641" class="LineNr">641 </span>  <span class="Delimiter">}</span>
 <span id="L642" class="LineNr">642 </span><span class="Delimiter">}</span>
-<span id="L643" class="LineNr">643 </span>
-<span id="L644" class="LineNr">644 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L645" class="LineNr">645 </span><span class="Normal">using</span> std::min<span class="Delimiter">;</span>
-<span id="L646" class="LineNr">646 </span><span class="Normal">using</span> std::max<span class="Delimiter">;</span>
 </pre>
 </body>
 </html>
diff --git a/html/054static_dispatch.cc.html b/html/054static_dispatch.cc.html
index 15d4d181..12306ed6 100644
--- a/html/054static_dispatch.cc.html
+++ b/html/054static_dispatch.cc.html
@@ -15,6 +15,7 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.CommentedCode { color: #6c6c6c; }
 .muRecipe { color: #ff8700; }
 .muData { color: #ffff00; }
 .LineNr { color: #444444; }
@@ -231,7 +232,7 @@ if ('onhashchange' in window) {
 <span id="L166" class="LineNr">166 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> index = <span class="Constant">0</span><span class="Delimiter">;</span>  index &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L167" class="LineNr">167 </span>  <span class="Conceal">¦</span> instruction&amp; inst = caller_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>index<span class="Delimiter">);</span>
 <span id="L168" class="LineNr">168 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>is_label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L169" class="LineNr">169 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='054static_dispatch.cc.html#L361'>non_ghost_size</a><span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Recipe_variants<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>name<span class="Delimiter">))</span> == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L169" class="LineNr">169 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='054static_dispatch.cc.html#L366'>non_ghost_size</a><span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Recipe_variants<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>name<span class="Delimiter">))</span> == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L170" class="LineNr">170 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction &quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L171" class="LineNr">171 </span>  <span class="Conceal">¦</span> Resolve_stack<span class="Delimiter">.</span>push_front<span class="Delimiter">(</span>call<span class="Delimiter">(</span>r<span class="Delimiter">));</span>
 <span id="L172" class="LineNr">172 </span>  <span class="Conceal">¦</span> Resolve_stack<span class="Delimiter">.</span>front<span class="Delimiter">().</span>running_step_index = index<span class="Delimiter">;</span>
@@ -245,511 +246,516 @@ if ('onhashchange' in window) {
 <span id="L180" class="LineNr">180 </span><span class="Delimiter">}</span>
 <span id="L181" class="LineNr">181 </span>
 <span id="L182" class="LineNr">182 </span>string best_variant<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="L183" class="LineNr">183 </span>  vector&lt;recipe_ordinal&gt;&amp; variants = get<span class="Delimiter">(</span>Recipe_variants<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>name<span class="Delimiter">);</span>
+<span id="L183" class="LineNr">183 </span>  <span class="Normal">const</span> vector&lt;recipe_ordinal&gt;&amp; variants = get<span class="Delimiter">(</span>Recipe_variants<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>name<span class="Delimiter">);</span>
 <span id="L184" class="LineNr">184 </span>  vector&lt;recipe_ordinal&gt; candidates<span class="Delimiter">;</span>
 <span id="L185" class="LineNr">185 </span>
 <span id="L186" class="LineNr">186 </span>  <span class="Comment">// Static Dispatch Phase 1</span>
-<span id="L187" class="LineNr">187 </span>  candidates = <a href='054static_dispatch.cc.html#L237'>strictly_matching_variants</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> variants<span class="Delimiter">);</span>
-<span id="L188" class="LineNr">188 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!candidates<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> best_variant<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> candidates<span class="Delimiter">).</span>name<span class="Delimiter">;</span>
-<span id="L189" class="LineNr">189 </span>
-<span id="L190" class="LineNr">190 </span>  <span class="Comment">// Static Dispatch Phase 2</span>
-<span id="L191" class="LineNr">191 </span>  candidates = <a href='054static_dispatch.cc.html#L266'>strictly_matching_variants_except_literal_against_address_or_boolean</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> variants<span class="Delimiter">);</span>
-<span id="L192" class="LineNr">192 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!candidates<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> best_variant<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> candidates<span class="Delimiter">).</span>name<span class="Delimiter">;</span>
-<span id="L193" class="LineNr">193 </span>
-<span id="L194" class="LineNr">194 </span>  <span class="Comment">// Static Dispatch Phase 3</span>
-<span id="L195" class="LineNr">195 </span>  <span class="Comment">//: (shape-shifting recipes in a later layer)</span>
-<span id="L196" class="LineNr">196 </span>  <span class="Comment">// End Static Dispatch Phase 3</span>
-<span id="L197" class="LineNr">197 </span>
-<span id="L198" class="LineNr">198 </span>  <span class="Comment">// Static Dispatch Phase 4</span>
-<span id="L199" class="LineNr">199 </span>  candidates = <a href='054static_dispatch.cc.html#L305'>matching_variants</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> variants<span class="Delimiter">);</span>
-<span id="L200" class="LineNr">200 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!candidates<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> best_variant<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> candidates<span class="Delimiter">).</span>name<span class="Delimiter">;</span>
-<span id="L201" class="LineNr">201 </span>
-<span id="L202" class="LineNr">202 </span>  <span class="Comment">// error messages</span>
-<span id="L203" class="LineNr">203 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &gt;= <a href='010vm.cc.html#L191'>MAX_PRIMITIVE_RECIPES</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>  <span class="Comment">// we currently don't check types for primitive variants</span>
-<span id="L204" class="LineNr">204 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>variants<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L205" class="LineNr">205 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;types don't match in call for '&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; end<span class="Delimiter">();</span>
-<span id="L206" class="LineNr">206 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;  which tries to call '&quot;</span> &lt;&lt; original_header_label<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><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#L197'>end</a><span class="Delimiter">();</span>
-<span id="L207" class="LineNr">207 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L208" class="LineNr">208 </span>  <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L209" class="LineNr">209 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;failed to find a matching call for '&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#L197'>end</a><span class="Delimiter">();</span>
-<span id="L210" class="LineNr">210 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;  available variants are:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L211" class="LineNr">211 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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>variants<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L212" class="LineNr">212 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;    &quot;</span> &lt;&lt; <a href='054static_dispatch.cc.html#L585'>original_header_label</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L213" class="LineNr">213 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L214" class="LineNr">214 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span>list&lt;call&gt;::iterator p = <span class="Comment">/*</span><span class="Comment">skip</span><span class="Comment">*/</span>++Resolve_stack<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Resolve_stack<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L215" class="LineNr">215 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">const</span> recipe&amp; specializer_recipe = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>running_recipe<span class="Delimiter">);</span>
-<span id="L216" class="LineNr">216 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">const</span> instruction&amp; specializer_inst = specializer_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>running_step_index<span class="Delimiter">);</span>
-<span id="L217" class="LineNr">217 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>specializer_recipe<span class="Delimiter">.</span>name != <span class="Constant">&quot;interactive&quot;</span><span class="Delimiter">)</span>
-<span id="L218" class="LineNr">218 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;  (from '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>specializer_inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' in &quot;</span> &lt;&lt; specializer_recipe<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L219" class="LineNr">219 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">else</span>
-<span id="L220" class="LineNr">220 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;  (from '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>specializer_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#L197'>end</a><span class="Delimiter">();</span>
-<span id="L221" class="LineNr">221 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// One special-case to help with the rewrite_stash transform. (cross-layer)</span>
-<span id="L222" class="LineNr">222 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>specializer_inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;stash_&quot;</span><span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L223" class="LineNr">223 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='010vm.cc.html#L32'>instruction</a> stash_inst<span class="Delimiter">;</span>
-<span id="L224" class="LineNr">224 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='054static_dispatch.cc.html#L368'>next_stash</a><span class="Delimiter">(</span>*p<span class="Delimiter">,</span> &amp;stash_inst<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L225" class="LineNr">225 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>specializer_recipe<span class="Delimiter">.</span>name != <span class="Constant">&quot;interactive&quot;</span><span class="Delimiter">)</span>
-<span id="L226" class="LineNr">226 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;  (part of '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>stash_inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' in &quot;</span> &lt;&lt; specializer_recipe<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L227" class="LineNr">227 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">else</span>
-<span id="L228" class="LineNr">228 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;  (part of '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>stash_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#L197'>end</a><span class="Delimiter">();</span>
-<span id="L229" class="LineNr">229 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L230" class="LineNr">230 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L231" class="LineNr">231 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L232" class="LineNr">232 </span>  <span class="Delimiter">}</span>
-<span id="L233" class="LineNr">233 </span>  <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L234" class="LineNr">234 </span><span class="Delimiter">}</span>
-<span id="L235" class="LineNr">235 </span>
-<span id="L236" class="LineNr">236 </span><span class="Comment">// phase 1</span>
-<span id="L237" class="LineNr">237 </span>vector&lt;recipe_ordinal&gt; <a href='054static_dispatch.cc.html#L237'>strictly_matching_variants</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> vector&lt;recipe_ordinal&gt;&amp; variants<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L238" class="LineNr">238 </span>  vector&lt;recipe_ordinal&gt; result<span class="Delimiter">;</span>
-<span id="L239" class="LineNr">239 </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>variants<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L240" class="LineNr">240 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> == -<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L241" class="LineNr">241 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking variant (strict) &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; header_label<span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><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='054static_dispatch.cc.html#L248'>all_header_reagents_strictly_match</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))))</span>
-<span id="L243" class="LineNr">243 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L244" class="LineNr">244 </span>  <span class="Delimiter">}</span>
-<span id="L245" class="LineNr">245 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L246" class="LineNr">246 </span><span class="Delimiter">}</span>
-<span id="L247" class="LineNr">247 </span>
-<span id="L248" class="LineNr">248 </span><span class="Normal">bool</span> <a href='054static_dispatch.cc.html#L248'>all_header_reagents_strictly_match</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; variant<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L249" class="LineNr">249 </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; 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>variant<span class="Delimiter">.</span>ingredients<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="Normal">if</span> <span class="Delimiter">(</span>!types_strictly_match<span class="Delimiter">(</span>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<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="L251" class="LineNr">251 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;strict match failed: ingredient &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L252" class="LineNr">252 </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="L253" class="LineNr">253 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L254" class="LineNr">254 </span>  <span class="Delimiter">}</span>
-<span id="L255" class="LineNr">255 </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; 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>variant<span class="Delimiter">.</span>products<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L256" class="LineNr">256 </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="L257" class="LineNr">257 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_strictly_match<span class="Delimiter">(</span>variant<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 class="Delimiter">{</span>
-<span id="L258" class="LineNr">258 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;strict match failed: product &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L259" class="LineNr">259 </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="L260" class="LineNr">260 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L261" class="LineNr">261 </span>  <span class="Delimiter">}</span>
-<span id="L262" class="LineNr">262 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L263" class="LineNr">263 </span><span class="Delimiter">}</span>
-<span id="L264" class="LineNr">264 </span>
-<span id="L265" class="LineNr">265 </span><span class="Comment">// phase 2</span>
-<span id="L266" class="LineNr">266 </span>vector&lt;recipe_ordinal&gt; <a href='054static_dispatch.cc.html#L266'>strictly_matching_variants_except_literal_against_address_or_boolean</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> vector&lt;recipe_ordinal&gt;&amp; variants<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L267" class="LineNr">267 </span>  vector&lt;recipe_ordinal&gt; result<span class="Delimiter">;</span>
-<span id="L268" class="LineNr">268 </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>variants<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L269" class="LineNr">269 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> == -<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L270" class="LineNr">270 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking variant (strict except literal-against-boolean) &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; header_label<span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L271" class="LineNr">271 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='054static_dispatch.cc.html#L277'>all_header_reagents_strictly_match_except_literal_against_address_or_boolean</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))))</span>
-<span id="L272" class="LineNr">272 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L273" class="LineNr">273 </span>  <span class="Delimiter">}</span>
-<span id="L274" class="LineNr">274 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L275" class="LineNr">275 </span><span class="Delimiter">}</span>
-<span id="L276" class="LineNr">276 </span>
-<span id="L277" class="LineNr">277 </span><span class="Normal">bool</span> <a href='054static_dispatch.cc.html#L277'>all_header_reagents_strictly_match_except_literal_against_address_or_boolean</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; variant<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L278" class="LineNr">278 </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; 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>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L279" class="LineNr">279 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_strictly_match_except_literal_against_address_or_boolean<span class="Delimiter">(</span>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<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="L280" class="LineNr">280 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;match failed: ingredient &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L281" class="LineNr">281 </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="L282" class="LineNr">282 </span>  <span class="Conceal">¦</span> <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">for</span> <span class="Delimiter">(</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>variant<span class="Delimiter">.</span>products<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>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L285" class="LineNr">285 </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="L286" class="LineNr">286 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_strictly_match_except_literal_against_address_or_boolean<span class="Delimiter">(</span>variant<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 class="Delimiter">{</span>
-<span id="L287" class="LineNr">287 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;match failed: product &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L288" class="LineNr">288 </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="L289" class="LineNr">289 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L290" class="LineNr">290 </span>  <span class="Delimiter">}</span>
-<span id="L291" class="LineNr">291 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L292" class="LineNr">292 </span><span class="Delimiter">}</span>
-<span id="L293" class="LineNr">293 </span>
-<span id="L294" class="LineNr">294 </span><span class="Normal">bool</span> <a href='054static_dispatch.cc.html#L294'>types_strictly_match_except_literal_against_address_or_boolean</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; to<span class="Delimiter">,</span> <span class="Normal">const</span> reagent&amp; from<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L295" class="LineNr">295 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>from<span class="Delimiter">)</span> &amp;&amp; <a href='021check_instruction.cc.html#L224'>is_mu_boolean</a><span class="Delimiter">(</span>to<span class="Delimiter">))</span>
-<span id="L296" class="LineNr">296 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> from<span class="Delimiter">.</span>name == <span class="Constant">&quot;0&quot;</span> || from<span class="Delimiter">.</span>name == <span class="Constant">&quot;1&quot;</span><span class="Delimiter">;</span>
-<span id="L297" class="LineNr">297 </span>  <span class="Comment">// Match Literal Zero Against Address {</span>
-<span id="L298" class="LineNr">298 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>from<span class="Delimiter">)</span> &amp;&amp; is_mu_address<span class="Delimiter">(</span>to<span class="Delimiter">))</span>
-<span id="L299" class="LineNr">299 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> from<span class="Delimiter">.</span>name == <span class="Constant">&quot;0&quot;</span><span class="Delimiter">;</span>
-<span id="L300" class="LineNr">300 </span>  <span class="Comment">// }</span>
-<span id="L301" class="LineNr">301 </span>  <span class="Identifier">return</span> types_strictly_match<span class="Delimiter">(</span>to<span class="Delimiter">,</span> from<span class="Delimiter">);</span>
-<span id="L302" class="LineNr">302 </span><span class="Delimiter">}</span>
-<span id="L303" class="LineNr">303 </span>
-<span id="L304" class="LineNr">304 </span><span class="Comment">// phase 4</span>
-<span id="L305" class="LineNr">305 </span>vector&lt;recipe_ordinal&gt; <a href='054static_dispatch.cc.html#L305'>matching_variants</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> vector&lt;recipe_ordinal&gt;&amp; variants<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L306" class="LineNr">306 </span>  vector&lt;recipe_ordinal&gt; result<span class="Delimiter">;</span>
-<span id="L307" class="LineNr">307 </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>variants<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L308" class="LineNr">308 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> == -<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L309" class="LineNr">309 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking variant &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; header_label<span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L310" class="LineNr">310 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='054static_dispatch.cc.html#L316'>all_header_reagents_match</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))))</span>
-<span id="L311" class="LineNr">311 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L312" class="LineNr">312 </span>  <span class="Delimiter">}</span>
-<span id="L313" class="LineNr">313 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L314" class="LineNr">314 </span><span class="Delimiter">}</span>
-<span id="L315" class="LineNr">315 </span>
-<span id="L316" class="LineNr">316 </span><span class="Normal">bool</span> <a href='054static_dispatch.cc.html#L316'>all_header_reagents_match</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; variant<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L317" class="LineNr">317 </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; 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>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L318" class="LineNr">318 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_match<span class="Delimiter">(</span>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<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="L319" class="LineNr">319 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;match failed: ingredient &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L320" class="LineNr">320 </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="L321" class="LineNr">321 </span>  <span class="Conceal">¦</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">for</span> <span class="Delimiter">(</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>variant<span class="Delimiter">.</span>products<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>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L324" class="LineNr">324 </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="L325" class="LineNr">325 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_match<span class="Delimiter">(</span>variant<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 class="Delimiter">{</span>
-<span id="L326" class="LineNr">326 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;match failed: product &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L327" class="LineNr">327 </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="L328" class="LineNr">328 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L329" class="LineNr">329 </span>  <span class="Delimiter">}</span>
-<span id="L330" class="LineNr">330 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L331" class="LineNr">331 </span><span class="Delimiter">}</span>
-<span id="L332" class="LineNr">332 </span>
-<span id="L333" class="LineNr">333 </span><span class="Comment">// tie-breaker for each phase</span>
-<span id="L334" class="LineNr">334 </span><span class="Normal">const</span> recipe&amp; best_variant<span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> vector&lt;recipe_ordinal&gt;&amp; candidates<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L335" class="LineNr">335 </span>  assert<span class="Delimiter">(</span>!candidates<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L336" class="LineNr">336 </span>  <span class="Normal">int</span> min_score = <span class="Constant">999</span><span class="Delimiter">;</span>
-<span id="L337" class="LineNr">337 </span>  <span class="Normal">int</span> min_index = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L338" class="LineNr">338 </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>candidates<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L339" class="LineNr">339 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> recipe&amp; candidate = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> candidates<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L340" class="LineNr">340 </span>  <span class="Conceal">¦</span> <span class="Comment">// prefer functions without extra or missing ingredients or products</span>
-<span id="L341" class="LineNr">341 </span>  <span class="Conceal">¦</span> <span class="Normal">int</span> score = abs<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>candidate<span class="Delimiter">.</span>products<span class="Delimiter">)</span>-SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">))</span>
-<span id="L342" class="LineNr">342 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span>     + abs<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>candidate<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span>-SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">));</span>
-<span id="L343" class="LineNr">343 </span>  <span class="Conceal">¦</span> <span class="Comment">// prefer functions with non-address ingredients or products</span>
-<span id="L344" class="LineNr">344 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>candidate<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L345" class="LineNr">345 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>candidate<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span>
-<span id="L346" class="LineNr">346 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++score<span class="Delimiter">;</span>
-<span id="L347" class="LineNr">347 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L348" class="LineNr">348 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>candidate<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L349" class="LineNr">349 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>candidate<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span>
-<span id="L350" class="LineNr">350 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++score<span class="Delimiter">;</span>
-<span id="L351" class="LineNr">351 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L352" class="LineNr">352 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>score &lt; <span class="Constant">999</span><span class="Delimiter">);</span>
-<span id="L353" class="LineNr">353 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>score &lt; min_score<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L354" class="LineNr">354 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> min_score = score<span class="Delimiter">;</span>
-<span id="L355" class="LineNr">355 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> min_index = i<span class="Delimiter">;</span>
+<span id="L187" class="LineNr">187 </span><span class="CommentedCode">//?   cerr &lt;&lt; inst.name &lt;&lt; &quot; phase 1\n&quot;;</span>
+<span id="L188" class="LineNr">188 </span>  candidates = <a href='054static_dispatch.cc.html#L241'>strictly_matching_variants</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> variants<span class="Delimiter">);</span>
+<span id="L189" class="LineNr">189 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!candidates<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> best_variant<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> candidates<span class="Delimiter">).</span>name<span class="Delimiter">;</span>
+<span id="L190" class="LineNr">190 </span>
+<span id="L191" class="LineNr">191 </span>  <span class="Comment">// Static Dispatch Phase 2</span>
+<span id="L192" class="LineNr">192 </span><span class="CommentedCode">//?   cerr &lt;&lt; inst.name &lt;&lt; &quot; phase 2\n&quot;;</span>
+<span id="L193" class="LineNr">193 </span>  candidates = <a href='054static_dispatch.cc.html#L270'>strictly_matching_variants_except_literal_against_address_or_boolean</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> variants<span class="Delimiter">);</span>
+<span id="L194" class="LineNr">194 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!candidates<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> best_variant<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> candidates<span class="Delimiter">).</span>name<span class="Delimiter">;</span>
+<span id="L195" class="LineNr">195 </span>
+<span id="L196" class="LineNr">196 </span><span class="CommentedCode">//?   cerr &lt;&lt; inst.name &lt;&lt; &quot; phase 3\n&quot;;</span>
+<span id="L197" class="LineNr">197 </span>  <span class="Comment">// Static Dispatch Phase 3</span>
+<span id="L198" class="LineNr">198 </span>  <span class="Comment">//: (shape-shifting recipes in a later layer)</span>
+<span id="L199" class="LineNr">199 </span>  <span class="Comment">// End Static Dispatch Phase 3</span>
+<span id="L200" class="LineNr">200 </span>
+<span id="L201" class="LineNr">201 </span>  <span class="Comment">// Static Dispatch Phase 4</span>
+<span id="L202" class="LineNr">202 </span><span class="CommentedCode">//?   cerr &lt;&lt; inst.name &lt;&lt; &quot; phase 4\n&quot;;</span>
+<span id="L203" class="LineNr">203 </span>  candidates = <a href='054static_dispatch.cc.html#L309'>matching_variants</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> variants<span class="Delimiter">);</span>
+<span id="L204" class="LineNr">204 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!candidates<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> best_variant<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> candidates<span class="Delimiter">).</span>name<span class="Delimiter">;</span>
+<span id="L205" class="LineNr">205 </span>
+<span id="L206" class="LineNr">206 </span>  <span class="Comment">// error messages</span>
+<span id="L207" class="LineNr">207 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_primitive<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>name<span class="Delimiter">)))</span> <span class="Delimiter">{</span>  <span class="Comment">// we currently don't check types for primitive variants</span>
+<span id="L208" class="LineNr">208 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>variants<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L209" class="LineNr">209 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;types don't match in call for '&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; end<span class="Delimiter">();</span>
+<span id="L210" class="LineNr">210 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;  which tries to call '&quot;</span> &lt;&lt; original_header_label<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L211" class="LineNr">211 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L212" class="LineNr">212 </span>  <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L213" class="LineNr">213 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;failed to find a matching call for '&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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L214" class="LineNr">214 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;  available variants are:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L215" class="LineNr">215 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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>variants<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L216" class="LineNr">216 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;    &quot;</span> &lt;&lt; <a href='054static_dispatch.cc.html#L590'>original_header_label</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L217" class="LineNr">217 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L218" class="LineNr">218 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span>list&lt;call&gt;::iterator p = <span class="Comment">/*</span><span class="Comment">skip</span><span class="Comment">*/</span>++Resolve_stack<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Resolve_stack<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L219" class="LineNr">219 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">const</span> recipe&amp; specializer_recipe = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>running_recipe<span class="Delimiter">);</span>
+<span id="L220" class="LineNr">220 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">const</span> instruction&amp; specializer_inst = specializer_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>running_step_index<span class="Delimiter">);</span>
+<span id="L221" class="LineNr">221 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>specializer_recipe<span class="Delimiter">.</span>name != <span class="Constant">&quot;interactive&quot;</span><span class="Delimiter">)</span>
+<span id="L222" class="LineNr">222 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;  (from '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>specializer_inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' in &quot;</span> &lt;&lt; specializer_recipe<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L223" class="LineNr">223 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">else</span>
+<span id="L224" class="LineNr">224 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;  (from '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>specializer_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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L225" class="LineNr">225 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// One special-case to help with the rewrite_stash transform. (cross-layer)</span>
+<span id="L226" class="LineNr">226 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>specializer_inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;stash_&quot;</span><span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L227" class="LineNr">227 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='010vm.cc.html#L32'>instruction</a> stash_inst<span class="Delimiter">;</span>
+<span id="L228" class="LineNr">228 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='054static_dispatch.cc.html#L373'>next_stash</a><span class="Delimiter">(</span>*p<span class="Delimiter">,</span> &amp;stash_inst<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L229" class="LineNr">229 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>specializer_recipe<span class="Delimiter">.</span>name != <span class="Constant">&quot;interactive&quot;</span><span class="Delimiter">)</span>
+<span id="L230" class="LineNr">230 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;  (part of '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>stash_inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' in &quot;</span> &lt;&lt; specializer_recipe<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L231" class="LineNr">231 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">else</span>
+<span id="L232" class="LineNr">232 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;  (part of '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>stash_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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L233" class="LineNr">233 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L234" class="LineNr">234 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L235" class="LineNr">235 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L236" class="LineNr">236 </span>  <span class="Delimiter">}</span>
+<span id="L237" class="LineNr">237 </span>  <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L238" class="LineNr">238 </span><span class="Delimiter">}</span>
+<span id="L239" class="LineNr">239 </span>
+<span id="L240" class="LineNr">240 </span><span class="Comment">// phase 1</span>
+<span id="L241" class="LineNr">241 </span>vector&lt;recipe_ordinal&gt; <a href='054static_dispatch.cc.html#L241'>strictly_matching_variants</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> vector&lt;recipe_ordinal&gt;&amp; variants<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L242" class="LineNr">242 </span>  vector&lt;recipe_ordinal&gt; result<span class="Delimiter">;</span>
+<span id="L243" class="LineNr">243 </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>variants<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="Normal">if</span> <span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> == -<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L245" class="LineNr">245 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking variant (strict) &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; header_label<span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L246" class="LineNr">246 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='054static_dispatch.cc.html#L252'>all_header_reagents_strictly_match</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> variants<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> result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L248" class="LineNr">248 </span>  <span class="Delimiter">}</span>
+<span id="L249" class="LineNr">249 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L250" class="LineNr">250 </span><span class="Delimiter">}</span>
+<span id="L251" class="LineNr">251 </span>
+<span id="L252" class="LineNr">252 </span><span class="Normal">bool</span> <a href='054static_dispatch.cc.html#L252'>all_header_reagents_strictly_match</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; variant<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L253" class="LineNr">253 </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; 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>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L254" class="LineNr">254 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_strictly_match<span class="Delimiter">(</span>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<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="L255" class="LineNr">255 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;strict match failed: ingredient &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L256" class="LineNr">256 </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="L257" class="LineNr">257 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L258" class="LineNr">258 </span>  <span class="Delimiter">}</span>
+<span id="L259" class="LineNr">259 </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; 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>variant<span class="Delimiter">.</span>products<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L260" class="LineNr">260 </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="L261" class="LineNr">261 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_strictly_match<span class="Delimiter">(</span>variant<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 class="Delimiter">{</span>
+<span id="L262" class="LineNr">262 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;strict match failed: product &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L263" class="LineNr">263 </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="L264" class="LineNr">264 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L265" class="LineNr">265 </span>  <span class="Delimiter">}</span>
+<span id="L266" class="LineNr">266 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L267" class="LineNr">267 </span><span class="Delimiter">}</span>
+<span id="L268" class="LineNr">268 </span>
+<span id="L269" class="LineNr">269 </span><span class="Comment">// phase 2</span>
+<span id="L270" class="LineNr">270 </span>vector&lt;recipe_ordinal&gt; <a href='054static_dispatch.cc.html#L270'>strictly_matching_variants_except_literal_against_address_or_boolean</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> vector&lt;recipe_ordinal&gt;&amp; variants<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L271" class="LineNr">271 </span>  vector&lt;recipe_ordinal&gt; result<span class="Delimiter">;</span>
+<span id="L272" class="LineNr">272 </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>variants<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L273" class="LineNr">273 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> == -<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L274" class="LineNr">274 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking variant (strict except literal-against-boolean) &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; header_label<span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L275" class="LineNr">275 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='054static_dispatch.cc.html#L281'>all_header_reagents_strictly_match_except_literal_against_address_or_boolean</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))))</span>
+<span id="L276" class="LineNr">276 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L277" class="LineNr">277 </span>  <span class="Delimiter">}</span>
+<span id="L278" class="LineNr">278 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L279" class="LineNr">279 </span><span class="Delimiter">}</span>
+<span id="L280" class="LineNr">280 </span>
+<span id="L281" class="LineNr">281 </span><span class="Normal">bool</span> <a href='054static_dispatch.cc.html#L281'>all_header_reagents_strictly_match_except_literal_against_address_or_boolean</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; variant<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L282" class="LineNr">282 </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; 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>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L283" class="LineNr">283 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_strictly_match_except_literal_against_address_or_boolean<span class="Delimiter">(</span>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<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="L284" class="LineNr">284 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;match failed: ingredient &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L285" class="LineNr">285 </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="L286" class="LineNr">286 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L287" class="LineNr">287 </span>  <span class="Delimiter">}</span>
+<span id="L288" class="LineNr">288 </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; min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>products<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>  ++i<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>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="L290" class="LineNr">290 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_strictly_match_except_literal_against_address_or_boolean<span class="Delimiter">(</span>variant<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 class="Delimiter">{</span>
+<span id="L291" class="LineNr">291 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;match failed: product &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L292" class="LineNr">292 </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="L293" class="LineNr">293 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L294" class="LineNr">294 </span>  <span class="Delimiter">}</span>
+<span id="L295" class="LineNr">295 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L296" class="LineNr">296 </span><span class="Delimiter">}</span>
+<span id="L297" class="LineNr">297 </span>
+<span id="L298" class="LineNr">298 </span><span class="Normal">bool</span> <a href='054static_dispatch.cc.html#L298'>types_strictly_match_except_literal_against_address_or_boolean</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; to<span class="Delimiter">,</span> <span class="Normal">const</span> reagent&amp; from<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L299" class="LineNr">299 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>from<span class="Delimiter">)</span> &amp;&amp; <a href='021check_instruction.cc.html#L224'>is_mu_boolean</a><span class="Delimiter">(</span>to<span class="Delimiter">))</span>
+<span id="L300" class="LineNr">300 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> from<span class="Delimiter">.</span>name == <span class="Constant">&quot;0&quot;</span> || from<span class="Delimiter">.</span>name == <span class="Constant">&quot;1&quot;</span><span class="Delimiter">;</span>
+<span id="L301" class="LineNr">301 </span>  <span class="Comment">// Match Literal Zero Against Address {</span>
+<span id="L302" class="LineNr">302 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>from<span class="Delimiter">)</span> &amp;&amp; is_mu_address<span class="Delimiter">(</span>to<span class="Delimiter">))</span>
+<span id="L303" class="LineNr">303 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> from<span class="Delimiter">.</span>name == <span class="Constant">&quot;0&quot;</span><span class="Delimiter">;</span>
+<span id="L304" class="LineNr">304 </span>  <span class="Comment">// }</span>
+<span id="L305" class="LineNr">305 </span>  <span class="Identifier">return</span> types_strictly_match<span class="Delimiter">(</span>to<span class="Delimiter">,</span> from<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="Comment">// phase 4</span>
+<span id="L309" class="LineNr">309 </span>vector&lt;recipe_ordinal&gt; <a href='054static_dispatch.cc.html#L309'>matching_variants</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> vector&lt;recipe_ordinal&gt;&amp; variants<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L310" class="LineNr">310 </span>  vector&lt;recipe_ordinal&gt; result<span class="Delimiter">;</span>
+<span id="L311" class="LineNr">311 </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>variants<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L312" class="LineNr">312 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> == -<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L313" class="LineNr">313 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking variant &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; header_label<span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L314" class="LineNr">314 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='054static_dispatch.cc.html#L320'>all_header_reagents_match</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))))</span>
+<span id="L315" class="LineNr">315 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L316" class="LineNr">316 </span>  <span class="Delimiter">}</span>
+<span id="L317" class="LineNr">317 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L318" class="LineNr">318 </span><span class="Delimiter">}</span>
+<span id="L319" class="LineNr">319 </span>
+<span id="L320" class="LineNr">320 </span><span class="Normal">bool</span> <a href='054static_dispatch.cc.html#L320'>all_header_reagents_match</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; variant<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L321" class="LineNr">321 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="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>ingredients<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L322" class="LineNr">322 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_match<span class="Delimiter">(</span>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<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="L323" class="LineNr">323 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;match failed: ingredient &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L324" class="LineNr">324 </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="L325" class="LineNr">325 </span>  <span class="Conceal">¦</span> <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">for</span> <span class="Delimiter">(</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>variant<span class="Delimiter">.</span>products<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>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L328" class="LineNr">328 </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="L329" class="LineNr">329 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_match<span class="Delimiter">(</span>variant<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 class="Delimiter">{</span>
+<span id="L330" class="LineNr">330 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;match failed: product &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L331" class="LineNr">331 </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="L332" class="LineNr">332 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L333" class="LineNr">333 </span>  <span class="Delimiter">}</span>
+<span id="L334" class="LineNr">334 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L335" class="LineNr">335 </span><span class="Delimiter">}</span>
+<span id="L336" class="LineNr">336 </span>
+<span id="L337" class="LineNr">337 </span><span class="Comment">// tie-breaker for each phase</span>
+<span id="L338" class="LineNr">338 </span><span class="Normal">const</span> recipe&amp; best_variant<span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> vector&lt;recipe_ordinal&gt;&amp; candidates<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L339" class="LineNr">339 </span>  assert<span class="Delimiter">(</span>!candidates<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L340" class="LineNr">340 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>candidates<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">return</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> candidates<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
+<span id="L341" class="LineNr">341 </span>  <span class="Normal">int</span> min_score = <span class="Constant">999</span><span class="Delimiter">;</span>
+<span id="L342" class="LineNr">342 </span>  <span class="Normal">int</span> min_index = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L343" class="LineNr">343 </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>candidates<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L344" class="LineNr">344 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> recipe&amp; candidate = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> candidates<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L345" class="LineNr">345 </span>  <span class="Conceal">¦</span> <span class="Comment">// prefer functions without extra or missing ingredients or products</span>
+<span id="L346" class="LineNr">346 </span>  <span class="Conceal">¦</span> <span class="Normal">int</span> score = abs<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>candidate<span class="Delimiter">.</span>products<span class="Delimiter">)</span>-SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">))</span>
+<span id="L347" class="LineNr">347 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span>     + abs<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>candidate<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span>-SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">));</span>
+<span id="L348" class="LineNr">348 </span>  <span class="Conceal">¦</span> <span class="Comment">// prefer functions with non-address ingredients or products</span>
+<span id="L349" class="LineNr">349 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>candidate<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L350" class="LineNr">350 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>candidate<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span>
+<span id="L351" class="LineNr">351 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++score<span class="Delimiter">;</span>
+<span id="L352" class="LineNr">352 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L353" class="LineNr">353 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>candidate<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L354" class="LineNr">354 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>candidate<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span>
+<span id="L355" class="LineNr">355 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++score<span class="Delimiter">;</span>
 <span id="L356" class="LineNr">356 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L357" class="LineNr">357 </span>  <span class="Delimiter">}</span>
-<span id="L358" class="LineNr">358 </span>  <span class="Identifier">return</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> candidates<span class="Delimiter">.</span>at<span class="Delimiter">(</span>min_index<span class="Delimiter">));</span>
-<span id="L359" class="LineNr">359 </span><span class="Delimiter">}</span>
-<span id="L360" class="LineNr">360 </span>
-<span id="L361" class="LineNr">361 </span><span class="Normal">int</span> <a href='054static_dispatch.cc.html#L361'>non_ghost_size</a><span class="Delimiter">(</span>vector&lt;recipe_ordinal&gt;&amp; variants<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L362" class="LineNr">362 </span>  <span class="Normal">int</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L363" class="LineNr">363 </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>variants<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L364" class="LineNr">364 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> != -<span class="Constant">1</span><span class="Delimiter">)</span> ++result<span class="Delimiter">;</span>
-<span id="L365" class="LineNr">365 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L366" class="LineNr">366 </span><span class="Delimiter">}</span>
-<span id="L367" class="LineNr">367 </span>
-<span id="L368" class="LineNr">368 </span><span class="Normal">bool</span> <a href='054static_dispatch.cc.html#L368'>next_stash</a><span class="Delimiter">(</span><span class="Normal">const</span> call&amp; c<span class="Delimiter">,</span> instruction* stash_inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L369" class="LineNr">369 </span>  <span class="Normal">const</span> recipe&amp; specializer_recipe = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> c<span class="Delimiter">.</span>running_recipe<span class="Delimiter">);</span>
-<span id="L370" class="LineNr">370 </span>  <span class="Normal">int</span> index = c<span class="Delimiter">.</span>running_step_index<span class="Delimiter">;</span>
-<span id="L371" class="LineNr">371 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>++index<span class="Delimiter">;</span>  index &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>specializer_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L372" class="LineNr">372 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> instruction&amp; inst = specializer_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>index<span class="Delimiter">);</span>
-<span id="L373" class="LineNr">373 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;stash&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L374" class="LineNr">374 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> *stash_inst = inst<span class="Delimiter">;</span>
-<span id="L375" class="LineNr">375 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L376" class="LineNr">376 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L377" class="LineNr">377 </span>  <span class="Delimiter">}</span>
-<span id="L378" class="LineNr">378 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L379" class="LineNr">379 </span><span class="Delimiter">}</span>
-<span id="L380" class="LineNr">380 </span>
-<span id="L381" class="LineNr">381 </span><span class="Delimiter">:(scenario static_dispatch_disabled_in_recipe_without_variants)</span>
-<span id="L382" class="LineNr">382 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L383" class="LineNr">383 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>test <span class="Constant">3</span>
-<span id="L384" class="LineNr">384 </span>]
-<span id="L385" class="LineNr">385 </span><span class="muRecipe">def</span> test [
-<span id="L386" class="LineNr">386 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>next-ingredient  <span class="Comment"># ensure no header</span>
-<span id="L387" class="LineNr">387 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
-<span id="L388" class="LineNr">388 </span>]
-<span id="L389" class="LineNr">389 </span><span class="traceContains">+mem: storing 34 in location 1</span>
-<span id="L390" class="LineNr">390 </span>
-<span id="L391" class="LineNr">391 </span><span class="Delimiter">:(scenario static_dispatch_disabled_on_headerless_definition)</span>
-<span id="L392" class="LineNr">392 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L393" class="LineNr">393 </span><span class="muRecipe">def</span> test a:num<span class="muRecipe"> -&gt; </span>z:num [
-<span id="L394" class="LineNr">394 </span>  z<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
-<span id="L395" class="LineNr">395 </span>]
-<span id="L396" class="LineNr">396 </span><span class="muRecipe">def</span> test [
-<span id="L397" class="LineNr">397 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
-<span id="L398" class="LineNr">398 </span>]
-<span id="L399" class="LineNr">399 </span><span class="traceContains">+error: redefining <a href='010vm.cc.html#L19'>recipe</a> test</span>
-<span id="L400" class="LineNr">400 </span>
-<span id="L401" class="LineNr">401 </span><span class="Delimiter">:(scenario static_dispatch_disabled_on_headerless_definition_2)</span>
-<span id="L402" class="LineNr">402 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L403" class="LineNr">403 </span><span class="muRecipe">def</span> test [
-<span id="L404" class="LineNr">404 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
-<span id="L405" class="LineNr">405 </span>]
-<span id="L406" class="LineNr">406 </span><span class="muRecipe">def</span> test a:num<span class="muRecipe"> -&gt; </span>z:num [
-<span id="L407" class="LineNr">407 </span>  z<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
-<span id="L408" class="LineNr">408 </span>]
-<span id="L409" class="LineNr">409 </span><span class="traceContains">+error: redefining <a href='010vm.cc.html#L19'>recipe</a> test</span>
-<span id="L410" class="LineNr">410 </span>
-<span id="L411" class="LineNr">411 </span><span class="Delimiter">:(scenario static_dispatch_on_primitive_names)</span>
-<span id="L412" class="LineNr">412 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L413" class="LineNr">413 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L414" class="LineNr">414 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L415" class="LineNr">415 </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="L416" class="LineNr">416 </span>  <span class="Constant">4</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>copy <span class="Constant">0</span>/<span class="Constant">false</span>
-<span id="L417" class="LineNr">417 </span>  <span class="Constant">5</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>copy <span class="Constant">0</span>/<span class="Constant">false</span>
-<span id="L418" class="LineNr">418 </span>  <span class="Constant">6</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>equal <span class="Constant">4</span>:<span class="Normal">bool</span><span class="Delimiter">,</span> <span class="Constant">5</span>:<span class="Normal">bool</span>
-<span id="L419" class="LineNr">419 </span>]
-<span id="L420" class="LineNr">420 </span><span class="Comment"># temporarily hardcode number equality to always fail</span>
-<span id="L421" class="LineNr">421 </span><span class="muRecipe">def</span> equal x:num<span class="Delimiter">,</span> y:num<span class="muRecipe"> -&gt; </span>z:<span class="Normal">bool</span> [
-<span id="L422" class="LineNr">422 </span>  local-scope
-<span id="L423" class="LineNr">423 </span>  load-ingredients
-<span id="L424" class="LineNr">424 </span>  z<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>/<span class="Constant">false</span>
-<span id="L425" class="LineNr">425 </span>]
-<span id="L426" class="LineNr">426 </span><span class="Comment"># comparing numbers used overload</span>
-<span id="L427" class="LineNr">427 </span><span class="traceContains">+mem: storing 0 in location 3</span>
-<span id="L428" class="LineNr">428 </span><span class="Comment"># comparing booleans continues to use primitive</span>
-<span id="L429" class="LineNr">429 </span><span class="traceContains">+mem: storing 1 in location 6</span>
-<span id="L430" class="LineNr">430 </span>
-<span id="L431" class="LineNr">431 </span><span class="Delimiter">:(scenario static_dispatch_works_with_dummy_results_for_containers)</span>
-<span id="L432" class="LineNr">432 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L433" class="LineNr">433 </span>  _<span class="Special"> &lt;- </span>test <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">4</span>
-<span id="L434" class="LineNr">434 </span>]
-<span id="L435" class="LineNr">435 </span><span class="muRecipe">def</span> test a:num<span class="muRecipe"> -&gt; </span>z:point [
-<span id="L436" class="LineNr">436 </span>  local-scope
-<span id="L437" class="LineNr">437 </span>  load-ingredients
-<span id="L438" class="LineNr">438 </span>  z<span class="Special"> &lt;- </span>merge a<span class="Delimiter">,</span> <span class="Constant">0</span>
+<span id="L357" class="LineNr">357 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>score &lt; <span class="Constant">999</span><span class="Delimiter">);</span>
+<span id="L358" class="LineNr">358 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>score &lt; min_score<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L359" class="LineNr">359 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> min_score = score<span class="Delimiter">;</span>
+<span id="L360" class="LineNr">360 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> min_index = i<span class="Delimiter">;</span>
+<span id="L361" class="LineNr">361 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L362" class="LineNr">362 </span>  <span class="Delimiter">}</span>
+<span id="L363" class="LineNr">363 </span>  <span class="Identifier">return</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> candidates<span class="Delimiter">.</span>at<span class="Delimiter">(</span>min_index<span class="Delimiter">));</span>
+<span id="L364" class="LineNr">364 </span><span class="Delimiter">}</span>
+<span id="L365" class="LineNr">365 </span>
+<span id="L366" class="LineNr">366 </span><span class="Normal">int</span> <a href='054static_dispatch.cc.html#L366'>non_ghost_size</a><span class="Delimiter">(</span>vector&lt;recipe_ordinal&gt;&amp; variants<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L367" class="LineNr">367 </span>  <span class="Normal">int</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L368" class="LineNr">368 </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>variants<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L369" class="LineNr">369 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> != -<span class="Constant">1</span><span class="Delimiter">)</span> ++result<span class="Delimiter">;</span>
+<span id="L370" class="LineNr">370 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L371" class="LineNr">371 </span><span class="Delimiter">}</span>
+<span id="L372" class="LineNr">372 </span>
+<span id="L373" class="LineNr">373 </span><span class="Normal">bool</span> <a href='054static_dispatch.cc.html#L373'>next_stash</a><span class="Delimiter">(</span><span class="Normal">const</span> call&amp; c<span class="Delimiter">,</span> instruction* stash_inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L374" class="LineNr">374 </span>  <span class="Normal">const</span> recipe&amp; specializer_recipe = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> c<span class="Delimiter">.</span>running_recipe<span class="Delimiter">);</span>
+<span id="L375" class="LineNr">375 </span>  <span class="Normal">int</span> index = c<span class="Delimiter">.</span>running_step_index<span class="Delimiter">;</span>
+<span id="L376" class="LineNr">376 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>++index<span class="Delimiter">;</span>  index &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>specializer_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L377" class="LineNr">377 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> instruction&amp; inst = specializer_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>index<span class="Delimiter">);</span>
+<span id="L378" class="LineNr">378 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;stash&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L379" class="LineNr">379 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> *stash_inst = inst<span class="Delimiter">;</span>
+<span id="L380" class="LineNr">380 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L381" class="LineNr">381 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L382" class="LineNr">382 </span>  <span class="Delimiter">}</span>
+<span id="L383" class="LineNr">383 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L384" class="LineNr">384 </span><span class="Delimiter">}</span>
+<span id="L385" class="LineNr">385 </span>
+<span id="L386" class="LineNr">386 </span><span class="Delimiter">:(scenario static_dispatch_disabled_in_recipe_without_variants)</span>
+<span id="L387" class="LineNr">387 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L388" class="LineNr">388 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>test <span class="Constant">3</span>
+<span id="L389" class="LineNr">389 </span>]
+<span id="L390" class="LineNr">390 </span><span class="muRecipe">def</span> test [
+<span id="L391" class="LineNr">391 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>next-ingredient  <span class="Comment"># ensure no header</span>
+<span id="L392" class="LineNr">392 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
+<span id="L393" class="LineNr">393 </span>]
+<span id="L394" class="LineNr">394 </span><span class="traceContains">+mem: storing 34 in location 1</span>
+<span id="L395" class="LineNr">395 </span>
+<span id="L396" class="LineNr">396 </span><span class="Delimiter">:(scenario static_dispatch_disabled_on_headerless_definition)</span>
+<span id="L397" class="LineNr">397 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L398" class="LineNr">398 </span><span class="muRecipe">def</span> test a:num<span class="muRecipe"> -&gt; </span>z:num [
+<span id="L399" class="LineNr">399 </span>  z<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
+<span id="L400" class="LineNr">400 </span>]
+<span id="L401" class="LineNr">401 </span><span class="muRecipe">def</span> test [
+<span id="L402" class="LineNr">402 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
+<span id="L403" class="LineNr">403 </span>]
+<span id="L404" class="LineNr">404 </span><span class="traceContains">+error: redefining <a href='010vm.cc.html#L19'>recipe</a> test</span>
+<span id="L405" class="LineNr">405 </span>
+<span id="L406" class="LineNr">406 </span><span class="Delimiter">:(scenario static_dispatch_disabled_on_headerless_definition_2)</span>
+<span id="L407" class="LineNr">407 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L408" class="LineNr">408 </span><span class="muRecipe">def</span> test [
+<span id="L409" class="LineNr">409 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
+<span id="L410" class="LineNr">410 </span>]
+<span id="L411" class="LineNr">411 </span><span class="muRecipe">def</span> test a:num<span class="muRecipe"> -&gt; </span>z:num [
+<span id="L412" class="LineNr">412 </span>  z<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
+<span id="L413" class="LineNr">413 </span>]
+<span id="L414" class="LineNr">414 </span><span class="traceContains">+error: redefining <a href='010vm.cc.html#L19'>recipe</a> test</span>
+<span id="L415" class="LineNr">415 </span>
+<span id="L416" class="LineNr">416 </span><span class="Delimiter">:(scenario static_dispatch_on_primitive_names)</span>
+<span id="L417" class="LineNr">417 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L418" class="LineNr">418 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L419" class="LineNr">419 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L420" class="LineNr">420 </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="L421" class="LineNr">421 </span>  <span class="Constant">4</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>copy <span class="Constant">0</span>/<span class="Constant">false</span>
+<span id="L422" class="LineNr">422 </span>  <span class="Constant">5</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>copy <span class="Constant">0</span>/<span class="Constant">false</span>
+<span id="L423" class="LineNr">423 </span>  <span class="Constant">6</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>equal <span class="Constant">4</span>:<span class="Normal">bool</span><span class="Delimiter">,</span> <span class="Constant">5</span>:<span class="Normal">bool</span>
+<span id="L424" class="LineNr">424 </span>]
+<span id="L425" class="LineNr">425 </span><span class="Comment"># temporarily hardcode number equality to always fail</span>
+<span id="L426" class="LineNr">426 </span><span class="muRecipe">def</span> equal x:num<span class="Delimiter">,</span> y:num<span class="muRecipe"> -&gt; </span>z:<span class="Normal">bool</span> [
+<span id="L427" class="LineNr">427 </span>  local-scope
+<span id="L428" class="LineNr">428 </span>  load-ingredients
+<span id="L429" class="LineNr">429 </span>  z<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>/<span class="Constant">false</span>
+<span id="L430" class="LineNr">430 </span>]
+<span id="L431" class="LineNr">431 </span><span class="Comment"># comparing numbers used overload</span>
+<span id="L432" class="LineNr">432 </span><span class="traceContains">+mem: storing 0 in location 3</span>
+<span id="L433" class="LineNr">433 </span><span class="Comment"># comparing booleans continues to use primitive</span>
+<span id="L434" class="LineNr">434 </span><span class="traceContains">+mem: storing 1 in location 6</span>
+<span id="L435" class="LineNr">435 </span>
+<span id="L436" class="LineNr">436 </span><span class="Delimiter">:(scenario static_dispatch_works_with_dummy_results_for_containers)</span>
+<span id="L437" class="LineNr">437 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L438" class="LineNr">438 </span>  _<span class="Special"> &lt;- </span>test <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">4</span>
 <span id="L439" class="LineNr">439 </span>]
-<span id="L440" class="LineNr">440 </span><span class="muRecipe">def</span> test a:num<span class="Delimiter">,</span> b:num<span class="muRecipe"> -&gt; </span>z:point [
+<span id="L440" class="LineNr">440 </span><span class="muRecipe">def</span> test a:num<span class="muRecipe"> -&gt; </span>z:point [
 <span id="L441" class="LineNr">441 </span>  local-scope
 <span id="L442" class="LineNr">442 </span>  load-ingredients
-<span id="L443" class="LineNr">443 </span>  z<span class="Special"> &lt;- </span>merge a<span class="Delimiter">,</span> b
+<span id="L443" class="LineNr">443 </span>  z<span class="Special"> &lt;- </span>merge a<span class="Delimiter">,</span> <span class="Constant">0</span>
 <span id="L444" class="LineNr">444 </span>]
-<span id="L445" class="LineNr">445 </span>$error: <span class="Constant">0</span>
-<span id="L446" class="LineNr">446 </span>
-<span id="L447" class="LineNr">447 </span><span class="Delimiter">:(scenario static_dispatch_works_with_compound_type_containing_container_defined_after_first_use)</span>
-<span id="L448" class="LineNr">448 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L449" class="LineNr">449 </span>  <span class="Normal">x</span>:&amp;:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
-<span id="L450" class="LineNr">450 </span>  test x
-<span id="L451" class="LineNr">451 </span>]
-<span id="L452" class="LineNr">452 </span><span class="muData">container</span> foo [
-<span id="L453" class="LineNr">453 </span>  <span class="Normal">x</span>:num
-<span id="L454" class="LineNr">454 </span>]
-<span id="L455" class="LineNr">455 </span><span class="muRecipe">def</span> test a:&amp;:foo<span class="muRecipe"> -&gt; </span>z:num [
-<span id="L456" class="LineNr">456 </span>  local-scope
-<span id="L457" class="LineNr">457 </span>  load-ingredients
-<span id="L458" class="LineNr">458 </span>  <span class="Normal">z</span>:num<span class="Special"> &lt;- </span>get *a<span class="Delimiter">,</span> <span class="Constant">x:offset</span>
+<span id="L445" class="LineNr">445 </span><span class="muRecipe">def</span> test a:num<span class="Delimiter">,</span> b:num<span class="muRecipe"> -&gt; </span>z:point [
+<span id="L446" class="LineNr">446 </span>  local-scope
+<span id="L447" class="LineNr">447 </span>  load-ingredients
+<span id="L448" class="LineNr">448 </span>  z<span class="Special"> &lt;- </span>merge a<span class="Delimiter">,</span> b
+<span id="L449" class="LineNr">449 </span>]
+<span id="L450" class="LineNr">450 </span>$error: <span class="Constant">0</span>
+<span id="L451" class="LineNr">451 </span>
+<span id="L452" class="LineNr">452 </span><span class="Delimiter">:(scenario static_dispatch_works_with_compound_type_containing_container_defined_after_first_use)</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="Normal">x</span>:&amp;:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
+<span id="L455" class="LineNr">455 </span>  test x
+<span id="L456" class="LineNr">456 </span>]
+<span id="L457" class="LineNr">457 </span><span class="muData">container</span> foo [
+<span id="L458" class="LineNr">458 </span>  <span class="Normal">x</span>:num
 <span id="L459" class="LineNr">459 </span>]
-<span id="L460" class="LineNr">460 </span>$error: <span class="Constant">0</span>
-<span id="L461" class="LineNr">461 </span>
-<span id="L462" class="LineNr">462 </span><span class="Delimiter">:(scenario static_dispatch_works_with_compound_type_containing_container_defined_after_second_use)</span>
-<span id="L463" class="LineNr">463 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L464" class="LineNr">464 </span>  <span class="Normal">x</span>:&amp;:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
-<span id="L465" class="LineNr">465 </span>  test x
-<span id="L466" class="LineNr">466 </span>]
-<span id="L467" class="LineNr">467 </span><span class="muRecipe">def</span> test a:&amp;:foo<span class="muRecipe"> -&gt; </span>z:num [
-<span id="L468" class="LineNr">468 </span>  local-scope
-<span id="L469" class="LineNr">469 </span>  load-ingredients
-<span id="L470" class="LineNr">470 </span>  <span class="Normal">z</span>:num<span class="Special"> &lt;- </span>get *a<span class="Delimiter">,</span> <span class="Constant">x:offset</span>
+<span id="L460" class="LineNr">460 </span><span class="muRecipe">def</span> test a:&amp;:foo<span class="muRecipe"> -&gt; </span>z:num [
+<span id="L461" class="LineNr">461 </span>  local-scope
+<span id="L462" class="LineNr">462 </span>  load-ingredients
+<span id="L463" class="LineNr">463 </span>  <span class="Normal">z</span>:num<span class="Special"> &lt;- </span>get *a<span class="Delimiter">,</span> <span class="Constant">x:offset</span>
+<span id="L464" class="LineNr">464 </span>]
+<span id="L465" class="LineNr">465 </span>$error: <span class="Constant">0</span>
+<span id="L466" class="LineNr">466 </span>
+<span id="L467" class="LineNr">467 </span><span class="Delimiter">:(scenario static_dispatch_works_with_compound_type_containing_container_defined_after_second_use)</span>
+<span id="L468" class="LineNr">468 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L469" class="LineNr">469 </span>  <span class="Normal">x</span>:&amp;:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
+<span id="L470" class="LineNr">470 </span>  test x
 <span id="L471" class="LineNr">471 </span>]
-<span id="L472" class="LineNr">472 </span><span class="muData">container</span> foo [
-<span id="L473" class="LineNr">473 </span>  <span class="Normal">x</span>:num
-<span id="L474" class="LineNr">474 </span>]
-<span id="L475" class="LineNr">475 </span>$error: <span class="Constant">0</span>
-<span id="L476" class="LineNr">476 </span>
-<span id="L477" class="LineNr">477 </span><span class="Delimiter">:(scenario static_dispatch_prefers_literals_to_be_numbers_rather_than_addresses)</span>
-<span id="L478" class="LineNr">478 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L479" class="LineNr">479 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>foo <span class="Constant">0</span>
-<span id="L480" class="LineNr">480 </span>]
-<span id="L481" class="LineNr">481 </span><span class="muRecipe">def</span> foo x:&amp;:num<span class="muRecipe"> -&gt; </span>y:num [
-<span id="L482" class="LineNr">482 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
-<span id="L483" class="LineNr">483 </span>]
-<span id="L484" class="LineNr">484 </span><span class="muRecipe">def</span> foo x:num<span class="muRecipe"> -&gt; </span>y:num [
-<span id="L485" class="LineNr">485 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
-<span id="L486" class="LineNr">486 </span>]
-<span id="L487" class="LineNr">487 </span><span class="traceContains">+mem: storing 35 in location 1</span>
-<span id="L488" class="LineNr">488 </span>
-<span id="L489" class="LineNr">489 </span><span class="Delimiter">:(scenario static_dispatch_prefers_literals_to_be_numbers_rather_than_addresses_2)</span>
-<span id="L490" class="LineNr">490 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L491" class="LineNr">491 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>foo <span class="Constant">0</span> <span class="Constant">0</span>
-<span id="L492" class="LineNr">492 </span>]
-<span id="L493" class="LineNr">493 </span><span class="Comment"># Both variants need to bind 0 to address in first ingredient.</span>
-<span id="L494" class="LineNr">494 </span><span class="Comment"># We still want to prefer the variant with a number rather than address for</span>
-<span id="L495" class="LineNr">495 </span><span class="Comment"># _subsequent_ ingredients.</span>
-<span id="L496" class="LineNr">496 </span><span class="muRecipe">def</span> foo x:&amp;:num y:&amp;:num<span class="muRecipe"> -&gt; </span>z:num [  <span class="Comment"># put the bad match before the good one</span>
-<span id="L497" class="LineNr">497 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
-<span id="L498" class="LineNr">498 </span>]
-<span id="L499" class="LineNr">499 </span><span class="muRecipe">def</span> foo x:&amp;:num y:num<span class="muRecipe"> -&gt; </span>z:num [
-<span id="L500" class="LineNr">500 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
-<span id="L501" class="LineNr">501 </span>]
-<span id="L502" class="LineNr">502 </span><span class="traceContains">+mem: storing 35 in location 1</span>
-<span id="L503" class="LineNr">503 </span>
-<span id="L504" class="LineNr">504 </span><span class="Delimiter">:(scenario static_dispatch_on_non_literal_character_ignores_variant_with_numbers)</span>
-<span id="L505" class="LineNr">505 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L506" class="LineNr">506 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L507" class="LineNr">507 </span>  local-scope
-<span id="L508" class="LineNr">508 </span>  <span class="Normal">x</span>:<span class="Normal">char</span><span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/newline
-<span id="L509" class="LineNr">509 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>foo x
-<span id="L510" class="LineNr">510 </span>]
-<span id="L511" class="LineNr">511 </span><span class="muRecipe">def</span> foo x:num<span class="muRecipe"> -&gt; </span>y:num [
-<span id="L512" class="LineNr">512 </span>  load-ingredients
-<span id="L513" class="LineNr">513 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
-<span id="L514" class="LineNr">514 </span>]
-<span id="L515" class="LineNr">515 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: ingredient 0 has the wrong type at '1:num/raw &lt;- foo x'</span>
-<span id="L516" class="LineNr">516 </span><span class="traceAbsent">-mem: storing 34 in location 1</span>
-<span id="L517" class="LineNr">517 </span>
-<span id="L518" class="LineNr">518 </span><span class="Delimiter">:(scenario static_dispatch_dispatches_literal_to_boolean_before_character)</span>
-<span id="L519" class="LineNr">519 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L520" class="LineNr">520 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>foo <span class="Constant">0</span>  <span class="Comment"># valid literal for boolean</span>
-<span id="L521" class="LineNr">521 </span>]
-<span id="L522" class="LineNr">522 </span><span class="muRecipe">def</span> foo x:<span class="Normal">char</span><span class="muRecipe"> -&gt; </span>y:num [
-<span id="L523" class="LineNr">523 </span>  local-scope
-<span id="L524" class="LineNr">524 </span>  load-ingredients
-<span id="L525" class="LineNr">525 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
+<span id="L472" class="LineNr">472 </span><span class="muRecipe">def</span> test a:&amp;:foo<span class="muRecipe"> -&gt; </span>z:num [
+<span id="L473" class="LineNr">473 </span>  local-scope
+<span id="L474" class="LineNr">474 </span>  load-ingredients
+<span id="L475" class="LineNr">475 </span>  <span class="Normal">z</span>:num<span class="Special"> &lt;- </span>get *a<span class="Delimiter">,</span> <span class="Constant">x:offset</span>
+<span id="L476" class="LineNr">476 </span>]
+<span id="L477" class="LineNr">477 </span><span class="muData">container</span> foo [
+<span id="L478" class="LineNr">478 </span>  <span class="Normal">x</span>:num
+<span id="L479" class="LineNr">479 </span>]
+<span id="L480" class="LineNr">480 </span>$error: <span class="Constant">0</span>
+<span id="L481" class="LineNr">481 </span>
+<span id="L482" class="LineNr">482 </span><span class="Delimiter">:(scenario static_dispatch_prefers_literals_to_be_numbers_rather_than_addresses)</span>
+<span id="L483" class="LineNr">483 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L484" class="LineNr">484 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>foo <span class="Constant">0</span>
+<span id="L485" class="LineNr">485 </span>]
+<span id="L486" class="LineNr">486 </span><span class="muRecipe">def</span> foo x:&amp;:num<span class="muRecipe"> -&gt; </span>y:num [
+<span id="L487" class="LineNr">487 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
+<span id="L488" class="LineNr">488 </span>]
+<span id="L489" class="LineNr">489 </span><span class="muRecipe">def</span> foo x:num<span class="muRecipe"> -&gt; </span>y:num [
+<span id="L490" class="LineNr">490 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L491" class="LineNr">491 </span>]
+<span id="L492" class="LineNr">492 </span><span class="traceContains">+mem: storing 35 in location 1</span>
+<span id="L493" class="LineNr">493 </span>
+<span id="L494" class="LineNr">494 </span><span class="Delimiter">:(scenario static_dispatch_prefers_literals_to_be_numbers_rather_than_addresses_2)</span>
+<span id="L495" class="LineNr">495 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L496" class="LineNr">496 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>foo <span class="Constant">0</span> <span class="Constant">0</span>
+<span id="L497" class="LineNr">497 </span>]
+<span id="L498" class="LineNr">498 </span><span class="Comment"># Both variants need to bind 0 to address in first ingredient.</span>
+<span id="L499" class="LineNr">499 </span><span class="Comment"># We still want to prefer the variant with a number rather than address for</span>
+<span id="L500" class="LineNr">500 </span><span class="Comment"># _subsequent_ ingredients.</span>
+<span id="L501" class="LineNr">501 </span><span class="muRecipe">def</span> foo x:&amp;:num y:&amp;:num<span class="muRecipe"> -&gt; </span>z:num [  <span class="Comment"># put the bad match before the good one</span>
+<span id="L502" class="LineNr">502 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
+<span id="L503" class="LineNr">503 </span>]
+<span id="L504" class="LineNr">504 </span><span class="muRecipe">def</span> foo x:&amp;:num y:num<span class="muRecipe"> -&gt; </span>z:num [
+<span id="L505" class="LineNr">505 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L506" class="LineNr">506 </span>]
+<span id="L507" class="LineNr">507 </span><span class="traceContains">+mem: storing 35 in location 1</span>
+<span id="L508" class="LineNr">508 </span>
+<span id="L509" class="LineNr">509 </span><span class="Delimiter">:(scenario static_dispatch_on_non_literal_character_ignores_variant_with_numbers)</span>
+<span id="L510" class="LineNr">510 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L511" class="LineNr">511 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L512" class="LineNr">512 </span>  local-scope
+<span id="L513" class="LineNr">513 </span>  <span class="Normal">x</span>:<span class="Normal">char</span><span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/newline
+<span id="L514" class="LineNr">514 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>foo x
+<span id="L515" class="LineNr">515 </span>]
+<span id="L516" class="LineNr">516 </span><span class="muRecipe">def</span> foo x:num<span class="muRecipe"> -&gt; </span>y:num [
+<span id="L517" class="LineNr">517 </span>  load-ingredients
+<span id="L518" class="LineNr">518 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
+<span id="L519" class="LineNr">519 </span>]
+<span id="L520" class="LineNr">520 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: ingredient 0 has the wrong type at '1:num/raw &lt;- foo x'</span>
+<span id="L521" class="LineNr">521 </span><span class="traceAbsent">-mem: storing 34 in location 1</span>
+<span id="L522" class="LineNr">522 </span>
+<span id="L523" class="LineNr">523 </span><span class="Delimiter">:(scenario static_dispatch_dispatches_literal_to_boolean_before_character)</span>
+<span id="L524" class="LineNr">524 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L525" class="LineNr">525 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>foo <span class="Constant">0</span>  <span class="Comment"># valid literal for boolean</span>
 <span id="L526" class="LineNr">526 </span>]
-<span id="L527" class="LineNr">527 </span><span class="muRecipe">def</span> foo x:<span class="Normal">bool</span><span class="muRecipe"> -&gt; </span>y:num [
+<span id="L527" class="LineNr">527 </span><span class="muRecipe">def</span> foo x:<span class="Normal">char</span><span class="muRecipe"> -&gt; </span>y:num [
 <span id="L528" class="LineNr">528 </span>  local-scope
 <span id="L529" class="LineNr">529 </span>  load-ingredients
-<span id="L530" class="LineNr">530 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L530" class="LineNr">530 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
 <span id="L531" class="LineNr">531 </span>]
-<span id="L532" class="LineNr">532 </span><span class="Comment"># boolean variant is preferred</span>
-<span id="L533" class="LineNr">533 </span><span class="traceContains">+mem: storing 35 in location 1</span>
-<span id="L534" class="LineNr">534 </span>
-<span id="L535" class="LineNr">535 </span><span class="Delimiter">:(scenario static_dispatch_dispatches_literal_to_character_when_out_of_boolean_range)</span>
-<span id="L536" class="LineNr">536 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L537" class="LineNr">537 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>foo <span class="Constant">97</span>  <span class="Comment"># not a valid literal for boolean</span>
-<span id="L538" class="LineNr">538 </span>]
-<span id="L539" class="LineNr">539 </span><span class="muRecipe">def</span> foo x:<span class="Normal">char</span><span class="muRecipe"> -&gt; </span>y:num [
-<span id="L540" class="LineNr">540 </span>  local-scope
-<span id="L541" class="LineNr">541 </span>  load-ingredients
-<span id="L542" class="LineNr">542 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
+<span id="L532" class="LineNr">532 </span><span class="muRecipe">def</span> foo x:<span class="Normal">bool</span><span class="muRecipe"> -&gt; </span>y:num [
+<span id="L533" class="LineNr">533 </span>  local-scope
+<span id="L534" class="LineNr">534 </span>  load-ingredients
+<span id="L535" class="LineNr">535 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L536" class="LineNr">536 </span>]
+<span id="L537" class="LineNr">537 </span><span class="Comment"># boolean variant is preferred</span>
+<span id="L538" class="LineNr">538 </span><span class="traceContains">+mem: storing 35 in location 1</span>
+<span id="L539" class="LineNr">539 </span>
+<span id="L540" class="LineNr">540 </span><span class="Delimiter">:(scenario static_dispatch_dispatches_literal_to_character_when_out_of_boolean_range)</span>
+<span id="L541" class="LineNr">541 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L542" class="LineNr">542 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>foo <span class="Constant">97</span>  <span class="Comment"># not a valid literal for boolean</span>
 <span id="L543" class="LineNr">543 </span>]
-<span id="L544" class="LineNr">544 </span><span class="muRecipe">def</span> foo x:<span class="Normal">bool</span><span class="muRecipe"> -&gt; </span>y:num [
+<span id="L544" class="LineNr">544 </span><span class="muRecipe">def</span> foo x:<span class="Normal">char</span><span class="muRecipe"> -&gt; </span>y:num [
 <span id="L545" class="LineNr">545 </span>  local-scope
 <span id="L546" class="LineNr">546 </span>  load-ingredients
-<span id="L547" class="LineNr">547 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L547" class="LineNr">547 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
 <span id="L548" class="LineNr">548 </span>]
-<span id="L549" class="LineNr">549 </span><span class="Comment"># character variant is preferred</span>
-<span id="L550" class="LineNr">550 </span><span class="traceContains">+mem: storing 34 in location 1</span>
-<span id="L551" class="LineNr">551 </span>
-<span id="L552" class="LineNr">552 </span><span class="Delimiter">:(scenario static_dispatch_dispatches_literal_to_number_if_at_all_possible)</span>
-<span id="L553" class="LineNr">553 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L554" class="LineNr">554 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>foo <span class="Constant">97</span>
-<span id="L555" class="LineNr">555 </span>]
-<span id="L556" class="LineNr">556 </span><span class="muRecipe">def</span> foo x:<span class="Normal">char</span><span class="muRecipe"> -&gt; </span>y:num [
-<span id="L557" class="LineNr">557 </span>  local-scope
-<span id="L558" class="LineNr">558 </span>  load-ingredients
-<span id="L559" class="LineNr">559 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
+<span id="L549" class="LineNr">549 </span><span class="muRecipe">def</span> foo x:<span class="Normal">bool</span><span class="muRecipe"> -&gt; </span>y:num [
+<span id="L550" class="LineNr">550 </span>  local-scope
+<span id="L551" class="LineNr">551 </span>  load-ingredients
+<span id="L552" class="LineNr">552 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L553" class="LineNr">553 </span>]
+<span id="L554" class="LineNr">554 </span><span class="Comment"># character variant is preferred</span>
+<span id="L555" class="LineNr">555 </span><span class="traceContains">+mem: storing 34 in location 1</span>
+<span id="L556" class="LineNr">556 </span>
+<span id="L557" class="LineNr">557 </span><span class="Delimiter">:(scenario static_dispatch_dispatches_literal_to_number_if_at_all_possible)</span>
+<span id="L558" class="LineNr">558 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L559" class="LineNr">559 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>foo <span class="Constant">97</span>
 <span id="L560" class="LineNr">560 </span>]
-<span id="L561" class="LineNr">561 </span><span class="muRecipe">def</span> foo x:num<span class="muRecipe"> -&gt; </span>y:num [
+<span id="L561" class="LineNr">561 </span><span class="muRecipe">def</span> foo x:<span class="Normal">char</span><span class="muRecipe"> -&gt; </span>y:num [
 <span id="L562" class="LineNr">562 </span>  local-scope
 <span id="L563" class="LineNr">563 </span>  load-ingredients
-<span id="L564" class="LineNr">564 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L564" class="LineNr">564 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
 <span id="L565" class="LineNr">565 </span>]
-<span id="L566" class="LineNr">566 </span><span class="Comment"># number variant is preferred</span>
-<span id="L567" class="LineNr">567 </span><span class="traceContains">+mem: storing 35 in location 1</span>
-<span id="L568" class="LineNr">568 </span>
-<span id="L569" class="LineNr">569 </span><span class="Delimiter">:(replace{} &quot;string header_label(const <a href='010vm.cc.html#L14'>recipe_ordinal</a> r)&quot;)</span>
-<span id="L570" class="LineNr">570 </span>string header_label<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="L571" class="LineNr">571 </span>  <span class="Identifier">return</span> header_label<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">));</span>
-<span id="L572" class="LineNr">572 </span><span class="Delimiter">}</span>
-<span id="L573" class="LineNr">573 </span><span class="Delimiter">:(code)</span>
-<span id="L574" class="LineNr">574 </span>string header_label<span class="Delimiter">(</span><span class="Normal">const</span> recipe&amp; caller<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L575" class="LineNr">575 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L576" class="LineNr">576 </span>  out &lt;&lt; <span class="Constant">&quot;recipe &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name<span class="Delimiter">;</span>
-<span id="L577" class="LineNr">577 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L578" class="LineNr">578 </span>  <span class="Conceal">¦</span> out &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L579" class="LineNr">579 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!caller<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> out &lt;&lt; <span class="Constant">&quot; -&gt;&quot;</span><span class="Delimiter">;</span>
-<span id="L580" class="LineNr">580 </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>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L581" class="LineNr">581 </span>  <span class="Conceal">¦</span> out &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L582" class="LineNr">582 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L583" class="LineNr">583 </span><span class="Delimiter">}</span>
-<span id="L584" class="LineNr">584 </span>
-<span id="L585" class="LineNr">585 </span>string <a href='054static_dispatch.cc.html#L585'>original_header_label</a><span class="Delimiter">(</span><span class="Normal">const</span> recipe&amp; caller<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L586" class="LineNr">586 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L587" class="LineNr">587 </span>  out &lt;&lt; <span class="Constant">&quot;recipe &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>original_name<span class="Delimiter">;</span>
-<span id="L588" class="LineNr">588 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L589" class="LineNr">589 </span>  <span class="Conceal">¦</span> out &lt;&lt; <span class="Constant">' '</span> &lt;&lt; caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string<span class="Delimiter">;</span>
-<span id="L590" class="LineNr">590 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!caller<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> out &lt;&lt; <span class="Constant">&quot; -&gt;&quot;</span><span class="Delimiter">;</span>
-<span id="L591" class="LineNr">591 </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>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L592" class="LineNr">592 </span>  <span class="Conceal">¦</span> out &lt;&lt; <span class="Constant">' '</span> &lt;&lt; caller<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string<span class="Delimiter">;</span>
-<span id="L593" class="LineNr">593 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L594" class="LineNr">594 </span><span class="Delimiter">}</span>
-<span id="L595" class="LineNr">595 </span>
-<span id="L596" class="LineNr">596 </span><span class="Delimiter">:(scenario reload_variant_retains_other_variants)</span>
-<span id="L597" class="LineNr">597 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L598" class="LineNr">598 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L599" class="LineNr">599 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>foo <span class="Constant">1</span>:num
-<span id="L600" class="LineNr">600 </span>]
-<span id="L601" class="LineNr">601 </span><span class="muRecipe">def</span> foo x:num<span class="muRecipe"> -&gt; </span>y:num [
-<span id="L602" class="LineNr">602 </span>  local-scope
-<span id="L603" class="LineNr">603 </span>  load-ingredients
-<span id="L604" class="LineNr">604 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
+<span id="L566" class="LineNr">566 </span><span class="muRecipe">def</span> foo x:num<span class="muRecipe"> -&gt; </span>y:num [
+<span id="L567" class="LineNr">567 </span>  local-scope
+<span id="L568" class="LineNr">568 </span>  load-ingredients
+<span id="L569" class="LineNr">569 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L570" class="LineNr">570 </span>]
+<span id="L571" class="LineNr">571 </span><span class="Comment"># number variant is preferred</span>
+<span id="L572" class="LineNr">572 </span><span class="traceContains">+mem: storing 35 in location 1</span>
+<span id="L573" class="LineNr">573 </span>
+<span id="L574" class="LineNr">574 </span><span class="Delimiter">:(replace{} &quot;string header_label(const <a href='010vm.cc.html#L14'>recipe_ordinal</a> r)&quot;)</span>
+<span id="L575" class="LineNr">575 </span>string header_label<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="L576" class="LineNr">576 </span>  <span class="Identifier">return</span> header_label<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">));</span>
+<span id="L577" class="LineNr">577 </span><span class="Delimiter">}</span>
+<span id="L578" class="LineNr">578 </span><span class="Delimiter">:(code)</span>
+<span id="L579" class="LineNr">579 </span>string header_label<span class="Delimiter">(</span><span class="Normal">const</span> recipe&amp; caller<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L580" class="LineNr">580 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L581" class="LineNr">581 </span>  out &lt;&lt; <span class="Constant">&quot;recipe &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name<span class="Delimiter">;</span>
+<span id="L582" class="LineNr">582 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L583" class="LineNr">583 </span>  <span class="Conceal">¦</span> out &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L584" class="LineNr">584 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!caller<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> out &lt;&lt; <span class="Constant">&quot; -&gt;&quot;</span><span class="Delimiter">;</span>
+<span id="L585" class="LineNr">585 </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>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L586" class="LineNr">586 </span>  <span class="Conceal">¦</span> out &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L587" class="LineNr">587 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L588" class="LineNr">588 </span><span class="Delimiter">}</span>
+<span id="L589" class="LineNr">589 </span>
+<span id="L590" class="LineNr">590 </span>string <a href='054static_dispatch.cc.html#L590'>original_header_label</a><span class="Delimiter">(</span><span class="Normal">const</span> recipe&amp; caller<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L591" class="LineNr">591 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L592" class="LineNr">592 </span>  out &lt;&lt; <span class="Constant">&quot;recipe &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>original_name<span class="Delimiter">;</span>
+<span id="L593" class="LineNr">593 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L594" class="LineNr">594 </span>  <span class="Conceal">¦</span> out &lt;&lt; <span class="Constant">' '</span> &lt;&lt; caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string<span class="Delimiter">;</span>
+<span id="L595" class="LineNr">595 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!caller<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> out &lt;&lt; <span class="Constant">&quot; -&gt;&quot;</span><span class="Delimiter">;</span>
+<span id="L596" class="LineNr">596 </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>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L597" class="LineNr">597 </span>  <span class="Conceal">¦</span> out &lt;&lt; <span class="Constant">' '</span> &lt;&lt; caller<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string<span class="Delimiter">;</span>
+<span id="L598" class="LineNr">598 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L599" class="LineNr">599 </span><span class="Delimiter">}</span>
+<span id="L600" class="LineNr">600 </span>
+<span id="L601" class="LineNr">601 </span><span class="Delimiter">:(scenario reload_variant_retains_other_variants)</span>
+<span id="L602" class="LineNr">602 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L603" class="LineNr">603 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L604" class="LineNr">604 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>foo <span class="Constant">1</span>:num
 <span id="L605" class="LineNr">605 </span>]
-<span id="L606" class="LineNr">606 </span><span class="muRecipe">def</span> foo x:&amp;:num<span class="muRecipe"> -&gt; </span>y:num [
+<span id="L606" class="LineNr">606 </span><span class="muRecipe">def</span> foo x:num<span class="muRecipe"> -&gt; </span>y:num [
 <span id="L607" class="LineNr">607 </span>  local-scope
 <span id="L608" class="LineNr">608 </span>  load-ingredients
-<span id="L609" class="LineNr">609 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L609" class="LineNr">609 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
 <span id="L610" class="LineNr">610 </span>]
-<span id="L611" class="LineNr">611 </span><span class="muRecipe">def</span>! foo x:&amp;:num<span class="muRecipe"> -&gt; </span>y:num [
+<span id="L611" class="LineNr">611 </span><span class="muRecipe">def</span> foo x:&amp;:num<span class="muRecipe"> -&gt; </span>y:num [
 <span id="L612" class="LineNr">612 </span>  local-scope
 <span id="L613" class="LineNr">613 </span>  load-ingredients
-<span id="L614" class="LineNr">614 </span>  <span class="Identifier">return</span> <span class="Constant">36</span>
+<span id="L614" class="LineNr">614 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
 <span id="L615" class="LineNr">615 </span>]
-<span id="L616" class="LineNr">616 </span><span class="traceContains">+mem: storing 34 in location 2</span>
-<span id="L617" class="LineNr">617 </span>$error: <span class="Constant">0</span>
-<span id="L618" class="LineNr">618 </span>
-<span id="L619" class="LineNr">619 </span><span class="Delimiter">:(scenario dispatch_errors_come_after_unknown_name_errors)</span>
-<span id="L620" class="LineNr">620 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L621" class="LineNr">621 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L622" class="LineNr">622 </span>  <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>foo x
-<span id="L623" class="LineNr">623 </span>]
-<span id="L624" class="LineNr">624 </span><span class="muRecipe">def</span> foo a:num<span class="muRecipe"> -&gt; </span>b:num [
-<span id="L625" class="LineNr">625 </span>  local-scope
-<span id="L626" class="LineNr">626 </span>  load-ingredients
-<span id="L627" class="LineNr">627 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
+<span id="L616" class="LineNr">616 </span><span class="muRecipe">def</span>! foo x:&amp;:num<span class="muRecipe"> -&gt; </span>y:num [
+<span id="L617" class="LineNr">617 </span>  local-scope
+<span id="L618" class="LineNr">618 </span>  load-ingredients
+<span id="L619" class="LineNr">619 </span>  <span class="Identifier">return</span> <span class="Constant">36</span>
+<span id="L620" class="LineNr">620 </span>]
+<span id="L621" class="LineNr">621 </span><span class="traceContains">+mem: storing 34 in location 2</span>
+<span id="L622" class="LineNr">622 </span>$error: <span class="Constant">0</span>
+<span id="L623" class="LineNr">623 </span>
+<span id="L624" class="LineNr">624 </span><span class="Delimiter">:(scenario dispatch_errors_come_after_unknown_name_errors)</span>
+<span id="L625" class="LineNr">625 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L626" class="LineNr">626 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L627" class="LineNr">627 </span>  <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>foo x
 <span id="L628" class="LineNr">628 </span>]
-<span id="L629" class="LineNr">629 </span><span class="muRecipe">def</span> foo a:<span class="Normal">bool</span><span class="muRecipe"> -&gt; </span>b:num [
+<span id="L629" class="LineNr">629 </span><span class="muRecipe">def</span> foo a:num<span class="muRecipe"> -&gt; </span>b:num [
 <span id="L630" class="LineNr">630 </span>  local-scope
 <span id="L631" class="LineNr">631 </span>  load-ingredients
-<span id="L632" class="LineNr">632 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L632" class="LineNr">632 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
 <span id="L633" class="LineNr">633 </span>]
-<span id="L634" class="LineNr">634 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: missing type for 'x' in 'y:num &lt;- foo x'</span>
-<span id="L635" class="LineNr">635 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: failed to find a matching call for 'y:num &lt;- foo x'</span>
-<span id="L636" class="LineNr">636 </span>
-<span id="L637" class="LineNr">637 </span><span class="Delimiter">:(scenario override_methods_with_type_abbreviations)</span>
-<span id="L638" class="LineNr">638 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L639" class="LineNr">639 </span>  local-scope
-<span id="L640" class="LineNr">640 </span>  <span class="Normal">s</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [abc]
-<span id="L641" class="LineNr">641 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>foo s
-<span id="L642" class="LineNr">642 </span>]
-<span id="L643" class="LineNr">643 </span><span class="muRecipe">def</span> foo a:address:array:character<span class="muRecipe"> -&gt; </span>result:number [
-<span id="L644" class="LineNr">644 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
-<span id="L645" class="LineNr">645 </span>]
-<span id="L646" class="LineNr">646 </span><span class="Comment"># identical to previous variant once you take type abbreviations into account</span>
-<span id="L647" class="LineNr">647 </span><span class="muRecipe">def</span>! foo a:text<span class="muRecipe"> -&gt; </span>result:num [
-<span id="L648" class="LineNr">648 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
-<span id="L649" class="LineNr">649 </span>]
-<span id="L650" class="LineNr">650 </span><span class="traceContains">+mem: storing 35 in location 1</span>
-<span id="L651" class="LineNr">651 </span>
-<span id="L652" class="LineNr">652 </span><span class="Delimiter">:(scenario ignore_static_dispatch_in_type_errors_without_overloading)</span>
-<span id="L653" class="LineNr">653 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L654" class="LineNr">654 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L655" class="LineNr">655 </span>  local-scope
-<span id="L656" class="LineNr">656 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L657" class="LineNr">657 </span>  foo x
-<span id="L658" class="LineNr">658 </span>]
-<span id="L659" class="LineNr">659 </span><span class="muRecipe">def</span> foo x:&amp;:<span class="Normal">char</span> [
+<span id="L634" class="LineNr">634 </span><span class="muRecipe">def</span> foo a:<span class="Normal">bool</span><span class="muRecipe"> -&gt; </span>b:num [
+<span id="L635" class="LineNr">635 </span>  local-scope
+<span id="L636" class="LineNr">636 </span>  load-ingredients
+<span id="L637" class="LineNr">637 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L638" class="LineNr">638 </span>]
+<span id="L639" class="LineNr">639 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: missing type for 'x' in 'y:num &lt;- foo x'</span>
+<span id="L640" class="LineNr">640 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: failed to find a matching call for 'y:num &lt;- foo x'</span>
+<span id="L641" class="LineNr">641 </span>
+<span id="L642" class="LineNr">642 </span><span class="Delimiter">:(scenario override_methods_with_type_abbreviations)</span>
+<span id="L643" class="LineNr">643 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L644" class="LineNr">644 </span>  local-scope
+<span id="L645" class="LineNr">645 </span>  <span class="Normal">s</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [abc]
+<span id="L646" class="LineNr">646 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>foo s
+<span id="L647" class="LineNr">647 </span>]
+<span id="L648" class="LineNr">648 </span><span class="muRecipe">def</span> foo a:<a href='043space.cc.html#L83'>address</a>:array:character<span class="muRecipe"> -&gt; </span>result:number [
+<span id="L649" class="LineNr">649 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
+<span id="L650" class="LineNr">650 </span>]
+<span id="L651" class="LineNr">651 </span><span class="Comment"># identical to previous variant once you take type abbreviations into account</span>
+<span id="L652" class="LineNr">652 </span><span class="muRecipe">def</span>! foo a:text<span class="muRecipe"> -&gt; </span>result:num [
+<span id="L653" class="LineNr">653 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L654" class="LineNr">654 </span>]
+<span id="L655" class="LineNr">655 </span><span class="traceContains">+mem: storing 35 in location 1</span>
+<span id="L656" class="LineNr">656 </span>
+<span id="L657" class="LineNr">657 </span><span class="Delimiter">:(scenario ignore_static_dispatch_in_type_errors_without_overloading)</span>
+<span id="L658" class="LineNr">658 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L659" class="LineNr">659 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L660" class="LineNr">660 </span>  local-scope
-<span id="L661" class="LineNr">661 </span>  load-ingredients
-<span id="L662" class="LineNr">662 </span>]
-<span id="L663" class="LineNr">663 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: types don't match in call for 'foo x'</span>
-<span id="L664" class="LineNr">664 </span><span class="traceContains">+error:   which tries to call 'recipe foo x:&amp;:char'</span>
-<span id="L665" class="LineNr">665 </span>
-<span id="L666" class="LineNr">666 </span><span class="Delimiter">:(scenario show_available_variants_in_dispatch_errors)</span>
-<span id="L667" class="LineNr">667 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L668" class="LineNr">668 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L669" class="LineNr">669 </span>  local-scope
-<span id="L670" class="LineNr">670 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L671" class="LineNr">671 </span>  foo x
-<span id="L672" class="LineNr">672 </span>]
-<span id="L673" class="LineNr">673 </span><span class="muRecipe">def</span> foo x:&amp;:<span class="Normal">char</span> [
+<span id="L661" class="LineNr">661 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L662" class="LineNr">662 </span>  foo x
+<span id="L663" class="LineNr">663 </span>]
+<span id="L664" class="LineNr">664 </span><span class="muRecipe">def</span> foo x:&amp;:<span class="Normal">char</span> [
+<span id="L665" class="LineNr">665 </span>  local-scope
+<span id="L666" class="LineNr">666 </span>  load-ingredients
+<span id="L667" class="LineNr">667 </span>]
+<span id="L668" class="LineNr">668 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: types don't match in call for 'foo x'</span>
+<span id="L669" class="LineNr">669 </span><span class="traceContains">+error:   which tries to call 'recipe foo x:&amp;:char'</span>
+<span id="L670" class="LineNr">670 </span>
+<span id="L671" class="LineNr">671 </span><span class="Delimiter">:(scenario show_available_variants_in_dispatch_errors)</span>
+<span id="L672" class="LineNr">672 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L673" class="LineNr">673 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L674" class="LineNr">674 </span>  local-scope
-<span id="L675" class="LineNr">675 </span>  load-ingredients
-<span id="L676" class="LineNr">676 </span>]
-<span id="L677" class="LineNr">677 </span><span class="muRecipe">def</span> foo x:&amp;:<span class="Normal">bool</span> [
-<span id="L678" class="LineNr">678 </span>  local-scope
-<span id="L679" class="LineNr">679 </span>  load-ingredients
-<span id="L680" class="LineNr">680 </span>]
-<span id="L681" class="LineNr">681 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: failed to find a matching call for 'foo x'</span>
-<span id="L682" class="LineNr">682 </span><span class="traceContains">+error:   available variants are:</span>
-<span id="L683" class="LineNr">683 </span><span class="traceContains">+error:     <a href='010vm.cc.html#L19'>recipe</a> foo x:&amp;:char</span>
-<span id="L684" class="LineNr">684 </span><span class="traceContains">+error:     <a href='010vm.cc.html#L19'>recipe</a> foo x:&amp;:bool</span>
-<span id="L685" class="LineNr">685 </span>
-<span id="L686" class="LineNr">686 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L687" class="LineNr">687 </span><span class="Normal">using</span> std::abs<span class="Delimiter">;</span>
+<span id="L675" class="LineNr">675 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L676" class="LineNr">676 </span>  foo x
+<span id="L677" class="LineNr">677 </span>]
+<span id="L678" class="LineNr">678 </span><span class="muRecipe">def</span> foo x:&amp;:<span class="Normal">char</span> [
+<span id="L679" class="LineNr">679 </span>  local-scope
+<span id="L680" class="LineNr">680 </span>  load-ingredients
+<span id="L681" class="LineNr">681 </span>]
+<span id="L682" class="LineNr">682 </span><span class="muRecipe">def</span> foo x:&amp;:<span class="Normal">bool</span> [
+<span id="L683" class="LineNr">683 </span>  local-scope
+<span id="L684" class="LineNr">684 </span>  load-ingredients
+<span id="L685" class="LineNr">685 </span>]
+<span id="L686" class="LineNr">686 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: failed to find a matching call for 'foo x'</span>
+<span id="L687" class="LineNr">687 </span><span class="traceContains">+error:   available variants are:</span>
+<span id="L688" class="LineNr">688 </span><span class="traceContains">+error:     <a href='010vm.cc.html#L19'>recipe</a> foo x:&amp;:char</span>
+<span id="L689" class="LineNr">689 </span><span class="traceContains">+error:     <a href='010vm.cc.html#L19'>recipe</a> foo x:&amp;:bool</span>
+<span id="L690" class="LineNr">690 </span>
+<span id="L691" class="LineNr">691 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L692" class="LineNr">692 </span><span class="Normal">using</span> std::abs<span class="Delimiter">;</span>
 </pre>
 </body>
 </html>
diff --git a/html/055shape_shifting_container.cc.html b/html/055shape_shifting_container.cc.html
index 17178da1..8953e839 100644
--- a/html/055shape_shifting_container.cc.html
+++ b/html/055shape_shifting_container.cc.html
@@ -100,7 +100,7 @@ if ('onhashchange' in window) {
 <span id="L34" class="LineNr"> 34 </span><span class="Normal">const</span> type_tree* get_base_type<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* t<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Normal">const</span> type_tree* result = t<span class="Delimiter">-&gt;</span>atom ? t : t<span class="Delimiter">-&gt;</span>left<span class="Delimiter">;</span>
 <span id="L36" class="LineNr"> 36 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!result<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span>
-<span id="L37" class="LineNr"> 37 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>t<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L37" class="LineNr"> 37 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>t<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L38" class="LineNr"> 38 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L39" class="LineNr"> 39 </span><span class="Delimiter">}</span>
 <span id="L40" class="LineNr"> 40 </span>
@@ -145,7 +145,7 @@ if ('onhashchange' in window) {
 <span id="L79" class="LineNr"> 79 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L80" class="LineNr"> 80 </span>  <span class="Constant">1</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [abc]
 <span id="L81" class="LineNr"> 81 </span>  <span class="Comment"># compound types for type ingredients</span>
-<span id="L82" class="LineNr"> 82 </span>  <span class="Delimiter">{</span><span class="Constant">2</span>: <span class="Delimiter">(</span>foo number <span class="Delimiter">(</span>address array character<span class="Delimiter">))}</span><span class="Special"> &lt;- </span>merge <span class="Constant">34</span>/x<span class="Delimiter">,</span> <span class="Constant">1</span>:text/y
+<span id="L82" class="LineNr"> 82 </span>  <span class="Delimiter">{</span><span class="Constant">2</span>: <span class="Delimiter">(</span>foo number <span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a> array character<span class="Delimiter">))}</span><span class="Special"> &lt;- </span>merge <span class="Constant">34</span>/x<span class="Delimiter">,</span> <span class="Constant">1</span>:text/y
 <span id="L83" class="LineNr"> 83 </span>]
 <span id="L84" class="LineNr"> 84 </span>$error: <span class="Constant">0</span>
 <span id="L85" class="LineNr"> 85 </span>
@@ -156,7 +156,7 @@ if ('onhashchange' in window) {
 <span id="L90" class="LineNr"> 90 </span>]
 <span id="L91" class="LineNr"> 91 </span><span class="muData">container</span> bar:_a:_b [
 <span id="L92" class="LineNr"> 92 </span>  <span class="Comment"># dilated element</span>
-<span id="L93" class="LineNr"> 93 </span>  <span class="Delimiter">{</span>data: <span class="Delimiter">(</span>foo _a <span class="Delimiter">(</span>address _b<span class="Delimiter">))}</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="Delimiter">{</span>data: <span class="Delimiter">(</span>foo _a <span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a> _b<span class="Delimiter">))}</span>
 <span id="L94" class="LineNr"> 94 </span>]
 <span id="L95" class="LineNr"> 95 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L96" class="LineNr"> 96 </span>  <span class="Constant">1</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [abc]
@@ -374,8 +374,8 @@ if ('onhashchange' in window) {
 <span id="L308" class="LineNr">308 </span>]
 <span id="L309" class="LineNr">309 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L310" class="LineNr">310 </span>  <span class="Constant">1</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [abc]
-<span id="L311" class="LineNr">311 </span>  <span class="Delimiter">{</span><span class="Constant">2</span>: <span class="Delimiter">(</span>foo number <span class="Delimiter">(</span>address array character<span class="Delimiter">))}</span><span class="Special"> &lt;- </span>merge <span class="Constant">34</span>/x<span class="Delimiter">,</span> <span class="Constant">1</span>:text/y
-<span id="L312" class="LineNr">312 </span>  <span class="Constant">3</span>:text<span class="Special"> &lt;- </span>get <span class="Delimiter">{</span><span class="Constant">2</span>: <span class="Delimiter">(</span>foo number <span class="Delimiter">(</span>address array character<span class="Delimiter">))},</span> <span class="Constant">y:offset</span>
+<span id="L311" class="LineNr">311 </span>  <span class="Delimiter">{</span><span class="Constant">2</span>: <span class="Delimiter">(</span>foo number <span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a> array character<span class="Delimiter">))}</span><span class="Special"> &lt;- </span>merge <span class="Constant">34</span>/x<span class="Delimiter">,</span> <span class="Constant">1</span>:text/y
+<span id="L312" class="LineNr">312 </span>  <span class="Constant">3</span>:text<span class="Special"> &lt;- </span>get <span class="Delimiter">{</span><span class="Constant">2</span>: <span class="Delimiter">(</span>foo number <span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a> array character<span class="Delimiter">))},</span> <span class="Constant">y:offset</span>
 <span id="L313" class="LineNr">313 </span>  <span class="Constant">4</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>equal <span class="Constant">1</span>:text<span class="Delimiter">,</span> <span class="Constant">3</span>:text
 <span id="L314" class="LineNr">314 </span>]
 <span id="L315" class="LineNr">315 </span><span class="traceContains">+mem: storing 1 in location 4</span>
@@ -494,7 +494,7 @@ if ('onhashchange' in window) {
 <span id="L428" class="LineNr">428 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L429" class="LineNr">429 </span>  reagent callsite<span class="Delimiter">(</span><span class="Constant">&quot;x:foo:point&quot;</span><span class="Delimiter">);</span>
 <span id="L430" class="LineNr">430 </span>  reagent element = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>callsite<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L431" class="LineNr">431 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">),</span> <span class="Constant">&quot;{x: </span><span class="cSpecial">\&quot;</span><span class="Constant">point</span><span class="cSpecial">\&quot;</span><span class="Constant">}&quot;</span><span class="Delimiter">);</span>
+<span id="L431" class="LineNr">431 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">),</span> <span class="Constant">&quot;{x: </span><span class="cSpecial">\&quot;</span><span class="Constant">point</span><span class="cSpecial">\&quot;</span><span class="Constant">}&quot;</span><span class="Delimiter">);</span>
 <span id="L432" class="LineNr">432 </span><span class="Delimiter">}</span>
 <span id="L433" class="LineNr">433 </span>
 <span id="L434" class="LineNr">434 </span><span class="Normal">void</span> test_replace_type_ingredients_tail<span class="Delimiter">()</span> <span class="Delimiter">{</span>
@@ -506,7 +506,7 @@ if ('onhashchange' in window) {
 <span id="L440" class="LineNr">440 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L441" class="LineNr">441 </span>  reagent callsite<span class="Delimiter">(</span><span class="Constant">&quot;x:bar:point&quot;</span><span class="Delimiter">);</span>
 <span id="L442" class="LineNr">442 </span>  reagent element = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>callsite<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L443" class="LineNr">443 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">),</span> <span class="Constant">&quot;{x: (</span><span class="cSpecial">\&quot;</span><span class="Constant">foo</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">point</span><span class="cSpecial">\&quot;</span><span class="Constant">)}&quot;</span><span class="Delimiter">);</span>
+<span id="L443" class="LineNr">443 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">),</span> <span class="Constant">&quot;{x: (</span><span class="cSpecial">\&quot;</span><span class="Constant">foo</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">point</span><span class="cSpecial">\&quot;</span><span class="Constant">)}&quot;</span><span class="Delimiter">);</span>
 <span id="L444" class="LineNr">444 </span><span class="Delimiter">}</span>
 <span id="L445" class="LineNr">445 </span>
 <span id="L446" class="LineNr">446 </span><span class="Normal">void</span> test_replace_type_ingredients_head_tail_multiple<span class="Delimiter">()</span> <span class="Delimiter">{</span>
@@ -516,9 +516,9 @@ if ('onhashchange' in window) {
 <span id="L450" class="LineNr">450 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;container bar:_elem [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L451" class="LineNr">451 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:foo:_elem</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L452" class="LineNr">452 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L453" class="LineNr">453 </span>  reagent callsite<span class="Delimiter">(</span><span class="Constant">&quot;x:bar:address:array:character&quot;</span><span class="Delimiter">);</span>
+<span id="L453" class="LineNr">453 </span>  reagent callsite<span class="Delimiter">(</span><span class="Constant">&quot;x:bar:<a href='043space.cc.html#L83'>address</a>:array:character&quot;</span><span class="Delimiter">);</span>
 <span id="L454" class="LineNr">454 </span>  reagent element = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>callsite<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L455" class="LineNr">455 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">),</span> <span class="Constant">&quot;{x: (</span><span class="cSpecial">\&quot;</span><span class="Constant">foo</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">address</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">array</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">character</span><span class="cSpecial">\&quot;</span><span class="Constant">)}&quot;</span><span class="Delimiter">);</span>
+<span id="L455" class="LineNr">455 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">),</span> <span class="Constant">&quot;{x: (</span><span class="cSpecial">\&quot;</span><span class="Constant">foo</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant"><a href='043space.cc.html#L83'>address</a></span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">array</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">character</span><span class="cSpecial">\&quot;</span><span class="Constant">)}&quot;</span><span class="Delimiter">);</span>
 <span id="L456" class="LineNr">456 </span><span class="Delimiter">}</span>
 <span id="L457" class="LineNr">457 </span>
 <span id="L458" class="LineNr">458 </span><span class="Normal">void</span> test_replace_type_ingredients_head_middle<span class="Delimiter">()</span> <span class="Delimiter">{</span>
@@ -530,7 +530,7 @@ if ('onhashchange' in window) {
 <span id="L464" class="LineNr">464 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L465" class="LineNr">465 </span>  reagent callsite<span class="Delimiter">(</span><span class="Constant">&quot;x:bar:address&quot;</span><span class="Delimiter">);</span>
 <span id="L466" class="LineNr">466 </span>  reagent element = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>callsite<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L467" class="LineNr">467 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">),</span> <span class="Constant">&quot;{x: (</span><span class="cSpecial">\&quot;</span><span class="Constant">foo</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">address</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">number</span><span class="cSpecial">\&quot;</span><span class="Constant">)}&quot;</span><span class="Delimiter">);</span>
+<span id="L467" class="LineNr">467 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">),</span> <span class="Constant">&quot;{x: (</span><span class="cSpecial">\&quot;</span><span class="Constant">foo</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant"><a href='043space.cc.html#L83'>address</a></span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">number</span><span class="cSpecial">\&quot;</span><span class="Constant">)}&quot;</span><span class="Delimiter">);</span>
 <span id="L468" class="LineNr">468 </span><span class="Delimiter">}</span>
 <span id="L469" class="LineNr">469 </span>
 <span id="L470" class="LineNr">470 </span><span class="Normal">void</span> test_replace_last_type_ingredient_with_multiple<span class="Delimiter">()</span> <span class="Delimiter">{</span>
@@ -540,9 +540,9 @@ if ('onhashchange' in window) {
 <span id="L474" class="LineNr">474 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L475" class="LineNr">475 </span>  reagent callsite<span class="Delimiter">(</span><span class="Constant">&quot;{f: (foo number (address array character))}&quot;</span><span class="Delimiter">);</span>
 <span id="L476" class="LineNr">476 </span>  reagent element1 = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>callsite<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L477" class="LineNr">477 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>element1<span class="Delimiter">),</span> <span class="Constant">&quot;{x: </span><span class="cSpecial">\&quot;</span><span class="Constant">number</span><span class="cSpecial">\&quot;</span><span class="Constant">}&quot;</span><span class="Delimiter">);</span>
+<span id="L477" class="LineNr">477 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>element1<span class="Delimiter">),</span> <span class="Constant">&quot;{x: </span><span class="cSpecial">\&quot;</span><span class="Constant">number</span><span class="cSpecial">\&quot;</span><span class="Constant">}&quot;</span><span class="Delimiter">);</span>
 <span id="L478" class="LineNr">478 </span>  reagent element2 = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>callsite<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L479" class="LineNr">479 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>element2<span class="Delimiter">),</span> <span class="Constant">&quot;{y: (</span><span class="cSpecial">\&quot;</span><span class="Constant">address</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">array</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">character</span><span class="cSpecial">\&quot;</span><span class="Constant">)}&quot;</span><span class="Delimiter">);</span>
+<span id="L479" class="LineNr">479 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>element2<span class="Delimiter">),</span> <span class="Constant">&quot;{y: (</span><span class="cSpecial">\&quot;</span><span class="Constant"><a href='043space.cc.html#L83'>address</a></span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">array</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">character</span><span class="cSpecial">\&quot;</span><span class="Constant">)}&quot;</span><span class="Delimiter">);</span>
 <span id="L480" class="LineNr">480 </span><span class="Delimiter">}</span>
 <span id="L481" class="LineNr">481 </span>
 <span id="L482" class="LineNr">482 </span><span class="Normal">void</span> test_replace_last_type_ingredient_inside_compound<span class="Delimiter">()</span> <span class="Delimiter">{</span>
@@ -562,11 +562,11 @@ if ('onhashchange' in window) {
 <span id="L496" class="LineNr">496 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L497" class="LineNr">497 </span>  reagent callsite<span class="Delimiter">(</span><span class="Constant">&quot;{f: (foo number (address array character) boolean)}&quot;</span><span class="Delimiter">);</span>
 <span id="L498" class="LineNr">498 </span>  reagent element1 = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>callsite<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L499" class="LineNr">499 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>element1<span class="Delimiter">),</span> <span class="Constant">&quot;{x: </span><span class="cSpecial">\&quot;</span><span class="Constant">number</span><span class="cSpecial">\&quot;</span><span class="Constant">}&quot;</span><span class="Delimiter">);</span>
+<span id="L499" class="LineNr">499 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>element1<span class="Delimiter">),</span> <span class="Constant">&quot;{x: </span><span class="cSpecial">\&quot;</span><span class="Constant">number</span><span class="cSpecial">\&quot;</span><span class="Constant">}&quot;</span><span class="Delimiter">);</span>
 <span id="L500" class="LineNr">500 </span>  reagent element2 = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>callsite<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L501" class="LineNr">501 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>element2<span class="Delimiter">),</span> <span class="Constant">&quot;{y: (</span><span class="cSpecial">\&quot;</span><span class="Constant">address</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">array</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">character</span><span class="cSpecial">\&quot;</span><span class="Constant">)}&quot;</span><span class="Delimiter">);</span>
+<span id="L501" class="LineNr">501 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>element2<span class="Delimiter">),</span> <span class="Constant">&quot;{y: (</span><span class="cSpecial">\&quot;</span><span class="Constant"><a href='043space.cc.html#L83'>address</a></span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">array</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">character</span><span class="cSpecial">\&quot;</span><span class="Constant">)}&quot;</span><span class="Delimiter">);</span>
 <span id="L502" class="LineNr">502 </span>  reagent element3 = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>callsite<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>
-<span id="L503" class="LineNr">503 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>element3<span class="Delimiter">),</span> <span class="Constant">&quot;{z: </span><span class="cSpecial">\&quot;</span><span class="Constant">boolean</span><span class="cSpecial">\&quot;</span><span class="Constant">}&quot;</span><span class="Delimiter">);</span>
+<span id="L503" class="LineNr">503 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>element3<span class="Delimiter">),</span> <span class="Constant">&quot;{z: </span><span class="cSpecial">\&quot;</span><span class="Constant">boolean</span><span class="cSpecial">\&quot;</span><span class="Constant">}&quot;</span><span class="Delimiter">);</span>
 <span id="L504" class="LineNr">504 </span><span class="Delimiter">}</span>
 <span id="L505" class="LineNr">505 </span>
 <span id="L506" class="LineNr">506 </span><span class="Normal">void</span> test_replace_middle_type_ingredient_with_multiple2<span class="Delimiter">()</span> <span class="Delimiter">{</span>
@@ -576,7 +576,7 @@ if ('onhashchange' in window) {
 <span id="L510" class="LineNr">510 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L511" class="LineNr">511 </span>  reagent callsite<span class="Delimiter">(</span><span class="Constant">&quot;{f: (foo (address array character) number)}&quot;</span><span class="Delimiter">);</span>
 <span id="L512" class="LineNr">512 </span>  reagent element = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>callsite<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L513" class="LineNr">513 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">),</span> <span class="Constant">&quot;{key: (</span><span class="cSpecial">\&quot;</span><span class="Constant">address</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">array</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">character</span><span class="cSpecial">\&quot;</span><span class="Constant">)}&quot;</span><span class="Delimiter">);</span>
+<span id="L513" class="LineNr">513 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">),</span> <span class="Constant">&quot;{key: (</span><span class="cSpecial">\&quot;</span><span class="Constant"><a href='043space.cc.html#L83'>address</a></span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">array</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">character</span><span class="cSpecial">\&quot;</span><span class="Constant">)}&quot;</span><span class="Delimiter">);</span>
 <span id="L514" class="LineNr">514 </span><span class="Delimiter">}</span>
 <span id="L515" class="LineNr">515 </span>
 <span id="L516" class="LineNr">516 </span><span class="Normal">void</span> test_replace_middle_type_ingredient_with_multiple3<span class="Delimiter">()</span> <span class="Delimiter">{</span>
@@ -590,7 +590,7 @@ if ('onhashchange' in window) {
 <span id="L524" class="LineNr">524 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L525" class="LineNr">525 </span>  reagent callsite<span class="Delimiter">(</span><span class="Constant">&quot;{f: (foo_table (address array character) number)}&quot;</span><span class="Delimiter">);</span>
 <span id="L526" class="LineNr">526 </span>  reagent element = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>callsite<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L527" class="LineNr">527 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">),</span> <span class="Constant">&quot;{data: (</span><span class="cSpecial">\&quot;</span><span class="Constant">address</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">array</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">foo_table_row</span><span class="cSpecial">\&quot;</span><span class="Constant"> (</span><span class="cSpecial">\&quot;</span><span class="Constant">address</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">array</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">character</span><span class="cSpecial">\&quot;</span><span class="Constant">) </span><span class="cSpecial">\&quot;</span><span class="Constant">number</span><span class="cSpecial">\&quot;</span><span class="Constant">)}&quot;</span><span class="Delimiter">);</span>
+<span id="L527" class="LineNr">527 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">),</span> <span class="Constant">&quot;{data: (</span><span class="cSpecial">\&quot;</span><span class="Constant"><a href='043space.cc.html#L83'>address</a></span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">array</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">foo_table_row</span><span class="cSpecial">\&quot;</span><span class="Constant"> (</span><span class="cSpecial">\&quot;</span><span class="Constant"><a href='043space.cc.html#L83'>address</a></span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">array</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">character</span><span class="cSpecial">\&quot;</span><span class="Constant">) </span><span class="cSpecial">\&quot;</span><span class="Constant">number</span><span class="cSpecial">\&quot;</span><span class="Constant">)}&quot;</span><span class="Delimiter">);</span>
 <span id="L528" class="LineNr">528 </span><span class="Delimiter">}</span>
 <span id="L529" class="LineNr">529 </span>
 <span id="L530" class="LineNr">530 </span><span class="Delimiter">:(code)</span>
@@ -690,7 +690,7 @@ if ('onhashchange' in window) {
 <span id="L624" class="LineNr">624 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L625" class="LineNr">625 </span><span class="Delimiter">}</span>
 <span id="L626" class="LineNr">626 </span><span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L627" class="LineNr">627 </span>  <a href='036refcount.cc.html#L367'>compute_exclusive_container_address_offsets</a><span class="Delimiter">(</span>info<span class="Delimiter">,</span> type<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L627" class="LineNr">627 </span>  <a href='036refcount.cc.html#L364'>compute_exclusive_container_address_offsets</a><span class="Delimiter">(</span>info<span class="Delimiter">,</span> type<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
 <span id="L628" class="LineNr">628 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L629" class="LineNr">629 </span><span class="Delimiter">}</span>
 <span id="L630" class="LineNr">630 </span>
@@ -703,9 +703,9 @@ if ('onhashchange' in window) {
 <span id="L637" class="LineNr">637 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:foo:&amp;:num&quot;</span><span class="Delimiter">);</span>
 <span id="L638" class="LineNr">638 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L639" class="LineNr">639 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L640" class="LineNr">640 </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<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L641" class="LineNr">641 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
-<span id="L642" class="LineNr">642 </span>  set&lt;address_element_info&gt;&amp; offset_info = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L640" class="LineNr">640 </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<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L641" class="LineNr">641 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
+<span id="L642" class="LineNr">642 </span>  set&lt;address_element_info&gt;&amp; offset_info = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
 <span id="L643" class="LineNr">643 </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>offset_info<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L644" class="LineNr">644 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>offset_info<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
 <span id="L645" class="LineNr">645 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>offset_info<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
@@ -725,9 +725,9 @@ if ('onhashchange' in window) {
 <span id="L659" class="LineNr">659 </span>  <a href='003trace.cc.html#L158'>CLEAR_TRACE</a><span class="Delimiter">;</span>
 <span id="L660" class="LineNr">660 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L661" class="LineNr">661 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L662" class="LineNr">662 </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<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L663" class="LineNr">663 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
-<span id="L664" class="LineNr">664 </span>  set&lt;address_element_info&gt;&amp; offset_info = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L662" class="LineNr">662 </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<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L663" class="LineNr">663 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
+<span id="L664" class="LineNr">664 </span>  set&lt;address_element_info&gt;&amp; offset_info = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
 <span id="L665" class="LineNr">665 </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>offset_info<span class="Delimiter">),</span> <span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L666" class="LineNr">666 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>offset_info<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
 <span id="L667" class="LineNr">667 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>offset_info<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
@@ -744,7 +744,7 @@ if ('onhashchange' in window) {
 <span id="L678" class="LineNr">678 </span>]
 <span id="L679" class="LineNr">679 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L680" class="LineNr">680 </span>  local-scope
-<span id="L681" class="LineNr">681 </span>  <span class="Normal">x</span>:address:foo:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>foo num<span class="Delimiter">)</span>: type<span class="Delimiter">}</span>
+<span id="L681" class="LineNr">681 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L83'>address</a>:foo:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>foo num<span class="Delimiter">)</span>: type<span class="Delimiter">}</span>
 <span id="L682" class="LineNr">682 </span>]
 <span id="L683" class="LineNr">683 </span><span class="Comment"># no crash</span>
 <span id="L684" class="LineNr">684 </span>
diff --git a/html/056shape_shifting_recipe.cc.html b/html/056shape_shifting_recipe.cc.html
index 6cf9462d..6166e4b8 100644
--- a/html/056shape_shifting_recipe.cc.html
+++ b/html/056shape_shifting_recipe.cc.html
@@ -98,13 +98,13 @@ if ('onhashchange' in window) {
 <span id="L31" class="LineNr">  31 </span>
 <span id="L32" class="LineNr">  32 </span><span class="Delimiter">:(before &quot;End Transform Checks&quot;)</span>
 <span id="L33" class="LineNr">  33 </span>r<span class="Delimiter">.</span>transformed_until = t<span class="Delimiter">;</span>
-<span id="L34" class="LineNr">  34 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Transform<span class="Delimiter">.</span>at<span class="Delimiter">(</span>t<span class="Delimiter">)</span> != <span class="Normal">static_cast</span>&lt;transform_fn&gt;<span class="Delimiter">(</span>expand_type_abbreviations<span class="Delimiter">)</span> &amp;&amp; <a href='056shape_shifting_recipe.cc.html#L147'>any_type_ingredient_in_header</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment"><a href='010vm.cc.html#L14'>recipe_ordinal</a></span><span class="Comment">*/</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L34" class="LineNr">  34 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Transform<span class="Delimiter">.</span>at<span class="Delimiter">(</span>t<span class="Delimiter">)</span> != <span class="Normal">static_cast</span>&lt;transform_fn&gt;<span class="Delimiter">(</span>expand_type_abbreviations<span class="Delimiter">)</span> &amp;&amp; <a href='056shape_shifting_recipe.cc.html#L173'>any_type_ingredient_in_header</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment"><a href='010vm.cc.html#L14'>recipe_ordinal</a></span><span class="Comment">*/</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L35" class="LineNr">  35 </span>
 <span id="L36" class="LineNr">  36 </span><span class="Delimiter">:(after &quot;Running One Instruction&quot;)</span>
 <span id="L37" class="LineNr">  37 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>running_step_index == <span class="Constant">0</span>
-<span id="L38" class="LineNr">  38 </span>  <span class="Conceal">¦</span> &amp;&amp; <a href='056shape_shifting_recipe.cc.html#L147'>any_type_ingredient_in_header</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>running_recipe<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L38" class="LineNr">  38 </span>  <span class="Conceal">¦</span> &amp;&amp; <a href='056shape_shifting_recipe.cc.html#L173'>any_type_ingredient_in_header</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>running_recipe<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L39" class="LineNr">  39 </span><span class="CommentedCode">//?   DUMP(&quot;&quot;);</span>
-<span id="L40" class="LineNr">  40 </span>  <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;ran into unspecialized shape-shifting <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; <a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L40" class="LineNr">  40 </span>  <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;ran into unspecialized shape-shifting <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; <a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L41" class="LineNr">  41 </span><span class="CommentedCode">//?   exit(0);</span>
 <span id="L42" class="LineNr">  42 </span><span class="Delimiter">}</span>
 <span id="L43" class="LineNr">  43 </span>
@@ -116,11 +116,11 @@ if ('onhashchange' in window) {
 <span id="L49" class="LineNr">  49 </span><span class="Delimiter">:(after &quot;Static Dispatch Phase 3&quot;)</span>
 <span id="L50" class="LineNr">  50 </span>candidates = <a href='056shape_shifting_recipe.cc.html#L90'>strictly_matching_shape_shifting_variants</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> variants<span class="Delimiter">);</span>
 <span id="L51" class="LineNr">  51 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!candidates<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L52" class="LineNr">  52 </span>  <a href='010vm.cc.html#L14'>recipe_ordinal</a> exemplar = <a href='056shape_shifting_recipe.cc.html#L119'>best_shape_shifting_variant</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> candidates<span class="Delimiter">);</span>
+<span id="L52" class="LineNr">  52 </span>  <a href='010vm.cc.html#L14'>recipe_ordinal</a> exemplar = <a href='056shape_shifting_recipe.cc.html#L123'>best_shape_shifting_variant</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> candidates<span class="Delimiter">);</span>
 <span id="L53" class="LineNr">  53 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;found variant to specialize: &quot;</span> &lt;&lt; exemplar &lt;&lt; <span class="Constant">' '</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> exemplar<span class="Delimiter">).</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L54" class="LineNr">  54 </span>  <a href='010vm.cc.html#L14'>recipe_ordinal</a> new_recipe_ordinal = <a href='056shape_shifting_recipe.cc.html#L217'>new_variant</a><span class="Delimiter">(</span>exemplar<span class="Delimiter">,</span> inst<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">);</span>
+<span id="L54" class="LineNr">  54 </span>  <a href='010vm.cc.html#L14'>recipe_ordinal</a> new_recipe_ordinal = <a href='056shape_shifting_recipe.cc.html#L257'>new_variant</a><span class="Delimiter">(</span>exemplar<span class="Delimiter">,</span> inst<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">);</span>
 <span id="L55" class="LineNr">  55 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>new_recipe_ordinal == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">goto</span> skip_shape_shifting_variants<span class="Delimiter">;</span>
-<span id="L56" class="LineNr">  56 </span>  variants<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>new_recipe_ordinal<span class="Delimiter">);</span>  <span class="Comment">// side-effect</span>
+<span id="L56" class="LineNr">  56 </span>  get<span class="Delimiter">(</span>Recipe_variants<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>name<span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>new_recipe_ordinal<span class="Delimiter">);</span>  <span class="Comment">// side-effect</span>
 <span id="L57" class="LineNr">  57 </span>  recipe&amp; variant = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> new_recipe_ordinal<span class="Delimiter">);</span>
 <span id="L58" class="LineNr">  58 </span>  <span class="Comment">// perform all transforms on the new specialization</span>
 <span id="L59" class="LineNr">  59 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!variant<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
@@ -142,8 +142,8 @@ if ('onhashchange' in window) {
 <span id="L75" class="LineNr">  75 </span><span class="Comment">//: recipes can be called</span>
 <span id="L76" class="LineNr">  76 </span>
 <span id="L77" class="LineNr">  77 </span><span class="Delimiter">:(before &quot;End Instruction Operation Checks&quot;)</span>
-<span id="L78" class="LineNr">  78 </span><span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>operation<span class="Delimiter">)</span> &amp;&amp; inst<span class="Delimiter">.</span>operation &gt;= <a href='010vm.cc.html#L191'>MAX_PRIMITIVE_RECIPES</a>
-<span id="L79" class="LineNr">  79 </span>  <span class="Conceal">¦</span> &amp;&amp; <a href='056shape_shifting_recipe.cc.html#L147'>any_type_ingredient_in_header</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L78" class="LineNr">  78 </span><span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>operation<span class="Delimiter">)</span> &amp;&amp; !is_primitive<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation<span class="Delimiter">)</span>
+<span id="L79" class="LineNr">  79 </span>  <span class="Conceal">¦</span> &amp;&amp; <a href='056shape_shifting_recipe.cc.html#L173'>any_type_ingredient_in_header</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L80" class="LineNr">  80 </span>  <a href='003trace.cc.html#L168'>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;instruction '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' has no valid specialization</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L81" class="LineNr">  81 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L82" class="LineNr">  82 </span><span class="Delimiter">}</span>
@@ -154,7 +154,7 @@ if ('onhashchange' in window) {
 <span id="L87" class="LineNr">  87 </span>
 <span id="L88" class="LineNr">  88 </span><span class="Delimiter">:(code)</span>
 <span id="L89" class="LineNr">  89 </span><span class="Comment">// phase 3 of static dispatch</span>
-<span id="L90" class="LineNr">  90 </span>vector&lt;recipe_ordinal&gt; <a href='056shape_shifting_recipe.cc.html#L90'>strictly_matching_shape_shifting_variants</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> vector&lt;recipe_ordinal&gt;&amp; variants<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L90" class="LineNr">  90 </span>vector&lt;recipe_ordinal&gt; <a href='056shape_shifting_recipe.cc.html#L90'>strictly_matching_shape_shifting_variants</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> vector&lt;recipe_ordinal&gt;&amp; variants<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L91" class="LineNr">  91 </span>  vector&lt;recipe_ordinal&gt; result<span class="Delimiter">;</span>
 <span id="L92" class="LineNr">  92 </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>variants<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L93" class="LineNr">  93 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> == -<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
@@ -182,979 +182,1044 @@ if ('onhashchange' in window) {
 <span id="L115" class="LineNr"> 115 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L116" class="LineNr"> 116 </span><span class="Delimiter">}</span>
 <span id="L117" class="LineNr"> 117 </span>
-<span id="L118" class="LineNr"> 118 </span><span class="Comment">// tie-breaker for phase 3</span>
-<span id="L119" class="LineNr"> 119 </span><a href='010vm.cc.html#L14'>recipe_ordinal</a> <a href='056shape_shifting_recipe.cc.html#L119'>best_shape_shifting_variant</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> vector&lt;recipe_ordinal&gt;&amp; candidates<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L120" class="LineNr"> 120 </span>  assert<span class="Delimiter">(</span>!candidates<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L121" class="LineNr"> 121 </span>  <span class="Comment">// primary score</span>
-<span id="L122" class="LineNr"> 122 </span>  <span class="Normal">int</span> max_score = -<span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L123" class="LineNr"> 123 </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>candidates<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L124" class="LineNr"> 124 </span>  <span class="Conceal">¦</span> <span class="Normal">int</span> score = number_of_concrete_type_names<span class="Delimiter">(</span>candidates<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L125" class="LineNr"> 125 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>score &gt; -<span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L126" class="LineNr"> 126 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>score &gt; max_score<span class="Delimiter">)</span> max_score = score<span class="Delimiter">;</span>
-<span id="L127" class="LineNr"> 127 </span>  <span class="Delimiter">}</span>
-<span id="L128" class="LineNr"> 128 </span>  <span class="Comment">// break any ties at max_score by a secondary score</span>
-<span id="L129" class="LineNr"> 129 </span>  <span class="Normal">int</span> min_score2 = <span class="Constant">999</span><span class="Delimiter">;</span>
-<span id="L130" class="LineNr"> 130 </span>  <span class="Normal">int</span> best_index = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L131" class="LineNr"> 131 </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>candidates<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L132" class="LineNr"> 132 </span>  <span class="Conceal">¦</span> <span class="Normal">int</span> score1 = number_of_concrete_type_names<span class="Delimiter">(</span>candidates<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L133" class="LineNr"> 133 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>score1 &lt;= max_score<span class="Delimiter">);</span>
-<span id="L134" class="LineNr"> 134 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>score1 != max_score<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L135" class="LineNr"> 135 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> recipe&amp; candidate = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> candidates<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L136" class="LineNr"> 136 </span>  <span class="Conceal">¦</span> <span class="Normal">int</span> score2 = <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>candidate<span class="Delimiter">.</span>products<span class="Delimiter">)</span>-SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">))</span>
-<span id="L137" class="LineNr"> 137 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</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>-SIZE<span class="Delimiter">(</span>candidate<span class="Delimiter">.</span>ingredients<span class="Delimiter">));</span>
-<span id="L138" class="LineNr"> 138 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>score2 &lt; <span class="Constant">999</span><span class="Delimiter">);</span>
-<span id="L139" class="LineNr"> 139 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>score2 &lt; min_score2<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L140" class="LineNr"> 140 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> min_score2 = score2<span class="Delimiter">;</span>
-<span id="L141" class="LineNr"> 141 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> best_index = i<span class="Delimiter">;</span>
-<span id="L142" class="LineNr"> 142 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L143" class="LineNr"> 143 </span>  <span class="Delimiter">}</span>
-<span id="L144" class="LineNr"> 144 </span>  <span class="Identifier">return</span> candidates<span class="Delimiter">.</span>at<span class="Delimiter">(</span>best_index<span class="Delimiter">);</span>
-<span id="L145" class="LineNr"> 145 </span><span class="Delimiter">}</span>
-<span id="L146" class="LineNr"> 146 </span>
-<span id="L147" class="LineNr"> 147 </span><span class="Normal">bool</span> <a href='056shape_shifting_recipe.cc.html#L147'>any_type_ingredient_in_header</a><span class="Delimiter">(</span><a href='010vm.cc.html#L14'>recipe_ordinal</a> variant<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L148" class="LineNr"> 148 </span>  <span class="Normal">const</span> recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> variant<span class="Delimiter">);</span>
-<span id="L149" class="LineNr"> 149 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L150" class="LineNr"> 150 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>contains_type_ingredient_name<span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span>
-<span id="L151" class="LineNr"> 151 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L152" class="LineNr"> 152 </span>  <span class="Delimiter">}</span>
-<span id="L153" class="LineNr"> 153 </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>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L154" class="LineNr"> 154 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>contains_type_ingredient_name<span class="Delimiter">(</span>caller<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span>
-<span id="L155" class="LineNr"> 155 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L156" class="LineNr"> 156 </span>  <span class="Delimiter">}</span>
-<span id="L157" class="LineNr"> 157 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L158" class="LineNr"> 158 </span><span class="Delimiter">}</span>
-<span id="L159" class="LineNr"> 159 </span>
-<span id="L160" class="LineNr"> 160 </span><span class="Normal">bool</span> concrete_type_names_strictly_match<span class="Delimiter">(</span>reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> to<span class="Delimiter">,</span> reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> from<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L161" class="LineNr"> 161 </span>  canonize_type<span class="Delimiter">(</span>to<span class="Delimiter">);</span>
-<span id="L162" class="LineNr"> 162 </span>  canonize_type<span class="Delimiter">(</span>from<span class="Delimiter">);</span>
-<span id="L163" class="LineNr"> 163 </span>  <span class="Identifier">return</span> concrete_type_names_strictly_match<span class="Delimiter">(</span>to<span class="Delimiter">.</span>type<span class="Delimiter">,</span> from<span class="Delimiter">.</span>type<span class="Delimiter">,</span> from<span class="Delimiter">);</span>
-<span id="L164" class="LineNr"> 164 </span><span class="Delimiter">}</span>
-<span id="L165" class="LineNr"> 165 </span>
-<span id="L166" class="LineNr"> 166 </span><span class="Normal">bool</span> concrete_type_names_strictly_match<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* to<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* from<span class="Delimiter">,</span> <span class="Normal">const</span> reagent&amp; rhs_reagent<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L167" class="LineNr"> 167 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!to<span class="Delimiter">)</span> <span class="Identifier">return</span> !from<span class="Delimiter">;</span>
-<span id="L168" class="LineNr"> 168 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!from<span class="Delimiter">)</span> <span class="Identifier">return</span> !to<span class="Delimiter">;</span>
-<span id="L169" class="LineNr"> 169 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>to<span class="Delimiter">-&gt;</span>atom &amp;&amp; is_type_ingredient_name<span class="Delimiter">(</span>to<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>  <span class="Comment">// type ingredient matches anything</span>
-<span id="L170" class="LineNr"> 170 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!to<span class="Delimiter">-&gt;</span>atom &amp;&amp; to<span class="Delimiter">-&gt;</span>right == <span class="Constant">NULL</span> &amp;&amp; to<span class="Delimiter">-&gt;</span>left != <span class="Constant">NULL</span> &amp;&amp; to<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom &amp;&amp; is_type_ingredient_name<span class="Delimiter">(</span>to<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L171" class="LineNr"> 171 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>from<span class="Delimiter">-&gt;</span>atom &amp;&amp; is_mu_address<span class="Delimiter">(</span>to<span class="Delimiter">))</span>
-<span id="L172" class="LineNr"> 172 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> from<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;literal&quot;</span> &amp;&amp; rhs_reagent<span class="Delimiter">.</span>name == <span class="Constant">&quot;0&quot;</span><span class="Delimiter">;</span>
-<span id="L173" class="LineNr"> 173 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!from<span class="Delimiter">-&gt;</span>atom &amp;&amp; !to<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span>
-<span id="L174" class="LineNr"> 174 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> concrete_type_names_strictly_match<span class="Delimiter">(</span>to<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> from<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> rhs_reagent<span class="Delimiter">)</span>
-<span id="L175" class="LineNr"> 175 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> &amp;&amp; concrete_type_names_strictly_match<span class="Delimiter">(</span>to<span class="Delimiter">-&gt;</span>right<span class="Delimiter">,</span> from<span class="Delimiter">-&gt;</span>right<span class="Delimiter">,</span> rhs_reagent<span class="Delimiter">);</span>
-<span id="L176" class="LineNr"> 176 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>from<span class="Delimiter">-&gt;</span>atom != to<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L177" class="LineNr"> 177 </span>  <span class="Comment">// both from and to are atoms</span>
-<span id="L178" class="LineNr"> 178 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>from<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;literal&quot;</span><span class="Delimiter">)</span>
-<span id="L179" class="LineNr"> 179 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> Literal_type_names<span class="Delimiter">.</span>find<span class="Delimiter">(</span>to<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)</span> != Literal_type_names<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L180" class="LineNr"> 180 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>to<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;literal&quot;</span><span class="Delimiter">)</span>
-<span id="L181" class="LineNr"> 181 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> Literal_type_names<span class="Delimiter">.</span>find<span class="Delimiter">(</span>from<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)</span> != Literal_type_names<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L182" class="LineNr"> 182 </span>  <span class="Identifier">return</span> to<span class="Delimiter">-&gt;</span>name == from<span class="Delimiter">-&gt;</span>name<span class="Delimiter">;</span>
-<span id="L183" class="LineNr"> 183 </span><span class="Delimiter">}</span>
-<span id="L184" class="LineNr"> 184 </span>
-<span id="L185" class="LineNr"> 185 </span><span class="Normal">bool</span> contains_type_ingredient_name<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L186" class="LineNr"> 186 </span>  <span class="Identifier">return</span> contains_type_ingredient_name<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L187" class="LineNr"> 187 </span><span class="Delimiter">}</span>
-<span id="L188" class="LineNr"> 188 </span>
-<span id="L189" class="LineNr"> 189 </span><span class="Normal">bool</span> contains_type_ingredient_name<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L190" class="LineNr"> 190 </span>  <span class="Normal">if</span> <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="L191" class="LineNr"> 191 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_type_ingredient_name<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L192" class="LineNr"> 192 </span>  <span class="Identifier">return</span> contains_type_ingredient_name<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">)</span> || contains_type_ingredient_name<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">);</span>
-<span id="L193" class="LineNr"> 193 </span><span class="Delimiter">}</span>
-<span id="L194" class="LineNr"> 194 </span>
-<span id="L195" class="LineNr"> 195 </span><span class="Normal">int</span> number_of_concrete_type_names<span class="Delimiter">(</span><a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L196" class="LineNr"> 196 </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="L197" class="LineNr"> 197 </span>  <span class="Normal">int</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L198" class="LineNr"> 198 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L199" class="LineNr"> 199 </span>  <span class="Conceal">¦</span> result += number_of_concrete_type_names<span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L200" class="LineNr"> 200 </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>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L201" class="LineNr"> 201 </span>  <span class="Conceal">¦</span> result += number_of_concrete_type_names<span class="Delimiter">(</span>caller<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L202" class="LineNr"> 202 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L203" class="LineNr"> 203 </span><span class="Delimiter">}</span>
-<span id="L204" class="LineNr"> 204 </span>
-<span id="L205" class="LineNr"> 205 </span><span class="Normal">int</span> number_of_concrete_type_names<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L206" class="LineNr"> 206 </span>  <span class="Identifier">return</span> number_of_concrete_type_names<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L207" class="LineNr"> 207 </span><span class="Delimiter">}</span>
-<span id="L208" class="LineNr"> 208 </span>
-<span id="L209" class="LineNr"> 209 </span><span class="Normal">int</span> number_of_concrete_type_names<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L210" class="LineNr"> 210 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L211" class="LineNr"> 211 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span>
-<span id="L212" class="LineNr"> 212 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> is_type_ingredient_name<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)</span> ? <span class="Constant">0</span> : <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L213" class="LineNr"> 213 </span>  <span class="Identifier">return</span> number_of_concrete_type_names<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">)</span>
-<span id="L214" class="LineNr"> 214 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span>+ number_of_concrete_type_names<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">);</span>
-<span id="L215" class="LineNr"> 215 </span><span class="Delimiter">}</span>
-<span id="L216" class="LineNr"> 216 </span>
-<span id="L217" class="LineNr"> 217 </span><a href='010vm.cc.html#L14'>recipe_ordinal</a> <a href='056shape_shifting_recipe.cc.html#L217'>new_variant</a><span class="Delimiter">(</span><a href='010vm.cc.html#L14'>recipe_ordinal</a> exemplar<span class="Delimiter">,</span> <span class="Normal">const</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="L218" class="LineNr"> 218 </span>  string new_name = <a href='054static_dispatch.cc.html#L111'>next_unused_recipe_name</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name<span class="Delimiter">);</span>
-<span id="L219" class="LineNr"> 219 </span>  assert<span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> new_name<span class="Delimiter">));</span>
-<span id="L220" class="LineNr"> 220 </span>  <a href='010vm.cc.html#L14'>recipe_ordinal</a> new_recipe_ordinal = <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> new_name<span class="Delimiter">,</span> Next_recipe_ordinal++<span class="Delimiter">);</span>
-<span id="L221" class="LineNr"> 221 </span>  <span class="Comment">// make a copy</span>
-<span id="L222" class="LineNr"> 222 </span>  assert<span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> exemplar<span class="Delimiter">));</span>
-<span id="L223" class="LineNr"> 223 </span>  assert<span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> new_recipe_ordinal<span class="Delimiter">));</span>
-<span id="L224" class="LineNr"> 224 </span>  <a href='010vm.cc.html#L19'>recipe</a> new_recipe = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> exemplar<span class="Delimiter">);</span>
-<span id="L225" class="LineNr"> 225 </span>  new_recipe<span class="Delimiter">.</span>name = new_name<span class="Delimiter">;</span>
-<span id="L226" class="LineNr"> 226 </span>  new_recipe<span class="Delimiter">.</span>is_autogenerated = <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L227" class="LineNr"> 227 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;switching &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; to specialized &quot;</span> &lt;&lt; header_label<span class="Delimiter">(</span>new_recipe<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L228" class="LineNr"> 228 </span>
-<span id="L229" class="LineNr"> 229 </span>  <span class="Comment">// Replace type ingredients with concrete types in new_recipe.</span>
-<span id="L230" class="LineNr"> 230 </span>  <span class="Comment">//</span>
-<span id="L231" class="LineNr"> 231 </span>  <span class="Comment">// preprocessing: micro-manage a couple of transforms</span>
-<span id="L232" class="LineNr"> 232 </span>  <span class="Comment">// a) perform tangle *before* replacing type ingredients, just in case</span>
-<span id="L233" class="LineNr"> 233 </span>  <span class="Comment">// inserted code involves type ingredients</span>
-<span id="L234" class="LineNr"> 234 </span>  insert_fragments<span class="Delimiter">(</span>new_recipe<span class="Delimiter">);</span>
-<span id="L235" class="LineNr"> 235 </span>  <span class="Comment">// b) do the work of check_or_set_types_by_name (and its prerequisites)</span>
-<span id="L236" class="LineNr"> 236 </span>  <span class="Comment">// while supporting type-ingredients</span>
-<span id="L237" class="LineNr"> 237 </span>  expand_type_abbreviations<span class="Delimiter">(</span>new_recipe<span class="Delimiter">);</span>
-<span id="L238" class="LineNr"> 238 </span>  <a href='056shape_shifting_recipe.cc.html#L255'>compute_type_names</a><span class="Delimiter">(</span>new_recipe<span class="Delimiter">);</span>
-<span id="L239" class="LineNr"> 239 </span>  <span class="Comment">// that gives enough information to replace type-ingredients with concrete types</span>
-<span id="L240" class="LineNr"> 240 </span>  <span class="Delimiter">{</span>
-<span id="L241" class="LineNr"> 241 </span>  <span class="Conceal">¦</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt; mappings<span class="Delimiter">;</span>
-<span id="L242" class="LineNr"> 242 </span>  <span class="Conceal">¦</span> <span class="Normal">bool</span> error = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L243" class="LineNr"> 243 </span>  <span class="Conceal">¦</span> <a href='056shape_shifting_recipe.cc.html#L289'>compute_type_ingredient_mappings</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> exemplar<span class="Delimiter">),</span> inst<span class="Delimiter">,</span> mappings<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">,</span> &amp;error<span class="Delimiter">);</span>
-<span id="L244" class="LineNr"> 244 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!error<span class="Delimiter">)</span> error = <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>mappings<span class="Delimiter">)</span> != <a href='056shape_shifting_recipe.cc.html#L427'>type_ingredient_count_in_header</a><span class="Delimiter">(</span>exemplar<span class="Delimiter">));</span>
-<span id="L245" class="LineNr"> 245 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!error<span class="Delimiter">)</span> replace_type_ingredients<span class="Delimiter">(</span>new_recipe<span class="Delimiter">,</span> mappings<span class="Delimiter">);</span>
-<span id="L246" class="LineNr"> 246 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt;::iterator p = mappings<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != mappings<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L247" class="LineNr"> 247 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">delete</span> p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">;</span>
-<span id="L248" class="LineNr"> 248 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>error<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L249" class="LineNr"> 249 </span>  <span class="Delimiter">}</span>
-<span id="L250" class="LineNr"> 250 </span>  ensure_all_concrete_types<span class="Delimiter">(</span>new_recipe<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> exemplar<span class="Delimiter">));</span>
-<span id="L251" class="LineNr"> 251 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> new_recipe_ordinal<span class="Delimiter">,</span> new_recipe<span class="Delimiter">);</span>
-<span id="L252" class="LineNr"> 252 </span>  <span class="Identifier">return</span> new_recipe_ordinal<span class="Delimiter">;</span>
-<span id="L253" class="LineNr"> 253 </span><span class="Delimiter">}</span>
-<span id="L254" class="LineNr"> 254 </span>
-<span id="L255" class="LineNr"> 255 </span><span class="Normal">void</span> <a href='056shape_shifting_recipe.cc.html#L255'>compute_type_names</a><span class="Delimiter">(</span>recipe&amp; variant<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L256" class="LineNr"> 256 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- compute type names: &quot;</span> &lt;&lt; variant<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L257" class="LineNr"> 257 </span>  map&lt;string<span class="Delimiter">,</span> type_tree*&gt; type_names<span class="Delimiter">;</span>
-<span id="L258" class="LineNr"> 258 </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>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L259" class="LineNr"> 259 </span>  <span class="Conceal">¦</span> <a href='056shape_shifting_recipe.cc.html#L272'>save_or_deduce_type_name</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> type_names<span class="Delimiter">,</span> variant<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L260" class="LineNr"> 260 </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>variant<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L261" class="LineNr"> 261 </span>  <span class="Conceal">¦</span> <a href='056shape_shifting_recipe.cc.html#L272'>save_or_deduce_type_name</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> type_names<span class="Delimiter">,</span> variant<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L262" class="LineNr"> 262 </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>variant<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L263" class="LineNr"> 263 </span>  <span class="Conceal">¦</span> instruction&amp; inst = variant<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L264" class="LineNr"> 264 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  <a href='010vm.cc.html#L32'>instruction</a>: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L265" class="LineNr"> 265 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> in = <span class="Constant">0</span><span class="Delimiter">;</span>  in &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++in<span class="Delimiter">)</span>
-<span id="L266" class="LineNr"> 266 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='056shape_shifting_recipe.cc.html#L272'>save_or_deduce_type_name</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>in<span class="Delimiter">),</span> type_names<span class="Delimiter">,</span> variant<span class="Delimiter">,</span> <span class="Constant">&quot; in '&quot;</span> + to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> + <span class="Constant">&quot;'&quot;</span><span class="Delimiter">);</span>
-<span id="L267" class="LineNr"> 267 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> out = <span class="Constant">0</span><span class="Delimiter">;</span>  out &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++out<span class="Delimiter">)</span>
-<span id="L268" class="LineNr"> 268 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='056shape_shifting_recipe.cc.html#L272'>save_or_deduce_type_name</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>out<span class="Delimiter">),</span> type_names<span class="Delimiter">,</span> variant<span class="Delimiter">,</span> <span class="Constant">&quot; in '&quot;</span> + to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> + <span class="Constant">&quot;'&quot;</span><span class="Delimiter">);</span>
-<span id="L269" class="LineNr"> 269 </span>  <span class="Delimiter">}</span>
-<span id="L270" class="LineNr"> 270 </span><span class="Delimiter">}</span>
-<span id="L271" class="LineNr"> 271 </span>
-<span id="L272" class="LineNr"> 272 </span><span class="Normal">void</span> <a href='056shape_shifting_recipe.cc.html#L272'>save_or_deduce_type_name</a><span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> type_tree*&gt;&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; variant<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; context<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L273" class="LineNr"> 273 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9994</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;    checking &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L274" class="LineNr"> 274 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type &amp;&amp; contains_key<span class="Delimiter">(</span>type<span class="Delimiter">,</span> x<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L275" class="LineNr"> 275 </span>  <span class="Conceal">¦</span> x<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*get<span class="Delimiter">(</span>type<span class="Delimiter">,</span> x<span class="Delimiter">.</span>name<span class="Delimiter">));</span>
-<span id="L276" class="LineNr"> 276 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9994</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;    deducing type to &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L277" class="LineNr"> 277 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L278" class="LineNr"> 278 </span>  <span class="Delimiter">}</span>
-<span id="L279" class="LineNr"> 279 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L280" class="LineNr"> 280 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>original_name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;unknown type for '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; context &lt;&lt; <span class="Constant">&quot; (check the name for typos)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L281" class="LineNr"> 281 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L282" class="LineNr"> 282 </span>  <span class="Delimiter">}</span>
-<span id="L283" class="LineNr"> 283 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>type<span class="Delimiter">,</span> x<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L284" class="LineNr"> 284 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;offset&quot;</span> || x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;variant&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// special-case for container-access instructions</span>
-<span id="L285" class="LineNr"> 285 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>type<span class="Delimiter">,</span> x<span class="Delimiter">.</span>name<span class="Delimiter">,</span> x<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L286" class="LineNr"> 286 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;type of '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' is &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L287" class="LineNr"> 287 </span><span class="Delimiter">}</span>
-<span id="L288" class="LineNr"> 288 </span>
-<span id="L289" class="LineNr"> 289 </span><span class="Normal">void</span> <a href='056shape_shifting_recipe.cc.html#L289'>compute_type_ingredient_mappings</a><span class="Delimiter">(</span><span class="Normal">const</span> recipe&amp; exemplar<span class="Delimiter">,</span> <span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt;&amp; mappings<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; caller_recipe<span class="Delimiter">,</span> <span class="Normal">bool</span>* error<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L290" class="LineNr"> 290 </span>  <span class="Normal">int</span> limit = 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>exemplar<span class="Delimiter">.</span>ingredients<span class="Delimiter">));</span>
-<span id="L291" class="LineNr"> 291 </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; limit<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L292" class="LineNr"> 292 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> reagent&amp; exemplar_reagent = exemplar<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L293" class="LineNr"> 293 </span>  <span class="Conceal">¦</span> reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> ingredient = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L294" class="LineNr"> 294 </span>  <span class="Conceal">¦</span> canonize_type<span class="Delimiter">(</span>ingredient<span class="Delimiter">);</span>
-<span id="L295" class="LineNr"> 295 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>exemplar_reagent<span class="Delimiter">)</span> &amp;&amp; ingredient<span class="Delimiter">.</span>name == <span class="Constant">&quot;0&quot;</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// assume it matches</span>
-<span id="L296" class="LineNr"> 296 </span>  <span class="Conceal">¦</span> accumulate_type_ingredients<span class="Delimiter">(</span>exemplar_reagent<span class="Delimiter">,</span> ingredient<span class="Delimiter">,</span> mappings<span class="Delimiter">,</span> exemplar<span class="Delimiter">,</span> inst<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">,</span> error<span class="Delimiter">);</span>
-<span id="L297" class="LineNr"> 297 </span>  <span class="Delimiter">}</span>
-<span id="L298" class="LineNr"> 298 </span>  limit = 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>exemplar<span class="Delimiter">.</span>products<span class="Delimiter">));</span>
-<span id="L299" class="LineNr"> 299 </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; limit<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L300" class="LineNr"> 300 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> reagent&amp; exemplar_reagent = exemplar<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L301" class="LineNr"> 301 </span>  <span class="Conceal">¦</span> reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> product = inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L302" class="LineNr"> 302 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_dummy<span class="Delimiter">(</span>product<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L303" class="LineNr"> 303 </span>  <span class="Conceal">¦</span> canonize_type<span class="Delimiter">(</span>product<span class="Delimiter">);</span>
-<span id="L304" class="LineNr"> 304 </span>  <span class="Conceal">¦</span> accumulate_type_ingredients<span class="Delimiter">(</span>exemplar_reagent<span class="Delimiter">,</span> product<span class="Delimiter">,</span> mappings<span class="Delimiter">,</span> exemplar<span class="Delimiter">,</span> inst<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">,</span> error<span class="Delimiter">);</span>
-<span id="L305" class="LineNr"> 305 </span>  <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="Normal">void</span> accumulate_type_ingredients<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; exemplar_reagent<span class="Delimiter">,</span> reagent&amp; refinement<span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt;&amp; mappings<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; exemplar<span class="Delimiter">,</span> <span class="Normal">const</span> instruction&amp; call_instruction<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; caller_recipe<span class="Delimiter">,</span> <span class="Normal">bool</span>* error<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L309" class="LineNr"> 309 </span>  assert<span class="Delimiter">(</span>refinement<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L310" class="LineNr"> 310 </span>  accumulate_type_ingredients<span class="Delimiter">(</span>exemplar_reagent<span class="Delimiter">.</span>type<span class="Delimiter">,</span> refinement<span class="Delimiter">.</span>type<span class="Delimiter">,</span> mappings<span class="Delimiter">,</span> exemplar<span class="Delimiter">,</span> exemplar_reagent<span class="Delimiter">,</span> call_instruction<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">,</span> error<span class="Delimiter">);</span>
-<span id="L311" class="LineNr"> 311 </span><span class="Delimiter">}</span>
-<span id="L312" class="LineNr"> 312 </span>
-<span id="L313" class="LineNr"> 313 </span><span class="Normal">void</span> accumulate_type_ingredients<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* exemplar_type<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* refinement_type<span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt;&amp; mappings<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; exemplar<span class="Delimiter">,</span> <span class="Normal">const</span> reagent&amp; exemplar_reagent<span class="Delimiter">,</span> <span class="Normal">const</span> instruction&amp; call_instruction<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; caller_recipe<span class="Delimiter">,</span> <span class="Normal">bool</span>* error<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L314" class="LineNr"> 314 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!exemplar_type<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L315" class="LineNr"> 315 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!refinement_type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L316" class="LineNr"> 316 </span>  <span class="Conceal">¦</span> <span class="Comment">// probably a bug in mu</span>
-<span id="L317" class="LineNr"> 317 </span>  <span class="Conceal">¦</span> <span class="Comment">// todo: make this smarter; only flag an error if exemplar_type contains some *new* type ingredient</span>
-<span id="L318" class="LineNr"> 318 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>exemplar<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;missing type ingredient for &quot;</span> &lt;&lt; exemplar_reagent<span class="Delimiter">.</span>original_string &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L319" class="LineNr"> 319 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;  (called from '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>call_instruction<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#L197'>end</a><span class="Delimiter">();</span>
-<span id="L320" class="LineNr"> 320 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L321" class="LineNr"> 321 </span>  <span class="Delimiter">}</span>
-<span id="L322" class="LineNr"> 322 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!exemplar_type<span class="Delimiter">-&gt;</span>atom &amp;&amp; exemplar_type<span class="Delimiter">-&gt;</span>right == <span class="Constant">NULL</span> &amp;&amp; !refinement_type<span class="Delimiter">-&gt;</span>atom &amp;&amp; refinement_type<span class="Delimiter">-&gt;</span>right != <span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L323" class="LineNr"> 323 </span>  <span class="Conceal">¦</span> exemplar_type = exemplar_type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">;</span>
-<span id="L324" class="LineNr"> 324 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L171'>assert_for_now</a><span class="Delimiter">(</span>exemplar_type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L325" class="LineNr"> 325 </span>  <span class="Delimiter">}</span>
-<span id="L326" class="LineNr"> 326 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>exemplar_type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L327" class="LineNr"> 327 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_type_ingredient_name<span class="Delimiter">(</span>exemplar_type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L328" class="LineNr"> 328 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">const</span> type_tree* curr_refinement_type = <span class="Constant">NULL</span><span class="Delimiter">;</span>  <span class="Comment">// temporary heap allocation; must always be deleted before it goes out of scope</span>
-<span id="L329" class="LineNr"> 329 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>exemplar_type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span>
-<span id="L330" class="LineNr"> 330 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr_refinement_type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*refinement_type<span class="Delimiter">);</span>
-<span id="L331" class="LineNr"> 331 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L332" class="LineNr"> 332 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>!refinement_type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L333" class="LineNr"> 333 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr_refinement_type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*refinement_type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">);</span>
-<span id="L334" class="LineNr"> 334 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L335" class="LineNr"> 335 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> exemplar_type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L336" class="LineNr"> 336 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;adding mapping from &quot;</span> &lt;&lt; exemplar_type<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>curr_refinement_type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L337" class="LineNr"> 337 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> exemplar_type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*curr_refinement_type<span class="Delimiter">));</span>
-<span id="L338" class="LineNr"> 338 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L339" class="LineNr"> 339 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L340" class="LineNr"> 340 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!deeply_equal_type_names<span class="Delimiter">(</span>get<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> exemplar_type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">),</span> curr_refinement_type<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L341" class="LineNr"> 341 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;no call found for '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>call_instruction<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#L197'>end</a><span class="Delimiter">();</span>
-<span id="L342" class="LineNr"> 342 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> *error = <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L343" class="LineNr"> 343 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">delete</span> curr_refinement_type<span class="Delimiter">;</span>
-<span id="L344" class="LineNr"> 344 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L345" class="LineNr"> 345 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L346" class="LineNr"> 346 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>get<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> exemplar_type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)-&gt;</span>name == <span class="Constant">&quot;literal&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L347" class="LineNr"> 347 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">delete</span> get<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> exemplar_type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">);</span>
-<span id="L348" class="LineNr"> 348 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> exemplar_type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*curr_refinement_type<span class="Delimiter">));</span>
-<span id="L349" class="LineNr"> 349 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L350" class="LineNr"> 350 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L351" class="LineNr"> 351 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">delete</span> curr_refinement_type<span class="Delimiter">;</span>
-<span id="L352" class="LineNr"> 352 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L353" class="LineNr"> 353 </span>  <span class="Delimiter">}</span>
-<span id="L354" class="LineNr"> 354 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L355" class="LineNr"> 355 </span>  <span class="Conceal">¦</span> accumulate_type_ingredients<span class="Delimiter">(</span>exemplar_type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> refinement_type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> mappings<span class="Delimiter">,</span> exemplar<span class="Delimiter">,</span> exemplar_reagent<span class="Delimiter">,</span> call_instruction<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">,</span> error<span class="Delimiter">);</span>
-<span id="L356" class="LineNr"> 356 </span>  <span class="Conceal">¦</span> accumulate_type_ingredients<span class="Delimiter">(</span>exemplar_type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">,</span> refinement_type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">,</span> mappings<span class="Delimiter">,</span> exemplar<span class="Delimiter">,</span> exemplar_reagent<span class="Delimiter">,</span> call_instruction<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">,</span> error<span class="Delimiter">);</span>
-<span id="L357" class="LineNr"> 357 </span>  <span class="Delimiter">}</span>
-<span id="L358" class="LineNr"> 358 </span><span class="Delimiter">}</span>
-<span id="L359" class="LineNr"> 359 </span>
-<span id="L360" class="LineNr"> 360 </span><span class="Normal">void</span> replace_type_ingredients<span class="Delimiter">(</span>recipe&amp; new_recipe<span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt;&amp; mappings<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L361" class="LineNr"> 361 </span>  <span class="Comment">// update its header</span>
-<span id="L362" class="LineNr"> 362 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>mappings<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L363" class="LineNr"> 363 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;replacing in <a href='010vm.cc.html#L19'>recipe</a> header ingredients&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L364" class="LineNr"> 364 </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>new_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L365" class="LineNr"> 365 </span>  <span class="Conceal">¦</span> replace_type_ingredients<span class="Delimiter">(</span>new_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> mappings<span class="Delimiter">,</span> new_recipe<span class="Delimiter">);</span>
-<span id="L366" class="LineNr"> 366 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;replacing in <a href='010vm.cc.html#L19'>recipe</a> header products&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L367" class="LineNr"> 367 </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>new_recipe<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L368" class="LineNr"> 368 </span>  <span class="Conceal">¦</span> replace_type_ingredients<span class="Delimiter">(</span>new_recipe<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> mappings<span class="Delimiter">,</span> new_recipe<span class="Delimiter">);</span>
-<span id="L369" class="LineNr"> 369 </span>  <span class="Comment">// update its body</span>
-<span id="L370" class="LineNr"> 370 </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>new_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L371" class="LineNr"> 371 </span>  <span class="Conceal">¦</span> instruction&amp; inst = new_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L372" class="LineNr"> 372 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;replacing in <a href='010vm.cc.html#L32'>instruction</a> '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L373" class="LineNr"> 373 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
-<span id="L374" class="LineNr"> 374 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> replace_type_ingredients<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">),</span> mappings<span class="Delimiter">,</span> new_recipe<span class="Delimiter">);</span>
-<span id="L375" class="LineNr"> 375 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
-<span id="L376" class="LineNr"> 376 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> replace_type_ingredients<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">),</span> mappings<span class="Delimiter">,</span> new_recipe<span class="Delimiter">);</span>
-<span id="L377" class="LineNr"> 377 </span>  <span class="Conceal">¦</span> <span class="Comment">// special-case for new: replace type ingredient in first ingredient *value*</span>
-<span id="L378" class="LineNr"> 378 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;new&quot;</span> &amp;&amp; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>type<span class="Delimiter">-&gt;</span>name != <span class="Constant">&quot;literal-string&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L379" class="LineNr"> 379 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> type_tree* type = <a href='056shape_shifting_recipe.cc.html#L444'>parse_type_tree</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>name<span class="Delimiter">);</span>
-<span id="L380" class="LineNr"> 380 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> replace_type_ingredients<span class="Delimiter">(</span>type<span class="Delimiter">,</span> mappings<span class="Delimiter">);</span>
-<span id="L381" class="LineNr"> 381 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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 = inspect<span class="Delimiter">(</span>type<span class="Delimiter">);</span>
-<span id="L382" class="LineNr"> 382 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">delete</span> type<span class="Delimiter">;</span>
-<span id="L383" class="LineNr"> 383 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L384" class="LineNr"> 384 </span>  <span class="Delimiter">}</span>
-<span id="L385" class="LineNr"> 385 </span><span class="Delimiter">}</span>
-<span id="L386" class="LineNr"> 386 </span>
-<span id="L387" class="LineNr"> 387 </span><span class="Normal">void</span> replace_type_ingredients<span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt;&amp; mappings<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; caller<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L388" class="LineNr"> 388 </span>  string before = <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">);</span>
-<span id="L389" class="LineNr"> 389 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;replacing in ingredient &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L390" class="LineNr"> 390 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L391" class="LineNr"> 391 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;specializing &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>original_name &lt;&lt; <span class="Constant">&quot;: missing type for '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L392" class="LineNr"> 392 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L118" class="LineNr"> 118 </span><span class="Comment">// manual prototype</span>
+<span id="L119" class="LineNr"> 119 </span>vector&lt;recipe_ordinal&gt; <a href='056shape_shifting_recipe.cc.html#L145'>keep_max</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp;<span class="Delimiter">,</span> <span class="Normal">const</span> vector&lt;recipe_ordinal&gt;&amp;<span class="Delimiter">,</span>
+<span id="L120" class="LineNr"> 120 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span>           <span class="Normal">int</span> <span class="Delimiter">(</span>*<span class="Delimiter">)(</span><span class="Normal">const</span> instruction&amp;<span class="Delimiter">,</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a><span class="Delimiter">));</span>
+<span id="L121" class="LineNr"> 121 </span>
+<span id="L122" class="LineNr"> 122 </span><span class="Comment">// tie-breaker for phase 3</span>
+<span id="L123" class="LineNr"> 123 </span><a href='010vm.cc.html#L14'>recipe_ordinal</a> <a href='056shape_shifting_recipe.cc.html#L123'>best_shape_shifting_variant</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> vector&lt;recipe_ordinal&gt;&amp; candidates<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L124" class="LineNr"> 124 </span>  assert<span class="Delimiter">(</span>!candidates<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L125" class="LineNr"> 125 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>candidates<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">return</span> candidates<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L126" class="LineNr"> 126 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;A picking shape-shifting variant:\n&quot;;</span>
+<span id="L127" class="LineNr"> 127 </span>  vector&lt;recipe_ordinal&gt; result1 = <a href='056shape_shifting_recipe.cc.html#L145'>keep_max</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> candidates<span class="Delimiter">,</span> number_of_concrete_type_names<span class="Delimiter">);</span>
+<span id="L128" class="LineNr"> 128 </span>  assert<span class="Delimiter">(</span>!result1<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L129" class="LineNr"> 129 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>result1<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">return</span> result1<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L130" class="LineNr"> 130 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;B picking shape-shifting variant:\n&quot;;</span>
+<span id="L131" class="LineNr"> 131 </span>  vector&lt;recipe_ordinal&gt; result2 = <a href='056shape_shifting_recipe.cc.html#L145'>keep_max</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> result1<span class="Delimiter">,</span> <a href='056shape_shifting_recipe.cc.html#L167'>arity_fit</a><span class="Delimiter">);</span>
+<span id="L132" class="LineNr"> 132 </span>  assert<span class="Delimiter">(</span>!result2<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L133" class="LineNr"> 133 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>result2<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">return</span> result2<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L134" class="LineNr"> 134 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;C picking shape-shifting variant:\n&quot;;</span>
+<span id="L135" class="LineNr"> 135 </span>  vector&lt;recipe_ordinal&gt; result3 = <a href='056shape_shifting_recipe.cc.html#L145'>keep_max</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> result2<span class="Delimiter">,</span> number_of_type_ingredients<span class="Delimiter">);</span>
+<span id="L136" class="LineNr"> 136 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>result3<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L137" class="LineNr"> 137 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">Couldn't decide the best shape-shifting variant for instruction '&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; end<span class="Delimiter">();</span>
+<span id="L138" class="LineNr"> 138 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;This is a hole in Mu. Please copy the following candidates into an email to Kartik Agaram &lt;mu@akkartik.com&gt;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L139" class="LineNr"> 139 </span>  <span class="Conceal">¦</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>candidates<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L140" class="LineNr"> 140 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; header_label<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> candidates<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L141" class="LineNr"> 141 </span>  <span class="Delimiter">}</span>
+<span id="L142" class="LineNr"> 142 </span>  <span class="Identifier">return</span> result3<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L143" class="LineNr"> 143 </span><span class="Delimiter">}</span>
+<span id="L144" class="LineNr"> 144 </span>
+<span id="L145" class="LineNr"> 145 </span>vector&lt;recipe_ordinal&gt; <a href='056shape_shifting_recipe.cc.html#L145'>keep_max</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> vector&lt;recipe_ordinal&gt;&amp; in<span class="Delimiter">,</span>
+<span id="L146" class="LineNr"> 146 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span>           <span class="Normal">int</span> <span class="Delimiter">(</span>*scorer<span class="Delimiter">)(</span><span class="Normal">const</span> instruction&amp;<span class="Delimiter">,</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L147" class="LineNr"> 147 </span>  assert<span class="Delimiter">(</span>!in<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L148" class="LineNr"> 148 </span>  vector&lt;recipe_ordinal&gt; out<span class="Delimiter">;</span>
+<span id="L149" class="LineNr"> 149 </span>  out<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
+<span id="L150" class="LineNr"> 150 </span>  <span class="Normal">int</span> best_score = <span class="Delimiter">(</span>*scorer<span class="Delimiter">)(</span>inst<span class="Delimiter">,</span> in<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
+<span id="L151" class="LineNr"> 151 </span><span class="CommentedCode">//?   cerr &lt;&lt; best_score &lt;&lt; &quot; &quot; &lt;&lt; header_label(get(Recipe, in.at(0))) &lt;&lt; '\n';</span>
+<span id="L152" class="LineNr"> 152 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L153" class="LineNr"> 153 </span>  <span class="Conceal">¦</span> <span class="Normal">int</span> score = <span class="Delimiter">(</span>*scorer<span class="Delimiter">)(</span>inst<span class="Delimiter">,</span> in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L154" class="LineNr"> 154 </span><span class="CommentedCode">//?     cerr &lt;&lt; score &lt;&lt; &quot; &quot; &lt;&lt; header_label(get(Recipe, in.at(i))) &lt;&lt; '\n';</span>
+<span id="L155" class="LineNr"> 155 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>score == best_score<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L156" class="LineNr"> 156 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> out<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L157" class="LineNr"> 157 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L158" class="LineNr"> 158 </span>  <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>score &gt; best_score<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L159" class="LineNr"> 159 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> best_score = score<span class="Delimiter">;</span>
+<span id="L160" class="LineNr"> 160 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> out<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L161" class="LineNr"> 161 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> out<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L162" class="LineNr"> 162 </span>  <span class="Conceal">¦</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="Identifier">return</span> out<span class="Delimiter">;</span>
+<span id="L165" class="LineNr"> 165 </span><span class="Delimiter">}</span>
+<span id="L166" class="LineNr"> 166 </span>
+<span id="L167" class="LineNr"> 167 </span><span class="Normal">int</span> <a href='056shape_shifting_recipe.cc.html#L167'>arity_fit</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> candidate<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L168" class="LineNr"> 168 </span>  <span class="Normal">const</span> recipe&amp; r = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> candidate<span class="Delimiter">);</span>
+<span id="L169" class="LineNr"> 169 </span>  <span class="Identifier">return</span> <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>r<span class="Delimiter">.</span>products<span class="Delimiter">))</span>
+<span id="L170" class="LineNr"> 170 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span>+ <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>ingredients<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>
+<span id="L171" class="LineNr"> 171 </span><span class="Delimiter">}</span>
+<span id="L172" class="LineNr"> 172 </span>
+<span id="L173" class="LineNr"> 173 </span><span class="Normal">bool</span> <a href='056shape_shifting_recipe.cc.html#L173'>any_type_ingredient_in_header</a><span class="Delimiter">(</span><a href='010vm.cc.html#L14'>recipe_ordinal</a> variant<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L174" class="LineNr"> 174 </span>  <span class="Normal">const</span> recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> variant<span class="Delimiter">);</span>
+<span id="L175" class="LineNr"> 175 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L176" class="LineNr"> 176 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>contains_type_ingredient_name<span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span>
+<span id="L177" class="LineNr"> 177 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L178" class="LineNr"> 178 </span>  <span class="Delimiter">}</span>
+<span id="L179" class="LineNr"> 179 </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>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L180" class="LineNr"> 180 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>contains_type_ingredient_name<span class="Delimiter">(</span>caller<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span>
+<span id="L181" class="LineNr"> 181 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L182" class="LineNr"> 182 </span>  <span class="Delimiter">}</span>
+<span id="L183" class="LineNr"> 183 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L184" class="LineNr"> 184 </span><span class="Delimiter">}</span>
+<span id="L185" class="LineNr"> 185 </span>
+<span id="L186" class="LineNr"> 186 </span><span class="Normal">bool</span> concrete_type_names_strictly_match<span class="Delimiter">(</span>reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> to<span class="Delimiter">,</span> reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> from<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L187" class="LineNr"> 187 </span>  canonize_type<span class="Delimiter">(</span>to<span class="Delimiter">);</span>
+<span id="L188" class="LineNr"> 188 </span>  canonize_type<span class="Delimiter">(</span>from<span class="Delimiter">);</span>
+<span id="L189" class="LineNr"> 189 </span>  <span class="Identifier">return</span> concrete_type_names_strictly_match<span class="Delimiter">(</span>to<span class="Delimiter">.</span>type<span class="Delimiter">,</span> from<span class="Delimiter">.</span>type<span class="Delimiter">,</span> from<span class="Delimiter">);</span>
+<span id="L190" class="LineNr"> 190 </span><span class="Delimiter">}</span>
+<span id="L191" class="LineNr"> 191 </span>
+<span id="L192" class="LineNr"> 192 </span><span class="Normal">bool</span> concrete_type_names_strictly_match<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* to<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* from<span class="Delimiter">,</span> <span class="Normal">const</span> reagent&amp; rhs_reagent<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L193" class="LineNr"> 193 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!to<span class="Delimiter">)</span> <span class="Identifier">return</span> !from<span class="Delimiter">;</span>
+<span id="L194" class="LineNr"> 194 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!from<span class="Delimiter">)</span> <span class="Identifier">return</span> !to<span class="Delimiter">;</span>
+<span id="L195" class="LineNr"> 195 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>to<span class="Delimiter">-&gt;</span>atom &amp;&amp; is_type_ingredient_name<span class="Delimiter">(</span>to<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>  <span class="Comment">// type ingredient matches anything</span>
+<span id="L196" class="LineNr"> 196 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!to<span class="Delimiter">-&gt;</span>atom &amp;&amp; to<span class="Delimiter">-&gt;</span>right == <span class="Constant">NULL</span> &amp;&amp; to<span class="Delimiter">-&gt;</span>left != <span class="Constant">NULL</span> &amp;&amp; to<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom &amp;&amp; is_type_ingredient_name<span class="Delimiter">(</span>to<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L197" class="LineNr"> 197 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>from<span class="Delimiter">-&gt;</span>atom &amp;&amp; is_mu_address<span class="Delimiter">(</span>to<span class="Delimiter">))</span>
+<span id="L198" class="LineNr"> 198 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> from<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;literal&quot;</span> &amp;&amp; rhs_reagent<span class="Delimiter">.</span>name == <span class="Constant">&quot;0&quot;</span><span class="Delimiter">;</span>
+<span id="L199" class="LineNr"> 199 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!from<span class="Delimiter">-&gt;</span>atom &amp;&amp; !to<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span>
+<span id="L200" class="LineNr"> 200 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> concrete_type_names_strictly_match<span class="Delimiter">(</span>to<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> from<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> rhs_reagent<span class="Delimiter">)</span>
+<span id="L201" class="LineNr"> 201 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> &amp;&amp; concrete_type_names_strictly_match<span class="Delimiter">(</span>to<span class="Delimiter">-&gt;</span>right<span class="Delimiter">,</span> from<span class="Delimiter">-&gt;</span>right<span class="Delimiter">,</span> rhs_reagent<span class="Delimiter">);</span>
+<span id="L202" class="LineNr"> 202 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>from<span class="Delimiter">-&gt;</span>atom != to<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L203" class="LineNr"> 203 </span>  <span class="Comment">// both from and to are atoms</span>
+<span id="L204" class="LineNr"> 204 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>from<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;literal&quot;</span><span class="Delimiter">)</span>
+<span id="L205" class="LineNr"> 205 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> Literal_type_names<span class="Delimiter">.</span>find<span class="Delimiter">(</span>to<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)</span> != Literal_type_names<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L206" class="LineNr"> 206 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>to<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;literal&quot;</span><span class="Delimiter">)</span>
+<span id="L207" class="LineNr"> 207 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> Literal_type_names<span class="Delimiter">.</span>find<span class="Delimiter">(</span>from<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)</span> != Literal_type_names<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L208" class="LineNr"> 208 </span>  <span class="Identifier">return</span> to<span class="Delimiter">-&gt;</span>name == from<span class="Delimiter">-&gt;</span>name<span class="Delimiter">;</span>
+<span id="L209" class="LineNr"> 209 </span><span class="Delimiter">}</span>
+<span id="L210" class="LineNr"> 210 </span>
+<span id="L211" class="LineNr"> 211 </span><span class="Normal">bool</span> contains_type_ingredient_name<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L212" class="LineNr"> 212 </span>  <span class="Identifier">return</span> contains_type_ingredient_name<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L213" class="LineNr"> 213 </span><span class="Delimiter">}</span>
+<span id="L214" class="LineNr"> 214 </span>
+<span id="L215" class="LineNr"> 215 </span><span class="Normal">bool</span> contains_type_ingredient_name<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L216" class="LineNr"> 216 </span>  <span class="Normal">if</span> <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="L217" class="LineNr"> 217 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_type_ingredient_name<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L218" class="LineNr"> 218 </span>  <span class="Identifier">return</span> contains_type_ingredient_name<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">)</span> || contains_type_ingredient_name<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">);</span>
+<span id="L219" class="LineNr"> 219 </span><span class="Delimiter">}</span>
+<span id="L220" class="LineNr"> 220 </span>
+<span id="L221" class="LineNr"> 221 </span><span class="Normal">int</span> number_of_concrete_type_names<span class="Delimiter">(</span><a href='001help.cc.html#L258'>unused</a> <span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L222" class="LineNr"> 222 </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="L223" class="LineNr"> 223 </span>  <span class="Normal">int</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L224" class="LineNr"> 224 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L225" class="LineNr"> 225 </span>  <span class="Conceal">¦</span> result += number_of_concrete_type_names<span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">);</span>
+<span id="L226" class="LineNr"> 226 </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>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L227" class="LineNr"> 227 </span>  <span class="Conceal">¦</span> result += number_of_concrete_type_names<span class="Delimiter">(</span>caller<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">);</span>
+<span id="L228" class="LineNr"> 228 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</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="Normal">int</span> number_of_concrete_type_names<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L232" class="LineNr"> 232 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L233" class="LineNr"> 233 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span>
+<span id="L234" class="LineNr"> 234 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> is_type_ingredient_name<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)</span> ? <span class="Constant">0</span> : <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L235" class="LineNr"> 235 </span>  <span class="Identifier">return</span> number_of_concrete_type_names<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">)</span>
+<span id="L236" class="LineNr"> 236 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span>+ number_of_concrete_type_names<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">);</span>
+<span id="L237" class="LineNr"> 237 </span><span class="Delimiter">}</span>
+<span id="L238" class="LineNr"> 238 </span>
+<span id="L239" class="LineNr"> 239 </span><span class="Normal">int</span> number_of_type_ingredients<span class="Delimiter">(</span><a href='001help.cc.html#L258'>unused</a> <span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L240" class="LineNr"> 240 </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="L241" class="LineNr"> 241 </span>  <span class="Normal">int</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L242" class="LineNr"> 242 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L243" class="LineNr"> 243 </span>  <span class="Conceal">¦</span> result += number_of_type_ingredients<span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">);</span>
+<span id="L244" class="LineNr"> 244 </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>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L245" class="LineNr"> 245 </span>  <span class="Conceal">¦</span> result += number_of_type_ingredients<span class="Delimiter">(</span>caller<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">);</span>
+<span id="L246" class="LineNr"> 246 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L247" class="LineNr"> 247 </span><span class="Delimiter">}</span>
+<span id="L248" class="LineNr"> 248 </span>
+<span id="L249" class="LineNr"> 249 </span><span class="Normal">int</span> number_of_type_ingredients<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L250" class="LineNr"> 250 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L251" class="LineNr"> 251 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span>
+<span id="L252" class="LineNr"> 252 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> is_type_ingredient_name<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)</span> ? <span class="Constant">1</span> : <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L253" class="LineNr"> 253 </span>  <span class="Identifier">return</span> number_of_type_ingredients<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">)</span>
+<span id="L254" class="LineNr"> 254 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span>+ number_of_type_ingredients<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">);</span>
+<span id="L255" class="LineNr"> 255 </span><span class="Delimiter">}</span>
+<span id="L256" class="LineNr"> 256 </span>
+<span id="L257" class="LineNr"> 257 </span><a href='010vm.cc.html#L14'>recipe_ordinal</a> <a href='056shape_shifting_recipe.cc.html#L257'>new_variant</a><span class="Delimiter">(</span><a href='010vm.cc.html#L14'>recipe_ordinal</a> exemplar<span class="Delimiter">,</span> <span class="Normal">const</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="L258" class="LineNr"> 258 </span>  string new_name = <a href='054static_dispatch.cc.html#L111'>next_unused_recipe_name</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name<span class="Delimiter">);</span>
+<span id="L259" class="LineNr"> 259 </span>  assert<span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> new_name<span class="Delimiter">));</span>
+<span id="L260" class="LineNr"> 260 </span>  <a href='010vm.cc.html#L14'>recipe_ordinal</a> new_recipe_ordinal = <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> new_name<span class="Delimiter">,</span> Next_recipe_ordinal++<span class="Delimiter">);</span>
+<span id="L261" class="LineNr"> 261 </span>  <span class="Comment">// make a copy</span>
+<span id="L262" class="LineNr"> 262 </span>  assert<span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> exemplar<span class="Delimiter">));</span>
+<span id="L263" class="LineNr"> 263 </span>  assert<span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> new_recipe_ordinal<span class="Delimiter">));</span>
+<span id="L264" class="LineNr"> 264 </span>  <a href='010vm.cc.html#L19'>recipe</a> new_recipe = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> exemplar<span class="Delimiter">);</span>
+<span id="L265" class="LineNr"> 265 </span>  new_recipe<span class="Delimiter">.</span>name = new_name<span class="Delimiter">;</span>
+<span id="L266" class="LineNr"> 266 </span>  new_recipe<span class="Delimiter">.</span>is_autogenerated = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L267" class="LineNr"> 267 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;switching &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; to specialized &quot;</span> &lt;&lt; header_label<span class="Delimiter">(</span>new_recipe<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L268" class="LineNr"> 268 </span>
+<span id="L269" class="LineNr"> 269 </span>  <span class="Comment">// Replace type ingredients with concrete types in new_recipe.</span>
+<span id="L270" class="LineNr"> 270 </span>  <span class="Comment">//</span>
+<span id="L271" class="LineNr"> 271 </span>  <span class="Comment">// preprocessing: micro-manage a couple of transforms</span>
+<span id="L272" class="LineNr"> 272 </span>  <span class="Comment">// a) perform tangle *before* replacing type ingredients, just in case</span>
+<span id="L273" class="LineNr"> 273 </span>  <span class="Comment">// inserted code involves type ingredients</span>
+<span id="L274" class="LineNr"> 274 </span>  insert_fragments<span class="Delimiter">(</span>new_recipe<span class="Delimiter">);</span>
+<span id="L275" class="LineNr"> 275 </span>  <span class="Comment">// b) do the work of check_or_set_types_by_name (and its prerequisites)</span>
+<span id="L276" class="LineNr"> 276 </span>  <span class="Comment">// while supporting type-ingredients</span>
+<span id="L277" class="LineNr"> 277 </span>  expand_type_abbreviations<span class="Delimiter">(</span>new_recipe<span class="Delimiter">);</span>
+<span id="L278" class="LineNr"> 278 </span>  <a href='056shape_shifting_recipe.cc.html#L295'>compute_type_names</a><span class="Delimiter">(</span>new_recipe<span class="Delimiter">);</span>
+<span id="L279" class="LineNr"> 279 </span>  <span class="Comment">// that gives enough information to replace type-ingredients with concrete types</span>
+<span id="L280" class="LineNr"> 280 </span>  <span class="Delimiter">{</span>
+<span id="L281" class="LineNr"> 281 </span>  <span class="Conceal">¦</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt; mappings<span class="Delimiter">;</span>
+<span id="L282" class="LineNr"> 282 </span>  <span class="Conceal">¦</span> <span class="Normal">bool</span> error = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L283" class="LineNr"> 283 </span>  <span class="Conceal">¦</span> <a href='056shape_shifting_recipe.cc.html#L329'>compute_type_ingredient_mappings</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> exemplar<span class="Delimiter">),</span> inst<span class="Delimiter">,</span> mappings<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">,</span> &amp;error<span class="Delimiter">);</span>
+<span id="L284" class="LineNr"> 284 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!error<span class="Delimiter">)</span> error = <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>mappings<span class="Delimiter">)</span> != <a href='056shape_shifting_recipe.cc.html#L467'>type_ingredient_count_in_header</a><span class="Delimiter">(</span>exemplar<span class="Delimiter">));</span>
+<span id="L285" class="LineNr"> 285 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!error<span class="Delimiter">)</span> replace_type_ingredients<span class="Delimiter">(</span>new_recipe<span class="Delimiter">,</span> mappings<span class="Delimiter">);</span>
+<span id="L286" class="LineNr"> 286 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt;::iterator p = mappings<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != mappings<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L287" class="LineNr"> 287 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">delete</span> p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">;</span>
+<span id="L288" class="LineNr"> 288 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>error<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L289" class="LineNr"> 289 </span>  <span class="Delimiter">}</span>
+<span id="L290" class="LineNr"> 290 </span>  ensure_all_concrete_types<span class="Delimiter">(</span>new_recipe<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> exemplar<span class="Delimiter">));</span>
+<span id="L291" class="LineNr"> 291 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> new_recipe_ordinal<span class="Delimiter">,</span> new_recipe<span class="Delimiter">);</span>
+<span id="L292" class="LineNr"> 292 </span>  <span class="Identifier">return</span> new_recipe_ordinal<span class="Delimiter">;</span>
+<span id="L293" class="LineNr"> 293 </span><span class="Delimiter">}</span>
+<span id="L294" class="LineNr"> 294 </span>
+<span id="L295" class="LineNr"> 295 </span><span class="Normal">void</span> <a href='056shape_shifting_recipe.cc.html#L295'>compute_type_names</a><span class="Delimiter">(</span>recipe&amp; variant<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L296" class="LineNr"> 296 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- compute type names: &quot;</span> &lt;&lt; variant<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L297" class="LineNr"> 297 </span>  map&lt;string<span class="Delimiter">,</span> type_tree*&gt; type_names<span class="Delimiter">;</span>
+<span id="L298" class="LineNr"> 298 </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>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L299" class="LineNr"> 299 </span>  <span class="Conceal">¦</span> <a href='056shape_shifting_recipe.cc.html#L312'>save_or_deduce_type_name</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> type_names<span class="Delimiter">,</span> variant<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L300" class="LineNr"> 300 </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>variant<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L301" class="LineNr"> 301 </span>  <span class="Conceal">¦</span> <a href='056shape_shifting_recipe.cc.html#L312'>save_or_deduce_type_name</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> type_names<span class="Delimiter">,</span> variant<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L302" class="LineNr"> 302 </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>variant<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L303" class="LineNr"> 303 </span>  <span class="Conceal">¦</span> instruction&amp; inst = variant<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L304" class="LineNr"> 304 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  <a href='010vm.cc.html#L32'>instruction</a>: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L305" class="LineNr"> 305 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> in = <span class="Constant">0</span><span class="Delimiter">;</span>  in &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++in<span class="Delimiter">)</span>
+<span id="L306" class="LineNr"> 306 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='056shape_shifting_recipe.cc.html#L312'>save_or_deduce_type_name</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>in<span class="Delimiter">),</span> type_names<span class="Delimiter">,</span> variant<span class="Delimiter">,</span> <span class="Constant">&quot; in '&quot;</span> + to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> + <span class="Constant">&quot;'&quot;</span><span class="Delimiter">);</span>
+<span id="L307" class="LineNr"> 307 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> out = <span class="Constant">0</span><span class="Delimiter">;</span>  out &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++out<span class="Delimiter">)</span>
+<span id="L308" class="LineNr"> 308 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='056shape_shifting_recipe.cc.html#L312'>save_or_deduce_type_name</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>out<span class="Delimiter">),</span> type_names<span class="Delimiter">,</span> variant<span class="Delimiter">,</span> <span class="Constant">&quot; in '&quot;</span> + to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> + <span class="Constant">&quot;'&quot;</span><span class="Delimiter">);</span>
+<span id="L309" class="LineNr"> 309 </span>  <span class="Delimiter">}</span>
+<span id="L310" class="LineNr"> 310 </span><span class="Delimiter">}</span>
+<span id="L311" class="LineNr"> 311 </span>
+<span id="L312" class="LineNr"> 312 </span><span class="Normal">void</span> <a href='056shape_shifting_recipe.cc.html#L312'>save_or_deduce_type_name</a><span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> type_tree*&gt;&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; variant<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; context<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L313" class="LineNr"> 313 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9994</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;    checking &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L314" class="LineNr"> 314 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type &amp;&amp; contains_key<span class="Delimiter">(</span>type<span class="Delimiter">,</span> x<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L315" class="LineNr"> 315 </span>  <span class="Conceal">¦</span> x<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*get<span class="Delimiter">(</span>type<span class="Delimiter">,</span> x<span class="Delimiter">.</span>name<span class="Delimiter">));</span>
+<span id="L316" class="LineNr"> 316 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9994</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;    deducing type to &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L317" class="LineNr"> 317 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L318" class="LineNr"> 318 </span>  <span class="Delimiter">}</span>
+<span id="L319" class="LineNr"> 319 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L320" class="LineNr"> 320 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>original_name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;unknown type for '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; context &lt;&lt; <span class="Constant">&quot; (check the name for typos)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L321" class="LineNr"> 321 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</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">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>type<span class="Delimiter">,</span> x<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L324" class="LineNr"> 324 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;offset&quot;</span> || x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;variant&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// special-case for container-access instructions</span>
+<span id="L325" class="LineNr"> 325 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>type<span class="Delimiter">,</span> x<span class="Delimiter">.</span>name<span class="Delimiter">,</span> x<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L326" class="LineNr"> 326 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;type of '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' is &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L327" class="LineNr"> 327 </span><span class="Delimiter">}</span>
+<span id="L328" class="LineNr"> 328 </span>
+<span id="L329" class="LineNr"> 329 </span><span class="Normal">void</span> <a href='056shape_shifting_recipe.cc.html#L329'>compute_type_ingredient_mappings</a><span class="Delimiter">(</span><span class="Normal">const</span> recipe&amp; exemplar<span class="Delimiter">,</span> <span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt;&amp; mappings<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; caller_recipe<span class="Delimiter">,</span> <span class="Normal">bool</span>* error<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L330" class="LineNr"> 330 </span>  <span class="Normal">int</span> limit = 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>exemplar<span class="Delimiter">.</span>ingredients<span class="Delimiter">));</span>
+<span id="L331" class="LineNr"> 331 </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; limit<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L332" class="LineNr"> 332 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> reagent&amp; exemplar_reagent = exemplar<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L333" class="LineNr"> 333 </span>  <span class="Conceal">¦</span> reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> ingredient = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L334" class="LineNr"> 334 </span>  <span class="Conceal">¦</span> canonize_type<span class="Delimiter">(</span>ingredient<span class="Delimiter">);</span>
+<span id="L335" class="LineNr"> 335 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>exemplar_reagent<span class="Delimiter">)</span> &amp;&amp; ingredient<span class="Delimiter">.</span>name == <span class="Constant">&quot;0&quot;</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// assume it matches</span>
+<span id="L336" class="LineNr"> 336 </span>  <span class="Conceal">¦</span> accumulate_type_ingredients<span class="Delimiter">(</span>exemplar_reagent<span class="Delimiter">,</span> ingredient<span class="Delimiter">,</span> mappings<span class="Delimiter">,</span> exemplar<span class="Delimiter">,</span> inst<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">,</span> error<span class="Delimiter">);</span>
+<span id="L337" class="LineNr"> 337 </span>  <span class="Delimiter">}</span>
+<span id="L338" class="LineNr"> 338 </span>  limit = 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>exemplar<span class="Delimiter">.</span>products<span class="Delimiter">));</span>
+<span id="L339" class="LineNr"> 339 </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; limit<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L340" class="LineNr"> 340 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> reagent&amp; exemplar_reagent = exemplar<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L341" class="LineNr"> 341 </span>  <span class="Conceal">¦</span> reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> product = inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L342" class="LineNr"> 342 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_dummy<span class="Delimiter">(</span>product<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L343" class="LineNr"> 343 </span>  <span class="Conceal">¦</span> canonize_type<span class="Delimiter">(</span>product<span class="Delimiter">);</span>
+<span id="L344" class="LineNr"> 344 </span>  <span class="Conceal">¦</span> accumulate_type_ingredients<span class="Delimiter">(</span>exemplar_reagent<span class="Delimiter">,</span> product<span class="Delimiter">,</span> mappings<span class="Delimiter">,</span> exemplar<span class="Delimiter">,</span> inst<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">,</span> error<span class="Delimiter">);</span>
+<span id="L345" class="LineNr"> 345 </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="Normal">void</span> accumulate_type_ingredients<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; exemplar_reagent<span class="Delimiter">,</span> reagent&amp; refinement<span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt;&amp; mappings<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; exemplar<span class="Delimiter">,</span> <span class="Normal">const</span> instruction&amp; call_instruction<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; caller_recipe<span class="Delimiter">,</span> <span class="Normal">bool</span>* error<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L349" class="LineNr"> 349 </span>  assert<span class="Delimiter">(</span>refinement<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L350" class="LineNr"> 350 </span>  accumulate_type_ingredients<span class="Delimiter">(</span>exemplar_reagent<span class="Delimiter">.</span>type<span class="Delimiter">,</span> refinement<span class="Delimiter">.</span>type<span class="Delimiter">,</span> mappings<span class="Delimiter">,</span> exemplar<span class="Delimiter">,</span> exemplar_reagent<span class="Delimiter">,</span> call_instruction<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">,</span> error<span class="Delimiter">);</span>
+<span id="L351" class="LineNr"> 351 </span><span class="Delimiter">}</span>
+<span id="L352" class="LineNr"> 352 </span>
+<span id="L353" class="LineNr"> 353 </span><span class="Normal">void</span> accumulate_type_ingredients<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* exemplar_type<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* refinement_type<span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt;&amp; mappings<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; exemplar<span class="Delimiter">,</span> <span class="Normal">const</span> reagent&amp; exemplar_reagent<span class="Delimiter">,</span> <span class="Normal">const</span> instruction&amp; call_instruction<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; caller_recipe<span class="Delimiter">,</span> <span class="Normal">bool</span>* error<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L354" class="LineNr"> 354 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!exemplar_type<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L355" class="LineNr"> 355 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!refinement_type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L356" class="LineNr"> 356 </span>  <span class="Conceal">¦</span> <span class="Comment">// probably a bug in mu</span>
+<span id="L357" class="LineNr"> 357 </span>  <span class="Conceal">¦</span> <span class="Comment">// todo: make this smarter; only flag an error if exemplar_type contains some *new* type ingredient</span>
+<span id="L358" class="LineNr"> 358 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>exemplar<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;missing type ingredient for &quot;</span> &lt;&lt; exemplar_reagent<span class="Delimiter">.</span>original_string &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L359" class="LineNr"> 359 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;  (called from '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>call_instruction<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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L360" class="LineNr"> 360 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L361" class="LineNr"> 361 </span>  <span class="Delimiter">}</span>
+<span id="L362" class="LineNr"> 362 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!exemplar_type<span class="Delimiter">-&gt;</span>atom &amp;&amp; exemplar_type<span class="Delimiter">-&gt;</span>right == <span class="Constant">NULL</span> &amp;&amp; !refinement_type<span class="Delimiter">-&gt;</span>atom &amp;&amp; refinement_type<span class="Delimiter">-&gt;</span>right != <span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L363" class="LineNr"> 363 </span>  <span class="Conceal">¦</span> exemplar_type = exemplar_type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">;</span>
+<span id="L364" class="LineNr"> 364 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L171'>assert_for_now</a><span class="Delimiter">(</span>exemplar_type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L365" class="LineNr"> 365 </span>  <span class="Delimiter">}</span>
+<span id="L366" class="LineNr"> 366 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>exemplar_type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L367" class="LineNr"> 367 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_type_ingredient_name<span class="Delimiter">(</span>exemplar_type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L368" class="LineNr"> 368 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">const</span> type_tree* curr_refinement_type = <span class="Constant">NULL</span><span class="Delimiter">;</span>  <span class="Comment">// temporary heap allocation; must always be deleted before it goes out of scope</span>
+<span id="L369" class="LineNr"> 369 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>exemplar_type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span>
+<span id="L370" class="LineNr"> 370 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr_refinement_type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*refinement_type<span class="Delimiter">);</span>
+<span id="L371" class="LineNr"> 371 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L372" class="LineNr"> 372 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>!refinement_type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L373" class="LineNr"> 373 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr_refinement_type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*refinement_type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">);</span>
+<span id="L374" class="LineNr"> 374 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L375" class="LineNr"> 375 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> exemplar_type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L376" class="LineNr"> 376 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;adding mapping from &quot;</span> &lt;&lt; exemplar_type<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>curr_refinement_type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L377" class="LineNr"> 377 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> exemplar_type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*curr_refinement_type<span class="Delimiter">));</span>
+<span id="L378" class="LineNr"> 378 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L379" class="LineNr"> 379 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L380" class="LineNr"> 380 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!deeply_equal_type_names<span class="Delimiter">(</span>get<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> exemplar_type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">),</span> curr_refinement_type<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L381" class="LineNr"> 381 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;no call found for '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>call_instruction<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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L382" class="LineNr"> 382 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> *error = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L383" class="LineNr"> 383 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">delete</span> curr_refinement_type<span class="Delimiter">;</span>
+<span id="L384" class="LineNr"> 384 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L385" class="LineNr"> 385 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L386" class="LineNr"> 386 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>get<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> exemplar_type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)-&gt;</span>name == <span class="Constant">&quot;literal&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L387" class="LineNr"> 387 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">delete</span> get<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> exemplar_type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">);</span>
+<span id="L388" class="LineNr"> 388 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> exemplar_type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*curr_refinement_type<span class="Delimiter">));</span>
+<span id="L389" class="LineNr"> 389 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L390" class="LineNr"> 390 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L391" class="LineNr"> 391 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">delete</span> curr_refinement_type<span class="Delimiter">;</span>
+<span id="L392" class="LineNr"> 392 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L393" class="LineNr"> 393 </span>  <span class="Delimiter">}</span>
-<span id="L394" class="LineNr"> 394 </span>  replace_type_ingredients<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">,</span> mappings<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="Normal">void</span> replace_type_ingredients<span class="Delimiter">(</span>type_tree* type<span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt;&amp; mappings<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L398" class="LineNr"> 398 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L399" class="LineNr"> 399 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L400" class="LineNr"> 400 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>right == <span class="Constant">NULL</span> &amp;&amp; type<span class="Delimiter">-&gt;</span>left != <span class="Constant">NULL</span> &amp;&amp; type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom &amp;&amp; contains_key<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)</span> &amp;&amp; !get<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)-&gt;</span>atom &amp;&amp; get<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)-&gt;</span>right != <span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L401" class="LineNr"> 401 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> *type = *get<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name<span class="Delimiter">);</span>
-<span id="L402" class="LineNr"> 402 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L403" class="LineNr"> 403 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L404" class="LineNr"> 404 </span>  <span class="Conceal">¦</span> replace_type_ingredients<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> mappings<span class="Delimiter">);</span>
-<span id="L405" class="LineNr"> 405 </span>  <span class="Conceal">¦</span> replace_type_ingredients<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">,</span> mappings<span class="Delimiter">);</span>
-<span id="L406" class="LineNr"> 406 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L407" class="LineNr"> 407 </span>  <span class="Delimiter">}</span>
-<span id="L408" class="LineNr"> 408 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span>  <span class="Comment">// todo: ugly side effect</span>
-<span id="L409" class="LineNr"> 409 </span>  <span class="Conceal">¦</span> type<span class="Delimiter">-&gt;</span>value = get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">);</span>
-<span id="L410" class="LineNr"> 410 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span>
-<span id="L411" class="LineNr"> 411 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L412" class="LineNr"> 412 </span>  <span class="Normal">const</span> type_tree* replacement = get<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">);</span>
-<span id="L413" class="LineNr"> 413 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; type<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>replacement<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L414" class="LineNr"> 414 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>replacement<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L415" class="LineNr"> 415 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> replacement<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L416" class="LineNr"> 416 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// error in program; should be reported elsewhere</span>
-<span id="L417" class="LineNr"> 417 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L418" class="LineNr"> 418 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L419" class="LineNr"> 419 </span>  <span class="Conceal">¦</span> type<span class="Delimiter">-&gt;</span>name = <span class="Delimiter">(</span>replacement<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;literal&quot;</span><span class="Delimiter">)</span> ? <span class="Constant">&quot;number&quot;</span> : replacement<span class="Delimiter">-&gt;</span>name<span class="Delimiter">;</span>
-<span id="L420" class="LineNr"> 420 </span>  <span class="Conceal">¦</span> type<span class="Delimiter">-&gt;</span>value = get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">);</span>
-<span id="L421" class="LineNr"> 421 </span>  <span class="Delimiter">}</span>
-<span id="L422" class="LineNr"> 422 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L423" class="LineNr"> 423 </span>  <span class="Conceal">¦</span> *type = *replacement<span class="Delimiter">;</span>
+<span id="L394" class="LineNr"> 394 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L395" class="LineNr"> 395 </span>  <span class="Conceal">¦</span> accumulate_type_ingredients<span class="Delimiter">(</span>exemplar_type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> refinement_type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> mappings<span class="Delimiter">,</span> exemplar<span class="Delimiter">,</span> exemplar_reagent<span class="Delimiter">,</span> call_instruction<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">,</span> error<span class="Delimiter">);</span>
+<span id="L396" class="LineNr"> 396 </span>  <span class="Conceal">¦</span> accumulate_type_ingredients<span class="Delimiter">(</span>exemplar_type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">,</span> refinement_type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">,</span> mappings<span class="Delimiter">,</span> exemplar<span class="Delimiter">,</span> exemplar_reagent<span class="Delimiter">,</span> call_instruction<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">,</span> error<span class="Delimiter">);</span>
+<span id="L397" class="LineNr"> 397 </span>  <span class="Delimiter">}</span>
+<span id="L398" class="LineNr"> 398 </span><span class="Delimiter">}</span>
+<span id="L399" class="LineNr"> 399 </span>
+<span id="L400" class="LineNr"> 400 </span><span class="Normal">void</span> replace_type_ingredients<span class="Delimiter">(</span>recipe&amp; new_recipe<span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt;&amp; mappings<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L401" class="LineNr"> 401 </span>  <span class="Comment">// update its header</span>
+<span id="L402" class="LineNr"> 402 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>mappings<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L403" class="LineNr"> 403 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;replacing in <a href='010vm.cc.html#L19'>recipe</a> header ingredients&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L404" class="LineNr"> 404 </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>new_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L405" class="LineNr"> 405 </span>  <span class="Conceal">¦</span> replace_type_ingredients<span class="Delimiter">(</span>new_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> mappings<span class="Delimiter">,</span> new_recipe<span class="Delimiter">);</span>
+<span id="L406" class="LineNr"> 406 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;replacing in <a href='010vm.cc.html#L19'>recipe</a> header products&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L407" class="LineNr"> 407 </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>new_recipe<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L408" class="LineNr"> 408 </span>  <span class="Conceal">¦</span> replace_type_ingredients<span class="Delimiter">(</span>new_recipe<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> mappings<span class="Delimiter">,</span> new_recipe<span class="Delimiter">);</span>
+<span id="L409" class="LineNr"> 409 </span>  <span class="Comment">// update its body</span>
+<span id="L410" class="LineNr"> 410 </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>new_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L411" class="LineNr"> 411 </span>  <span class="Conceal">¦</span> instruction&amp; inst = new_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L412" class="LineNr"> 412 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;replacing in <a href='010vm.cc.html#L32'>instruction</a> '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L413" class="LineNr"> 413 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
+<span id="L414" class="LineNr"> 414 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> replace_type_ingredients<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">),</span> mappings<span class="Delimiter">,</span> new_recipe<span class="Delimiter">);</span>
+<span id="L415" class="LineNr"> 415 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
+<span id="L416" class="LineNr"> 416 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> replace_type_ingredients<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">),</span> mappings<span class="Delimiter">,</span> new_recipe<span class="Delimiter">);</span>
+<span id="L417" class="LineNr"> 417 </span>  <span class="Conceal">¦</span> <span class="Comment">// special-case for new: replace type ingredient in first ingredient *value*</span>
+<span id="L418" class="LineNr"> 418 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;new&quot;</span> &amp;&amp; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>type<span class="Delimiter">-&gt;</span>name != <span class="Constant">&quot;literal-string&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L419" class="LineNr"> 419 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> type_tree* type = <a href='056shape_shifting_recipe.cc.html#L484'>parse_type_tree</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>name<span class="Delimiter">);</span>
+<span id="L420" class="LineNr"> 420 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> replace_type_ingredients<span class="Delimiter">(</span>type<span class="Delimiter">,</span> mappings<span class="Delimiter">);</span>
+<span id="L421" class="LineNr"> 421 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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 = inspect<span class="Delimiter">(</span>type<span class="Delimiter">);</span>
+<span id="L422" class="LineNr"> 422 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">delete</span> type<span class="Delimiter">;</span>
+<span id="L423" class="LineNr"> 423 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L424" class="LineNr"> 424 </span>  <span class="Delimiter">}</span>
 <span id="L425" class="LineNr"> 425 </span><span class="Delimiter">}</span>
 <span id="L426" class="LineNr"> 426 </span>
-<span id="L427" class="LineNr"> 427 </span><span class="Normal">int</span> <a href='056shape_shifting_recipe.cc.html#L427'>type_ingredient_count_in_header</a><span class="Delimiter">(</span><a href='010vm.cc.html#L14'>recipe_ordinal</a> variant<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L428" class="LineNr"> 428 </span>  <span class="Normal">const</span> recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> variant<span class="Delimiter">);</span>
-<span id="L429" class="LineNr"> 429 </span>  set&lt;string&gt; type_ingredients<span class="Delimiter">;</span>
-<span id="L430" class="LineNr"> 430 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L431" class="LineNr"> 431 </span>  <span class="Conceal">¦</span> accumulate_type_ingredients<span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">,</span> type_ingredients<span class="Delimiter">);</span>
-<span id="L432" class="LineNr"> 432 </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>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L433" class="LineNr"> 433 </span>  <span class="Conceal">¦</span> accumulate_type_ingredients<span class="Delimiter">(</span>caller<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">,</span> type_ingredients<span class="Delimiter">);</span>
-<span id="L434" class="LineNr"> 434 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>type_ingredients<span class="Delimiter">);</span>
+<span id="L427" class="LineNr"> 427 </span><span class="Normal">void</span> replace_type_ingredients<span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt;&amp; mappings<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; caller<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L428" class="LineNr"> 428 </span>  string before = <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">);</span>
+<span id="L429" class="LineNr"> 429 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;replacing in ingredient &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L430" class="LineNr"> 430 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L431" class="LineNr"> 431 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;specializing &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>original_name &lt;&lt; <span class="Constant">&quot;: missing type for '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L432" class="LineNr"> 432 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L433" class="LineNr"> 433 </span>  <span class="Delimiter">}</span>
+<span id="L434" class="LineNr"> 434 </span>  replace_type_ingredients<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">,</span> mappings<span class="Delimiter">);</span>
 <span id="L435" class="LineNr"> 435 </span><span class="Delimiter">}</span>
 <span id="L436" class="LineNr"> 436 </span>
-<span id="L437" class="LineNr"> 437 </span><span class="Normal">void</span> accumulate_type_ingredients<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">,</span> set&lt;string&gt;&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L437" class="LineNr"> 437 </span><span class="Normal">void</span> replace_type_ingredients<span class="Delimiter">(</span>type_tree* type<span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt;&amp; mappings<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L438" class="LineNr"> 438 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L439" class="LineNr"> 439 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_type_ingredient_name<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span> out<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">);</span>
-<span id="L440" class="LineNr"> 440 </span>  accumulate_type_ingredients<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L441" class="LineNr"> 441 </span>  accumulate_type_ingredients<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L442" class="LineNr"> 442 </span><span class="Delimiter">}</span>
-<span id="L443" class="LineNr"> 443 </span>
-<span id="L444" class="LineNr"> 444 </span>type_tree* <a href='056shape_shifting_recipe.cc.html#L444'>parse_type_tree</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L445" class="LineNr"> 445 </span>  string_tree* s2 = parse_string_tree<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
-<span id="L446" class="LineNr"> 446 </span>  type_tree* result = <a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span>s2<span class="Delimiter">);</span>
-<span id="L447" class="LineNr"> 447 </span>  <span class="Normal">delete</span> s2<span class="Delimiter">;</span>
-<span id="L448" class="LineNr"> 448 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L449" class="LineNr"> 449 </span><span class="Delimiter">}</span>
-<span id="L450" class="LineNr"> 450 </span>
-<span id="L451" class="LineNr"> 451 </span>string inspect<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L452" class="LineNr"> 452 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L453" class="LineNr"> 453 </span>  <a href='056shape_shifting_recipe.cc.html#L457'>dump_inspect</a><span class="Delimiter">(</span>x<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L454" class="LineNr"> 454 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L455" class="LineNr"> 455 </span><span class="Delimiter">}</span>
-<span id="L456" class="LineNr"> 456 </span>
-<span id="L457" class="LineNr"> 457 </span><span class="Normal">void</span> <a href='056shape_shifting_recipe.cc.html#L457'>dump_inspect</a><span class="Delimiter">(</span><span class="Normal">const</span> type_tree* x<span class="Delimiter">,</span> ostream&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L458" class="LineNr"> 458 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">-&gt;</span>left &amp;&amp; !x<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L459" class="LineNr"> 459 </span>  <span class="Conceal">¦</span> out &lt;&lt; x<span class="Delimiter">-&gt;</span>name<span class="Delimiter">;</span>
-<span id="L460" class="LineNr"> 460 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L439" class="LineNr"> 439 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L440" class="LineNr"> 440 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>right == <span class="Constant">NULL</span> &amp;&amp; type<span class="Delimiter">-&gt;</span>left != <span class="Constant">NULL</span> &amp;&amp; type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom &amp;&amp; contains_key<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)</span> &amp;&amp; !get<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)-&gt;</span>atom &amp;&amp; get<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)-&gt;</span>right != <span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L441" class="LineNr"> 441 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> *type = *get<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name<span class="Delimiter">);</span>
+<span id="L442" class="LineNr"> 442 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L443" class="LineNr"> 443 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L444" class="LineNr"> 444 </span>  <span class="Conceal">¦</span> replace_type_ingredients<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> mappings<span class="Delimiter">);</span>
+<span id="L445" class="LineNr"> 445 </span>  <span class="Conceal">¦</span> replace_type_ingredients<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">,</span> mappings<span class="Delimiter">);</span>
+<span id="L446" class="LineNr"> 446 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L447" class="LineNr"> 447 </span>  <span class="Delimiter">}</span>
+<span id="L448" class="LineNr"> 448 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span>  <span class="Comment">// todo: ugly side effect</span>
+<span id="L449" class="LineNr"> 449 </span>  <span class="Conceal">¦</span> type<span class="Delimiter">-&gt;</span>value = get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">);</span>
+<span id="L450" class="LineNr"> 450 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span>
+<span id="L451" class="LineNr"> 451 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L452" class="LineNr"> 452 </span>  <span class="Normal">const</span> type_tree* replacement = get<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">);</span>
+<span id="L453" class="LineNr"> 453 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; type<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>replacement<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L454" class="LineNr"> 454 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>replacement<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L455" class="LineNr"> 455 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> replacement<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L456" class="LineNr"> 456 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// error in program; should be reported elsewhere</span>
+<span id="L457" class="LineNr"> 457 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L458" class="LineNr"> 458 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L459" class="LineNr"> 459 </span>  <span class="Conceal">¦</span> type<span class="Delimiter">-&gt;</span>name = <span class="Delimiter">(</span>replacement<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;literal&quot;</span><span class="Delimiter">)</span> ? <span class="Constant">&quot;number&quot;</span> : replacement<span class="Delimiter">-&gt;</span>name<span class="Delimiter">;</span>
+<span id="L460" class="LineNr"> 460 </span>  <span class="Conceal">¦</span> type<span class="Delimiter">-&gt;</span>value = get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">);</span>
 <span id="L461" class="LineNr"> 461 </span>  <span class="Delimiter">}</span>
-<span id="L462" class="LineNr"> 462 </span>  out &lt;&lt; <span class="Constant">'('</span><span class="Delimiter">;</span>
-<span id="L463" class="LineNr"> 463 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">const</span> type_tree* curr = x<span class="Delimiter">;</span>  curr<span class="Delimiter">;</span>  curr = curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L464" class="LineNr"> 464 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr != x<span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
-<span id="L465" class="LineNr"> 465 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">)</span>
-<span id="L466" class="LineNr"> 466 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='056shape_shifting_recipe.cc.html#L457'>dump_inspect</a><span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L467" class="LineNr"> 467 </span>  <span class="Conceal">¦</span> <span class="Normal">else</span>
-<span id="L468" class="LineNr"> 468 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> out &lt;&lt; curr<span class="Delimiter">-&gt;</span>name<span class="Delimiter">;</span>
-<span id="L469" class="LineNr"> 469 </span>  <span class="Delimiter">}</span>
-<span id="L470" class="LineNr"> 470 </span>  out &lt;&lt; <span class="Constant">')'</span><span class="Delimiter">;</span>
-<span id="L471" class="LineNr"> 471 </span><span class="Delimiter">}</span>
-<span id="L472" class="LineNr"> 472 </span>
-<span id="L473" class="LineNr"> 473 </span><span class="Normal">void</span> ensure_all_concrete_types<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">const</span><span class="Comment">*/</span> recipe&amp; new_recipe<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; exemplar<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L474" class="LineNr"> 474 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- ensure all concrete types in <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; new_recipe<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L475" class="LineNr"> 475 </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>new_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L476" class="LineNr"> 476 </span>  <span class="Conceal">¦</span> ensure_all_concrete_types<span class="Delimiter">(</span>new_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> exemplar<span class="Delimiter">);</span>
-<span id="L477" class="LineNr"> 477 </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>new_recipe<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L478" class="LineNr"> 478 </span>  <span class="Conceal">¦</span> ensure_all_concrete_types<span class="Delimiter">(</span>new_recipe<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> exemplar<span class="Delimiter">);</span>
-<span id="L479" class="LineNr"> 479 </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>new_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L480" class="LineNr"> 480 </span>  <span class="Conceal">¦</span> instruction&amp; inst = new_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L481" class="LineNr"> 481 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
-<span id="L482" class="LineNr"> 482 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> ensure_all_concrete_types<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">),</span> exemplar<span class="Delimiter">);</span>
-<span id="L483" class="LineNr"> 483 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
-<span id="L484" class="LineNr"> 484 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> ensure_all_concrete_types<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">),</span> exemplar<span class="Delimiter">);</span>
-<span id="L485" class="LineNr"> 485 </span>  <span class="Delimiter">}</span>
-<span id="L486" class="LineNr"> 486 </span><span class="Delimiter">}</span>
-<span id="L487" class="LineNr"> 487 </span>
-<span id="L488" class="LineNr"> 488 </span><span class="Normal">void</span> ensure_all_concrete_types<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">const</span><span class="Comment">*/</span> reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; exemplar<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L489" class="LineNr"> 489 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type || contains_type_ingredient_name<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L490" class="LineNr"> 490 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>exemplar<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;failed to map a type to &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L491" class="LineNr"> 491 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> x<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>  <span class="Comment">// just to prevent crashes later</span>
-<span id="L492" class="LineNr"> 492 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L493" class="LineNr"> 493 </span>  <span class="Delimiter">}</span>
-<span id="L494" class="LineNr"> 494 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>value == -<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L495" class="LineNr"> 495 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>exemplar<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;failed to map a type to the unknown &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L496" class="LineNr"> 496 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L497" class="LineNr"> 497 </span>  <span class="Delimiter">}</span>
-<span id="L498" class="LineNr"> 498 </span><span class="Delimiter">}</span>
-<span id="L499" class="LineNr"> 499 </span>
-<span id="L500" class="LineNr"> 500 </span><span class="Delimiter">:(scenario shape_shifting_recipe_2)</span>
-<span id="L501" class="LineNr"> 501 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L502" class="LineNr"> 502 </span>  <span class="Constant">10</span>:point<span class="Special"> &lt;- </span>merge <span class="Constant">14</span><span class="Delimiter">,</span> <span class="Constant">15</span>
-<span id="L503" class="LineNr"> 503 </span>  <span class="Constant">11</span>:point<span class="Special"> &lt;- </span>foo <span class="Constant">10</span>:point
-<span id="L504" class="LineNr"> 504 </span>]
-<span id="L505" class="LineNr"> 505 </span><span class="Comment"># non-matching shape-shifting variant</span>
-<span id="L506" class="LineNr"> 506 </span><span class="muRecipe">def</span> foo a:_t<span class="Delimiter">,</span> b:_t<span class="muRecipe"> -&gt; </span>result:num [
-<span id="L507" class="LineNr"> 507 </span>  local-scope
-<span id="L508" class="LineNr"> 508 </span>  load-ingredients
-<span id="L509" class="LineNr"> 509 </span>  result<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L510" class="LineNr"> 510 </span>]
-<span id="L511" class="LineNr"> 511 </span><span class="Comment"># matching shape-shifting variant</span>
-<span id="L512" class="LineNr"> 512 </span><span class="muRecipe">def</span> foo a:_t<span class="muRecipe"> -&gt; </span>result:_t [
-<span id="L513" class="LineNr"> 513 </span>  local-scope
-<span id="L514" class="LineNr"> 514 </span>  load-ingredients
-<span id="L515" class="LineNr"> 515 </span>  result<span class="Special"> &lt;- </span>copy a
-<span id="L516" class="LineNr"> 516 </span>]
-<span id="L517" class="LineNr"> 517 </span><span class="traceContains">+mem: storing 14 in location 11</span>
-<span id="L518" class="LineNr"> 518 </span><span class="traceContains">+mem: storing 15 in location 12</span>
-<span id="L519" class="LineNr"> 519 </span>
-<span id="L520" class="LineNr"> 520 </span><span class="Delimiter">:(scenario shape_shifting_recipe_nonroot)</span>
-<span id="L521" class="LineNr"> 521 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L522" class="LineNr"> 522 </span>  <span class="Constant">10</span>:foo:point<span class="Special"> &lt;- </span>merge <span class="Constant">14</span><span class="Delimiter">,</span> <span class="Constant">15</span><span class="Delimiter">,</span> <span class="Constant">16</span>
-<span id="L523" class="LineNr"> 523 </span>  <span class="Constant">20</span>:point/<span class="Special">raw &lt;- </span>bar <span class="Constant">10</span>:foo:point
-<span id="L524" class="LineNr"> 524 </span>]
-<span id="L525" class="LineNr"> 525 </span><span class="Comment"># shape-shifting recipe with type ingredient following some other type</span>
-<span id="L526" class="LineNr"> 526 </span><span class="muRecipe">def</span> bar a:foo:_t<span class="muRecipe"> -&gt; </span>result:_t [
-<span id="L527" class="LineNr"> 527 </span>  local-scope
-<span id="L528" class="LineNr"> 528 </span>  load-ingredients
-<span id="L529" class="LineNr"> 529 </span>  result<span class="Special"> &lt;- </span>get a<span class="Delimiter">,</span> <span class="Constant">x:offset</span>
-<span id="L530" class="LineNr"> 530 </span>]
-<span id="L531" class="LineNr"> 531 </span><span class="muData">container</span> foo:_t [
-<span id="L532" class="LineNr"> 532 </span>  <span class="Normal">x</span>:_t
-<span id="L533" class="LineNr"> 533 </span>  <span class="Normal">y</span>:num
-<span id="L534" class="LineNr"> 534 </span>]
-<span id="L535" class="LineNr"> 535 </span><span class="traceContains">+mem: storing 14 in location 20</span>
-<span id="L536" class="LineNr"> 536 </span><span class="traceContains">+mem: storing 15 in location 21</span>
-<span id="L537" class="LineNr"> 537 </span>
-<span id="L538" class="LineNr"> 538 </span><span class="Delimiter">:(scenario shape_shifting_recipe_nested)</span>
-<span id="L539" class="LineNr"> 539 </span><span class="muData">container</span> c:_a:_b [
-<span id="L540" class="LineNr"> 540 </span>  <span class="Normal">a</span>:_a
-<span id="L541" class="LineNr"> 541 </span>  <span class="Normal">b</span>:_b
-<span id="L542" class="LineNr"> 542 </span>]
-<span id="L543" class="LineNr"> 543 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L544" class="LineNr"> 544 </span>  <span class="Normal">s</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [abc]
-<span id="L545" class="LineNr"> 545 </span>  <span class="Delimiter">{</span>x: <span class="Delimiter">(</span>c <span class="Delimiter">(</span>address array character<span class="Delimiter">)</span> number<span class="Delimiter">)}</span><span class="Special"> &lt;- </span>merge s<span class="Delimiter">,</span> <span class="Constant">34</span>
-<span id="L546" class="LineNr"> 546 </span>  foo x
-<span id="L547" class="LineNr"> 547 </span>]
-<span id="L548" class="LineNr"> 548 </span><span class="muRecipe">def</span> foo x:c:_bar:_baz [
-<span id="L549" class="LineNr"> 549 </span>  local-scope
-<span id="L550" class="LineNr"> 550 </span>  load-ingredients
-<span id="L551" class="LineNr"> 551 </span>]
-<span id="L552" class="LineNr"> 552 </span><span class="Comment"># no errors</span>
-<span id="L553" class="LineNr"> 553 </span>
-<span id="L554" class="LineNr"> 554 </span><span class="Delimiter">:(scenario shape_shifting_recipe_type_deduction_ignores_offsets)</span>
-<span id="L555" class="LineNr"> 555 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L556" class="LineNr"> 556 </span>  <span class="Constant">10</span>:foo:point<span class="Special"> &lt;- </span>merge <span class="Constant">14</span><span class="Delimiter">,</span> <span class="Constant">15</span><span class="Delimiter">,</span> <span class="Constant">16</span>
-<span id="L557" class="LineNr"> 557 </span>  <span class="Constant">20</span>:point/<span class="Special">raw &lt;- </span>bar <span class="Constant">10</span>:foo:point
-<span id="L558" class="LineNr"> 558 </span>]
-<span id="L559" class="LineNr"> 559 </span><span class="muRecipe">def</span> bar a:foo:_t<span class="muRecipe"> -&gt; </span>result:_t [
-<span id="L560" class="LineNr"> 560 </span>  local-scope
-<span id="L561" class="LineNr"> 561 </span>  load-ingredients
-<span id="L562" class="LineNr"> 562 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
-<span id="L563" class="LineNr"> 563 </span>  result<span class="Special"> &lt;- </span>get a<span class="Delimiter">,</span> <span class="Constant">x:offset</span>  <span class="Comment"># shouldn't collide with other variable</span>
+<span id="L462" class="LineNr"> 462 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L463" class="LineNr"> 463 </span>  <span class="Conceal">¦</span> *type = *replacement<span class="Delimiter">;</span>
+<span id="L464" class="LineNr"> 464 </span>  <span class="Delimiter">}</span>
+<span id="L465" class="LineNr"> 465 </span><span class="Delimiter">}</span>
+<span id="L466" class="LineNr"> 466 </span>
+<span id="L467" class="LineNr"> 467 </span><span class="Normal">int</span> <a href='056shape_shifting_recipe.cc.html#L467'>type_ingredient_count_in_header</a><span class="Delimiter">(</span><a href='010vm.cc.html#L14'>recipe_ordinal</a> variant<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L468" class="LineNr"> 468 </span>  <span class="Normal">const</span> recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> variant<span class="Delimiter">);</span>
+<span id="L469" class="LineNr"> 469 </span>  set&lt;string&gt; type_ingredients<span class="Delimiter">;</span>
+<span id="L470" class="LineNr"> 470 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L471" class="LineNr"> 471 </span>  <span class="Conceal">¦</span> accumulate_type_ingredients<span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">,</span> type_ingredients<span class="Delimiter">);</span>
+<span id="L472" class="LineNr"> 472 </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>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L473" class="LineNr"> 473 </span>  <span class="Conceal">¦</span> accumulate_type_ingredients<span class="Delimiter">(</span>caller<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">,</span> type_ingredients<span class="Delimiter">);</span>
+<span id="L474" class="LineNr"> 474 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>type_ingredients<span class="Delimiter">);</span>
+<span id="L475" class="LineNr"> 475 </span><span class="Delimiter">}</span>
+<span id="L476" class="LineNr"> 476 </span>
+<span id="L477" class="LineNr"> 477 </span><span class="Normal">void</span> accumulate_type_ingredients<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">,</span> set&lt;string&gt;&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L478" class="LineNr"> 478 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L479" class="LineNr"> 479 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_type_ingredient_name<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span> out<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">);</span>
+<span id="L480" class="LineNr"> 480 </span>  accumulate_type_ingredients<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
+<span id="L481" class="LineNr"> 481 </span>  accumulate_type_ingredients<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
+<span id="L482" class="LineNr"> 482 </span><span class="Delimiter">}</span>
+<span id="L483" class="LineNr"> 483 </span>
+<span id="L484" class="LineNr"> 484 </span>type_tree* <a href='056shape_shifting_recipe.cc.html#L484'>parse_type_tree</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L485" class="LineNr"> 485 </span>  string_tree* s2 = parse_string_tree<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
+<span id="L486" class="LineNr"> 486 </span>  type_tree* result = <a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span>s2<span class="Delimiter">);</span>
+<span id="L487" class="LineNr"> 487 </span>  <span class="Normal">delete</span> s2<span class="Delimiter">;</span>
+<span id="L488" class="LineNr"> 488 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L489" class="LineNr"> 489 </span><span class="Delimiter">}</span>
+<span id="L490" class="LineNr"> 490 </span>
+<span id="L491" class="LineNr"> 491 </span>string inspect<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L492" class="LineNr"> 492 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L493" class="LineNr"> 493 </span>  <a href='056shape_shifting_recipe.cc.html#L497'>dump_inspect</a><span class="Delimiter">(</span>x<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
+<span id="L494" class="LineNr"> 494 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L495" class="LineNr"> 495 </span><span class="Delimiter">}</span>
+<span id="L496" class="LineNr"> 496 </span>
+<span id="L497" class="LineNr"> 497 </span><span class="Normal">void</span> <a href='056shape_shifting_recipe.cc.html#L497'>dump_inspect</a><span class="Delimiter">(</span><span class="Normal">const</span> type_tree* x<span class="Delimiter">,</span> ostream&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L498" class="LineNr"> 498 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">-&gt;</span>left &amp;&amp; !x<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L499" class="LineNr"> 499 </span>  <span class="Conceal">¦</span> out &lt;&lt; x<span class="Delimiter">-&gt;</span>name<span class="Delimiter">;</span>
+<span id="L500" class="LineNr"> 500 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L501" class="LineNr"> 501 </span>  <span class="Delimiter">}</span>
+<span id="L502" class="LineNr"> 502 </span>  out &lt;&lt; <span class="Constant">'('</span><span class="Delimiter">;</span>
+<span id="L503" class="LineNr"> 503 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">const</span> type_tree* curr = x<span class="Delimiter">;</span>  curr<span class="Delimiter">;</span>  curr = curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L504" class="LineNr"> 504 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr != x<span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
+<span id="L505" class="LineNr"> 505 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">)</span>
+<span id="L506" class="LineNr"> 506 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='056shape_shifting_recipe.cc.html#L497'>dump_inspect</a><span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
+<span id="L507" class="LineNr"> 507 </span>  <span class="Conceal">¦</span> <span class="Normal">else</span>
+<span id="L508" class="LineNr"> 508 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> out &lt;&lt; curr<span class="Delimiter">-&gt;</span>name<span class="Delimiter">;</span>
+<span id="L509" class="LineNr"> 509 </span>  <span class="Delimiter">}</span>
+<span id="L510" class="LineNr"> 510 </span>  out &lt;&lt; <span class="Constant">')'</span><span class="Delimiter">;</span>
+<span id="L511" class="LineNr"> 511 </span><span class="Delimiter">}</span>
+<span id="L512" class="LineNr"> 512 </span>
+<span id="L513" class="LineNr"> 513 </span><span class="Normal">void</span> ensure_all_concrete_types<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">const</span><span class="Comment">*/</span> recipe&amp; new_recipe<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; exemplar<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L514" class="LineNr"> 514 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- ensure all concrete types in <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; new_recipe<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L515" class="LineNr"> 515 </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>new_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L516" class="LineNr"> 516 </span>  <span class="Conceal">¦</span> ensure_all_concrete_types<span class="Delimiter">(</span>new_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> exemplar<span class="Delimiter">);</span>
+<span id="L517" class="LineNr"> 517 </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>new_recipe<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L518" class="LineNr"> 518 </span>  <span class="Conceal">¦</span> ensure_all_concrete_types<span class="Delimiter">(</span>new_recipe<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> exemplar<span class="Delimiter">);</span>
+<span id="L519" class="LineNr"> 519 </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>new_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L520" class="LineNr"> 520 </span>  <span class="Conceal">¦</span> instruction&amp; inst = new_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L521" class="LineNr"> 521 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
+<span id="L522" class="LineNr"> 522 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> ensure_all_concrete_types<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">),</span> exemplar<span class="Delimiter">);</span>
+<span id="L523" class="LineNr"> 523 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
+<span id="L524" class="LineNr"> 524 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> ensure_all_concrete_types<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">),</span> exemplar<span class="Delimiter">);</span>
+<span id="L525" class="LineNr"> 525 </span>  <span class="Delimiter">}</span>
+<span id="L526" class="LineNr"> 526 </span><span class="Delimiter">}</span>
+<span id="L527" class="LineNr"> 527 </span>
+<span id="L528" class="LineNr"> 528 </span><span class="Normal">void</span> ensure_all_concrete_types<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">const</span><span class="Comment">*/</span> reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; exemplar<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L529" class="LineNr"> 529 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type || contains_type_ingredient_name<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L530" class="LineNr"> 530 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>exemplar<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;failed to map a type to &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L531" class="LineNr"> 531 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> x<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>  <span class="Comment">// just to prevent crashes later</span>
+<span id="L532" class="LineNr"> 532 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L533" class="LineNr"> 533 </span>  <span class="Delimiter">}</span>
+<span id="L534" class="LineNr"> 534 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>value == -<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L535" class="LineNr"> 535 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>exemplar<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;failed to map a type to the unknown &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L536" class="LineNr"> 536 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L537" class="LineNr"> 537 </span>  <span class="Delimiter">}</span>
+<span id="L538" class="LineNr"> 538 </span><span class="Delimiter">}</span>
+<span id="L539" class="LineNr"> 539 </span>
+<span id="L540" class="LineNr"> 540 </span><span class="Delimiter">:(scenario shape_shifting_recipe_2)</span>
+<span id="L541" class="LineNr"> 541 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L542" class="LineNr"> 542 </span>  <span class="Constant">10</span>:point<span class="Special"> &lt;- </span>merge <span class="Constant">14</span><span class="Delimiter">,</span> <span class="Constant">15</span>
+<span id="L543" class="LineNr"> 543 </span>  <span class="Constant">11</span>:point<span class="Special"> &lt;- </span>foo <span class="Constant">10</span>:point
+<span id="L544" class="LineNr"> 544 </span>]
+<span id="L545" class="LineNr"> 545 </span><span class="Comment"># non-matching shape-shifting variant</span>
+<span id="L546" class="LineNr"> 546 </span><span class="muRecipe">def</span> foo a:_t<span class="Delimiter">,</span> b:_t<span class="muRecipe"> -&gt; </span>result:num [
+<span id="L547" class="LineNr"> 547 </span>  local-scope
+<span id="L548" class="LineNr"> 548 </span>  load-ingredients
+<span id="L549" class="LineNr"> 549 </span>  result<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L550" class="LineNr"> 550 </span>]
+<span id="L551" class="LineNr"> 551 </span><span class="Comment"># matching shape-shifting variant</span>
+<span id="L552" class="LineNr"> 552 </span><span class="muRecipe">def</span> foo a:_t<span class="muRecipe"> -&gt; </span>result:_t [
+<span id="L553" class="LineNr"> 553 </span>  local-scope
+<span id="L554" class="LineNr"> 554 </span>  load-ingredients
+<span id="L555" class="LineNr"> 555 </span>  result<span class="Special"> &lt;- </span>copy a
+<span id="L556" class="LineNr"> 556 </span>]
+<span id="L557" class="LineNr"> 557 </span><span class="traceContains">+mem: storing 14 in location 11</span>
+<span id="L558" class="LineNr"> 558 </span><span class="traceContains">+mem: storing 15 in location 12</span>
+<span id="L559" class="LineNr"> 559 </span>
+<span id="L560" class="LineNr"> 560 </span><span class="Delimiter">:(scenario shape_shifting_recipe_nonroot)</span>
+<span id="L561" class="LineNr"> 561 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L562" class="LineNr"> 562 </span>  <span class="Constant">10</span>:foo:point<span class="Special"> &lt;- </span>merge <span class="Constant">14</span><span class="Delimiter">,</span> <span class="Constant">15</span><span class="Delimiter">,</span> <span class="Constant">16</span>
+<span id="L563" class="LineNr"> 563 </span>  <span class="Constant">20</span>:point/<span class="Special">raw &lt;- </span>bar <span class="Constant">10</span>:foo:point
 <span id="L564" class="LineNr"> 564 </span>]
-<span id="L565" class="LineNr"> 565 </span><span class="muData">container</span> foo:_t [
-<span id="L566" class="LineNr"> 566 </span>  <span class="Normal">x</span>:_t
-<span id="L567" class="LineNr"> 567 </span>  <span class="Normal">y</span>:num
-<span id="L568" class="LineNr"> 568 </span>]
-<span id="L569" class="LineNr"> 569 </span><span class="traceContains">+mem: storing 14 in location 20</span>
-<span id="L570" class="LineNr"> 570 </span><span class="traceContains">+mem: storing 15 in location 21</span>
-<span id="L571" class="LineNr"> 571 </span>
-<span id="L572" class="LineNr"> 572 </span><span class="Delimiter">:(scenario shape_shifting_recipe_empty)</span>
-<span id="L573" class="LineNr"> 573 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L574" class="LineNr"> 574 </span>  foo <span class="Constant">1</span>
-<span id="L575" class="LineNr"> 575 </span>]
-<span id="L576" class="LineNr"> 576 </span><span class="Comment"># shape-shifting recipe with no body</span>
-<span id="L577" class="LineNr"> 577 </span><span class="muRecipe">def</span> foo a:_t [
-<span id="L578" class="LineNr"> 578 </span>]
-<span id="L579" class="LineNr"> 579 </span><span class="Comment"># shouldn't crash</span>
-<span id="L580" class="LineNr"> 580 </span>
-<span id="L581" class="LineNr"> 581 </span><span class="Delimiter">:(scenario shape_shifting_recipe_handles_shape_shifting_new_ingredient)</span>
-<span id="L582" class="LineNr"> 582 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L583" class="LineNr"> 583 </span>  <span class="Constant">1</span>:&amp;:foo:point<span class="Special"> &lt;- </span>bar <span class="Constant">3</span>
-<span id="L584" class="LineNr"> 584 </span>  <span class="Constant">11</span>:foo:point<span class="Special"> &lt;- </span>copy *<span class="Constant">1</span>:&amp;:foo:point
-<span id="L585" class="LineNr"> 585 </span>]
-<span id="L586" class="LineNr"> 586 </span><span class="muData">container</span> foo:_t [
-<span id="L587" class="LineNr"> 587 </span>  <span class="Normal">x</span>:_t
-<span id="L588" class="LineNr"> 588 </span>  <span class="Normal">y</span>:num
-<span id="L589" class="LineNr"> 589 </span>]
-<span id="L590" class="LineNr"> 590 </span><span class="muRecipe">def</span> bar x:num<span class="muRecipe"> -&gt; </span>result:&amp;:foo:_t [
-<span id="L591" class="LineNr"> 591 </span>  local-scope
-<span id="L592" class="LineNr"> 592 </span>  load-ingredients
-<span id="L593" class="LineNr"> 593 </span>  <span class="Comment"># new refers to _t in its ingredient *value*</span>
-<span id="L594" class="LineNr"> 594 </span>  result<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>foo _t<span class="Delimiter">)</span> : type<span class="Delimiter">}</span>
-<span id="L595" class="LineNr"> 595 </span>]
-<span id="L596" class="LineNr"> 596 </span><span class="traceContains">+mem: storing 0 in location 11</span>
-<span id="L597" class="LineNr"> 597 </span><span class="traceContains">+mem: storing 0 in location 12</span>
-<span id="L598" class="LineNr"> 598 </span><span class="traceContains">+mem: storing 0 in location 13</span>
-<span id="L599" class="LineNr"> 599 </span>
-<span id="L600" class="LineNr"> 600 </span><span class="Delimiter">:(scenario shape_shifting_recipe_handles_shape_shifting_new_ingredient_2)</span>
-<span id="L601" class="LineNr"> 601 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L602" class="LineNr"> 602 </span>  <span class="Constant">1</span>:&amp;:foo:point<span class="Special"> &lt;- </span>bar <span class="Constant">3</span>
-<span id="L603" class="LineNr"> 603 </span>  <span class="Constant">11</span>:foo:point<span class="Special"> &lt;- </span>copy *<span class="Constant">1</span>:&amp;:foo:point
+<span id="L565" class="LineNr"> 565 </span><span class="Comment"># shape-shifting recipe with type ingredient following some other type</span>
+<span id="L566" class="LineNr"> 566 </span><span class="muRecipe">def</span> bar a:foo:_t<span class="muRecipe"> -&gt; </span>result:_t [
+<span id="L567" class="LineNr"> 567 </span>  local-scope
+<span id="L568" class="LineNr"> 568 </span>  load-ingredients
+<span id="L569" class="LineNr"> 569 </span>  result<span class="Special"> &lt;- </span>get a<span class="Delimiter">,</span> <span class="Constant">x:offset</span>
+<span id="L570" class="LineNr"> 570 </span>]
+<span id="L571" class="LineNr"> 571 </span><span class="muData">container</span> foo:_t [
+<span id="L572" class="LineNr"> 572 </span>  <span class="Normal">x</span>:_t
+<span id="L573" class="LineNr"> 573 </span>  <span class="Normal">y</span>:num
+<span id="L574" class="LineNr"> 574 </span>]
+<span id="L575" class="LineNr"> 575 </span><span class="traceContains">+mem: storing 14 in location 20</span>
+<span id="L576" class="LineNr"> 576 </span><span class="traceContains">+mem: storing 15 in location 21</span>
+<span id="L577" class="LineNr"> 577 </span>
+<span id="L578" class="LineNr"> 578 </span><span class="Delimiter">:(scenario shape_shifting_recipe_nested)</span>
+<span id="L579" class="LineNr"> 579 </span><span class="muData">container</span> c:_a:_b [
+<span id="L580" class="LineNr"> 580 </span>  <span class="Normal">a</span>:_a
+<span id="L581" class="LineNr"> 581 </span>  <span class="Normal">b</span>:_b
+<span id="L582" class="LineNr"> 582 </span>]
+<span id="L583" class="LineNr"> 583 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L584" class="LineNr"> 584 </span>  <span class="Normal">s</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [abc]
+<span id="L585" class="LineNr"> 585 </span>  <span class="Delimiter">{</span>x: <span class="Delimiter">(</span>c <span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a> array character<span class="Delimiter">)</span> number<span class="Delimiter">)}</span><span class="Special"> &lt;- </span>merge s<span class="Delimiter">,</span> <span class="Constant">34</span>
+<span id="L586" class="LineNr"> 586 </span>  foo x
+<span id="L587" class="LineNr"> 587 </span>]
+<span id="L588" class="LineNr"> 588 </span><span class="muRecipe">def</span> foo x:c:_bar:_baz [
+<span id="L589" class="LineNr"> 589 </span>  local-scope
+<span id="L590" class="LineNr"> 590 </span>  load-ingredients
+<span id="L591" class="LineNr"> 591 </span>]
+<span id="L592" class="LineNr"> 592 </span><span class="Comment"># no errors</span>
+<span id="L593" class="LineNr"> 593 </span>
+<span id="L594" class="LineNr"> 594 </span><span class="Delimiter">:(scenario shape_shifting_recipe_type_deduction_ignores_offsets)</span>
+<span id="L595" class="LineNr"> 595 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L596" class="LineNr"> 596 </span>  <span class="Constant">10</span>:foo:point<span class="Special"> &lt;- </span>merge <span class="Constant">14</span><span class="Delimiter">,</span> <span class="Constant">15</span><span class="Delimiter">,</span> <span class="Constant">16</span>
+<span id="L597" class="LineNr"> 597 </span>  <span class="Constant">20</span>:point/<span class="Special">raw &lt;- </span>bar <span class="Constant">10</span>:foo:point
+<span id="L598" class="LineNr"> 598 </span>]
+<span id="L599" class="LineNr"> 599 </span><span class="muRecipe">def</span> bar a:foo:_t<span class="muRecipe"> -&gt; </span>result:_t [
+<span id="L600" class="LineNr"> 600 </span>  local-scope
+<span id="L601" class="LineNr"> 601 </span>  load-ingredients
+<span id="L602" class="LineNr"> 602 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
+<span id="L603" class="LineNr"> 603 </span>  result<span class="Special"> &lt;- </span>get a<span class="Delimiter">,</span> <span class="Constant">x:offset</span>  <span class="Comment"># shouldn't collide with other variable</span>
 <span id="L604" class="LineNr"> 604 </span>]
-<span id="L605" class="LineNr"> 605 </span><span class="muRecipe">def</span> bar x:num<span class="muRecipe"> -&gt; </span>result:&amp;:foo:_t [
-<span id="L606" class="LineNr"> 606 </span>  local-scope
-<span id="L607" class="LineNr"> 607 </span>  load-ingredients
-<span id="L608" class="LineNr"> 608 </span>  <span class="Comment"># new refers to _t in its ingredient *value*</span>
-<span id="L609" class="LineNr"> 609 </span>  result<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>foo _t<span class="Delimiter">)</span> : type<span class="Delimiter">}</span>
-<span id="L610" class="LineNr"> 610 </span>]
-<span id="L611" class="LineNr"> 611 </span><span class="Comment"># container defined after use</span>
-<span id="L612" class="LineNr"> 612 </span><span class="muData">container</span> foo:_t [
-<span id="L613" class="LineNr"> 613 </span>  <span class="Normal">x</span>:_t
-<span id="L614" class="LineNr"> 614 </span>  <span class="Normal">y</span>:num
+<span id="L605" class="LineNr"> 605 </span><span class="muData">container</span> foo:_t [
+<span id="L606" class="LineNr"> 606 </span>  <span class="Normal">x</span>:_t
+<span id="L607" class="LineNr"> 607 </span>  <span class="Normal">y</span>:num
+<span id="L608" class="LineNr"> 608 </span>]
+<span id="L609" class="LineNr"> 609 </span><span class="traceContains">+mem: storing 14 in location 20</span>
+<span id="L610" class="LineNr"> 610 </span><span class="traceContains">+mem: storing 15 in location 21</span>
+<span id="L611" class="LineNr"> 611 </span>
+<span id="L612" class="LineNr"> 612 </span><span class="Delimiter">:(scenario shape_shifting_recipe_empty)</span>
+<span id="L613" class="LineNr"> 613 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L614" class="LineNr"> 614 </span>  foo <span class="Constant">1</span>
 <span id="L615" class="LineNr"> 615 </span>]
-<span id="L616" class="LineNr"> 616 </span><span class="traceContains">+mem: storing 0 in location 11</span>
-<span id="L617" class="LineNr"> 617 </span><span class="traceContains">+mem: storing 0 in location 12</span>
-<span id="L618" class="LineNr"> 618 </span><span class="traceContains">+mem: storing 0 in location 13</span>
-<span id="L619" class="LineNr"> 619 </span>
-<span id="L620" class="LineNr"> 620 </span><span class="Delimiter">:(scenario shape_shifting_recipe_called_with_dummy)</span>
-<span id="L621" class="LineNr"> 621 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L622" class="LineNr"> 622 </span>  _<span class="Special"> &lt;- </span>bar <span class="Constant">34</span>
-<span id="L623" class="LineNr"> 623 </span>]
-<span id="L624" class="LineNr"> 624 </span><span class="muRecipe">def</span> bar x:_t<span class="muRecipe"> -&gt; </span>result:&amp;:_t [
-<span id="L625" class="LineNr"> 625 </span>  local-scope
-<span id="L626" class="LineNr"> 626 </span>  load-ingredients
-<span id="L627" class="LineNr"> 627 </span>  result<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L628" class="LineNr"> 628 </span>]
-<span id="L629" class="LineNr"> 629 </span>$error: <span class="Constant">0</span>
-<span id="L630" class="LineNr"> 630 </span>
-<span id="L631" class="LineNr"> 631 </span><span class="Delimiter">:(code)</span>
-<span id="L632" class="LineNr"> 632 </span><span class="Comment">// this one needs a little more fine-grained control</span>
-<span id="L633" class="LineNr"> 633 </span><span class="Normal">void</span> <a href='056shape_shifting_recipe.cc.html#L633'>test_shape_shifting_new_ingredient_does_not_pollute_global_namespace</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L634" class="LineNr"> 634 </span>  <span class="Comment">// if you specialize a shape-shifting recipe that allocates a type-ingredient..</span>
-<span id="L635" class="LineNr"> 635 </span>  <a href='012transform.cc.html#L99'>transform</a><span class="Delimiter">(</span><span class="Constant">&quot;def barz x:_elem [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L636" class="LineNr"> 636 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  local-scope</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L637" class="LineNr"> 637 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  load-ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L638" class="LineNr"> 638 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  y:&amp;:num &lt;- new _elem:type</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L639" class="LineNr"> 639 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L640" class="LineNr"> 640 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;def fooz [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L641" class="LineNr"> 641 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  local-scope</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L642" class="LineNr"> 642 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  barz 34</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L643" class="LineNr"> 643 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L644" class="LineNr"> 644 </span>  <span class="Comment">// ..and if you then try to load a new shape-shifting container with that</span>
-<span id="L645" class="LineNr"> 645 </span>  <span class="Comment">// type-ingredient</span>
-<span id="L646" class="LineNr"> 646 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo:_elem [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L647" class="LineNr"> 647 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:_elem</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L648" class="LineNr"> 648 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  y:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L649" class="LineNr"> 649 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L650" class="LineNr"> 650 </span>  <span class="Comment">// then it should work as usual</span>
-<span id="L651" class="LineNr"> 651 </span>  reagent callsite<span class="Delimiter">(</span><span class="Constant">&quot;x:foo:point&quot;</span><span class="Delimiter">);</span>
-<span id="L652" class="LineNr"> 652 </span>  reagent element = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>callsite<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L653" class="LineNr"> 653 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>element<span class="Delimiter">.</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;x&quot;</span><span class="Delimiter">);</span>
-<span id="L654" class="LineNr"> 654 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;point&quot;</span><span class="Delimiter">);</span>
-<span id="L655" class="LineNr"> 655 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!element<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">);</span>
-<span id="L656" class="LineNr"> 656 </span><span class="Delimiter">}</span>
-<span id="L657" class="LineNr"> 657 </span>
-<span id="L658" class="LineNr"> 658 </span><span class="Comment">//: specializing a type ingredient with a compound type</span>
-<span id="L659" class="LineNr"> 659 </span><span class="Delimiter">:(scenario shape_shifting_recipe_supports_compound_types)</span>
-<span id="L660" class="LineNr"> 660 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L661" class="LineNr"> 661 </span>  <span class="Constant">1</span>:&amp;:point<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">point:type</span>
-<span id="L662" class="LineNr"> 662 </span>  *<span class="Constant">1</span>:&amp;:point<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">1</span>:&amp;:point<span class="Delimiter">,</span> <span class="Constant">y:offset</span><span class="Delimiter">,</span> <span class="Constant">34</span>
-<span id="L663" class="LineNr"> 663 </span>  <span class="Constant">3</span>:&amp;:point<span class="Special"> &lt;- </span>bar <span class="Constant">1</span>:&amp;:point  <span class="Comment"># specialize _t to address:point</span>
-<span id="L664" class="LineNr"> 664 </span>  <span class="Constant">4</span>:point<span class="Special"> &lt;- </span>copy *<span class="Constant">3</span>:&amp;:point
-<span id="L665" class="LineNr"> 665 </span>]
-<span id="L666" class="LineNr"> 666 </span><span class="muRecipe">def</span> bar a:_t<span class="muRecipe"> -&gt; </span>result:_t [
-<span id="L667" class="LineNr"> 667 </span>  local-scope
-<span id="L668" class="LineNr"> 668 </span>  load-ingredients
-<span id="L669" class="LineNr"> 669 </span>  result<span class="Special"> &lt;- </span>copy a
-<span id="L670" class="LineNr"> 670 </span>]
-<span id="L671" class="LineNr"> 671 </span><span class="traceContains">+mem: storing 34 in location 5</span>
-<span id="L672" class="LineNr"> 672 </span>
-<span id="L673" class="LineNr"> 673 </span><span class="Comment">//: specializing a type ingredient with a compound type -- while *inside* another compound type</span>
-<span id="L674" class="LineNr"> 674 </span><span class="Delimiter">:(scenario shape_shifting_recipe_supports_compound_types_2)</span>
-<span id="L675" class="LineNr"> 675 </span><span class="muData">container</span> foo:_t [
-<span id="L676" class="LineNr"> 676 </span>  <span class="Normal">value</span>:_t
-<span id="L677" class="LineNr"> 677 </span>]
-<span id="L678" class="LineNr"> 678 </span><span class="muRecipe">def</span> bar x:&amp;:foo:_t<span class="muRecipe"> -&gt; </span>result:_t [
-<span id="L679" class="LineNr"> 679 </span>  local-scope
-<span id="L680" class="LineNr"> 680 </span>  load-ingredients
-<span id="L681" class="LineNr"> 681 </span>  result<span class="Special"> &lt;- </span>get *x<span class="Delimiter">,</span> <span class="Constant">value:offset</span>
-<span id="L682" class="LineNr"> 682 </span>]
-<span id="L683" class="LineNr"> 683 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L684" class="LineNr"> 684 </span>  <span class="Constant">1</span>:&amp;:foo:&amp;:point<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>foo address point<span class="Delimiter">)</span>: type<span class="Delimiter">}</span>
-<span id="L685" class="LineNr"> 685 </span>  <span class="Constant">2</span>:&amp;:point<span class="Special"> &lt;- </span>bar <span class="Constant">1</span>:&amp;:foo:&amp;:point
-<span id="L686" class="LineNr"> 686 </span>]
-<span id="L687" class="LineNr"> 687 </span><span class="Comment"># no errors; call to 'bar' successfully specialized</span>
-<span id="L688" class="LineNr"> 688 </span>
-<span id="L689" class="LineNr"> 689 </span><span class="Delimiter">:(scenario shape_shifting_recipe_error)</span>
-<span id="L690" class="LineNr"> 690 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L691" class="LineNr"> 691 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L692" class="LineNr"> 692 </span>  <span class="Normal">a</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3</span>
-<span id="L693" class="LineNr"> 693 </span>  <span class="Normal">b</span>:&amp;:num<span class="Special"> &lt;- </span>foo a
-<span id="L694" class="LineNr"> 694 </span>]
-<span id="L695" class="LineNr"> 695 </span><span class="muRecipe">def</span> foo a:_t<span class="muRecipe"> -&gt; </span>b:_t [
-<span id="L696" class="LineNr"> 696 </span>  load-ingredients
-<span id="L697" class="LineNr"> 697 </span>  b<span class="Special"> &lt;- </span>copy a
-<span id="L698" class="LineNr"> 698 </span>]
-<span id="L699" class="LineNr"> 699 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: no call found for 'b:&amp;:num &lt;- foo a'</span>
-<span id="L700" class="LineNr"> 700 </span>
-<span id="L701" class="LineNr"> 701 </span><span class="Delimiter">:(scenario specialize_inside_recipe_without_header)</span>
-<span id="L702" class="LineNr"> 702 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L703" class="LineNr"> 703 </span>  foo <span class="Constant">3</span>
-<span id="L704" class="LineNr"> 704 </span>]
-<span id="L705" class="LineNr"> 705 </span><span class="muRecipe">def</span> foo [
-<span id="L706" class="LineNr"> 706 </span>  local-scope
-<span id="L707" class="LineNr"> 707 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>next-ingredient  <span class="Comment"># ensure no header</span>
-<span id="L708" class="LineNr"> 708 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>bar x  <span class="Comment"># call a shape-shifting recipe</span>
-<span id="L709" class="LineNr"> 709 </span>]
-<span id="L710" class="LineNr"> 710 </span><span class="muRecipe">def</span> bar x:_elem<span class="muRecipe"> -&gt; </span>y:_elem [
-<span id="L711" class="LineNr"> 711 </span>  local-scope
-<span id="L712" class="LineNr"> 712 </span>  load-ingredients
-<span id="L713" class="LineNr"> 713 </span>  y<span class="Special"> &lt;- </span>add x<span class="Delimiter">,</span> <span class="Constant">1</span>
-<span id="L714" class="LineNr"> 714 </span>]
-<span id="L715" class="LineNr"> 715 </span><span class="traceContains">+mem: storing 4 in location 1</span>
-<span id="L716" class="LineNr"> 716 </span>
-<span id="L717" class="LineNr"> 717 </span><span class="Delimiter">:(scenario specialize_with_literal)</span>
-<span id="L718" class="LineNr"> 718 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L616" class="LineNr"> 616 </span><span class="Comment"># shape-shifting recipe with no body</span>
+<span id="L617" class="LineNr"> 617 </span><span class="muRecipe">def</span> foo a:_t [
+<span id="L618" class="LineNr"> 618 </span>]
+<span id="L619" class="LineNr"> 619 </span><span class="Comment"># shouldn't crash</span>
+<span id="L620" class="LineNr"> 620 </span>
+<span id="L621" class="LineNr"> 621 </span><span class="Delimiter">:(scenario shape_shifting_recipe_handles_shape_shifting_new_ingredient)</span>
+<span id="L622" class="LineNr"> 622 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L623" class="LineNr"> 623 </span>  <span class="Constant">1</span>:&amp;:foo:point<span class="Special"> &lt;- </span>bar <span class="Constant">3</span>
+<span id="L624" class="LineNr"> 624 </span>  <span class="Constant">11</span>:foo:point<span class="Special"> &lt;- </span>copy *<span class="Constant">1</span>:&amp;:foo:point
+<span id="L625" class="LineNr"> 625 </span>]
+<span id="L626" class="LineNr"> 626 </span><span class="muData">container</span> foo:_t [
+<span id="L627" class="LineNr"> 627 </span>  <span class="Normal">x</span>:_t
+<span id="L628" class="LineNr"> 628 </span>  <span class="Normal">y</span>:num
+<span id="L629" class="LineNr"> 629 </span>]
+<span id="L630" class="LineNr"> 630 </span><span class="muRecipe">def</span> bar x:num<span class="muRecipe"> -&gt; </span>result:&amp;:foo:_t [
+<span id="L631" class="LineNr"> 631 </span>  local-scope
+<span id="L632" class="LineNr"> 632 </span>  load-ingredients
+<span id="L633" class="LineNr"> 633 </span>  <span class="Comment"># new refers to _t in its ingredient *value*</span>
+<span id="L634" class="LineNr"> 634 </span>  result<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>foo _t<span class="Delimiter">)</span> : type<span class="Delimiter">}</span>
+<span id="L635" class="LineNr"> 635 </span>]
+<span id="L636" class="LineNr"> 636 </span><span class="traceContains">+mem: storing 0 in location 11</span>
+<span id="L637" class="LineNr"> 637 </span><span class="traceContains">+mem: storing 0 in location 12</span>
+<span id="L638" class="LineNr"> 638 </span><span class="traceContains">+mem: storing 0 in location 13</span>
+<span id="L639" class="LineNr"> 639 </span>
+<span id="L640" class="LineNr"> 640 </span><span class="Delimiter">:(scenario shape_shifting_recipe_handles_shape_shifting_new_ingredient_2)</span>
+<span id="L641" class="LineNr"> 641 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L642" class="LineNr"> 642 </span>  <span class="Constant">1</span>:&amp;:foo:point<span class="Special"> &lt;- </span>bar <span class="Constant">3</span>
+<span id="L643" class="LineNr"> 643 </span>  <span class="Constant">11</span>:foo:point<span class="Special"> &lt;- </span>copy *<span class="Constant">1</span>:&amp;:foo:point
+<span id="L644" class="LineNr"> 644 </span>]
+<span id="L645" class="LineNr"> 645 </span><span class="muRecipe">def</span> bar x:num<span class="muRecipe"> -&gt; </span>result:&amp;:foo:_t [
+<span id="L646" class="LineNr"> 646 </span>  local-scope
+<span id="L647" class="LineNr"> 647 </span>  load-ingredients
+<span id="L648" class="LineNr"> 648 </span>  <span class="Comment"># new refers to _t in its ingredient *value*</span>
+<span id="L649" class="LineNr"> 649 </span>  result<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>foo _t<span class="Delimiter">)</span> : type<span class="Delimiter">}</span>
+<span id="L650" class="LineNr"> 650 </span>]
+<span id="L651" class="LineNr"> 651 </span><span class="Comment"># container defined after use</span>
+<span id="L652" class="LineNr"> 652 </span><span class="muData">container</span> foo:_t [
+<span id="L653" class="LineNr"> 653 </span>  <span class="Normal">x</span>:_t
+<span id="L654" class="LineNr"> 654 </span>  <span class="Normal">y</span>:num
+<span id="L655" class="LineNr"> 655 </span>]
+<span id="L656" class="LineNr"> 656 </span><span class="traceContains">+mem: storing 0 in location 11</span>
+<span id="L657" class="LineNr"> 657 </span><span class="traceContains">+mem: storing 0 in location 12</span>
+<span id="L658" class="LineNr"> 658 </span><span class="traceContains">+mem: storing 0 in location 13</span>
+<span id="L659" class="LineNr"> 659 </span>
+<span id="L660" class="LineNr"> 660 </span><span class="Delimiter">:(scenario shape_shifting_recipe_called_with_dummy)</span>
+<span id="L661" class="LineNr"> 661 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L662" class="LineNr"> 662 </span>  _<span class="Special"> &lt;- </span>bar <span class="Constant">34</span>
+<span id="L663" class="LineNr"> 663 </span>]
+<span id="L664" class="LineNr"> 664 </span><span class="muRecipe">def</span> bar x:_t<span class="muRecipe"> -&gt; </span>result:&amp;:_t [
+<span id="L665" class="LineNr"> 665 </span>  local-scope
+<span id="L666" class="LineNr"> 666 </span>  load-ingredients
+<span id="L667" class="LineNr"> 667 </span>  result<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L668" class="LineNr"> 668 </span>]
+<span id="L669" class="LineNr"> 669 </span>$error: <span class="Constant">0</span>
+<span id="L670" class="LineNr"> 670 </span>
+<span id="L671" class="LineNr"> 671 </span><span class="Delimiter">:(code)</span>
+<span id="L672" class="LineNr"> 672 </span><span class="Comment">// this one needs a little more fine-grained control</span>
+<span id="L673" class="LineNr"> 673 </span><span class="Normal">void</span> <a href='056shape_shifting_recipe.cc.html#L673'>test_shape_shifting_new_ingredient_does_not_pollute_global_namespace</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L674" class="LineNr"> 674 </span>  <span class="Comment">// if you specialize a shape-shifting recipe that allocates a type-ingredient..</span>
+<span id="L675" class="LineNr"> 675 </span>  <a href='012transform.cc.html#L99'>transform</a><span class="Delimiter">(</span><span class="Constant">&quot;def barz x:_elem [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L676" class="LineNr"> 676 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  local-scope</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L677" class="LineNr"> 677 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  load-ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L678" class="LineNr"> 678 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  y:&amp;:num &lt;- new _elem:type</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L679" class="LineNr"> 679 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L680" class="LineNr"> 680 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;def fooz [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L681" class="LineNr"> 681 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  local-scope</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L682" class="LineNr"> 682 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  barz 34</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L683" class="LineNr"> 683 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L684" class="LineNr"> 684 </span>  <span class="Comment">// ..and if you then try to load a new shape-shifting container with that</span>
+<span id="L685" class="LineNr"> 685 </span>  <span class="Comment">// type-ingredient</span>
+<span id="L686" class="LineNr"> 686 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo:_elem [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L687" class="LineNr"> 687 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:_elem</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L688" class="LineNr"> 688 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  y:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L689" class="LineNr"> 689 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L690" class="LineNr"> 690 </span>  <span class="Comment">// then it should work as usual</span>
+<span id="L691" class="LineNr"> 691 </span>  reagent callsite<span class="Delimiter">(</span><span class="Constant">&quot;x:foo:point&quot;</span><span class="Delimiter">);</span>
+<span id="L692" class="LineNr"> 692 </span>  reagent element = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>callsite<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L693" class="LineNr"> 693 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>element<span class="Delimiter">.</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;x&quot;</span><span class="Delimiter">);</span>
+<span id="L694" class="LineNr"> 694 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;point&quot;</span><span class="Delimiter">);</span>
+<span id="L695" class="LineNr"> 695 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!element<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">);</span>
+<span id="L696" class="LineNr"> 696 </span><span class="Delimiter">}</span>
+<span id="L697" class="LineNr"> 697 </span>
+<span id="L698" class="LineNr"> 698 </span><span class="Comment">//: specializing a type ingredient with a compound type</span>
+<span id="L699" class="LineNr"> 699 </span><span class="Delimiter">:(scenario shape_shifting_recipe_supports_compound_types)</span>
+<span id="L700" class="LineNr"> 700 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L701" class="LineNr"> 701 </span>  <span class="Constant">1</span>:&amp;:point<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">point:type</span>
+<span id="L702" class="LineNr"> 702 </span>  *<span class="Constant">1</span>:&amp;:point<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">1</span>:&amp;:point<span class="Delimiter">,</span> <span class="Constant">y:offset</span><span class="Delimiter">,</span> <span class="Constant">34</span>
+<span id="L703" class="LineNr"> 703 </span>  <span class="Constant">3</span>:&amp;:point<span class="Special"> &lt;- </span>bar <span class="Constant">1</span>:&amp;:point  <span class="Comment"># specialize _t to address:point</span>
+<span id="L704" class="LineNr"> 704 </span>  <span class="Constant">4</span>:point<span class="Special"> &lt;- </span>copy *<span class="Constant">3</span>:&amp;:point
+<span id="L705" class="LineNr"> 705 </span>]
+<span id="L706" class="LineNr"> 706 </span><span class="muRecipe">def</span> bar a:_t<span class="muRecipe"> -&gt; </span>result:_t [
+<span id="L707" class="LineNr"> 707 </span>  local-scope
+<span id="L708" class="LineNr"> 708 </span>  load-ingredients
+<span id="L709" class="LineNr"> 709 </span>  result<span class="Special"> &lt;- </span>copy a
+<span id="L710" class="LineNr"> 710 </span>]
+<span id="L711" class="LineNr"> 711 </span><span class="traceContains">+mem: storing 34 in location 5</span>
+<span id="L712" class="LineNr"> 712 </span>
+<span id="L713" class="LineNr"> 713 </span><span class="Comment">//: specializing a type ingredient with a compound type -- while *inside* another compound type</span>
+<span id="L714" class="LineNr"> 714 </span><span class="Delimiter">:(scenario shape_shifting_recipe_supports_compound_types_2)</span>
+<span id="L715" class="LineNr"> 715 </span><span class="muData">container</span> foo:_t [
+<span id="L716" class="LineNr"> 716 </span>  <span class="Normal">value</span>:_t
+<span id="L717" class="LineNr"> 717 </span>]
+<span id="L718" class="LineNr"> 718 </span><span class="muRecipe">def</span> bar x:&amp;:foo:_t<span class="muRecipe"> -&gt; </span>result:_t [
 <span id="L719" class="LineNr"> 719 </span>  local-scope
-<span id="L720" class="LineNr"> 720 </span>  <span class="Comment"># permit literal to map to number</span>
-<span id="L721" class="LineNr"> 721 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>foo <span class="Constant">3</span>
+<span id="L720" class="LineNr"> 720 </span>  load-ingredients
+<span id="L721" class="LineNr"> 721 </span>  result<span class="Special"> &lt;- </span>get *x<span class="Delimiter">,</span> <span class="Constant">value:offset</span>
 <span id="L722" class="LineNr"> 722 </span>]
-<span id="L723" class="LineNr"> 723 </span><span class="muRecipe">def</span> foo x:_elem<span class="muRecipe"> -&gt; </span>y:_elem [
-<span id="L724" class="LineNr"> 724 </span>  local-scope
-<span id="L725" class="LineNr"> 725 </span>  load-ingredients
-<span id="L726" class="LineNr"> 726 </span>  y<span class="Special"> &lt;- </span>add x<span class="Delimiter">,</span> <span class="Constant">1</span>
-<span id="L727" class="LineNr"> 727 </span>]
-<span id="L728" class="LineNr"> 728 </span><span class="traceContains">+mem: storing 4 in location 1</span>
-<span id="L729" class="LineNr"> 729 </span>
-<span id="L730" class="LineNr"> 730 </span><span class="Delimiter">:(scenario specialize_with_literal_2)</span>
+<span id="L723" class="LineNr"> 723 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L724" class="LineNr"> 724 </span>  <span class="Constant">1</span>:&amp;:foo:&amp;:point<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>foo <a href='043space.cc.html#L83'>address</a> point<span class="Delimiter">)</span>: type<span class="Delimiter">}</span>
+<span id="L725" class="LineNr"> 725 </span>  <span class="Constant">2</span>:&amp;:point<span class="Special"> &lt;- </span>bar <span class="Constant">1</span>:&amp;:foo:&amp;:point
+<span id="L726" class="LineNr"> 726 </span>]
+<span id="L727" class="LineNr"> 727 </span><span class="Comment"># no errors; call to 'bar' successfully specialized</span>
+<span id="L728" class="LineNr"> 728 </span>
+<span id="L729" class="LineNr"> 729 </span><span class="Delimiter">:(scenario shape_shifting_recipe_error)</span>
+<span id="L730" class="LineNr"> 730 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L731" class="LineNr"> 731 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L732" class="LineNr"> 732 </span>  local-scope
-<span id="L733" class="LineNr"> 733 </span>  <span class="Comment"># permit literal to map to character</span>
-<span id="L734" class="LineNr"> 734 </span>  <span class="Constant">1</span>:<span class="Normal">char</span>/<span class="Special">raw &lt;- </span>foo <span class="Constant">3</span>
-<span id="L735" class="LineNr"> 735 </span>]
-<span id="L736" class="LineNr"> 736 </span><span class="muRecipe">def</span> foo x:_elem<span class="muRecipe"> -&gt; </span>y:_elem [
-<span id="L737" class="LineNr"> 737 </span>  local-scope
-<span id="L738" class="LineNr"> 738 </span>  load-ingredients
-<span id="L739" class="LineNr"> 739 </span>  y<span class="Special"> &lt;- </span>add x<span class="Delimiter">,</span> <span class="Constant">1</span>
-<span id="L740" class="LineNr"> 740 </span>]
-<span id="L741" class="LineNr"> 741 </span><span class="traceContains">+mem: storing 4 in location 1</span>
-<span id="L742" class="LineNr"> 742 </span>
-<span id="L743" class="LineNr"> 743 </span><span class="Delimiter">:(scenario specialize_with_literal_3)</span>
-<span id="L744" class="LineNr"> 744 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L745" class="LineNr"> 745 </span>  local-scope
-<span id="L746" class="LineNr"> 746 </span>  <span class="Comment"># permit '0' to map to address to shape-shifting type-ingredient</span>
-<span id="L747" class="LineNr"> 747 </span>  <span class="Constant">1</span>:&amp;:<span class="Normal">char</span>/<span class="Special">raw &lt;- </span>foo <span class="Constant">0</span>
-<span id="L748" class="LineNr"> 748 </span>]
-<span id="L749" class="LineNr"> 749 </span><span class="muRecipe">def</span> foo x:&amp;:_elem<span class="muRecipe"> -&gt; </span>y:&amp;:_elem [
-<span id="L750" class="LineNr"> 750 </span>  local-scope
-<span id="L751" class="LineNr"> 751 </span>  load-ingredients
-<span id="L752" class="LineNr"> 752 </span>  y<span class="Special"> &lt;- </span>copy x
-<span id="L753" class="LineNr"> 753 </span>]
-<span id="L754" class="LineNr"> 754 </span><span class="traceContains">+mem: storing 0 in location 1</span>
-<span id="L755" class="LineNr"> 755 </span>$error: <span class="Constant">0</span>
+<span id="L732" class="LineNr"> 732 </span>  <span class="Normal">a</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3</span>
+<span id="L733" class="LineNr"> 733 </span>  <span class="Normal">b</span>:&amp;:num<span class="Special"> &lt;- </span>foo a
+<span id="L734" class="LineNr"> 734 </span>]
+<span id="L735" class="LineNr"> 735 </span><span class="muRecipe">def</span> foo a:_t<span class="muRecipe"> -&gt; </span>b:_t [
+<span id="L736" class="LineNr"> 736 </span>  load-ingredients
+<span id="L737" class="LineNr"> 737 </span>  b<span class="Special"> &lt;- </span>copy a
+<span id="L738" class="LineNr"> 738 </span>]
+<span id="L739" class="LineNr"> 739 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: no call found for 'b:&amp;:num &lt;- foo a'</span>
+<span id="L740" class="LineNr"> 740 </span>
+<span id="L741" class="LineNr"> 741 </span><span class="Delimiter">:(scenario specialize_inside_recipe_without_header)</span>
+<span id="L742" class="LineNr"> 742 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L743" class="LineNr"> 743 </span>  foo <span class="Constant">3</span>
+<span id="L744" class="LineNr"> 744 </span>]
+<span id="L745" class="LineNr"> 745 </span><span class="muRecipe">def</span> foo [
+<span id="L746" class="LineNr"> 746 </span>  local-scope
+<span id="L747" class="LineNr"> 747 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>next-ingredient  <span class="Comment"># ensure no header</span>
+<span id="L748" class="LineNr"> 748 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>bar x  <span class="Comment"># call a shape-shifting recipe</span>
+<span id="L749" class="LineNr"> 749 </span>]
+<span id="L750" class="LineNr"> 750 </span><span class="muRecipe">def</span> bar x:_elem<span class="muRecipe"> -&gt; </span>y:_elem [
+<span id="L751" class="LineNr"> 751 </span>  local-scope
+<span id="L752" class="LineNr"> 752 </span>  load-ingredients
+<span id="L753" class="LineNr"> 753 </span>  y<span class="Special"> &lt;- </span>add x<span class="Delimiter">,</span> <span class="Constant">1</span>
+<span id="L754" class="LineNr"> 754 </span>]
+<span id="L755" class="LineNr"> 755 </span><span class="traceContains">+mem: storing 4 in location 1</span>
 <span id="L756" class="LineNr"> 756 </span>
-<span id="L757" class="LineNr"> 757 </span><span class="Delimiter">:(scenario specialize_with_literal_4)</span>
-<span id="L758" class="LineNr"> 758 </span><span class="Special">% Hide_errors = true;</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>  local-scope
-<span id="L761" class="LineNr"> 761 </span>  <span class="Comment"># ambiguous call: what's the type of its ingredient?!</span>
-<span id="L762" class="LineNr"> 762 </span>  foo <span class="Constant">0</span>
-<span id="L763" class="LineNr"> 763 </span>]
-<span id="L764" class="LineNr"> 764 </span><span class="muRecipe">def</span> foo x:&amp;:_elem<span class="muRecipe"> -&gt; </span>y:&amp;:_elem [
-<span id="L765" class="LineNr"> 765 </span>  local-scope
-<span id="L766" class="LineNr"> 766 </span>  load-ingredients
-<span id="L767" class="LineNr"> 767 </span>  y<span class="Special"> &lt;- </span>copy x
-<span id="L768" class="LineNr"> 768 </span>]
-<span id="L769" class="LineNr"> 769 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: <a href='010vm.cc.html#L32'>instruction</a> 'foo' has no valid specialization</span>
-<span id="L770" class="LineNr"> 770 </span>
-<span id="L771" class="LineNr"> 771 </span><span class="Delimiter">:(scenario specialize_with_literal_5)</span>
-<span id="L772" class="LineNr"> 772 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L773" class="LineNr"> 773 </span>  foo <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">4</span>  <span class="Comment"># recipe mapping two variables to literals</span>
-<span id="L774" class="LineNr"> 774 </span>]
-<span id="L775" class="LineNr"> 775 </span><span class="muRecipe">def</span> foo x:_elem<span class="Delimiter">,</span> y:_elem [
-<span id="L776" class="LineNr"> 776 </span>  local-scope
-<span id="L777" class="LineNr"> 777 </span>  load-ingredients
-<span id="L778" class="LineNr"> 778 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>add x<span class="Delimiter">,</span> y
-<span id="L779" class="LineNr"> 779 </span>]
-<span id="L780" class="LineNr"> 780 </span><span class="traceContains">+mem: storing 7 in location 1</span>
-<span id="L781" class="LineNr"> 781 </span>
-<span id="L782" class="LineNr"> 782 </span><span class="Delimiter">:(scenario multiple_shape_shifting_variants)</span>
-<span id="L783" class="LineNr"> 783 </span><span class="Comment"># try to call two different shape-shifting recipes with the same name</span>
+<span id="L757" class="LineNr"> 757 </span><span class="Delimiter">:(scenario specialize_with_literal)</span>
+<span id="L758" class="LineNr"> 758 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L759" class="LineNr"> 759 </span>  local-scope
+<span id="L760" class="LineNr"> 760 </span>  <span class="Comment"># permit literal to map to number</span>
+<span id="L761" class="LineNr"> 761 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>foo <span class="Constant">3</span>
+<span id="L762" class="LineNr"> 762 </span>]
+<span id="L763" class="LineNr"> 763 </span><span class="muRecipe">def</span> foo x:_elem<span class="muRecipe"> -&gt; </span>y:_elem [
+<span id="L764" class="LineNr"> 764 </span>  local-scope
+<span id="L765" class="LineNr"> 765 </span>  load-ingredients
+<span id="L766" class="LineNr"> 766 </span>  y<span class="Special"> &lt;- </span>add x<span class="Delimiter">,</span> <span class="Constant">1</span>
+<span id="L767" class="LineNr"> 767 </span>]
+<span id="L768" class="LineNr"> 768 </span><span class="traceContains">+mem: storing 4 in location 1</span>
+<span id="L769" class="LineNr"> 769 </span>
+<span id="L770" class="LineNr"> 770 </span><span class="Delimiter">:(scenario specialize_with_literal_2)</span>
+<span id="L771" class="LineNr"> 771 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L772" class="LineNr"> 772 </span>  local-scope
+<span id="L773" class="LineNr"> 773 </span>  <span class="Comment"># permit literal to map to character</span>
+<span id="L774" class="LineNr"> 774 </span>  <span class="Constant">1</span>:<span class="Normal">char</span>/<span class="Special">raw &lt;- </span>foo <span class="Constant">3</span>
+<span id="L775" class="LineNr"> 775 </span>]
+<span id="L776" class="LineNr"> 776 </span><span class="muRecipe">def</span> foo x:_elem<span class="muRecipe"> -&gt; </span>y:_elem [
+<span id="L777" class="LineNr"> 777 </span>  local-scope
+<span id="L778" class="LineNr"> 778 </span>  load-ingredients
+<span id="L779" class="LineNr"> 779 </span>  y<span class="Special"> &lt;- </span>add x<span class="Delimiter">,</span> <span class="Constant">1</span>
+<span id="L780" class="LineNr"> 780 </span>]
+<span id="L781" class="LineNr"> 781 </span><span class="traceContains">+mem: storing 4 in location 1</span>
+<span id="L782" class="LineNr"> 782 </span>
+<span id="L783" class="LineNr"> 783 </span><span class="Delimiter">:(scenario specialize_with_literal_3)</span>
 <span id="L784" class="LineNr"> 784 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L785" class="LineNr"> 785 </span>  <span class="Normal">e1</span>:d1:num<span class="Special"> &lt;- </span>merge <span class="Constant">3</span>
-<span id="L786" class="LineNr"> 786 </span>  <span class="Normal">e2</span>:d2:num<span class="Special"> &lt;- </span>merge <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">5</span>
-<span id="L787" class="LineNr"> 787 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>foo e1
-<span id="L788" class="LineNr"> 788 </span>  <span class="Constant">2</span>:num/<span class="Special">raw &lt;- </span>foo e2
-<span id="L789" class="LineNr"> 789 </span>]
-<span id="L790" class="LineNr"> 790 </span><span class="Comment"># the two shape-shifting definitions</span>
-<span id="L791" class="LineNr"> 791 </span><span class="muRecipe">def</span> foo a:d1:_elem<span class="muRecipe"> -&gt; </span>b:num [
-<span id="L792" class="LineNr"> 792 </span>  local-scope
-<span id="L793" class="LineNr"> 793 </span>  load-ingredients
-<span id="L794" class="LineNr"> 794 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
-<span id="L795" class="LineNr"> 795 </span>]
-<span id="L796" class="LineNr"> 796 </span><span class="muRecipe">def</span> foo a:d2:_elem<span class="muRecipe"> -&gt; </span>b:num [
-<span id="L797" class="LineNr"> 797 </span>  local-scope
-<span id="L798" class="LineNr"> 798 </span>  load-ingredients
-<span id="L799" class="LineNr"> 799 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
-<span id="L800" class="LineNr"> 800 </span>]
-<span id="L801" class="LineNr"> 801 </span><span class="Comment"># the shape-shifting containers they use</span>
-<span id="L802" class="LineNr"> 802 </span><span class="muData">container</span> d1:_elem [
-<span id="L803" class="LineNr"> 803 </span>  <span class="Normal">x</span>:_elem
-<span id="L804" class="LineNr"> 804 </span>]
-<span id="L805" class="LineNr"> 805 </span><span class="muData">container</span> d2:_elem [
-<span id="L806" class="LineNr"> 806 </span>  <span class="Normal">x</span>:num
-<span id="L807" class="LineNr"> 807 </span>  <span class="Normal">y</span>:_elem
+<span id="L785" class="LineNr"> 785 </span>  local-scope
+<span id="L786" class="LineNr"> 786 </span>  <span class="Comment"># permit '0' to map to address to shape-shifting type-ingredient</span>
+<span id="L787" class="LineNr"> 787 </span>  <span class="Constant">1</span>:&amp;:<span class="Normal">char</span>/<span class="Special">raw &lt;- </span>foo <span class="Constant">0</span>
+<span id="L788" class="LineNr"> 788 </span>]
+<span id="L789" class="LineNr"> 789 </span><span class="muRecipe">def</span> foo x:&amp;:_elem<span class="muRecipe"> -&gt; </span>y:&amp;:_elem [
+<span id="L790" class="LineNr"> 790 </span>  local-scope
+<span id="L791" class="LineNr"> 791 </span>  load-ingredients
+<span id="L792" class="LineNr"> 792 </span>  y<span class="Special"> &lt;- </span>copy x
+<span id="L793" class="LineNr"> 793 </span>]
+<span id="L794" class="LineNr"> 794 </span><span class="traceContains">+mem: storing 0 in location 1</span>
+<span id="L795" class="LineNr"> 795 </span>$error: <span class="Constant">0</span>
+<span id="L796" class="LineNr"> 796 </span>
+<span id="L797" class="LineNr"> 797 </span><span class="Delimiter">:(scenario specialize_with_literal_4)</span>
+<span id="L798" class="LineNr"> 798 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L799" class="LineNr"> 799 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L800" class="LineNr"> 800 </span>  local-scope
+<span id="L801" class="LineNr"> 801 </span>  <span class="Comment"># ambiguous call: what's the type of its ingredient?!</span>
+<span id="L802" class="LineNr"> 802 </span>  foo <span class="Constant">0</span>
+<span id="L803" class="LineNr"> 803 </span>]
+<span id="L804" class="LineNr"> 804 </span><span class="muRecipe">def</span> foo x:&amp;:_elem<span class="muRecipe"> -&gt; </span>y:&amp;:_elem [
+<span id="L805" class="LineNr"> 805 </span>  local-scope
+<span id="L806" class="LineNr"> 806 </span>  load-ingredients
+<span id="L807" class="LineNr"> 807 </span>  y<span class="Special"> &lt;- </span>copy x
 <span id="L808" class="LineNr"> 808 </span>]
-<span id="L809" class="LineNr"> 809 </span><span class="traceContains">+mem: storing 34 in location 1</span>
-<span id="L810" class="LineNr"> 810 </span><span class="traceContains">+mem: storing 35 in location 2</span>
-<span id="L811" class="LineNr"> 811 </span>
-<span id="L812" class="LineNr"> 812 </span><span class="Delimiter">:(scenario multiple_shape_shifting_variants_2)</span>
-<span id="L813" class="LineNr"> 813 </span><span class="Comment"># static dispatch between shape-shifting variants, _including pointer lookups_</span>
-<span id="L814" class="LineNr"> 814 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L815" class="LineNr"> 815 </span>  <span class="Normal">e1</span>:d1:num<span class="Special"> &lt;- </span>merge <span class="Constant">3</span>
-<span id="L816" class="LineNr"> 816 </span>  <span class="Normal">e2</span>:&amp;:d2:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>d2 number<span class="Delimiter">)</span>: type<span class="Delimiter">}</span>
-<span id="L817" class="LineNr"> 817 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>foo e1
-<span id="L818" class="LineNr"> 818 </span>  <span class="Constant">2</span>:num/<span class="Special">raw &lt;- </span>foo *e2  <span class="Comment"># different from previous scenario</span>
+<span id="L809" class="LineNr"> 809 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: <a href='010vm.cc.html#L32'>instruction</a> 'foo' has no valid specialization</span>
+<span id="L810" class="LineNr"> 810 </span>
+<span id="L811" class="LineNr"> 811 </span><span class="Delimiter">:(scenario specialize_with_literal_5)</span>
+<span id="L812" class="LineNr"> 812 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L813" class="LineNr"> 813 </span>  foo <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">4</span>  <span class="Comment"># recipe mapping two variables to literals</span>
+<span id="L814" class="LineNr"> 814 </span>]
+<span id="L815" class="LineNr"> 815 </span><span class="muRecipe">def</span> foo x:_elem<span class="Delimiter">,</span> y:_elem [
+<span id="L816" class="LineNr"> 816 </span>  local-scope
+<span id="L817" class="LineNr"> 817 </span>  load-ingredients
+<span id="L818" class="LineNr"> 818 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>add x<span class="Delimiter">,</span> y
 <span id="L819" class="LineNr"> 819 </span>]
-<span id="L820" class="LineNr"> 820 </span><span class="muRecipe">def</span> foo a:d1:_elem<span class="muRecipe"> -&gt; </span>b:num [
-<span id="L821" class="LineNr"> 821 </span>  local-scope
-<span id="L822" class="LineNr"> 822 </span>  load-ingredients
-<span id="L823" class="LineNr"> 823 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
-<span id="L824" class="LineNr"> 824 </span>]
-<span id="L825" class="LineNr"> 825 </span><span class="muRecipe">def</span> foo a:d2:_elem<span class="muRecipe"> -&gt; </span>b:num [
-<span id="L826" class="LineNr"> 826 </span>  local-scope
-<span id="L827" class="LineNr"> 827 </span>  load-ingredients
-<span id="L828" class="LineNr"> 828 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L820" class="LineNr"> 820 </span><span class="traceContains">+mem: storing 7 in location 1</span>
+<span id="L821" class="LineNr"> 821 </span>
+<span id="L822" class="LineNr"> 822 </span><span class="Delimiter">:(scenario multiple_shape_shifting_variants)</span>
+<span id="L823" class="LineNr"> 823 </span><span class="Comment"># try to call two different shape-shifting recipes with the same name</span>
+<span id="L824" class="LineNr"> 824 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L825" class="LineNr"> 825 </span>  <span class="Normal">e1</span>:d1:num<span class="Special"> &lt;- </span>merge <span class="Constant">3</span>
+<span id="L826" class="LineNr"> 826 </span>  <span class="Normal">e2</span>:d2:num<span class="Special"> &lt;- </span>merge <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">5</span>
+<span id="L827" class="LineNr"> 827 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>foo e1
+<span id="L828" class="LineNr"> 828 </span>  <span class="Constant">2</span>:num/<span class="Special">raw &lt;- </span>foo e2
 <span id="L829" class="LineNr"> 829 </span>]
-<span id="L830" class="LineNr"> 830 </span><span class="muData">container</span> d1:_elem [
-<span id="L831" class="LineNr"> 831 </span>  <span class="Normal">x</span>:_elem
-<span id="L832" class="LineNr"> 832 </span>]
-<span id="L833" class="LineNr"> 833 </span><span class="muData">container</span> d2:_elem [
-<span id="L834" class="LineNr"> 834 </span>  <span class="Normal">x</span>:num
-<span id="L835" class="LineNr"> 835 </span>  <span class="Normal">y</span>:_elem
-<span id="L836" class="LineNr"> 836 </span>]
-<span id="L837" class="LineNr"> 837 </span><span class="traceContains">+mem: storing 34 in location 1</span>
-<span id="L838" class="LineNr"> 838 </span><span class="traceContains">+mem: storing 35 in location 2</span>
-<span id="L839" class="LineNr"> 839 </span>
-<span id="L840" class="LineNr"> 840 </span><span class="Delimiter">:(scenario missing_type_in_shape_shifting_recipe)</span>
-<span id="L841" class="LineNr"> 841 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L842" class="LineNr"> 842 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L843" class="LineNr"> 843 </span>  <span class="Normal">a</span>:d1:num<span class="Special"> &lt;- </span>merge <span class="Constant">3</span>
-<span id="L844" class="LineNr"> 844 </span>  foo a
-<span id="L845" class="LineNr"> 845 </span>]
-<span id="L846" class="LineNr"> 846 </span><span class="muRecipe">def</span> foo a:d1:_elem<span class="muRecipe"> -&gt; </span>b:num [
-<span id="L847" class="LineNr"> 847 </span>  local-scope
-<span id="L848" class="LineNr"> 848 </span>  load-ingredients
-<span id="L849" class="LineNr"> 849 </span>  copy e  <span class="Comment"># no such variable</span>
-<span id="L850" class="LineNr"> 850 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
-<span id="L851" class="LineNr"> 851 </span>]
-<span id="L852" class="LineNr"> 852 </span><span class="muData">container</span> d1:_elem [
-<span id="L853" class="LineNr"> 853 </span>  <span class="Normal">x</span>:_elem
-<span id="L854" class="LineNr"> 854 </span>]
-<span id="L855" class="LineNr"> 855 </span><span class="traceContains">+error: foo: unknown type for 'e' in 'copy e' (check the name for typos)</span>
-<span id="L856" class="LineNr"> 856 </span><span class="traceContains">+error: specializing foo: missing type for 'e'</span>
-<span id="L857" class="LineNr"> 857 </span><span class="Comment"># and it doesn't crash</span>
-<span id="L858" class="LineNr"> 858 </span>
-<span id="L859" class="LineNr"> 859 </span><span class="Delimiter">:(scenario missing_type_in_shape_shifting_recipe_2)</span>
-<span id="L860" class="LineNr"> 860 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L861" class="LineNr"> 861 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L862" class="LineNr"> 862 </span>  <span class="Normal">a</span>:d1:num<span class="Special"> &lt;- </span>merge <span class="Constant">3</span>
-<span id="L863" class="LineNr"> 863 </span>  foo a
+<span id="L830" class="LineNr"> 830 </span><span class="Comment"># the two shape-shifting definitions</span>
+<span id="L831" class="LineNr"> 831 </span><span class="muRecipe">def</span> foo a:d1:_elem<span class="muRecipe"> -&gt; </span>b:num [
+<span id="L832" class="LineNr"> 832 </span>  local-scope
+<span id="L833" class="LineNr"> 833 </span>  load-ingredients
+<span id="L834" class="LineNr"> 834 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
+<span id="L835" class="LineNr"> 835 </span>]
+<span id="L836" class="LineNr"> 836 </span><span class="muRecipe">def</span> foo a:d2:_elem<span class="muRecipe"> -&gt; </span>b:num [
+<span id="L837" class="LineNr"> 837 </span>  local-scope
+<span id="L838" class="LineNr"> 838 </span>  load-ingredients
+<span id="L839" class="LineNr"> 839 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L840" class="LineNr"> 840 </span>]
+<span id="L841" class="LineNr"> 841 </span><span class="Comment"># the shape-shifting containers they use</span>
+<span id="L842" class="LineNr"> 842 </span><span class="muData">container</span> d1:_elem [
+<span id="L843" class="LineNr"> 843 </span>  <span class="Normal">x</span>:_elem
+<span id="L844" class="LineNr"> 844 </span>]
+<span id="L845" class="LineNr"> 845 </span><span class="muData">container</span> d2:_elem [
+<span id="L846" class="LineNr"> 846 </span>  <span class="Normal">x</span>:num
+<span id="L847" class="LineNr"> 847 </span>  <span class="Normal">y</span>:_elem
+<span id="L848" class="LineNr"> 848 </span>]
+<span id="L849" class="LineNr"> 849 </span><span class="traceContains">+mem: storing 34 in location 1</span>
+<span id="L850" class="LineNr"> 850 </span><span class="traceContains">+mem: storing 35 in location 2</span>
+<span id="L851" class="LineNr"> 851 </span>
+<span id="L852" class="LineNr"> 852 </span><span class="Delimiter">:(scenario multiple_shape_shifting_variants_2)</span>
+<span id="L853" class="LineNr"> 853 </span><span class="Comment"># static dispatch between shape-shifting variants, _including pointer lookups_</span>
+<span id="L854" class="LineNr"> 854 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L855" class="LineNr"> 855 </span>  <span class="Normal">e1</span>:d1:num<span class="Special"> &lt;- </span>merge <span class="Constant">3</span>
+<span id="L856" class="LineNr"> 856 </span>  <span class="Normal">e2</span>:&amp;:d2:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>d2 number<span class="Delimiter">)</span>: type<span class="Delimiter">}</span>
+<span id="L857" class="LineNr"> 857 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>foo e1
+<span id="L858" class="LineNr"> 858 </span>  <span class="Constant">2</span>:num/<span class="Special">raw &lt;- </span>foo *e2  <span class="Comment"># different from previous scenario</span>
+<span id="L859" class="LineNr"> 859 </span>]
+<span id="L860" class="LineNr"> 860 </span><span class="muRecipe">def</span> foo a:d1:_elem<span class="muRecipe"> -&gt; </span>b:num [
+<span id="L861" class="LineNr"> 861 </span>  local-scope
+<span id="L862" class="LineNr"> 862 </span>  load-ingredients
+<span id="L863" class="LineNr"> 863 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
 <span id="L864" class="LineNr"> 864 </span>]
-<span id="L865" class="LineNr"> 865 </span><span class="muRecipe">def</span> foo a:d1:_elem<span class="muRecipe"> -&gt; </span>b:num [
+<span id="L865" class="LineNr"> 865 </span><span class="muRecipe">def</span> foo a:d2:_elem<span class="muRecipe"> -&gt; </span>b:num [
 <span id="L866" class="LineNr"> 866 </span>  local-scope
 <span id="L867" class="LineNr"> 867 </span>  load-ingredients
-<span id="L868" class="LineNr"> 868 </span>  get e<span class="Delimiter">,</span> <span class="Constant">x:offset</span>  <span class="Comment"># unknown variable in a 'get', which does some extra checking</span>
-<span id="L869" class="LineNr"> 869 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
-<span id="L870" class="LineNr"> 870 </span>]
-<span id="L871" class="LineNr"> 871 </span><span class="muData">container</span> d1:_elem [
-<span id="L872" class="LineNr"> 872 </span>  <span class="Normal">x</span>:_elem
-<span id="L873" class="LineNr"> 873 </span>]
-<span id="L874" class="LineNr"> 874 </span><span class="traceContains">+error: foo: unknown type for 'e' in 'get e, x:offset' (check the name for typos)</span>
-<span id="L875" class="LineNr"> 875 </span><span class="traceContains">+error: specializing foo: missing type for 'e'</span>
-<span id="L876" class="LineNr"> 876 </span><span class="Comment"># and it doesn't crash</span>
-<span id="L877" class="LineNr"> 877 </span>
-<span id="L878" class="LineNr"> 878 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L879" class="LineNr"> 879 </span><span class="Delimiter">:(scenario specialize_recursive_shape_shifting_recipe)</span>
-<span id="L880" class="LineNr"> 880 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L881" class="LineNr"> 881 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L882" class="LineNr"> 882 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>foo <span class="Constant">1</span>:num
-<span id="L883" class="LineNr"> 883 </span>]
-<span id="L884" class="LineNr"> 884 </span><span class="muRecipe">def</span> foo x:_elem<span class="muRecipe"> -&gt; </span>y:num [
-<span id="L885" class="LineNr"> 885 </span>  local-scope
-<span id="L886" class="LineNr"> 886 </span>  load-ingredients
-<span id="L887" class="LineNr"> 887 </span>  <span class="Delimiter">{</span>
-<span id="L888" class="LineNr"> 888 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span>
-<span id="L889" class="LineNr"> 889 </span>  <span class="Conceal">¦</span> <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>foo x
-<span id="L890" class="LineNr"> 890 </span>  <span class="Delimiter">}</span>
-<span id="L891" class="LineNr"> 891 </span>  <span class="Identifier">return</span> y
-<span id="L892" class="LineNr"> 892 </span>]
-<span id="L893" class="LineNr"> 893 </span><span class="traceContains">+transform: new specialization: foo_2</span>
-<span id="L894" class="LineNr"> 894 </span><span class="Comment"># transform terminates</span>
-<span id="L895" class="LineNr"> 895 </span>
-<span id="L896" class="LineNr"> 896 </span><span class="Delimiter">:(scenarios run)</span>
-<span id="L897" class="LineNr"> 897 </span><span class="Delimiter">:(scenario specialize_most_similar_variant)</span>
-<span id="L898" class="LineNr"> 898 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L899" class="LineNr"> 899 </span>  <span class="Constant">1</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L900" class="LineNr"> 900 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>foo <span class="Constant">1</span>:&amp;:num
-<span id="L901" class="LineNr"> 901 </span>]
-<span id="L902" class="LineNr"> 902 </span><span class="muRecipe">def</span> foo x:_elem<span class="muRecipe"> -&gt; </span>y:num [
-<span id="L903" class="LineNr"> 903 </span>  local-scope
-<span id="L904" class="LineNr"> 904 </span>  load-ingredients
-<span id="L905" class="LineNr"> 905 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
-<span id="L906" class="LineNr"> 906 </span>]
-<span id="L907" class="LineNr"> 907 </span><span class="muRecipe">def</span> foo x:&amp;:_elem<span class="muRecipe"> -&gt; </span>y:num [
-<span id="L908" class="LineNr"> 908 </span>  local-scope
-<span id="L909" class="LineNr"> 909 </span>  load-ingredients
-<span id="L910" class="LineNr"> 910 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
-<span id="L911" class="LineNr"> 911 </span>]
-<span id="L912" class="LineNr"> 912 </span><span class="traceContains">+mem: storing 35 in location 2</span>
-<span id="L913" class="LineNr"> 913 </span>
-<span id="L914" class="LineNr"> 914 </span><span class="Delimiter">:(scenario specialize_most_similar_variant_2)</span>
-<span id="L915" class="LineNr"> 915 </span><span class="Comment"># version with headers padded with lots of unrelated concrete types</span>
-<span id="L916" class="LineNr"> 916 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L917" class="LineNr"> 917 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
-<span id="L918" class="LineNr"> 918 </span>  <span class="Constant">2</span>:&amp;:@:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L919" class="LineNr"> 919 </span>  <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>foo <span class="Constant">2</span>:&amp;:@:num<span class="Delimiter">,</span> <span class="Constant">1</span>:num
-<span id="L920" class="LineNr"> 920 </span>]
-<span id="L921" class="LineNr"> 921 </span><span class="Comment"># variant with concrete type</span>
-<span id="L922" class="LineNr"> 922 </span><span class="muRecipe">def</span> foo dummy:&amp;:@:num<span class="Delimiter">,</span> x:num<span class="muRecipe"> -&gt; </span>y:num<span class="Delimiter">,</span> dummy:&amp;:@:num [
-<span id="L923" class="LineNr"> 923 </span>  local-scope
-<span id="L924" class="LineNr"> 924 </span>  load-ingredients
-<span id="L925" class="LineNr"> 925 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
-<span id="L926" class="LineNr"> 926 </span>]
-<span id="L927" class="LineNr"> 927 </span><span class="Comment"># shape-shifting variant</span>
-<span id="L928" class="LineNr"> 928 </span><span class="muRecipe">def</span> foo dummy:&amp;:@:num<span class="Delimiter">,</span> x:_elem<span class="muRecipe"> -&gt; </span>y:num<span class="Delimiter">,</span> dummy:&amp;:@:num [
-<span id="L929" class="LineNr"> 929 </span>  local-scope
-<span id="L930" class="LineNr"> 930 </span>  load-ingredients
-<span id="L931" class="LineNr"> 931 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L868" class="LineNr"> 868 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L869" class="LineNr"> 869 </span>]
+<span id="L870" class="LineNr"> 870 </span><span class="muData">container</span> d1:_elem [
+<span id="L871" class="LineNr"> 871 </span>  <span class="Normal">x</span>:_elem
+<span id="L872" class="LineNr"> 872 </span>]
+<span id="L873" class="LineNr"> 873 </span><span class="muData">container</span> d2:_elem [
+<span id="L874" class="LineNr"> 874 </span>  <span class="Normal">x</span>:num
+<span id="L875" class="LineNr"> 875 </span>  <span class="Normal">y</span>:_elem
+<span id="L876" class="LineNr"> 876 </span>]
+<span id="L877" class="LineNr"> 877 </span><span class="traceContains">+mem: storing 34 in location 1</span>
+<span id="L878" class="LineNr"> 878 </span><span class="traceContains">+mem: storing 35 in location 2</span>
+<span id="L879" class="LineNr"> 879 </span>
+<span id="L880" class="LineNr"> 880 </span><span class="Delimiter">:(scenario missing_type_in_shape_shifting_recipe)</span>
+<span id="L881" class="LineNr"> 881 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L882" class="LineNr"> 882 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L883" class="LineNr"> 883 </span>  <span class="Normal">a</span>:d1:num<span class="Special"> &lt;- </span>merge <span class="Constant">3</span>
+<span id="L884" class="LineNr"> 884 </span>  foo a
+<span id="L885" class="LineNr"> 885 </span>]
+<span id="L886" class="LineNr"> 886 </span><span class="muRecipe">def</span> foo a:d1:_elem<span class="muRecipe"> -&gt; </span>b:num [
+<span id="L887" class="LineNr"> 887 </span>  local-scope
+<span id="L888" class="LineNr"> 888 </span>  load-ingredients
+<span id="L889" class="LineNr"> 889 </span>  copy e  <span class="Comment"># no such variable</span>
+<span id="L890" class="LineNr"> 890 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
+<span id="L891" class="LineNr"> 891 </span>]
+<span id="L892" class="LineNr"> 892 </span><span class="muData">container</span> d1:_elem [
+<span id="L893" class="LineNr"> 893 </span>  <span class="Normal">x</span>:_elem
+<span id="L894" class="LineNr"> 894 </span>]
+<span id="L895" class="LineNr"> 895 </span><span class="traceContains">+error: foo: unknown type for 'e' in 'copy e' (check the name for typos)</span>
+<span id="L896" class="LineNr"> 896 </span><span class="traceContains">+error: specializing foo: missing type for 'e'</span>
+<span id="L897" class="LineNr"> 897 </span><span class="Comment"># and it doesn't crash</span>
+<span id="L898" class="LineNr"> 898 </span>
+<span id="L899" class="LineNr"> 899 </span><span class="Delimiter">:(scenario missing_type_in_shape_shifting_recipe_2)</span>
+<span id="L900" class="LineNr"> 900 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L901" class="LineNr"> 901 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L902" class="LineNr"> 902 </span>  <span class="Normal">a</span>:d1:num<span class="Special"> &lt;- </span>merge <span class="Constant">3</span>
+<span id="L903" class="LineNr"> 903 </span>  foo a
+<span id="L904" class="LineNr"> 904 </span>]
+<span id="L905" class="LineNr"> 905 </span><span class="muRecipe">def</span> foo a:d1:_elem<span class="muRecipe"> -&gt; </span>b:num [
+<span id="L906" class="LineNr"> 906 </span>  local-scope
+<span id="L907" class="LineNr"> 907 </span>  load-ingredients
+<span id="L908" class="LineNr"> 908 </span>  get e<span class="Delimiter">,</span> <span class="Constant">x:offset</span>  <span class="Comment"># unknown variable in a 'get', which does some extra checking</span>
+<span id="L909" class="LineNr"> 909 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
+<span id="L910" class="LineNr"> 910 </span>]
+<span id="L911" class="LineNr"> 911 </span><span class="muData">container</span> d1:_elem [
+<span id="L912" class="LineNr"> 912 </span>  <span class="Normal">x</span>:_elem
+<span id="L913" class="LineNr"> 913 </span>]
+<span id="L914" class="LineNr"> 914 </span><span class="traceContains">+error: foo: unknown type for 'e' in 'get e, x:offset' (check the name for typos)</span>
+<span id="L915" class="LineNr"> 915 </span><span class="traceContains">+error: specializing foo: missing type for 'e'</span>
+<span id="L916" class="LineNr"> 916 </span><span class="Comment"># and it doesn't crash</span>
+<span id="L917" class="LineNr"> 917 </span>
+<span id="L918" class="LineNr"> 918 </span><span class="Delimiter">:(scenarios transform)</span>
+<span id="L919" class="LineNr"> 919 </span><span class="Delimiter">:(scenario specialize_recursive_shape_shifting_recipe)</span>
+<span id="L920" class="LineNr"> 920 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L921" class="LineNr"> 921 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L922" class="LineNr"> 922 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>foo <span class="Constant">1</span>:num
+<span id="L923" class="LineNr"> 923 </span>]
+<span id="L924" class="LineNr"> 924 </span><span class="muRecipe">def</span> foo x:_elem<span class="muRecipe"> -&gt; </span>y:num [
+<span id="L925" class="LineNr"> 925 </span>  local-scope
+<span id="L926" class="LineNr"> 926 </span>  load-ingredients
+<span id="L927" class="LineNr"> 927 </span>  <span class="Delimiter">{</span>
+<span id="L928" class="LineNr"> 928 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span>
+<span id="L929" class="LineNr"> 929 </span>  <span class="Conceal">¦</span> <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>foo x
+<span id="L930" class="LineNr"> 930 </span>  <span class="Delimiter">}</span>
+<span id="L931" class="LineNr"> 931 </span>  <span class="Identifier">return</span> y
 <span id="L932" class="LineNr"> 932 </span>]
-<span id="L933" class="LineNr"> 933 </span><span class="Comment"># prefer the concrete variant</span>
-<span id="L934" class="LineNr"> 934 </span><span class="traceContains">+mem: storing 34 in location 3</span>
+<span id="L933" class="LineNr"> 933 </span><span class="traceContains">+transform: new specialization: foo_2</span>
+<span id="L934" class="LineNr"> 934 </span><span class="Comment"># transform terminates</span>
 <span id="L935" class="LineNr"> 935 </span>
-<span id="L936" class="LineNr"> 936 </span><span class="Delimiter">:(scenario specialize_most_similar_variant_3)</span>
-<span id="L937" class="LineNr"> 937 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L938" class="LineNr"> 938 </span>  <span class="Constant">1</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [abc]
-<span id="L939" class="LineNr"> 939 </span>  foo <span class="Constant">1</span>:text
-<span id="L940" class="LineNr"> 940 </span>]
-<span id="L941" class="LineNr"> 941 </span><span class="muRecipe">def</span> foo x:text [
-<span id="L942" class="LineNr"> 942 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L943" class="LineNr"> 943 </span>]
-<span id="L944" class="LineNr"> 944 </span><span class="muRecipe">def</span> foo x:&amp;:_elem [
-<span id="L945" class="LineNr"> 945 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
+<span id="L936" class="LineNr"> 936 </span><span class="Delimiter">:(scenarios run)</span>
+<span id="L937" class="LineNr"> 937 </span><span class="Delimiter">:(scenario specialize_most_similar_variant)</span>
+<span id="L938" class="LineNr"> 938 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L939" class="LineNr"> 939 </span>  <span class="Constant">1</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L940" class="LineNr"> 940 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>foo <span class="Constant">1</span>:&amp;:num
+<span id="L941" class="LineNr"> 941 </span>]
+<span id="L942" class="LineNr"> 942 </span><span class="muRecipe">def</span> foo x:_elem<span class="muRecipe"> -&gt; </span>y:num [
+<span id="L943" class="LineNr"> 943 </span>  local-scope
+<span id="L944" class="LineNr"> 944 </span>  load-ingredients
+<span id="L945" class="LineNr"> 945 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
 <span id="L946" class="LineNr"> 946 </span>]
-<span id="L947" class="LineNr"> 947 </span><span class="Comment"># make sure the more precise version was used</span>
-<span id="L948" class="LineNr"> 948 </span><span class="traceContains">+mem: storing 34 in location 2</span>
-<span id="L949" class="LineNr"> 949 </span>
-<span id="L950" class="LineNr"> 950 </span><span class="Delimiter">:(scenario specialize_literal_as_number)</span>
-<span id="L951" class="LineNr"> 951 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L952" class="LineNr"> 952 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>foo <span class="Constant">23</span>
-<span id="L953" class="LineNr"> 953 </span>]
-<span id="L954" class="LineNr"> 954 </span><span class="muRecipe">def</span> foo x:_elem<span class="muRecipe"> -&gt; </span>y:num [
-<span id="L955" class="LineNr"> 955 </span>  local-scope
-<span id="L956" class="LineNr"> 956 </span>  load-ingredients
-<span id="L957" class="LineNr"> 957 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
-<span id="L958" class="LineNr"> 958 </span>]
-<span id="L959" class="LineNr"> 959 </span><span class="muRecipe">def</span> foo x:<span class="Normal">char</span><span class="muRecipe"> -&gt; </span>y:num [
-<span id="L960" class="LineNr"> 960 </span>  local-scope
-<span id="L961" class="LineNr"> 961 </span>  load-ingredients
-<span id="L962" class="LineNr"> 962 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
-<span id="L963" class="LineNr"> 963 </span>]
-<span id="L964" class="LineNr"> 964 </span><span class="traceContains">+mem: storing 34 in location 1</span>
-<span id="L965" class="LineNr"> 965 </span>
-<span id="L966" class="LineNr"> 966 </span><span class="Delimiter">:(scenario specialize_literal_as_number_2)</span>
-<span id="L967" class="LineNr"> 967 </span><span class="Comment"># version calling with literal</span>
-<span id="L968" class="LineNr"> 968 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L969" class="LineNr"> 969 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>foo <span class="Constant">0</span>
-<span id="L970" class="LineNr"> 970 </span>]
-<span id="L971" class="LineNr"> 971 </span><span class="Comment"># variant with concrete type</span>
-<span id="L972" class="LineNr"> 972 </span><span class="muRecipe">def</span> foo x:num<span class="muRecipe"> -&gt; </span>y:num [
-<span id="L973" class="LineNr"> 973 </span>  local-scope
-<span id="L974" class="LineNr"> 974 </span>  load-ingredients
-<span id="L975" class="LineNr"> 975 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
-<span id="L976" class="LineNr"> 976 </span>]
-<span id="L977" class="LineNr"> 977 </span><span class="Comment"># shape-shifting variant</span>
-<span id="L978" class="LineNr"> 978 </span><span class="muRecipe">def</span> foo x:&amp;:_elem<span class="muRecipe"> -&gt; </span>y:num [
-<span id="L979" class="LineNr"> 979 </span>  local-scope
-<span id="L980" class="LineNr"> 980 </span>  load-ingredients
-<span id="L981" class="LineNr"> 981 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
-<span id="L982" class="LineNr"> 982 </span>]
-<span id="L983" class="LineNr"> 983 </span><span class="Comment"># prefer the concrete variant, ignore concrete types in scoring the shape-shifting variant</span>
-<span id="L984" class="LineNr"> 984 </span><span class="traceContains">+mem: storing 34 in location 1</span>
-<span id="L985" class="LineNr"> 985 </span>
-<span id="L986" class="LineNr"> 986 </span><span class="Delimiter">:(scenario specialize_literal_as_address)</span>
-<span id="L987" class="LineNr"> 987 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L988" class="LineNr"> 988 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>foo <span class="Constant">0</span>
-<span id="L989" class="LineNr"> 989 </span>]
-<span id="L990" class="LineNr"> 990 </span><span class="Comment"># variant with concrete address type</span>
-<span id="L991" class="LineNr"> 991 </span><span class="muRecipe">def</span> foo x:&amp;:num<span class="muRecipe"> -&gt; </span>y:num [
-<span id="L992" class="LineNr"> 992 </span>  local-scope
-<span id="L993" class="LineNr"> 993 </span>  load-ingredients
-<span id="L994" class="LineNr"> 994 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
-<span id="L995" class="LineNr"> 995 </span>]
-<span id="L996" class="LineNr"> 996 </span><span class="Comment"># shape-shifting variant</span>
-<span id="L997" class="LineNr"> 997 </span><span class="muRecipe">def</span> foo x:&amp;:_elem<span class="muRecipe"> -&gt; </span>y:num [
-<span id="L998" class="LineNr"> 998 </span>  local-scope
-<span id="L999" class="LineNr"> 999 </span>  load-ingredients
-<span id="L1000" class="LineNr">1000 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
-<span id="L1001" class="LineNr">1001 </span>]
-<span id="L1002" class="LineNr">1002 </span><span class="Comment"># prefer the concrete variant, ignore concrete types in scoring the shape-shifting variant</span>
-<span id="L1003" class="LineNr">1003 </span><span class="traceContains">+mem: storing 34 in location 1</span>
-<span id="L1004" class="LineNr">1004 </span>
-<span id="L1005" class="LineNr">1005 </span><span class="Delimiter">:(scenario missing_type_during_specialization)</span>
-<span id="L1006" class="LineNr">1006 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L1007" class="LineNr">1007 </span><span class="Comment"># define a shape-shifting recipe</span>
-<span id="L1008" class="LineNr">1008 </span><span class="muRecipe">def</span> foo a:_elem [
-<span id="L1009" class="LineNr">1009 </span>]
-<span id="L1010" class="LineNr">1010 </span><span class="Comment"># define a container with field 'z'</span>
-<span id="L1011" class="LineNr">1011 </span><span class="muData">container</span> foo2 [
-<span id="L1012" class="LineNr">1012 </span>  <span class="Normal">z</span>:num
-<span id="L1013" class="LineNr">1013 </span>]
-<span id="L1014" class="LineNr">1014 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L1015" class="LineNr">1015 </span>  local-scope
-<span id="L1016" class="LineNr">1016 </span>  <span class="Normal">x</span>:foo2<span class="Special"> &lt;- </span>merge <span class="Constant">34</span>
-<span id="L1017" class="LineNr">1017 </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="L1018" class="LineNr">1018 </span><span class="PreProc">  </span><span class="Comment"># define a variable with the same name 'z'</span>
-<span id="L1019" class="LineNr">1019 </span>  <span class="Normal">z</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L1020" class="LineNr">1020 </span>  <span class="Comment"># trigger specialization of the shape-shifting recipe</span>
-<span id="L1021" class="LineNr">1021 </span>  foo z
+<span id="L947" class="LineNr"> 947 </span><span class="muRecipe">def</span> foo x:&amp;:_elem<span class="muRecipe"> -&gt; </span>y:num [
+<span id="L948" class="LineNr"> 948 </span>  local-scope
+<span id="L949" class="LineNr"> 949 </span>  load-ingredients
+<span id="L950" class="LineNr"> 950 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L951" class="LineNr"> 951 </span>]
+<span id="L952" class="LineNr"> 952 </span><span class="traceContains">+mem: storing 35 in location 2</span>
+<span id="L953" class="LineNr"> 953 </span>
+<span id="L954" class="LineNr"> 954 </span><span class="Delimiter">:(scenario specialize_most_similar_variant_2)</span>
+<span id="L955" class="LineNr"> 955 </span><span class="Comment"># version with headers padded with lots of unrelated concrete types</span>
+<span id="L956" class="LineNr"> 956 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L957" class="LineNr"> 957 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
+<span id="L958" class="LineNr"> 958 </span>  <span class="Constant">2</span>:&amp;:@:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L959" class="LineNr"> 959 </span>  <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>foo <span class="Constant">2</span>:&amp;:@:num<span class="Delimiter">,</span> <span class="Constant">1</span>:num
+<span id="L960" class="LineNr"> 960 </span>]
+<span id="L961" class="LineNr"> 961 </span><span class="Comment"># variant with concrete type</span>
+<span id="L962" class="LineNr"> 962 </span><span class="muRecipe">def</span> foo dummy:&amp;:@:num<span class="Delimiter">,</span> x:num<span class="muRecipe"> -&gt; </span>y:num<span class="Delimiter">,</span> dummy:&amp;:@:num [
+<span id="L963" class="LineNr"> 963 </span>  local-scope
+<span id="L964" class="LineNr"> 964 </span>  load-ingredients
+<span id="L965" class="LineNr"> 965 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
+<span id="L966" class="LineNr"> 966 </span>]
+<span id="L967" class="LineNr"> 967 </span><span class="Comment"># shape-shifting variant</span>
+<span id="L968" class="LineNr"> 968 </span><span class="muRecipe">def</span> foo dummy:&amp;:@:num<span class="Delimiter">,</span> x:_elem<span class="muRecipe"> -&gt; </span>y:num<span class="Delimiter">,</span> dummy:&amp;:@:num [
+<span id="L969" class="LineNr"> 969 </span>  local-scope
+<span id="L970" class="LineNr"> 970 </span>  load-ingredients
+<span id="L971" class="LineNr"> 971 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L972" class="LineNr"> 972 </span>]
+<span id="L973" class="LineNr"> 973 </span><span class="Comment"># prefer the concrete variant</span>
+<span id="L974" class="LineNr"> 974 </span><span class="traceContains">+mem: storing 34 in location 3</span>
+<span id="L975" class="LineNr"> 975 </span>
+<span id="L976" class="LineNr"> 976 </span><span class="Delimiter">:(scenario specialize_most_similar_variant_3)</span>
+<span id="L977" class="LineNr"> 977 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L978" class="LineNr"> 978 </span>  <span class="Constant">1</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [abc]
+<span id="L979" class="LineNr"> 979 </span>  foo <span class="Constant">1</span>:text
+<span id="L980" class="LineNr"> 980 </span>]
+<span id="L981" class="LineNr"> 981 </span><span class="muRecipe">def</span> foo x:text [
+<span id="L982" class="LineNr"> 982 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L983" class="LineNr"> 983 </span>]
+<span id="L984" class="LineNr"> 984 </span><span class="muRecipe">def</span> foo x:&amp;:_elem [
+<span id="L985" class="LineNr"> 985 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
+<span id="L986" class="LineNr"> 986 </span>]
+<span id="L987" class="LineNr"> 987 </span><span class="Comment"># make sure the more precise version was used</span>
+<span id="L988" class="LineNr"> 988 </span><span class="traceContains">+mem: storing 34 in location 2</span>
+<span id="L989" class="LineNr"> 989 </span>
+<span id="L990" class="LineNr"> 990 </span><span class="Delimiter">:(scenario specialize_literal_as_number)</span>
+<span id="L991" class="LineNr"> 991 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L992" class="LineNr"> 992 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>foo <span class="Constant">23</span>
+<span id="L993" class="LineNr"> 993 </span>]
+<span id="L994" class="LineNr"> 994 </span><span class="muRecipe">def</span> foo x:_elem<span class="muRecipe"> -&gt; </span>y:num [
+<span id="L995" class="LineNr"> 995 </span>  local-scope
+<span id="L996" class="LineNr"> 996 </span>  load-ingredients
+<span id="L997" class="LineNr"> 997 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
+<span id="L998" class="LineNr"> 998 </span>]
+<span id="L999" class="LineNr"> 999 </span><span class="muRecipe">def</span> foo x:<span class="Normal">char</span><span class="muRecipe"> -&gt; </span>y:num [
+<span id="L1000" class="LineNr">1000 </span>  local-scope
+<span id="L1001" class="LineNr">1001 </span>  load-ingredients
+<span id="L1002" class="LineNr">1002 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L1003" class="LineNr">1003 </span>]
+<span id="L1004" class="LineNr">1004 </span><span class="traceContains">+mem: storing 34 in location 1</span>
+<span id="L1005" class="LineNr">1005 </span>
+<span id="L1006" class="LineNr">1006 </span><span class="Delimiter">:(scenario specialize_literal_as_number_2)</span>
+<span id="L1007" class="LineNr">1007 </span><span class="Comment"># version calling with literal</span>
+<span id="L1008" class="LineNr">1008 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L1009" class="LineNr">1009 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>foo <span class="Constant">0</span>
+<span id="L1010" class="LineNr">1010 </span>]
+<span id="L1011" class="LineNr">1011 </span><span class="Comment"># variant with concrete type</span>
+<span id="L1012" class="LineNr">1012 </span><span class="muRecipe">def</span> foo x:num<span class="muRecipe"> -&gt; </span>y:num [
+<span id="L1013" class="LineNr">1013 </span>  local-scope
+<span id="L1014" class="LineNr">1014 </span>  load-ingredients
+<span id="L1015" class="LineNr">1015 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
+<span id="L1016" class="LineNr">1016 </span>]
+<span id="L1017" class="LineNr">1017 </span><span class="Comment"># shape-shifting variant</span>
+<span id="L1018" class="LineNr">1018 </span><span class="muRecipe">def</span> foo x:&amp;:_elem<span class="muRecipe"> -&gt; </span>y:num [
+<span id="L1019" class="LineNr">1019 </span>  local-scope
+<span id="L1020" class="LineNr">1020 </span>  load-ingredients
+<span id="L1021" class="LineNr">1021 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
 <span id="L1022" class="LineNr">1022 </span>]
-<span id="L1023" class="LineNr">1023 </span><span class="Comment"># shouldn't crash</span>
-<span id="L1024" class="LineNr">1024 </span>
-<span id="L1025" class="LineNr">1025 </span><span class="Delimiter">:(scenario missing_type_during_specialization2)</span>
-<span id="L1026" class="LineNr">1026 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L1027" class="LineNr">1027 </span><span class="Comment"># define a shape-shifting recipe</span>
-<span id="L1028" class="LineNr">1028 </span><span class="muRecipe">def</span> foo a:_elem [
+<span id="L1023" class="LineNr">1023 </span><span class="Comment"># prefer the concrete variant, ignore concrete types in scoring the shape-shifting variant</span>
+<span id="L1024" class="LineNr">1024 </span><span class="traceContains">+mem: storing 34 in location 1</span>
+<span id="L1025" class="LineNr">1025 </span>
+<span id="L1026" class="LineNr">1026 </span><span class="Delimiter">:(scenario specialize_literal_as_address)</span>
+<span id="L1027" class="LineNr">1027 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L1028" class="LineNr">1028 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>foo <span class="Constant">0</span>
 <span id="L1029" class="LineNr">1029 </span>]
-<span id="L1030" class="LineNr">1030 </span><span class="Comment"># define a container with field 'z'</span>
-<span id="L1031" class="LineNr">1031 </span><span class="muData">container</span> foo2 [
-<span id="L1032" class="LineNr">1032 </span>  <span class="Normal">z</span>:num
-<span id="L1033" class="LineNr">1033 </span>]
-<span id="L1034" class="LineNr">1034 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L1035" class="LineNr">1035 </span>  local-scope
-<span id="L1036" class="LineNr">1036 </span>  <span class="Normal">x</span>:foo2<span class="Special"> &lt;- </span>merge <span class="Constant">34</span>
-<span id="L1037" class="LineNr">1037 </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="L1038" class="LineNr">1038 </span><span class="PreProc">  </span><span class="Comment"># define a variable with the same name 'z'</span>
-<span id="L1039" class="LineNr">1039 </span>  <span class="Normal">z</span>:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L1040" class="LineNr">1040 </span>  <span class="Comment"># trigger specialization of the shape-shifting recipe</span>
-<span id="L1041" class="LineNr">1041 </span>  foo *z
-<span id="L1042" class="LineNr">1042 </span>]
-<span id="L1043" class="LineNr">1043 </span><span class="Comment"># shouldn't crash</span>
+<span id="L1030" class="LineNr">1030 </span><span class="Comment"># variant with concrete address type</span>
+<span id="L1031" class="LineNr">1031 </span><span class="muRecipe">def</span> foo x:&amp;:num<span class="muRecipe"> -&gt; </span>y:num [
+<span id="L1032" class="LineNr">1032 </span>  local-scope
+<span id="L1033" class="LineNr">1033 </span>  load-ingredients
+<span id="L1034" class="LineNr">1034 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
+<span id="L1035" class="LineNr">1035 </span>]
+<span id="L1036" class="LineNr">1036 </span><span class="Comment"># shape-shifting variant</span>
+<span id="L1037" class="LineNr">1037 </span><span class="muRecipe">def</span> foo x:&amp;:_elem<span class="muRecipe"> -&gt; </span>y:num [
+<span id="L1038" class="LineNr">1038 </span>  local-scope
+<span id="L1039" class="LineNr">1039 </span>  load-ingredients
+<span id="L1040" class="LineNr">1040 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L1041" class="LineNr">1041 </span>]
+<span id="L1042" class="LineNr">1042 </span><span class="Comment"># prefer the concrete variant, ignore concrete types in scoring the shape-shifting variant</span>
+<span id="L1043" class="LineNr">1043 </span><span class="traceContains">+mem: storing 34 in location 1</span>
 <span id="L1044" class="LineNr">1044 </span>
-<span id="L1045" class="LineNr">1045 </span><span class="Delimiter">:(scenario tangle_shape_shifting_recipe)</span>
-<span id="L1046" class="LineNr">1046 </span><span class="Comment"># shape-shifting recipe</span>
-<span id="L1047" class="LineNr">1047 </span><span class="muRecipe">def</span> foo a:_elem [
-<span id="L1048" class="LineNr">1048 </span>  local-scope
-<span id="L1049" class="LineNr">1049 </span>  load-ingredients
-<span id="L1050" class="LineNr">1050 </span>  &lt;label1&gt;
-<span id="L1051" class="LineNr">1051 </span>]
-<span id="L1052" class="LineNr">1052 </span><span class="Comment"># tangle some code that refers to the type ingredient</span>
-<span id="L1053" class="LineNr">1053 </span><span class="muRecipe">after</span> &lt;label1&gt; [
-<span id="L1054" class="LineNr">1054 </span>  <span class="Normal">b</span>:_elem<span class="Special"> &lt;- </span>copy a
-<span id="L1055" class="LineNr">1055 </span>]
-<span id="L1056" class="LineNr">1056 </span><span class="Comment"># trigger specialization</span>
-<span id="L1057" class="LineNr">1057 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L1058" class="LineNr">1058 </span>  local-scope
-<span id="L1059" class="LineNr">1059 </span>  foo <span class="Constant">34</span>
-<span id="L1060" class="LineNr">1060 </span>]
-<span id="L1061" class="LineNr">1061 </span>$error: <span class="Constant">0</span>
-<span id="L1062" class="LineNr">1062 </span>
-<span id="L1063" class="LineNr">1063 </span><span class="Delimiter">:(scenario tangle_shape_shifting_recipe_with_type_abbreviation)</span>
-<span id="L1064" class="LineNr">1064 </span><span class="Comment"># shape-shifting recipe</span>
-<span id="L1065" class="LineNr">1065 </span><span class="muRecipe">def</span> foo a:_elem [
-<span id="L1066" class="LineNr">1066 </span>  local-scope
-<span id="L1067" class="LineNr">1067 </span>  load-ingredients
-<span id="L1068" class="LineNr">1068 </span>  &lt;label1&gt;
+<span id="L1045" class="LineNr">1045 </span><span class="Delimiter">:(scenario missing_type_during_specialization)</span>
+<span id="L1046" class="LineNr">1046 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L1047" class="LineNr">1047 </span><span class="Comment"># define a shape-shifting recipe</span>
+<span id="L1048" class="LineNr">1048 </span><span class="muRecipe">def</span> foo a:_elem [
+<span id="L1049" class="LineNr">1049 </span>]
+<span id="L1050" class="LineNr">1050 </span><span class="Comment"># define a container with field 'z'</span>
+<span id="L1051" class="LineNr">1051 </span><span class="muData">container</span> foo2 [
+<span id="L1052" class="LineNr">1052 </span>  <span class="Normal">z</span>:num
+<span id="L1053" class="LineNr">1053 </span>]
+<span id="L1054" class="LineNr">1054 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L1055" class="LineNr">1055 </span>  local-scope
+<span id="L1056" class="LineNr">1056 </span>  <span class="Normal">x</span>:foo2<span class="Special"> &lt;- </span>merge <span class="Constant">34</span>
+<span id="L1057" class="LineNr">1057 </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="L1058" class="LineNr">1058 </span><span class="PreProc">  </span><span class="Comment"># define a variable with the same name 'z'</span>
+<span id="L1059" class="LineNr">1059 </span>  <span class="Normal">z</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L1060" class="LineNr">1060 </span>  <span class="Comment"># trigger specialization of the shape-shifting recipe</span>
+<span id="L1061" class="LineNr">1061 </span>  foo z
+<span id="L1062" class="LineNr">1062 </span>]
+<span id="L1063" class="LineNr">1063 </span><span class="Comment"># shouldn't crash</span>
+<span id="L1064" class="LineNr">1064 </span>
+<span id="L1065" class="LineNr">1065 </span><span class="Delimiter">:(scenario missing_type_during_specialization2)</span>
+<span id="L1066" class="LineNr">1066 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L1067" class="LineNr">1067 </span><span class="Comment"># define a shape-shifting recipe</span>
+<span id="L1068" class="LineNr">1068 </span><span class="muRecipe">def</span> foo a:_elem [
 <span id="L1069" class="LineNr">1069 </span>]
-<span id="L1070" class="LineNr">1070 </span><span class="Comment"># tangle some code that refers to the type ingredient</span>
-<span id="L1071" class="LineNr">1071 </span><span class="muRecipe">after</span> &lt;label1&gt; [
-<span id="L1072" class="LineNr">1072 </span>  <span class="Normal">b</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># type abbreviation</span>
+<span id="L1070" class="LineNr">1070 </span><span class="Comment"># define a container with field 'z'</span>
+<span id="L1071" class="LineNr">1071 </span><span class="muData">container</span> foo2 [
+<span id="L1072" class="LineNr">1072 </span>  <span class="Normal">z</span>:num
 <span id="L1073" class="LineNr">1073 </span>]
-<span id="L1074" class="LineNr">1074 </span><span class="Comment"># trigger specialization</span>
-<span id="L1075" class="LineNr">1075 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L1076" class="LineNr">1076 </span>  local-scope
-<span id="L1077" class="LineNr">1077 </span>  foo <span class="Constant">34</span>
-<span id="L1078" class="LineNr">1078 </span>]
-<span id="L1079" class="LineNr">1079 </span>$error: <span class="Constant">0</span>
-<span id="L1080" class="LineNr">1080 </span>
-<span id="L1081" class="LineNr">1081 </span><span class="Delimiter">:(scenario shape_shifting_recipe_coexists_with_primitive)</span>
-<span id="L1082" class="LineNr">1082 </span><span class="Comment"># recipe overloading a primitive with a generic type</span>
-<span id="L1083" class="LineNr">1083 </span><span class="muRecipe">def</span> add a:&amp;:foo:_elem [
-<span id="L1084" class="LineNr">1084 </span>  assert <span class="Constant">0</span><span class="Delimiter">,</span> [should <span class="Normal">not</span> get here]
-<span id="L1085" class="LineNr">1085 </span>]
-<span id="L1086" class="LineNr">1086 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L1087" class="LineNr">1087 </span>  <span class="Comment"># call primitive add with literal 0</span>
-<span id="L1088" class="LineNr">1088 </span>  add <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">0</span>
-<span id="L1089" class="LineNr">1089 </span>]
-<span id="L1090" class="LineNr">1090 </span>$error: <span class="Constant">0</span>
+<span id="L1074" class="LineNr">1074 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L1075" class="LineNr">1075 </span>  local-scope
+<span id="L1076" class="LineNr">1076 </span>  <span class="Normal">x</span>:foo2<span class="Special"> &lt;- </span>merge <span class="Constant">34</span>
+<span id="L1077" class="LineNr">1077 </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="L1078" class="LineNr">1078 </span><span class="PreProc">  </span><span class="Comment"># define a variable with the same name 'z'</span>
+<span id="L1079" class="LineNr">1079 </span>  <span class="Normal">z</span>:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L1080" class="LineNr">1080 </span>  <span class="Comment"># trigger specialization of the shape-shifting recipe</span>
+<span id="L1081" class="LineNr">1081 </span>  foo *z
+<span id="L1082" class="LineNr">1082 </span>]
+<span id="L1083" class="LineNr">1083 </span><span class="Comment"># shouldn't crash</span>
+<span id="L1084" class="LineNr">1084 </span>
+<span id="L1085" class="LineNr">1085 </span><span class="Delimiter">:(scenario tangle_shape_shifting_recipe)</span>
+<span id="L1086" class="LineNr">1086 </span><span class="Comment"># shape-shifting recipe</span>
+<span id="L1087" class="LineNr">1087 </span><span class="muRecipe">def</span> foo a:_elem [
+<span id="L1088" class="LineNr">1088 </span>  local-scope
+<span id="L1089" class="LineNr">1089 </span>  load-ingredients
+<span id="L1090" class="LineNr">1090 </span>  &lt;label1&gt;
+<span id="L1091" class="LineNr">1091 </span>]
+<span id="L1092" class="LineNr">1092 </span><span class="Comment"># tangle some code that refers to the type ingredient</span>
+<span id="L1093" class="LineNr">1093 </span><span class="muRecipe">after</span> &lt;label1&gt; [
+<span id="L1094" class="LineNr">1094 </span>  <span class="Normal">b</span>:_elem<span class="Special"> &lt;- </span>copy a
+<span id="L1095" class="LineNr">1095 </span>]
+<span id="L1096" class="LineNr">1096 </span><span class="Comment"># trigger specialization</span>
+<span id="L1097" class="LineNr">1097 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L1098" class="LineNr">1098 </span>  local-scope
+<span id="L1099" class="LineNr">1099 </span>  foo <span class="Constant">34</span>
+<span id="L1100" class="LineNr">1100 </span>]
+<span id="L1101" class="LineNr">1101 </span>$error: <span class="Constant">0</span>
+<span id="L1102" class="LineNr">1102 </span>
+<span id="L1103" class="LineNr">1103 </span><span class="Delimiter">:(scenario tangle_shape_shifting_recipe_with_type_abbreviation)</span>
+<span id="L1104" class="LineNr">1104 </span><span class="Comment"># shape-shifting recipe</span>
+<span id="L1105" class="LineNr">1105 </span><span class="muRecipe">def</span> foo a:_elem [
+<span id="L1106" class="LineNr">1106 </span>  local-scope
+<span id="L1107" class="LineNr">1107 </span>  load-ingredients
+<span id="L1108" class="LineNr">1108 </span>  &lt;label1&gt;
+<span id="L1109" class="LineNr">1109 </span>]
+<span id="L1110" class="LineNr">1110 </span><span class="Comment"># tangle some code that refers to the type ingredient</span>
+<span id="L1111" class="LineNr">1111 </span><span class="muRecipe">after</span> &lt;label1&gt; [
+<span id="L1112" class="LineNr">1112 </span>  <span class="Normal">b</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># type abbreviation</span>
+<span id="L1113" class="LineNr">1113 </span>]
+<span id="L1114" class="LineNr">1114 </span><span class="Comment"># trigger specialization</span>
+<span id="L1115" class="LineNr">1115 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L1116" class="LineNr">1116 </span>  local-scope
+<span id="L1117" class="LineNr">1117 </span>  foo <span class="Constant">34</span>
+<span id="L1118" class="LineNr">1118 </span>]
+<span id="L1119" class="LineNr">1119 </span>$error: <span class="Constant">0</span>
+<span id="L1120" class="LineNr">1120 </span>
+<span id="L1121" class="LineNr">1121 </span><span class="Delimiter">:(scenario shape_shifting_recipe_coexists_with_primitive)</span>
+<span id="L1122" class="LineNr">1122 </span><span class="Comment"># recipe overloading a primitive with a generic type</span>
+<span id="L1123" class="LineNr">1123 </span><span class="muRecipe">def</span> add a:&amp;:foo:_elem [
+<span id="L1124" class="LineNr">1124 </span>  assert <span class="Constant">0</span><span class="Delimiter">,</span> [should <span class="Normal">not</span> get here]
+<span id="L1125" class="LineNr">1125 </span>]
+<span id="L1126" class="LineNr">1126 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L1127" class="LineNr">1127 </span>  <span class="Comment"># call primitive add with literal 0</span>
+<span id="L1128" class="LineNr">1128 </span>  add <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">0</span>
+<span id="L1129" class="LineNr">1129 </span>]
+<span id="L1130" class="LineNr">1130 </span>$error: <span class="Constant">0</span>
+<span id="L1131" class="LineNr">1131 </span>
+<span id="L1132" class="LineNr">1132 </span><span class="Delimiter">:(scenario specialization_heuristic_test_1)</span>
+<span id="L1133" class="LineNr">1133 </span><span class="Comment"># modeled on the 'buffer' container in text.mu</span>
+<span id="L1134" class="LineNr">1134 </span><span class="muData">container</span> foo_buffer:_elem [
+<span id="L1135" class="LineNr">1135 </span>  <span class="Normal">x</span>:num
+<span id="L1136" class="LineNr">1136 </span>]
+<span id="L1137" class="LineNr">1137 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L1138" class="LineNr">1138 </span>  append <span class="Constant">1</span>:&amp;:foo_buffer:<span class="Normal">char</span>/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">2</span>:text/<span class="Special">raw</span>
+<span id="L1139" class="LineNr">1139 </span>]
+<span id="L1140" class="LineNr">1140 </span><span class="muRecipe">def</span> append buf:&amp;:foo_buffer:_elem<span class="Delimiter">,</span> x:_elem<span class="muRecipe"> -&gt; </span>buf:&amp;:foo_buffer:_elem [
+<span id="L1141" class="LineNr">1141 </span>  local-scope
+<span id="L1142" class="LineNr">1142 </span>  load-ingredients
+<span id="L1143" class="LineNr">1143 </span>  stash <span class="Constant">34</span>
+<span id="L1144" class="LineNr">1144 </span>]
+<span id="L1145" class="LineNr">1145 </span><span class="muRecipe">def</span> append buf:&amp;:foo_buffer:<span class="Normal">char</span><span class="Delimiter">,</span> x:_elem<span class="muRecipe"> -&gt; </span>buf:&amp;:foo_buffer:<span class="Normal">char</span> [
+<span id="L1146" class="LineNr">1146 </span>  local-scope
+<span id="L1147" class="LineNr">1147 </span>  load-ingredients
+<span id="L1148" class="LineNr">1148 </span>  stash <span class="Constant">35</span>
+<span id="L1149" class="LineNr">1149 </span>]
+<span id="L1150" class="LineNr">1150 </span><span class="muRecipe">def</span> append buf:&amp;:foo_buffer:_elem<span class="Delimiter">,</span> x:&amp;:@:_elem<span class="muRecipe"> -&gt; </span>buf:&amp;:foo_buffer:_elem [
+<span id="L1151" class="LineNr">1151 </span>  local-scope
+<span id="L1152" class="LineNr">1152 </span>  load-ingredients
+<span id="L1153" class="LineNr">1153 </span>  stash <span class="Constant">36</span>
+<span id="L1154" class="LineNr">1154 </span>]
+<span id="L1155" class="LineNr">1155 </span><span class="traceContains">+app: 36</span>
 </pre>
 </body>
 </html>
diff --git a/html/057immutable.cc.html b/html/057immutable.cc.html
index 50e9ad43..5058f120 100644
--- a/html/057immutable.cc.html
+++ b/html/057immutable.cc.html
@@ -298,7 +298,7 @@ if ('onhashchange' in window) {
 <span id="L234" class="LineNr">234 </span><span class="muRecipe">def</span> foo a:&amp;:@:&amp;:num [
 <span id="L235" class="LineNr">235 </span>  local-scope
 <span id="L236" class="LineNr">236 </span>  load-ingredients
-<span id="L237" class="LineNr">237 </span>  <span class="Normal">b</span>:&amp;:@:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>address number<span class="Delimiter">)</span>: type<span class="Delimiter">},</span> <span class="Constant">3</span>
+<span id="L237" class="LineNr">237 </span>  <span class="Normal">b</span>:&amp;:@:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span><a href='043space.cc.html#L83'>address</a> number<span class="Delimiter">)</span>: type<span class="Delimiter">},</span> <span class="Constant">3</span>
 <span id="L238" class="LineNr">238 </span>  <span class="Comment"># modify b, completely unrelated to immutable ingredient a</span>
 <span id="L239" class="LineNr">239 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span>index *b<span class="Delimiter">,</span> <span class="Constant">0</span>
 <span id="L240" class="LineNr">240 </span>  *x<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
@@ -380,16 +380,16 @@ if ('onhashchange' in window) {
 <span id="L316" class="LineNr">316 </span><span class="Comment">//: when checking for immutable ingredients, remember to take space into account</span>
 <span id="L317" class="LineNr">317 </span><span class="Delimiter">:(scenario check_space_of_reagents_in_immutability_checks)</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="Normal">a</span>:space<span class="Special"> &lt;- </span><span class="Normal">new</span>-closure
+<span id="L319" class="LineNr">319 </span>  <span class="Normal">a</span>:space/names:<span class="Normal">new</span>-closure<span class="Special"> &lt;- </span><span class="Normal">new</span>-closure
 <span id="L320" class="LineNr">320 </span>  <span class="Normal">b</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
 <span id="L321" class="LineNr">321 </span>  run-closure b:&amp;:num<span class="Delimiter">,</span> a:space
 <span id="L322" class="LineNr">322 </span>]
 <span id="L323" class="LineNr">323 </span><span class="muRecipe">def</span> <span class="Normal">new</span>-closure [
-<span id="L324" class="LineNr">324 </span>  <span class="Normal">new</span>-<span class="Normal">default</span>-space
+<span id="L324" class="LineNr">324 </span>  local-scope
 <span id="L325" class="LineNr">325 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L326" class="LineNr">326 </span>  <span class="Identifier">return</span> <span class="Normal">default</span>-space
+<span id="L326" class="LineNr">326 </span>  <span class="Identifier">return</span> <span class="Normal">default</span>-space/names:<span class="Normal">new</span>-closure
 <span id="L327" class="LineNr">327 </span>]
-<span id="L328" class="LineNr">328 </span><span class="muRecipe">def</span> run-closure x:&amp;:num<span class="Delimiter">,</span> s:space [
+<span id="L328" class="LineNr">328 </span><span class="muRecipe">def</span> run-closure x:&amp;:num<span class="Delimiter">,</span> s:space/names:<span class="Normal">new</span>-closure [
 <span id="L329" class="LineNr">329 </span>  local-scope
 <span id="L330" class="LineNr">330 </span>  load-ingredients
 <span id="L331" class="LineNr">331 </span>  <span class="Constant">0</span>:space/names:<span class="Normal">new</span>-closure<span class="Special"> &lt;- </span>copy s
diff --git a/html/058to_text.cc.html b/html/058to_text.cc.html
index 9da04ba3..ab99a6e9 100644
--- a/html/058to_text.cc.html
+++ b/html/058to_text.cc.html
@@ -78,7 +78,7 @@ if ('onhashchange' in window) {
 <span id="L18" class="LineNr">18 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L19" class="LineNr">19 </span><span class="Normal">case</span> TO_TEXT: <span class="Delimiter">{</span>
 <span id="L20" class="LineNr">20 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L21" class="LineNr">21 </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><a href='038new_text.cc.html#L38'>new_mu_text</a><span class="Delimiter">(</span>inspect<span class="Delimiter">(</span><a href='026call.cc.html#L85'>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> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))));</span>
+<span id="L21" class="LineNr">21 </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><a href='038new_text.cc.html#L38'>new_mu_text</a><span class="Delimiter">(</span>inspect<span class="Delimiter">(</span><a href='026call.cc.html#L87'>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> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))));</span>
 <span id="L22" class="LineNr">22 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L23" class="LineNr">23 </span><span class="Delimiter">}</span>
 </pre>
diff --git a/html/060rewrite_literal_string.cc.html b/html/060rewrite_literal_string.cc.html
index d1ad3567..a60ef3a0 100644
--- a/html/060rewrite_literal_string.cc.html
+++ b/html/060rewrite_literal_string.cc.html
@@ -127,10 +127,10 @@ if ('onhashchange' in window) {
 <span id="L65" class="LineNr">65 </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="L66" class="LineNr">66 </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="L67" class="LineNr">67 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> in = <span class="Constant">0</span><span class="Delimiter">;</span>  in &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++in<span class="Delimiter">)</span>
-<span id="L68" class="LineNr">68 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='042name.cc.html#L141'>is_numeric_location</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>in<span class="Delimiter">)))</span>
+<span id="L68" class="LineNr">68 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='042name.cc.html#L148'>is_numeric_location</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>in<span class="Delimiter">)))</span>
 <span id="L69" class="LineNr">69 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L70" class="LineNr">70 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> out = <span class="Constant">0</span><span class="Delimiter">;</span>  out &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++out<span class="Delimiter">)</span>
-<span id="L71" class="LineNr">71 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='042name.cc.html#L141'>is_numeric_location</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>out<span class="Delimiter">)))</span>
+<span id="L71" class="LineNr">71 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='042name.cc.html#L148'>is_numeric_location</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>out<span class="Delimiter">)))</span>
 <span id="L72" class="LineNr">72 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L73" class="LineNr">73 </span>  <span class="Delimiter">}</span>
 <span id="L74" class="LineNr">74 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
diff --git a/html/061text.mu.html b/html/061text.mu.html
index a38b5cd1..9dab6f90 100644
--- a/html/061text.mu.html
+++ b/html/061text.mu.html
@@ -282,7 +282,7 @@ if ('onhashchange' in window) {
 <span id="L220" class="LineNr"> 220 </span>  *buf <span class="Special">&lt;-</span> put *buf, <span class="Constant">length:offset</span>, len
 <span id="L221" class="LineNr"> 221 </span>]
 <span id="L222" class="LineNr"> 222 </span>
-<span id="L223" class="LineNr"> 223 </span><span class="muRecipe">def</span> append buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char, t:text<span class="muRecipe"> -&gt; </span>buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char [
+<span id="L223" class="LineNr"> 223 </span><span class="muRecipe">def</span> append buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:_elem, t:&amp;:@:_elem<span class="muRecipe"> -&gt; </span>buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:_elem [
 <span id="L224" class="LineNr"> 224 </span>  <span class="Constant">local-scope</span>
 <span id="L225" class="LineNr"> 225 </span>  <span class="Constant">load-ingredients</span>
 <span id="L226" class="LineNr"> 226 </span>  len:num <span class="Special">&lt;-</span> length *t
@@ -290,8 +290,8 @@ if ('onhashchange' in window) {
 <span id="L228" class="LineNr"> 228 </span>  <span class="Delimiter">{</span>
 <span id="L229" class="LineNr"> 229 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-or-equal i, len
 <span id="L230" class="LineNr"> 230 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
-<span id="L231" class="LineNr"> 231 </span>  <span class="Conceal">¦</span> c:char <span class="Special">&lt;-</span> index *t, i
-<span id="L232" class="LineNr"> 232 </span>  <span class="Conceal">¦</span> buf <span class="Special">&lt;-</span> append buf, c
+<span id="L231" class="LineNr"> 231 </span>  <span class="Conceal">¦</span> x:_elem <span class="Special">&lt;-</span> index *t, i
+<span id="L232" class="LineNr"> 232 </span>  <span class="Conceal">¦</span> buf <span class="Special">&lt;-</span> append buf, x
 <span id="L233" class="LineNr"> 233 </span>  <span class="Conceal">¦</span> i <span class="Special">&lt;-</span> add i,<span class="Constant"> 1</span>
 <span id="L234" class="LineNr"> 234 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
 <span id="L235" class="LineNr"> 235 </span>  <span class="Delimiter">}</span>
diff --git a/html/062convert_ingredients_to_text.cc.html b/html/062convert_ingredients_to_text.cc.html
index f207cbe1..091d01fa 100644
--- a/html/062convert_ingredients_to_text.cc.html
+++ b/html/062convert_ingredients_to_text.cc.html
@@ -137,7 +137,7 @@ if ('onhashchange' in window) {
 <span id="L74" class="LineNr"> 74 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L75" class="LineNr"> 75 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='014literal_string.cc.html#L126'>is_literal_text</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L76" class="LineNr"> 76 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ostringstream ingredient_name<span class="Delimiter">;</span>
-<span id="L77" class="LineNr"> 77 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ingredient_name &lt;&lt; <span class="Constant">&quot;stash_&quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">'_'</span> &lt;&lt; j &lt;&lt; <span class="Constant">&quot;:address:array:character&quot;</span><span class="Delimiter">;</span>
+<span id="L77" class="LineNr"> 77 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ingredient_name &lt;&lt; <span class="Constant">&quot;stash_&quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">'_'</span> &lt;&lt; j &lt;&lt; <span class="Constant">&quot;:<a href='043space.cc.html#L83'>address</a>:array:character&quot;</span><span class="Delimiter">;</span>
 <span id="L78" class="LineNr"> 78 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> convert_ingredient_to_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">),</span> new_instructions<span class="Delimiter">,</span> ingredient_name<span class="Delimiter">.</span>str<span class="Delimiter">());</span>
 <span id="L79" class="LineNr"> 79 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L80" class="LineNr"> 80 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
@@ -145,7 +145,7 @@ if ('onhashchange' in window) {
 <span id="L82" class="LineNr"> 82 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Comment">/*</span><span class="Comment">skip</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L83" class="LineNr"> 83 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='014literal_string.cc.html#L126'>is_literal_text</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L84" class="LineNr"> 84 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ostringstream ingredient_name<span class="Delimiter">;</span>
-<span id="L85" class="LineNr"> 85 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ingredient_name &lt;&lt; <span class="Constant">&quot;trace_&quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">'_'</span> &lt;&lt; j &lt;&lt; <span class="Constant">&quot;:address:array:character&quot;</span><span class="Delimiter">;</span>
+<span id="L85" class="LineNr"> 85 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ingredient_name &lt;&lt; <span class="Constant">&quot;trace_&quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">'_'</span> &lt;&lt; j &lt;&lt; <span class="Constant">&quot;:<a href='043space.cc.html#L83'>address</a>:array:character&quot;</span><span class="Delimiter">;</span>
 <span id="L86" class="LineNr"> 86 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> convert_ingredient_to_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">),</span> new_instructions<span class="Delimiter">,</span> ingredient_name<span class="Delimiter">.</span>str<span class="Delimiter">());</span>
 <span id="L87" class="LineNr"> 87 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L88" class="LineNr"> 88 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
@@ -158,12 +158,12 @@ if ('onhashchange' in window) {
 <span id="L95" class="LineNr"> 95 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='014literal_string.cc.html#L126'>is_literal_text</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> || <a href='027call_ingredient.cc.html#L174'>is_mu_text</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="L96" class="LineNr"> 96 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Comment">/*</span><span class="Comment">skip base</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L97" class="LineNr"> 97 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ostringstream ingredient_name<span class="Delimiter">;</span>
-<span id="L98" class="LineNr"> 98 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ingredient_name &lt;&lt; <span class="Constant">&quot;append_&quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">'_'</span> &lt;&lt; j &lt;&lt; <span class="Constant">&quot;:address:array:character&quot;</span><span class="Delimiter">;</span>
+<span id="L98" class="LineNr"> 98 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ingredient_name &lt;&lt; <span class="Constant">&quot;append_&quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">'_'</span> &lt;&lt; j &lt;&lt; <span class="Constant">&quot;:<a href='043space.cc.html#L83'>address</a>:array:character&quot;</span><span class="Delimiter">;</span>
 <span id="L99" class="LineNr"> 99 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> convert_ingredient_to_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">),</span> new_instructions<span class="Delimiter">,</span> ingredient_name<span class="Delimiter">.</span>str<span class="Delimiter">());</span>
 <span id="L100" class="LineNr">100 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L101" class="LineNr">101 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L102" class="LineNr">102 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L103" class="LineNr">103 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L104" class="LineNr">104 </span>  <span class="Conceal">¦</span> new_instructions<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
 <span id="L105" class="LineNr">105 </span>  <span class="Delimiter">}</span>
 <span id="L106" class="LineNr">106 </span>  caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_instructions<span class="Delimiter">);</span>
@@ -188,7 +188,7 @@ if ('onhashchange' in window) {
 <span id="L125" class="LineNr">125 </span>  <span class="Conceal">¦</span> def<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>r<span class="Delimiter">);</span>
 <span id="L126" class="LineNr">126 </span>  <span class="Delimiter">}</span>
 <span id="L127" class="LineNr">127 </span>  def<span class="Delimiter">.</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span>tmp_var<span class="Delimiter">));</span>
-<span id="L128" class="LineNr">128 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>def<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L128" class="LineNr">128 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>def<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L129" class="LineNr">129 </span>  out<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>def<span class="Delimiter">);</span>
 <span id="L130" class="LineNr">130 </span>  r<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>  <span class="Comment">// reclaim old memory</span>
 <span id="L131" class="LineNr">131 </span>  r = reagent<span class="Delimiter">(</span>tmp_var<span class="Delimiter">);</span>
@@ -206,32 +206,41 @@ if ('onhashchange' in window) {
 <span id="L143" class="LineNr">143 </span>  <span class="Identifier">return</span> !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>left<span class="Delimiter">-&gt;</span>atom &amp;&amp; x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;array&quot;</span><span class="Delimiter">;</span>
 <span id="L144" class="LineNr">144 </span><span class="Delimiter">}</span>
 <span id="L145" class="LineNr">145 </span>
-<span id="L146" class="LineNr">146 </span><span class="Delimiter">:(scenarios run)</span>
-<span id="L147" class="LineNr">147 </span><span class="Delimiter">:(scenario append_other_types_to_text)</span>
-<span id="L148" class="LineNr">148 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L149" class="LineNr">149 </span>  local-scope
-<span id="L150" class="LineNr">150 </span>  <span class="Normal">n</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">11</span>
-<span id="L151" class="LineNr">151 </span>  <span class="Normal">c</span>:character<span class="Special"> &lt;- </span>copy <span class="Constant">111</span>/o
-<span id="L152" class="LineNr">152 </span>  <span class="Normal">a</span>:text<span class="Special"> &lt;- </span>append [abc]<span class="Delimiter">,</span> <span class="Constant">10</span><span class="Delimiter">,</span> n<span class="Delimiter">,</span> c
-<span id="L153" class="LineNr">153 </span>  <span class="Normal">expected</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [abc1011o]
-<span id="L154" class="LineNr">154 </span>  <span class="Constant">10</span>:<span class="Normal">bool</span>/<span class="Special">raw &lt;- </span>equal a<span class="Delimiter">,</span> expected
-<span id="L155" class="LineNr">155 </span>]
-<span id="L156" class="LineNr">156 </span>
-<span id="L157" class="LineNr">157 </span><span class="Comment">//: Make sure that the new system is strictly better than just the 'stash'</span>
-<span id="L158" class="LineNr">158 </span><span class="Comment">//: primitive by itself.</span>
-<span id="L159" class="LineNr">159 </span>
-<span id="L160" class="LineNr">160 </span><span class="Delimiter">:(scenario rewrite_stash_continues_to_fall_back_to_default_implementation)</span>
-<span id="L161" class="LineNr">161 </span><span class="Comment"># type without a to-text implementation</span>
-<span id="L162" class="LineNr">162 </span><span class="muData">container</span> foo [
-<span id="L163" class="LineNr">163 </span>  <span class="Normal">x</span>:num
-<span id="L164" class="LineNr">164 </span>  <span class="Normal">y</span>:num
-<span id="L165" class="LineNr">165 </span>]
-<span id="L166" class="LineNr">166 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L167" class="LineNr">167 </span>  local-scope
-<span id="L168" class="LineNr">168 </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="L169" class="LineNr">169 </span>  stash x
-<span id="L170" class="LineNr">170 </span>]
-<span id="L171" class="LineNr">171 </span><span class="traceContains">+app: 34 35</span>
+<span id="L146" class="LineNr">146 </span><span class="Comment">//: Supporting 'append' above requires remembering what name an instruction</span>
+<span id="L147" class="LineNr">147 </span><span class="Comment">//: had before any rewrites or transforms.</span>
+<span id="L148" class="LineNr">148 </span><span class="Delimiter">:(before &quot;End <a href='010vm.cc.html#L32'>instruction</a> Fields&quot;)</span>
+<span id="L149" class="LineNr">149 </span>string name_before_rewrite<span class="Delimiter">;</span>
+<span id="L150" class="LineNr">150 </span><span class="Delimiter">:(before &quot;End <a href='010vm.cc.html#L32'>instruction</a> Clear&quot;)</span>
+<span id="L151" class="LineNr">151 </span>name_before_rewrite<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L152" class="LineNr">152 </span><span class="Delimiter">:(before &quot;End next_instruction(curr)&quot;)</span>
+<span id="L153" class="LineNr">153 </span>curr<span class="Delimiter">-&gt;</span>name_before_rewrite = curr<span class="Delimiter">-&gt;</span>name<span class="Delimiter">;</span>
+<span id="L154" class="LineNr">154 </span>
+<span id="L155" class="LineNr">155 </span><span class="Delimiter">:(scenarios run)</span>
+<span id="L156" class="LineNr">156 </span><span class="Delimiter">:(scenario append_other_types_to_text)</span>
+<span id="L157" class="LineNr">157 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L158" class="LineNr">158 </span>  local-scope
+<span id="L159" class="LineNr">159 </span>  <span class="Normal">n</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">11</span>
+<span id="L160" class="LineNr">160 </span>  <span class="Normal">c</span>:character<span class="Special"> &lt;- </span>copy <span class="Constant">111</span>/o
+<span id="L161" class="LineNr">161 </span>  <span class="Normal">a</span>:text<span class="Special"> &lt;- </span>append [abc]<span class="Delimiter">,</span> <span class="Constant">10</span><span class="Delimiter">,</span> n<span class="Delimiter">,</span> c
+<span id="L162" class="LineNr">162 </span>  <span class="Normal">expected</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [abc1011o]
+<span id="L163" class="LineNr">163 </span>  <span class="Constant">10</span>:<span class="Normal">bool</span>/<span class="Special">raw &lt;- </span>equal a<span class="Delimiter">,</span> expected
+<span id="L164" class="LineNr">164 </span>]
+<span id="L165" class="LineNr">165 </span>
+<span id="L166" class="LineNr">166 </span><span class="Comment">//: Make sure that the new system is strictly better than just the 'stash'</span>
+<span id="L167" class="LineNr">167 </span><span class="Comment">//: primitive by itself.</span>
+<span id="L168" class="LineNr">168 </span>
+<span id="L169" class="LineNr">169 </span><span class="Delimiter">:(scenario rewrite_stash_continues_to_fall_back_to_default_implementation)</span>
+<span id="L170" class="LineNr">170 </span><span class="Comment"># type without a to-text implementation</span>
+<span id="L171" class="LineNr">171 </span><span class="muData">container</span> foo [
+<span id="L172" class="LineNr">172 </span>  <span class="Normal">x</span>:num
+<span id="L173" class="LineNr">173 </span>  <span class="Normal">y</span>:num
+<span id="L174" class="LineNr">174 </span>]
+<span id="L175" class="LineNr">175 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L176" class="LineNr">176 </span>  local-scope
+<span id="L177" class="LineNr">177 </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="L178" class="LineNr">178 </span>  stash x
+<span id="L179" class="LineNr">179 </span>]
+<span id="L180" class="LineNr">180 </span><span class="traceContains">+app: 34 35</span>
 </pre>
 </body>
 </html>
diff --git a/html/069hash.cc.html b/html/069hash.cc.html
index 3f60a052..9521a756 100644
--- a/html/069hash.cc.html
+++ b/html/069hash.cc.html
@@ -87,7 +87,7 @@ if ('onhashchange' in window) {
 <span id="L22" class="LineNr"> 22 </span><span class="Delimiter">}</span>
 <span id="L23" class="LineNr"> 23 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L24" class="LineNr"> 24 </span><span class="Normal">case</span> HASH: <span class="Delimiter">{</span>
-<span id="L25" class="LineNr"> 25 </span>  <span class="Normal">const</span> reagent&amp; input = <a href='026call.cc.html#L85'>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 id="L25" class="LineNr"> 25 </span>  <span class="Normal">const</span> reagent&amp; input = <a href='026call.cc.html#L87'>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 id="L26" class="LineNr"> 26 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L27" class="LineNr"> 27 </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><a href='069hash.cc.html#L34'>hash</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> input<span class="Delimiter">));</span>
 <span id="L28" class="LineNr"> 28 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -144,9 +144,9 @@ if ('onhashchange' in window) {
 <span id="L79" class="LineNr"> 79 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> elem = r<span class="Delimiter">;</span>
 <span id="L80" class="LineNr"> 80 </span>  <span class="Normal">delete</span> elem<span class="Delimiter">.</span>type<span class="Delimiter">;</span>
 <span id="L81" class="LineNr"> 81 </span>  elem<span class="Delimiter">.</span>type = <a href='032array.cc.html#L377'>copy_array_element</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L82" class="LineNr"> 82 </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> address = r<span class="Delimiter">.</span>value+<span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; size<span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> address += size_of<span class="Delimiter">(</span>elem<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L82" class="LineNr"> 82 </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> <a href='043space.cc.html#L83'>address</a> = r<span class="Delimiter">.</span>value+<span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; size<span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> <a href='043space.cc.html#L83'>address</a> += size_of<span class="Delimiter">(</span>elem<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L83" class="LineNr"> 83 </span>  <span class="Conceal">¦</span> reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> tmp = elem<span class="Delimiter">;</span>
-<span id="L84" class="LineNr"> 84 </span>  <span class="Conceal">¦</span> tmp<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>address<span class="Delimiter">);</span>
+<span id="L84" class="LineNr"> 84 </span>  <span class="Conceal">¦</span> tmp<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">);</span>
 <span id="L85" class="LineNr"> 85 </span>  <span class="Conceal">¦</span> h = <a href='069hash.cc.html#L34'>hash</a><span class="Delimiter">(</span>h<span class="Delimiter">,</span> tmp<span class="Delimiter">);</span>
 <span id="L86" class="LineNr"> 86 </span><span class="CommentedCode">//?     cerr &lt;&lt; i &lt;&lt; &quot; (&quot; &lt;&lt; address &lt;&lt; &quot;): &quot; &lt;&lt; h &lt;&lt; '\n';</span>
 <span id="L87" class="LineNr"> 87 </span>  <span class="Delimiter">}</span>
@@ -155,7 +155,7 @@ if ('onhashchange' in window) {
 <span id="L90" class="LineNr"> 90 </span>
 <span id="L91" class="LineNr"> 91 </span><span class="Normal">size_t</span> <a href='069hash.cc.html#L91'>hash_mu_container</a><span class="Delimiter">(</span><span class="Normal">size_t</span> h<span class="Delimiter">,</span> <span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L92" class="LineNr"> 92 </span>  type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> get_base_type<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">)-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L93" class="LineNr"> 93 </span>  <span class="Normal">int</span> address = r<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="Normal">int</span> <a href='043space.cc.html#L83'>address</a> = r<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
 <span id="L94" class="LineNr"> 94 </span>  <span class="Normal">int</span> offset = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L95" class="LineNr"> 95 </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>info<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L96" class="LineNr"> 96 </span>  <span class="Conceal">¦</span> reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> element = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">,</span> i<span class="Delimiter">);</span>
diff --git a/html/071deep_copy.cc.html b/html/071deep_copy.cc.html
index 3ec46cb0..90700e7f 100644
--- a/html/071deep_copy.cc.html
+++ b/html/071deep_copy.cc.html
@@ -284,7 +284,7 @@ if ('onhashchange' in window) {
 <span id="L220" class="LineNr">220 </span><span class="Delimiter">}</span>
 <span id="L221" class="LineNr">221 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L222" class="LineNr">222 </span><span class="Normal">case</span> DEEP_COPY: <span class="Delimiter">{</span>
-<span id="L223" class="LineNr">223 </span>  products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>deep_copy<span class="Delimiter">(</span><a href='026call.cc.html#L85'>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 id="L223" class="LineNr">223 </span>  products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>deep_copy<span class="Delimiter">(</span><a href='026call.cc.html#L87'>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 id="L224" class="LineNr">224 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L225" class="LineNr">225 </span><span class="Delimiter">}</span>
 <span id="L226" class="LineNr">226 </span>
@@ -292,13 +292,13 @@ if ('onhashchange' in window) {
 <span id="L228" class="LineNr">228 </span>vector&lt;<span class="Normal">double</span>&gt; deep_copy<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L229" class="LineNr">229 </span>  <span class="Comment">// allocate a tiny bit of temporary space for deep_copy()</span>
 <span id="L230" class="LineNr">230 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: allocating space for temporary&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L231" class="LineNr">231 </span>  reagent tmp<span class="Delimiter">(</span><span class="Constant">&quot;tmp:address:number&quot;</span><span class="Delimiter">);</span>
+<span id="L231" class="LineNr">231 </span>  reagent tmp<span class="Delimiter">(</span><span class="Constant">&quot;tmp:<a href='043space.cc.html#L83'>address</a>:number&quot;</span><span class="Delimiter">);</span>
 <span id="L232" class="LineNr">232 </span>  tmp<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>allocate<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
 <span id="L233" class="LineNr">233 </span>  map&lt;<span class="Normal">int</span><span class="Delimiter">,</span> <span class="Normal">int</span>&gt; addresses_copied<span class="Delimiter">;</span>
 <span id="L234" class="LineNr">234 </span>  vector&lt;<span class="Normal">double</span>&gt; result = deep_copy<span class="Delimiter">(</span>in<span class="Delimiter">,</span> addresses_copied<span class="Delimiter">,</span> tmp<span class="Delimiter">);</span>
 <span id="L235" class="LineNr">235 </span>  <span class="Comment">// reclaim Mu memory allocated for tmp</span>
 <span id="L236" class="LineNr">236 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: reclaiming temporary&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L237" class="LineNr">237 </span>  <a href='037abandon.cc.html#L28'>abandon</a><span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>value<span class="Delimiter">,</span> <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>type<span class="Delimiter">),</span> <a href='036refcount.cc.html#L92'>payload_size</a><span class="Delimiter">(</span>tmp<span class="Delimiter">));</span>
+<span id="L237" class="LineNr">237 </span>  <a href='037abandon.cc.html#L28'>abandon</a><span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>value<span class="Delimiter">,</span> <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>type<span class="Delimiter">),</span> <a href='036refcount.cc.html#L89'>payload_size</a><span class="Delimiter">(</span>tmp<span class="Delimiter">));</span>
 <span id="L238" class="LineNr">238 </span>  <span class="Comment">// reclaim host memory allocated for tmp.type when tmp goes out of scope</span>
 <span id="L239" class="LineNr">239 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L240" class="LineNr">240 </span><span class="Delimiter">}</span>
@@ -321,221 +321,226 @@ if ('onhashchange' in window) {
 <span id="L257" class="LineNr">257 </span>
 <span id="L258" class="LineNr">258 </span><span class="Comment">// deep-copy an address and return a new address</span>
 <span id="L259" class="LineNr">259 </span><span class="Normal">int</span> <a href='071deep_copy.cc.html#L259'>deep_copy_address</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; canonized_in<span class="Delimiter">,</span> map&lt;<span class="Normal">int</span><span class="Delimiter">,</span> <span class="Normal">int</span>&gt;&amp; addresses_copied<span class="Delimiter">,</span> <span class="Normal">const</span> reagent&amp; tmp<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L260" class="LineNr">260 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='071deep_copy.cc.html#L325'>address_value</a><span class="Delimiter">(</span>canonized_in<span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L261" class="LineNr">261 </span>  <span class="Normal">int</span> in_address = <a href='071deep_copy.cc.html#L319'>payload_address</a><span class="Delimiter">(</span>canonized_in<span class="Delimiter">);</span>
-<span id="L262" class="LineNr">262 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: copying address &quot;</span> &lt;&lt; in_address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L260" class="LineNr">260 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='071deep_copy.cc.html#L327'>address_value</a><span class="Delimiter">(</span>canonized_in<span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L261" class="LineNr">261 </span>  <span class="Normal">int</span> in_address = <a href='071deep_copy.cc.html#L321'>payload_address</a><span class="Delimiter">(</span>canonized_in<span class="Delimiter">);</span>
+<span id="L262" class="LineNr">262 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: copying <a href='043space.cc.html#L83'>address</a> &quot;</span> &lt;&lt; in_address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L263" class="LineNr">263 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>addresses_copied<span class="Delimiter">,</span> in_address<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L264" class="LineNr">264 </span>  <span class="Conceal">¦</span> <span class="Normal">int</span> out = get<span class="Delimiter">(</span>addresses_copied<span class="Delimiter">,</span> in_address<span class="Delimiter">);</span>
 <span id="L265" class="LineNr">265 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: copy already exists: &quot;</span> &lt;&lt; out &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L266" class="LineNr">266 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> out<span class="Delimiter">;</span>
-<span id="L267" class="LineNr">267 </span>  <span class="Delimiter">}</span>
-<span id="L268" class="LineNr">268 </span>  <span class="Normal">int</span> out = allocate<span class="Delimiter">(</span><a href='036refcount.cc.html#L92'>payload_size</a><span class="Delimiter">(</span>canonized_in<span class="Delimiter">));</span>
-<span id="L269" class="LineNr">269 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: new address is &quot;</span> &lt;&lt; out &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L270" class="LineNr">270 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>addresses_copied<span class="Delimiter">,</span> in_address<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L271" class="LineNr">271 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> payload = canonized_in<span class="Delimiter">;</span>
-<span id="L272" class="LineNr">272 </span>  payload<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
-<span id="L273" class="LineNr">273 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;recursing on payload &quot;</span> &lt;&lt; payload<span class="Delimiter">.</span>value &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>payload<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L274" class="LineNr">274 </span>  vector&lt;<span class="Normal">double</span>&gt; data = deep_copy<span class="Delimiter">(</span>payload<span class="Delimiter">,</span> addresses_copied<span class="Delimiter">,</span> tmp<span class="Delimiter">);</span>
-<span id="L275" class="LineNr">275 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: writing result &quot;</span> &lt;&lt; out &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>data<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L276" class="LineNr">276 </span>  <span class="Comment">// HACK: write_memory interface isn't ideal for this situation; we need</span>
-<span id="L277" class="LineNr">277 </span>  <span class="Comment">// a temporary location to help copy the payload.</span>
-<span id="L278" class="LineNr">278 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: writing temporary &quot;</span> &lt;&lt; tmp<span class="Delimiter">.</span>value &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; out &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L279" class="LineNr">279 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> tmp<span class="Delimiter">.</span>value<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L280" class="LineNr">280 </span>  payload<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>value<span class="Delimiter">);</span>  <span class="Comment">// now modified for output</span>
-<span id="L281" class="LineNr">281 </span>  vector&lt;<span class="Normal">double</span>&gt; old_data = read_memory<span class="Delimiter">(</span>payload<span class="Delimiter">);</span>
-<span id="L282" class="LineNr">282 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: really writing to &quot;</span> &lt;&lt; payload<span class="Delimiter">.</span>value &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>payload<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; (old value &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>old_data<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; new value &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>data<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L283" class="LineNr">283 </span>  write_memory<span class="Delimiter">(</span>payload<span class="Delimiter">,</span> data<span class="Delimiter">);</span>
-<span id="L284" class="LineNr">284 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: output is &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>data<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L285" class="LineNr">285 </span>  <span class="Identifier">return</span> out<span class="Delimiter">;</span>
-<span id="L286" class="LineNr">286 </span><span class="Delimiter">}</span>
-<span id="L287" class="LineNr">287 </span>
-<span id="L288" class="LineNr">288 </span><span class="Comment">// deep-copy a non-address and return a vector of locations</span>
-<span id="L289" class="LineNr">289 </span><span class="Normal">void</span> deep_copy<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; canonized_in<span class="Delimiter">,</span> map&lt;<span class="Normal">int</span><span class="Delimiter">,</span> <span class="Normal">int</span>&gt;&amp; addresses_copied<span class="Delimiter">,</span> <span class="Normal">const</span> reagent&amp; tmp<span class="Delimiter">,</span> vector&lt;<span class="Normal">double</span>&gt;&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L290" class="LineNr">290 </span>  assert<span class="Delimiter">(</span>!is_mu_address<span class="Delimiter">(</span>canonized_in<span class="Delimiter">));</span>
-<span id="L291" class="LineNr">291 </span>  vector&lt;<span class="Normal">double</span>&gt; data = read_memory<span class="Delimiter">(</span>canonized_in<span class="Delimiter">);</span>
-<span id="L292" class="LineNr">292 </span>  out<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">(),</span> data<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> data<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">());</span>
-<span id="L293" class="LineNr">293 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> canonized_in<span class="Delimiter">.</span>type<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L294" class="LineNr">294 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: scanning for addresses in &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>data<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L295" class="LineNr">295 </span>  <span class="Normal">const</span> container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> canonized_in<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L296" class="LineNr">296 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt;::const_iterator p = metadata<span class="Delimiter">.</span>address<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != metadata<span class="Delimiter">.</span>address<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L297" class="LineNr">297 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!all_match<span class="Delimiter">(</span>data<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L298" class="LineNr">298 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;address_element_info&gt;::const_iterator info = p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  info != p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++info<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L299" class="LineNr">299 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// hack: skip primitive containers that do their own locking; they're designed to be shared between routines</span>
-<span id="L300" class="LineNr">300 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom &amp;&amp; info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;channel&quot;</span><span class="Delimiter">)</span>
-<span id="L301" class="LineNr">301 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L302" class="LineNr">302 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;screen&quot;</span> || info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;console&quot;</span> || info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;resources&quot;</span><span class="Delimiter">)</span>
+<span id="L266" class="LineNr">266 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> out<span class="Delimiter">));</span>  <span class="Comment">// refcount must already be incremented</span>
+<span id="L267" class="LineNr">267 </span>  <span class="Conceal">¦</span> ++get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
+<span id="L268" class="LineNr">268 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> out<span class="Delimiter">;</span>
+<span id="L269" class="LineNr">269 </span>  <span class="Delimiter">}</span>
+<span id="L270" class="LineNr">270 </span>  <span class="Normal">int</span> out = allocate<span class="Delimiter">(</span><a href='036refcount.cc.html#L89'>payload_size</a><span class="Delimiter">(</span>canonized_in<span class="Delimiter">));</span>
+<span id="L271" class="LineNr">271 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: new <a href='043space.cc.html#L83'>address</a> is &quot;</span> &lt;&lt; out &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L272" class="LineNr">272 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>addresses_copied<span class="Delimiter">,</span> in_address<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
+<span id="L273" class="LineNr">273 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> payload = canonized_in<span class="Delimiter">;</span>
+<span id="L274" class="LineNr">274 </span>  payload<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
+<span id="L275" class="LineNr">275 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;recursing on payload &quot;</span> &lt;&lt; payload<span class="Delimiter">.</span>value &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>payload<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L276" class="LineNr">276 </span>  vector&lt;<span class="Normal">double</span>&gt; data = deep_copy<span class="Delimiter">(</span>payload<span class="Delimiter">,</span> addresses_copied<span class="Delimiter">,</span> tmp<span class="Delimiter">);</span>
+<span id="L277" class="LineNr">277 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: writing result &quot;</span> &lt;&lt; out &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>data<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L278" class="LineNr">278 </span>  <span class="Comment">// HACK: write_memory interface isn't ideal for this situation; we need</span>
+<span id="L279" class="LineNr">279 </span>  <span class="Comment">// a temporary location to help copy the payload.</span>
+<span id="L280" class="LineNr">280 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: writing temporary &quot;</span> &lt;&lt; tmp<span class="Delimiter">.</span>value &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; out &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L281" class="LineNr">281 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> tmp<span class="Delimiter">.</span>value<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
+<span id="L282" class="LineNr">282 </span>  payload<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>value<span class="Delimiter">);</span>  <span class="Comment">// now modified for output</span>
+<span id="L283" class="LineNr">283 </span>  vector&lt;<span class="Normal">double</span>&gt; old_data = read_memory<span class="Delimiter">(</span>payload<span class="Delimiter">);</span>
+<span id="L284" class="LineNr">284 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: really writing to &quot;</span> &lt;&lt; payload<span class="Delimiter">.</span>value &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>payload<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; (old value &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>old_data<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; new value &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>data<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L285" class="LineNr">285 </span>  write_memory<span class="Delimiter">(</span>payload<span class="Delimiter">,</span> data<span class="Delimiter">);</span>
+<span id="L286" class="LineNr">286 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: output is &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>data<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L287" class="LineNr">287 </span>  <span class="Identifier">return</span> out<span class="Delimiter">;</span>
+<span id="L288" class="LineNr">288 </span><span class="Delimiter">}</span>
+<span id="L289" class="LineNr">289 </span>
+<span id="L290" class="LineNr">290 </span><span class="Comment">// deep-copy a non-address and return a vector of locations</span>
+<span id="L291" class="LineNr">291 </span><span class="Normal">void</span> deep_copy<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; canonized_in<span class="Delimiter">,</span> map&lt;<span class="Normal">int</span><span class="Delimiter">,</span> <span class="Normal">int</span>&gt;&amp; addresses_copied<span class="Delimiter">,</span> <span class="Normal">const</span> reagent&amp; tmp<span class="Delimiter">,</span> vector&lt;<span class="Normal">double</span>&gt;&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L292" class="LineNr">292 </span>  assert<span class="Delimiter">(</span>!is_mu_address<span class="Delimiter">(</span>canonized_in<span class="Delimiter">));</span>
+<span id="L293" class="LineNr">293 </span>  vector&lt;<span class="Normal">double</span>&gt; data = read_memory<span class="Delimiter">(</span>canonized_in<span class="Delimiter">);</span>
+<span id="L294" class="LineNr">294 </span>  out<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">(),</span> data<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> data<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">());</span>
+<span id="L295" class="LineNr">295 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> canonized_in<span class="Delimiter">.</span>type<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L296" class="LineNr">296 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: scanning for addresses in &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>data<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L297" class="LineNr">297 </span>  <span class="Normal">const</span> container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> canonized_in<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L298" class="LineNr">298 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt;::const_iterator p = metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != metadata<span class="Delimiter">.</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L299" class="LineNr">299 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!all_match<span class="Delimiter">(</span>data<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L300" class="LineNr">300 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;address_element_info&gt;::const_iterator info = p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  info != p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++info<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L301" class="LineNr">301 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// hack: skip primitive containers that do their own locking; they're designed to be shared between routines</span>
+<span id="L302" class="LineNr">302 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom &amp;&amp; info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;channel&quot;</span><span class="Delimiter">)</span>
 <span id="L303" class="LineNr">303 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L304" class="LineNr">304 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// construct a fake reagent that reads directly from the appropriate</span>
-<span id="L305" class="LineNr">305 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// field of the container</span>
-<span id="L306" class="LineNr">306 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> reagent curr<span class="Delimiter">;</span>
-<span id="L307" class="LineNr">307 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span>
-<span id="L308" class="LineNr">308 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;address&quot;</span><span class="Delimiter">),</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Normal">new</span> type_tree<span class="Delimiter">(</span>info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">),</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
-<span id="L309" class="LineNr">309 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">else</span>
-<span id="L310" class="LineNr">310 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;address&quot;</span><span class="Delimiter">),</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">));</span>
-<span id="L311" class="LineNr">311 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>canonized_in<span class="Delimiter">.</span>value + info<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">);</span>
-<span id="L312" class="LineNr">312 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;raw&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
-<span id="L313" class="LineNr">313 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: copying address &quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L314" class="LineNr">314 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> out<span class="Delimiter">.</span>at<span class="Delimiter">(</span>info<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">)</span> = <a href='071deep_copy.cc.html#L259'>deep_copy_address</a><span class="Delimiter">(</span>curr<span class="Delimiter">,</span> addresses_copied<span class="Delimiter">,</span> tmp<span class="Delimiter">);</span>
-<span id="L315" class="LineNr">315 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L316" class="LineNr">316 </span>  <span class="Delimiter">}</span>
-<span id="L317" class="LineNr">317 </span><span class="Delimiter">}</span>
-<span id="L318" class="LineNr">318 </span>
-<span id="L319" class="LineNr">319 </span><span class="Normal">int</span> <a href='071deep_copy.cc.html#L319'>payload_address</a><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="L320" class="LineNr">320 </span>  x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
-<span id="L321" class="LineNr">321 </span>  canonize<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
-<span id="L322" class="LineNr">322 </span>  <span class="Identifier">return</span> x<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
-<span id="L323" class="LineNr">323 </span><span class="Delimiter">}</span>
-<span id="L324" class="LineNr">324 </span>
-<span id="L325" class="LineNr">325 </span><span class="Normal">int</span> <a href='071deep_copy.cc.html#L325'>address_value</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L326" class="LineNr">326 </span>  assert<span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>x<span class="Delimiter">));</span>
-<span id="L327" class="LineNr">327 </span>  vector&lt;<span class="Normal">double</span>&gt; result = read_memory<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
-<span id="L328" class="LineNr">328 </span>  assert<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>result<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L329" class="LineNr">329 </span>  <span class="Identifier">return</span> <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
-<span id="L330" class="LineNr">330 </span><span class="Delimiter">}</span>
-<span id="L331" class="LineNr">331 </span>
-<span id="L332" class="LineNr">332 </span><span class="Delimiter">:(scenario deep_copy_stress_test_1)</span>
-<span id="L333" class="LineNr">333 </span><span class="muData">container</span> foo1 [
-<span id="L334" class="LineNr">334 </span>  <span class="Normal">p</span>:&amp;:num
-<span id="L335" class="LineNr">335 </span>]
-<span id="L336" class="LineNr">336 </span><span class="muData">container</span> foo2 [
-<span id="L337" class="LineNr">337 </span>  <span class="Normal">p</span>:&amp;:foo1
-<span id="L338" class="LineNr">338 </span>]
-<span id="L339" class="LineNr">339 </span><span class="muData">exclusive-container</span> foo3 [
-<span id="L340" class="LineNr">340 </span>  <span class="Normal">p</span>:&amp;:foo1
-<span id="L341" class="LineNr">341 </span>  <span class="Normal">q</span>:&amp;:foo2
-<span id="L342" class="LineNr">342 </span>]
-<span id="L343" class="LineNr">343 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L344" class="LineNr">344 </span>  local-scope
-<span id="L345" class="LineNr">345 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L346" class="LineNr">346 </span>  *x<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L347" class="LineNr">347 </span>  <span class="Normal">a</span>:&amp;:foo1<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo1:type</span>
-<span id="L348" class="LineNr">348 </span>  *a<span class="Special"> &lt;- </span>merge x
-<span id="L349" class="LineNr">349 </span>  <span class="Normal">b</span>:&amp;:foo2<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo2:type</span>
-<span id="L350" class="LineNr">350 </span>  *b<span class="Special"> &lt;- </span>merge a
-<span id="L351" class="LineNr">351 </span>  <span class="Normal">c</span>:foo3<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/q<span class="Delimiter">,</span> b
-<span id="L352" class="LineNr">352 </span>  <span class="Normal">d</span>:foo3<span class="Special"> &lt;- </span>deep-copy c
-<span id="L353" class="LineNr">353 </span>  <span class="Normal">e</span>:&amp;:foo2<span class="Delimiter">,</span> z:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert d<span class="Delimiter">,</span> <span class="Constant">q:variant</span>
-<span id="L354" class="LineNr">354 </span>  <span class="Normal">f</span>:&amp;:foo1<span class="Special"> &lt;- </span>get *e<span class="Delimiter">,</span> <span class="Constant">p:offset</span>
-<span id="L355" class="LineNr">355 </span>  <span class="Normal">g</span>:&amp;:num<span class="Special"> &lt;- </span>get *f<span class="Delimiter">,</span> <span class="Constant">p:offset</span>
-<span id="L356" class="LineNr">356 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>copy *g
-<span id="L357" class="LineNr">357 </span>]
-<span id="L358" class="LineNr">358 </span><span class="traceContains">+mem: storing 34 in location 1</span>
-<span id="L359" class="LineNr">359 </span>
-<span id="L360" class="LineNr">360 </span><span class="Delimiter">:(scenario deep_copy_stress_test_2)</span>
-<span id="L361" class="LineNr">361 </span><span class="muData">container</span> foo1 [
-<span id="L362" class="LineNr">362 </span>  <span class="Normal">p</span>:&amp;:num
-<span id="L363" class="LineNr">363 </span>]
-<span id="L364" class="LineNr">364 </span><span class="muData">container</span> foo2 [
-<span id="L365" class="LineNr">365 </span>  <span class="Normal">p</span>:&amp;:foo1
-<span id="L366" class="LineNr">366 </span>]
-<span id="L367" class="LineNr">367 </span><span class="muData">exclusive-container</span> foo3 [
-<span id="L368" class="LineNr">368 </span>  <span class="Normal">p</span>:&amp;:foo1
-<span id="L369" class="LineNr">369 </span>  <span class="Normal">q</span>:&amp;:foo2
-<span id="L370" class="LineNr">370 </span>]
-<span id="L371" class="LineNr">371 </span><span class="muData">container</span> foo4 [
-<span id="L372" class="LineNr">372 </span>  <span class="Normal">p</span>:num
-<span id="L373" class="LineNr">373 </span>  <span class="Normal">q</span>:&amp;:foo3
-<span id="L374" class="LineNr">374 </span>]
-<span id="L375" class="LineNr">375 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L376" class="LineNr">376 </span>  local-scope
-<span id="L377" class="LineNr">377 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L378" class="LineNr">378 </span>  *x<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L379" class="LineNr">379 </span>  <span class="Normal">a</span>:&amp;:foo1<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo1:type</span>
-<span id="L380" class="LineNr">380 </span>  *a<span class="Special"> &lt;- </span>merge x
-<span id="L381" class="LineNr">381 </span>  <span class="Normal">b</span>:&amp;:foo2<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo2:type</span>
-<span id="L382" class="LineNr">382 </span>  *b<span class="Special"> &lt;- </span>merge a
-<span id="L383" class="LineNr">383 </span>  <span class="Normal">c</span>:&amp;:foo3<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo3:type</span>
-<span id="L384" class="LineNr">384 </span>  *c<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/q<span class="Delimiter">,</span> b
-<span id="L385" class="LineNr">385 </span>  <span class="Normal">d</span>:foo4<span class="Special"> &lt;- </span>merge <span class="Constant">35</span><span class="Delimiter">,</span> c
-<span id="L386" class="LineNr">386 </span>  <span class="Normal">e</span>:foo4<span class="Special"> &lt;- </span>deep-copy d
-<span id="L387" class="LineNr">387 </span>  <span class="Normal">f</span>:&amp;:foo3<span class="Special"> &lt;- </span>get e<span class="Delimiter">,</span> <span class="Constant">q:offset</span>
-<span id="L388" class="LineNr">388 </span>  <span class="Normal">g</span>:&amp;:foo2<span class="Delimiter">,</span> z:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert *f<span class="Delimiter">,</span> <span class="Constant">q:variant</span>
-<span id="L389" class="LineNr">389 </span>  <span class="Normal">h</span>:&amp;:foo1<span class="Special"> &lt;- </span>get *g<span class="Delimiter">,</span> <span class="Constant">p:offset</span>
-<span id="L390" class="LineNr">390 </span>  <span class="Normal">y</span>:&amp;:num<span class="Special"> &lt;- </span>get *h<span class="Delimiter">,</span> <span class="Constant">p:offset</span>
-<span id="L391" class="LineNr">391 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>copy *y
-<span id="L392" class="LineNr">392 </span>]
-<span id="L393" class="LineNr">393 </span><span class="traceContains">+mem: storing 34 in location 1</span>
-<span id="L394" class="LineNr">394 </span>
-<span id="L395" class="LineNr">395 </span><span class="Delimiter">:(scenario deep_copy_cycles)</span>
-<span id="L396" class="LineNr">396 </span><span class="muData">container</span> foo [
-<span id="L397" class="LineNr">397 </span>  <span class="Normal">p</span>:num
-<span id="L398" class="LineNr">398 </span>  <span class="Normal">q</span>:&amp;:foo
-<span id="L399" class="LineNr">399 </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>  local-scope
-<span id="L402" class="LineNr">402 </span>  <span class="Normal">x</span>:&amp;:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
-<span id="L403" class="LineNr">403 </span>  *x<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *x<span class="Delimiter">,</span> <span class="Constant">p:offset</span><span class="Delimiter">,</span> <span class="Constant">34</span>
-<span id="L404" class="LineNr">404 </span>  *x<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *x<span class="Delimiter">,</span> <span class="Constant">q:offset</span><span class="Delimiter">,</span> x  <span class="Comment"># create a cycle</span>
-<span id="L405" class="LineNr">405 </span>  <span class="Normal">y</span>:&amp;:foo<span class="Special"> &lt;- </span>deep-copy x
-<span id="L406" class="LineNr">406 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>get *y<span class="Delimiter">,</span> <span class="Constant">p:offset</span>
-<span id="L407" class="LineNr">407 </span>  <span class="Normal">y2</span>:&amp;:foo<span class="Special"> &lt;- </span>get *y<span class="Delimiter">,</span> <span class="Constant">q:offset</span>
-<span id="L408" class="LineNr">408 </span>  stash y [vs] y2
-<span id="L409" class="LineNr">409 </span>  <span class="Constant">2</span>:<span class="Normal">bool</span>/<span class="Special">raw &lt;- </span>equal y<span class="Delimiter">,</span> y2  <span class="Comment"># is it still a cycle?</span>
-<span id="L410" class="LineNr">410 </span>  <span class="Constant">3</span>:<span class="Normal">bool</span>/<span class="Special">raw &lt;- </span>equal x<span class="Delimiter">,</span> y  <span class="Comment"># is it the same cycle?</span>
-<span id="L411" class="LineNr">411 </span>]
-<span id="L412" class="LineNr">412 </span><span class="traceContains">+mem: storing 34 in location 1</span>
-<span id="L413" class="LineNr">413 </span><span class="Comment"># deep copy also contains a cycle</span>
-<span id="L414" class="LineNr">414 </span><span class="traceContains">+mem: storing 1 in location 2</span>
-<span id="L415" class="LineNr">415 </span><span class="Comment"># but it's a completely different (disjoint) cycle</span>
-<span id="L416" class="LineNr">416 </span><span class="traceContains">+mem: storing 0 in location 3</span>
-<span id="L417" class="LineNr">417 </span>
-<span id="L418" class="LineNr">418 </span><span class="Delimiter">:(scenario deep_copy_skips_channel)</span>
-<span id="L419" class="LineNr">419 </span><span class="Comment"># ugly! dummy 'channel' type if we happen to be building without that layer</span>
-<span id="L420" class="LineNr">420 </span><span class="Special">% if (!contains_key(Type_ordinal, &quot;channel&quot;)) get_or_insert(Type, put(Type_ordinal, &quot;channel&quot;, Next_type_ordinal++)).name = &quot;channel&quot;;</span>
-<span id="L421" class="LineNr">421 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L422" class="LineNr">422 </span>  local-scope
-<span id="L423" class="LineNr">423 </span>  <span class="Normal">x</span>:&amp;:channel:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>channel num<span class="Delimiter">)</span>: type<span class="Delimiter">}</span>
-<span id="L424" class="LineNr">424 </span>  <span class="Normal">y</span>:&amp;:channel:num<span class="Special"> &lt;- </span>deep-copy x
-<span id="L425" class="LineNr">425 </span>  <span class="Constant">10</span>:<span class="Normal">bool</span>/<span class="Special">raw &lt;- </span>equal x<span class="Delimiter">,</span> y
-<span id="L426" class="LineNr">426 </span>]
-<span id="L427" class="LineNr">427 </span><span class="Comment"># channels are never deep-copied</span>
-<span id="L428" class="LineNr">428 </span><span class="traceContains">+mem: storing 1 in location 10</span>
-<span id="L429" class="LineNr">429 </span>
-<span id="L430" class="LineNr">430 </span><span class="Delimiter">:(scenario deep_copy_skips_nested_channel)</span>
-<span id="L431" class="LineNr">431 </span><span class="Comment"># ugly! dummy 'channel' type if we happen to be building without that layer</span>
-<span id="L432" class="LineNr">432 </span><span class="Special">% if (!contains_key(Type_ordinal, &quot;channel&quot;)) get_or_insert(Type, put(Type_ordinal, &quot;channel&quot;, Next_type_ordinal++)).name = &quot;channel&quot;;</span>
-<span id="L433" class="LineNr">433 </span><span class="muData">container</span> foo [
-<span id="L434" class="LineNr">434 </span>  <span class="Normal">c</span>:&amp;:channel:num
-<span id="L435" class="LineNr">435 </span>]
-<span id="L436" class="LineNr">436 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L437" class="LineNr">437 </span>  local-scope
-<span id="L438" class="LineNr">438 </span>  <span class="Normal">x</span>:&amp;:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
-<span id="L439" class="LineNr">439 </span>  <span class="Normal">y</span>:&amp;:foo<span class="Special"> &lt;- </span>deep-copy x
-<span id="L440" class="LineNr">440 </span>  <span class="Normal">xc</span>:&amp;:channel:num<span class="Special"> &lt;- </span>get *x<span class="Delimiter">,</span> <span class="Constant">c:offset</span>
-<span id="L441" class="LineNr">441 </span>  <span class="Normal">yc</span>:&amp;:channel:num<span class="Special"> &lt;- </span>get *y<span class="Delimiter">,</span> <span class="Constant">c:offset</span>
-<span id="L442" class="LineNr">442 </span>  <span class="Constant">10</span>:<span class="Normal">bool</span>/<span class="Special">raw &lt;- </span>equal xc<span class="Delimiter">,</span> yc
-<span id="L443" class="LineNr">443 </span>]
-<span id="L444" class="LineNr">444 </span><span class="Comment"># channels are never deep-copied</span>
-<span id="L445" class="LineNr">445 </span><span class="traceContains">+mem: storing 1 in location 10</span>
-<span id="L446" class="LineNr">446 </span>
-<span id="L447" class="LineNr">447 </span><span class="Delimiter">:(scenario deep_copy_skips_resources)</span>
-<span id="L448" class="LineNr">448 </span><span class="Comment"># ugly! dummy 'resources' type if we happen to be building without that layer</span>
-<span id="L449" class="LineNr">449 </span><span class="Special">% if (!contains_key(Type_ordinal, &quot;resources&quot;)) get_or_insert(Type, put(Type_ordinal, &quot;resources&quot;, Next_type_ordinal++)).name = &quot;resources&quot;;</span>
-<span id="L450" class="LineNr">450 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L451" class="LineNr">451 </span>  local-scope
-<span id="L452" class="LineNr">452 </span>  <span class="Normal">x</span>:&amp;:resources<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">resources:type</span>
-<span id="L453" class="LineNr">453 </span>  <span class="Normal">y</span>:&amp;:resources<span class="Special"> &lt;- </span>deep-copy x
-<span id="L454" class="LineNr">454 </span>  <span class="Constant">10</span>:<span class="Normal">bool</span>/<span class="Special">raw &lt;- </span>equal x<span class="Delimiter">,</span> y
-<span id="L455" class="LineNr">455 </span>]
-<span id="L456" class="LineNr">456 </span><span class="Comment"># resources are never deep-copied</span>
-<span id="L457" class="LineNr">457 </span><span class="traceContains">+mem: storing 1 in location 10</span>
-<span id="L458" class="LineNr">458 </span>
-<span id="L459" class="LineNr">459 </span><span class="Delimiter">:(scenario deep_copy_skips_nested_resources)</span>
-<span id="L460" class="LineNr">460 </span><span class="Comment"># ugly! dummy 'resources' type if we happen to be building without that layer</span>
-<span id="L461" class="LineNr">461 </span><span class="Special">% if (!contains_key(Type_ordinal, &quot;resources&quot;)) get_or_insert(Type, put(Type_ordinal, &quot;resources&quot;, Next_type_ordinal++)).name = &quot;resources&quot;;</span>
-<span id="L462" class="LineNr">462 </span><span class="muData">container</span> foo [
-<span id="L463" class="LineNr">463 </span>  <span class="Normal">c</span>:&amp;:resources
-<span id="L464" class="LineNr">464 </span>]
-<span id="L465" class="LineNr">465 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L466" class="LineNr">466 </span>  local-scope
-<span id="L467" class="LineNr">467 </span>  <span class="Normal">x</span>:&amp;:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
-<span id="L468" class="LineNr">468 </span>  <span class="Normal">y</span>:&amp;:foo<span class="Special"> &lt;- </span>deep-copy x
-<span id="L469" class="LineNr">469 </span>  <span class="Normal">xc</span>:&amp;:resources<span class="Special"> &lt;- </span>get *x<span class="Delimiter">,</span> <span class="Constant">c:offset</span>
-<span id="L470" class="LineNr">470 </span>  <span class="Normal">yc</span>:&amp;:resources<span class="Special"> &lt;- </span>get *y<span class="Delimiter">,</span> <span class="Constant">c:offset</span>
-<span id="L471" class="LineNr">471 </span>  <span class="Constant">10</span>:<span class="Normal">bool</span>/<span class="Special">raw &lt;- </span>equal xc<span class="Delimiter">,</span> yc
-<span id="L472" class="LineNr">472 </span>]
-<span id="L473" class="LineNr">473 </span><span class="Comment"># resources are never deep-copied</span>
-<span id="L474" class="LineNr">474 </span><span class="traceContains">+mem: storing 1 in location 10</span>
+<span id="L304" class="LineNr">304 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;screen&quot;</span> || info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;console&quot;</span> || info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;resources&quot;</span><span class="Delimiter">)</span>
+<span id="L305" class="LineNr">305 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L306" class="LineNr">306 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// construct a fake reagent that reads directly from the appropriate</span>
+<span id="L307" class="LineNr">307 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// field of the container</span>
+<span id="L308" class="LineNr">308 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> reagent curr<span class="Delimiter">;</span>
+<span id="L309" class="LineNr">309 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span>
+<span id="L310" class="LineNr">310 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;address&quot;</span><span class="Delimiter">),</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Normal">new</span> type_tree<span class="Delimiter">(</span>info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">),</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
+<span id="L311" class="LineNr">311 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">else</span>
+<span id="L312" class="LineNr">312 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;address&quot;</span><span class="Delimiter">),</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">));</span>
+<span id="L313" class="LineNr">313 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>canonized_in<span class="Delimiter">.</span>value + info<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">);</span>
+<span id="L314" class="LineNr">314 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;raw&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
+<span id="L315" class="LineNr">315 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: copying <a href='043space.cc.html#L83'>address</a> &quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L316" class="LineNr">316 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> out<span class="Delimiter">.</span>at<span class="Delimiter">(</span>info<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">)</span> = <a href='071deep_copy.cc.html#L259'>deep_copy_address</a><span class="Delimiter">(</span>curr<span class="Delimiter">,</span> addresses_copied<span class="Delimiter">,</span> tmp<span class="Delimiter">);</span>
+<span id="L317" class="LineNr">317 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L318" class="LineNr">318 </span>  <span class="Delimiter">}</span>
+<span id="L319" class="LineNr">319 </span><span class="Delimiter">}</span>
+<span id="L320" class="LineNr">320 </span>
+<span id="L321" class="LineNr">321 </span><span class="Normal">int</span> <a href='071deep_copy.cc.html#L321'>payload_address</a><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="L322" class="LineNr">322 </span>  x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
+<span id="L323" class="LineNr">323 </span>  canonize<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
+<span id="L324" class="LineNr">324 </span>  <span class="Identifier">return</span> x<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
+<span id="L325" class="LineNr">325 </span><span class="Delimiter">}</span>
+<span id="L326" class="LineNr">326 </span>
+<span id="L327" class="LineNr">327 </span><span class="Normal">int</span> <a href='071deep_copy.cc.html#L327'>address_value</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L328" class="LineNr">328 </span>  assert<span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>x<span class="Delimiter">));</span>
+<span id="L329" class="LineNr">329 </span>  vector&lt;<span class="Normal">double</span>&gt; result = read_memory<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
+<span id="L330" class="LineNr">330 </span>  assert<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>result<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L331" class="LineNr">331 </span>  <span class="Identifier">return</span> <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><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">:(scenario deep_copy_stress_test_1)</span>
+<span id="L335" class="LineNr">335 </span><span class="muData">container</span> foo1 [
+<span id="L336" class="LineNr">336 </span>  <span class="Normal">p</span>:&amp;:num
+<span id="L337" class="LineNr">337 </span>]
+<span id="L338" class="LineNr">338 </span><span class="muData">container</span> foo2 [
+<span id="L339" class="LineNr">339 </span>  <span class="Normal">p</span>:&amp;:foo1
+<span id="L340" class="LineNr">340 </span>]
+<span id="L341" class="LineNr">341 </span><span class="muData">exclusive-container</span> foo3 [
+<span id="L342" class="LineNr">342 </span>  <span class="Normal">p</span>:&amp;:foo1
+<span id="L343" class="LineNr">343 </span>  <span class="Normal">q</span>:&amp;:foo2
+<span id="L344" class="LineNr">344 </span>]
+<span id="L345" class="LineNr">345 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L346" class="LineNr">346 </span>  local-scope
+<span id="L347" class="LineNr">347 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L348" class="LineNr">348 </span>  *x<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L349" class="LineNr">349 </span>  <span class="Normal">a</span>:&amp;:foo1<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo1:type</span>
+<span id="L350" class="LineNr">350 </span>  *a<span class="Special"> &lt;- </span>merge x
+<span id="L351" class="LineNr">351 </span>  <span class="Normal">b</span>:&amp;:foo2<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo2:type</span>
+<span id="L352" class="LineNr">352 </span>  *b<span class="Special"> &lt;- </span>merge a
+<span id="L353" class="LineNr">353 </span>  <span class="Normal">c</span>:foo3<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/q<span class="Delimiter">,</span> b
+<span id="L354" class="LineNr">354 </span>  <span class="Normal">d</span>:foo3<span class="Special"> &lt;- </span>deep-copy c
+<span id="L355" class="LineNr">355 </span>  <span class="Normal">e</span>:&amp;:foo2<span class="Delimiter">,</span> z:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert d<span class="Delimiter">,</span> <span class="Constant">q:variant</span>
+<span id="L356" class="LineNr">356 </span>  <span class="Normal">f</span>:&amp;:foo1<span class="Special"> &lt;- </span>get *e<span class="Delimiter">,</span> <span class="Constant">p:offset</span>
+<span id="L357" class="LineNr">357 </span>  <span class="Normal">g</span>:&amp;:num<span class="Special"> &lt;- </span>get *f<span class="Delimiter">,</span> <span class="Constant">p:offset</span>
+<span id="L358" class="LineNr">358 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>copy *g
+<span id="L359" class="LineNr">359 </span>]
+<span id="L360" class="LineNr">360 </span><span class="traceContains">+mem: storing 34 in location 1</span>
+<span id="L361" class="LineNr">361 </span>
+<span id="L362" class="LineNr">362 </span><span class="Delimiter">:(scenario deep_copy_stress_test_2)</span>
+<span id="L363" class="LineNr">363 </span><span class="muData">container</span> foo1 [
+<span id="L364" class="LineNr">364 </span>  <span class="Normal">p</span>:&amp;:num
+<span id="L365" class="LineNr">365 </span>]
+<span id="L366" class="LineNr">366 </span><span class="muData">container</span> foo2 [
+<span id="L367" class="LineNr">367 </span>  <span class="Normal">p</span>:&amp;:foo1
+<span id="L368" class="LineNr">368 </span>]
+<span id="L369" class="LineNr">369 </span><span class="muData">exclusive-container</span> foo3 [
+<span id="L370" class="LineNr">370 </span>  <span class="Normal">p</span>:&amp;:foo1
+<span id="L371" class="LineNr">371 </span>  <span class="Normal">q</span>:&amp;:foo2
+<span id="L372" class="LineNr">372 </span>]
+<span id="L373" class="LineNr">373 </span><span class="muData">container</span> foo4 [
+<span id="L374" class="LineNr">374 </span>  <span class="Normal">p</span>:num
+<span id="L375" class="LineNr">375 </span>  <span class="Normal">q</span>:&amp;:foo3
+<span id="L376" class="LineNr">376 </span>]
+<span id="L377" class="LineNr">377 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L378" class="LineNr">378 </span>  local-scope
+<span id="L379" class="LineNr">379 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L380" class="LineNr">380 </span>  *x<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L381" class="LineNr">381 </span>  <span class="Normal">a</span>:&amp;:foo1<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo1:type</span>
+<span id="L382" class="LineNr">382 </span>  *a<span class="Special"> &lt;- </span>merge x
+<span id="L383" class="LineNr">383 </span>  <span class="Normal">b</span>:&amp;:foo2<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo2:type</span>
+<span id="L384" class="LineNr">384 </span>  *b<span class="Special"> &lt;- </span>merge a
+<span id="L385" class="LineNr">385 </span>  <span class="Normal">c</span>:&amp;:foo3<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo3:type</span>
+<span id="L386" class="LineNr">386 </span>  *c<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/q<span class="Delimiter">,</span> b
+<span id="L387" class="LineNr">387 </span>  <span class="Normal">d</span>:foo4<span class="Special"> &lt;- </span>merge <span class="Constant">35</span><span class="Delimiter">,</span> c
+<span id="L388" class="LineNr">388 </span>  <span class="Normal">e</span>:foo4<span class="Special"> &lt;- </span>deep-copy d
+<span id="L389" class="LineNr">389 </span>  <span class="Normal">f</span>:&amp;:foo3<span class="Special"> &lt;- </span>get e<span class="Delimiter">,</span> <span class="Constant">q:offset</span>
+<span id="L390" class="LineNr">390 </span>  <span class="Normal">g</span>:&amp;:foo2<span class="Delimiter">,</span> z:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert *f<span class="Delimiter">,</span> <span class="Constant">q:variant</span>
+<span id="L391" class="LineNr">391 </span>  <span class="Normal">h</span>:&amp;:foo1<span class="Special"> &lt;- </span>get *g<span class="Delimiter">,</span> <span class="Constant">p:offset</span>
+<span id="L392" class="LineNr">392 </span>  <span class="Normal">y</span>:&amp;:num<span class="Special"> &lt;- </span>get *h<span class="Delimiter">,</span> <span class="Constant">p:offset</span>
+<span id="L393" class="LineNr">393 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>copy *y
+<span id="L394" class="LineNr">394 </span>]
+<span id="L395" class="LineNr">395 </span><span class="traceContains">+mem: storing 34 in location 1</span>
+<span id="L396" class="LineNr">396 </span>
+<span id="L397" class="LineNr">397 </span><span class="Delimiter">:(scenario deep_copy_cycles)</span>
+<span id="L398" class="LineNr">398 </span><span class="muData">container</span> foo [
+<span id="L399" class="LineNr">399 </span>  <span class="Normal">p</span>:num
+<span id="L400" class="LineNr">400 </span>  <span class="Normal">q</span>:&amp;:foo
+<span id="L401" class="LineNr">401 </span>]
+<span id="L402" class="LineNr">402 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L403" class="LineNr">403 </span>  local-scope
+<span id="L404" class="LineNr">404 </span>  <span class="Normal">x</span>:&amp;:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
+<span id="L405" class="LineNr">405 </span>  *x<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *x<span class="Delimiter">,</span> <span class="Constant">p:offset</span><span class="Delimiter">,</span> <span class="Constant">34</span>
+<span id="L406" class="LineNr">406 </span>  *x<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *x<span class="Delimiter">,</span> <span class="Constant">q:offset</span><span class="Delimiter">,</span> x  <span class="Comment"># create a cycle</span>
+<span id="L407" class="LineNr">407 </span>  <span class="Normal">y</span>:&amp;:foo<span class="Special"> &lt;- </span>deep-copy x
+<span id="L408" class="LineNr">408 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>get *y<span class="Delimiter">,</span> <span class="Constant">p:offset</span>
+<span id="L409" class="LineNr">409 </span>  <span class="Normal">y2</span>:&amp;:foo<span class="Special"> &lt;- </span>get *y<span class="Delimiter">,</span> <span class="Constant">q:offset</span>
+<span id="L410" class="LineNr">410 </span>  <span class="Constant">2</span>:<span class="Normal">bool</span>/<span class="Special">raw &lt;- </span>equal y<span class="Delimiter">,</span> y2  <span class="Comment"># is it still a cycle?</span>
+<span id="L411" class="LineNr">411 </span>  <span class="Constant">3</span>:<span class="Normal">bool</span>/<span class="Special">raw &lt;- </span>equal x<span class="Delimiter">,</span> y  <span class="Comment"># is it the same cycle?</span>
+<span id="L412" class="LineNr">412 </span>  <span class="Comment"># not bothering cleaning up; both cycles leak memory</span>
+<span id="L413" class="LineNr">413 </span>]
+<span id="L414" class="LineNr">414 </span><span class="traceContains">+mem: storing 34 in location 1</span>
+<span id="L415" class="LineNr">415 </span><span class="Comment"># deep copy also contains a cycle</span>
+<span id="L416" class="LineNr">416 </span><span class="traceContains">+mem: storing 1 in location 2</span>
+<span id="L417" class="LineNr">417 </span><span class="Comment"># but it's a completely different (disjoint) cycle</span>
+<span id="L418" class="LineNr">418 </span><span class="traceContains">+mem: storing 0 in location 3</span>
+<span id="L419" class="LineNr">419 </span>
+<span id="L420" class="LineNr">420 </span><span class="Comment">//: todo: version of deep_copy_cycles that breaks cycles at end and verifies no memory leaks</span>
+<span id="L421" class="LineNr">421 </span><span class="Comment">//: needs approximate matching over scenario traces</span>
+<span id="L422" class="LineNr">422 </span>
+<span id="L423" class="LineNr">423 </span><span class="Delimiter">:(scenario deep_copy_skips_channel)</span>
+<span id="L424" class="LineNr">424 </span><span class="Comment"># ugly! dummy 'channel' type if we happen to be building without that layer</span>
+<span id="L425" class="LineNr">425 </span><span class="Special">% if (!contains_key(Type_ordinal, &quot;channel&quot;)) get_or_insert(Type, put(Type_ordinal, &quot;channel&quot;, Next_type_ordinal++)).name = &quot;channel&quot;;</span>
+<span id="L426" class="LineNr">426 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L427" class="LineNr">427 </span>  local-scope
+<span id="L428" class="LineNr">428 </span>  <span class="Normal">x</span>:&amp;:channel:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>channel num<span class="Delimiter">)</span>: type<span class="Delimiter">}</span>
+<span id="L429" class="LineNr">429 </span>  <span class="Normal">y</span>:&amp;:channel:num<span class="Special"> &lt;- </span>deep-copy x
+<span id="L430" class="LineNr">430 </span>  <span class="Constant">10</span>:<span class="Normal">bool</span>/<span class="Special">raw &lt;- </span>equal x<span class="Delimiter">,</span> y
+<span id="L431" class="LineNr">431 </span>]
+<span id="L432" class="LineNr">432 </span><span class="Comment"># channels are never deep-copied</span>
+<span id="L433" class="LineNr">433 </span><span class="traceContains">+mem: storing 1 in location 10</span>
+<span id="L434" class="LineNr">434 </span>
+<span id="L435" class="LineNr">435 </span><span class="Delimiter">:(scenario deep_copy_skips_nested_channel)</span>
+<span id="L436" class="LineNr">436 </span><span class="Comment"># ugly! dummy 'channel' type if we happen to be building without that layer</span>
+<span id="L437" class="LineNr">437 </span><span class="Special">% if (!contains_key(Type_ordinal, &quot;channel&quot;)) get_or_insert(Type, put(Type_ordinal, &quot;channel&quot;, Next_type_ordinal++)).name = &quot;channel&quot;;</span>
+<span id="L438" class="LineNr">438 </span><span class="muData">container</span> foo [
+<span id="L439" class="LineNr">439 </span>  <span class="Normal">c</span>:&amp;:channel:num
+<span id="L440" class="LineNr">440 </span>]
+<span id="L441" class="LineNr">441 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L442" class="LineNr">442 </span>  local-scope
+<span id="L443" class="LineNr">443 </span>  <span class="Normal">x</span>:&amp;:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
+<span id="L444" class="LineNr">444 </span>  <span class="Normal">y</span>:&amp;:foo<span class="Special"> &lt;- </span>deep-copy x
+<span id="L445" class="LineNr">445 </span>  <span class="Normal">xc</span>:&amp;:channel:num<span class="Special"> &lt;- </span>get *x<span class="Delimiter">,</span> <span class="Constant">c:offset</span>
+<span id="L446" class="LineNr">446 </span>  <span class="Normal">yc</span>:&amp;:channel:num<span class="Special"> &lt;- </span>get *y<span class="Delimiter">,</span> <span class="Constant">c:offset</span>
+<span id="L447" class="LineNr">447 </span>  <span class="Constant">10</span>:<span class="Normal">bool</span>/<span class="Special">raw &lt;- </span>equal xc<span class="Delimiter">,</span> yc
+<span id="L448" class="LineNr">448 </span>]
+<span id="L449" class="LineNr">449 </span><span class="Comment"># channels are never deep-copied</span>
+<span id="L450" class="LineNr">450 </span><span class="traceContains">+mem: storing 1 in location 10</span>
+<span id="L451" class="LineNr">451 </span>
+<span id="L452" class="LineNr">452 </span><span class="Delimiter">:(scenario deep_copy_skips_resources)</span>
+<span id="L453" class="LineNr">453 </span><span class="Comment"># ugly! dummy 'resources' type if we happen to be building without that layer</span>
+<span id="L454" class="LineNr">454 </span><span class="Special">% if (!contains_key(Type_ordinal, &quot;resources&quot;)) get_or_insert(Type, put(Type_ordinal, &quot;resources&quot;, Next_type_ordinal++)).name = &quot;resources&quot;;</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>  local-scope
+<span id="L457" class="LineNr">457 </span>  <span class="Normal">x</span>:&amp;:resources<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">resources:type</span>
+<span id="L458" class="LineNr">458 </span>  <span class="Normal">y</span>:&amp;:resources<span class="Special"> &lt;- </span>deep-copy x
+<span id="L459" class="LineNr">459 </span>  <span class="Constant">10</span>:<span class="Normal">bool</span>/<span class="Special">raw &lt;- </span>equal x<span class="Delimiter">,</span> y
+<span id="L460" class="LineNr">460 </span>]
+<span id="L461" class="LineNr">461 </span><span class="Comment"># resources are never deep-copied</span>
+<span id="L462" class="LineNr">462 </span><span class="traceContains">+mem: storing 1 in location 10</span>
+<span id="L463" class="LineNr">463 </span>
+<span id="L464" class="LineNr">464 </span><span class="Delimiter">:(scenario deep_copy_skips_nested_resources)</span>
+<span id="L465" class="LineNr">465 </span><span class="Comment"># ugly! dummy 'resources' type if we happen to be building without that layer</span>
+<span id="L466" class="LineNr">466 </span><span class="Special">% if (!contains_key(Type_ordinal, &quot;resources&quot;)) get_or_insert(Type, put(Type_ordinal, &quot;resources&quot;, Next_type_ordinal++)).name = &quot;resources&quot;;</span>
+<span id="L467" class="LineNr">467 </span><span class="muData">container</span> foo [
+<span id="L468" class="LineNr">468 </span>  <span class="Normal">c</span>:&amp;:resources
+<span id="L469" class="LineNr">469 </span>]
+<span id="L470" class="LineNr">470 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L471" class="LineNr">471 </span>  local-scope
+<span id="L472" class="LineNr">472 </span>  <span class="Normal">x</span>:&amp;:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
+<span id="L473" class="LineNr">473 </span>  <span class="Normal">y</span>:&amp;:foo<span class="Special"> &lt;- </span>deep-copy x
+<span id="L474" class="LineNr">474 </span>  <span class="Normal">xc</span>:&amp;:resources<span class="Special"> &lt;- </span>get *x<span class="Delimiter">,</span> <span class="Constant">c:offset</span>
+<span id="L475" class="LineNr">475 </span>  <span class="Normal">yc</span>:&amp;:resources<span class="Special"> &lt;- </span>get *y<span class="Delimiter">,</span> <span class="Constant">c:offset</span>
+<span id="L476" class="LineNr">476 </span>  <span class="Constant">10</span>:<span class="Normal">bool</span>/<span class="Special">raw &lt;- </span>equal xc<span class="Delimiter">,</span> yc
+<span id="L477" class="LineNr">477 </span>]
+<span id="L478" class="LineNr">478 </span><span class="Comment"># resources are never deep-copied</span>
+<span id="L479" class="LineNr">479 </span><span class="traceContains">+mem: storing 1 in location 10</span>
 </pre>
 </body>
 </html>
diff --git a/html/072recipe.cc.html b/html/072recipe.cc.html
index fd78c68b..0da90663 100644
--- a/html/072recipe.cc.html
+++ b/html/072recipe.cc.html
@@ -175,11 +175,11 @@ if ('onhashchange' in window) {
 <span id="L111" class="LineNr">111 </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="L112" class="LineNr">112 </span>  <span class="Delimiter">}</span>
 <span id="L113" class="LineNr">113 </span>  <span class="Normal">if</span> <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 class="Delimiter">{</span>
-<span id="L114" class="LineNr">114 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to call empty <a href='010vm.cc.html#L19'>recipe</a> in '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to call empty <a href='010vm.cc.html#L19'>recipe</a> in '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L115" class="LineNr">115 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L116" class="LineNr">116 </span>  <span class="Delimiter">}</span>
-<span id="L117" class="LineNr">117 </span>  <span class="Normal">const</span> call&amp; caller_frame = <a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">();</span>
-<span id="L118" class="LineNr">118 </span>  <a href='010vm.cc.html#L32'>instruction</a><span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> call_instruction = <a href='026call.cc.html#L84'>to_instruction</a><span class="Delimiter">(</span>caller_frame<span class="Delimiter">);</span>
+<span id="L117" class="LineNr">117 </span>  <span class="Normal">const</span> call&amp; caller_frame = <a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">();</span>
+<span id="L118" class="LineNr">118 </span>  <a href='010vm.cc.html#L32'>instruction</a><span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> call_instruction = <a href='026call.cc.html#L86'>to_instruction</a><span class="Delimiter">(</span>caller_frame<span class="Delimiter">);</span>
 <span id="L119" class="LineNr">119 </span>  call_instruction<span class="Delimiter">.</span>operation = 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="L120" class="LineNr">120 </span>  call_instruction<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>call_instruction<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">());</span>
 <span id="L121" class="LineNr">121 </span>  Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>push_front<span class="Delimiter">(</span>call<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)));</span>
@@ -376,7 +376,7 @@ if ('onhashchange' in window) {
 <span id="L312" class="LineNr">312 </span><span class="Delimiter">:(before &quot;End Matching Types For Literal(to)&quot;)</span>
 <span id="L313" class="LineNr">313 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='072recipe.cc.html#L277'>is_mu_recipe</a><span class="Delimiter">(</span>to<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L314" class="LineNr">314 </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="L315" class="LineNr">315 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>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#L158'>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="L315" class="LineNr">315 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>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#L162'>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="L316" class="LineNr">316 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L317" class="LineNr">317 </span>  <span class="Delimiter">}</span>
 <span id="L318" class="LineNr">318 </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>
@@ -394,9 +394,9 @@ if ('onhashchange' in window) {
 <span id="L330" class="LineNr">330 </span>
 <span id="L331" class="LineNr">331 </span><span class="Delimiter">:(scenario call_variable_compound_ingredient)</span>
 <span id="L332" class="LineNr">332 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L333" class="LineNr">333 </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>address number<span class="Delimiter">)</span><span class="muRecipe"> -&gt; </span>number<span class="Delimiter">)}</span><span class="Special"> &lt;- </span>copy f
+<span id="L333" class="LineNr">333 </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#L83'>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="L334" class="LineNr">334 </span>  <span class="Constant">2</span>:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L335" class="LineNr">335 </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>address number<span class="Delimiter">)</span><span class="muRecipe"> -&gt; </span>number<span class="Delimiter">)},</span> <span class="Constant">2</span>:&amp;:num
+<span id="L335" class="LineNr">335 </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#L83'>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="L336" class="LineNr">336 </span>]
 <span id="L337" class="LineNr">337 </span><span class="muRecipe">def</span> f x:&amp;:num<span class="muRecipe"> -&gt; </span>y:num [
 <span id="L338" class="LineNr">338 </span>  local-scope
diff --git a/html/073scheduler.cc.html b/html/073scheduler.cc.html
index dc482071..a9745289 100644
--- a/html/073scheduler.cc.html
+++ b/html/073scheduler.cc.html
@@ -196,7 +196,7 @@ if ('onhashchange' in window) {
 <span id="L131" class="LineNr">131 </span>  <span class="Conceal">¦</span> arg<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='038new_text.cc.html#L38'>new_mu_text</a><span class="Delimiter">(</span>argv[i]<span class="Delimiter">));</span>
 <span id="L132" class="LineNr">132 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> arg<span class="Delimiter">.</span>back<span class="Delimiter">())</span> == <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L133" class="LineNr">133 </span>  <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> arg<span class="Delimiter">.</span>back<span class="Delimiter">(),</span> <span class="Constant">1</span><span class="Delimiter">);</span>  <span class="Comment">// update refcount</span>
-<span id="L134" class="LineNr">134 </span>  <span class="Conceal">¦</span> <a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>arg<span class="Delimiter">);</span>
+<span id="L134" class="LineNr">134 </span>  <span class="Conceal">¦</span> <a href='026call.cc.html#L81'>current_call</a><span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>arg<span class="Delimiter">);</span>
 <span id="L135" class="LineNr">135 </span>  <span class="Delimiter">}</span>
 <span id="L136" class="LineNr">136 </span>  run<span class="Delimiter">(</span>main_routine<span class="Delimiter">);</span>
 <span id="L137" class="LineNr">137 </span><span class="Delimiter">}</span>
@@ -243,8 +243,8 @@ if ('onhashchange' in window) {
 <span id="L178" class="LineNr">178 </span>  routine* new_routine = <span class="Normal">new</span> routine<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="L179" class="LineNr">179 </span>  new_routine<span class="Delimiter">-&gt;</span>parent_index = Current_routine_index<span class="Delimiter">;</span>
 <span id="L180" class="LineNr">180 </span>  <span class="Comment">// populate ingredients</span>
-<span id="L181" class="LineNr">181 </span>  <span class="Normal">for</span> <span class="Delimiter">(</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; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L182" class="LineNr">182 </span>  <span class="Conceal">¦</span> reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> ingredient = <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L181" class="LineNr">181 </span>  <span class="Normal">for</span> <span class="Delimiter">(</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; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L182" class="LineNr">182 </span>  <span class="Conceal">¦</span> reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> ingredient = <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L183" class="LineNr">183 </span>  <span class="Conceal">¦</span> new_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>ingredient<span class="Delimiter">);</span>
 <span id="L184" class="LineNr">184 </span>  <span class="Conceal">¦</span> vector&lt;<span class="Normal">double</span>&gt; new_ingredient_atoms = deep_copy<span class="Delimiter">(</span>ingredient<span class="Delimiter">);</span>
 <span id="L185" class="LineNr">185 </span>  <span class="Conceal">¦</span> new_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>new_ingredient_atoms<span class="Delimiter">);</span>
@@ -378,7 +378,7 @@ if ('onhashchange' in window) {
 <span id="L313" class="LineNr">313 </span>  local-scope
 <span id="L314" class="LineNr">314 </span>  <span class="Normal">n</span>:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">12000</span>/unsafe  <span class="Comment"># pretend allocation with a known address</span>
 <span id="L315" class="LineNr">315 </span>  *n<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
-<span id="L316" class="LineNr">316 </span>  <span class="Normal">space</span>:space<span class="Special"> &lt;- </span>create-space n
+<span id="L316" class="LineNr">316 </span>  <span class="Normal">space</span>:space/names:create-space<span class="Special"> &lt;- </span>create-space n
 <span id="L317" class="LineNr">317 </span>  <span class="Normal">n2</span>:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">13000</span>/unsafe
 <span id="L318" class="LineNr">318 </span>  <span class="Normal">n3</span>:num<span class="Special"> &lt;- </span>use-space space<span class="Delimiter">,</span> n2
 <span id="L319" class="LineNr">319 </span>]
diff --git a/html/074wait.cc.html b/html/074wait.cc.html
index eee7a236..934f2f29 100644
--- a/html/074wait.cc.html
+++ b/html/074wait.cc.html
@@ -264,11 +264,11 @@ if ('onhashchange' in window) {
 <span id="L199" class="LineNr">199 </span><span class="Delimiter">}</span>
 <span id="L200" class="LineNr">200 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L201" class="LineNr">201 </span><span class="Normal">case</span> GET_LOCATION: <span class="Delimiter">{</span>
-<span id="L202" class="LineNr">202 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> base = <a href='026call.cc.html#L85'>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 id="L202" class="LineNr">202 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> base = <a href='026call.cc.html#L87'>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 id="L203" class="LineNr">203 </span>  canonize<span class="Delimiter">(</span>base<span class="Delimiter">);</span>
 <span id="L204" class="LineNr">204 </span>  <span class="Normal">int</span> base_address = base<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
 <span id="L205" class="LineNr">205 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base_address == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L206" class="LineNr">206 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L206" class="LineNr">206 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
 <span id="L207" class="LineNr">207 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L208" class="LineNr">208 </span>  <span class="Delimiter">}</span>
 <span id="L209" class="LineNr">209 </span>  <span class="Normal">const</span> type_tree* base_type = get_base_type<span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
@@ -402,7 +402,7 @@ if ('onhashchange' in window) {
 <span id="L337" class="LineNr">337 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L338" class="LineNr">338 </span><span class="Normal">case</span> WAIT_FOR_ROUTINE: <span class="Delimiter">{</span>
 <span id="L339" class="LineNr">339 </span>  <span class="Normal">if</span> <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> == Current_routine<span class="Delimiter">-&gt;</span>id<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L340" class="LineNr">340 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;routine can't wait for itself! '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L340" class="LineNr">340 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;routine can't wait for itself! '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L341" class="LineNr">341 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L342" class="LineNr">342 </span>  <span class="Delimiter">}</span>
 <span id="L343" class="LineNr">343 </span>  Current_routine<span class="Delimiter">-&gt;</span>state = WAITING<span class="Delimiter">;</span>
@@ -564,7 +564,7 @@ if ('onhashchange' in window) {
 <span id="L499" class="LineNr">499 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L500" class="LineNr">500 </span><span class="Normal">case</span> WAIT_FOR_ROUTINE_TO_BLOCK: <span class="Delimiter">{</span>
 <span id="L501" class="LineNr">501 </span>  <span class="Normal">if</span> <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> == Current_routine<span class="Delimiter">-&gt;</span>id<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L502" class="LineNr">502 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;routine can't wait for itself! '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L502" class="LineNr">502 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;routine can't wait for itself! '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L503" class="LineNr">503 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L504" class="LineNr">504 </span>  <span class="Delimiter">}</span>
 <span id="L505" class="LineNr">505 </span>  Current_routine<span class="Delimiter">-&gt;</span>state = WAITING<span class="Delimiter">;</span>
diff --git a/html/076continuation.cc.html b/html/076continuation.cc.html
index db9ae8c5..b6df6ea2 100644
--- a/html/076continuation.cc.html
+++ b/html/076continuation.cc.html
@@ -164,7 +164,7 @@ if ('onhashchange' in window) {
 <span id="L100" class="LineNr">100 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;delimited continuation; incrementing callstack depth to &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L101" class="LineNr">101 </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="L102" class="LineNr">102 </span>  <span class="Delimiter">}</span>
-<span id="L103" class="LineNr">103 </span>  <span class="Normal">const</span> instruction&amp; caller_instruction = <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">();</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Normal">const</span> instruction&amp; caller_instruction = <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">();</span>
 <span id="L104" class="LineNr">104 </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="L105" class="LineNr">105 </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="L106" class="LineNr">106 </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>
@@ -200,10 +200,10 @@ if ('onhashchange' in window) {
 <span id="L136" class="LineNr">136 </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="L137" class="LineNr">137 </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="L138" class="LineNr">138 </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#L197'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L139" class="LineNr">139 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>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="L140" class="LineNr">140 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L139" class="LineNr">139 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>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="L140" class="LineNr">140 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>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#L197'>end</a><span class="Delimiter">();</span>
 <span id="L141" class="LineNr">141 </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#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L142" class="LineNr">142 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L142" class="LineNr">142 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>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#L197'>end</a><span class="Delimiter">();</span>
 <span id="L143" class="LineNr">143 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L144" class="LineNr">144 </span>  <span class="Delimiter">}</span>
 <span id="L145" class="LineNr">145 </span>  Delimited_continuation[Next_delimited_continuation_id] = call_stack<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>
@@ -230,12 +230,12 @@ if ('onhashchange' in window) {
 <span id="L166" class="LineNr">166 </span>
 <span id="L167" class="LineNr">167 </span><span class="Comment">//: overload 'call' for continuations</span>
 <span id="L168" class="LineNr">168 </span><span class="Delimiter">:(after &quot;Begin Call&quot;)</span>
-<span id="L169" class="LineNr">169 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L85'>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>type<span class="Delimiter">-&gt;</span>atom
-<span id="L170" class="LineNr">170 </span>  <span class="Conceal">¦</span> &amp;&amp; <a href='026call.cc.html#L85'>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>type<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;continuation&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L169" class="LineNr">169 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L87'>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>type<span class="Delimiter">-&gt;</span>atom
+<span id="L170" class="LineNr">170 </span>  <span class="Conceal">¦</span> &amp;&amp; <a href='026call.cc.html#L87'>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>type<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;continuation&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L171" class="LineNr">171 </span>  <span class="Comment">// copy multiple calls on to current call stack</span>
 <span id="L172" class="LineNr">172 </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="L173" class="LineNr">173 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">.</span>find<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> == Delimited_continuation<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">())</span>
-<span id="L174" class="LineNr">174 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>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#L85'>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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L174" class="LineNr">174 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>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#L87'>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#L197'>end</a><span class="Delimiter">();</span>
 <span id="L175" class="LineNr">175 </span>  <span class="Normal">const</span> call_stack&amp; new_calls = Delimited_continuation[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 class="Delimiter">;</span>
 <span id="L176" class="LineNr">176 </span>  <span class="Normal">const</span> call&amp; caller = <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>new_calls<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> ? *++new_calls<span class="Delimiter">.</span>begin<span class="Delimiter">()</span> : Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">();</span>
 <span id="L177" class="LineNr">177 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::const_reverse_iterator p = new_calls<span class="Delimiter">.</span>rbegin<span class="Delimiter">();</span> p != new_calls<span class="Delimiter">.</span>rend<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span>
@@ -247,7 +247,7 @@ if ('onhashchange' in window) {
 <span id="L183" class="LineNr">183 </span>  <span class="Delimiter">}</span>
 <span id="L184" class="LineNr">184 </span>  ++current_step_index<span class="Delimiter">();</span>  <span class="Comment">// skip past the return-continuation-until-mark</span>
 <span id="L185" class="LineNr">185 </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="L186" class="LineNr">186 </span>  finish_call_housekeeping<span class="Delimiter">(</span><a href='026call.cc.html#L84'>to_instruction</a><span class="Delimiter">(</span>caller<span class="Delimiter">),</span> ingredients<span class="Delimiter">);</span>
+<span id="L186" class="LineNr">186 </span>  finish_call_housekeeping<span class="Delimiter">(</span><a href='026call.cc.html#L86'>to_instruction</a><span class="Delimiter">(</span>caller<span class="Delimiter">),</span> ingredients<span class="Delimiter">);</span>
 <span id="L187" class="LineNr">187 </span>  <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L188" class="LineNr">188 </span><span class="Delimiter">}</span>
 </pre>
diff --git a/html/082scenario_screen.cc.html b/html/082scenario_screen.cc.html
index 37d5b21d..c04ed1ee 100644
--- a/html/082scenario_screen.cc.html
+++ b/html/082scenario_screen.cc.html
@@ -217,7 +217,7 @@ if ('onhashchange' in window) {
 <span id="L152" class="LineNr">152 </span><span class="Delimiter">:(before &quot;End Special Scenario Variable Names(r)&quot;)</span>
 <span id="L153" class="LineNr">153 </span>Name[r][<span class="Constant">&quot;screen&quot;</span>] = SCREEN<span class="Delimiter">;</span>
 <span id="L154" class="LineNr">154 </span><span class="Comment">//: make 'screen' always a raw location in scenarios</span>
-<span id="L155" class="LineNr">155 </span><span class="Delimiter">:(before &quot;End <a href='042name.cc.html#L156'>is_special_name</a> Special-cases&quot;)</span>
+<span id="L155" class="LineNr">155 </span><span class="Delimiter">:(before &quot;End <a href='042name.cc.html#L163'>is_special_name</a> Special-cases&quot;)</span>
 <span id="L156" class="LineNr">156 </span><span class="Normal">if</span> <span class="Delimiter">(</span>s == <span class="Constant">&quot;screen&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L157" class="LineNr">157 </span>
 <span id="L158" class="LineNr">158 </span><span class="Delimiter">:(before &quot;End Rewrite Instruction(curr, <a href='010vm.cc.html#L19'>recipe</a> result)&quot;)</span>
@@ -266,7 +266,7 @@ if ('onhashchange' in window) {
 <span id="L201" class="LineNr">201 </span><span class="Normal">case</span> SCREEN_SHOULD_CONTAIN: <span class="Delimiter">{</span>
 <span id="L202" class="LineNr">202 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Passed<span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L203" class="LineNr">203 </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="L204" class="LineNr">204 </span>  check_screen<span class="Delimiter">(</span><a href='026call.cc.html#L85'>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>name<span class="Delimiter">,</span> -<span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L204" class="LineNr">204 </span>  check_screen<span class="Delimiter">(</span><a href='026call.cc.html#L87'>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>name<span class="Delimiter">,</span> -<span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L205" class="LineNr">205 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L206" class="LineNr">206 </span><span class="Delimiter">}</span>
 <span id="L207" class="LineNr">207 </span>
@@ -295,7 +295,7 @@ if ('onhashchange' in window) {
 <span id="L230" class="LineNr">230 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Passed<span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L231" class="LineNr">231 </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="L232" class="LineNr">232 </span>  assert<span class="Delimiter">(</span>scalar<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)));</span>
-<span id="L233" class="LineNr">233 </span>  check_screen<span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><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> 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="L233" class="LineNr">233 </span>  check_screen<span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><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> 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="L234" class="LineNr">234 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L235" class="LineNr">235 </span><span class="Delimiter">}</span>
 <span id="L236" class="LineNr">236 </span>
@@ -316,23 +316,23 @@ if ('onhashchange' in window) {
 <span id="L251" class="LineNr">251 </span><span class="Delimiter">:(code)</span>
 <span id="L252" class="LineNr">252 </span><span class="Normal">void</span> check_screen<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; expected_contents<span class="Delimiter">,</span> <span class="Normal">const</span> <span class="Normal">int</span> color<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L253" class="LineNr">253 </span>  <span class="Normal">int</span> screen_location = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> SCREEN<span class="Delimiter">)</span>+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L254" class="LineNr">254 </span>  <span class="Normal">int</span> data_offset = <a href='042name.cc.html#L133'>find_element_name</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;screen&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;data&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L254" class="LineNr">254 </span>  <span class="Normal">int</span> data_offset = <a href='042name.cc.html#L140'>find_element_name</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;screen&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;data&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L255" class="LineNr">255 </span>  assert<span class="Delimiter">(</span>data_offset &gt;= <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L256" class="LineNr">256 </span>  <span class="Normal">int</span> screen_data_location = screen_location+data_offset<span class="Delimiter">;</span>  <span class="Comment">// type: address:array:character</span>
 <span id="L257" class="LineNr">257 </span>  <span class="Normal">int</span> screen_data_start = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> screen_data_location<span class="Delimiter">)</span> + <span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// type: array:character</span>
-<span id="L258" class="LineNr">258 </span>  <span class="Normal">int</span> width_offset = <a href='042name.cc.html#L133'>find_element_name</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;screen&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;num-columns&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L258" class="LineNr">258 </span>  <span class="Normal">int</span> width_offset = <a href='042name.cc.html#L140'>find_element_name</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;screen&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;num-columns&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L259" class="LineNr">259 </span>  <span class="Normal">int</span> screen_width = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> screen_location+width_offset<span class="Delimiter">);</span>
-<span id="L260" class="LineNr">260 </span>  <span class="Normal">int</span> height_offset = <a href='042name.cc.html#L133'>find_element_name</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;screen&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;num-rows&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L260" class="LineNr">260 </span>  <span class="Normal">int</span> height_offset = <a href='042name.cc.html#L140'>find_element_name</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;screen&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;num-rows&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L261" class="LineNr">261 </span>  <span class="Normal">int</span> screen_height = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> screen_location+height_offset<span class="Delimiter">);</span>
 <span id="L262" class="LineNr">262 </span>  raw_string_stream cursor<span class="Delimiter">(</span>expected_contents<span class="Delimiter">);</span>
 <span id="L263" class="LineNr">263 </span>  <span class="Comment">// todo: too-long expected_contents should fail</span>
-<span id="L264" class="LineNr">264 </span>  <span class="Normal">int</span> top_index_offset = <a href='042name.cc.html#L133'>find_element_name</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;screen&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;top-idx&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L264" class="LineNr">264 </span>  <span class="Normal">int</span> top_index_offset = <a href='042name.cc.html#L140'>find_element_name</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;screen&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;top-idx&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L265" class="LineNr">265 </span>  <span class="Normal">int</span> top_index = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> screen_location+top_index_offset<span class="Delimiter">);</span>
 <span id="L266" class="LineNr">266 </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> row=top_index/screen_width<span class="Delimiter">;</span>  i &lt; screen_height<span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> row=<span class="Delimiter">(</span>row+<span class="Constant">1</span><span class="Delimiter">)</span>%screen_height<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L267" class="LineNr">267 </span>  <span class="Conceal">¦</span> cursor<span class="Delimiter">.</span><a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">();</span>
 <span id="L268" class="LineNr">268 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>cursor<span class="Delimiter">.</span>at_end<span class="Delimiter">())</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L269" class="LineNr">269 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>cursor<span class="Delimiter">.</span>get<span class="Delimiter">()</span> != <span class="Constant">'.'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L270" class="LineNr">270 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;each row of the expected screen should start with a '.'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L270" class="LineNr">270 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;each row of the expected screen should start with a '.'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L271" class="LineNr">271 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L272" class="LineNr">272 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L273" class="LineNr">273 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
@@ -349,7 +349,7 @@ if ('onhashchange' in window) {
 <span id="L284" class="LineNr">284 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>color == -<span class="Constant">1</span> || color == <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> addr+cell_color_offset<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L285" class="LineNr">285 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// contents match but color is off</span>
 <span id="L286" class="LineNr">286 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L287" class="LineNr">287 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected screen location (&quot;</span> &lt;&lt; row &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; column &lt;&lt; <span class="Constant">&quot;) to contain '&quot;</span> &lt;&lt; unicode_character_at<span class="Delimiter">(</span>addr<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' in color &quot;</span> &lt;&lt; color &lt;&lt; <span class="Constant">&quot; instead of &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> addr+cell_color_offset<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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L287" class="LineNr">287 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected screen location (&quot;</span> &lt;&lt; row &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; column &lt;&lt; <span class="Constant">&quot;) to contain '&quot;</span> &lt;&lt; unicode_character_at<span class="Delimiter">(</span>addr<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' in color &quot;</span> &lt;&lt; color &lt;&lt; <span class="Constant">&quot; instead of &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> addr+cell_color_offset<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#L197'>end</a><span class="Delimiter">();</span>
 <span id="L288" class="LineNr">288 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> dump_screen<span class="Delimiter">();</span>
 <span id="L289" class="LineNr">289 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L290" class="LineNr">290 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
@@ -371,20 +371,20 @@ if ('onhashchange' in window) {
 <span id="L306" class="LineNr">306 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> ostringstream color_phrase<span class="Delimiter">;</span>
 <span id="L307" class="LineNr">307 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>color != -<span class="Constant">1</span><span class="Delimiter">)</span> color_phrase &lt;&lt; <span class="Constant">&quot; in color &quot;</span> &lt;&lt; color<span class="Delimiter">;</span>
 <span id="L308" class="LineNr">308 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L309" class="LineNr">309 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected screen location (&quot;</span> &lt;&lt; row &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; column &lt;&lt; <span class="Constant">&quot;) to contain &quot;</span> &lt;&lt; curr &lt;&lt; expected_pretty &lt;&lt; color_phrase<span class="Delimiter">.</span>str<span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot; instead of &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> addr<span class="Delimiter">))</span> &lt;&lt; actual_pretty &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L309" class="LineNr">309 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected screen location (&quot;</span> &lt;&lt; row &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; column &lt;&lt; <span class="Constant">&quot;) to contain &quot;</span> &lt;&lt; curr &lt;&lt; expected_pretty &lt;&lt; color_phrase<span class="Delimiter">.</span>str<span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot; instead of &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> addr<span class="Delimiter">))</span> &lt;&lt; actual_pretty &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L310" class="LineNr">310 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> dump_screen<span class="Delimiter">();</span>
 <span id="L311" class="LineNr">311 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L312" class="LineNr">312 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L313" class="LineNr">313 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L314" class="LineNr">314 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>cursor<span class="Delimiter">.</span>get<span class="Delimiter">()</span> != <span class="Constant">'.'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L315" class="LineNr">315 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;row &quot;</span> &lt;&lt; row &lt;&lt; <span class="Constant">&quot; of the expected screen is too long</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L315" class="LineNr">315 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;row &quot;</span> &lt;&lt; row &lt;&lt; <span class="Constant">&quot; of the expected screen is too long</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L316" class="LineNr">316 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L317" class="LineNr">317 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L318" class="LineNr">318 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L319" class="LineNr">319 </span>  <span class="Delimiter">}</span>
 <span id="L320" class="LineNr">320 </span>  cursor<span class="Delimiter">.</span><a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">();</span>
 <span id="L321" class="LineNr">321 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!cursor<span class="Delimiter">.</span>at_end<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L322" class="LineNr">322 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected screen has too many rows</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L322" class="LineNr">322 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected screen has too many rows</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L323" class="LineNr">323 </span>  <span class="Conceal">¦</span> Passed = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L324" class="LineNr">324 </span>  <span class="Delimiter">}</span>
 <span id="L325" class="LineNr">325 </span><span class="Delimiter">}</span>
@@ -451,16 +451,16 @@ if ('onhashchange' in window) {
 <span id="L386" class="LineNr">386 </span><span class="Delimiter">:(code)</span>
 <span id="L387" class="LineNr">387 </span><span class="Normal">void</span> dump_screen<span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L388" class="LineNr">388 </span>  <span class="Normal">int</span> screen_location = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> SCREEN<span class="Delimiter">)</span> + <span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L389" class="LineNr">389 </span>  <span class="Normal">int</span> width_offset = <a href='042name.cc.html#L133'>find_element_name</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;screen&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;num-columns&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L389" class="LineNr">389 </span>  <span class="Normal">int</span> width_offset = <a href='042name.cc.html#L140'>find_element_name</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;screen&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;num-columns&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L390" class="LineNr">390 </span>  <span class="Normal">int</span> screen_width = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> screen_location+width_offset<span class="Delimiter">);</span>
-<span id="L391" class="LineNr">391 </span>  <span class="Normal">int</span> height_offset = <a href='042name.cc.html#L133'>find_element_name</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;screen&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;num-rows&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L391" class="LineNr">391 </span>  <span class="Normal">int</span> height_offset = <a href='042name.cc.html#L140'>find_element_name</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;screen&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;num-rows&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L392" class="LineNr">392 </span>  <span class="Normal">int</span> screen_height = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> screen_location+height_offset<span class="Delimiter">);</span>
-<span id="L393" class="LineNr">393 </span>  <span class="Normal">int</span> data_offset = <a href='042name.cc.html#L133'>find_element_name</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;screen&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;data&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L393" class="LineNr">393 </span>  <span class="Normal">int</span> data_offset = <a href='042name.cc.html#L140'>find_element_name</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;screen&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;data&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L394" class="LineNr">394 </span>  assert<span class="Delimiter">(</span>data_offset &gt;= <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L395" class="LineNr">395 </span>  <span class="Normal">int</span> screen_data_location = screen_location+data_offset<span class="Delimiter">;</span>  <span class="Comment">// type: address:array:character</span>
 <span id="L396" class="LineNr">396 </span>  <span class="Normal">int</span> screen_data_start = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> screen_data_location<span class="Delimiter">)</span> + <span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// type: array:character</span>
 <span id="L397" class="LineNr">397 </span>  assert<span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> screen_data_start<span class="Delimiter">)</span> == screen_width*screen_height<span class="Delimiter">);</span>
-<span id="L398" class="LineNr">398 </span>  <span class="Normal">int</span> top_index_offset = <a href='042name.cc.html#L133'>find_element_name</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;screen&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;top-idx&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L398" class="LineNr">398 </span>  <span class="Normal">int</span> top_index_offset = <a href='042name.cc.html#L140'>find_element_name</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;screen&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;top-idx&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L399" class="LineNr">399 </span>  <span class="Normal">int</span> top_index = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> screen_location+top_index_offset<span class="Delimiter">);</span>
 <span id="L400" class="LineNr">400 </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> row=top_index/screen_width<span class="Delimiter">;</span>  i &lt; screen_height<span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> row=<span class="Delimiter">(</span>row+<span class="Constant">1</span><span class="Delimiter">)</span>%screen_height<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L401" class="LineNr">401 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">'.'</span><span class="Delimiter">;</span>
diff --git a/html/085scenario_console.cc.html b/html/085scenario_console.cc.html
index 0f8b3cda..5a7fd154 100644
--- a/html/085scenario_console.cc.html
+++ b/html/085scenario_console.cc.html
@@ -101,7 +101,7 @@ if ('onhashchange' in window) {
 <span id="L39" class="LineNr"> 39 </span><span class="Delimiter">:(before &quot;End Special Scenario Variable Names(r)&quot;)</span>
 <span id="L40" class="LineNr"> 40 </span>Name[r][<span class="Constant">&quot;console&quot;</span>] = CONSOLE<span class="Delimiter">;</span>
 <span id="L41" class="LineNr"> 41 </span><span class="Comment">//: make 'console' always a raw location in scenarios</span>
-<span id="L42" class="LineNr"> 42 </span><span class="Delimiter">:(before &quot;End <a href='042name.cc.html#L156'>is_special_name</a> Special-cases&quot;)</span>
+<span id="L42" class="LineNr"> 42 </span><span class="Delimiter">:(before &quot;End <a href='042name.cc.html#L163'>is_special_name</a> Special-cases&quot;)</span>
 <span id="L43" class="LineNr"> 43 </span><span class="Normal">if</span> <span class="Delimiter">(</span>s == <span class="Constant">&quot;console&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L44" class="LineNr"> 44 </span>
 <span id="L45" class="LineNr"> 45 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Declarations&quot;)</span>
@@ -115,7 +115,7 @@ if ('onhashchange' in window) {
 <span id="L53" class="LineNr"> 53 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L54" class="LineNr"> 54 </span><span class="Normal">case</span> ASSUME_CONSOLE: <span class="Delimiter">{</span>
 <span id="L55" class="LineNr"> 55 </span>  <span class="Comment">// create a temporary recipe just for parsing; it won't contain valid instructions</span>
-<span id="L56" class="LineNr"> 56 </span>  istringstream in<span class="Delimiter">(</span><span class="Constant">&quot;[&quot;</span> + <a href='026call.cc.html#L85'>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>name + <span class="Constant">&quot;]&quot;</span><span class="Delimiter">);</span>
+<span id="L56" class="LineNr"> 56 </span>  istringstream in<span class="Delimiter">(</span><span class="Constant">&quot;[&quot;</span> + <a href='026call.cc.html#L87'>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>name + <span class="Constant">&quot;]&quot;</span><span class="Delimiter">);</span>
 <span id="L57" class="LineNr"> 57 </span>  <a href='010vm.cc.html#L19'>recipe</a> r<span class="Delimiter">;</span>
 <span id="L58" class="LineNr"> 58 </span>  <a href='011load.cc.html#L81'>slurp_body</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
 <span id="L59" class="LineNr"> 59 </span>  <span class="Normal">int</span> num_events = <a href='085scenario_console.cc.html#L284'>count_events</a><span class="Delimiter">(</span>r<span class="Delimiter">);</span>
diff --git a/html/087file.cc.html b/html/087file.cc.html
index 2b2a60d1..25952ce2 100644
--- a/html/087file.cc.html
+++ b/html/087file.cc.html
@@ -172,7 +172,7 @@ if ('onhashchange' in window) {
 <span id="L111" class="LineNr">111 </span>  <span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span> x = <span class="Normal">static_cast</span>&lt;<span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span>&gt;<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="L112" class="LineNr">112 </span>  <span class="Normal">FILE</span>* f = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">FILE</span>*&gt;<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
 <span id="L113" class="LineNr">113 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>f == <span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L114" class="LineNr">114 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;can't read from null file in '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;can't read from null file in '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L115" class="LineNr">115 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L116" class="LineNr">116 </span>  <span class="Delimiter">}</span>
 <span id="L117" class="LineNr">117 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
@@ -182,7 +182,7 @@ if ('onhashchange' in window) {
 <span id="L121" class="LineNr">121 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L122" class="LineNr">122 </span>  <span class="Delimiter">}</span>
 <span id="L123" class="LineNr">123 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ferror<span class="Delimiter">(</span>f<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L124" class="LineNr">124 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;file in invalid state in '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L124" class="LineNr">124 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;file in invalid state in '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
 <span id="L125" class="LineNr">125 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L126" class="LineNr">126 </span>  <span class="Delimiter">}</span>
 <span id="L127" class="LineNr">127 </span>  <span class="Normal">char</span> c = getc<span class="Delimiter">(</span>f<span class="Delimiter">);</span>  <span class="Comment">// todo: unicode</span>
@@ -192,7 +192,7 @@ if ('onhashchange' in window) {
 <span id="L131" class="LineNr">131 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L132" class="LineNr">132 </span>  <span class="Delimiter">}</span>
 <span id="L133" class="LineNr">133 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ferror<span class="Delimiter">(</span>f<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L134" class="LineNr">134 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;couldn't read from file in '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L134" class="LineNr">134 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;couldn't read from file in '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L135" class="LineNr">135 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;  errno: &quot;</span> &lt;&lt; errno &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L136" class="LineNr">136 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L137" class="LineNr">137 </span>  <span class="Delimiter">}</span>
@@ -232,19 +232,19 @@ if ('onhashchange' in window) {
 <span id="L171" class="LineNr">171 </span>  <span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span> x = <span class="Normal">static_cast</span>&lt;<span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span>&gt;<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="L172" class="LineNr">172 </span>  <span class="Normal">FILE</span>* f = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">FILE</span>*&gt;<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
 <span id="L173" class="LineNr">173 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>f == <span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L174" class="LineNr">174 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;can't write to null file in '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L174" class="LineNr">174 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;can't write to null file in '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L175" class="LineNr">175 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L176" class="LineNr">176 </span>  <span class="Delimiter">}</span>
 <span id="L177" class="LineNr">177 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>feof<span class="Delimiter">(</span>f<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L178" class="LineNr">178 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ferror<span class="Delimiter">(</span>f<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L179" class="LineNr">179 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;file in invalid state in '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>current_instruction<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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L179" class="LineNr">179 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;file in invalid state in '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>current_instruction<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#L197'>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>  <span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span> y = <span class="Normal">static_cast</span>&lt;<span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span>&gt;<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L183" class="LineNr">183 </span>  <span class="Normal">char</span> c = <span class="Normal">static_cast</span>&lt;<span class="Normal">char</span>&gt;<span class="Delimiter">(</span>y<span class="Delimiter">);</span>
 <span id="L184" class="LineNr">184 </span>  putc<span class="Delimiter">(</span>c<span class="Delimiter">,</span> f<span class="Delimiter">);</span>  <span class="Comment">// todo: unicode</span>
 <span id="L185" class="LineNr">185 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ferror<span class="Delimiter">(</span>f<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L186" class="LineNr">186 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;couldn't write to file in '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L186" class="LineNr">186 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;couldn't write to file in '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L187" class="LineNr">187 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;  errno: &quot;</span> &lt;&lt; errno &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L188" class="LineNr">188 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L189" class="LineNr">189 </span>  <span class="Delimiter">}</span>
diff --git a/html/089scenario_filesystem.cc.html b/html/089scenario_filesystem.cc.html
index 031884b4..77deb8a0 100644
--- a/html/089scenario_filesystem.cc.html
+++ b/html/089scenario_filesystem.cc.html
@@ -138,7 +138,7 @@ if ('onhashchange' in window) {
 <span id="L76" class="LineNr"> 76 </span><span class="Delimiter">:(before &quot;End Special Scenario Variable Names(r)&quot;)</span>
 <span id="L77" class="LineNr"> 77 </span>Name[r][<span class="Constant">&quot;resources&quot;</span>] = RESOURCES<span class="Delimiter">;</span>
 <span id="L78" class="LineNr"> 78 </span><span class="Comment">//: make 'resources' always a raw location in scenarios</span>
-<span id="L79" class="LineNr"> 79 </span><span class="Delimiter">:(before &quot;End <a href='042name.cc.html#L156'>is_special_name</a> Special-cases&quot;)</span>
+<span id="L79" class="LineNr"> 79 </span><span class="Delimiter">:(before &quot;End <a href='042name.cc.html#L163'>is_special_name</a> Special-cases&quot;)</span>
 <span id="L80" class="LineNr"> 80 </span><span class="Normal">if</span> <span class="Delimiter">(</span>s == <span class="Constant">&quot;resources&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L81" class="LineNr"> 81 </span><span class="Delimiter">:(before &quot;End Initialize Type Of Special Name In Scenario(r)&quot;)</span>
 <span id="L82" class="LineNr"> 82 </span><span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>name == <span class="Constant">&quot;resources&quot;</span><span class="Delimiter">)</span> r<span class="Delimiter">.</span>type = <a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span><span class="Constant">&quot;address:resources&quot;</span><span class="Delimiter">);</span>
@@ -158,7 +158,7 @@ if ('onhashchange' in window) {
 <span id="L96" class="LineNr"> 96 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L97" class="LineNr"> 97 </span><span class="Normal">case</span> ASSUME_RESOURCES: <span class="Delimiter">{</span>
 <span id="L98" class="LineNr"> 98 </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="L99" class="LineNr"> 99 </span>  <a href='089scenario_filesystem.cc.html#L104'>assume_resources</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>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>name<span class="Delimiter">,</span> <a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">());</span>
+<span id="L99" class="LineNr"> 99 </span>  <a href='089scenario_filesystem.cc.html#L104'>assume_resources</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>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>name<span class="Delimiter">,</span> <a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">());</span>
 <span id="L100" class="LineNr">100 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L101" class="LineNr">101 </span><span class="Delimiter">}</span>
 <span id="L102" class="LineNr">102 </span>
@@ -288,12 +288,12 @@ if ('onhashchange' in window) {
 <span id="L226" class="LineNr">226 </span>  <span class="Normal">int</span> resources_address = allocate<span class="Delimiter">(</span><a href='089scenario_filesystem.cc.html#L237'>size_of_resources</a><span class="Delimiter">());</span>
 <span id="L227" class="LineNr">227 </span>  curr = resources_address+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span>+<span class="Comment">/*</span><span class="Comment">offset of 'data' element</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L228" class="LineNr">228 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> resources_data_address<span class="Delimiter">);</span>
-<span id="L229" class="LineNr">229 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing resources data address &quot;</span> &lt;&lt; resources_data_address &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; curr &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L229" class="LineNr">229 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing resources data <a href='043space.cc.html#L83'>address</a> &quot;</span> &lt;&lt; resources_data_address &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; curr &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L230" class="LineNr">230 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> resources_address<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>  <span class="Comment">// initialize refcount</span>
 <span id="L231" class="LineNr">231 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing refcount 1 in location &quot;</span> &lt;&lt; resources_address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L232" class="LineNr">232 </span>  <span class="Comment">// save in product</span>
 <span id="L233" class="LineNr">233 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> RESOURCES<span class="Delimiter">,</span> resources_address<span class="Delimiter">);</span>
-<span id="L234" class="LineNr">234 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing resources address &quot;</span> &lt;&lt; resources_address &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; RESOURCES &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L234" class="LineNr">234 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing resources <a href='043space.cc.html#L83'>address</a> &quot;</span> &lt;&lt; resources_address &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; RESOURCES &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L235" class="LineNr">235 </span><span class="Delimiter">}</span>
 <span id="L236" class="LineNr">236 </span>
 <span id="L237" class="LineNr">237 </span><span class="Normal">int</span> <a href='089scenario_filesystem.cc.html#L237'>size_of_resources</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
diff --git a/html/091socket.cc.html b/html/091socket.cc.html
index 67c46579..23cb2069 100644
--- a/html/091socket.cc.html
+++ b/html/091socket.cc.html
@@ -314,7 +314,7 @@ if ('onhashchange' in window) {
 <span id="L252" class="LineNr">252 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L253" class="LineNr">253 </span>  <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>poll_result &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L254" class="LineNr">254 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">int</span> error_code = errno<span class="Delimiter">;</span>
-<span id="L255" class="LineNr">255 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;error in $read-from-socket</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L255" class="LineNr">255 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;error in $read-from-socket</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L256" class="LineNr">256 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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><span class="Comment">/*</span><span class="Comment">no data</span><span class="Comment">*/</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L257" class="LineNr">257 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">found</span><span class="Comment">*/</span><span class="Constant">false</span><span class="Delimiter">);</span>
 <span id="L258" class="LineNr">258 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">eof</span><span class="Comment">*/</span><span class="Constant">false</span><span class="Delimiter">);</span>
@@ -359,7 +359,7 @@ if ('onhashchange' in window) {
 <span id="L297" class="LineNr">297 </span>  <span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span> y = <span class="Normal">static_cast</span>&lt;<span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span>&gt;<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L298" class="LineNr">298 </span>  <span class="Normal">char</span> c = <span class="Normal">static_cast</span>&lt;<span class="Normal">char</span>&gt;<span class="Delimiter">(</span>y<span class="Delimiter">);</span>
 <span id="L299" class="LineNr">299 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>write<span class="Delimiter">(</span>socket<span class="Delimiter">-&gt;</span>fd<span class="Delimiter">,</span> &amp;c<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L300" class="LineNr">300 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;failed to write to socket</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L300" class="LineNr">300 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;failed to write to socket</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L301" class="LineNr">301 </span>  <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L302" class="LineNr">302 </span>  <span class="Delimiter">}</span>
 <span id="L303" class="LineNr">303 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
diff --git a/html/099hardware_checks.cc.html b/html/099hardware_checks.cc.html
index f8430815..66ae664c 100644
--- a/html/099hardware_checks.cc.html
+++ b/html/099hardware_checks.cc.html
@@ -101,7 +101,7 @@ if ('onhashchange' in window) {
 <span id="L38" class="LineNr">38 </span>  <a href='003trace.cc.html#L161'>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;--- check if <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; has any dependency-injection mistakes&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L39" class="LineNr">39 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> index = <span class="Constant">0</span><span class="Delimiter">;</span>  index &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L40" class="LineNr">40 </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>index<span class="Delimiter">);</span>
-<span id="L41" class="LineNr">41 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation &lt; <a href='010vm.cc.html#L191'>MAX_PRIMITIVE_RECIPES</a><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L41" class="LineNr">41 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='028call_return.cc.html#L114'>is_primitive</a><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="L42" class="LineNr">42 </span>  <span class="Conceal">¦</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="L43" class="LineNr">43 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">const</span> reagent&amp; ing = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L44" class="LineNr">44 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal<span class="Delimiter">(</span>ing<span class="Delimiter">)</span> || ing<span class="Delimiter">.</span>name != <span class="Constant">&quot;0&quot;</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
@@ -111,7 +111,7 @@ if ('onhashchange' in window) {
 <span id="L48" class="LineNr">48 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">const</span> reagent&amp; expected_ing = callee<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L49" class="LineNr">49 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Real_hardware_types<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L50" class="LineNr">50 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>*Real_hardware_types<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)</span> == *expected_ing<span class="Delimiter">.</span>type<span class="Delimiter">)</span>
-<span id="L51" class="LineNr">51 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>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;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': only 'main' can pass 0 into a &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>expected_ing<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L51" class="LineNr">51 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>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;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': only 'main' can pass 0 into a &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L162'>to_string</a><span class="Delimiter">(</span>expected_ing<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L52" class="LineNr">52 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L53" class="LineNr">53 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L54" class="LineNr">54 </span>  <span class="Delimiter">}</span>
diff --git a/html/101run_sandboxed.cc.html b/html/101run_sandboxed.cc.html
index aa776257..bf52a190 100644
--- a/html/101run_sandboxed.cc.html
+++ b/html/101run_sandboxed.cc.html
@@ -153,7 +153,7 @@ if ('onhashchange' in window) {
 <span id="L89" class="LineNr"> 89 </span><span class="Comment">// reads a string, tries to call it as code (treating it as a test), saving</span>
 <span id="L90" class="LineNr"> 90 </span><span class="Comment">// all errors.</span>
 <span id="L91" class="LineNr"> 91 </span><span class="Comment">// returns true if successfully called (no errors found during load and transform)</span>
-<span id="L92" class="LineNr"> 92 </span><span class="Normal">bool</span> <a href='101run_sandboxed.cc.html#L92'>run_interactive</a><span class="Delimiter">(</span><span class="Normal">int</span> address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L92" class="LineNr"> 92 </span><span class="Normal">bool</span> <a href='101run_sandboxed.cc.html#L92'>run_interactive</a><span class="Delimiter">(</span><span class="Normal">int</span> <a href='043space.cc.html#L83'>address</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L93" class="LineNr"> 93 </span>  assert<span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;interactive&quot;</span><span class="Delimiter">)</span> &amp;&amp; get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;interactive&quot;</span><span class="Delimiter">)</span> != <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L94" class="LineNr"> 94 </span>  <span class="Comment">// try to sandbox the run as best you can</span>
 <span id="L95" class="LineNr"> 95 </span>  <span class="Comment">// todo: test this</span>
@@ -161,7 +161,7 @@ if ('onhashchange' in window) {
 <span id="L97" class="LineNr"> 97 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">1</span><span class="Delimiter">;</span> i &lt; Reserved_for_tests<span class="Delimiter">;</span> ++i<span class="Delimiter">)</span>
 <span id="L98" class="LineNr"> 98 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> Memory<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L99" class="LineNr"> 99 </span>  <span class="Delimiter">}</span>
-<span id="L100" class="LineNr">100 </span>  string command = <a href='003trace.cc.html#L367'>trim</a><span class="Delimiter">(</span><a href='101run_sandboxed.cc.html#L474'>strip_comments</a><span class="Delimiter">(</span><a href='038new_text.cc.html#L143'>read_mu_text</a><span class="Delimiter">(</span>address<span class="Delimiter">)));</span>
+<span id="L100" class="LineNr">100 </span>  string command = <a href='003trace.cc.html#L367'>trim</a><span class="Delimiter">(</span><a href='101run_sandboxed.cc.html#L474'>strip_comments</a><span class="Delimiter">(</span><a href='038new_text.cc.html#L143'>read_mu_text</a><span class="Delimiter">(</span><a href='043space.cc.html#L83'>address</a><span class="Delimiter">)));</span>
 <span id="L101" class="LineNr">101 </span>  Name[get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;interactive&quot;</span><span class="Delimiter">)</span>]<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
 <span id="L102" class="LineNr">102 </span>  <a href='101run_sandboxed.cc.html#L145'>run_code_begin</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">should_stash_snapshots</span><span class="Comment">*/</span><span class="Constant">true</span><span class="Delimiter">);</span>
 <span id="L103" class="LineNr">103 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>command<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
@@ -170,7 +170,7 @@ if ('onhashchange' in window) {
 <span id="L106" class="LineNr">106 </span>  Current_routine = <span class="Constant">NULL</span><span class="Delimiter">;</span>
 <span id="L107" class="LineNr">107 </span>  <span class="Comment">// call run(string) but without the scheduling</span>
 <span id="L108" class="LineNr">108 </span>  load<span class="Delimiter">(</span>string<span class="Delimiter">(</span><span class="Constant">&quot;recipe! interactive [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">)</span> +
-<span id="L109" class="LineNr">109 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;new-default-space</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> +  <span class="Comment">// disable automatic abandon so tests can see changes</span>
+<span id="L109" class="LineNr">109 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;local-scope</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> +
 <span id="L110" class="LineNr">110 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;screen:&amp;:screen &lt;- next-ingredient</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> +
 <span id="L111" class="LineNr">111 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;$start-tracking-products</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> +
 <span id="L112" class="LineNr">112 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> command + <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> +
@@ -499,12 +499,12 @@ if ('onhashchange' in window) {
 <span id="L435" class="LineNr">435 </span><span class="Delimiter">:(after &quot;Running One Instruction&quot;)</span>
 <span id="L436" class="LineNr">436 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Track_most_recent_products &amp;&amp; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">)</span> == Call_depth_to_track_most_recent_products_at
 <span id="L437" class="LineNr">437 </span>  <span class="Conceal">¦</span> &amp;&amp; !current_instruction<span class="Delimiter">().</span>is_label
-<span id="L438" class="LineNr">438 </span>  <span class="Conceal">¦</span> &amp;&amp; <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>name != <span class="Constant">&quot;$stop-tracking-products&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L438" class="LineNr">438 </span>  <span class="Conceal">¦</span> &amp;&amp; <a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">().</span>name != <span class="Constant">&quot;$stop-tracking-products&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L439" class="LineNr">439 </span>  Most_recent_products = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
 <span id="L440" class="LineNr">440 </span><span class="Delimiter">}</span>
 <span id="L441" class="LineNr">441 </span><span class="Delimiter">:(before &quot;End Running One Instruction&quot;)</span>
 <span id="L442" class="LineNr">442 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Track_most_recent_products &amp;&amp; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">)</span> == Call_depth_to_track_most_recent_products_at<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L443" class="LineNr">443 </span>  Most_recent_products = <a href='101run_sandboxed.cc.html#L446'>track_most_recent_products</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">(),</span> products<span class="Delimiter">);</span>
+<span id="L443" class="LineNr">443 </span>  Most_recent_products = <a href='101run_sandboxed.cc.html#L446'>track_most_recent_products</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_instruction</a><span class="Delimiter">(),</span> products<span class="Delimiter">);</span>
 <span id="L444" class="LineNr">444 </span><span class="Delimiter">}</span>
 <span id="L445" class="LineNr">445 </span><span class="Delimiter">:(code)</span>
 <span id="L446" class="LineNr">446 </span>string <a href='101run_sandboxed.cc.html#L446'>track_most_recent_products</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; <a href='010vm.cc.html#L32'>instruction</a><span class="Delimiter">,</span> <span class="Normal">const</span> vector&lt;vector&lt;<span class="Normal">double</span>&gt; &gt;&amp; products<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -549,10 +549,10 @@ if ('onhashchange' in window) {
 <span id="L485" class="LineNr">485 </span>  <span class="Identifier">return</span> result<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
 <span id="L486" class="LineNr">486 </span><span class="Delimiter">}</span>
 <span id="L487" class="LineNr">487 </span>
-<span id="L488" class="LineNr">488 </span><span class="Normal">int</span> <a href='101run_sandboxed.cc.html#L488'>stringified_value_of_location</a><span class="Delimiter">(</span><span class="Normal">int</span> address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L488" class="LineNr">488 </span><span class="Normal">int</span> <a href='101run_sandboxed.cc.html#L488'>stringified_value_of_location</a><span class="Delimiter">(</span><span class="Normal">int</span> <a href='043space.cc.html#L83'>address</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L489" class="LineNr">489 </span>  <span class="Comment">// convert to string</span>
 <span id="L490" class="LineNr">490 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L491" class="LineNr">491 </span>  out &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address<span class="Delimiter">));</span>
+<span id="L491" class="LineNr">491 </span>  out &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <a href='043space.cc.html#L83'>address</a><span class="Delimiter">));</span>
 <span id="L492" class="LineNr">492 </span>  <span class="Identifier">return</span> <a href='038new_text.cc.html#L38'>new_mu_text</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span>str<span class="Delimiter">());</span>
 <span id="L493" class="LineNr">493 </span><span class="Delimiter">}</span>
 <span id="L494" class="LineNr">494 </span>
diff --git a/html/counters.mu.html b/html/counters.mu.html
index dac8aeaa..7c36cf61 100644
--- a/html/counters.mu.html
+++ b/html/counters.mu.html
@@ -60,7 +60,7 @@ if ('onhashchange' in window) {
 <span id="L3" class="LineNr"> 3 </span>
 <span id="L4" class="LineNr"> 4 </span><span class="muRecipe">def</span> <a href='counters.mu.html#L4'>new-counter</a> n:num<span class="muRecipe"> -&gt; </span><span class="Constant">default-space</span>:space [
 <span id="L5" class="LineNr"> 5 </span>  <span class="Constant">default-space</span> <span class="Special">&lt;-</span> new <span class="Constant">location:type</span>,<span class="Constant"> 30</span>
-<span id="L6" class="LineNr"> 6 </span>  <span class="Constant">load-ingredients</span>
+<span id="L6" class="LineNr"> 6 </span>  <span class="Constant">load-ingredients</span>  <span class="Comment"># initialize n</span>
 <span id="L7" class="LineNr"> 7 </span>]
 <span id="L8" class="LineNr"> 8 </span>
 <span id="L9" class="LineNr"> 9 </span><span class="muRecipe">def</span> <a href='counters.mu.html#L9'>increment-counter</a> outer:space/names:<a href='counters.mu.html#L4'>new-counter</a>, x:num<span class="muRecipe"> -&gt; </span>n:num/space:1 [