about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2017-11-05 02:00:26 -0800
committerKartik K. Agaram <vc@akkartik.com>2017-11-05 02:00:26 -0800
commitffc9e66b3505990009e47b461eb03d3eb1635258 (patch)
tree6e7ae8df9a0143736500270da2212ee6182a8c85
parent53de40aa88c91150f513852e49b314f130663b64 (diff)
downloadmu-ffc9e66b3505990009e47b461eb03d3eb1635258.tar.gz
4109
-rw-r--r--html/010vm.cc.html16
-rw-r--r--html/011load.cc.html4
-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.html4
-rw-r--r--html/021check_instruction.cc.html18
-rw-r--r--html/022arithmetic.cc.html2
-rw-r--r--html/026call.cc.html6
-rw-r--r--html/028call_return.cc.html2
-rw-r--r--html/030container.cc.html16
-rw-r--r--html/031merge.cc.html4
-rw-r--r--html/032array.cc.html24
-rw-r--r--html/033exclusive_container.cc.html10
-rw-r--r--html/034address.cc.html64
-rw-r--r--html/035lookup.cc.html110
-rw-r--r--html/036refcount.cc.html258
-rw-r--r--html/037abandon.cc.html118
-rw-r--r--html/038new_text.cc.html16
-rw-r--r--html/043space.cc.html947
-rw-r--r--html/044space_surround.cc.html8
-rw-r--r--html/045closure_name.cc.html4
-rw-r--r--html/046check_type_by_name.cc.html2
-rw-r--r--html/050scenario.cc.html22
-rw-r--r--html/053recipe_header.cc.html10
-rw-r--r--html/054static_dispatch.cc.html8
-rw-r--r--html/055shape_shifting_container.cc.html38
-rw-r--r--html/056shape_shifting_recipe.cc.html4
-rw-r--r--html/057immutable.cc.html2
-rw-r--r--html/062convert_ingredients_to_text.cc.html8
-rw-r--r--html/069hash.cc.html12
-rw-r--r--html/071deep_copy.cc.html10
-rw-r--r--html/072recipe.cc.html6
-rw-r--r--html/073scheduler.cc.html2
-rw-r--r--html/074wait.cc.html6
-rw-r--r--html/076continuation.cc.html486
-rw-r--r--html/082scenario_screen.cc.html2
-rw-r--r--html/085scenario_console.cc.html16
-rw-r--r--html/089scenario_filesystem.cc.html18
-rw-r--r--html/099hardware_checks.cc.html6
-rw-r--r--html/101run_sandboxed.cc.html8
41 files changed, 1222 insertions, 1091 deletions
diff --git a/html/010vm.cc.html b/html/010vm.cc.html
index 0f2aa4a5..c37b89f9 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> <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="L137" class="LineNr">137 </span>  <a href='010vm.cc.html#L123'>type_ordinal</a> <a href='043space.cc.html#L82'>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#L82'>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:<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="L437" class="LineNr">437 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L82'>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:<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="L442" class="LineNr">442 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L82'>address</a>:address&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:<a href='043space.cc.html#L82'>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:<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="L447" class="LineNr">447 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L82'>address</a>:boolean&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:<a href='043space.cc.html#L82'>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:<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="L452" class="LineNr">452 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L82'>address</a>:address&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:<a href='043space.cc.html#L82'>address</a>:<a href='043space.cc.html#L82'>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:<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="L457" class="LineNr">457 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L82'>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:<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="L462" class="LineNr">462 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L82'>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>
diff --git a/html/011load.cc.html b/html/011load.cc.html
index 79e5215c..9a6ec529 100644
--- a/html/011load.cc.html
+++ b/html/011load.cc.html
@@ -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>:<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="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#L82'>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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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 508b4862..067f1ca4 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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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 31ae7e61..cb0e91da 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><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="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#L82'>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 c7103cb5..dd6954b0 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 = <a href='043space.cc.html#L83'>address</a>:number
+<span id="L94" class="LineNr"> 94 </span><span class="muData">type</span> foo = <a href='043space.cc.html#L82'>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 ad332815..9ed83089 100644
--- a/html/020run.cc.html
+++ b/html/020run.cc.html
@@ -362,7 +362,7 @@ if ('onhashchange' in window) {
 <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="L298" class="LineNr">298 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><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>
@@ -389,7 +389,7 @@ if ('onhashchange' in window) {
 <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="L325" class="LineNr">325 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><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>
diff --git a/html/021check_instruction.cc.html b/html/021check_instruction.cc.html
index f4f738ab..8c0e076e 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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<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="L76" class="LineNr"> 76 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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>:<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="L85" class="LineNr"> 85 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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:<a href='043space.cc.html#L83'>address</a>: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#L82'>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:<a href='043space.cc.html#L83'>address</a>: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#L82'>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:<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="L182" class="LineNr">182 </span>  reagent b<span class="Delimiter">(</span><span class="Constant">&quot;b:<a href='043space.cc.html#L82'>address</a>:buffer:<a href='043space.cc.html#L82'>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>
diff --git a/html/022arithmetic.cc.html b/html/022arithmetic.cc.html
index e8f8eb5c..3e0d1aff 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>:<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="L67" class="LineNr"> 67 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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>
diff --git a/html/026call.cc.html b/html/026call.cc.html
index ae15c156..096383c6 100644
--- a/html/026call.cc.html
+++ b/html/026call.cc.html
@@ -126,7 +126,7 @@ if ('onhashchange' in window) {
 <span id="L60" class="LineNr"> 60 </span>routine::routine<span class="Delimiter">(</span><a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L61" class="LineNr"> 61 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L62" class="LineNr"> 62 </span>  <span class="Conceal">¦</span> ++Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">;</span>
-<span id="L63" class="LineNr"> 63 </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;new routine; 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="L63" class="LineNr"> 63 </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;new routine; 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="L64" class="LineNr"> 64 </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="L65" class="LineNr"> 65 </span>  <span class="Delimiter">}</span>
 <span id="L66" class="LineNr"> 66 </span>  calls<span class="Delimiter">.</span>push_front<span class="Delimiter">(</span>call<span class="Delimiter">(</span>r<span class="Delimiter">));</span>
@@ -209,7 +209,7 @@ if ('onhashchange' in window) {
 <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="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">&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>
@@ -259,7 +259,7 @@ if ('onhashchange' in window) {
 <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="L196" class="LineNr">196 </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;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>
diff --git a/html/028call_return.cc.html b/html/028call_return.cc.html
index dfbe030e..b5a3306c 100644
--- a/html/028call_return.cc.html
+++ b/html/028call_return.cc.html
@@ -100,7 +100,7 @@ if ('onhashchange' in window) {
 <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">// 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#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="L40" class="LineNr"> 40 </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; <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>
diff --git a/html/030container.cc.html b/html/030container.cc.html
index 49fcfbd2..4008d4bd 100644
--- a/html/030container.cc.html
+++ b/html/030container.cc.html
@@ -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:<a href='043space.cc.html#L83'>address</a>: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#L82'>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:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>
@@ -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>:<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="L478" class="LineNr">478 </span>  <span class="Constant">15</span>:<a href='043space.cc.html#L82'>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>
@@ -636,14 +636,14 @@ if ('onhashchange' in window) {
 <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> <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="L572" class="LineNr">572 </span>  <span class="Normal">int</span> <a href='043space.cc.html#L82'>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#L82'>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>
 <span id="L577" class="LineNr">577 </span>  write_products = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L578" class="LineNr">578 </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>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L579" class="LineNr">579 </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>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><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>
+<span id="L579" class="LineNr">579 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><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>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><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>
 <span id="L580" class="LineNr">580 </span>  <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address+i<span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
 <span id="L581" class="LineNr">581 </span>  <span class="Delimiter">}</span>
 <span id="L582" class="LineNr">582 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -739,7 +739,7 @@ if ('onhashchange' in window) {
 <span id="L672" class="LineNr">672 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> || get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> name<span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L673" class="LineNr">673 </span>  <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> name<span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
 <span id="L674" class="LineNr">674 </span>  <span class="Delimiter">}</span>
-<span id="L675" class="LineNr">675 </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;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;type number: &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> name<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L675" class="LineNr">675 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;type number: &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> name<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L676" class="LineNr">676 </span>  <a href='030container.cc.html#L733'>skip_bracket</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> <span class="Constant">&quot;'&quot;</span>+command+<span class="Constant">&quot;' must begin with '['&quot;</span><span class="Delimiter">);</span>
 <span id="L677" class="LineNr">677 </span>  type_info&amp; info = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> name<span class="Delimiter">));</span>
 <span id="L678" class="LineNr">678 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>Num_calls_to_transform_all_at_first_definition == -<span class="Constant">1</span><span class="Delimiter">)</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><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="L874" class="LineNr">874 </span>  <span class="Delimiter">{</span>x: <span class="Delimiter">(</span><a href='043space.cc.html#L82'>address</a> array <span class="Delimiter">(</span><a href='043space.cc.html#L82'>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 ff2a2334..dcab8062 100644
--- a/html/031merge.cc.html
+++ b/html/031merge.cc.html
@@ -210,7 +210,7 @@ if ('onhashchange' in window) {
 <span id="L145" class="LineNr">145 </span>  state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>push<span class="Delimiter">(</span>merge_check_point<span class="Delimiter">(</span>product<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L146" class="LineNr">146 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L147" class="LineNr">147 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>!state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L148" class="LineNr">148 </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; ingredient_index &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L148" class="LineNr">148 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; ingredient_index &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L149" class="LineNr">149 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>ingredient_index &gt;= <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L150" class="LineNr">150 </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;too few ingredients 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="L151" class="LineNr">151 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
@@ -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#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="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">&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 82126414..6e0fdf4a 100644
--- a/html/032array.cc.html
+++ b/html/032array.cc.html
@@ -122,7 +122,7 @@ if ('onhashchange' in window) {
 <span id="L57" class="LineNr"> 57 </span>  <span class="Conceal">¦</span> array_length_from_type = array_length_from_type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">;</span>
 <span id="L58" class="LineNr"> 58 </span>  <span class="Normal">int</span> <a href='032array.cc.html#L397'>array_length</a> = <a href='002test.cc.html#L91'>to_integer</a><span class="Delimiter">(</span>array_length_from_type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">);</span>
 <span id="L59" class="LineNr"> 59 </span>  <span class="Comment">// initialize array length, so that size_of will work</span>
-<span id="L60" class="LineNr"> 60 </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; <a href='032array.cc.html#L397'>array_length</a> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; base_address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L60" class="LineNr"> 60 </span>  <a href='003trace.cc.html#L161'>trace</a><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; <a href='032array.cc.html#L397'>array_length</a> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; base_address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L61" class="LineNr"> 61 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> base_address<span class="Delimiter">,</span> <a href='032array.cc.html#L397'>array_length</a><span class="Delimiter">);</span>  <span class="Comment">// in array elements</span>
 <span id="L62" class="LineNr"> 62 </span>  <span class="Normal">int</span> size = size_of<span class="Delimiter">(</span>product<span class="Delimiter">);</span>  <span class="Comment">// in locations</span>
 <span id="L63" class="LineNr"> 63 </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;creating array of size &quot;</span> &lt;&lt; size &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</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:<a href='043space.cc.html#L83'>address</a>: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#L82'>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:<a href='043space.cc.html#L83'>address</a>: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#L82'>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:<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="L264" class="LineNr">264 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L82'>address</a>:array:<a href='043space.cc.html#L82'>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:<a href='043space.cc.html#L83'>address</a>: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#L82'>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><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="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#L82'>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>:<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="L301" class="LineNr">301 </span>  <span class="Constant">5</span>:<a href='043space.cc.html#L82'>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#L82'>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>
@@ -416,7 +416,7 @@ if ('onhashchange' in window) {
 <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 <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="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#L82'>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#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>
@@ -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:<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="L415" class="LineNr">415 </span>  reagent x<span class="Delimiter">(</span><span class="Constant">&quot;1:array:<a href='043space.cc.html#L82'>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>
@@ -618,15 +618,15 @@ if ('onhashchange' in window) {
 <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> <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="L556" class="LineNr">556 </span>  <span class="Normal">int</span> <a href='043space.cc.html#L82'>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#L82'>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#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>
+<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">&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>
 <span id="L565" class="LineNr">565 </span>  <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address+i<span class="Delimiter">,</span> value<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
 <span id="L566" class="LineNr">566 </span>  <span class="Delimiter">}</span>
 <span id="L567" class="LineNr">567 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/033exclusive_container.cc.html b/html/033exclusive_container.cc.html
index 88d8d090..ae11dfd7 100644
--- a/html/033exclusive_container.cc.html
+++ b/html/033exclusive_container.cc.html
@@ -228,19 +228,19 @@ if ('onhashchange' in window) {
 <span id="L163" class="LineNr">163 </span>  write_products = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L164" class="LineNr">164 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>tag == <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> base_address<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
 <span id="L165" class="LineNr">165 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> reagent&amp; variant = variant_type<span class="Delimiter">(</span>base<span class="Delimiter">,</span> tag<span class="Delimiter">);</span>
-<span id="L166" class="LineNr">166 </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 1 in location &quot;</span> &lt;&lt; status<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L166" class="LineNr">166 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 1 in location &quot;</span> &lt;&lt; status<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L167" class="LineNr">167 </span>  <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> status<span class="Delimiter">.</span>value<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L168" class="LineNr">168 </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="Delimiter">{</span>
 <span id="L169" class="LineNr">169 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// Write Memory in Successful MAYBE_CONVERT in Run</span>
 <span id="L170" class="LineNr">170 </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; size_of<span class="Delimiter">(</span>variant<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="Conceal">¦</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> 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="L172" class="LineNr">172 </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;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>val<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; product<span class="Delimiter">.</span>value+i &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L172" class="LineNr">172 </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">&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>val<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; product<span class="Delimiter">.</span>value+i &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L173" class="LineNr">173 </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>Memory<span class="Delimiter">,</span> product<span class="Delimiter">.</span>value+i<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
 <span id="L174" class="LineNr">174 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L175" class="LineNr">175 </span>  <span class="Conceal">¦</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">else</span> <span class="Delimiter">{</span>
-<span id="L178" class="LineNr">178 </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; status<span class="Delimiter">.</span>value &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> <a href='003trace.cc.html#L161'>trace</a><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; status<span class="Delimiter">.</span>value &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='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> status<span class="Delimiter">.</span>value<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L180" class="LineNr">180 </span>  <span class="Delimiter">}</span>
 <span id="L181" class="LineNr">181 </span>  <span class="Identifier">break</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#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="L321" class="LineNr">321 </span>  <a href='003trace.cc.html#L161'>trace</a><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>
@@ -398,7 +398,7 @@ if ('onhashchange' in window) {
 <span id="L333" class="LineNr">333 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L334" class="LineNr">334 </span>  <span class="Delimiter">}</span>
 <span id="L335" class="LineNr">335 </span>  <span class="Normal">const</span> reagent&amp; variant = variant_type<span class="Delimiter">(</span>container<span class="Delimiter">,</span> ingredient<span class="Delimiter">.</span>value<span class="Delimiter">);</span>
-<span id="L336" class="LineNr">336 </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;tag: &quot;</span> &lt;&lt; ingredient<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L336" class="LineNr">336 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;tag: &quot;</span> &lt;&lt; ingredient<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L337" class="LineNr">337 </span>  <span class="Comment">// replace union with its variant</span>
 <span id="L338" class="LineNr">338 </span>  state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>pop<span class="Delimiter">();</span>
 <span id="L339" class="LineNr">339 </span>  state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>push<span class="Delimiter">(</span>merge_check_point<span class="Delimiter">(</span>variant<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">));</span>
diff --git a/html/034address.cc.html b/html/034address.cc.html
index 7d5c45c8..83e47f3e 100644
--- a/html/034address.cc.html
+++ b/html/034address.cc.html
@@ -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>:<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="L126" class="LineNr">126 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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#L82'>address</a>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">2</span>:<a href='043space.cc.html#L82'>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>:<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="L135" class="LineNr">135 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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#L82'>address</a>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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>:<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="L146" class="LineNr">146 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>address</a>:<a href='043space.cc.html#L82'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span><a href='043space.cc.html#L82'>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>
@@ -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>:<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="L237" class="LineNr">237 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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>:<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="L243" class="LineNr">243 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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><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="L249" class="LineNr">249 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='043space.cc.html#L82'>address</a> <a href='043space.cc.html#L82'>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>
@@ -366,7 +366,7 @@ if ('onhashchange' in window) {
 <span id="L302" class="LineNr">302 </span>alloc = Memory_allocated_until<span class="Delimiter">;</span>
 <span id="L303" class="LineNr">303 </span>Memory_allocated_until += Initial_memory_per_routine<span class="Delimiter">;</span>
 <span id="L304" class="LineNr">304 </span>alloc_max = Memory_allocated_until<span class="Delimiter">;</span>
-<span id="L305" class="LineNr">305 </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;new&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;routine allocated memory from &quot;</span> &lt;&lt; alloc &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; alloc_max &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L305" class="LineNr">305 </span><a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;new&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;routine allocated memory from &quot;</span> &lt;&lt; alloc &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; alloc_max &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L306" class="LineNr">306 </span>
 <span id="L307" class="LineNr">307 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Declarations&quot;)</span>
 <span id="L308" class="LineNr">308 </span>ALLOCATE<span class="Delimiter">,</span>
@@ -378,13 +378,13 @@ if ('onhashchange' in window) {
 <span id="L314" class="LineNr">314 </span>  <span class="Normal">int</span> size = 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="L315" class="LineNr">315 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</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="L316" class="LineNr">316 </span>  <span class="Conceal">¦</span> <span class="Comment">// array allocation</span>
-<span id="L317" class="LineNr">317 </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;array length is &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; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L317" class="LineNr">317 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;array length is &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; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <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#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="L323" class="LineNr">323 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><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>
 <span id="L325" class="LineNr">325 </span>  <span class="Delimiter">}</span>
 <span id="L326" class="LineNr">326 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
@@ -395,7 +395,7 @@ if ('onhashchange' in window) {
 <span id="L331" class="LineNr">331 </span><span class="Normal">int</span> allocate<span class="Delimiter">(</span><span class="Normal">int</span> size<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L332" class="LineNr">332 </span>  <span class="Comment">// include space for refcount</span>
 <span id="L333" class="LineNr">333 </span>  ++size<span class="Delimiter">;</span>
-<span id="L334" class="LineNr">334 </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;allocating size &quot;</span> &lt;&lt; size &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L334" class="LineNr">334 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;allocating size &quot;</span> &lt;&lt; size &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L335" class="LineNr">335 </span><span class="CommentedCode">//?   Total_alloc += size;</span>
 <span id="L336" class="LineNr">336 </span><span class="CommentedCode">//?   ++Num_alloc;</span>
 <span id="L337" class="LineNr">337 </span>  <span class="Comment">// Allocate Special-cases</span>
@@ -403,11 +403,11 @@ if ('onhashchange' in window) {
 <span id="L339" class="LineNr">339 </span>  <span class="Comment">// really crappy at the moment</span>
 <span id="L340" class="LineNr">340 </span>  ensure_space<span class="Delimiter">(</span>size<span class="Delimiter">);</span>
 <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="L342" class="LineNr">342 </span>  <a href='003trace.cc.html#L161'>trace</a><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> <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="L344" class="LineNr">344 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> <a href='043space.cc.html#L82'>address</a> = result<span class="Delimiter">;</span>  <a href='043space.cc.html#L82'>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">&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#L82'>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#L82'>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>
@@ -440,7 +440,7 @@ if ('onhashchange' in window) {
 <span id="L376" class="LineNr">376 </span>  <span class="Conceal">¦</span> Current_routine<span class="Delimiter">-&gt;</span>alloc = Memory_allocated_until<span class="Delimiter">;</span>
 <span id="L377" class="LineNr">377 </span>  <span class="Conceal">¦</span> Memory_allocated_until += Initial_memory_per_routine<span class="Delimiter">;</span>
 <span id="L378" class="LineNr">378 </span>  <span class="Conceal">¦</span> Current_routine<span class="Delimiter">-&gt;</span>alloc_max = Memory_allocated_until<span class="Delimiter">;</span>
-<span id="L379" class="LineNr">379 </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;new&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;routine allocated memory from &quot;</span> &lt;&lt; Current_routine<span class="Delimiter">-&gt;</span>alloc &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; Current_routine<span class="Delimiter">-&gt;</span>alloc_max &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L379" class="LineNr">379 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;new&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;routine allocated memory from &quot;</span> &lt;&lt; Current_routine<span class="Delimiter">-&gt;</span>alloc &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; Current_routine<span class="Delimiter">-&gt;</span>alloc_max &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L380" class="LineNr">380 </span>  <span class="Delimiter">}</span>
 <span id="L381" class="LineNr">381 </span><span class="Delimiter">}</span>
 <span id="L382" class="LineNr">382 </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>:<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="L387" class="LineNr">387 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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>:<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="L393" class="LineNr">393 </span>  <span class="Constant">11</span>:<a href='043space.cc.html#L82'>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#L82'>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#L82'>address</a>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">11</span>:<a href='043space.cc.html#L82'>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>:<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="L402" class="LineNr">402 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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#L82'>address</a>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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>:<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="L411" class="LineNr">411 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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#L82'>address</a>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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>:<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="L424" class="LineNr">424 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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>:<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="L433" class="LineNr">433 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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 175b0ad5..d888828a 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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<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="L52" class="LineNr"> 52 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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,18 +126,18 @@ 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>:<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="L64" class="LineNr"> 64 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<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="L74" class="LineNr"> 74 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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>
@@ -164,11 +164,11 @@ if ('onhashchange' in window) {
 <span id="L99" class="LineNr"> 99 </span>
 <span id="L100" class="LineNr">100 </span><span class="Normal">void</span> lookup_memory_core<span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">bool</span> check_for_null<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L101" class="LineNr">101 </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="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L102" class="LineNr">102 </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 &lt;&lt; <span class="Constant">&quot; is &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> x<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="L102" class="LineNr">102 </span>  <a href='003trace.cc.html#L161'>trace</a><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 &lt;&lt; <span class="Constant">&quot; is &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> x<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="L103" class="LineNr">103 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><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<span class="Delimiter">));</span>
 <span id="L104" class="LineNr">104 </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="L105" class="LineNr">105 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>value<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L106" class="LineNr">106 </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;skipping refcount at &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L106" class="LineNr">106 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;skipping refcount at &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>value &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> x<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>value+<span class="Constant">1</span><span class="Delimiter">);</span>  <span class="Comment">// skip refcount</span>
 <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>
@@ -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:<a href='043space.cc.html#L83'>address</a>: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#L82'>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:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>
@@ -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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<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="L216" class="LineNr">216 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L82'>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#L82'>address</a>:num/lookup<span class="Special"> &lt;- </span>get <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<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="L244" class="LineNr">244 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<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="L262" class="LineNr">262 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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>:<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="L293" class="LineNr">293 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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>:<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="L304" class="LineNr">304 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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>:<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="L321" class="LineNr">321 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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>:<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="L345" class="LineNr">345 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>address</a>:array:num/lookup<span class="Special"> &lt;- </span>put-index <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<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="L371" class="LineNr">371 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>address</a>:array:num<span class="Special"> &lt;- </span>put-index <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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><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="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#L82'>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#L82'>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#L82'>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#L82'>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#L82'>address</a>:num
+<span id="L391" class="LineNr">391 </span>  *<span class="Constant">5</span>:<a href='043space.cc.html#L82'>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#L82'>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>:<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="L416" class="LineNr">416 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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>:<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="L430" class="LineNr">430 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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>:<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="L440" class="LineNr">440 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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#L82'>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#L82'>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>:<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="L451" class="LineNr">451 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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#L82'>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#L82'>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>:<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="L474" class="LineNr">474 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>
diff --git a/html/036refcount.cc.html b/html/036refcount.cc.html
index f7dc5df7..d8667152 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>:<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="L6" class="LineNr">   6 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:<a href='043space.cc.html#L82'>address</a>:num
+<span id="L8" class="LineNr">   8 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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>
@@ -117,7 +117,7 @@ if ('onhashchange' in window) {
 <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="L55" class="LineNr">  55 </span>  <a href='003trace.cc.html#L161'>trace</a><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>
@@ -135,7 +135,7 @@ if ('onhashchange' in window) {
 <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="L73" class="LineNr">  73 </span>  <a href='003trace.cc.html#L161'>trace</a><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>
@@ -159,9 +159,9 @@ if ('onhashchange' in window) {
 <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="L97" class="LineNr">  97 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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="L99" class="LineNr">  99 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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>
@@ -171,14 +171,14 @@ if ('onhashchange' in window) {
 <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="L109" class="LineNr"> 109 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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="L111" class="LineNr"> 111 </span>  foo <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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="L113" class="LineNr"> 113 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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="L116" class="LineNr"> 116 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L82'>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="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>
@@ -193,12 +193,12 @@ if ('onhashchange' in window) {
 <span id="L128" class="LineNr"> 128 </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="L131" class="LineNr"> 131 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L82'>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="L134" class="LineNr"> 134 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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#L82'>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#L82'>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#L82'>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>
@@ -211,14 +211,14 @@ if ('onhashchange' in window) {
 <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="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#L82'>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="L154" class="LineNr"> 154 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>address</a>:array:<a href='043space.cc.html#L82'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span><a href='043space.cc.html#L82'>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#L82'>address</a>:array:<a href='043space.cc.html#L82'>address</a>:num<span class="Special"> &lt;- </span>put-index *<span class="Constant">2</span>:<a href='043space.cc.html#L82'>address</a>:array:<a href='043space.cc.html#L82'>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#L82'>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>
@@ -230,19 +230,19 @@ if ('onhashchange' in window) {
 <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="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#L82'>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="L175" class="LineNr"> 175 </span>  <span class="Normal">p</span>:<a href='043space.cc.html#L82'>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="L178" class="LineNr"> 178 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>address</a>:num
+<span id="L180" class="LineNr"> 180 </span>  <span class="Constant">4</span>:<a href='043space.cc.html#L82'>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>
@@ -264,17 +264,17 @@ if ('onhashchange' in window) {
 <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="L202" class="LineNr"> 202 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L82'>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="L205" class="LineNr"> 205 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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#L82'>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#L82'>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#L82'>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#L82'>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="L210" class="LineNr"> 210 </span><span class="traceContains">+transform: compute <a href='043space.cc.html#L82'>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="L212" class="LineNr"> 212 </span><span class="traceContains">+transform: <a href='043space.cc.html#L82'>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>
@@ -339,7 +339,7 @@ if ('onhashchange' in window) {
 <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="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#L82'>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>
@@ -374,10 +374,10 @@ if ('onhashchange' in window) {
 <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="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#L82'>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="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#L82'>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>
@@ -421,18 +421,18 @@ if ('onhashchange' in window) {
 <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="L359" class="LineNr"> 359 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!metadata<span class="Delimiter">.</span><a href='043space.cc.html#L82'>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#L82'>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#L82'>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="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#L82'>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="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#L82'>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>
@@ -509,10 +509,10 @@ if ('onhashchange' in window) {
 <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="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#L82'>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="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#L82'>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>
@@ -521,7 +521,7 @@ if ('onhashchange' in window) {
 <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="L459" class="LineNr"> 459 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L82'>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>
@@ -531,16 +531,16 @@ if ('onhashchange' in window) {
 <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="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#L82'>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#L82'>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#L82'>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="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#L82'>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>
@@ -554,7 +554,7 @@ if ('onhashchange' in window) {
 <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="L492" class="LineNr"> 492 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  y:<a href='043space.cc.html#L82'>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>
@@ -566,16 +566,16 @@ if ('onhashchange' in window) {
 <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="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#L82'>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#L82'>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#L82'>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="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#L82'>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>
@@ -586,7 +586,7 @@ if ('onhashchange' in window) {
 <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="L524" class="LineNr"> 524 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L82'>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>
@@ -601,16 +601,16 @@ if ('onhashchange' in window) {
 <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="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#L82'>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#L82'>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#L82'>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="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#L82'>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>
@@ -623,9 +623,9 @@ if ('onhashchange' in window) {
 <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="L561" class="LineNr"> 561 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L82'>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="L563" class="LineNr"> 563 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L82'>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>
@@ -637,7 +637,7 @@ if ('onhashchange' in window) {
 <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="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#L82'>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>
@@ -648,7 +648,7 @@ if ('onhashchange' in window) {
 <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="L586" class="LineNr"> 586 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L82'>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>
@@ -662,7 +662,7 @@ if ('onhashchange' in window) {
 <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="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#L82'>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>
@@ -673,9 +673,9 @@ if ('onhashchange' in window) {
 <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="L611" class="LineNr"> 611 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L82'>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="L613" class="LineNr"> 613 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L82'>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>
@@ -687,7 +687,7 @@ if ('onhashchange' in window) {
 <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="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#L82'>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>
@@ -698,7 +698,7 @@ if ('onhashchange' in window) {
 <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="L636" class="LineNr"> 636 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L82'>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>
@@ -712,7 +712,7 @@ if ('onhashchange' in window) {
 <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="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#L82'>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>
@@ -723,9 +723,9 @@ if ('onhashchange' in window) {
 <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="L661" class="LineNr"> 661 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L82'>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="L663" class="LineNr"> 663 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L82'>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>
@@ -737,7 +737,7 @@ if ('onhashchange' in window) {
 <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="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#L82'>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>
@@ -748,10 +748,10 @@ if ('onhashchange' in window) {
 <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="L686" class="LineNr"> 686 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L82'>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="L689" class="LineNr"> 689 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L82'>address</a>:array:<a href='043space.cc.html#L82'>address</a>:<a href='043space.cc.html#L82'>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>
@@ -762,7 +762,7 @@ if ('onhashchange' in window) {
 <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="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#L82'>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>
@@ -775,7 +775,7 @@ if ('onhashchange' in window) {
 <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="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#L82'>address</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != metadata<span class="Delimiter">.</span><a href='043space.cc.html#L82'>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>
@@ -784,14 +784,14 @@ if ('onhashchange' in window) {
 <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="L722" class="LineNr"> 722 </span>  <a href='003trace.cc.html#L161'>trace</a><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="L727" class="LineNr"> 727 </span>  <a href='003trace.cc.html#L161'>trace</a><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="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#L82'>address</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != metadata<span class="Delimiter">.</span><a href='043space.cc.html#L82'>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>
@@ -817,13 +817,13 @@ if ('onhashchange' in window) {
 <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="L755" class="LineNr"> 755 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L82'>address</a>:num
 <span id="L756" class="LineNr"> 756 </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="L758" class="LineNr"> 758 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>address</a>:num
+<span id="L760" class="LineNr"> 760 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L82'>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#L82'>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#L82'>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>
@@ -835,13 +835,13 @@ if ('onhashchange' in window) {
 <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="L773" class="LineNr"> 773 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L82'>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="L776" class="LineNr"> 776 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>address</a>:num
+<span id="L778" class="LineNr"> 778 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L82'>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#L82'>address</a>:array:bar<span class="Special"> &lt;- </span>put-index *<span class="Constant">3</span>:<a href='043space.cc.html#L82'>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>
@@ -857,11 +857,11 @@ if ('onhashchange' in window) {
 <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="L795" class="LineNr"> 795 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L82'>address</a>:num
 <span id="L796" class="LineNr"> 796 </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="L798" class="LineNr"> 798 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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>]
@@ -885,19 +885,19 @@ if ('onhashchange' in window) {
 <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="L823" class="LineNr"> 823 </span>  <span class="Normal">y</span>:<a href='043space.cc.html#L82'>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="L826" class="LineNr"> 826 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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#L82'>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#L82'>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#L82'>address</a>:num
+<span id="L829" class="LineNr"> 829 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L82'>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#L82'>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#L82'>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#L82'>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#L82'>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="L833" class="LineNr"> 833 </span><span class="traceContains">+transform: compute <a href='043space.cc.html#L82'>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="L835" class="LineNr"> 835 </span><span class="traceContains">+transform: <a href='043space.cc.html#L82'>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>
@@ -918,15 +918,15 @@ if ('onhashchange' in window) {
 <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="L856" class="LineNr"> 856 </span>  <span class="Normal">z</span>:<a href='043space.cc.html#L82'>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="L859" class="LineNr"> 859 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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="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#L82'>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>]
@@ -948,13 +948,13 @@ if ('onhashchange' in window) {
 <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="L886" class="LineNr"> 886 </span>  <span class="Normal">z</span>:<a href='043space.cc.html#L82'>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="L889" class="LineNr"> 889 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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="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#L82'>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>]
@@ -975,11 +975,11 @@ if ('onhashchange' in window) {
 <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="L913" class="LineNr"> 913 </span>  <span class="Normal">y</span>:<a href='043space.cc.html#L82'>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="L916" class="LineNr"> 916 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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>
@@ -992,13 +992,13 @@ if ('onhashchange' in window) {
 <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="L930" class="LineNr"> 930 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L82'>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="L933" class="LineNr"> 933 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>address</a>:array:num
+<span id="L935" class="LineNr"> 935 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L82'>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#L82'>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>
@@ -1010,22 +1010,22 @@ if ('onhashchange' in window) {
 <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="L948" class="LineNr"> 948 </span>  <span class="Normal">b</span>:<a href='043space.cc.html#L82'>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="L952" class="LineNr"> 952 </span>  <span class="Normal">z</span>:<a href='043space.cc.html#L82'>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="L955" class="LineNr"> 955 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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="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#L82'>address</a>:num
+<span id="L960" class="LineNr"> 960 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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="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#L82'>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>
@@ -1048,24 +1048,24 @@ if ('onhashchange' in window) {
 <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="L986" class="LineNr"> 986 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L82'>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="L991" class="LineNr"> 991 </span>  <span class="Normal">y</span>:<a href='043space.cc.html#L82'>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="L998" class="LineNr"> 998 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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#L82'>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#L82'>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#L82'>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#L82'>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>
diff --git a/html/037abandon.cc.html b/html/037abandon.cc.html
index 7af0b622..848bbc41 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>:<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="L6" class="LineNr">  6 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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#L82'>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#L82'>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#L82'>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>
@@ -80,7 +80,7 @@ if ('onhashchange' in window) {
 <span id="L15" class="LineNr"> 15 </span>
 <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="L18" class="LineNr"> 18 </span>  <a href='003trace.cc.html#L161'>trace</a><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#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>
@@ -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> <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="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#L82'>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">&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#L82'>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,30 +103,30 @@ 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><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="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#L82'>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><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="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#L82'>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 = <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="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#L82'>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; <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="L55" class="LineNr"> 55 </span>  <a href='003trace.cc.html#L161'>trace</a><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#L82'>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#L82'>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#L82'>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>
 <span id="L61" class="LineNr"> 61 </span><span class="Normal">if</span> <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> size<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L62" class="LineNr"> 62 </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;picking up space from free-list of size &quot;</span> &lt;&lt; size &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L62" class="LineNr"> 62 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;abandon&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;picking up space from free-list of size &quot;</span> &lt;&lt; size &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L63" class="LineNr"> 63 </span>  <span class="Normal">int</span> result = <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> size<span class="Delimiter">);</span>
-<span id="L64" class="LineNr"> 64 </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 from free list: &quot;</span> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L64" class="LineNr"> 64 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new alloc from free list: &quot;</span> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L65" class="LineNr"> 65 </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> size<span class="Delimiter">,</span> <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> result<span class="Delimiter">));</span>
 <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>
@@ -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>:<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="L78" class="LineNr"> 78 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>address</a>:num
+<span id="L80" class="LineNr"> 80 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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#L82'>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>:<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="L90" class="LineNr"> 90 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>address</a>:array:num
+<span id="L92" class="LineNr"> 92 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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#L82'>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>:<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="L102" class="LineNr">102 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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>:<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="L104" class="LineNr">104 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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>:<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 class="Constant">1</span>:<a href='043space.cc.html#L82'>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>:<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="L116" class="LineNr">116 </span>  foo <span class="Constant">1</span>:<a href='043space.cc.html#L82'>address</a>:num
+<span id="L117" class="LineNr">117 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<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="L139" class="LineNr">139 </span>  <span class="Constant">10</span>:<a href='043space.cc.html#L82'>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#L82'>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>:<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="L142" class="LineNr">142 </span>  <span class="Constant">10</span>:<a href='043space.cc.html#L82'>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>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L151" class="LineNr">151 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L82'>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>:<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="L154" class="LineNr">154 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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#L82'>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#L82'>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#L82'>address</a>:num
+<span id="L157" class="LineNr">157 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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>:<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="L180" class="LineNr">180 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>address</a>:array:<a href='043space.cc.html#L82'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span><a href='043space.cc.html#L82'>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#L82'>address</a>:array:<a href='043space.cc.html#L82'>address</a>:num<span class="Special"> &lt;- </span>put-index *<span class="Constant">2</span>:<a href='043space.cc.html#L82'>address</a>:array:<a href='043space.cc.html#L82'>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#L82'>address</a>:num
+<span id="L183" class="LineNr">183 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>address</a>:array:<a href='043space.cc.html#L82'>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>:<a href='043space.cc.html#L83'>address</a>:num
+<span id="L200" class="LineNr">200 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L82'>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>:<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="L203" class="LineNr">203 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>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#L82'>address</a>:num
+<span id="L206" class="LineNr">206 </span>  *<span class="Constant">2</span>:<a href='043space.cc.html#L82'>address</a>:array:foo<span class="Special"> &lt;- </span>put-index *<span class="Constant">2</span>:<a href='043space.cc.html#L82'>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#L82'>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>:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>:<a href='043space.cc.html#L83'>address</a>:array:num
+<span id="L228" class="LineNr">228 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L82'>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>:<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="L231" class="LineNr">231 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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#L82'>address</a>:array:num
+<span id="L233" class="LineNr">233 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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 7dab898f..6b422c40 100644
--- a/html/038new_text.cc.html
+++ b/html/038new_text.cc.html
@@ -95,7 +95,7 @@ if ('onhashchange' in window) {
 <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#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="L33" class="LineNr"> 33 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><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>
 <span id="L36" class="LineNr"> 36 </span>
@@ -106,10 +106,10 @@ if ('onhashchange' in window) {
 <span id="L41" class="LineNr"> 41 </span><span class="CommentedCode">//?   Total_alloc += string_length+1;</span>
 <span id="L42" class="LineNr"> 42 </span><span class="CommentedCode">//?   ++Num_alloc;</span>
 <span id="L43" class="LineNr"> 43 </span>  <span class="Normal">int</span> result = allocate<span class="Delimiter">(</span>string_length+<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="L44" class="LineNr"> 44 </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 string refcount 0 in location &quot;</span> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L44" class="LineNr"> 44 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing string refcount 0 in location &quot;</span> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L45" class="LineNr"> 45 </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="L46" class="LineNr"> 46 </span>  <span class="Normal">int</span> curr_address = result+<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="L47" class="LineNr"> 47 </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 string length &quot;</span> &lt;&lt; string_length &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; curr_address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><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">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing string length &quot;</span> &lt;&lt; string_length &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; curr_address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L48" class="LineNr"> 48 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr_address<span class="Delimiter">,</span> string_length<span class="Delimiter">);</span>
 <span id="L49" class="LineNr"> 49 </span>  ++curr_address<span class="Delimiter">;</span>  <span class="Comment">// skip length</span>
 <span id="L50" class="LineNr"> 50 </span>  <span class="Normal">int</span> curr = <span class="Constant">0</span><span class="Delimiter">;</span>
@@ -118,7 +118,7 @@ if ('onhashchange' in window) {
 <span id="L53" class="LineNr"> 53 </span>  <span class="Conceal">¦</span> <span class="Normal">uint32_t</span> curr_character<span class="Delimiter">;</span>
 <span id="L54" class="LineNr"> 54 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>curr &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>contents<span class="Delimiter">));</span>
 <span id="L55" class="LineNr"> 55 </span>  <span class="Conceal">¦</span> tb_utf8_char_to_unicode<span class="Delimiter">(</span>&amp;curr_character<span class="Delimiter">,</span> &amp;raw_contents[curr]<span class="Delimiter">);</span>
-<span id="L56" class="LineNr"> 56 </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 string character &quot;</span> &lt;&lt; curr_character &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; curr_address &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> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing string character &quot;</span> &lt;&lt; curr_character &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; curr_address &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> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr_address<span class="Delimiter">,</span> curr_character<span class="Delimiter">);</span>
 <span id="L58" class="LineNr"> 58 </span>  <span class="Conceal">¦</span> curr += tb_utf8_char_length<span class="Delimiter">(</span>raw_contents[curr]<span class="Delimiter">);</span>
 <span id="L59" class="LineNr"> 59 </span>  <span class="Conceal">¦</span> ++curr_address<span class="Delimiter">;</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>:<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="L123" class="LineNr">123 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L82'>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> <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="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#L82'>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#L82'>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> <a href='043space.cc.html#L83'>address</a><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#L82'>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>
diff --git a/html/043space.cc.html b/html/043space.cc.html
index 66900af8..ac9c1f97 100644
--- a/html/043space.cc.html
+++ b/html/043space.cc.html
@@ -71,480 +71,479 @@ if ('onhashchange' in window) {
 <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="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="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="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="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="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>
+<span id="L8" class="LineNr">  8 </span><span class="Comment">//: Warning: messing with 'default-space' can corrupt memory. Don't share</span>
+<span id="L9" class="LineNr">  9 </span><span class="Comment">//: default-space between recipes. Later we'll see how to chain spaces safely.</span>
+<span id="L10" class="LineNr"> 10 </span>
+<span id="L11" class="LineNr"> 11 </span><span class="Comment">//: Under the hood, a space is an array of locations in memory.</span>
+<span id="L12" class="LineNr"> 12 </span><span class="Delimiter">:(before &quot;End Mu Types Initialization&quot;)</span>
+<span id="L13" class="LineNr"> 13 </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="L14" class="LineNr"> 14 </span>
+<span id="L15" class="LineNr"> 15 </span><span class="Delimiter">:(scenario set_default_space)</span>
+<span id="L16" class="LineNr"> 16 </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="L17" class="LineNr"> 17 </span><span class="Comment"># then local 0 is really location 12, local 1 is really location 13, and so on.</span>
+<span id="L18" class="LineNr"> 18 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L19" class="LineNr"> 19 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use 'new'</span>
+<span id="L20" class="LineNr"> 20 </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="L21" class="LineNr"> 21 </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="L22" class="LineNr"> 22 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L23" class="LineNr"> 23 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
+<span id="L24" class="LineNr"> 24 </span>]
+<span id="L25" class="LineNr"> 25 </span><span class="traceContains">+mem: storing 23 in location 13</span>
+<span id="L26" class="LineNr"> 26 </span>
+<span id="L27" class="LineNr"> 27 </span><span class="Delimiter">:(scenario lookup_sidesteps_default_space)</span>
+<span id="L28" class="LineNr"> 28 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L29" class="LineNr"> 29 </span>  <span class="Comment"># pretend pointer from outside (2000 reserved for refcount)</span>
+<span id="L30" class="LineNr"> 30 </span>  <span class="Constant">2001</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L31" class="LineNr"> 31 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use 'new'</span>
+<span id="L32" class="LineNr"> 32 </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="L33" class="LineNr"> 33 </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="L34" class="LineNr"> 34 </span>  <span class="Comment"># actual start of this recipe</span>
+<span id="L35" class="LineNr"> 35 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span>copy <span class="Constant">1000</span>/unsafe
+<span id="L36" class="LineNr"> 36 </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="L37" class="LineNr"> 37 </span>  <span class="Constant">8</span>:num/<span class="Special">raw &lt;- </span>copy *<span class="Constant">1</span>:&amp;:num
+<span id="L38" class="LineNr"> 38 </span>]
+<span id="L39" class="LineNr"> 39 </span><span class="traceContains">+mem: storing 34 in location 8</span>
+<span id="L40" class="LineNr"> 40 </span>
+<span id="L41" class="LineNr"> 41 </span><span class="Comment">//: precondition: disable name conversion for 'default-space'</span>
+<span id="L42" class="LineNr"> 42 </span>
+<span id="L43" class="LineNr"> 43 </span><span class="Delimiter">:(scenario convert_names_passes_default_space)</span>
+<span id="L44" class="LineNr"> 44 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L45" class="LineNr"> 45 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L46" class="LineNr"> 46 </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="L47" class="LineNr"> 47 </span>]
+<span id="L48" class="LineNr"> 48 </span><span class="traceContains">+name: assign x 1</span>
+<span id="L49" class="LineNr"> 49 </span><span class="traceAbsent">-name: assign default-space 1</span>
+<span id="L50" class="LineNr"> 50 </span>
+<span id="L51" class="LineNr"> 51 </span><span class="Delimiter">:(before &quot;End <a href='042name.cc.html#L99'>is_disqualified</a> Special-cases&quot;)</span>
+<span id="L52" class="LineNr"> 52 </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="L53" class="LineNr"> 53 </span>  x<span class="Delimiter">.</span>initialized = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L54" class="LineNr"> 54 </span><span class="Delimiter">:(before &quot;End <a href='042name.cc.html#L163'>is_special_name</a> Special-cases&quot;)</span>
+<span id="L55" class="LineNr"> 55 </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="L56" class="LineNr"> 56 </span>
+<span id="L57" class="LineNr"> 57 </span><span class="Comment">//: core implementation</span>
+<span id="L58" class="LineNr"> 58 </span>
+<span id="L59" class="LineNr"> 59 </span><span class="Delimiter">:(before &quot;End call Fields&quot;)</span>
+<span id="L60" class="LineNr"> 60 </span><span class="Normal">int</span> default_space<span class="Delimiter">;</span>
+<span id="L61" class="LineNr"> 61 </span><span class="Delimiter">:(before &quot;End call Constructor&quot;)</span>
+<span id="L62" class="LineNr"> 62 </span>default_space = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L63" class="LineNr"> 63 </span>
+<span id="L64" class="LineNr"> 64 </span><span class="Delimiter">:(before &quot;Begin canonize(x) Lookups&quot;)</span>
+<span id="L65" class="LineNr"> 65 </span><a href='043space.cc.html#L67'>absolutize</a><span class="Delimiter">(</span>x<span class="Delimiter">);</span>
+<span id="L66" class="LineNr"> 66 </span><span class="Delimiter">:(code)</span>
+<span id="L67" class="LineNr"> 67 </span><span class="Normal">void</span> <a href='043space.cc.html#L67'>absolutize</a><span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L68" class="LineNr"> 68 </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="L69" class="LineNr"> 69 </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="L70" class="LineNr"> 70 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>initialized<span class="Delimiter">)</span>
+<span id="L71" class="LineNr"> 71 </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="L72" class="LineNr"> 72 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L82'>address</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>value<span class="Delimiter">,</span> <a href='043space.cc.html#L78'>space_base</a><span class="Delimiter">(</span>x<span class="Delimiter">)));</span>
+<span id="L73" class="LineNr"> 73 </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="L74" class="LineNr"> 74 </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="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">//: hook replaced in a later layer</span>
+<span id="L78" class="LineNr"> 78 </span><span class="Normal">int</span> <a href='043space.cc.html#L78'>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="L79" class="LineNr"> 79 </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="L80" class="LineNr"> 80 </span><span class="Delimiter">}</span>
+<span id="L81" class="LineNr"> 81 </span>
+<span id="L82" class="LineNr"> 82 </span><span class="Normal">int</span> <a href='043space.cc.html#L82'>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="L83" class="LineNr"> 83 </span>  assert<span class="Delimiter">(</span>offset &gt;= <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L84" class="LineNr"> 84 </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="L85" class="LineNr"> 85 </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="L86" class="LineNr"> 86 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>offset &gt;= size<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L87" class="LineNr"> 87 </span>  <span class="Conceal">¦</span> <span class="Comment">// todo: test</span>
+<span id="L88" class="LineNr"> 88 </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="L89" class="LineNr"> 89 </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="L90" class="LineNr"> 90 </span>  <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L91" class="LineNr"> 91 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</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>  <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="L94" class="LineNr"> 94 </span><span class="Delimiter">}</span>
+<span id="L95" class="LineNr"> 95 </span>
+<span id="L96" class="LineNr"> 96 </span><span class="Comment">//: reads and writes to the 'default-space' variable have special behavior</span>
+<span id="L97" class="LineNr"> 97 </span>
+<span id="L98" class="LineNr"> 98 </span><span class="Delimiter">:(after &quot;Begin Preprocess write_memory(x, data)&quot;)</span>
+<span id="L99" class="LineNr"> 99 </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="L100" class="LineNr">100 </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="L101" class="LineNr">101 </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#L82'>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="L102" class="LineNr">102 </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="L103" class="LineNr">103 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L104" class="LineNr">104 </span><span class="Delimiter">}</span>
+<span id="L105" class="LineNr">105 </span><span class="Delimiter">:(code)</span>
+<span id="L106" class="LineNr">106 </span><span class="Normal">bool</span> <a href='043space.cc.html#L106'>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="L107" class="LineNr">107 </span>  canonize_type<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
+<span id="L108" class="LineNr">108 </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="L109" class="LineNr">109 </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="L110" class="LineNr">110 </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="L111" class="LineNr">111 </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="L112" class="LineNr">112 </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="L113" class="LineNr">113 </span><span class="Delimiter">}</span>
+<span id="L114" class="LineNr">114 </span>
+<span id="L115" class="LineNr">115 </span><span class="Delimiter">:(scenario get_default_space)</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="Normal">default</span>-space:space<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L118" class="LineNr">118 </span>  <span class="Constant">1</span>:space/<span class="Special">raw &lt;- </span>copy <span class="Normal">default</span>-space:space
+<span id="L119" class="LineNr">119 </span>]
+<span id="L120" class="LineNr">120 </span><span class="traceContains">+mem: storing 10 in location 1</span>
+<span id="L121" class="LineNr">121 </span>
+<span id="L122" class="LineNr">122 </span><span class="Delimiter">:(after &quot;Begin Preprocess read_memory(x)&quot;)</span>
+<span id="L123" class="LineNr">123 </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="L124" class="LineNr">124 </span>  vector&lt;<span class="Normal">double</span>&gt; result<span class="Delimiter">;</span>
+<span id="L125" class="LineNr">125 </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="L126" class="LineNr">126 </span>  <span class="Identifier">return</span> result<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="SalientComment">//:: fix 'get'</span>
+<span id="L130" class="LineNr">130 </span>
+<span id="L131" class="LineNr">131 </span><span class="Delimiter">:(scenario lookup_sidesteps_default_space_in_get)</span>
+<span id="L132" class="LineNr">132 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L133" class="LineNr">133 </span>  <span class="Comment"># pretend pointer to container from outside (2000 reserved for refcount)</span>
+<span id="L134" class="LineNr">134 </span>  <span class="Constant">2001</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L135" class="LineNr">135 </span>  <span class="Constant">2002</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
+<span id="L136" class="LineNr">136 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use 'new'</span>
+<span id="L137" class="LineNr">137 </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="L138" class="LineNr">138 </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="L139" class="LineNr">139 </span>  <span class="Comment"># actual start of this recipe</span>
+<span id="L140" class="LineNr">140 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span>copy <span class="Constant">1000</span>/unsafe
+<span id="L141" class="LineNr">141 </span>  <span class="Constant">1</span>:&amp;:point<span class="Special"> &lt;- </span>copy <span class="Constant">2000</span>/unsafe
+<span id="L142" class="LineNr">142 </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="L143" class="LineNr">143 </span>]
+<span id="L144" class="LineNr">144 </span><span class="traceContains">+mem: storing 35 in location 9</span>
+<span id="L145" class="LineNr">145 </span>
+<span id="L146" class="LineNr">146 </span><span class="Delimiter">:(before &quot;Read element&quot; following &quot;case GET:&quot;)</span>
+<span id="L147" class="LineNr">147 </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="L148" class="LineNr">148 </span>
+<span id="L149" class="LineNr">149 </span><span class="SalientComment">//:: fix 'index'</span>
+<span id="L150" class="LineNr">150 </span>
+<span id="L151" class="LineNr">151 </span><span class="Delimiter">:(scenario lookup_sidesteps_default_space_in_index)</span>
+<span id="L152" class="LineNr">152 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L153" class="LineNr">153 </span>  <span class="Comment"># pretend pointer to array from outside (2000 reserved for refcount)</span>
+<span id="L154" class="LineNr">154 </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="L155" class="LineNr">155 </span>  <span class="Constant">2002</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L156" class="LineNr">156 </span>  <span class="Constant">2003</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
+<span id="L157" class="LineNr">157 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use 'new'</span>
+<span id="L158" class="LineNr">158 </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="L159" class="LineNr">159 </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="L160" class="LineNr">160 </span>  <span class="Comment"># actual start of this recipe</span>
+<span id="L161" class="LineNr">161 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span>copy <span class="Constant">1000</span>/unsafe
+<span id="L162" class="LineNr">162 </span>  <span class="Constant">1</span>:&amp;:@:num<span class="Special"> &lt;- </span>copy <span class="Constant">2000</span>/unsafe
+<span id="L163" class="LineNr">163 </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="L164" class="LineNr">164 </span>]
+<span id="L165" class="LineNr">165 </span><span class="traceContains">+mem: storing 35 in location 9</span>
+<span id="L166" class="LineNr">166 </span>
+<span id="L167" class="LineNr">167 </span><span class="Delimiter">:(before &quot;Read element&quot; following &quot;case INDEX:&quot;)</span>
+<span id="L168" class="LineNr">168 </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="L169" class="LineNr">169 </span>
+<span id="L170" class="LineNr">170 </span><span class="SalientComment">//:: 'local-scope' is a convenience operation to automatically deduce</span>
+<span id="L171" class="LineNr">171 </span><span class="SalientComment">//:: the amount of space to allocate in a default space with names</span>
+<span id="L172" class="LineNr">172 </span>
+<span id="L173" class="LineNr">173 </span><span class="Delimiter">:(scenario local_scope)</span>
+<span id="L174" class="LineNr">174 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L175" class="LineNr">175 </span>  local-scope
+<span id="L176" class="LineNr">176 </span>  <span class="Normal">x</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L177" class="LineNr">177 </span>  <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3</span>
+<span id="L178" class="LineNr">178 </span>]
+<span id="L179" class="LineNr">179 </span><span class="Comment"># allocate space for x and y, as well as the chaining slot at 0</span>
+<span id="L180" class="LineNr">180 </span><span class="traceContains">+mem: array length is 3</span>
+<span id="L181" class="LineNr">181 </span>
+<span id="L182" class="LineNr">182 </span><span class="Delimiter">:(before &quot;End <a href='042name.cc.html#L99'>is_disqualified</a> Special-cases&quot;)</span>
+<span id="L183" class="LineNr">183 </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="L184" class="LineNr">184 </span>  x<span class="Delimiter">.</span>initialized = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L185" class="LineNr">185 </span><span class="Delimiter">:(before &quot;End <a href='042name.cc.html#L163'>is_special_name</a> Special-cases&quot;)</span>
+<span id="L186" class="LineNr">186 </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="L187" class="LineNr">187 </span>
+<span id="L188" class="LineNr">188 </span><span class="Delimiter">:(before &quot;End Rewrite Instruction(curr, <a href='010vm.cc.html#L19'>recipe</a> result)&quot;)</span>
+<span id="L189" class="LineNr">189 </span><span class="Comment">// rewrite 'local-scope' to</span>
+<span id="L190" class="LineNr">190 </span><span class="Comment">//   ```</span>
+<span id="L191" class="LineNr">191 </span><span class="Comment">//   default-space:space &lt;- new location:type, number-of-locals:literal</span>
+<span id="L192" class="LineNr">192 </span><span class="Comment">//   ```</span>
+<span id="L193" class="LineNr">193 </span><span class="Comment">// where number-of-locals is Name[recipe][&quot;&quot;]</span>
+<span id="L194" class="LineNr">194 </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="L195" class="LineNr">195 </span>  <a href='043space.cc.html#L198'>rewrite_default_space_instruction</a><span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L196" class="LineNr">196 </span><span class="Delimiter">}</span>
+<span id="L197" class="LineNr">197 </span><span class="Delimiter">:(code)</span>
+<span id="L198" class="LineNr">198 </span><span class="Normal">void</span> <a href='043space.cc.html#L198'>rewrite_default_space_instruction</a><span class="Delimiter">(</span>instruction&amp; curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L199" class="LineNr">199 </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="L200" class="LineNr">200 </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="L201" class="LineNr">201 </span>  curr<span class="Delimiter">.</span>name = <span class="Constant">&quot;new&quot;</span><span class="Delimiter">;</span>
+<span id="L202" class="LineNr">202 </span>  <span class="Constant">curr.ingredients.push_back(reagent(&quot;location:type</span><span class="Constant">&quot;));</span>
+<span id="L203" class="LineNr">203 </span>  <span class="Constant">curr.ingredients.push_back(reagent(&quot;number-of-locals:literal</span><span class="Constant">&quot;));</span>
+<span id="L204" class="LineNr">204 </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="L205" class="LineNr">205 </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="L206" class="LineNr">206 </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="L207" class="LineNr">207 </span><span class="Delimiter">}</span>
+<span id="L208" class="LineNr">208 </span><span class="Delimiter">:(after &quot;Begin Preprocess read_memory(x)&quot;)</span>
+<span id="L209" class="LineNr">209 </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="L210" class="LineNr">210 </span>  vector&lt;<span class="Normal">double</span>&gt; result<span class="Delimiter">;</span>
+<span id="L211" class="LineNr">211 </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="L212" class="LineNr">212 </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="L213" class="LineNr">213 </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="L214" class="LineNr">214 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L215" class="LineNr">215 </span><span class="Delimiter">}</span>
+<span id="L216" class="LineNr">216 </span><span class="Delimiter">:(after &quot;Begin Preprocess write_memory(x, data)&quot;)</span>
+<span id="L217" class="LineNr">217 </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="L218" class="LineNr">218 </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="L219" class="LineNr">219 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L220" class="LineNr">220 </span><span class="Delimiter">}</span>
+<span id="L221" class="LineNr">221 </span>
+<span id="L222" class="LineNr">222 </span><span class="SalientComment">//:: try to reclaim the default-space when a recipe returns</span>
+<span id="L223" class="LineNr">223 </span>
+<span id="L224" class="LineNr">224 </span><span class="Delimiter">:(scenario local_scope_reclaimed_on_return)</span>
+<span id="L225" class="LineNr">225 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L226" class="LineNr">226 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>foo
+<span id="L227" class="LineNr">227 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>foo
+<span id="L228" class="LineNr">228 </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="L229" class="LineNr">229 </span>]
+<span id="L230" class="LineNr">230 </span><span class="muRecipe">def</span> foo [
+<span id="L231" class="LineNr">231 </span>  local-scope
+<span id="L232" class="LineNr">232 </span>  <span class="Normal">result</span>:num<span class="Special"> &lt;- </span>copy <span class="Normal">default</span>-space:space
+<span id="L233" class="LineNr">233 </span>  <span class="Identifier">return</span> result:num
+<span id="L234" class="LineNr">234 </span>]
+<span id="L235" class="LineNr">235 </span><span class="Comment"># both calls to foo should have received the same default-space</span>
+<span id="L236" class="LineNr">236 </span><span class="traceContains">+mem: storing 1 in location 3</span>
+<span id="L237" class="LineNr">237 </span>
+<span id="L238" class="LineNr">238 </span><span class="Comment">//: todo: do this in a transform, rather than magically in the 'return' instruction</span>
+<span id="L239" class="LineNr">239 </span><span class="Delimiter">:(after &quot;Falling Through End Of Recipe&quot;)</span>
+<span id="L240" class="LineNr">240 </span><a href='043space.cc.html#L244'>reclaim_default_space</a><span class="Delimiter">();</span>
+<span id="L241" class="LineNr">241 </span><span class="Delimiter">:(after &quot;Begin Return&quot;)</span>
+<span id="L242" class="LineNr">242 </span><a href='043space.cc.html#L244'>reclaim_default_space</a><span class="Delimiter">();</span>
+<span id="L243" class="LineNr">243 </span><span class="Delimiter">:(code)</span>
+<span id="L244" class="LineNr">244 </span><span class="Normal">void</span> <a href='043space.cc.html#L244'>reclaim_default_space</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L245" class="LineNr">245 </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="L246" class="LineNr">246 </span>  reagent default_space<span class="Delimiter">(</span><span class="Constant">&quot;default-space:<a href='043space.cc.html#L82'>address</a>:array:location&quot;</span><span class="Delimiter">);</span>
+<span id="L247" class="LineNr">247 </span>  <a href='036refcount.cc.html#L59'>decrement_any_refcounts</a><span class="Delimiter">(</span>default_space<span class="Delimiter">);</span>
+<span id="L248" class="LineNr">248 </span><span class="Delimiter">}</span>
+<span id="L249" class="LineNr">249 </span><span class="Delimiter">:(after &quot;Begin Decrement Refcounts(canonized_x)&quot;)</span>
+<span id="L250" class="LineNr">250 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='043space.cc.html#L106'>is_mu_space</a><span class="Delimiter">(</span>canonized_x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L251" class="LineNr">251 </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="L252" class="LineNr">252 </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="L253" class="LineNr">253 </span>  <span class="Comment">// this branch relies on global state</span>
+<span id="L254" class="LineNr">254 </span>  string recipe_name<span class="Delimiter">;</span>
+<span id="L255" class="LineNr">255 </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="L256" class="LineNr">256 </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="L257" class="LineNr">257 </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="L258" class="LineNr">258 </span>  <span class="Delimiter">}</span>
+<span id="L259" class="LineNr">259 </span>  <span class="Normal">else</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>canonized_x<span class="Delimiter">.</span>name != <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">)</span>
+<span id="L261" class="LineNr">261 </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="L262" class="LineNr">262 </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="L263" class="LineNr">263 </span>  <span class="Conceal">¦</span> recipe_name = <a href='026call.cc.html#L85'>current_recipe_name</a><span class="Delimiter">();</span>
+<span id="L264" class="LineNr">264 </span>  <span class="Delimiter">}</span>
+<span id="L265" class="LineNr">265 </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="L266" class="LineNr">266 </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="L267" class="LineNr">267 </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="L268" class="LineNr">268 </span>  <span class="Comment">// Reclaim Space(space_address, space_recipe_ordinal, space_recipe)</span>
+<span id="L269" class="LineNr">269 </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="L270" class="LineNr">270 </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="L271" class="LineNr">271 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L272" class="LineNr">272 </span><span class="Delimiter">}</span>
+<span id="L273" class="LineNr">273 </span><span class="Delimiter">:(code)</span>
+<span id="L274" class="LineNr">274 </span><span class="Normal">bool</span> <a href='043space.cc.html#L274'>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="L275" class="LineNr">275 </span>  <span class="Identifier">return</span> !r<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>empty<span class="Delimiter">()</span>
+<span id="L276" class="LineNr">276 </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="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>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="L278" class="LineNr">278 </span><span class="Delimiter">}</span>
+<span id="L279" class="LineNr">279 </span>
+<span id="L280" class="LineNr">280 </span><span class="Comment">//:</span>
+<span id="L281" class="LineNr">281 </span>
+<span id="L282" class="LineNr">282 </span><span class="Delimiter">:(scenario local_scope_reclaims_locals)</span>
+<span id="L283" class="LineNr">283 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L284" class="LineNr">284 </span>  local-scope
+<span id="L285" class="LineNr">285 </span>  <span class="Normal">x</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [abc]
+<span id="L286" class="LineNr">286 </span>]
+<span id="L287" class="LineNr">287 </span><span class="Comment"># x</span>
+<span id="L288" class="LineNr">288 </span><span class="traceContains">+mem: automatically abandoning 1004</span>
+<span id="L289" class="LineNr">289 </span><span class="Comment"># local-scope</span>
+<span id="L290" class="LineNr">290 </span><span class="traceContains">+mem: automatically abandoning 1000</span>
+<span id="L291" class="LineNr">291 </span>
+<span id="L292" class="LineNr">292 </span><span class="Delimiter">:(before &quot;Reclaim Space(space_address, space_recipe_ordinal, space_recipe)&quot;)</span>
+<span id="L293" class="LineNr">293 </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="L294" class="LineNr">294 </span>  set&lt;string&gt; reclaimed_locals<span class="Delimiter">;</span>
+<span id="L295" class="LineNr">295 </span>  <a href='003trace.cc.html#L161'>trace</a><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="L296" class="LineNr">296 </span>  <span class="Comment">// update any refcounts for variables in the space -- in the context of the space</span>
+<span id="L297" class="LineNr">297 </span>  call_stack calls_stash = <a href='043space.cc.html#L318'>save_call_stack</a><span class="Delimiter">(</span>space_address<span class="Delimiter">,</span> space_recipe_ordinal<span class="Delimiter">);</span>
+<span id="L298" class="LineNr">298 </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="L299" class="LineNr">299 </span>  <span class="Comment">// no early returns until we restore 'calls' below</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="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="L301" class="LineNr">301 </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="L302" class="LineNr">302 </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="L303" class="LineNr">303 </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="L304" class="LineNr">304 </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="L305" class="LineNr">305 </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="L306" class="LineNr">306 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// local variables only</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>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="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;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="L309" class="LineNr">309 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// End Checks For Reclaiming Locals</span>
+<span id="L310" class="LineNr">310 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><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="L311" class="LineNr">311 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> canonize<span class="Delimiter">(</span>product<span class="Delimiter">);</span>
+<span id="L312" class="LineNr">312 </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="L313" class="LineNr">313 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L314" class="LineNr">314 </span>  <span class="Delimiter">}</span>
+<span id="L315" class="LineNr">315 </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="L316" class="LineNr">316 </span><span class="Delimiter">}</span>
+<span id="L317" class="LineNr">317 </span><span class="Delimiter">:(code)</span>
+<span id="L318" class="LineNr">318 </span>call_stack <a href='043space.cc.html#L318'>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="L319" class="LineNr">319 </span>  call dummy_call<span class="Delimiter">(</span>space_recipe_ordinal<span class="Delimiter">);</span>
+<span id="L320" class="LineNr">320 </span>  dummy_call<span class="Delimiter">.</span>default_space = space_address<span class="Delimiter">;</span>
+<span id="L321" class="LineNr">321 </span>  call_stack result<span class="Delimiter">;</span>
+<span id="L322" class="LineNr">322 </span>  result<span class="Delimiter">.</span>push_front<span class="Delimiter">(</span>dummy_call<span class="Delimiter">);</span>
+<span id="L323" class="LineNr">323 </span>  <span class="Identifier">return</span> result<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="Delimiter">:(scenario local_variables_can_outlive_call)</span>
+<span id="L327" class="LineNr">327 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L328" class="LineNr">328 </span>  local-scope
+<span id="L329" class="LineNr">329 </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="L330" class="LineNr">330 </span>  <span class="Normal">y</span>:space<span class="Special"> &lt;- </span>copy <span class="Normal">default</span>-space:space
+<span id="L331" class="LineNr">331 </span>]
+<span id="L332" class="LineNr">332 </span><span class="traceAbsent">-mem: automatically abandoning 1005</span>
+<span id="L333" class="LineNr">333 </span>
+<span id="L334" class="LineNr">334 </span><span class="Comment">//:</span>
+<span id="L335" class="LineNr">335 </span>
+<span id="L336" class="LineNr">336 </span><span class="Delimiter">:(scenario local_scope_does_not_reclaim_escaping_locals)</span>
+<span id="L337" class="LineNr">337 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L338" class="LineNr">338 </span>  <span class="Constant">1</span>:text<span class="Special"> &lt;- </span>foo
+<span id="L339" class="LineNr">339 </span>]
+<span id="L340" class="LineNr">340 </span><span class="muRecipe">def</span> foo [
+<span id="L341" class="LineNr">341 </span>  local-scope
+<span id="L342" class="LineNr">342 </span>  <span class="Normal">x</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [abc]
+<span id="L343" class="LineNr">343 </span>  <span class="Identifier">return</span> x:text
+<span id="L344" class="LineNr">344 </span>]
+<span id="L345" class="LineNr">345 </span><span class="Comment"># local-scope</span>
+<span id="L346" class="LineNr">346 </span><span class="traceContains">+mem: automatically abandoning 1000</span>
+<span id="L347" class="LineNr">347 </span><span class="Comment"># x</span>
+<span id="L348" class="LineNr">348 </span><span class="traceAbsent">-mem: automatically abandoning 1004</span>
+<span id="L349" class="LineNr">349 </span>
+<span id="L350" class="LineNr">350 </span><span class="Delimiter">:(after &quot;Begin Return&quot;)</span>  <span class="Comment">// before reclaiming default-space</span>
+<span id="L351" class="LineNr">351 </span><a href='043space.cc.html#L353'>increment_refcounts_of_return_ingredients</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">);</span>
+<span id="L352" class="LineNr">352 </span><span class="Delimiter">:(code)</span>
+<span id="L353" class="LineNr">353 </span><span class="Normal">void</span> <a href='043space.cc.html#L353'>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="L354" class="LineNr">354 </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="L355" class="LineNr">355 </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="L356" class="LineNr">356 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L357" class="LineNr">357 </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="L358" class="LineNr">358 </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="L359" class="LineNr">359 </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="L360" class="LineNr">360 </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="L361" class="LineNr">361 </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="L362" class="LineNr">362 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L363" class="LineNr">363 </span>  <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="Comment">//:</span>
+<span id="L367" class="LineNr">367 </span>
+<span id="L368" class="LineNr">368 </span><span class="Delimiter">:(scenario local_scope_frees_up_addresses_inside_containers)</span>
+<span id="L369" class="LineNr">369 </span><span class="muData">container</span> foo [
+<span id="L370" class="LineNr">370 </span>  <span class="Normal">x</span>:num
+<span id="L371" class="LineNr">371 </span>  <span class="Normal">y</span>:&amp;:num
+<span id="L372" class="LineNr">372 </span>]
+<span id="L373" class="LineNr">373 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L374" class="LineNr">374 </span>  local-scope
+<span id="L375" class="LineNr">375 </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="L376" class="LineNr">376 </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="L377" class="LineNr">377 </span>  <span class="Comment"># x and y are both cleared when main returns</span>
+<span id="L378" class="LineNr">378 </span>]
+<span id="L379" class="LineNr">379 </span><span class="traceContains">+mem: automatically abandoning 1006</span>
+<span id="L380" class="LineNr">380 </span>
+<span id="L381" class="LineNr">381 </span><span class="Delimiter">:(scenario local_scope_returns_addresses_inside_containers)</span>
+<span id="L382" class="LineNr">382 </span><span class="muData">container</span> foo [
+<span id="L383" class="LineNr">383 </span>  <span class="Normal">x</span>:num
+<span id="L384" class="LineNr">384 </span>  <span class="Normal">y</span>:&amp;:num
+<span id="L385" class="LineNr">385 </span>]
+<span id="L386" class="LineNr">386 </span><span class="muRecipe">def</span> f [
+<span id="L387" class="LineNr">387 </span>  local-scope
+<span id="L388" class="LineNr">388 </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="L389" class="LineNr">389 </span>  *x:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">12</span>
+<span id="L390" class="LineNr">390 </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="L391" class="LineNr">391 </span>  <span class="Comment"># since y is 'escaping' f, it should not be cleared</span>
+<span id="L392" class="LineNr">392 </span>  <span class="Identifier">return</span> y:foo
+<span id="L393" class="LineNr">393 </span>]
+<span id="L394" class="LineNr">394 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L395" class="LineNr">395 </span>  <span class="Constant">1</span>:foo<span class="Special"> &lt;- </span>f
+<span id="L396" class="LineNr">396 </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="L397" class="LineNr">397 </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="L398" class="LineNr">398 </span>  <span class="Constant">5</span>:num<span class="Special"> &lt;- </span>copy *<span class="Constant">4</span>:&amp;:num
+<span id="L399" class="LineNr">399 </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="L400" class="LineNr">400 </span>  <span class="Constant">4</span>:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L401" class="LineNr">401 </span>]
+<span id="L402" class="LineNr">402 </span><span class="traceContains">+mem: storing 34 in location 1</span>
+<span id="L403" class="LineNr">403 </span><span class="traceContains">+mem: storing 1006 in location 2</span>
+<span id="L404" class="LineNr">404 </span><span class="traceContains">+mem: storing 34 in location 3</span>
+<span id="L405" class="LineNr">405 </span><span class="Comment"># refcount of 1:foo shouldn't include any stray ones from f</span>
+<span id="L406" class="LineNr">406 </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="L407" class="LineNr">407 </span><span class="traceContains">+mem: incrementing refcount of 1006: 1 -&gt; 2</span>
+<span id="L408" class="LineNr">408 </span><span class="Comment"># 1:foo wasn't abandoned/cleared</span>
+<span id="L409" class="LineNr">409 </span><span class="traceContains">+run: {5: &quot;number&quot;} &lt;- copy {4: (&quot;address&quot; &quot;number&quot;), &quot;lookup&quot;: ()}</span>
+<span id="L410" class="LineNr">410 </span><span class="traceContains">+mem: storing 12 in location 5</span>
+<span id="L411" class="LineNr">411 </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="L412" class="LineNr">412 </span><span class="traceContains">+mem: decrementing refcount of 1006: 2 -&gt; 1</span>
+<span id="L413" class="LineNr">413 </span><span class="traceContains">+run: {4: (&quot;address&quot; &quot;number&quot;)} &lt;- copy {0: &quot;literal&quot;}</span>
+<span id="L414" class="LineNr">414 </span><span class="traceContains">+mem: decrementing refcount of 1006: 1 -&gt; 0</span>
+<span id="L415" class="LineNr">415 </span><span class="traceContains">+mem: automatically abandoning 1006</span>
+<span id="L416" class="LineNr">416 </span>
+<span id="L417" class="LineNr">417 </span><span class="Delimiter">:(scenario local_scope_claims_return_values_when_not_saved)</span>
+<span id="L418" class="LineNr">418 </span><span class="muRecipe">def</span> f [
+<span id="L419" class="LineNr">419 </span>  local-scope
+<span id="L420" class="LineNr">420 </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="L421" class="LineNr">421 </span>  <span class="Identifier">return</span> x:&amp;:num
+<span id="L422" class="LineNr">422 </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>  f  <span class="Comment"># doesn't save result</span>
+<span id="L425" class="LineNr">425 </span>]
+<span id="L426" class="LineNr">426 </span><span class="Comment"># x reclaimed</span>
+<span id="L427" class="LineNr">427 </span><span class="traceContains">+mem: automatically abandoning 1004</span>
+<span id="L428" class="LineNr">428 </span><span class="Comment"># f's local scope reclaimed</span>
+<span id="L429" class="LineNr">429 </span><span class="traceContains">+mem: automatically abandoning 1000</span>
+<span id="L430" class="LineNr">430 </span>
+<span id="L431" class="LineNr">431 </span><span class="SalientComment">//:: all recipes must set default-space one way or another</span>
+<span id="L432" class="LineNr">432 </span>
+<span id="L433" class="LineNr">433 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L434" class="LineNr">434 </span><span class="Normal">bool</span> Hide_missing_default_space_errors = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L435" class="LineNr">435 </span><span class="Delimiter">:(before &quot;End Checks&quot;)</span>
+<span id="L436" class="LineNr">436 </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="L437" class="LineNr">437 </span><span class="Delimiter">:(code)</span>
+<span id="L438" class="LineNr">438 </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="L439" class="LineNr">439 </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="L440" class="LineNr">440 </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="L441" class="LineNr">441 </span>  <span class="Comment">// End check_default_space Special-cases</span>
+<span id="L442" class="LineNr">442 </span>  <span class="Comment">// assume recipes with only numeric addresses know what they're doing (usually tests)</span>
+<span id="L443" class="LineNr">443 </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="L444" class="LineNr">444 </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="L445" class="LineNr">445 </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="L446" class="LineNr">446 </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="L447" class="LineNr">447 </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="L448" class="LineNr">448 </span><span class="Delimiter">}</span>
+<span id="L449" class="LineNr">449 </span><span class="Delimiter">:(after &quot;Load Mu Prelude&quot;)</span>
+<span id="L450" class="LineNr">450 </span>Hide_missing_default_space_errors = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L451" class="LineNr">451 </span><span class="Delimiter">:(after &quot;Test Runs&quot;)</span>
+<span id="L452" class="LineNr">452 </span>Hide_missing_default_space_errors = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L453" class="LineNr">453 </span><span class="Delimiter">:(after &quot;Running Main&quot;)</span>
+<span id="L454" class="LineNr">454 </span>Hide_missing_default_space_errors = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L455" class="LineNr">455 </span>
+<span id="L456" class="LineNr">456 </span><span class="Delimiter">:(code)</span>
+<span id="L457" class="LineNr">457 </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="L458" class="LineNr">458 </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="L459" class="LineNr">459 </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="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>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="L461" class="LineNr">461 </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="L462" class="LineNr">462 </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="L463" class="LineNr">463 </span>  <span class="Delimiter">}</span>
+<span id="L464" class="LineNr">464 </span>  <span class="Identifier">return</span> <span class="Constant">false</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="Comment">// reagent comparison -- only between reagents in a single recipe</span>
+<span id="L468" class="LineNr">468 </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="L469" class="LineNr">469 </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="L470" class="LineNr">470 </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="L471" class="LineNr">471 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L472" class="LineNr">472 </span><span class="Delimiter">}</span>
+<span id="L473" class="LineNr">473 </span>
+<span id="L474" class="LineNr">474 </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="L475" class="LineNr">475 </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="L476" class="LineNr">476 </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="L477" class="LineNr">477 </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="L478" class="LineNr">478 </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="L479" class="LineNr">479 </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="L480" class="LineNr">480 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/044space_surround.cc.html b/html/044space_surround.cc.html
index f1f007b9..c6291f2e 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> <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="L40" class="LineNr">40 </span><span class="Normal">int</span> <a href='043space.cc.html#L78'>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="L42" class="LineNr">42 </span>  <span class="Identifier">return</span> <a href='043space.cc.html#L78'>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> <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="L45" class="LineNr">45 </span><span class="Normal">int</span> <a href='043space.cc.html#L78'>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 = <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="L48" class="LineNr">48 </span>  <span class="Normal">int</span> result = <a href='043space.cc.html#L78'>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>
diff --git a/html/045closure_name.cc.html b/html/045closure_name.cc.html
index ad68b75f..1740cdf2 100644
--- a/html/045closure_name.cc.html
+++ b/html/045closure_name.cc.html
@@ -66,7 +66,7 @@ if ('onhashchange' in window) {
 <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 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="L6" class="LineNr">  6 </span><span class="Comment">//: todo: warn on default-space abuse. default-space for one recipe 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>
@@ -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">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="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#L82'>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>
diff --git a/html/046check_type_by_name.cc.html b/html/046check_type_by_name.cc.html
index 2003837b..332f1843 100644
--- a/html/046check_type_by_name.cc.html
+++ b/html/046check_type_by_name.cc.html
@@ -110,7 +110,7 @@ if ('onhashchange' in window) {
 <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="L49" class="LineNr"> 49 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='043space.cc.html#L106'>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>
diff --git a/html/050scenario.cc.html b/html/050scenario.cc.html
index 698ac6c8..e47925c1 100644
--- a/html/050scenario.cc.html
+++ b/html/050scenario.cc.html
@@ -479,7 +479,7 @@ if ('onhashchange' in window) {
 <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> <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="L415" class="LineNr">415 </span>  <span class="Conceal">¦</span> <span class="Normal">int</span> <a href='043space.cc.html#L82'>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>
@@ -496,16 +496,16 @@ if ('onhashchange' in window) {
 <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> <a href='043space.cc.html#L83'>address</a><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#L82'>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="L434" class="LineNr">434 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><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#L82'>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#L82'>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#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="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#L82'>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><a href='043space.cc.html#L83'>address</a><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#L82'>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>
@@ -528,7 +528,7 @@ if ('onhashchange' in window) {
 <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> <a href='043space.cc.html#L83'>address</a> = 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#L82'>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#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>
@@ -536,7 +536,7 @@ if ('onhashchange' in window) {
 <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><a href='043space.cc.html#L83'>address</a><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#L82'>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>
@@ -544,7 +544,7 @@ if ('onhashchange' in window) {
 <span id="L477" class="LineNr">477 </span><span class="Delimiter">}</span>
 <span id="L478" class="LineNr">478 </span>
 <span id="L479" class="LineNr">479 </span><span class="Normal">void</span> check_mu_text<span class="Delimiter">(</span><span class="Normal">int</span> start<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; literal<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L480" class="LineNr">480 </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 text length at &quot;</span> &lt;&lt; start &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L480" class="LineNr">480 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking text length at &quot;</span> &lt;&lt; start &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <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>
@@ -554,7 +554,7 @@ if ('onhashchange' in window) {
 <span id="L487" class="LineNr">487 </span>  <span class="Delimiter">}</span>
 <span id="L488" class="LineNr">488 </span>  <span class="Normal">int</span> curr = start+<span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// now skip length</span>
 <span id="L489" class="LineNr">489 </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>literal<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<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="L490" class="LineNr">490 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><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#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>
@@ -944,7 +944,7 @@ if ('onhashchange' in window) {
 <span id="L877" class="LineNr">877 </span><span class="Delimiter">:(after &quot;case _SYSTEM:&quot;)</span>
 <span id="L878" class="LineNr">878 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Current_scenario<span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L879" class="LineNr">879 </span>
-<span id="L880" class="LineNr">880 </span><span class="SalientComment">//:: Warn if people use '_' manually in function names. They're reserved for internal use.</span>
+<span id="L880" class="LineNr">880 </span><span class="SalientComment">//:: Warn if people use '_' manually in recipe names. They're reserved for internal use.</span>
 <span id="L881" class="LineNr">881 </span>
 <span id="L882" class="LineNr">882 </span><span class="Delimiter">:(scenario recipe_name_with_underscore)</span>
 <span id="L883" class="LineNr">883 </span><span class="Special">% Hide_errors = true;</span>
diff --git a/html/053recipe_header.cc.html b/html/053recipe_header.cc.html
index 6591374c..3d30ac4c 100644
--- a/html/053recipe_header.cc.html
+++ b/html/053recipe_header.cc.html
@@ -90,7 +90,7 @@ if ('onhashchange' in window) {
 <span id="L24" class="LineNr"> 24 </span>
 <span id="L25" class="LineNr"> 25 </span><span class="Delimiter">:(before &quot;End Recipe Refinements&quot;)</span>
 <span id="L26" class="LineNr"> 26 </span><span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="Constant">'['</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L27" class="LineNr"> 27 </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;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;recipe has a header; parsing&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L27" class="LineNr"> 27 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;recipe has a header; parsing&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L28" class="LineNr"> 28 </span>  <a href='053recipe_header.cc.html#L32'>load_recipe_header</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> result<span class="Delimiter">);</span>
 <span id="L29" class="LineNr"> 29 </span><span class="Delimiter">}</span>
 <span id="L30" class="LineNr"> 30 </span>
@@ -108,7 +108,7 @@ if ('onhashchange' in window) {
 <span id="L42" class="LineNr"> 42 </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; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; should say '-&gt;' and not '&lt;-'</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="L43" class="LineNr"> 43 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>s == <span class="Constant">&quot;-&gt;&quot;</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L44" class="LineNr"> 44 </span>  <span class="Conceal">¦</span> result<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span>s<span class="Delimiter">));</span>
-<span id="L45" class="LineNr"> 45 </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;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;header ingredient: &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>back<span class="Delimiter">().</span>original_string &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L45" class="LineNr"> 45 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;header ingredient: &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>back<span class="Delimiter">().</span>original_string &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L46" class="LineNr"> 46 </span>  <span class="Conceal">¦</span> skip_whitespace_but_not_newline<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L47" class="LineNr"> 47 </span>  <span class="Delimiter">}</span>
 <span id="L48" class="LineNr"> 48 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L238'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="Constant">'['</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -119,7 +119,7 @@ if ('onhashchange' in window) {
 <span id="L53" class="LineNr"> 53 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L54" class="LineNr"> 54 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L55" class="LineNr"> 55 </span>  <span class="Conceal">¦</span> result<span class="Delimiter">.</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span>s<span class="Delimiter">));</span>
-<span id="L56" class="LineNr"> 56 </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;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;header product: &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>products<span class="Delimiter">.</span>back<span class="Delimiter">().</span>original_string &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> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;header product: &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>products<span class="Delimiter">.</span>back<span class="Delimiter">().</span>original_string &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> skip_whitespace_but_not_newline<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L58" class="LineNr"> 58 </span>  <span class="Delimiter">}</span>
 <span id="L59" class="LineNr"> 59 </span>  <span class="Comment">// End Load Recipe Header(result)</span>
@@ -215,7 +215,7 @@ if ('onhashchange' in window) {
 <span id="L149" class="LineNr">149 </span>  <span class="Delimiter">}</span>
 <span id="L150" class="LineNr">150 </span><span class="Delimiter">}</span>
 <span id="L151" class="LineNr">151 </span><span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">.</span>has_header<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L152" class="LineNr">152 </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;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;recipe &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; has a header&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L152" class="LineNr">152 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;recipe &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; has a header&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><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">//: Support type abbreviations in headers.</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:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>
diff --git a/html/054static_dispatch.cc.html b/html/054static_dispatch.cc.html
index 12306ed6..5d3cac06 100644
--- a/html/054static_dispatch.cc.html
+++ b/html/054static_dispatch.cc.html
@@ -107,7 +107,7 @@ if ('onhashchange' in window) {
 <span id="L41" class="LineNr"> 41 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <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="L42" class="LineNr"> 42 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Recipe_variants<span class="Delimiter">,</span> result<span class="Delimiter">.</span>name<span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> new_name<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="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;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;switching &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; new_name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L44" class="LineNr"> 44 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;switching &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; new_name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L45" class="LineNr"> 45 </span>  <span class="Conceal">¦</span> result<span class="Delimiter">.</span>name = new_name<span class="Delimiter">;</span>
 <span id="L46" class="LineNr"> 46 </span>  <span class="Conceal">¦</span> result<span class="Delimiter">.</span>is_autogenerated = <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L47" class="LineNr"> 47 </span>  <span class="Delimiter">}</span>
@@ -408,10 +408,10 @@ if ('onhashchange' in window) {
 <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="L345" class="LineNr">345 </span>  <span class="Conceal">¦</span> <span class="Comment">// prefer variants 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="L348" class="LineNr">348 </span>  <span class="Conceal">¦</span> <span class="Comment">// prefer variants 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>
@@ -711,7 +711,7 @@ if ('onhashchange' in window) {
 <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="L648" class="LineNr">648 </span><span class="muRecipe">def</span> foo a:<a href='043space.cc.html#L82'>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>
diff --git a/html/055shape_shifting_container.cc.html b/html/055shape_shifting_container.cc.html
index 8953e839..b7a86272 100644
--- a/html/055shape_shifting_container.cc.html
+++ b/html/055shape_shifting_container.cc.html
@@ -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><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="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#L82'>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><a href='043space.cc.html#L83'>address</a> _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#L82'>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]
@@ -210,7 +210,7 @@ if ('onhashchange' in window) {
 <span id="L144" class="LineNr">144 </span>
 <span id="L145" class="LineNr">145 </span><span class="Delimiter">:(before &quot;End container Name Refinements&quot;)</span>
 <span id="L146" class="LineNr">146 </span><span class="Normal">if</span> <span class="Delimiter">(</span>name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">':'</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L147" class="LineNr">147 </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;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;container has type ingredients; parsing&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L147" class="LineNr">147 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;container has type ingredients; parsing&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L148" class="LineNr">148 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!read_type_ingredients<span class="Delimiter">(</span>name<span class="Delimiter">,</span> command<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L149" class="LineNr">149 </span>  <span class="Conceal">¦</span> <span class="Comment">// error; skip rest of the container definition and continue</span>
 <span id="L150" class="LineNr">150 </span>  <span class="Conceal">¦</span> <a href='016dilated_reagent.cc.html#L57'>slurp_balanced_bracket</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
@@ -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><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="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#L82'>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#L82'>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>
@@ -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:<a href='043space.cc.html#L83'>address</a>: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#L82'>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#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="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#L82'>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#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="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#L82'>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>
@@ -542,7 +542,7 @@ if ('onhashchange' in window) {
 <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#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#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="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#L82'>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>
@@ -564,7 +564,7 @@ if ('onhashchange' in window) {
 <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#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#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="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#L82'>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#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>
@@ -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#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="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#L82'>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#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="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#L82'>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#L82'>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>
@@ -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><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="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#L82'>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#L82'>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#L82'>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><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="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#L82'>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#L82'>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#L82'>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>:<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="L681" class="LineNr">681 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L82'>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 6166e4b8..b1de6ae2 100644
--- a/html/056shape_shifting_recipe.cc.html
+++ b/html/056shape_shifting_recipe.cc.html
@@ -649,7 +649,7 @@ if ('onhashchange' in window) {
 <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="L585" class="LineNr"> 585 </span>  <span class="Delimiter">{</span>x: <span class="Delimiter">(</span>c <span class="Delimiter">(</span><a href='043space.cc.html#L82'>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 [
@@ -788,7 +788,7 @@ if ('onhashchange' in window) {
 <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> <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="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#L82'>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>
diff --git a/html/057immutable.cc.html b/html/057immutable.cc.html
index 5058f120..5b28aafb 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><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="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#L82'>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>
diff --git a/html/062convert_ingredients_to_text.cc.html b/html/062convert_ingredients_to_text.cc.html
index 091d01fa..eda38d88 100644
--- a/html/062convert_ingredients_to_text.cc.html
+++ b/html/062convert_ingredients_to_text.cc.html
@@ -61,7 +61,7 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="Comment">//: make some functions more friendly by trying to auto-convert their ingredients to text</span>
+<span id="L1" class="LineNr">  1 </span><span class="Comment">//: make some recipes more friendly by trying to auto-convert their ingredients to text</span>
 <span id="L2" class="LineNr">  2 </span>
 <span id="L3" class="LineNr">  3 </span><span class="Delimiter">:(scenarios transform)</span>
 <span id="L4" class="LineNr">  4 </span><span class="Delimiter">:(scenario rewrite_stashes_to_text)</span>
@@ -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;:<a href='043space.cc.html#L83'>address</a>: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#L82'>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;:<a href='043space.cc.html#L83'>address</a>: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#L82'>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,7 +158,7 @@ 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;:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>
diff --git a/html/069hash.cc.html b/html/069hash.cc.html
index 9521a756..00d88349 100644
--- a/html/069hash.cc.html
+++ b/html/069hash.cc.html
@@ -63,7 +63,7 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="Comment">// A universal hash function that can handle objects of any type.</span>
+<span id="L1" class="LineNr">  1 </span><span class="Comment">// Compute a hash for objects of any type.</span>
 <span id="L2" class="LineNr">  2 </span><span class="Comment">//</span>
 <span id="L3" class="LineNr">  3 </span><span class="Comment">// The way it's currently implemented, two objects will have the same hash if</span>
 <span id="L4" class="LineNr">  4 </span><span class="Comment">// all their non-address fields (all the way down) expand to the same sequence</span>
@@ -120,10 +120,10 @@ if ('onhashchange' in window) {
 <span id="L55" class="LineNr"> 55 </span>
 <span id="L56" class="LineNr"> 56 </span><span class="Normal">size_t</span> <a href='069hash.cc.html#L56'>hash_mu_address</a><span class="Delimiter">(</span><span class="Normal">size_t</span> h<span class="Delimiter">,</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L57" class="LineNr"> 57 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>value == <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="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;location &quot;</span> &lt;&lt; r<span class="Delimiter">.</span>value &lt;&lt; <span class="Constant">&quot; is &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> r<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="L58" class="LineNr"> 58 </span>  <a href='003trace.cc.html#L161'>trace</a><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; r<span class="Delimiter">.</span>value &lt;&lt; <span class="Constant">&quot; is &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> r<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="L59" class="LineNr"> 59 </span>  r<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> r<span class="Delimiter">.</span>value<span class="Delimiter">));</span>
 <span id="L60" class="LineNr"> 60 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>value != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L61" class="LineNr"> 61 </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;skipping refcount at &quot;</span> &lt;&lt; r<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L61" class="LineNr"> 61 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;skipping refcount at &quot;</span> &lt;&lt; r<span class="Delimiter">.</span>value &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> r<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>value+<span class="Constant">1</span><span class="Delimiter">);</span>  <span class="Comment">// skip refcount</span>
 <span id="L63" class="LineNr"> 63 </span>  <span class="Delimiter">}</span>
 <span id="L64" class="LineNr"> 64 </span>  drop_from_type<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</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> <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="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#L82'>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#L82'>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><a href='043space.cc.html#L83'>address</a><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#L82'>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> <a href='043space.cc.html#L83'>address</a> = 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#L82'>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 90700e7f..641d493b 100644
--- a/html/071deep_copy.cc.html
+++ b/html/071deep_copy.cc.html
@@ -292,7 +292,7 @@ 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:<a href='043space.cc.html#L83'>address</a>: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#L82'>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>
@@ -323,7 +323,7 @@ if ('onhashchange' in window) {
 <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#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="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#L82'>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>
@@ -332,7 +332,7 @@ if ('onhashchange' in window) {
 <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="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#L82'>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>
@@ -359,7 +359,7 @@ if ('onhashchange' in window) {
 <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="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#L82'>address</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != metadata<span class="Delimiter">.</span><a href='043space.cc.html#L82'>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>
@@ -376,7 +376,7 @@ if ('onhashchange' in window) {
 <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="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#L82'>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>
diff --git a/html/072recipe.cc.html b/html/072recipe.cc.html
index 0da90663..32f77078 100644
--- a/html/072recipe.cc.html
+++ b/html/072recipe.cc.html
@@ -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><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="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#L82'>address</a> number<span class="Delimiter">)</span><span class="muRecipe"> -&gt; </span>number<span class="Delimiter">)}</span><span class="Special"> &lt;- </span>copy f
 <span id="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><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="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#L82'>address</a> number<span class="Delimiter">)</span><span class="muRecipe"> -&gt; </span>number<span class="Delimiter">)},</span> <span class="Constant">2</span>:&amp;:num
 <span id="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
@@ -405,7 +405,7 @@ if ('onhashchange' in window) {
 <span id="L341" class="LineNr">341 </span>]
 <span id="L342" class="LineNr">342 </span>$error: <span class="Constant">0</span>
 <span id="L343" class="LineNr">343 </span>
-<span id="L344" class="LineNr">344 </span><span class="Comment">//: make sure we don't accidentally break on a function literal</span>
+<span id="L344" class="LineNr">344 </span><span class="Comment">//: make sure we don't accidentally break on a recipe literal</span>
 <span id="L345" class="LineNr">345 </span><span class="Delimiter">:(scenario jump_forbidden_on_recipe_literals)</span>
 <span id="L346" class="LineNr">346 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L347" class="LineNr">347 </span><span class="muRecipe">def</span> foo [
diff --git a/html/073scheduler.cc.html b/html/073scheduler.cc.html
index a9745289..094a8a8b 100644
--- a/html/073scheduler.cc.html
+++ b/html/073scheduler.cc.html
@@ -600,7 +600,7 @@ if ('onhashchange' in window) {
 <span id="L535" class="LineNr">535 </span><span class="Delimiter">:(before &quot;End Scheduler State Transitions&quot;)</span>
 <span id="L536" class="LineNr">536 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>limit &gt;= <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L537" class="LineNr">537 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>limit &lt;= Scheduling_interval<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L538" class="LineNr">538 </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;schedule&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;discontinuing routine &quot;</span> &lt;&lt; Current_routine<span class="Delimiter">-&gt;</span>id &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L538" class="LineNr">538 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;schedule&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;discontinuing routine &quot;</span> &lt;&lt; Current_routine<span class="Delimiter">-&gt;</span>id &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L539" class="LineNr">539 </span>  <span class="Conceal">¦</span> Current_routine<span class="Delimiter">-&gt;</span>state = DISCONTINUED<span class="Delimiter">;</span>
 <span id="L540" class="LineNr">540 </span>  <span class="Conceal">¦</span> Current_routine<span class="Delimiter">-&gt;</span>limit = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L541" class="LineNr">541 </span>  <span class="Delimiter">}</span>
diff --git a/html/074wait.cc.html b/html/074wait.cc.html
index 934f2f29..661da8b1 100644
--- a/html/074wait.cc.html
+++ b/html/074wait.cc.html
@@ -197,7 +197,7 @@ if ('onhashchange' in window) {
 <span id="L132" class="LineNr">132 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Routines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)-&gt;</span>state != WAITING<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L133" class="LineNr">133 </span>  <span class="Normal">int</span> loc = Routines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)-&gt;</span>waiting_on_location<span class="Delimiter">;</span>
 <span id="L134" class="LineNr">134 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>loc &amp;&amp; <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> loc<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">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;schedule&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;waking up routine &quot;</span> &lt;&lt; Routines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)-&gt;</span>id &lt;&lt; <a href='003trace.cc.html#L197'>end</a><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">&quot;schedule&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;waking up routine &quot;</span> &lt;&lt; Routines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)-&gt;</span>id &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> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> loc<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L137" class="LineNr">137 </span>  <span class="Conceal">¦</span> Routines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)-&gt;</span>state = <a href='073scheduler.cc.html#L41'>RUNNING</a><span class="Delimiter">;</span>
 <span id="L138" class="LineNr">138 </span>  <span class="Conceal">¦</span> Routines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)-&gt;</span>waiting_on_location = <span class="Constant">0</span><span class="Delimiter">;</span>
@@ -425,7 +425,7 @@ if ('onhashchange' in window) {
 <span id="L360" class="LineNr">360 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> routine* waitee = Routines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
 <span id="L361" class="LineNr">361 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>waitee<span class="Delimiter">-&gt;</span>id == id &amp;&amp; waitee<span class="Delimiter">-&gt;</span>state != <a href='073scheduler.cc.html#L41'>RUNNING</a> &amp;&amp; waitee<span class="Delimiter">-&gt;</span>state != WAITING<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L362" class="LineNr">362 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// routine is COMPLETED or DISCONTINUED</span>
-<span id="L363" class="LineNr">363 </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;schedule&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;waking up routine &quot;</span> &lt;&lt; waiter<span class="Delimiter">-&gt;</span>id &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> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;schedule&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;waking up routine &quot;</span> &lt;&lt; waiter<span class="Delimiter">-&gt;</span>id &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="Conceal">¦</span> waiter<span class="Delimiter">-&gt;</span>state = <a href='073scheduler.cc.html#L41'>RUNNING</a><span class="Delimiter">;</span>
 <span id="L365" class="LineNr">365 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> waiter<span class="Delimiter">-&gt;</span>waiting_on_routine = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L366" class="LineNr">366 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
@@ -585,7 +585,7 @@ if ('onhashchange' in window) {
 <span id="L520" class="LineNr">520 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> routine* waitee = Routines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
 <span id="L521" class="LineNr">521 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>waitee<span class="Delimiter">-&gt;</span>id != id<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L522" class="LineNr">522 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>waitee<span class="Delimiter">-&gt;</span>state != <a href='073scheduler.cc.html#L41'>RUNNING</a> || waitee<span class="Delimiter">-&gt;</span>blocked<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L523" class="LineNr">523 </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;schedule&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;waking up routine &quot;</span> &lt;&lt; waiter<span class="Delimiter">-&gt;</span>id &lt;&lt; <span class="Constant">&quot; because routine &quot;</span> &lt;&lt; waitee<span class="Delimiter">-&gt;</span>id &lt;&lt; <span class="Constant">&quot; is blocked&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L523" class="LineNr">523 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;schedule&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;waking up routine &quot;</span> &lt;&lt; waiter<span class="Delimiter">-&gt;</span>id &lt;&lt; <span class="Constant">&quot; because routine &quot;</span> &lt;&lt; waitee<span class="Delimiter">-&gt;</span>id &lt;&lt; <span class="Constant">&quot; is blocked&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L524" class="LineNr">524 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> waiter<span class="Delimiter">-&gt;</span>state = <a href='073scheduler.cc.html#L41'>RUNNING</a><span class="Delimiter">;</span>
 <span id="L525" class="LineNr">525 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> waiter<span class="Delimiter">-&gt;</span>waiting_on_routine_to_block = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L526" class="LineNr">526 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
diff --git a/html/076continuation.cc.html b/html/076continuation.cc.html
index b6df6ea2..2812b559 100644
--- a/html/076continuation.cc.html
+++ b/html/076continuation.cc.html
@@ -69,187 +69,319 @@ if ('onhashchange' in window) {
 <span id="L5" class="LineNr">  5 </span><span class="Comment">//: out of two primitives:</span>
 <span id="L6" class="LineNr">  6 </span><span class="Comment">//:</span>
 <span id="L7" class="LineNr">  7 </span><span class="Comment">//:  * 'call-with-continuation-mark' marks the top of the call stack and then</span>
-<span id="L8" class="LineNr">  8 </span><span class="Comment">//:    calls the provided function.</span>
+<span id="L8" class="LineNr">  8 </span><span class="Comment">//:    calls the provided recipe.</span>
 <span id="L9" class="LineNr">  9 </span><span class="Comment">//:  * 'return-continuation-until-mark' copies the top of the stack</span>
 <span id="L10" class="LineNr"> 10 </span><span class="Comment">//:    until the mark, and returns it as the result of</span>
-<span id="L11" class="LineNr"> 11 </span><span class="Comment">//:    call-with-continuation-mark (which might be a distant ancestor on the call</span>
-<span id="L12" class="LineNr"> 12 </span><span class="Comment">//:    stack; intervening calls don't return)</span>
+<span id="L11" class="LineNr"> 11 </span><span class="Comment">//:    'call-with-continuation-mark' (which might be a distant ancestor on the</span>
+<span id="L12" class="LineNr"> 12 </span><span class="Comment">//:    call stack; intervening calls don't return)</span>
 <span id="L13" class="LineNr"> 13 </span><span class="Comment">//:</span>
 <span id="L14" class="LineNr"> 14 </span><span class="Comment">//: The resulting slice of the stack can now be called just like a regular</span>
-<span id="L15" class="LineNr"> 15 </span><span class="Comment">//: function.</span>
-<span id="L16" class="LineNr"> 16 </span>
-<span id="L17" class="LineNr"> 17 </span><span class="Delimiter">:(before &quot;End Mu Types Initialization&quot;)</span>
-<span id="L18" class="LineNr"> 18 </span><a href='010vm.cc.html#L123'>type_ordinal</a> continuation = Type_ordinal[<span class="Constant">&quot;continuation&quot;</span>] = Next_type_ordinal++<span class="Delimiter">;</span>
-<span id="L19" class="LineNr"> 19 </span>Type[continuation]<span class="Delimiter">.</span>name = <span class="Constant">&quot;continuation&quot;</span><span class="Delimiter">;</span>
-<span id="L20" class="LineNr"> 20 </span>
-<span id="L21" class="LineNr"> 21 </span><span class="Comment">//: A continuation can be called like a recipe.</span>
-<span id="L22" class="LineNr"> 22 </span><span class="Delimiter">:(before &quot;End <a href='072recipe.cc.html#L277'>is_mu_recipe</a> Atom Cases(r)&quot;)</span>
-<span id="L23" class="LineNr"> 23 </span><span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;continuation&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L24" class="LineNr"> 24 </span>
-<span id="L25" class="LineNr"> 25 </span><span class="Comment">//: However, it can't be type-checked like most recipes. Pretend it's like a</span>
-<span id="L26" class="LineNr"> 26 </span><span class="Comment">//: header-less recipe.</span>
-<span id="L27" class="LineNr"> 27 </span><span class="Delimiter">:(after &quot;Begin Reagent-&gt;Recipe(r, recipe_header)&quot;)</span>
-<span id="L28" class="LineNr"> 28 </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>name == <span class="Constant">&quot;continuation&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L29" class="LineNr"> 29 </span>  result_header<span class="Delimiter">.</span>has_header = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L30" class="LineNr"> 30 </span>  <span class="Identifier">return</span> result_header<span class="Delimiter">;</span>
-<span id="L31" class="LineNr"> 31 </span><span class="Delimiter">}</span>
-<span id="L32" class="LineNr"> 32 </span>
-<span id="L33" class="LineNr"> 33 </span><span class="Delimiter">:(scenario delimited_continuation)</span>
-<span id="L34" class="LineNr"> 34 </span><span class="muRecipe"><a href='010vm.cc.html#L19'>recipe</a></span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L35" class="LineNr"> 35 </span>  <span class="Constant">1</span>:continuation<span class="Special"> &lt;- </span>call-with-continuation-mark f<span class="Delimiter">,</span> <span class="Constant">77</span>  <span class="Comment"># 77 is an argument to f</span>
-<span id="L36" class="LineNr"> 36 </span>  <span class="Constant">2</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">5</span>
-<span id="L37" class="LineNr"> 37 </span>  <span class="Delimiter">{</span>
-<span id="L38" class="LineNr"> 38 </span>  <span class="Conceal">¦</span> <span class="Constant">2</span>:number<span class="Special"> &lt;- </span>call <span class="Constant">1</span>:continuation<span class="Delimiter">,</span> <span class="Constant">2</span>:number  <span class="Comment"># 2 is an argument to g, the 'top' of the continuation</span>
-<span id="L39" class="LineNr"> 39 </span>  <span class="Conceal">¦</span> <span class="Constant">3</span>:boolean<span class="Special"> &lt;- </span>greater-<span class="Normal">or</span>-equal <span class="Constant">2</span>:number<span class="Delimiter">,</span> <span class="Constant">8</span>
-<span id="L40" class="LineNr"> 40 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span>-<span class="Normal">if</span> <span class="Constant">3</span>:boolean
-<span id="L41" class="LineNr"> 41 </span>  <span class="Conceal">¦</span> loop
-<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="muRecipe"><a href='010vm.cc.html#L19'>recipe</a></span> f [
-<span id="L45" class="LineNr"> 45 </span>  <span class="Constant">11</span>:number<span class="Special"> &lt;- </span>next-ingredient
-<span id="L46" class="LineNr"> 46 </span>  <span class="Constant">12</span>:number<span class="Special"> &lt;- </span>g <span class="Constant">11</span>:number
-<span id="L47" class="LineNr"> 47 </span>  <span class="Identifier">return</span> <span class="Constant">12</span>:number
-<span id="L48" class="LineNr"> 48 </span>]
-<span id="L49" class="LineNr"> 49 </span><span class="muRecipe"><a href='010vm.cc.html#L19'>recipe</a></span> g [
-<span id="L50" class="LineNr"> 50 </span>  <span class="Constant">21</span>:number<span class="Special"> &lt;- </span>next-ingredient
-<span id="L51" class="LineNr"> 51 </span>  rewind-ingredients
-<span id="L52" class="LineNr"> 52 </span>  <span class="Identifier">return</span>-continuation-until-mark
-<span id="L53" class="LineNr"> 53 </span>  <span class="Comment"># calls of the continuation start from here</span>
-<span id="L54" class="LineNr"> 54 </span>  <span class="Constant">22</span>:number<span class="Special"> &lt;- </span>next-ingredient
-<span id="L55" class="LineNr"> 55 </span>  <span class="Constant">23</span>:number<span class="Special"> &lt;- </span>add <span class="Constant">22</span>:number<span class="Delimiter">,</span> <span class="Constant">1</span>
-<span id="L56" class="LineNr"> 56 </span>  <span class="Identifier">return</span> <span class="Constant">23</span>:number
-<span id="L57" class="LineNr"> 57 </span>]
-<span id="L58" class="LineNr"> 58 </span><span class="Comment"># first call of 'g' executes the part before return-continuation-until-mark</span>
-<span id="L59" class="LineNr"> 59 </span><span class="traceContains">+mem: storing 77 in location 21</span>
-<span id="L60" class="LineNr"> 60 </span><span class="traceContains">+run: {2: &quot;number&quot;} &lt;- copy {5: &quot;literal&quot;}</span>
-<span id="L61" class="LineNr"> 61 </span><span class="traceContains">+mem: storing 5 in location 2</span>
-<span id="L62" class="LineNr"> 62 </span><span class="Comment"># calls of the continuation execute the part after return-continuation-until-mark</span>
-<span id="L63" class="LineNr"> 63 </span><span class="traceContains">+run: {2: &quot;number&quot;} &lt;- call {1: &quot;continuation&quot;}, {2: &quot;number&quot;}</span>
-<span id="L64" class="LineNr"> 64 </span><span class="traceContains">+mem: storing 5 in location 22</span>
-<span id="L65" class="LineNr"> 65 </span><span class="traceContains">+mem: storing 6 in location 2</span>
-<span id="L66" class="LineNr"> 66 </span><span class="traceContains">+run: {2: &quot;number&quot;} &lt;- call {1: &quot;continuation&quot;}, {2: &quot;number&quot;}</span>
-<span id="L67" class="LineNr"> 67 </span><span class="traceContains">+mem: storing 6 in location 22</span>
-<span id="L68" class="LineNr"> 68 </span><span class="traceContains">+mem: storing 7 in location 2</span>
-<span id="L69" class="LineNr"> 69 </span><span class="traceContains">+run: {2: &quot;number&quot;} &lt;- call {1: &quot;continuation&quot;}, {2: &quot;number&quot;}</span>
-<span id="L70" class="LineNr"> 70 </span><span class="traceContains">+mem: storing 7 in location 22</span>
-<span id="L71" class="LineNr"> 71 </span><span class="traceContains">+mem: storing 8 in location 2</span>
-<span id="L72" class="LineNr"> 72 </span><span class="Comment"># first call of 'g' does not execute the part after return-continuation-until-mark</span>
-<span id="L73" class="LineNr"> 73 </span><span class="traceAbsent">-mem: storing 77 in location 22</span>
-<span id="L74" class="LineNr"> 74 </span><span class="Comment"># calls of the continuation don't execute the part before return-continuation-until-mark</span>
-<span id="L75" class="LineNr"> 75 </span><span class="traceAbsent">-mem: storing 5 in location 21</span>
-<span id="L76" class="LineNr"> 76 </span><span class="traceAbsent">-mem: storing 6 in location 21</span>
-<span id="L77" class="LineNr"> 77 </span><span class="traceAbsent">-mem: storing 7 in location 21</span>
-<span id="L78" class="LineNr"> 78 </span><span class="Comment"># termination</span>
-<span id="L79" class="LineNr"> 79 </span><span class="traceAbsent">-mem: storing 9 in location 2</span>
-<span id="L80" class="LineNr"> 80 </span>
-<span id="L81" class="LineNr"> 81 </span><span class="Delimiter">:(before &quot;End call Fields&quot;)</span>
-<span id="L82" class="LineNr"> 82 </span><span class="Normal">bool</span> is_base_of_continuation<span class="Delimiter">;</span>
-<span id="L83" class="LineNr"> 83 </span><span class="Delimiter">:(before &quot;End call Constructor&quot;)</span>
-<span id="L84" class="LineNr"> 84 </span>is_base_of_continuation = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L85" class="LineNr"> 85 </span>
-<span id="L86" class="LineNr"> 86 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Declarations&quot;)</span>
-<span id="L87" class="LineNr"> 87 </span>CALL_WITH_CONTINUATION_MARK<span class="Delimiter">,</span>
-<span id="L88" class="LineNr"> 88 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Numbers&quot;)</span>
-<span id="L89" class="LineNr"> 89 </span>Recipe_ordinal[<span class="Constant">&quot;call-with-continuation-mark&quot;</span>] = CALL_WITH_CONTINUATION_MARK<span class="Delimiter">;</span>
-<span id="L90" class="LineNr"> 90 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
-<span id="L91" class="LineNr"> 91 </span><span class="Normal">case</span> CALL_WITH_CONTINUATION_MARK: <span class="Delimiter">{</span>
-<span id="L92" class="LineNr"> 92 </span>  <span class="Identifier">break</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="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
-<span id="L95" class="LineNr"> 95 </span><span class="Normal">case</span> CALL_WITH_CONTINUATION_MARK: <span class="Delimiter">{</span>
-<span id="L96" class="LineNr"> 96 </span>  <span class="Comment">// like call, but mark the current call as a 'base of continuation' call</span>
-<span id="L97" class="LineNr"> 97 </span>  <span class="Comment">// before pushing the next one on it</span>
-<span id="L98" class="LineNr"> 98 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L99" class="LineNr"> 99 </span>  <span class="Conceal">¦</span> ++Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">;</span>
-<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#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>
-<span id="L107" class="LineNr">107 </span>  finish_call_housekeeping<span class="Delimiter">(</span>caller_instruction<span class="Delimiter">,</span> ingredients<span class="Delimiter">);</span>
-<span id="L108" class="LineNr">108 </span>  <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L109" class="LineNr">109 </span><span class="Delimiter">}</span>
-<span id="L110" class="LineNr">110 </span>
-<span id="L111" class="LineNr">111 </span><span class="Comment">//: save the slice of current call stack until the 'call-with-continuation-mark'</span>
-<span id="L112" class="LineNr">112 </span><span class="Comment">//: call, and return it as the result.</span>
-<span id="L113" class="LineNr">113 </span><span class="Comment">//: todo: implement delimited continuations in Mu's memory</span>
-<span id="L114" class="LineNr">114 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L115" class="LineNr">115 </span>map&lt;<span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span><span class="Delimiter">,</span> call_stack&gt; Delimited_continuation<span class="Delimiter">;</span>
-<span id="L116" class="LineNr">116 </span><span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span> Next_delimited_continuation_id = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L117" class="LineNr">117 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L118" class="LineNr">118 </span>Delimited_continuation<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
-<span id="L119" class="LineNr">119 </span>Next_delimited_continuation_id = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L120" class="LineNr">120 </span>
-<span id="L121" class="LineNr">121 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Declarations&quot;)</span>
-<span id="L122" class="LineNr">122 </span>RETURN_CONTINUATION_UNTIL_MARK<span class="Delimiter">,</span>
-<span id="L123" class="LineNr">123 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Numbers&quot;)</span>
-<span id="L124" class="LineNr">124 </span>Recipe_ordinal[<span class="Constant">&quot;return-continuation-until-mark&quot;</span>] = RETURN_CONTINUATION_UNTIL_MARK<span class="Delimiter">;</span>
-<span id="L125" class="LineNr">125 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
-<span id="L126" class="LineNr">126 </span><span class="Normal">case</span> RETURN_CONTINUATION_UNTIL_MARK: <span class="Delimiter">{</span>
-<span id="L127" class="LineNr">127 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L128" class="LineNr">128 </span><span class="Delimiter">}</span>
-<span id="L129" class="LineNr">129 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
-<span id="L130" class="LineNr">130 </span><span class="Normal">case</span> RETURN_CONTINUATION_UNTIL_MARK: <span class="Delimiter">{</span>
-<span id="L131" class="LineNr">131 </span>  <span class="Comment">// first clear any existing ingredients, to isolate the creation of the</span>
-<span id="L132" class="LineNr">132 </span>  <span class="Comment">// continuation from its calls</span>
-<span id="L133" class="LineNr">133 </span>  Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
-<span id="L134" class="LineNr">134 </span>  Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>next_ingredient_to_process = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L135" class="LineNr">135 </span>  <span class="Comment">// copy the current call stack until the most recent marked call</span>
-<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#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#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>
-<span id="L146" class="LineNr">146 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>begin<span class="Delimiter">()</span> != base<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L147" class="LineNr">147 </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="L148" class="LineNr">148 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> --Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">;</span>
-<span id="L149" class="LineNr">149 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &gt;= <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L150" class="LineNr">150 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L151" class="LineNr">151 </span>  <span class="Conceal">¦</span> Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>pop_front<span class="Delimiter">();</span>
-<span id="L152" class="LineNr">152 </span>  <span class="Delimiter">}</span>
-<span id="L153" class="LineNr">153 </span>  <span class="Comment">// return it as the result of the marked call</span>
-<span id="L154" class="LineNr">154 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L155" class="LineNr">155 </span>  products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>Next_delimited_continuation_id<span class="Delimiter">);</span>
-<span id="L156" class="LineNr">156 </span>  ++Next_delimited_continuation_id<span class="Delimiter">;</span>
-<span id="L157" class="LineNr">157 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// continue to process rest of marked call</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="Delimiter">:(code)</span>
-<span id="L161" class="LineNr">161 </span>call_stack::iterator find_base_of_continuation<span class="Delimiter">(</span>call_stack&amp; c<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L162" class="LineNr">162 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::iterator p = c<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != c<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span>
-<span id="L163" class="LineNr">163 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>is_base_of_continuation<span class="Delimiter">)</span> <span class="Identifier">return</span> p<span class="Delimiter">;</span>
-<span id="L164" class="LineNr">164 </span>  <span class="Identifier">return</span> c<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><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="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#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#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>
-<span id="L178" class="LineNr">178 </span>  <span class="Conceal">¦</span> Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>push_front<span class="Delimiter">(</span>*p<span class="Delimiter">);</span>
-<span id="L179" class="LineNr">179 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L180" class="LineNr">180 </span>  <span class="Conceal">¦</span> Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth += <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>new_calls<span class="Delimiter">);</span>
-<span id="L181" class="LineNr">181 </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;calling delimited continuation; growing callstack depth to &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L182" class="LineNr">182 </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="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#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>
+<span id="L15" class="LineNr"> 15 </span><span class="Comment">//: recipe.</span>
+<span id="L16" class="LineNr"> 16 </span><span class="Comment">//:</span>
+<span id="L17" class="LineNr"> 17 </span><span class="Comment">//: See the example programs continuation*.mu to get a sense for the</span>
+<span id="L18" class="LineNr"> 18 </span><span class="Comment">//: possibilities.</span>
+<span id="L19" class="LineNr"> 19 </span><span class="Comment">//:</span>
+<span id="L20" class="LineNr"> 20 </span><span class="Comment">//: Refinements:</span>
+<span id="L21" class="LineNr"> 21 </span><span class="Comment">//:  * You can call a single continuation multiple times, and it will preserve</span>
+<span id="L22" class="LineNr"> 22 </span><span class="Comment">//:    the state of its local variables at each stack frame between calls.</span>
+<span id="L23" class="LineNr"> 23 </span><span class="Comment">//:    The stack frames of a continuation are not destroyed until the</span>
+<span id="L24" class="LineNr"> 24 </span><span class="Comment">//:    continuation goes out of scope. See continuation2.mu.</span>
+<span id="L25" class="LineNr"> 25 </span><span class="Comment">//:  * 'return-continuation-until-mark' doesn't consume the mark, so you can</span>
+<span id="L26" class="LineNr"> 26 </span><span class="Comment">//:    return multiple continuations based on a single mark. In combination</span>
+<span id="L27" class="LineNr"> 27 </span><span class="Comment">//:    with the fact that 'return-continuation-until-mark' can return from</span>
+<span id="L28" class="LineNr"> 28 </span><span class="Comment">//:    regular calls, just as long as there was an earlier call to</span>
+<span id="L29" class="LineNr"> 29 </span><span class="Comment">//:    'call-with-continuation-mark', this gives us a way to create resumable</span>
+<span id="L30" class="LineNr"> 30 </span><span class="Comment">//:    recipes. See continuation3.mu.</span>
+<span id="L31" class="LineNr"> 31 </span><span class="Comment">//:</span>
+<span id="L32" class="LineNr"> 32 </span><span class="Comment">//: Caveats:</span>
+<span id="L33" class="LineNr"> 33 </span><span class="Comment">//:  * At the moment we can't statically type-check continuations. So we raise</span>
+<span id="L34" class="LineNr"> 34 </span><span class="Comment">//:    runtime errors for a call that doesn't return a continuation when the</span>
+<span id="L35" class="LineNr"> 35 </span><span class="Comment">//:    caller expects, or one that returns a continuation when the caller</span>
+<span id="L36" class="LineNr"> 36 </span><span class="Comment">//:    doesn't expect it. This shouldn't cause memory corruption, though.</span>
+<span id="L37" class="LineNr"> 37 </span><span class="Comment">//:    There should still be no way to lookup addresses that aren't allocated.</span>
+<span id="L38" class="LineNr"> 38 </span>
+<span id="L39" class="LineNr"> 39 </span><span class="Delimiter">:(before &quot;End Mu Types Initialization&quot;)</span>
+<span id="L40" class="LineNr"> 40 </span><a href='010vm.cc.html#L123'>type_ordinal</a> continuation = Type_ordinal[<span class="Constant">&quot;continuation&quot;</span>] = Next_type_ordinal++<span class="Delimiter">;</span>
+<span id="L41" class="LineNr"> 41 </span>Type[continuation]<span class="Delimiter">.</span>name = <span class="Constant">&quot;continuation&quot;</span><span class="Delimiter">;</span>
+<span id="L42" class="LineNr"> 42 </span>
+<span id="L43" class="LineNr"> 43 </span><span class="Comment">//: A continuation can be called like a recipe.</span>
+<span id="L44" class="LineNr"> 44 </span><span class="Delimiter">:(before &quot;End <a href='072recipe.cc.html#L277'>is_mu_recipe</a> Atom Cases(r)&quot;)</span>
+<span id="L45" class="LineNr"> 45 </span><span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;continuation&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L46" class="LineNr"> 46 </span>
+<span id="L47" class="LineNr"> 47 </span><span class="Comment">//: However, it can't be type-checked like most recipes. Pretend it's like a</span>
+<span id="L48" class="LineNr"> 48 </span><span class="Comment">//: header-less recipe.</span>
+<span id="L49" class="LineNr"> 49 </span><span class="Delimiter">:(after &quot;Begin Reagent-&gt;Recipe(r, recipe_header)&quot;)</span>
+<span id="L50" class="LineNr"> 50 </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>name == <span class="Constant">&quot;continuation&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L51" class="LineNr"> 51 </span>  result_header<span class="Delimiter">.</span>has_header = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="Identifier">return</span> result_header<span class="Delimiter">;</span>
+<span id="L53" class="LineNr"> 53 </span><span class="Delimiter">}</span>
+<span id="L54" class="LineNr"> 54 </span>
+<span id="L55" class="LineNr"> 55 </span><span class="Delimiter">:(scenario delimited_continuation)</span>
+<span id="L56" class="LineNr"> 56 </span><span class="muRecipe"><a href='010vm.cc.html#L19'>recipe</a></span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L57" class="LineNr"> 57 </span>  <span class="Constant">1</span>:continuation<span class="Special"> &lt;- </span>call-with-continuation-mark f<span class="Delimiter">,</span> <span class="Constant">77</span>  <span class="Comment"># 77 is an argument to f</span>
+<span id="L58" class="LineNr"> 58 </span>  <span class="Constant">2</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">5</span>
+<span id="L59" class="LineNr"> 59 </span>  <span class="Delimiter">{</span>
+<span id="L60" class="LineNr"> 60 </span>  <span class="Conceal">¦</span> <span class="Constant">2</span>:number<span class="Special"> &lt;- </span>call <span class="Constant">1</span>:continuation<span class="Delimiter">,</span> <span class="Constant">2</span>:number  <span class="Comment"># 2 is an argument to g, the 'top' of the continuation</span>
+<span id="L61" class="LineNr"> 61 </span>  <span class="Conceal">¦</span> <span class="Constant">3</span>:boolean<span class="Special"> &lt;- </span>greater-<span class="Normal">or</span>-equal <span class="Constant">2</span>:number<span class="Delimiter">,</span> <span class="Constant">8</span>
+<span id="L62" class="LineNr"> 62 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span>-<span class="Normal">if</span> <span class="Constant">3</span>:boolean
+<span id="L63" class="LineNr"> 63 </span>  <span class="Conceal">¦</span> loop
+<span id="L64" class="LineNr"> 64 </span>  <span class="Delimiter">}</span>
+<span id="L65" class="LineNr"> 65 </span>]
+<span id="L66" class="LineNr"> 66 </span><span class="muRecipe"><a href='010vm.cc.html#L19'>recipe</a></span> f [
+<span id="L67" class="LineNr"> 67 </span>  <span class="Constant">11</span>:number<span class="Special"> &lt;- </span>next-ingredient
+<span id="L68" class="LineNr"> 68 </span>  <span class="Constant">12</span>:number<span class="Special"> &lt;- </span>g <span class="Constant">11</span>:number
+<span id="L69" class="LineNr"> 69 </span>  <span class="Identifier">return</span> <span class="Constant">12</span>:number
+<span id="L70" class="LineNr"> 70 </span>]
+<span id="L71" class="LineNr"> 71 </span><span class="muRecipe"><a href='010vm.cc.html#L19'>recipe</a></span> g [
+<span id="L72" class="LineNr"> 72 </span>  <span class="Constant">21</span>:number<span class="Special"> &lt;- </span>next-ingredient
+<span id="L73" class="LineNr"> 73 </span>  rewind-ingredients
+<span id="L74" class="LineNr"> 74 </span>  <span class="Identifier">return</span>-continuation-until-mark
+<span id="L75" class="LineNr"> 75 </span>  <span class="Comment"># calls of the continuation start from here</span>
+<span id="L76" class="LineNr"> 76 </span>  <span class="Constant">22</span>:number<span class="Special"> &lt;- </span>next-ingredient
+<span id="L77" class="LineNr"> 77 </span>  <span class="Constant">23</span>:number<span class="Special"> &lt;- </span>add <span class="Constant">22</span>:number<span class="Delimiter">,</span> <span class="Constant">1</span>
+<span id="L78" class="LineNr"> 78 </span>  <span class="Identifier">return</span> <span class="Constant">23</span>:number
+<span id="L79" class="LineNr"> 79 </span>]
+<span id="L80" class="LineNr"> 80 </span><span class="Comment"># first call of 'g' executes the part before return-continuation-until-mark</span>
+<span id="L81" class="LineNr"> 81 </span><span class="traceContains">+mem: storing 77 in location 21</span>
+<span id="L82" class="LineNr"> 82 </span><span class="traceContains">+run: {2: &quot;number&quot;} &lt;- copy {5: &quot;literal&quot;}</span>
+<span id="L83" class="LineNr"> 83 </span><span class="traceContains">+mem: storing 5 in location 2</span>
+<span id="L84" class="LineNr"> 84 </span><span class="Comment"># calls of the continuation execute the part after return-continuation-until-mark</span>
+<span id="L85" class="LineNr"> 85 </span><span class="traceContains">+run: {2: &quot;number&quot;} &lt;- call {1: &quot;continuation&quot;}, {2: &quot;number&quot;}</span>
+<span id="L86" class="LineNr"> 86 </span><span class="traceContains">+mem: storing 5 in location 22</span>
+<span id="L87" class="LineNr"> 87 </span><span class="traceContains">+mem: storing 6 in location 2</span>
+<span id="L88" class="LineNr"> 88 </span><span class="traceContains">+run: {2: &quot;number&quot;} &lt;- call {1: &quot;continuation&quot;}, {2: &quot;number&quot;}</span>
+<span id="L89" class="LineNr"> 89 </span><span class="traceContains">+mem: storing 6 in location 22</span>
+<span id="L90" class="LineNr"> 90 </span><span class="traceContains">+mem: storing 7 in location 2</span>
+<span id="L91" class="LineNr"> 91 </span><span class="traceContains">+run: {2: &quot;number&quot;} &lt;- call {1: &quot;continuation&quot;}, {2: &quot;number&quot;}</span>
+<span id="L92" class="LineNr"> 92 </span><span class="traceContains">+mem: storing 7 in location 22</span>
+<span id="L93" class="LineNr"> 93 </span><span class="traceContains">+mem: storing 8 in location 2</span>
+<span id="L94" class="LineNr"> 94 </span><span class="Comment"># first call of 'g' does not execute the part after return-continuation-until-mark</span>
+<span id="L95" class="LineNr"> 95 </span><span class="traceAbsent">-mem: storing 77 in location 22</span>
+<span id="L96" class="LineNr"> 96 </span><span class="Comment"># calls of the continuation don't execute the part before return-continuation-until-mark</span>
+<span id="L97" class="LineNr"> 97 </span><span class="traceAbsent">-mem: storing 5 in location 21</span>
+<span id="L98" class="LineNr"> 98 </span><span class="traceAbsent">-mem: storing 6 in location 21</span>
+<span id="L99" class="LineNr"> 99 </span><span class="traceAbsent">-mem: storing 7 in location 21</span>
+<span id="L100" class="LineNr">100 </span><span class="Comment"># termination</span>
+<span id="L101" class="LineNr">101 </span><span class="traceAbsent">-mem: storing 9 in location 2</span>
+<span id="L102" class="LineNr">102 </span>
+<span id="L103" class="LineNr">103 </span><span class="Delimiter">:(before &quot;End call Fields&quot;)</span>
+<span id="L104" class="LineNr">104 </span><span class="Normal">bool</span> is_base_of_continuation<span class="Delimiter">;</span>
+<span id="L105" class="LineNr">105 </span><span class="Delimiter">:(before &quot;End call Constructor&quot;)</span>
+<span id="L106" class="LineNr">106 </span>is_base_of_continuation = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L107" class="LineNr">107 </span>
+<span id="L108" class="LineNr">108 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Declarations&quot;)</span>
+<span id="L109" class="LineNr">109 </span>CALL_WITH_CONTINUATION_MARK<span class="Delimiter">,</span>
+<span id="L110" class="LineNr">110 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Numbers&quot;)</span>
+<span id="L111" class="LineNr">111 </span>Recipe_ordinal[<span class="Constant">&quot;call-with-continuation-mark&quot;</span>] = CALL_WITH_CONTINUATION_MARK<span class="Delimiter">;</span>
+<span id="L112" class="LineNr">112 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
+<span id="L113" class="LineNr">113 </span><span class="Normal">case</span> CALL_WITH_CONTINUATION_MARK: <span class="Delimiter">{</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L115" class="LineNr">115 </span><span class="Delimiter">}</span>
+<span id="L116" class="LineNr">116 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
+<span id="L117" class="LineNr">117 </span><span class="Normal">case</span> CALL_WITH_CONTINUATION_MARK: <span class="Delimiter">{</span>
+<span id="L118" class="LineNr">118 </span>  <span class="Comment">// like call, but mark the current call as a 'base of continuation' call</span>
+<span id="L119" class="LineNr">119 </span>  <span class="Comment">// before pushing the next one on it</span>
+<span id="L120" class="LineNr">120 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L121" class="LineNr">121 </span>  <span class="Conceal">¦</span> ++Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">;</span>
+<span id="L122" class="LineNr">122 </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="L123" class="LineNr">123 </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="L124" class="LineNr">124 </span>  <span class="Delimiter">}</span>
+<span id="L125" class="LineNr">125 </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="L126" class="LineNr">126 </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="L127" class="LineNr">127 </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="L128" class="LineNr">128 </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="L129" class="LineNr">129 </span>  finish_call_housekeeping<span class="Delimiter">(</span>caller_instruction<span class="Delimiter">,</span> ingredients<span class="Delimiter">);</span>
+<span id="L130" class="LineNr">130 </span>  <span class="Identifier">continue</span><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="Comment">//: save the slice of current call stack until the 'call-with-continuation-mark'</span>
+<span id="L134" class="LineNr">134 </span><span class="Comment">//: call, and return it as the result.</span>
+<span id="L135" class="LineNr">135 </span><span class="Comment">//: todo: implement delimited continuations in Mu's memory</span>
+<span id="L136" class="LineNr">136 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L137" class="LineNr">137 </span>map&lt;<span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span><span class="Delimiter">,</span> call_stack&gt; Delimited_continuation<span class="Delimiter">;</span>
+<span id="L138" class="LineNr">138 </span><span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span> Next_delimited_continuation_id = <span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// 0 is null just like an address</span>
+<span id="L139" class="LineNr">139 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
+<span id="L140" class="LineNr">140 </span>Delimited_continuation<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L141" class="LineNr">141 </span>Next_delimited_continuation_id = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L142" class="LineNr">142 </span>
+<span id="L143" class="LineNr">143 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Declarations&quot;)</span>
+<span id="L144" class="LineNr">144 </span>RETURN_CONTINUATION_UNTIL_MARK<span class="Delimiter">,</span>
+<span id="L145" class="LineNr">145 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Numbers&quot;)</span>
+<span id="L146" class="LineNr">146 </span>Recipe_ordinal[<span class="Constant">&quot;return-continuation-until-mark&quot;</span>] = RETURN_CONTINUATION_UNTIL_MARK<span class="Delimiter">;</span>
+<span id="L147" class="LineNr">147 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
+<span id="L148" class="LineNr">148 </span><span class="Normal">case</span> RETURN_CONTINUATION_UNTIL_MARK: <span class="Delimiter">{</span>
+<span id="L149" class="LineNr">149 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L150" class="LineNr">150 </span><span class="Delimiter">}</span>
+<span id="L151" class="LineNr">151 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
+<span id="L152" class="LineNr">152 </span><span class="Normal">case</span> RETURN_CONTINUATION_UNTIL_MARK: <span class="Delimiter">{</span>
+<span id="L153" class="LineNr">153 </span>  <span class="Comment">// first clear any existing ingredients, to isolate the creation of the</span>
+<span id="L154" class="LineNr">154 </span>  <span class="Comment">// continuation from its calls</span>
+<span id="L155" class="LineNr">155 </span>  Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L156" class="LineNr">156 </span>  Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>next_ingredient_to_process = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L157" class="LineNr">157 </span>  <span class="Comment">// copy the current call stack until the most recent marked call</span>
+<span id="L158" class="LineNr">158 </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="L159" class="LineNr">159 </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="L160" class="LineNr">160 </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="L161" class="LineNr">161 </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="L162" class="LineNr">162 </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="L163" class="LineNr">163 </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="L164" class="LineNr">164 </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="L165" class="LineNr">165 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L166" class="LineNr">166 </span>  <span class="Delimiter">}</span>
+<span id="L167" class="LineNr">167 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;creating continuation &quot;</span> &lt;&lt; Next_delimited_continuation_id &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L168" class="LineNr">168 </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>
+<span id="L169" class="LineNr">169 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>begin<span class="Delimiter">()</span> != base<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L170" class="LineNr">170 </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="L171" class="LineNr">171 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> --Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">;</span>
+<span id="L172" class="LineNr">172 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &gt;= <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L173" class="LineNr">173 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L174" class="LineNr">174 </span>  <span class="Conceal">¦</span> Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>pop_front<span class="Delimiter">();</span>
+<span id="L175" class="LineNr">175 </span>  <span class="Delimiter">}</span>
+<span id="L176" class="LineNr">176 </span>  <span class="Comment">// return it as the result of the marked call</span>
+<span id="L177" class="LineNr">177 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L178" class="LineNr">178 </span>  products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>Next_delimited_continuation_id<span class="Delimiter">);</span>
+<span id="L179" class="LineNr">179 </span>  <span class="Comment">// return any other ingredients passed in</span>
+<span id="L180" class="LineNr">180 </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><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">()));</span>
+<span id="L181" class="LineNr">181 </span>  ++Next_delimited_continuation_id<span class="Delimiter">;</span>
+<span id="L182" class="LineNr">182 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// continue to process rest of marked call</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="Delimiter">:(code)</span>
+<span id="L186" class="LineNr">186 </span>call_stack::iterator find_base_of_continuation<span class="Delimiter">(</span>call_stack&amp; c<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L187" class="LineNr">187 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::iterator p = c<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != c<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span>
+<span id="L188" class="LineNr">188 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>is_base_of_continuation<span class="Delimiter">)</span> <span class="Identifier">return</span> p<span class="Delimiter">;</span>
+<span id="L189" class="LineNr">189 </span>  <span class="Identifier">return</span> c<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><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="Comment">//: overload 'call' for continuations</span>
+<span id="L193" class="LineNr">193 </span><span class="Delimiter">:(after &quot;Begin Call&quot;)</span>
+<span id="L194" class="LineNr">194 </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="L195" class="LineNr">195 </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="L196" class="LineNr">196 </span>  <span class="Comment">// copy multiple calls on to current call stack</span>
+<span id="L197" class="LineNr">197 </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="L198" class="LineNr">198 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;calling continuation &quot;</span> &lt;&lt; ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L199" class="LineNr">199 </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="L200" class="LineNr">200 </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="L201" class="LineNr">201 </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="L202" class="LineNr">202 </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="L203" class="LineNr">203 </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> <span class="Delimiter">{</span>
+<span id="L204" class="LineNr">204 </span>  <span class="Conceal">¦</span> Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>push_front<span class="Delimiter">(</span>*p<span class="Delimiter">);</span>
+<span id="L205" class="LineNr">205 </span>  <span class="Conceal">¦</span> <span class="Comment">// ensure that the presence of a continuation keeps its stack frames from being reclaimed</span>
+<span id="L206" class="LineNr">206 </span>  <span class="Conceal">¦</span> <span class="Normal">int</span> space_address = Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>default_space<span class="Delimiter">;</span>
+<span id="L207" class="LineNr">207 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>space_address != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L208" class="LineNr">208 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">int</span> refcount = <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>
+<span id="L209" class="LineNr">209 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><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; space_address &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; refcount &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; refcount+<span class="Constant">1</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='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> space_address<span class="Delimiter">,</span> refcount+<span class="Constant">1</span><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="Delimiter">}</span>
+<span id="L213" class="LineNr">213 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L214" class="LineNr">214 </span>  <span class="Conceal">¦</span> Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth += <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>new_calls<span class="Delimiter">);</span>
+<span id="L215" class="LineNr">215 </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;calling delimited continuation; growing callstack depth to &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L216" class="LineNr">216 </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="L217" class="LineNr">217 </span>  <span class="Delimiter">}</span>
+<span id="L218" class="LineNr">218 </span>  ++current_step_index<span class="Delimiter">();</span>  <span class="Comment">// skip past the return-continuation-until-mark</span>
+<span id="L219" class="LineNr">219 </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="L220" class="LineNr">220 </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="L221" class="LineNr">221 </span>  <span class="Identifier">continue</span><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">//: Ensure that the presence of a continuation keeps its stack frames from being reclaimed.</span>
+<span id="L225" class="LineNr">225 </span>
+<span id="L226" class="LineNr">226 </span><span class="Delimiter">:(scenario continuations_preserve_local_scopes)</span>
+<span id="L227" class="LineNr">227 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L228" class="LineNr">228 </span>  local-scope
+<span id="L229" class="LineNr">229 </span>  <span class="Normal">k</span>:continuation<span class="Special"> &lt;- </span>call-with-continuation-mark f
+<span id="L230" class="LineNr">230 </span>  call k
+<span id="L231" class="LineNr">231 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
+<span id="L232" class="LineNr">232 </span>]
+<span id="L233" class="LineNr">233 </span><span class="muRecipe">def</span> f [
+<span id="L234" class="LineNr">234 </span>  local-scope
+<span id="L235" class="LineNr">235 </span>  g
+<span id="L236" class="LineNr">236 </span>]
+<span id="L237" class="LineNr">237 </span><span class="muRecipe">def</span> g [
+<span id="L238" class="LineNr">238 </span>  local-scope
+<span id="L239" class="LineNr">239 </span>  <span class="Identifier">return</span>-continuation-until-mark
+<span id="L240" class="LineNr">240 </span>  add <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span>
+<span id="L241" class="LineNr">241 </span>]
+<span id="L242" class="LineNr">242 </span><span class="Comment"># entering main</span>
+<span id="L243" class="LineNr">243 </span><span class="traceContains">+mem: new alloc: 1000</span>
+<span id="L244" class="LineNr">244 </span><span class="traceContains">+run: {k: &quot;continuation&quot;} &lt;- call-with-continuation-mark {f: &quot;recipe-literal&quot;}</span>
+<span id="L245" class="LineNr">245 </span><span class="Comment"># entering f</span>
+<span id="L246" class="LineNr">246 </span><span class="traceContains">+mem: new alloc: 1004</span>
+<span id="L247" class="LineNr">247 </span><span class="Comment"># entering g</span>
+<span id="L248" class="LineNr">248 </span><span class="traceContains">+mem: new alloc: 1007</span>
+<span id="L249" class="LineNr">249 </span><span class="Comment"># return control to main</span>
+<span id="L250" class="LineNr">250 </span><span class="traceContains">+run: return-continuation-until-mark</span>
+<span id="L251" class="LineNr">251 </span><span class="Comment"># no allocs abandoned yet</span>
+<span id="L252" class="LineNr">252 </span><span class="Comment"># finish running main</span>
+<span id="L253" class="LineNr">253 </span><span class="traceContains">+run: call {k: &quot;continuation&quot;}</span>
+<span id="L254" class="LineNr">254 </span><span class="traceContains">+run: add {1: &quot;literal&quot;}, {1: &quot;literal&quot;}</span>
+<span id="L255" class="LineNr">255 </span><span class="traceContains">+run: return {34: &quot;literal&quot;}</span>
+<span id="L256" class="LineNr">256 </span><span class="Comment"># now k is reclaimed</span>
+<span id="L257" class="LineNr">257 </span><span class="traceContains">+mem: trying to reclaim local k:continuation</span>
+<span id="L258" class="LineNr">258 </span><span class="Comment"># at this point all allocs in the continuation are abandoned</span>
+<span id="L259" class="LineNr">259 </span><span class="traceContains">+mem: automatically abandoning 1007</span>
+<span id="L260" class="LineNr">260 </span><span class="traceContains">+mem: automatically abandoning 1004</span>
+<span id="L261" class="LineNr">261 </span><span class="Comment"># finally the alloc for main is abandoned</span>
+<span id="L262" class="LineNr">262 </span><span class="traceContains">+mem: automatically abandoning 1000</span>
+<span id="L263" class="LineNr">263 </span>
+<span id="L264" class="LineNr">264 </span><span class="Delimiter">:(after &quot;Begin Decrement Refcounts(canonized_x)&quot;)</span>
+<span id="L265" class="LineNr">265 </span><span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_continuation<span class="Delimiter">(</span>canonized_x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L266" class="LineNr">266 </span>  <span class="Normal">int</span> continuation_id = <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="L267" class="LineNr">267 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;reclaiming continuation &quot;</span> &lt;&lt; continuation_id &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L268" class="LineNr">268 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>continuation_id == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L269" class="LineNr">269 </span>  <span class="Normal">const</span> call_stack&amp; continuation_calls = get<span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> continuation_id<span class="Delimiter">);</span>
+<span id="L270" class="LineNr">270 </span>  <span class="Comment">// temporarily push the stack frames for the continuation one last time on to the call stack</span>
+<span id="L271" class="LineNr">271 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::const_reverse_iterator p = continuation_calls<span class="Delimiter">.</span>rbegin<span class="Delimiter">();</span> p != continuation_calls<span class="Delimiter">.</span>rend<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span>
+<span id="L272" class="LineNr">272 </span>  <span class="Conceal">¦</span> Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>push_front<span class="Delimiter">(</span>*p<span class="Delimiter">);</span>
+<span id="L273" class="LineNr">273 </span>  <span class="Comment">// reclaim their spaces while popping them</span>
+<span id="L274" class="LineNr">274 </span>  <span class="Comment">// (because reclaim_default_space() relies on the default-space being reclaimed being at the top of the stack)</span>
+<span id="L275" class="LineNr">275 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::const_iterator p = continuation_calls<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != continuation_calls<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="L276" class="LineNr">276 </span>  <span class="Conceal">¦</span> <a href='043space.cc.html#L244'>reclaim_default_space</a><span class="Delimiter">();</span>
+<span id="L277" class="LineNr">277 </span>  <span class="Conceal">¦</span> Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>pop_front<span class="Delimiter">();</span>
+<span id="L278" class="LineNr">278 </span>  <span class="Delimiter">}</span>
+<span id="L279" class="LineNr">279 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L280" class="LineNr">280 </span><span class="Delimiter">}</span>
+<span id="L281" class="LineNr">281 </span>
+<span id="L282" class="LineNr">282 </span><span class="Delimiter">:(code)</span>
+<span id="L283" class="LineNr">283 </span><span class="Normal">bool</span> is_mu_continuation<span class="Delimiter">(</span>reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L284" class="LineNr">284 </span>  canonize_type<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
+<span id="L285" class="LineNr">285 </span>  <span class="Identifier">return</span> x<span class="Delimiter">.</span>type &amp;&amp; x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom &amp;&amp; x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>value == get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;continuation&quot;</span><span class="Delimiter">);</span>
+<span id="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="Delimiter">:(scenario continuations_can_return_values)</span>
+<span id="L289" class="LineNr">289 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L290" class="LineNr">290 </span>  local-scope
+<span id="L291" class="LineNr">291 </span>  <span class="Normal">k</span>:continuation<span class="Delimiter">,</span> <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>call-with-continuation-mark f
+<span id="L292" class="LineNr">292 </span>]
+<span id="L293" class="LineNr">293 </span><span class="muRecipe">def</span> f [
+<span id="L294" class="LineNr">294 </span>  local-scope
+<span id="L295" class="LineNr">295 </span>  g
+<span id="L296" class="LineNr">296 </span>]
+<span id="L297" class="LineNr">297 </span><span class="muRecipe">def</span> g [
+<span id="L298" class="LineNr">298 </span>  local-scope
+<span id="L299" class="LineNr">299 </span>  <span class="Identifier">return</span>-continuation-until-mark <span class="Constant">34</span>
+<span id="L300" class="LineNr">300 </span>  stash [continuation called]
+<span id="L301" class="LineNr">301 </span>]
+<span id="L302" class="LineNr">302 </span><span class="Comment"># entering main</span>
+<span id="L303" class="LineNr">303 </span><span class="traceContains">+mem: new alloc: 1000</span>
+<span id="L304" class="LineNr">304 </span><span class="traceContains">+run: {k: &quot;continuation&quot;}, {1: &quot;number&quot;, &quot;raw&quot;: ()} &lt;- call-with-continuation-mark {f: &quot;recipe-literal&quot;}</span>
+<span id="L305" class="LineNr">305 </span><span class="Comment"># entering f</span>
+<span id="L306" class="LineNr">306 </span><span class="traceContains">+mem: new alloc: 1004</span>
+<span id="L307" class="LineNr">307 </span><span class="Comment"># entering g</span>
+<span id="L308" class="LineNr">308 </span><span class="traceContains">+mem: new alloc: 1007</span>
+<span id="L309" class="LineNr">309 </span><span class="Comment"># return control to main</span>
+<span id="L310" class="LineNr">310 </span><span class="traceContains">+run: return-continuation-until-mark {34: &quot;literal&quot;}</span>
+<span id="L311" class="LineNr">311 </span><span class="Comment"># no allocs abandoned yet</span>
+<span id="L312" class="LineNr">312 </span><span class="traceContains">+mem: storing 34 in location 1</span>
+<span id="L313" class="LineNr">313 </span><span class="Comment"># end of main</span>
+<span id="L314" class="LineNr">314 </span><span class="Comment"># make sure no memory leaks..</span>
+<span id="L315" class="LineNr">315 </span><span class="traceContains">+mem: trying to reclaim local k:continuation</span>
+<span id="L316" class="LineNr">316 </span><span class="traceContains">+mem: automatically abandoning 1007</span>
+<span id="L317" class="LineNr">317 </span><span class="traceContains">+mem: automatically abandoning 1004</span>
+<span id="L318" class="LineNr">318 </span><span class="traceContains">+mem: automatically abandoning 1000</span>
+<span id="L319" class="LineNr">319 </span><span class="Comment"># ..even though we never called the continuation</span>
+<span id="L320" class="LineNr">320 </span><span class="traceAbsent">-app: continuation called</span>
 </pre>
 </body>
 </html>
diff --git a/html/082scenario_screen.cc.html b/html/082scenario_screen.cc.html
index c04ed1ee..cde419df 100644
--- a/html/082scenario_screen.cc.html
+++ b/html/082scenario_screen.cc.html
@@ -69,7 +69,7 @@ if ('onhashchange' in window) {
 <span id="L4" class="LineNr">  4 </span><span class="Comment">//: scenario. 'screen-should-contain' can check unicode characters in the fake</span>
 <span id="L5" class="LineNr">  5 </span><span class="Comment">//: screen</span>
 <span id="L6" class="LineNr">  6 </span>
-<span id="L7" class="LineNr">  7 </span><span class="Comment">//: first make sure we don't mangle these functions in other transforms</span>
+<span id="L7" class="LineNr">  7 </span><span class="Comment">//: first make sure we don't mangle these instructions in other transforms</span>
 <span id="L8" class="LineNr">  8 </span><span class="Delimiter">:(before &quot;End initialize_transform_rewrite_literal_string_to_text()&quot;)</span>
 <span id="L9" class="LineNr">  9 </span>recipes_taking_literal_strings<span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;screen-should-contain&quot;</span><span class="Delimiter">);</span>
 <span id="L10" class="LineNr"> 10 </span>recipes_taking_literal_strings<span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;screen-should-contain-in-color&quot;</span><span class="Delimiter">);</span>
diff --git a/html/085scenario_console.cc.html b/html/085scenario_console.cc.html
index 5a7fd154..67b651cc 100644
--- a/html/085scenario_console.cc.html
+++ b/html/085scenario_console.cc.html
@@ -66,7 +66,7 @@ if ('onhashchange' in window) {
 <span id="L4" class="LineNr">  4 </span><span class="Comment">//: scenario. Like with the fake screen, 'assume-console' transparently</span>
 <span id="L5" class="LineNr">  5 </span><span class="Comment">//: supports unicode.</span>
 <span id="L6" class="LineNr">  6 </span>
-<span id="L7" class="LineNr">  7 </span><span class="Comment">//: first make sure we don't mangle these functions in other transforms</span>
+<span id="L7" class="LineNr">  7 </span><span class="Comment">//: first make sure we don't mangle this instruction in other transforms</span>
 <span id="L8" class="LineNr">  8 </span><span class="Delimiter">:(before &quot;End initialize_transform_rewrite_literal_string_to_text()&quot;)</span>
 <span id="L9" class="LineNr">  9 </span>recipes_taking_literal_strings<span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;assume-console&quot;</span><span class="Delimiter">);</span>
 <span id="L10" class="LineNr"> 10 </span>
@@ -128,7 +128,7 @@ if ('onhashchange' in window) {
 <span id="L66" class="LineNr"> 66 </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="L67" class="LineNr"> 67 </span>  <span class="Conceal">¦</span> <span class="Normal">const</span> instruction&amp; inst = r<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>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;left-click&quot;</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#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 'left-click' event starting at &quot;</span> &lt;&lt; Current_routine<span class="Delimiter">-&gt;</span>alloc &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#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 'left-click' event starting at &quot;</span> &lt;&lt; Current_routine<span class="Delimiter">-&gt;</span>alloc &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> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr_address<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">tag for 'touch-event' variant of 'event' exclusive-container</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L71" class="LineNr"> 71 </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> curr_address+<span class="Comment">/*</span><span class="Comment">skip tag</span><span class="Comment">*/</span><span class="Constant">1</span>+<span class="Comment">/*</span><span class="Comment">offset of 'type' in 'mouse-event'</span><span class="Comment">*/</span><span class="Constant">0</span><span class="Delimiter">,</span> TB_KEY_MOUSE_LEFT<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>Memory<span class="Delimiter">,</span> curr_address+<span class="Comment">/*</span><span class="Comment">skip tag</span><span class="Comment">*/</span><span class="Constant">1</span>+<span class="Comment">/*</span><span class="Comment">offset of 'row' in 'mouse-event'</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> <a href='002test.cc.html#L91'>to_integer</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>
@@ -136,7 +136,7 @@ if ('onhashchange' in window) {
 <span id="L74" class="LineNr"> 74 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr_address += <a href='085scenario_console.cc.html#L296'>size_of_event</a><span class="Delimiter">();</span>
 <span id="L75" class="LineNr"> 75 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L76" class="LineNr"> 76 </span>  <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;press&quot;</span><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#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 'press' event starting at &quot;</span> &lt;&lt; curr_address &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="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 'press' event starting at &quot;</span> &lt;&lt; curr_address &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> string key = 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="L79" class="LineNr"> 79 </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>key<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='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr_address+<span class="Constant">1</span><span class="Delimiter">,</span> <a href='002test.cc.html#L91'>to_integer</a><span class="Delimiter">(</span>key<span class="Delimiter">));</span>
@@ -157,18 +157,18 @@ if ('onhashchange' in window) {
 <span id="L95" class="LineNr"> 95 </span>  <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Delimiter">{</span>
 <span id="L96" class="LineNr"> 96 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// keyboard input</span>
 <span id="L97" class="LineNr"> 97 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;type&quot;</span><span class="Delimiter">);</span>
-<span id="L98" class="LineNr"> 98 </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;storing 'type' event starting at &quot;</span> &lt;&lt; curr_address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L98" class="LineNr"> 98 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 'type' event starting at &quot;</span> &lt;&lt; curr_address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L99" class="LineNr"> 99 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">const</span> string&amp; contents = 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="L100" class="LineNr">100 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">const</span> <span class="Normal">char</span>* raw_contents = contents<span class="Delimiter">.</span>c_str<span class="Delimiter">();</span>
 <span id="L101" class="LineNr">101 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">int</span> num_keyboard_events = <a href='038new_text.cc.html#L131'>unicode_length</a><span class="Delimiter">(</span>contents<span class="Delimiter">);</span>
 <span id="L102" class="LineNr">102 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">int</span> curr = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L103" class="LineNr">103 </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; num_keyboard_events<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> <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 'text' tag at &quot;</span> &lt;&lt; curr_address &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> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 'text' tag at &quot;</span> &lt;&lt; curr_address &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="Conceal">¦</span> <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr_address<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">tag for 'text' variant of 'event' exclusive-container</span><span class="Comment">*/</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L106" class="LineNr">106 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">uint32_t</span> curr_character<span class="Delimiter">;</span>
 <span id="L107" class="LineNr">107 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>curr &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>contents<span class="Delimiter">));</span>
 <span id="L108" class="LineNr">108 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> tb_utf8_char_to_unicode<span class="Delimiter">(</span>&amp;curr_character<span class="Delimiter">,</span> &amp;raw_contents[curr]<span class="Delimiter">);</span>
-<span id="L109" class="LineNr">109 </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;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing character &quot;</span> &lt;&lt; curr_character &lt;&lt; <span class="Constant">&quot; at &quot;</span> &lt;&lt; curr_address+<span class="Comment">/*</span><span class="Comment">skip exclusive container tag</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="L109" class="LineNr">109 </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">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing character &quot;</span> &lt;&lt; curr_character &lt;&lt; <span class="Constant">&quot; at &quot;</span> &lt;&lt; curr_address+<span class="Comment">/*</span><span class="Comment">skip exclusive container tag</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="L110" class="LineNr">110 </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>Memory<span class="Delimiter">,</span> curr_address+<span class="Comment">/*</span><span class="Comment">skip exclusive container tag</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> curr_character<span class="Delimiter">);</span>
 <span id="L111" class="LineNr">111 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr += tb_utf8_char_length<span class="Delimiter">(</span>raw_contents[curr]<span class="Delimiter">);</span>
 <span id="L112" class="LineNr">112 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr_address += <a href='085scenario_console.cc.html#L296'>size_of_event</a><span class="Delimiter">();</span>
@@ -178,9 +178,9 @@ if ('onhashchange' in window) {
 <span id="L116" class="LineNr">116 </span>  assert<span class="Delimiter">(</span>curr_address == event_data_address+size<span class="Delimiter">);</span>
 <span id="L117" class="LineNr">117 </span>  <span class="Comment">// wrap the array of events in a console object</span>
 <span id="L118" class="LineNr">118 </span>  <span class="Normal">int</span> console_address = allocate<span class="Delimiter">(</span><a href='085scenario_console.cc.html#L306'>size_of_console</a><span class="Delimiter">());</span>
-<span id="L119" class="LineNr">119 </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 console in &quot;</span> &lt;&lt; console_address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L119" class="LineNr">119 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing console in &quot;</span> &lt;&lt; console_address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L120" class="LineNr">120 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> CONSOLE<span class="Delimiter">,</span> console_address<span class="Delimiter">);</span>
-<span id="L121" class="LineNr">121 </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 console data in &quot;</span> &lt;&lt; console_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' in container 'events'</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="L121" class="LineNr">121 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing console data in &quot;</span> &lt;&lt; console_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' in container 'events'</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="L122" class="LineNr">122 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> console_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' in container 'events'</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> event_data_address<span class="Delimiter">);</span>
 <span id="L123" class="LineNr">123 </span>  <span class="Comment">// increment refcount for event data</span>
 <span id="L124" class="LineNr">124 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> event_data_address<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
diff --git a/html/089scenario_filesystem.cc.html b/html/089scenario_filesystem.cc.html
index 77deb8a0..434dcc16 100644
--- a/html/089scenario_filesystem.cc.html
+++ b/html/089scenario_filesystem.cc.html
@@ -269,31 +269,31 @@ if ('onhashchange' in window) {
 <span id="L207" class="LineNr">207 </span>  <span class="Normal">int</span> curr = resources_data_address + <span class="Comment">/*</span><span class="Comment">skip refcount and length</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">;</span>
 <span id="L208" class="LineNr">208 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::const_iterator p = contents<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != contents<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="L209" class="LineNr">209 </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> <a href='038new_text.cc.html#L38'>new_mu_text</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">));</span>
-<span id="L210" class="LineNr">210 </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 file name &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">)</span> &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="L210" class="LineNr">210 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing file name &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">)</span> &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="L211" class="LineNr">211 </span>  <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L212" class="LineNr">212 </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 refcount 1 in location &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Memory<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="L212" class="LineNr">212 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><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; get<span class="Delimiter">(</span>Memory<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="L213" class="LineNr">213 </span>  <span class="Conceal">¦</span> ++curr<span class="Delimiter">;</span>
 <span id="L214" class="LineNr">214 </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> <a href='038new_text.cc.html#L38'>new_mu_text</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">));</span>
-<span id="L215" class="LineNr">215 </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 file contents &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">)</span> &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="L215" class="LineNr">215 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing file contents &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">)</span> &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="L216" class="LineNr">216 </span>  <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L217" class="LineNr">217 </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 refcount 1 in location &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Memory<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="L217" class="LineNr">217 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><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; get<span class="Delimiter">(</span>Memory<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="L218" class="LineNr">218 </span>  <span class="Conceal">¦</span> ++curr<span class="Delimiter">;</span>
 <span id="L219" class="LineNr">219 </span>  <span class="Delimiter">}</span>
 <span id="L220" class="LineNr">220 </span>  curr = resources_data_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="L221" class="LineNr">221 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>contents<span class="Delimiter">));</span>  <span class="Comment">// size of array</span>
-<span id="L222" class="LineNr">222 </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 size &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">)</span> &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="L222" class="LineNr">222 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing resources size &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">)</span> &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="L223" class="LineNr">223 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> resources_data_address<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>  <span class="Comment">// initialize refcount</span>
-<span id="L224" class="LineNr">224 </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_data_address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L224" class="LineNr">224 </span>  <a href='003trace.cc.html#L161'>trace</a><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_data_address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L225" class="LineNr">225 </span>  <span class="Comment">// wrap the resources data in a 'resources' object</span>
 <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 <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="L229" class="LineNr">229 </span>  <a href='003trace.cc.html#L161'>trace</a><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#L82'>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="L231" class="LineNr">231 </span>  <a href='003trace.cc.html#L161'>trace</a><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 <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="L234" class="LineNr">234 </span>  <a href='003trace.cc.html#L161'>trace</a><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#L82'>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/099hardware_checks.cc.html b/html/099hardware_checks.cc.html
index 66ae664c..80835903 100644
--- a/html/099hardware_checks.cc.html
+++ b/html/099hardware_checks.cc.html
@@ -61,9 +61,9 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr"> 1 </span><span class="Comment">//: Let's raise errors when students use real hardware in any functions</span>
-<span id="L2" class="LineNr"> 2 </span><span class="Comment">//: besides 'main'. Part of the goal is to teach them testing hygiene and</span>
-<span id="L3" class="LineNr"> 3 </span><span class="Comment">//: dependency injection.</span>
+<span id="L1" class="LineNr"> 1 </span><span class="Comment">//: Let's raise errors when students use real hardware in any recipes besides</span>
+<span id="L2" class="LineNr"> 2 </span><span class="Comment">//: 'main'. Part of the goal is to teach them testing hygiene and dependency</span>
+<span id="L3" class="LineNr"> 3 </span><span class="Comment">//: injection.</span>
 <span id="L4" class="LineNr"> 4 </span><span class="Comment">//:</span>
 <span id="L5" class="LineNr"> 5 </span><span class="Comment">//: This is easy to sidestep, it's for feedback rather than safety.</span>
 <span id="L6" class="LineNr"> 6 </span>
diff --git a/html/101run_sandboxed.cc.html b/html/101run_sandboxed.cc.html
index bf52a190..0dde51a3 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> <a href='043space.cc.html#L83'>address</a><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#L82'>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><a href='043space.cc.html#L83'>address</a><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#L82'>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>
@@ -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> <a href='043space.cc.html#L83'>address</a><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#L82'>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> <a href='043space.cc.html#L83'>address</a><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#L82'>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>