about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2017-09-23 19:30:00 -0700
committerKartik K. Agaram <vc@akkartik.com>2017-09-23 19:30:00 -0700
commit615f4a970a2fa5c91766ee585a7d531b083f4bff (patch)
tree5fce7848b60fe7e0dae089c94ca228ad74067ce1
parent72cf994869e19f6bdc4678e1122f0082d07d4a11 (diff)
downloadmu-615f4a970a2fa5c91766ee585a7d531b083f4bff.tar.gz
4003
-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/021check_instruction.cc.html18
-rw-r--r--html/022arithmetic.cc.html2
-rw-r--r--html/030container.cc.html12
-rw-r--r--html/032array.cc.html20
-rw-r--r--html/034address.cc.html52
-rw-r--r--html/035lookup.cc.html106
-rw-r--r--html/036refcount.cc.html250
-rw-r--r--html/037abandon.cc.html112
-rw-r--r--html/038new_text.cc.html8
-rw-r--r--html/043space.cc.html40
-rw-r--r--html/044space_surround.cc.html14
-rw-r--r--html/045closure_name.cc.html2
-rw-r--r--html/050scenario.cc.html16
-rw-r--r--html/053recipe_header.cc.html2
-rw-r--r--html/054static_dispatch.cc.html2
-rw-r--r--html/055shape_shifting_container.cc.html36
-rw-r--r--html/056shape_shifting_recipe.cc.html4
-rw-r--r--html/057immutable.cc.html2
-rw-r--r--html/061text.mu.html2757
-rw-r--r--html/062convert_ingredients_to_text.cc.html6
-rw-r--r--html/064list.mu.html10
-rw-r--r--html/065duplex_list.mu.html10
-rw-r--r--html/066stream.mu.html2
-rw-r--r--html/069hash.cc.html6
-rw-r--r--html/071deep_copy.cc.html10
-rw-r--r--html/072recipe.cc.html4
-rw-r--r--html/075channel.mu.html6
-rw-r--r--html/088file.mu.html8
-rw-r--r--html/089scenario_filesystem.cc.html4
-rw-r--r--html/092socket.mu.html6
-rw-r--r--html/101run_sandboxed.cc.html8
-rw-r--r--html/chessboard.mu.html603
-rw-r--r--html/edit/003-shortcuts.mu.html4
-rw-r--r--html/edit/005-sandbox.mu.html4
-rw-r--r--html/edit/011-errors.mu.html2
-rw-r--r--html/factorial.mu.html39
-rw-r--r--html/http-client.mu.html4
-rw-r--r--html/lambda-to-mu.mu.html22
-rw-r--r--html/tangle.mu.html55
44 files changed, 2135 insertions, 2169 deletions
diff --git a/html/010vm.cc.html b/html/010vm.cc.html
index bf283866..acef2133 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#L76'>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#L76'>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> address = <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
+<span id="L138" class="LineNr">138 </span>  <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> address<span class="Delimiter">).</span>name = <span class="Constant">&quot;address&quot;</span><span class="Delimiter">;</span>
 <span id="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#L76'>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:address:number&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:boolean&quot;</span><span class="Delimiter">);</span>
 <span id="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#L76'>address</a>:address&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:<a href='043space.cc.html#L76'>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:address:address&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:address:boolean&quot;</span><span class="Delimiter">);</span>
 <span id="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#L76'>address</a>:boolean&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:<a href='043space.cc.html#L76'>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:address:boolean&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:address:boolean&quot;</span><span class="Delimiter">);</span>
 <span id="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#L76'>address</a>:address&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:<a href='043space.cc.html#L76'>address</a>:<a href='043space.cc.html#L76'>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:address:address&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:address:address:number&quot;</span><span class="Delimiter">);</span>
 <span id="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#L76'>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:address:number&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:character:array&quot;</span><span class="Delimiter">);</span>
 <span id="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#L76'>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:address:boolean&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:boolean:address&quot;</span><span class="Delimiter">);</span>
 <span id="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 a51b40fc..b332e42b 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#L76'>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>:address:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span><span class="Delimiter">,</span> <span class="Constant">4</span>:number
 <span id="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#L76'>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>:address: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 a7ce963d..3dded1d8 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#L76'>address</a>:array:character<span class="Special"> &lt;- </span>copy [abc def]
+<span id="L12" class="LineNr"> 12 </span>  <span class="Constant">1</span>:address:array:character<span class="Special"> &lt;- </span>copy [abc def]
 <span id="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#L76'>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>:address: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#L76'>address</a>:array:character<span class="Special"> &lt;- </span>copy [abc [def]]
+<span id="L172" class="LineNr">172 </span>  <span class="Constant">1</span>:address:array:character<span class="Special"> &lt;- </span>copy [abc [def]]
 <span id="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#L76'>address</a>:array:character<span class="Special"> &lt;- </span>copy [abc \[def]
+<span id="L178" class="LineNr">178 </span>  <span class="Constant">1</span>:address:array:character<span class="Special"> &lt;- </span>copy [abc \[def]
 <span id="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#L76'>address</a>:array:character<span class="Special"> &lt;- </span>copy [
+<span id="L184" class="LineNr">184 </span>  <span class="Constant">1</span>:address: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#L76'>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>:address: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 ac7a492a..0867993b 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#L76'>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>address array character<span class="Delimiter">)</span> <span class="Delimiter">(</span>bar number<span class="Delimiter">))}</span><span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
 <span id="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 80140cbc..67df9193 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#L76'>address</a>:number
+<span id="L94" class="LineNr"> 94 </span><span class="muData">type</span> foo = address: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/021check_instruction.cc.html b/html/021check_instruction.cc.html
index b8f91f5b..d9d3a922 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#L76'>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>:address: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#L76'>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:address: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#L76'>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#L76'>address</a>:num
+<span id="L76" class="LineNr"> 76 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">12</span>/unsafe
+<span id="L77" class="LineNr"> 77 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:address:num
 <span id="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#L76'>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#L76'>address</a>:num
+<span id="L85" class="LineNr"> 85 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">12</span>/unsafe
+<span id="L86" class="LineNr"> 86 </span>  <span class="Constant">2</span>:<span class="Normal">char</span><span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:address:num
 <span id="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#L76'>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:address: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#L76'>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:address: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#L76'>address</a>:buffer:<a href='043space.cc.html#L76'>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:address:buffer:address: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 78db2b4c..8efefbe6 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#L76'>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>:address: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/030container.cc.html b/html/030container.cc.html
index ebe82988..1427b05c 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#L76'>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:address: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#L76'>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:address: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#L76'>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>:address:num<span class="Special"> &lt;- </span>get <span class="Constant">12</span>:point-number/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1:offset</span>
 <span id="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,8 +636,8 @@ 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#L76'>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#L76'>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> address = base_address + base<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>offset<span class="Delimiter">.</span>at<span class="Delimiter">(</span>offset<span class="Delimiter">);</span>
+<span id="L573" class="LineNr">573 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address to copy to is &quot;</span> &lt;&lt; address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="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>
@@ -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#L76'>address</a> array <span class="Delimiter">(</span><a href='043space.cc.html#L76'>address</a> array character<span class="Delimiter">))}</span>
+<span id="L874" class="LineNr">874 </span>  <span class="Delimiter">{</span>x: <span class="Delimiter">(</span>address array <span class="Delimiter">(</span>address array character<span class="Delimiter">))}</span>
 <span id="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/032array.cc.html b/html/032array.cc.html
index 1b1c343f..fab5ef56 100644
--- a/html/032array.cc.html
+++ b/html/032array.cc.html
@@ -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#L76'>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:address: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#L76'>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:address: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#L76'>address</a>:array:<a href='043space.cc.html#L76'>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:address:array:address: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#L76'>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:address: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#L76'>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>address 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#L76'>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#L76'>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>:address:num<span class="Special"> &lt;- </span>index <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span>address number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)},</span> <span class="Constant">0</span>
 <span id="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#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="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#L76'>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 address is &quot;</span> &lt;&lt; base_address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L355" class="LineNr">355 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base_address == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L356" class="LineNr">356 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="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#L76'>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:address: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,8 +618,8 @@ 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#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;invalid index &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot; in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="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#L76'>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#L76'>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> address = base_address + <span class="Comment">/*</span><span class="Comment">skip length</span><span class="Comment">*/</span><span class="Constant">1</span> + index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span>*size_of<span class="Delimiter">(</span><a href='032array.cc.html#L381'>array_element</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L557" class="LineNr">557 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address to copy to is &quot;</span> &lt;&lt; address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="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>
diff --git a/html/034address.cc.html b/html/034address.cc.html
index ed08df0f..ae716fa4 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#L76'>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#L76'>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#L76'>address</a>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:num/<span class="Special">raw</span>
+<span id="L126" class="LineNr">126 </span>  <span class="Constant">1</span>:address:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L127" class="LineNr">127 </span>  <span class="Constant">2</span>:address:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L128" class="LineNr">128 </span>  <span class="Constant">3</span>:<span class="Normal">bool</span>/<span class="Special">raw &lt;- </span>equal <span class="Constant">1</span>:address:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">2</span>:address:num/<span class="Special">raw</span>
 <span id="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#L76'>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#L76'>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#L76'>address</a>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:array:num/<span class="Special">raw</span>
+<span id="L135" class="LineNr">135 </span>  <span class="Constant">1</span>:address:array:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">5</span>
+<span id="L136" class="LineNr">136 </span>  <span class="Constant">2</span>:address:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L137" class="LineNr">137 </span>  <span class="Constant">3</span>:num/<span class="Special">raw &lt;- </span>subtract <span class="Constant">2</span>:address:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:array:num/<span class="Special">raw</span>
 <span id="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#L76'>address</a>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span><a href='043space.cc.html#L76'>address</a> number<span class="Delimiter">)</span>: type<span class="Delimiter">}</span>
+<span id="L146" class="LineNr">146 </span>  <span class="Constant">1</span>:address:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>address number<span class="Delimiter">)</span>: type<span class="Delimiter">}</span>
 <span id="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#L76'>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>:address:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>num<span class="Delimiter">)</span>: type<span class="Delimiter">}</span>  <span class="Comment"># should be '{num: type}'</span>
 <span id="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#L76'>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>:address: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#L76'>address</a> <a href='043space.cc.html#L76'>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>address address number<span class="Delimiter">),</span> <span class="Special">raw</span>: <span class="Delimiter">()}</span><span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>&amp; num<span class="Delimiter">)</span>: type<span class="Delimiter">}</span>
 <span id="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>
@@ -405,9 +405,9 @@ if ('onhashchange' in window) {
 <span id="L341" class="LineNr">341 </span>  <span class="Normal">const</span> <span class="Normal">int</span> result = Current_routine<span class="Delimiter">-&gt;</span>alloc<span class="Delimiter">;</span>
 <span id="L342" class="LineNr">342 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new alloc: &quot;</span> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L343" class="LineNr">343 </span>  <span class="Comment">// initialize allocated space</span>
-<span id="L344" class="LineNr">344 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> <a href='043space.cc.html#L76'>address</a> = result<span class="Delimiter">;</span>  <a href='043space.cc.html#L76'>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#L76'>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#L76'>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> address = result<span class="Delimiter">;</span>  address &lt; result+size<span class="Delimiter">;</span>  ++address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L345" class="LineNr">345 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0 in location &quot;</span> &lt;&lt; address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L346" class="LineNr">346 </span>  <span class="Conceal">¦</span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L347" class="LineNr">347 </span>  <span class="Delimiter">}</span>
 <span id="L348" class="LineNr">348 </span>  Current_routine<span class="Delimiter">-&gt;</span>alloc += size<span class="Delimiter">;</span>
 <span id="L349" class="LineNr">349 </span>  <span class="Comment">// no support yet for reclaiming memory between routines</span>
@@ -448,33 +448,33 @@ if ('onhashchange' in window) {
 <span id="L384" class="LineNr">384 </span><span class="Special">% Memory_allocated_until = 10;</span>
 <span id="L385" class="LineNr">385 </span><span class="Special">% put(Memory, Memory_allocated_until, 1);</span>
 <span id="L386" class="LineNr">386 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L387" class="LineNr">387 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>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>:address: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#L76'>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#L76'>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#L76'>address</a>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">11</span>:<a href='043space.cc.html#L76'>address</a>:num/<span class="Special">raw</span>
+<span id="L393" class="LineNr">393 </span>  <span class="Constant">11</span>:address:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L394" class="LineNr">394 </span>  <span class="Constant">12</span>:address:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L395" class="LineNr">395 </span>  <span class="Constant">13</span>:num/<span class="Special">raw &lt;- </span>subtract <span class="Constant">12</span>:address:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">11</span>:address:num/<span class="Special">raw</span>
 <span id="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#L76'>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#L76'>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#L76'>address</a>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:array:num/<span class="Special">raw</span>
+<span id="L402" class="LineNr">402 </span>  <span class="Constant">1</span>:address:array:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">5</span>
+<span id="L403" class="LineNr">403 </span>  <span class="Constant">2</span>:address:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L404" class="LineNr">404 </span>  <span class="Constant">3</span>:num/<span class="Special">raw &lt;- </span>subtract <span class="Constant">2</span>:address:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:array:num/<span class="Special">raw</span>
 <span id="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#L76'>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#L76'>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#L76'>address</a>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:array:num/<span class="Special">raw</span>
+<span id="L411" class="LineNr">411 </span>  <span class="Constant">1</span>:address:array:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">0</span>
+<span id="L412" class="LineNr">412 </span>  <span class="Constant">2</span>:address:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L413" class="LineNr">413 </span>  <span class="Constant">3</span>:num/<span class="Special">raw &lt;- </span>subtract <span class="Constant">2</span>:address:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:array:num/<span class="Special">raw</span>
 <span id="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#L76'>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#L76'>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>:address:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L425" class="LineNr">425 </span>  <span class="Constant">2</span>:address:point/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">point:type</span>  <span class="Comment"># not enough room in initial page</span>
 <span id="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#L76'>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>:address: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 8df212f8..a4ee9480 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#L76'>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>:address: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#L76'>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>:address: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#L76'>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#L76'>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>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L53" class="LineNr"> 53 </span>  <span class="Constant">1</span>:address:num/lookup<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
 <span id="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#L76'>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#L76'>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>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L65" class="LineNr"> 65 </span>  <span class="Constant">1</span>:address:num/lookup<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
 <span id="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#L76'>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:address: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#L76'>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#L76'>address</a>:num/lookup
+<span id="L74" class="LineNr"> 74 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L75" class="LineNr"> 75 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:address:num/lookup
 <span id="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>
@@ -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#L76'>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:address: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#L76'>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:address: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#L76'>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>:address: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#L76'>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>:address: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#L76'>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>:address: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#L76'>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#L76'>address</a>:num/lookup<span class="Special"> &lt;- </span>get <span class="Constant">1</span>:<a href='043space.cc.html#L76'>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>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>/unsafe
+<span id="L217" class="LineNr">217 </span>  <span class="Constant">2</span>:address:num/lookup<span class="Special"> &lt;- </span>get <span class="Constant">1</span>:address:point/lookup<span class="Delimiter">,</span> <span class="Constant">0:offset</span>
 <span id="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#L76'>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>:address: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#L76'>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>:address: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#L76'>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>:address: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#L76'>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#L76'>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>:address:point/lookup<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> <span class="Constant">1</span>:address:point/lookup<span class="Delimiter">,</span> <span class="Constant">0:offset</span><span class="Delimiter">,</span> <span class="Constant">36</span>
 <span id="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#L76'>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>:address: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#L76'>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#L76'>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>:address:point<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> <span class="Constant">1</span>:address:point/lookup<span class="Delimiter">,</span> <span class="Constant">x:offset</span><span class="Delimiter">,</span> <span class="Constant">36</span>
 <span id="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#L76'>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#L76'>address</a>:array:num/lookup
+<span id="L293" class="LineNr">293 </span>  <span class="Constant">1</span>:address:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L294" class="LineNr">294 </span>  <span class="Constant">2</span>:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:address:array:num/lookup
 <span id="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#L76'>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#L76'>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>:address:array:num:<span class="Constant">3</span><span class="Special"> &lt;- </span>copy <span class="Constant">1000</span>/unsafe  <span class="Comment"># pretend allocation</span>
+<span id="L305" class="LineNr">305 </span>  <span class="Constant">1</span>:address:array:num:<span class="Constant">3</span>/lookup<span class="Special"> &lt;- </span>create-array
 <span id="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#L76'>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#L76'>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>:address:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L322" class="LineNr">322 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>index <span class="Constant">1</span>:address:array:num/lookup<span class="Delimiter">,</span> <span class="Constant">1</span>
 <span id="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#L76'>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#L76'>address</a>:array:num/lookup<span class="Special"> &lt;- </span>put-index <span class="Constant">1</span>:<a href='043space.cc.html#L76'>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>:address:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L346" class="LineNr">346 </span>  <span class="Constant">1</span>:address:array:num/lookup<span class="Special"> &lt;- </span>put-index <span class="Constant">1</span>:address:array:num/lookup<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">34</span>
 <span id="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#L76'>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>:address: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#L76'>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>:address: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#L76'>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#L76'>address</a>:array:num<span class="Special"> &lt;- </span>put-index <span class="Constant">1</span>:<a href='043space.cc.html#L76'>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>:address:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L372" class="LineNr">372 </span>  <span class="Constant">1</span>:address:array:num<span class="Special"> &lt;- </span>put-index <span class="Constant">1</span>:address:array:num/lookup<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">34</span>
 <span id="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#L76'>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#L76'>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#L76'>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#L76'>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#L76'>address</a>:num
-<span id="L391" class="LineNr">391 </span>  *<span class="Constant">5</span>:<a href='043space.cc.html#L76'>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#L76'>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>address number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)}</span><span class="Special"> &lt;- </span>create-array
+<span id="L389" class="LineNr">389 </span>  <span class="Constant">5</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L390" class="LineNr">390 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span>address number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)}</span><span class="Special"> &lt;- </span>put-index <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span>address number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)},</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">5</span>:address:num
+<span id="L391" class="LineNr">391 </span>  *<span class="Constant">5</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L392" class="LineNr">392 </span>  <span class="Constant">6</span>:num<span class="Special"> &lt;- </span>copy *<span class="Constant">5</span>:address:num
 <span id="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#L76'>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#L76'>address</a>:array:num/lookup
+<span id="L416" class="LineNr">416 </span>  <span class="Constant">1</span>:address:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L417" class="LineNr">417 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>length <span class="Constant">1</span>:address:array:num/lookup
 <span id="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#L76'>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#L76'>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>:address:number-<span class="Normal">or</span>-point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L431" class="LineNr">431 </span>  <span class="Constant">2</span>:num<span class="Delimiter">,</span> <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert <span class="Constant">1</span>:address:number-<span class="Normal">or</span>-point/lookup<span class="Delimiter">,</span> <span class="Constant">i:variant</span>
 <span id="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#L76'>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#L76'>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#L76'>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#L76'>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>:address:number-<span class="Normal">or</span>-point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L441" class="LineNr">441 </span>  <span class="Constant">2</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>/unsafe
+<span id="L442" class="LineNr">442 </span>  <span class="Constant">2</span>:address:num/lookup<span class="Delimiter">,</span> <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert <span class="Constant">1</span>:address:number-<span class="Normal">or</span>-point/lookup<span class="Delimiter">,</span> <span class="Constant">i:variant</span>
 <span id="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#L76'>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#L76'>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#L76'>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#L76'>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>:address:number-<span class="Normal">or</span>-point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L452" class="LineNr">452 </span>  <span class="Constant">2</span>:address:<span class="Normal">bool</span><span class="Special"> &lt;- </span>copy <span class="Constant">20</span>/unsafe
+<span id="L453" class="LineNr">453 </span>  <span class="Constant">3</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:address:<span class="Normal">bool</span>/lookup<span class="Special"> &lt;- </span>maybe-convert <span class="Constant">1</span>:address:number-<span class="Normal">or</span>-point/lookup<span class="Delimiter">,</span> <span class="Constant">i:variant</span>
 <span id="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#L76'>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#L76'>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>:address:number-<span class="Normal">or</span>-point<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
+<span id="L475" class="LineNr">475 </span>  <span class="Constant">1</span>:address:number-<span class="Normal">or</span>-point/lookup<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/number<span class="Delimiter">,</span> <span class="Constant">34</span>
 <span id="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#L76'>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>:address: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#L76'>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>:address: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 5beda908..a630e068 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#L76'>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#L76'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L8" class="LineNr">   8 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>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#L76'>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>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">1000</span>/unsafe
+<span id="L7" class="LineNr">   7 </span>  <span class="Constant">2</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:address:num
+<span id="L8" class="LineNr">   8 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L9" class="LineNr">   9 </span>  <span class="Constant">2</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="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>
@@ -162,9 +162,9 @@ if ('onhashchange' in window) {
 <span id="L97" class="LineNr">  97 </span>
 <span id="L98" class="LineNr">  98 </span><span class="Delimiter">:(scenario refcounts_reflexive)</span>
 <span id="L99" class="LineNr">  99 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L100" class="LineNr"> 100 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L100" class="LineNr"> 100 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
 <span id="L101" class="LineNr"> 101 </span>  <span class="Comment"># idempotent copies leave refcount unchanged</span>
-<span id="L102" class="LineNr"> 102 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L102" class="LineNr"> 102 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:address:num
 <span id="L103" class="LineNr"> 103 </span>]
 <span id="L104" class="LineNr"> 104 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L105" class="LineNr"> 105 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -174,14 +174,14 @@ if ('onhashchange' in window) {
 <span id="L109" class="LineNr"> 109 </span>
 <span id="L110" class="LineNr"> 110 </span><span class="Delimiter">:(scenario refcounts_call)</span>
 <span id="L111" class="LineNr"> 111 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L112" class="LineNr"> 112 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L112" class="LineNr"> 112 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
 <span id="L113" class="LineNr"> 113 </span>  <span class="Comment"># passing in addresses to recipes increments refcount</span>
-<span id="L114" class="LineNr"> 114 </span>  foo <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L114" class="LineNr"> 114 </span>  foo <span class="Constant">1</span>:address:num
 <span id="L115" class="LineNr"> 115 </span>  <span class="Comment"># return does NOT yet decrement refcount; memory must be explicitly managed</span>
-<span id="L116" class="LineNr"> 116 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L116" class="LineNr"> 116 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
 <span id="L117" class="LineNr"> 117 </span>]
 <span id="L118" class="LineNr"> 118 </span><span class="muRecipe">def</span> foo [
-<span id="L119" class="LineNr"> 119 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>next-ingredient
+<span id="L119" class="LineNr"> 119 </span>  <span class="Constant">2</span>:address:num<span class="Special"> &lt;- </span>next-ingredient
 <span id="L120" class="LineNr"> 120 </span>]
 <span id="L121" class="LineNr"> 121 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L122" class="LineNr"> 122 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -196,12 +196,12 @@ if ('onhashchange' in window) {
 <span id="L131" class="LineNr"> 131 </span>
 <span id="L132" class="LineNr"> 132 </span><span class="Delimiter">:(scenario refcounts_put)</span>
 <span id="L133" class="LineNr"> 133 </span><span class="muData">container</span> foo [
-<span id="L134" class="LineNr"> 134 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L134" class="LineNr"> 134 </span>  <span class="Normal">x</span>:address:num
 <span id="L135" class="LineNr"> 135 </span>]
 <span id="L136" class="LineNr"> 136 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L137" class="LineNr"> 137 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L138" class="LineNr"> 138 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
-<span id="L139" class="LineNr"> 139 </span>  *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>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#L76'>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#L76'>address</a>:num
+<span id="L137" class="LineNr"> 137 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L138" class="LineNr"> 138 </span>  <span class="Constant">2</span>:address:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
+<span id="L139" class="LineNr"> 139 </span>  *<span class="Constant">2</span>:address:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">2</span>:address:foo<span class="Delimiter">,</span> <span class="Constant">x:offset</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
 <span id="L140" class="LineNr"> 140 </span>]
 <span id="L141" class="LineNr"> 141 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L142" class="LineNr"> 142 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -214,14 +214,14 @@ if ('onhashchange' in window) {
 <span id="L149" class="LineNr"> 149 </span><span class="Delimiter">:(after &quot;Write Memory in PUT in Run&quot;)</span>
 <span id="L150" class="LineNr"> 150 </span>reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> element = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">,</span> offset<span class="Delimiter">);</span>
 <span id="L151" class="LineNr"> 151 </span>assert<span class="Delimiter">(</span>!has_property<span class="Delimiter">(</span>element<span class="Delimiter">,</span> <span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">));</span>
-<span id="L152" class="LineNr"> 152 </span>element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">);</span>
+<span id="L152" class="LineNr"> 152 </span>element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>address<span class="Delimiter">);</span>
 <span id="L153" class="LineNr"> 153 </span><a href='036refcount.cc.html#L31'>update_any_refcounts</a><span class="Delimiter">(</span>element<span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span>
 <span id="L154" class="LineNr"> 154 </span>
 <span id="L155" class="LineNr"> 155 </span><span class="Delimiter">:(scenario refcounts_put_index)</span>
 <span id="L156" class="LineNr"> 156 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L157" class="LineNr"> 157 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L158" class="LineNr"> 158 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:array:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span><a href='043space.cc.html#L76'>address</a> number<span class="Delimiter">)</span>: type<span class="Delimiter">},</span> <span class="Constant">3</span>
-<span id="L159" class="LineNr"> 159 </span>  *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:array:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>put-index *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:array:<a href='043space.cc.html#L76'>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#L76'>address</a>:num
+<span id="L157" class="LineNr"> 157 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L158" class="LineNr"> 158 </span>  <span class="Constant">2</span>:address:array:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>address number<span class="Delimiter">)</span>: type<span class="Delimiter">},</span> <span class="Constant">3</span>
+<span id="L159" class="LineNr"> 159 </span>  *<span class="Constant">2</span>:address:array:address:num<span class="Special"> &lt;- </span>put-index *<span class="Constant">2</span>:address:array:address:num<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
 <span id="L160" class="LineNr"> 160 </span>]
 <span id="L161" class="LineNr"> 161 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L162" class="LineNr"> 162 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -233,19 +233,19 @@ if ('onhashchange' in window) {
 <span id="L168" class="LineNr"> 168 </span>
 <span id="L169" class="LineNr"> 169 </span><span class="Delimiter">:(after &quot;Write Memory in PUT_INDEX in Run&quot;)</span>
 <span id="L170" class="LineNr"> 170 </span>reagent<span class="Comment">/*</span><span class="Comment">local</span><span class="Comment">*/</span> element<span class="Delimiter">;</span>
-<span id="L171" class="LineNr"> 171 </span>element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">);</span>
+<span id="L171" class="LineNr"> 171 </span>element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>address<span class="Delimiter">);</span>
 <span id="L172" class="LineNr"> 172 </span>element<span class="Delimiter">.</span>type = <a href='032array.cc.html#L377'>copy_array_element</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
 <span id="L173" class="LineNr"> 173 </span><a href='036refcount.cc.html#L31'>update_any_refcounts</a><span class="Delimiter">(</span>element<span class="Delimiter">,</span> value<span class="Delimiter">);</span>
 <span id="L174" class="LineNr"> 174 </span>
 <span id="L175" class="LineNr"> 175 </span><span class="Delimiter">:(scenario refcounts_maybe_convert)</span>
 <span id="L176" class="LineNr"> 176 </span><span class="muData">exclusive-container</span> foo [
 <span id="L177" class="LineNr"> 177 </span>  <span class="Normal">x</span>:num
-<span id="L178" class="LineNr"> 178 </span>  <span class="Normal">p</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L178" class="LineNr"> 178 </span>  <span class="Normal">p</span>:address:num
 <span id="L179" class="LineNr"> 179 </span>]
 <span id="L180" class="LineNr"> 180 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L181" class="LineNr"> 181 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L182" class="LineNr"> 182 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/p<span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L183" class="LineNr"> 183 </span>  <span class="Constant">4</span>:<a href='043space.cc.html#L76'>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 class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L182" class="LineNr"> 182 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/p<span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
+<span id="L183" class="LineNr"> 183 </span>  <span class="Constant">4</span>:address:num<span class="Delimiter">,</span> <span class="Constant">5</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert <span class="Constant">2</span>:foo<span class="Delimiter">,</span> <span class="Constant">1:variant/p</span>
 <span id="L184" class="LineNr"> 184 </span>]
 <span id="L185" class="LineNr"> 185 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L186" class="LineNr"> 186 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -267,17 +267,17 @@ if ('onhashchange' in window) {
 <span id="L202" class="LineNr"> 202 </span>
 <span id="L203" class="LineNr"> 203 </span><span class="Delimiter">:(scenario refcounts_copy_nested)</span>
 <span id="L204" class="LineNr"> 204 </span><span class="muData">container</span> foo [
-<span id="L205" class="LineNr"> 205 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:num  <span class="Comment"># address inside container</span>
+<span id="L205" class="LineNr"> 205 </span>  <span class="Normal">x</span>:address:num  <span class="Comment"># address inside container</span>
 <span id="L206" class="LineNr"> 206 </span>]
 <span id="L207" class="LineNr"> 207 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L208" class="LineNr"> 208 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L209" class="LineNr"> 209 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
-<span id="L210" class="LineNr"> 210 </span>  *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>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#L76'>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#L76'>address</a>:num
-<span id="L211" class="LineNr"> 211 </span>  <span class="Constant">3</span>:foo<span class="Special"> &lt;- </span>copy *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:foo
+<span id="L208" class="LineNr"> 208 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L209" class="LineNr"> 209 </span>  <span class="Constant">2</span>:address:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
+<span id="L210" class="LineNr"> 210 </span>  *<span class="Constant">2</span>:address:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">2</span>:address:foo<span class="Delimiter">,</span> <span class="Constant">x:offset</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
+<span id="L211" class="LineNr"> 211 </span>  <span class="Constant">3</span>:foo<span class="Special"> &lt;- </span>copy *<span class="Constant">2</span>:address:foo
 <span id="L212" class="LineNr"> 212 </span>]
-<span id="L213" class="LineNr"> 213 </span><span class="traceContains">+transform: compute <a href='043space.cc.html#L76'>address</a> offsets for container foo</span>
+<span id="L213" class="LineNr"> 213 </span><span class="traceContains">+transform: compute address offsets for container foo</span>
 <span id="L214" class="LineNr"> 214 </span><span class="traceContains">+transform: checking container foo, element 0</span>
-<span id="L215" class="LineNr"> 215 </span><span class="traceContains">+transform: <a href='043space.cc.html#L76'>address</a> at offset 0</span>
+<span id="L215" class="LineNr"> 215 </span><span class="traceContains">+transform: address at offset 0</span>
 <span id="L216" class="LineNr"> 216 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L217" class="LineNr"> 217 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
 <span id="L218" class="LineNr"> 218 </span><span class="traceContains">+run: {2: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()} &lt;- <a href='001help.cc.html#L221'>put</a> {2: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()}, {x: &quot;offset&quot;}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
@@ -342,7 +342,7 @@ if ('onhashchange' in window) {
 <span id="L277" class="LineNr"> 277 </span><span class="Comment">//  IF offset o1 has tag t2 AND offset o2 has tag t2 AND .., THEN</span>
 <span id="L278" class="LineNr"> 278 </span><span class="Comment">//    for all address_element_infos:</span>
 <span id="L279" class="LineNr"> 279 </span><span class="Comment">//      you need to update refcounts for the address at offset pointing to a payload of type payload_type (just in case we need to abandon something in the process)</span>
-<span id="L280" class="LineNr"> 280 </span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt; <a href='043space.cc.html#L76'>address</a><span class="Delimiter">;</span>
+<span id="L280" class="LineNr"> 280 </span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt; address<span class="Delimiter">;</span>
 <span id="L281" class="LineNr"> 281 </span><span class="Delimiter">:(code)</span>
 <span id="L282" class="LineNr"> 282 </span><span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> set&lt;tag_condition_info&gt;&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> set&lt;tag_condition_info&gt;&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L283" class="LineNr"> 283 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>size<span class="Delimiter">()</span> != b<span class="Delimiter">.</span>size<span class="Delimiter">())</span> <span class="Identifier">return</span> a<span class="Delimiter">.</span>size<span class="Delimiter">()</span> &lt; b<span class="Delimiter">.</span>size<span class="Delimiter">();</span>
@@ -377,10 +377,10 @@ if ('onhashchange' in window) {
 <span id="L312" class="LineNr"> 312 </span><span class="Delimiter">:(code)</span>
 <span id="L313" class="LineNr"> 313 </span><span class="Normal">void</span> compute_container_address_offsets<span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L314" class="LineNr"> 314 </span>  recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
-<span id="L315" class="LineNr"> 315 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- compute <a href='043space.cc.html#L76'>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="L315" class="LineNr"> 315 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- compute address offsets for &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L316" class="LineNr"> 316 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L317" class="LineNr"> 317 </span>  <span class="Conceal">¦</span> instruction&amp; inst = caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L318" class="LineNr"> 318 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;- compute <a href='043space.cc.html#L76'>address</a> offsets for &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L318" class="LineNr"> 318 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;- compute address offsets for &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L319" class="LineNr"> 319 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L320" class="LineNr"> 320 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> compute_container_address_offsets<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> <span class="Constant">&quot; in '&quot;</span>+inst<span class="Delimiter">.</span>original_string+<span class="Constant">&quot;'&quot;</span><span class="Delimiter">);</span>
 <span id="L321" class="LineNr"> 321 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
@@ -424,18 +424,18 @@ if ('onhashchange' in window) {
 <span id="L359" class="LineNr"> 359 </span>
 <span id="L360" class="LineNr"> 360 </span><span class="Normal">void</span> compute_container_address_offsets<span class="Delimiter">(</span><span class="Normal">const</span> type_info&amp; container_info<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* full_type<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L361" class="LineNr"> 361 </span>  container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> full_type<span class="Delimiter">);</span>
-<span id="L362" class="LineNr"> 362 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L363" class="LineNr"> 363 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9994</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compute <a href='043space.cc.html#L76'>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="L364" class="LineNr"> 364 </span>  <a href='036refcount.cc.html#L377'>append_addresses</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> full_type<span class="Delimiter">,</span> metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>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="Normal">if</span> <span class="Delimiter">(</span>!metadata<span class="Delimiter">.</span>address<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L363" class="LineNr"> 363 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9994</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compute address offsets for container &quot;</span> &lt;&lt; container_info<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L364" class="LineNr"> 364 </span>  <a href='036refcount.cc.html#L377'>append_addresses</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> full_type<span class="Delimiter">,</span> metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">(),</span> location_for_error_messages<span class="Delimiter">);</span>
 <span id="L365" class="LineNr"> 365 </span><span class="Delimiter">}</span>
 <span id="L366" class="LineNr"> 366 </span>
 <span id="L367" class="LineNr"> 367 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L367'>compute_exclusive_container_address_offsets</a><span class="Delimiter">(</span><span class="Normal">const</span> type_info&amp; exclusive_container_info<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* full_type<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L368" class="LineNr"> 368 </span>  container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> full_type<span class="Delimiter">);</span>
-<span id="L369" class="LineNr"> 369 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9994</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compute <a href='043space.cc.html#L76'>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="L369" class="LineNr"> 369 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9994</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compute address offsets for exclusive container &quot;</span> &lt;&lt; exclusive_container_info<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L370" class="LineNr"> 370 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> tag = <span class="Constant">0</span><span class="Delimiter">;</span>  tag &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>exclusive_container_info<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++tag<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L371" class="LineNr"> 371 </span>  <span class="Conceal">¦</span> set&lt;tag_condition_info&gt; key<span class="Delimiter">;</span>
 <span id="L372" class="LineNr"> 372 </span>  <span class="Conceal">¦</span> key<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>tag_condition_info<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">tag is at offset</span><span class="Comment">*/</span><span class="Constant">0</span><span class="Delimiter">,</span> tag<span class="Delimiter">));</span>
-<span id="L373" class="LineNr"> 373 </span>  <span class="Conceal">¦</span> <a href='036refcount.cc.html#L377'>append_addresses</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip tag offset</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> variant_type<span class="Delimiter">(</span>full_type<span class="Delimiter">,</span> tag<span class="Delimiter">).</span>type<span class="Delimiter">,</span> metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L373" class="LineNr"> 373 </span>  <span class="Conceal">¦</span> <a href='036refcount.cc.html#L377'>append_addresses</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip tag offset</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> variant_type<span class="Delimiter">(</span>full_type<span class="Delimiter">,</span> tag<span class="Delimiter">).</span>type<span class="Delimiter">,</span> metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
 <span id="L374" class="LineNr"> 374 </span>  <span class="Delimiter">}</span>
 <span id="L375" class="LineNr"> 375 </span><span class="Delimiter">}</span>
 <span id="L376" class="LineNr"> 376 </span>
@@ -512,10 +512,10 @@ if ('onhashchange' in window) {
 <span id="L447" class="LineNr"> 447 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
 <span id="L448" class="LineNr"> 448 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L449" class="LineNr"> 449 </span>  <span class="Comment">// the reagent we scanned knows it has no addresses</span>
-<span id="L450" class="LineNr"> 450 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>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>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
 <span id="L451" class="LineNr"> 451 </span>  <span class="Comment">// the global table contains an identical entry</span>
 <span id="L452" class="LineNr"> 452 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L453" class="LineNr"> 453 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L453" class="LineNr"> 453 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span>address<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
 <span id="L454" class="LineNr"> 454 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
 <span id="L455" class="LineNr"> 455 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L456" class="LineNr"> 456 </span><span class="Delimiter">}</span>
@@ -524,7 +524,7 @@ if ('onhashchange' in window) {
 <span id="L459" class="LineNr"> 459 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
 <span id="L460" class="LineNr"> 460 </span>  <span class="Comment">// define a container with an address at offset 0 that we have the size for</span>
 <span id="L461" class="LineNr"> 461 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L462" class="LineNr"> 462 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L462" class="LineNr"> 462 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L463" class="LineNr"> 463 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L464" class="LineNr"> 464 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
 <span id="L465" class="LineNr"> 465 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
@@ -534,16 +534,16 @@ if ('onhashchange' in window) {
 <span id="L469" class="LineNr"> 469 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
 <span id="L470" class="LineNr"> 470 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L471" class="LineNr"> 471 </span>  <span class="Comment">// the reagent we scanned knows it has an address at offset 0</span>
-<span id="L472" class="LineNr"> 472 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L473" class="LineNr"> 473 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
-<span id="L474" class="LineNr"> 474 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>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>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L473" class="LineNr"> 473 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
+<span id="L474" class="LineNr"> 474 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>  <span class="Comment">// unconditional for containers</span>
 <span id="L475" class="LineNr"> 475 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L476" class="LineNr"> 476 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L477" class="LineNr"> 477 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
 <span id="L478" class="LineNr"> 478 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
 <span id="L479" class="LineNr"> 479 </span>  <span class="Comment">// the global table contains an identical entry</span>
 <span id="L480" class="LineNr"> 480 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L481" class="LineNr"> 481 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L481" class="LineNr"> 481 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
 <span id="L482" class="LineNr"> 482 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L483" class="LineNr"> 483 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L484" class="LineNr"> 484 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
@@ -557,7 +557,7 @@ if ('onhashchange' in window) {
 <span id="L492" class="LineNr"> 492 </span>  <span class="Comment">// define a container with an address at offset 1 that we have the size for</span>
 <span id="L493" class="LineNr"> 493 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L494" class="LineNr"> 494 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L495" class="LineNr"> 495 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  y:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L495" class="LineNr"> 495 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  y:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L496" class="LineNr"> 496 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L497" class="LineNr"> 497 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
 <span id="L498" class="LineNr"> 498 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
@@ -569,16 +569,16 @@ if ('onhashchange' in window) {
 <span id="L504" class="LineNr"> 504 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
 <span id="L505" class="LineNr"> 505 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L506" class="LineNr"> 506 </span>  <span class="Comment">// the reagent we scanned knows it has an address at offset 1</span>
-<span id="L507" class="LineNr"> 507 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L508" class="LineNr"> 508 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
-<span id="L509" class="LineNr"> 509 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>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>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L508" class="LineNr"> 508 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
+<span id="L509" class="LineNr"> 509 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
 <span id="L510" class="LineNr"> 510 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L511" class="LineNr"> 511 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
 <span id="L512" class="LineNr"> 512 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
 <span id="L513" class="LineNr"> 513 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
 <span id="L514" class="LineNr"> 514 </span>  <span class="Comment">// the global table contains an identical entry</span>
 <span id="L515" class="LineNr"> 515 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L516" class="LineNr"> 516 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L516" class="LineNr"> 516 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
 <span id="L517" class="LineNr"> 517 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L518" class="LineNr"> 518 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
 <span id="L519" class="LineNr"> 519 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
@@ -589,7 +589,7 @@ if ('onhashchange' in window) {
 <span id="L524" class="LineNr"> 524 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
 <span id="L525" class="LineNr"> 525 </span>  <span class="Comment">// define a container with a nested container containing an address</span>
 <span id="L526" class="LineNr"> 526 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L527" class="LineNr"> 527 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L527" class="LineNr"> 527 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L528" class="LineNr"> 528 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  y:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L529" class="LineNr"> 529 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L530" class="LineNr"> 530 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;container bar [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
@@ -604,16 +604,16 @@ if ('onhashchange' in window) {
 <span id="L539" class="LineNr"> 539 </span>  <span class="Comment">// scan</span>
 <span id="L540" class="LineNr"> 540 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L541" class="LineNr"> 541 </span>  <span class="Comment">// the reagent we scanned knows it has an address at offset 2</span>
-<span id="L542" class="LineNr"> 542 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L543" class="LineNr"> 543 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
-<span id="L544" class="LineNr"> 544 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>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>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L543" class="LineNr"> 543 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
+<span id="L544" class="LineNr"> 544 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
 <span id="L545" class="LineNr"> 545 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L546" class="LineNr"> 546 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
 <span id="L547" class="LineNr"> 547 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
 <span id="L548" class="LineNr"> 548 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
 <span id="L549" class="LineNr"> 549 </span>  <span class="Comment">// the global table also knows its address offset</span>
 <span id="L550" class="LineNr"> 550 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L551" class="LineNr"> 551 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L551" class="LineNr"> 551 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
 <span id="L552" class="LineNr"> 552 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L553" class="LineNr"> 553 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
 <span id="L554" class="LineNr"> 554 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
@@ -626,9 +626,9 @@ if ('onhashchange' in window) {
 <span id="L561" class="LineNr"> 561 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
 <span id="L562" class="LineNr"> 562 </span>  <span class="Comment">// define a container with an address at offset 0</span>
 <span id="L563" class="LineNr"> 563 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L564" class="LineNr"> 564 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L564" class="LineNr"> 564 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L565" class="LineNr"> 565 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L566" class="LineNr"> 566 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L76'>address</a>:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L566" class="LineNr"> 566 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:address:foo&quot;</span><span class="Delimiter">);</span>
 <span id="L567" class="LineNr"> 567 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
 <span id="L568" class="LineNr"> 568 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
 <span id="L569" class="LineNr"> 569 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
@@ -640,7 +640,7 @@ if ('onhashchange' in window) {
 <span id="L575" class="LineNr"> 575 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
 <span id="L576" class="LineNr"> 576 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
 <span id="L577" class="LineNr"> 577 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L578" class="LineNr"> 578 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L578" class="LineNr"> 578 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
 <span id="L579" class="LineNr"> 579 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L580" class="LineNr"> 580 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L581" class="LineNr"> 581 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
@@ -651,7 +651,7 @@ if ('onhashchange' in window) {
 <span id="L586" class="LineNr"> 586 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
 <span id="L587" class="LineNr"> 587 </span>  <span class="Comment">// define a container with an address at offset 0</span>
 <span id="L588" class="LineNr"> 588 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L589" class="LineNr"> 589 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L589" class="LineNr"> 589 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L590" class="LineNr"> 590 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L591" class="LineNr"> 591 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:array:foo&quot;</span><span class="Delimiter">);</span>
 <span id="L592" class="LineNr"> 592 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
@@ -665,7 +665,7 @@ if ('onhashchange' in window) {
 <span id="L600" class="LineNr"> 600 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
 <span id="L601" class="LineNr"> 601 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
 <span id="L602" class="LineNr"> 602 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L603" class="LineNr"> 603 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L603" class="LineNr"> 603 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
 <span id="L604" class="LineNr"> 604 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L605" class="LineNr"> 605 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L606" class="LineNr"> 606 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
@@ -676,9 +676,9 @@ if ('onhashchange' in window) {
 <span id="L611" class="LineNr"> 611 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
 <span id="L612" class="LineNr"> 612 </span>  <span class="Comment">// define a container with an address at offset 0</span>
 <span id="L613" class="LineNr"> 613 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L614" class="LineNr"> 614 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L614" class="LineNr"> 614 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L615" class="LineNr"> 615 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L616" class="LineNr"> 616 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L76'>address</a>:array:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L616" class="LineNr"> 616 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:address:array:foo&quot;</span><span class="Delimiter">);</span>
 <span id="L617" class="LineNr"> 617 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
 <span id="L618" class="LineNr"> 618 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
 <span id="L619" class="LineNr"> 619 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
@@ -690,7 +690,7 @@ if ('onhashchange' in window) {
 <span id="L625" class="LineNr"> 625 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
 <span id="L626" class="LineNr"> 626 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
 <span id="L627" class="LineNr"> 627 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L628" class="LineNr"> 628 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L628" class="LineNr"> 628 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
 <span id="L629" class="LineNr"> 629 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L630" class="LineNr"> 630 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L631" class="LineNr"> 631 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
@@ -701,7 +701,7 @@ if ('onhashchange' in window) {
 <span id="L636" class="LineNr"> 636 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
 <span id="L637" class="LineNr"> 637 </span>  <span class="Comment">// define a container with an address at offset 0</span>
 <span id="L638" class="LineNr"> 638 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L639" class="LineNr"> 639 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L639" class="LineNr"> 639 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L640" class="LineNr"> 640 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L641" class="LineNr"> 641 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:array:foo:10&quot;</span><span class="Delimiter">);</span>
 <span id="L642" class="LineNr"> 642 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
@@ -715,7 +715,7 @@ if ('onhashchange' in window) {
 <span id="L650" class="LineNr"> 650 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
 <span id="L651" class="LineNr"> 651 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
 <span id="L652" class="LineNr"> 652 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L653" class="LineNr"> 653 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L653" class="LineNr"> 653 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
 <span id="L654" class="LineNr"> 654 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L655" class="LineNr"> 655 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L656" class="LineNr"> 656 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
@@ -726,9 +726,9 @@ if ('onhashchange' in window) {
 <span id="L661" class="LineNr"> 661 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
 <span id="L662" class="LineNr"> 662 </span>  <span class="Comment">// define a container with an address at offset 0</span>
 <span id="L663" class="LineNr"> 663 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L664" class="LineNr"> 664 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L664" class="LineNr"> 664 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L665" class="LineNr"> 665 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L666" class="LineNr"> 666 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L76'>address</a>:array:foo:10&quot;</span><span class="Delimiter">);</span>
+<span id="L666" class="LineNr"> 666 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:address:array:foo:10&quot;</span><span class="Delimiter">);</span>
 <span id="L667" class="LineNr"> 667 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
 <span id="L668" class="LineNr"> 668 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
 <span id="L669" class="LineNr"> 669 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
@@ -740,7 +740,7 @@ if ('onhashchange' in window) {
 <span id="L675" class="LineNr"> 675 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
 <span id="L676" class="LineNr"> 676 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
 <span id="L677" class="LineNr"> 677 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L678" class="LineNr"> 678 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L678" class="LineNr"> 678 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
 <span id="L679" class="LineNr"> 679 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L680" class="LineNr"> 680 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L681" class="LineNr"> 681 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
@@ -751,10 +751,10 @@ if ('onhashchange' in window) {
 <span id="L686" class="LineNr"> 686 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
 <span id="L687" class="LineNr"> 687 </span>  <span class="Comment">// define a container with an address at offset 0</span>
 <span id="L688" class="LineNr"> 688 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L689" class="LineNr"> 689 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L689" class="LineNr"> 689 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L690" class="LineNr"> 690 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L691" class="LineNr"> 691 </span>  <span class="Comment">// scan a deep nest of 'address' and 'array' types modifying a container</span>
-<span id="L692" class="LineNr"> 692 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L76'>address</a>:array:<a href='043space.cc.html#L76'>address</a>:<a href='043space.cc.html#L76'>address</a>:array:foo:10&quot;</span><span class="Delimiter">);</span>
+<span id="L692" class="LineNr"> 692 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:address:array:address:address:array:foo:10&quot;</span><span class="Delimiter">);</span>
 <span id="L693" class="LineNr"> 693 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
 <span id="L694" class="LineNr"> 694 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
 <span id="L695" class="LineNr"> 695 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
@@ -765,7 +765,7 @@ if ('onhashchange' in window) {
 <span id="L700" class="LineNr"> 700 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
 <span id="L701" class="LineNr"> 701 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
 <span id="L702" class="LineNr"> 702 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L703" class="LineNr"> 703 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L703" class="LineNr"> 703 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
 <span id="L704" class="LineNr"> 704 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L705" class="LineNr"> 705 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L706" class="LineNr"> 706 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
@@ -778,7 +778,7 @@ if ('onhashchange' in window) {
 <span id="L713" class="LineNr"> 713 </span><span class="Delimiter">:(before &quot;End Increment Refcounts(canonized_x)&quot;)</span>
 <span id="L714" class="LineNr"> 714 </span><span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_container<span class="Delimiter">(</span>canonized_x<span class="Delimiter">)</span> || is_mu_exclusive_container<span class="Delimiter">(</span>canonized_x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L715" class="LineNr"> 715 </span>  <span class="Normal">const</span> container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> canonized_x<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L716" class="LineNr"> 716 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt;::const_iterator p = metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>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="L716" class="LineNr"> 716 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt;::const_iterator p = metadata<span class="Delimiter">.</span>address<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != metadata<span class="Delimiter">.</span>address<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L717" class="LineNr"> 717 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!all_match<span class="Delimiter">(</span>data<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L718" class="LineNr"> 718 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;address_element_info&gt;::const_iterator info = p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  info != p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++info<span class="Delimiter">)</span>
 <span id="L719" class="LineNr"> 719 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='036refcount.cc.html#L53'>increment_refcount</a><span class="Delimiter">(</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>info<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">));</span>
@@ -794,7 +794,7 @@ if ('onhashchange' in window) {
 <span id="L729" class="LineNr"> 729 </span>  vector&lt;<span class="Normal">double</span>&gt; data = read_memory<span class="Delimiter">(</span>tmp<span class="Delimiter">);</span>
 <span id="L730" class="LineNr"> 730 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done reading old value of '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>canonized_x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L731" class="LineNr"> 731 </span>  <span class="Normal">const</span> container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> canonized_x<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L732" class="LineNr"> 732 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt;::const_iterator p = metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>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="L732" class="LineNr"> 732 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt;::const_iterator p = metadata<span class="Delimiter">.</span>address<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != metadata<span class="Delimiter">.</span>address<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L733" class="LineNr"> 733 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!all_match<span class="Delimiter">(</span>data<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L734" class="LineNr"> 734 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;address_element_info&gt;::const_iterator info = p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  info != p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++info<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L735" class="LineNr"> 735 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">int</span> element_address = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> canonized_x<span class="Delimiter">.</span>value + info<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">);</span>
@@ -820,13 +820,13 @@ if ('onhashchange' in window) {
 <span id="L755" class="LineNr"> 755 </span>  <span class="Normal">a</span>:bar  <span class="Comment"># contains an address</span>
 <span id="L756" class="LineNr"> 756 </span>]
 <span id="L757" class="LineNr"> 757 </span><span class="muData">container</span> bar [
-<span id="L758" class="LineNr"> 758 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L758" class="LineNr"> 758 </span>  <span class="Normal">x</span>:address:num
 <span id="L759" class="LineNr"> 759 </span>]
 <span id="L760" class="LineNr"> 760 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L761" class="LineNr"> 761 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L762" class="LineNr"> 762 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L763" class="LineNr"> 763 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
-<span id="L764" class="LineNr"> 764 </span>  *<span class="Constant">3</span>:<a href='043space.cc.html#L76'>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#L76'>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="L761" class="LineNr"> 761 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L762" class="LineNr"> 762 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:address:num
+<span id="L763" class="LineNr"> 763 </span>  <span class="Constant">3</span>:address:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
+<span id="L764" class="LineNr"> 764 </span>  *<span class="Constant">3</span>:address:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">3</span>:address:foo<span class="Delimiter">,</span> <span class="Constant">a:offset</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
 <span id="L765" class="LineNr"> 765 </span>]
 <span id="L766" class="LineNr"> 766 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L767" class="LineNr"> 767 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -838,13 +838,13 @@ if ('onhashchange' in window) {
 <span id="L773" class="LineNr"> 773 </span>
 <span id="L774" class="LineNr"> 774 </span><span class="Delimiter">:(scenario refcounts_put_index_array)</span>
 <span id="L775" class="LineNr"> 775 </span><span class="muData">container</span> bar [
-<span id="L776" class="LineNr"> 776 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L776" class="LineNr"> 776 </span>  <span class="Normal">x</span>:address:num
 <span id="L777" class="LineNr"> 777 </span>]
 <span id="L778" class="LineNr"> 778 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L779" class="LineNr"> 779 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L780" class="LineNr"> 780 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L781" class="LineNr"> 781 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L76'>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="L782" class="LineNr"> 782 </span>  *<span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:array:bar<span class="Special"> &lt;- </span>put-index *<span class="Constant">3</span>:<a href='043space.cc.html#L76'>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="L779" class="LineNr"> 779 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L780" class="LineNr"> 780 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:address:num
+<span id="L781" class="LineNr"> 781 </span>  <span class="Constant">3</span>:address:array:bar<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">bar:type</span><span class="Delimiter">,</span> <span class="Constant">3</span>
+<span id="L782" class="LineNr"> 782 </span>  *<span class="Constant">3</span>:address:array:bar<span class="Special"> &lt;- </span>put-index *<span class="Constant">3</span>:address:array:bar<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
 <span id="L783" class="LineNr"> 783 </span>]
 <span id="L784" class="LineNr"> 784 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L785" class="LineNr"> 785 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -860,11 +860,11 @@ if ('onhashchange' in window) {
 <span id="L795" class="LineNr"> 795 </span>  <span class="Normal">b</span>:bar  <span class="Comment"># contains an address</span>
 <span id="L796" class="LineNr"> 796 </span>]
 <span id="L797" class="LineNr"> 797 </span><span class="muData">container</span> bar [
-<span id="L798" class="LineNr"> 798 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L798" class="LineNr"> 798 </span>  <span class="Normal">x</span>:address:num
 <span id="L799" class="LineNr"> 799 </span>]
 <span id="L800" class="LineNr"> 800 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L801" class="LineNr"> 801 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L802" class="LineNr"> 802 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L801" class="LineNr"> 801 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L802" class="LineNr"> 802 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:address:num
 <span id="L803" class="LineNr"> 803 </span>  <span class="Constant">3</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/b<span class="Delimiter">,</span> <span class="Constant">2</span>:bar
 <span id="L804" class="LineNr"> 804 </span>  <span class="Constant">5</span>:bar<span class="Delimiter">,</span> <span class="Constant">6</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert <span class="Constant">3</span>:foo<span class="Delimiter">,</span> <span class="Constant">1:variant/b</span>
 <span id="L805" class="LineNr"> 805 </span>]
@@ -888,19 +888,19 @@ if ('onhashchange' in window) {
 <span id="L823" class="LineNr"> 823 </span>]
 <span id="L824" class="LineNr"> 824 </span><span class="muData">container</span> curr [
 <span id="L825" class="LineNr"> 825 </span>  <span class="Normal">x</span>:num
-<span id="L826" class="LineNr"> 826 </span>  <span class="Normal">y</span>:<a href='043space.cc.html#L76'>address</a>:num  <span class="Comment"># address inside container inside container</span>
+<span id="L826" class="LineNr"> 826 </span>  <span class="Normal">y</span>:address:num  <span class="Comment"># address inside container inside container</span>
 <span id="L827" class="LineNr"> 827 </span>]
 <span id="L828" class="LineNr"> 828 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L829" class="LineNr"> 829 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L830" class="LineNr"> 830 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:curr<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">curr:type</span>
-<span id="L831" class="LineNr"> 831 </span>  *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>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#L76'>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#L76'>address</a>:num
-<span id="L832" class="LineNr"> 832 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
-<span id="L833" class="LineNr"> 833 </span>  *<span class="Constant">3</span>:<a href='043space.cc.html#L76'>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#L76'>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#L76'>address</a>:curr
-<span id="L834" class="LineNr"> 834 </span>  <span class="Constant">4</span>:foo<span class="Special"> &lt;- </span>copy *<span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:foo
+<span id="L829" class="LineNr"> 829 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L830" class="LineNr"> 830 </span>  <span class="Constant">2</span>:address:curr<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">curr:type</span>
+<span id="L831" class="LineNr"> 831 </span>  *<span class="Constant">2</span>:address:curr<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">2</span>:address:curr<span class="Delimiter">,</span> <span class="Constant">1:offset/y</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
+<span id="L832" class="LineNr"> 832 </span>  <span class="Constant">3</span>:address:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
+<span id="L833" class="LineNr"> 833 </span>  *<span class="Constant">3</span>:address:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">3</span>:address:foo<span class="Delimiter">,</span> <span class="Constant">1:offset/b</span><span class="Delimiter">,</span> *<span class="Constant">2</span>:address:curr
+<span id="L834" class="LineNr"> 834 </span>  <span class="Constant">4</span>:foo<span class="Special"> &lt;- </span>copy *<span class="Constant">3</span>:address:foo
 <span id="L835" class="LineNr"> 835 </span>]
-<span id="L836" class="LineNr"> 836 </span><span class="traceContains">+transform: compute <a href='043space.cc.html#L76'>address</a> offsets for container foo</span>
+<span id="L836" class="LineNr"> 836 </span><span class="traceContains">+transform: compute address offsets for container foo</span>
 <span id="L837" class="LineNr"> 837 </span><span class="traceContains">+transform: checking container foo, element 1</span>
-<span id="L838" class="LineNr"> 838 </span><span class="traceContains">+transform: <a href='043space.cc.html#L76'>address</a> at offset 3</span>
+<span id="L838" class="LineNr"> 838 </span><span class="traceContains">+transform: address at offset 3</span>
 <span id="L839" class="LineNr"> 839 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L840" class="LineNr"> 840 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
 <span id="L841" class="LineNr"> 841 </span><span class="Comment"># storing an address in a container updates its refcount</span>
@@ -921,15 +921,15 @@ if ('onhashchange' in window) {
 <span id="L856" class="LineNr"> 856 </span><span class="muData">exclusive-container</span> bar [
 <span id="L857" class="LineNr"> 857 </span>  <span class="Normal">x</span>:num
 <span id="L858" class="LineNr"> 858 </span>  <span class="Normal">y</span>:num
-<span id="L859" class="LineNr"> 859 </span>  <span class="Normal">z</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L859" class="LineNr"> 859 </span>  <span class="Normal">z</span>:address:num
 <span id="L860" class="LineNr"> 860 </span>]
 <span id="L861" class="LineNr"> 861 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L862" class="LineNr"> 862 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L862" class="LineNr"> 862 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
 <span id="L863" class="LineNr"> 863 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/x<span class="Delimiter">,</span> <span class="Constant">34</span>
 <span id="L864" class="LineNr"> 864 </span>  <span class="Constant">3</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">12</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
 <span id="L865" class="LineNr"> 865 </span>  <span class="Constant">5</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">35</span>
 <span id="L866" class="LineNr"> 866 </span>  <span class="Constant">6</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">13</span><span class="Delimiter">,</span> <span class="Constant">5</span>:bar
-<span id="L867" class="LineNr"> 867 </span>  <span class="Constant">8</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">2</span>/z<span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L867" class="LineNr"> 867 </span>  <span class="Constant">8</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">2</span>/z<span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
 <span id="L868" class="LineNr"> 868 </span>  <span class="Constant">9</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">14</span><span class="Delimiter">,</span> <span class="Constant">8</span>:bar
 <span id="L869" class="LineNr"> 869 </span>  <span class="Constant">11</span>:foo<span class="Special"> &lt;- </span>copy <span class="Constant">9</span>:foo
 <span id="L870" class="LineNr"> 870 </span>]
@@ -951,13 +951,13 @@ if ('onhashchange' in window) {
 <span id="L886" class="LineNr"> 886 </span><span class="muData">container</span> bar [
 <span id="L887" class="LineNr"> 887 </span>  <span class="Normal">x</span>:num
 <span id="L888" class="LineNr"> 888 </span>  <span class="Normal">y</span>:num
-<span id="L889" class="LineNr"> 889 </span>  <span class="Normal">z</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L889" class="LineNr"> 889 </span>  <span class="Normal">z</span>:address:num
 <span id="L890" class="LineNr"> 890 </span>]
 <span id="L891" class="LineNr"> 891 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L892" class="LineNr"> 892 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L892" class="LineNr"> 892 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
 <span id="L893" class="LineNr"> 893 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/a<span class="Delimiter">,</span> <span class="Constant">34</span>
 <span id="L894" class="LineNr"> 894 </span>  <span class="Constant">6</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/a<span class="Delimiter">,</span> <span class="Constant">35</span>
-<span id="L895" class="LineNr"> 895 </span>  <span class="Constant">10</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">2</span>/x<span class="Delimiter">,</span> <span class="Constant">15</span>/y<span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L895" class="LineNr"> 895 </span>  <span class="Constant">10</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">2</span>/x<span class="Delimiter">,</span> <span class="Constant">15</span>/y<span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
 <span id="L896" class="LineNr"> 896 </span>  <span class="Constant">13</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/b<span class="Delimiter">,</span> <span class="Constant">10</span>:bar
 <span id="L897" class="LineNr"> 897 </span>  <span class="Constant">17</span>:foo<span class="Special"> &lt;- </span>copy <span class="Constant">13</span>:foo
 <span id="L898" class="LineNr"> 898 </span>]
@@ -978,11 +978,11 @@ if ('onhashchange' in window) {
 <span id="L913" class="LineNr"> 913 </span>]
 <span id="L914" class="LineNr"> 914 </span><span class="muData">exclusive-container</span> bar [
 <span id="L915" class="LineNr"> 915 </span>  <span class="Normal">x</span>:num
-<span id="L916" class="LineNr"> 916 </span>  <span class="Normal">y</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L916" class="LineNr"> 916 </span>  <span class="Normal">y</span>:address:num
 <span id="L917" class="LineNr"> 917 </span>]
 <span id="L918" class="LineNr"> 918 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L919" class="LineNr"> 919 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L920" class="LineNr"> 920 </span>  <span class="Constant">10</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/b<span class="Delimiter">,</span> <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L919" class="LineNr"> 919 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L920" class="LineNr"> 920 </span>  <span class="Constant">10</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/b<span class="Delimiter">,</span> <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
 <span id="L921" class="LineNr"> 921 </span>  <span class="Constant">20</span>:foo<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>:foo
 <span id="L922" class="LineNr"> 922 </span>]
 <span id="L923" class="LineNr"> 923 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
@@ -995,13 +995,13 @@ if ('onhashchange' in window) {
 <span id="L930" class="LineNr"> 930 </span>
 <span id="L931" class="LineNr"> 931 </span><span class="Delimiter">:(scenario refcounts_copy_array_within_container)</span>
 <span id="L932" class="LineNr"> 932 </span><span class="muData">container</span> foo [
-<span id="L933" class="LineNr"> 933 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:array:num
+<span id="L933" class="LineNr"> 933 </span>  <span class="Normal">x</span>:address:array:num
 <span id="L934" class="LineNr"> 934 </span>]
 <span id="L935" class="LineNr"> 935 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L936" class="LineNr"> 936 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>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="L937" class="LineNr"> 937 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:array:num
-<span id="L938" class="LineNr"> 938 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L76'>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="L939" class="LineNr"> 939 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:array:num
+<span id="L936" class="LineNr"> 936 </span>  <span class="Constant">1</span>:address:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">3</span>
+<span id="L937" class="LineNr"> 937 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:address:array:num
+<span id="L938" class="LineNr"> 938 </span>  <span class="Constant">3</span>:address:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">5</span>
+<span id="L939" class="LineNr"> 939 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">3</span>:address:array:num
 <span id="L940" class="LineNr"> 940 </span>]
 <span id="L941" class="LineNr"> 941 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;array&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}, {3: &quot;literal&quot;}</span>
 <span id="L942" class="LineNr"> 942 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -1013,22 +1013,22 @@ if ('onhashchange' in window) {
 <span id="L948" class="LineNr"> 948 </span><span class="Delimiter">:(scenario refcounts_copy_address_within_static_array_within_container)</span>
 <span id="L949" class="LineNr"> 949 </span><span class="muData">container</span> foo [
 <span id="L950" class="LineNr"> 950 </span>  <span class="Normal">a</span>:array:bar:<span class="Constant">3</span>
-<span id="L951" class="LineNr"> 951 </span>  <span class="Normal">b</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L951" class="LineNr"> 951 </span>  <span class="Normal">b</span>:address:num
 <span id="L952" class="LineNr"> 952 </span>]
 <span id="L953" class="LineNr"> 953 </span><span class="muData">container</span> bar [
 <span id="L954" class="LineNr"> 954 </span>  <span class="Normal">y</span>:num
-<span id="L955" class="LineNr"> 955 </span>  <span class="Normal">z</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L955" class="LineNr"> 955 </span>  <span class="Normal">z</span>:address:num
 <span id="L956" class="LineNr"> 956 </span>]
 <span id="L957" class="LineNr"> 957 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L958" class="LineNr"> 958 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L959" class="LineNr"> 959 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L958" class="LineNr"> 958 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L959" class="LineNr"> 959 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
 <span id="L960" class="LineNr"> 960 </span>  <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Special"> &lt;- </span>create-array
 <span id="L961" class="LineNr"> 961 </span>  put-index <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
-<span id="L962" class="LineNr"> 962 </span>  <span class="Constant">20</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L963" class="LineNr"> 963 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L964" class="LineNr"> 964 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L962" class="LineNr"> 962 </span>  <span class="Constant">20</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
+<span id="L963" class="LineNr"> 963 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L964" class="LineNr"> 964 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
 <span id="L965" class="LineNr"> 965 </span>  put-index <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
-<span id="L966" class="LineNr"> 966 </span>  <span class="Constant">20</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L966" class="LineNr"> 966 </span>  <span class="Constant">20</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
 <span id="L967" class="LineNr"> 967 </span>]
 <span id="L968" class="LineNr"> 968 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L969" class="LineNr"> 969 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -1051,24 +1051,24 @@ if ('onhashchange' in window) {
 <span id="L986" class="LineNr"> 986 </span>
 <span id="L987" class="LineNr"> 987 </span><span class="Delimiter">:(scenario refcounts_handle_exclusive_containers_with_different_tags)</span>
 <span id="L988" class="LineNr"> 988 </span><span class="muData">container</span> foo1 [
-<span id="L989" class="LineNr"> 989 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L989" class="LineNr"> 989 </span>  <span class="Normal">x</span>:address:num
 <span id="L990" class="LineNr"> 990 </span>  <span class="Normal">y</span>:num
 <span id="L991" class="LineNr"> 991 </span>]
 <span id="L992" class="LineNr"> 992 </span><span class="muData">container</span> foo2 [
 <span id="L993" class="LineNr"> 993 </span>  <span class="Normal">x</span>:num
-<span id="L994" class="LineNr"> 994 </span>  <span class="Normal">y</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L994" class="LineNr"> 994 </span>  <span class="Normal">y</span>:address:num
 <span id="L995" class="LineNr"> 995 </span>]
 <span id="L996" class="LineNr"> 996 </span><span class="muData">exclusive-container</span> bar [
 <span id="L997" class="LineNr"> 997 </span>  <span class="Normal">a</span>:foo1
 <span id="L998" class="LineNr"> 998 </span>  <span class="Normal">b</span>:foo2
 <span id="L999" class="LineNr"> 999 </span>]
 <span id="L1000" class="LineNr">1000 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L1001" class="LineNr">1001 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">12000</span>/unsafe  <span class="Comment"># pretend allocation</span>
-<span id="L1002" class="LineNr">1002 </span>  *<span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L1003" class="LineNr">1003 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/foo1<span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Delimiter">,</span> <span class="Constant">97</span>
-<span id="L1004" class="LineNr">1004 </span>  <span class="Constant">5</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">13000</span>/unsafe  <span class="Comment"># pretend allocation</span>
-<span id="L1005" class="LineNr">1005 </span>  *<span class="Constant">5</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
-<span id="L1006" class="LineNr">1006 </span>  <span class="Constant">6</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/foo2<span class="Delimiter">,</span> <span class="Constant">98</span><span class="Delimiter">,</span> <span class="Constant">5</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L1001" class="LineNr">1001 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">12000</span>/unsafe  <span class="Comment"># pretend allocation</span>
+<span id="L1002" class="LineNr">1002 </span>  *<span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L1003" class="LineNr">1003 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/foo1<span class="Delimiter">,</span> <span class="Constant">1</span>:address:num<span class="Delimiter">,</span> <span class="Constant">97</span>
+<span id="L1004" class="LineNr">1004 </span>  <span class="Constant">5</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">13000</span>/unsafe  <span class="Comment"># pretend allocation</span>
+<span id="L1005" class="LineNr">1005 </span>  *<span class="Constant">5</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
+<span id="L1006" class="LineNr">1006 </span>  <span class="Constant">6</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/foo2<span class="Delimiter">,</span> <span class="Constant">98</span><span class="Delimiter">,</span> <span class="Constant">5</span>:address:num
 <span id="L1007" class="LineNr">1007 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>copy <span class="Constant">6</span>:bar
 <span id="L1008" class="LineNr">1008 </span>]
 <span id="L1009" class="LineNr">1009 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {0: &quot;literal&quot;, &quot;foo1&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}, {97: &quot;literal&quot;}</span>
diff --git a/html/037abandon.cc.html b/html/037abandon.cc.html
index d239333e..0a5eadc4 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#L76'>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#L76'>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#L76'>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#L76'>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#L76'>address</a>:num
+<span id="L6" class="LineNr">  6 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L7" class="LineNr">  7 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:address:num  <span class="Comment"># because 1 will get reset during abandon below</span>
+<span id="L8" class="LineNr">  8 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># abandon</span>
+<span id="L9" class="LineNr">  9 </span>  <span class="Constant">3</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>  <span class="Comment"># must be same size as abandoned memory to reuse</span>
+<span id="L10" class="LineNr"> 10 </span>  <span class="Constant">4</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3</span>:address:num
 <span id="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>
@@ -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#L76'>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#L92'>payload_size</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L29" class="LineNr"> 29 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;abandon&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;updating refcounts inside &quot;</span> &lt;&lt; <a href='043space.cc.html#L76'>address</a> &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L28" class="LineNr"> 28 </span><span class="Normal">void</span> <a href='037abandon.cc.html#L28'>abandon</a><span class="Delimiter">(</span><span class="Normal">int</span> address<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">,</span> <span class="Normal">int</span> <a href='036refcount.cc.html#L92'>payload_size</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L29" class="LineNr"> 29 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;abandon&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;updating refcounts inside &quot;</span> &lt;&lt; address &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L30" class="LineNr"> 30 </span><span class="CommentedCode">//?   Total_free += size;</span>
 <span id="L31" class="LineNr"> 31 </span><span class="CommentedCode">//?   ++Num_free;</span>
 <span id="L32" class="LineNr"> 32 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;abandon: &quot; &lt;&lt; size &lt;&lt; '\n';</span>
@@ -103,23 +103,23 @@ if ('onhashchange' in window) {
 <span id="L38" class="LineNr"> 38 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name != <span class="Constant">&quot;array&quot;</span><span class="Delimiter">);</span>
 <span id="L39" class="LineNr"> 39 </span>  <span class="Conceal">¦</span> <span class="Normal">int</span> element_size = size_of<span class="Delimiter">(</span>element<span class="Delimiter">);</span>
 <span id="L40" class="LineNr"> 40 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='032array.cc.html#L397'>array_length</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L41" class="LineNr"> 41 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L76'>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>address + <span class="Comment">/*</span><span class="Comment">skip refcount and length</span><span class="Comment">*/</span><span class="Constant">2</span> + i*element_size<span class="Delimiter">);</span>
 <span id="L42" class="LineNr"> 42 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='036refcount.cc.html#L62'>decrement_any_refcounts</a><span class="Delimiter">(</span>element<span class="Delimiter">);</span>
 <span id="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#L76'>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>address + <span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L49" class="LineNr"> 49 </span>  <span class="Conceal">¦</span> <a href='036refcount.cc.html#L62'>decrement_any_refcounts</a><span class="Delimiter">(</span>tmp<span class="Delimiter">);</span>
 <span id="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#L76'>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 = address<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#L76'>address</a> &lt;&lt; <span class="Constant">&quot; in free-list of size &quot;</span> &lt;&lt; <a href='036refcount.cc.html#L92'>payload_size</a> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L56" class="LineNr"> 56 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <a href='043space.cc.html#L76'>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#L92'>payload_size</a><span class="Delimiter">));</span>
-<span id="L57" class="LineNr"> 57 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>free_list<span class="Delimiter">,</span> <a href='036refcount.cc.html#L92'>payload_size</a><span class="Delimiter">,</span> <a href='043space.cc.html#L76'>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">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;abandon&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;saving &quot;</span> &lt;&lt; address &lt;&lt; <span class="Constant">&quot; in free-list of size &quot;</span> &lt;&lt; <a href='036refcount.cc.html#L92'>payload_size</a> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L56" class="LineNr"> 56 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address<span class="Delimiter">,</span> <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>free_list<span class="Delimiter">,</span> <a href='036refcount.cc.html#L92'>payload_size</a><span class="Delimiter">));</span>
+<span id="L57" class="LineNr"> 57 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>free_list<span class="Delimiter">,</span> <a href='036refcount.cc.html#L92'>payload_size</a><span class="Delimiter">,</span> address<span class="Delimiter">);</span>
 <span id="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>
@@ -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#L76'>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#L76'>address</a>:num
-<span id="L80" class="LineNr"> 80 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>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#L76'>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#L76'>address</a>:array:num
+<span id="L78" class="LineNr"> 78 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L79" class="LineNr"> 79 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:address:num
+<span id="L80" class="LineNr"> 80 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># abandon</span>
+<span id="L81" class="LineNr"> 81 </span>  <span class="Constant">3</span>:address:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">2</span>  <span class="Comment"># different size</span>
+<span id="L82" class="LineNr"> 82 </span>  <span class="Constant">4</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3</span>:address:array:num
 <span id="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#L76'>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#L76'>address</a>:array:num
-<span id="L92" class="LineNr"> 92 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>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#L76'>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#L76'>address</a>:array:num
+<span id="L90" class="LineNr"> 90 </span>  <span class="Constant">1</span>:address:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">2</span>
+<span id="L91" class="LineNr"> 91 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:address:array:num
+<span id="L92" class="LineNr"> 92 </span>  <span class="Constant">1</span>:address:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># abandon</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="Constant">3</span>:address:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">2</span>  <span class="Comment"># same size</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="Constant">4</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3</span>:address:array:num
 <span id="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#L76'>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>:address: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#L76'>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#L76'>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>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L105" class="LineNr">105 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="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#L76'>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>:address: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#L76'>address</a>:num
-<span id="L117" class="LineNr">117 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>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>:address:num
+<span id="L117" class="LineNr">117 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="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#L76'>address</a>:num<span class="Special"> &lt;- </span>next-ingredient
+<span id="L120" class="LineNr">120 </span>  <span class="Constant">2</span>:address: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#L76'>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>:address: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#L76'>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#L76'>address</a>:array:num  <span class="Comment"># doesn't increment refcount</span>
+<span id="L139" class="LineNr">139 </span>  <span class="Constant">10</span>:address:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">20</span>
+<span id="L140" class="LineNr">140 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>:address:array:num  <span class="Comment"># doesn't increment refcount</span>
 <span id="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#L76'>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>:address:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">25</span>
 <span id="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#L76'>address</a>:num
+<span id="L151" class="LineNr">151 </span>  <span class="Normal">x</span>:address: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#L76'>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#L76'>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#L76'>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#L76'>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#L76'>address</a>:num
-<span id="L157" class="LineNr">157 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>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#L76'>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>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L155" class="LineNr">155 </span>  <span class="Constant">2</span>:address:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
+<span id="L156" class="LineNr">156 </span>  *<span class="Constant">2</span>:address:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">2</span>:address:foo<span class="Delimiter">,</span> <span class="Constant">x:offset</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
+<span id="L157" class="LineNr">157 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L158" class="LineNr">158 </span>  <span class="Constant">2</span>:address:foo<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="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#L76'>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#L76'>address</a>:array:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span><a href='043space.cc.html#L76'>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#L76'>address</a>:array:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>put-index *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:array:<a href='043space.cc.html#L76'>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#L76'>address</a>:num
-<span id="L183" class="LineNr">183 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>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#L76'>address</a>:array:<a href='043space.cc.html#L76'>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>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L181" class="LineNr">181 </span>  <span class="Constant">2</span>:address:array:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>address number<span class="Delimiter">)</span>: type<span class="Delimiter">},</span> <span class="Constant">3</span>
+<span id="L182" class="LineNr">182 </span>  *<span class="Constant">2</span>:address:array:address:num<span class="Special"> &lt;- </span>put-index *<span class="Constant">2</span>:address:array:address:num<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
+<span id="L183" class="LineNr">183 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L184" class="LineNr">184 </span>  <span class="Constant">2</span>:address:array:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="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#L76'>address</a>:num
+<span id="L200" class="LineNr">200 </span>  <span class="Normal">x</span>:address: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#L76'>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#L76'>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#L76'>address</a>:num
-<span id="L206" class="LineNr">206 </span>  *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:array:foo<span class="Special"> &lt;- </span>put-index *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>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#L76'>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>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L204" class="LineNr">204 </span>  <span class="Constant">2</span>:address:array:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span><span class="Delimiter">,</span> <span class="Constant">3</span>
+<span id="L205" class="LineNr">205 </span>  <span class="Constant">3</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:address:num
+<span id="L206" class="LineNr">206 </span>  *<span class="Constant">2</span>:address:array:foo<span class="Special"> &lt;- </span>put-index *<span class="Constant">2</span>:address:array:foo<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">3</span>:foo
+<span id="L207" class="LineNr">207 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="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#L76'>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>:address: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#L76'>address</a>:array:num
+<span id="L228" class="LineNr">228 </span>  <span class="Normal">x</span>:address: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#L76'>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#L76'>address</a>:array:num
-<span id="L233" class="LineNr">233 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>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>:address:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">3</span>
+<span id="L232" class="LineNr">232 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:address:array:num
+<span id="L233" class="LineNr">233 </span>  <span class="Constant">1</span>:address:array:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="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 ada49ea9..51bdf5e5 100644
--- a/html/038new_text.cc.html
+++ b/html/038new_text.cc.html
@@ -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#L76'>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>:address: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#L76'>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#L76'>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> address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L144" class="LineNr">144 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>address == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
 <span id="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#L76'>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> address<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 a513bd29..589bd60d 100644
--- a/html/043space.cc.html
+++ b/html/043space.cc.html
@@ -78,7 +78,7 @@ if ('onhashchange' in window) {
 <span id="L12" class="LineNr"> 12 </span><span class="Comment"># if default-space is 10, and if an array of 5 locals lies from location 12 to 16 (inclusive),</span>
 <span id="L13" class="LineNr"> 13 </span><span class="Comment"># then local 0 is really location 12, local 1 is really location 13, and so on.</span>
 <span id="L14" class="LineNr"> 14 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L15" class="LineNr"> 15 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use new</span>
+<span id="L15" class="LineNr"> 15 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use 'new'</span>
 <span id="L16" class="LineNr"> 16 </span>  <span class="Constant">10</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># refcount</span>
 <span id="L17" class="LineNr"> 17 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">5</span>  <span class="Comment"># length</span>
 <span id="L18" class="LineNr"> 18 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>/unsafe
@@ -90,7 +90,7 @@ if ('onhashchange' in window) {
 <span id="L24" class="LineNr"> 24 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L25" class="LineNr"> 25 </span>  <span class="Comment"># pretend pointer from outside (2000 reserved for refcount)</span>
 <span id="L26" class="LineNr"> 26 </span>  <span class="Constant">2001</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L27" class="LineNr"> 27 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use new</span>
+<span id="L27" class="LineNr"> 27 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use 'new&quot;</span>
 <span id="L28" class="LineNr"> 28 </span>  <span class="Constant">1000</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># refcount</span>
 <span id="L29" class="LineNr"> 29 </span>  <span class="Constant">1001</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">5</span>  <span class="Comment"># length</span>
 <span id="L30" class="LineNr"> 30 </span>  <span class="Comment"># actual start of this recipe</span>
@@ -122,14 +122,14 @@ if ('onhashchange' in window) {
 <span id="L56" class="LineNr"> 56 </span>default_space = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L57" class="LineNr"> 57 </span>
 <span id="L58" class="LineNr"> 58 </span><span class="Delimiter">:(before &quot;End canonize(x) Special-cases&quot;)</span>
-<span id="L59" class="LineNr"> 59 </span><a href='043space.cc.html#L61'>absolutize</a><span class="Delimiter">(</span>x<span class="Delimiter">);</span>
+<span id="L59" class="LineNr"> 59 </span>absolutize<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
 <span id="L60" class="LineNr"> 60 </span><span class="Delimiter">:(code)</span>
-<span id="L61" class="LineNr"> 61 </span><span class="Normal">void</span> <a href='043space.cc.html#L61'>absolutize</a><span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L61" class="LineNr"> 61 </span><span class="Normal">void</span> absolutize<span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L62" class="LineNr"> 62 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='022arithmetic.cc.html#L108'>is_raw</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> || is_dummy<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L63" class="LineNr"> 63 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L64" class="LineNr"> 64 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>initialized<span class="Delimiter">)</span>
 <span id="L65" class="LineNr"> 65 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;: reagent not initialized: '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L66" class="LineNr"> 66 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>value<span class="Delimiter">,</span> space_base<span class="Delimiter">(</span>x<span class="Delimiter">)));</span>
+<span id="L66" class="LineNr"> 66 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>address<span class="Delimiter">(</span>x<span class="Delimiter">.</span>value<span class="Delimiter">,</span> space_base<span class="Delimiter">(</span>x<span class="Delimiter">)));</span>
 <span id="L67" class="LineNr"> 67 </span>  x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;raw&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
 <span id="L68" class="LineNr"> 68 </span>  assert<span class="Delimiter">(</span><a href='022arithmetic.cc.html#L108'>is_raw</a><span class="Delimiter">(</span>x<span class="Delimiter">));</span>
 <span id="L69" class="LineNr"> 69 </span><span class="Delimiter">}</span>
@@ -139,7 +139,7 @@ if ('onhashchange' in window) {
 <span id="L73" class="LineNr"> 73 </span>  <span class="Identifier">return</span> <a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>default_space ? <span class="Delimiter">(</span><a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>default_space+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">)</span> : <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L74" class="LineNr"> 74 </span><span class="Delimiter">}</span>
 <span id="L75" class="LineNr"> 75 </span>
-<span id="L76" class="LineNr"> 76 </span><span class="Normal">int</span> <a href='043space.cc.html#L76'>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="L76" class="LineNr"> 76 </span><span class="Normal">int</span> address<span class="Delimiter">(</span><span class="Normal">int</span> offset<span class="Delimiter">,</span> <span class="Normal">int</span> base<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L77" class="LineNr"> 77 </span>  assert<span class="Delimiter">(</span>offset &gt;= <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L78" class="LineNr"> 78 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> offset<span class="Delimiter">;</span>  <span class="Comment">// raw</span>
 <span id="L79" class="LineNr"> 79 </span>  <span class="Normal">int</span> size = <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> base<span class="Delimiter">);</span>
@@ -156,12 +156,12 @@ if ('onhashchange' in window) {
 <span id="L90" class="LineNr"> 90 </span><span class="Delimiter">:(after &quot;Begin Preprocess write_memory(x, data)&quot;)</span>
 <span id="L91" class="LineNr"> 91 </span><span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L92" class="LineNr"> 92 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!scalar<span class="Delimiter">(</span>data<span class="Delimiter">)</span> || !is_space<span class="Delimiter">(</span>x<span class="Delimiter">))</span>
-<span id="L93" class="LineNr"> 93 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'default-space' should be of type <a href='043space.cc.html#L76'>address</a>:array:location, but is &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'default-space' should be of type address:array:location, but is &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L94" class="LineNr"> 94 </span>  <a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>default_space = data<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L95" class="LineNr"> 95 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L96" class="LineNr"> 96 </span><span class="Delimiter">}</span>
 <span id="L97" class="LineNr"> 97 </span><span class="Delimiter">:(code)</span>
-<span id="L98" class="LineNr"> 98 </span><span class="Normal">bool</span> <a href='043space.cc.html#L98'>is_space</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L98" class="LineNr"> 98 </span><span class="Normal">bool</span> is_space<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L99" class="LineNr"> 99 </span>  <span class="Identifier">return</span> <a href='039location_array.cc.html#L15'>is_address_of_array_of_numbers</a><span class="Delimiter">(</span>r<span class="Delimiter">);</span>
 <span id="L100" class="LineNr">100 </span><span class="Delimiter">}</span>
 <span id="L101" class="LineNr">101 </span>
@@ -186,7 +186,7 @@ if ('onhashchange' in window) {
 <span id="L120" class="LineNr">120 </span>  <span class="Comment"># pretend pointer to container from outside (2000 reserved for refcount)</span>
 <span id="L121" class="LineNr">121 </span>  <span class="Constant">2001</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
 <span id="L122" class="LineNr">122 </span>  <span class="Constant">2002</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
-<span id="L123" class="LineNr">123 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use new</span>
+<span id="L123" class="LineNr">123 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use 'new'</span>
 <span id="L124" class="LineNr">124 </span>  <span class="Constant">1000</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># refcount</span>
 <span id="L125" class="LineNr">125 </span>  <span class="Constant">1001</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">5</span>  <span class="Comment"># length</span>
 <span id="L126" class="LineNr">126 </span>  <span class="Comment"># actual start of this recipe</span>
@@ -207,7 +207,7 @@ if ('onhashchange' in window) {
 <span id="L141" class="LineNr">141 </span>  <span class="Constant">2001</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">2</span>  <span class="Comment"># length</span>
 <span id="L142" class="LineNr">142 </span>  <span class="Constant">2002</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
 <span id="L143" class="LineNr">143 </span>  <span class="Constant">2003</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
-<span id="L144" class="LineNr">144 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use new</span>
+<span id="L144" class="LineNr">144 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use 'new'</span>
 <span id="L145" class="LineNr">145 </span>  <span class="Constant">1000</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># refcount</span>
 <span id="L146" class="LineNr">146 </span>  <span class="Constant">1001</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">5</span>  <span class="Comment"># length</span>
 <span id="L147" class="LineNr">147 </span>  <span class="Comment"># actual start of this recipe</span>
@@ -245,7 +245,7 @@ if ('onhashchange' in window) {
 <span id="L179" class="LineNr">179 </span><span class="Comment">//   ```</span>
 <span id="L180" class="LineNr">180 </span><span class="Comment">// where number-of-locals is Name[recipe][&quot;&quot;]</span>
 <span id="L181" class="LineNr">181 </span><span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>name == <span class="Constant">&quot;new-default-space&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L182" class="LineNr">182 </span>  <a href='043space.cc.html#L314'>rewrite_default_space_instruction</a><span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L182" class="LineNr">182 </span>  rewrite_default_space_instruction<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
 <span id="L183" class="LineNr">183 </span><span class="Delimiter">}</span>
 <span id="L184" class="LineNr">184 </span><span class="Delimiter">:(after &quot;Begin Preprocess read_memory(x)&quot;)</span>
 <span id="L185" class="LineNr">185 </span><span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;number-of-locals&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -287,17 +287,17 @@ if ('onhashchange' in window) {
 <span id="L221" class="LineNr">221 </span>
 <span id="L222" class="LineNr">222 </span><span class="Delimiter">:(before &quot;End Rewrite Instruction(curr, <a href='010vm.cc.html#L19'>recipe</a> result)&quot;)</span>
 <span id="L223" class="LineNr">223 </span><span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>name == <span class="Constant">&quot;local-scope&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L224" class="LineNr">224 </span>  <a href='043space.cc.html#L314'>rewrite_default_space_instruction</a><span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L224" class="LineNr">224 </span>  rewrite_default_space_instruction<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
 <span id="L225" class="LineNr">225 </span><span class="Delimiter">}</span>
 <span id="L226" class="LineNr">226 </span>
 <span id="L227" class="LineNr">227 </span><span class="Comment">//: todo: do this in a transform, rather than magically in the 'return' instruction</span>
 <span id="L228" class="LineNr">228 </span><span class="Delimiter">:(after &quot;Falling Through End Of Recipe&quot;)</span>
-<span id="L229" class="LineNr">229 </span><a href='043space.cc.html#L234'>try_reclaim_locals</a><span class="Delimiter">();</span>
+<span id="L229" class="LineNr">229 </span>try_reclaim_locals<span class="Delimiter">();</span>
 <span id="L230" class="LineNr">230 </span><span class="Delimiter">:(after &quot;Starting Reply&quot;)</span>
-<span id="L231" class="LineNr">231 </span><a href='043space.cc.html#L234'>try_reclaim_locals</a><span class="Delimiter">();</span>
+<span id="L231" class="LineNr">231 </span>try_reclaim_locals<span class="Delimiter">();</span>
 <span id="L232" class="LineNr">232 </span>
 <span id="L233" class="LineNr">233 </span><span class="Delimiter">:(code)</span>
-<span id="L234" class="LineNr">234 </span><span class="Normal">void</span> <a href='043space.cc.html#L234'>try_reclaim_locals</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L234" class="LineNr">234 </span><span class="Normal">void</span> try_reclaim_locals<span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L235" class="LineNr">235 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Reclaim_memory<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L236" class="LineNr">236 </span>  <span class="Comment">// only reclaim routines starting with 'local-scope'</span>
 <span id="L237" class="LineNr">237 </span>  <span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r = get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">());</span>
@@ -314,7 +314,7 @@ if ('onhashchange' in window) {
 <span id="L248" class="LineNr">248 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// local variables only</span>
 <span id="L249" class="LineNr">249 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>product<span class="Delimiter">,</span> <span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L250" class="LineNr">250 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>product<span class="Delimiter">,</span> <span class="Constant">&quot;raw&quot;</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// tests often want to check such locations after they run</span>
-<span id="L251" class="LineNr">251 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='043space.cc.html#L276'>escaping</a><span class="Delimiter">(</span>product<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L251" class="LineNr">251 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>escaping<span class="Delimiter">(</span>product<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L252" class="LineNr">252 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// End Checks For Reclaiming Locals</span>
 <span id="L253" class="LineNr">253 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;clearing &quot;</span> &lt;&lt; product<span class="Delimiter">.</span>original_string &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L254" class="LineNr">254 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> zeros<span class="Delimiter">.</span>resize<span class="Delimiter">(</span>size_of<span class="Delimiter">(</span>product<span class="Delimiter">));</span>
@@ -339,13 +339,13 @@ if ('onhashchange' in window) {
 <span id="L273" class="LineNr">273 </span><span class="Delimiter">:(code)</span>
 <span id="L274" class="LineNr">274 </span><span class="Comment">// is this reagent one of the values returned by the current (return) instruction?</span>
 <span id="L275" class="LineNr">275 </span><span class="Comment">// is the corresponding ingredient saved in the caller?</span>
-<span id="L276" class="LineNr">276 </span><span class="Normal">bool</span> <a href='043space.cc.html#L276'>escaping</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L276" class="LineNr">276 </span><span class="Normal">bool</span> escaping<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L277" class="LineNr">277 </span>  assert<span class="Delimiter">(</span>Current_routine<span class="Delimiter">);</span>  <span class="Comment">// run-time only</span>
 <span id="L278" class="LineNr">278 </span>  <span class="Comment">// nothing escapes when you fall through past end of recipe</span>
 <span id="L279" class="LineNr">279 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L80'>current_step_index</a><span class="Delimiter">()</span> &gt;= <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>steps<span class="Delimiter">()))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L280" class="LineNr">280 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">long</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L281" class="LineNr">281 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>r == <a href='026call.cc.html#L85'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L282" class="LineNr">282 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='043space.cc.html#L304'>caller_uses_product</a><span class="Delimiter">(</span>i<span class="Delimiter">))</span>
+<span id="L282" class="LineNr">282 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>caller_uses_product<span class="Delimiter">(</span>i<span class="Delimiter">))</span>
 <span id="L283" class="LineNr">283 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L284" class="LineNr">284 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L285" class="LineNr">285 </span>  <span class="Delimiter">}</span>
@@ -367,7 +367,7 @@ if ('onhashchange' in window) {
 <span id="L301" class="LineNr">301 </span><span class="Delimiter">}</span>
 <span id="L302" class="LineNr">302 </span>
 <span id="L303" class="LineNr">303 </span><span class="Delimiter">:(code)</span>
-<span id="L304" class="LineNr">304 </span><span class="Normal">bool</span> <a href='043space.cc.html#L304'>caller_uses_product</a><span class="Delimiter">(</span><span class="Normal">int</span> product_index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L304" class="LineNr">304 </span><span class="Normal">bool</span> caller_uses_product<span class="Delimiter">(</span><span class="Normal">int</span> product_index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L305" class="LineNr">305 </span>  assert<span class="Delimiter">(</span>Current_routine<span class="Delimiter">);</span>  <span class="Comment">// run-time only</span>
 <span id="L306" class="LineNr">306 </span>  assert<span class="Delimiter">(</span>!Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
 <span id="L307" class="LineNr">307 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>size<span class="Delimiter">()</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
@@ -377,7 +377,7 @@ if ('onhashchange' in window) {
 <span id="L311" class="LineNr">311 </span>  <span class="Identifier">return</span> !is_dummy<span class="Delimiter">(</span>caller_inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>product_index<span class="Delimiter">));</span>
 <span id="L312" class="LineNr">312 </span><span class="Delimiter">}</span>
 <span id="L313" class="LineNr">313 </span>
-<span id="L314" class="LineNr">314 </span><span class="Normal">void</span> <a href='043space.cc.html#L314'>rewrite_default_space_instruction</a><span class="Delimiter">(</span>instruction&amp; curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L314" class="LineNr">314 </span><span class="Normal">void</span> rewrite_default_space_instruction<span class="Delimiter">(</span>instruction&amp; curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L315" class="LineNr">315 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
 <span id="L316" class="LineNr">316 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>curr<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' can't take any ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L317" class="LineNr">317 </span>  curr<span class="Delimiter">.</span>name = <span class="Constant">&quot;new&quot;</span><span class="Delimiter">;</span>
diff --git a/html/044space_surround.cc.html b/html/044space_surround.cc.html
index ad5f42d4..524db0d9 100644
--- a/html/044space_surround.cc.html
+++ b/html/044space_surround.cc.html
@@ -70,10 +70,10 @@ if ('onhashchange' in window) {
 <span id="L7" class="LineNr"> 7 </span><span class="Delimiter">:(scenario surrounding_space)</span>
 <span id="L8" class="LineNr"> 8 </span><span class="Comment"># location 1 in space 1 refers to the space surrounding the default space, here 20.</span>
 <span id="L9" class="LineNr"> 9 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L10" class="LineNr">10 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use new</span>
+<span id="L10" class="LineNr">10 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use 'new'</span>
 <span id="L11" class="LineNr">11 </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="L12" class="LineNr">12 </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="L13" class="LineNr">13 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use new</span>
+<span id="L13" class="LineNr">13 </span>  <span class="Comment"># pretend address:array:location; in practice we'll use 'new&quot;</span>
 <span id="L14" class="LineNr">14 </span>  <span class="Constant">20</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>  <span class="Comment"># refcount</span>
 <span id="L15" class="LineNr">15 </span>  <span class="Constant">21</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">5</span>  <span class="Comment"># length</span>
 <span id="L16" class="LineNr">16 </span>  <span class="Comment"># actual start of this recipe</span>
@@ -93,7 +93,7 @@ if ('onhashchange' in window) {
 <span id="L30" class="LineNr">30 </span><span class="traceContains">+mem: storing 33 in location 23</span>
 <span id="L31" class="LineNr">31 </span>
 <span id="L32" class="LineNr">32 </span><span class="Delimiter">:(before &quot;End Checks For Reclaiming Locals&quot;)</span>
-<span id="L33" class="LineNr">33 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='044space_surround.cc.html#L52'>space_index</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &gt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L33" class="LineNr">33 </span><span class="Normal">if</span> <span class="Delimiter">(</span>space_index<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &gt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L34" class="LineNr">34 </span>
 <span id="L35" class="LineNr">35 </span><span class="Comment">//: If you think of a space as a collection of variables with a common</span>
 <span id="L36" class="LineNr">36 </span><span class="Comment">//: lifetime, surrounding allows managing shorter lifetimes inside a longer</span>
@@ -102,17 +102,17 @@ if ('onhashchange' in window) {
 <span id="L39" class="LineNr">39 </span><span class="Delimiter">:(replace{} &quot;int space_base(const reagent&amp; x)&quot;)</span>
 <span id="L40" class="LineNr">40 </span><span class="Normal">int</span> space_base<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L41" class="LineNr">41 </span>  <span class="Normal">int</span> base = <a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>default_space ? <span class="Delimiter">(</span><a href='026call.cc.html#L79'>current_call</a><span class="Delimiter">().</span>default_space+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">)</span> : <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L42" class="LineNr">42 </span>  <span class="Identifier">return</span> space_base<span class="Delimiter">(</span>x<span class="Delimiter">,</span> <a href='044space_surround.cc.html#L52'>space_index</a><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> space_base<span class="Delimiter">(</span>x<span class="Delimiter">,</span> space_index<span class="Delimiter">(</span>x<span class="Delimiter">),</span> base<span class="Delimiter">);</span>
 <span id="L43" class="LineNr">43 </span><span class="Delimiter">}</span>
 <span id="L44" class="LineNr">44 </span>
-<span id="L45" class="LineNr">45 </span><span class="Normal">int</span> space_base<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">int</span> <a href='044space_surround.cc.html#L52'>space_index</a><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><a href='044space_surround.cc.html#L52'>space_index</a> == <span class="Constant">0</span><span class="Delimiter">)</span>
+<span id="L45" class="LineNr">45 </span><span class="Normal">int</span> space_base<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">int</span> space_index<span class="Delimiter">,</span> <span class="Normal">int</span> base<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L46" class="LineNr">46 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>space_index == <span class="Constant">0</span><span class="Delimiter">)</span>
 <span id="L47" class="LineNr">47 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> base<span class="Delimiter">;</span>
 <span id="L48" class="LineNr">48 </span>  <span class="Normal">int</span> result = space_base<span class="Delimiter">(</span>x<span class="Delimiter">,</span> space_index-<span class="Constant">1</span><span class="Delimiter">,</span> <a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> base+<span class="Comment">/*</span><span class="Comment">skip length</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">))</span>+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="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>
-<span id="L52" class="LineNr">52 </span><span class="Normal">int</span> <a href='044space_surround.cc.html#L52'>space_index</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L52" class="LineNr">52 </span><span class="Normal">int</span> space_index<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L53" class="LineNr">53 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>properties<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L54" class="LineNr">54 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>first == <span class="Constant">&quot;space&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L55" class="LineNr">55 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second || x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span>
diff --git a/html/045closure_name.cc.html b/html/045closure_name.cc.html
index 8e8a5e65..c526cdd9 100644
--- a/html/045closure_name.cc.html
+++ b/html/045closure_name.cc.html
@@ -108,7 +108,7 @@ if ('onhashchange' in window) {
 <span id="L45" class="LineNr"> 45 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L46" class="LineNr"> 46 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">).</span>name != <span class="Constant">&quot;0&quot;</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L47" class="LineNr"> 47 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!is_space<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L48" class="LineNr"> 48 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;slot 0 should always have type <a href='043space.cc.html#L76'>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="L48" class="LineNr"> 48 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;slot 0 should always have type address:array:location, but is '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L49" class="LineNr"> 49 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L50" class="LineNr"> 50 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L51" class="LineNr"> 51 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> string_tree* s = property<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">),</span> <span class="Constant">&quot;names&quot;</span><span class="Delimiter">);</span>
diff --git a/html/050scenario.cc.html b/html/050scenario.cc.html
index 9717d92c..503afcc0 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#L49'>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#L76'>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> address = <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#L76'>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> address<span class="Delimiter">))</span>
 <span id="L433" class="LineNr">433 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;duplicate expectation for location '&quot;</span> &lt;&lt; address &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
-<span id="L434" class="LineNr">434 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking location &quot;</span> &lt;&lt; <a href='043space.cc.html#L76'>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#L76'>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">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking location &quot;</span> &lt;&lt; address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L435" class="LineNr">435 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address<span class="Delimiter">)</span> != value<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L436" class="LineNr">436 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L437" class="LineNr">437 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected location '&quot;</span> &lt;&lt; address &lt;&lt; <span class="Constant">&quot;' to contain &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>value<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but saw &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <a href='043space.cc.html#L76'>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#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected location '&quot;</span> &lt;&lt; address &lt;&lt; <span class="Constant">&quot;' to contain &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>value<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but saw &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L228'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="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#L76'>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>address<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#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L197'>end</a> of file (3)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="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#L76'>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> address = x<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
 <span id="L465" class="LineNr">465 </span>  <span class="Conceal">¦</span> <span class="Comment">// exclude quoting brackets</span>
 <span id="L466" class="LineNr">466 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>*literal<span class="Delimiter">.</span>begin<span class="Delimiter">()</span> != <span class="Constant">'['</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L467" class="LineNr">467 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;array:character types inside 'memory-should-contain' can only be compared with text literals surrounded by [], not '&quot;</span> &lt;&lt; literal &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
@@ -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#L76'>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>address<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>
diff --git a/html/053recipe_header.cc.html b/html/053recipe_header.cc.html
index d54d2db5..587977ad 100644
--- a/html/053recipe_header.cc.html
+++ b/html/053recipe_header.cc.html
@@ -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#L76'>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:address: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 9112499b..15d4d181 100644
--- a/html/054static_dispatch.cc.html
+++ b/html/054static_dispatch.cc.html
@@ -705,7 +705,7 @@ if ('onhashchange' in window) {
 <span id="L640" class="LineNr">640 </span>  <span class="Normal">s</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [abc]
 <span id="L641" class="LineNr">641 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span>foo s
 <span id="L642" class="LineNr">642 </span>]
-<span id="L643" class="LineNr">643 </span><span class="muRecipe">def</span> foo a:<a href='043space.cc.html#L76'>address</a>:array:character<span class="muRecipe"> -&gt; </span>result:number [
+<span id="L643" class="LineNr">643 </span><span class="muRecipe">def</span> foo a:address:array:character<span class="muRecipe"> -&gt; </span>result:number [
 <span id="L644" class="LineNr">644 </span>  <span class="Identifier">return</span> <span class="Constant">34</span>
 <span id="L645" class="LineNr">645 </span>]
 <span id="L646" class="LineNr">646 </span><span class="Comment"># identical to previous variant once you take type abbreviations into account</span>
diff --git a/html/055shape_shifting_container.cc.html b/html/055shape_shifting_container.cc.html
index 14bdafe9..17178da1 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#L76'>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>address array character<span class="Delimiter">))}</span><span class="Special"> &lt;- </span>merge <span class="Constant">34</span>/x<span class="Delimiter">,</span> <span class="Constant">1</span>:text/y
 <span id="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#L76'>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>address _b<span class="Delimiter">))}</span>
 <span id="L94" class="LineNr"> 94 </span>]
 <span id="L95" class="LineNr"> 95 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L96" class="LineNr"> 96 </span>  <span class="Constant">1</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [abc]
@@ -374,8 +374,8 @@ if ('onhashchange' in window) {
 <span id="L308" class="LineNr">308 </span>]
 <span id="L309" class="LineNr">309 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L310" class="LineNr">310 </span>  <span class="Constant">1</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [abc]
-<span id="L311" class="LineNr">311 </span>  <span class="Delimiter">{</span><span class="Constant">2</span>: <span class="Delimiter">(</span>foo number <span class="Delimiter">(</span><a href='043space.cc.html#L76'>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#L76'>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>address array character<span class="Delimiter">))}</span><span class="Special"> &lt;- </span>merge <span class="Constant">34</span>/x<span class="Delimiter">,</span> <span class="Constant">1</span>:text/y
+<span id="L312" class="LineNr">312 </span>  <span class="Constant">3</span>:text<span class="Special"> &lt;- </span>get <span class="Delimiter">{</span><span class="Constant">2</span>: <span class="Delimiter">(</span>foo number <span class="Delimiter">(</span>address array character<span class="Delimiter">))},</span> <span class="Constant">y:offset</span>
 <span id="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#L76'>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:address:array:character&quot;</span><span class="Delimiter">);</span>
 <span id="L454" class="LineNr">454 </span>  reagent element = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>callsite<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L455" class="LineNr">455 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">),</span> <span class="Constant">&quot;{x: (</span><span class="cSpecial">\&quot;</span><span class="Constant">foo</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant"><a href='043space.cc.html#L76'>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#L158'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">),</span> <span class="Constant">&quot;{x: (</span><span class="cSpecial">\&quot;</span><span class="Constant">foo</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">address</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">array</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">character</span><span class="cSpecial">\&quot;</span><span class="Constant">)}&quot;</span><span class="Delimiter">);</span>
 <span id="L456" class="LineNr">456 </span><span class="Delimiter">}</span>
 <span id="L457" class="LineNr">457 </span>
 <span id="L458" class="LineNr">458 </span><span class="Normal">void</span> test_replace_type_ingredients_head_middle<span class="Delimiter">()</span> <span class="Delimiter">{</span>
@@ -530,7 +530,7 @@ if ('onhashchange' in window) {
 <span id="L464" class="LineNr">464 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L465" class="LineNr">465 </span>  reagent callsite<span class="Delimiter">(</span><span class="Constant">&quot;x:bar:address&quot;</span><span class="Delimiter">);</span>
 <span id="L466" class="LineNr">466 </span>  reagent element = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>callsite<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L467" class="LineNr">467 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">),</span> <span class="Constant">&quot;{x: (</span><span class="cSpecial">\&quot;</span><span class="Constant">foo</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant"><a href='043space.cc.html#L76'>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#L158'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">),</span> <span class="Constant">&quot;{x: (</span><span class="cSpecial">\&quot;</span><span class="Constant">foo</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">address</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">number</span><span class="cSpecial">\&quot;</span><span class="Constant">)}&quot;</span><span class="Delimiter">);</span>
 <span id="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#L158'>to_string</a><span class="Delimiter">(</span>element1<span class="Delimiter">),</span> <span class="Constant">&quot;{x: </span><span class="cSpecial">\&quot;</span><span class="Constant">number</span><span class="cSpecial">\&quot;</span><span class="Constant">}&quot;</span><span class="Delimiter">);</span>
 <span id="L478" class="LineNr">478 </span>  reagent element2 = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>callsite<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L479" class="LineNr">479 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>element2<span class="Delimiter">),</span> <span class="Constant">&quot;{y: (</span><span class="cSpecial">\&quot;</span><span class="Constant"><a href='043space.cc.html#L76'>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#L158'>to_string</a><span class="Delimiter">(</span>element2<span class="Delimiter">),</span> <span class="Constant">&quot;{y: (</span><span class="cSpecial">\&quot;</span><span class="Constant">address</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">array</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">character</span><span class="cSpecial">\&quot;</span><span class="Constant">)}&quot;</span><span class="Delimiter">);</span>
 <span id="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#L158'>to_string</a><span class="Delimiter">(</span>element1<span class="Delimiter">),</span> <span class="Constant">&quot;{x: </span><span class="cSpecial">\&quot;</span><span class="Constant">number</span><span class="cSpecial">\&quot;</span><span class="Constant">}&quot;</span><span class="Delimiter">);</span>
 <span id="L500" class="LineNr">500 </span>  reagent element2 = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>callsite<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L501" class="LineNr">501 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>element2<span class="Delimiter">),</span> <span class="Constant">&quot;{y: (</span><span class="cSpecial">\&quot;</span><span class="Constant"><a href='043space.cc.html#L76'>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#L158'>to_string</a><span class="Delimiter">(</span>element2<span class="Delimiter">),</span> <span class="Constant">&quot;{y: (</span><span class="cSpecial">\&quot;</span><span class="Constant">address</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">array</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">character</span><span class="cSpecial">\&quot;</span><span class="Constant">)}&quot;</span><span class="Delimiter">);</span>
 <span id="L502" class="LineNr">502 </span>  reagent element3 = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>callsite<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L503" class="LineNr">503 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>element3<span class="Delimiter">),</span> <span class="Constant">&quot;{z: </span><span class="cSpecial">\&quot;</span><span class="Constant">boolean</span><span class="cSpecial">\&quot;</span><span class="Constant">}&quot;</span><span class="Delimiter">);</span>
 <span id="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#L158'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">),</span> <span class="Constant">&quot;{key: (</span><span class="cSpecial">\&quot;</span><span class="Constant"><a href='043space.cc.html#L76'>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#L158'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">),</span> <span class="Constant">&quot;{key: (</span><span class="cSpecial">\&quot;</span><span class="Constant">address</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">array</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">character</span><span class="cSpecial">\&quot;</span><span class="Constant">)}&quot;</span><span class="Delimiter">);</span>
 <span id="L514" class="LineNr">514 </span><span class="Delimiter">}</span>
 <span id="L515" class="LineNr">515 </span>
 <span id="L516" class="LineNr">516 </span><span class="Normal">void</span> test_replace_middle_type_ingredient_with_multiple3<span class="Delimiter">()</span> <span class="Delimiter">{</span>
@@ -590,7 +590,7 @@ if ('onhashchange' in window) {
 <span id="L524" class="LineNr">524 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L525" class="LineNr">525 </span>  reagent callsite<span class="Delimiter">(</span><span class="Constant">&quot;{f: (foo_table (address array character) number)}&quot;</span><span class="Delimiter">);</span>
 <span id="L526" class="LineNr">526 </span>  reagent element = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>callsite<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L527" class="LineNr">527 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">),</span> <span class="Constant">&quot;{data: (</span><span class="cSpecial">\&quot;</span><span class="Constant"><a href='043space.cc.html#L76'>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#L76'>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#L158'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">),</span> <span class="Constant">&quot;{data: (</span><span class="cSpecial">\&quot;</span><span class="Constant">address</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">array</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">foo_table_row</span><span class="cSpecial">\&quot;</span><span class="Constant"> (</span><span class="cSpecial">\&quot;</span><span class="Constant">address</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">array</span><span class="cSpecial">\&quot;</span><span class="Constant"> </span><span class="cSpecial">\&quot;</span><span class="Constant">character</span><span class="cSpecial">\&quot;</span><span class="Constant">) </span><span class="cSpecial">\&quot;</span><span class="Constant">number</span><span class="cSpecial">\&quot;</span><span class="Constant">)}&quot;</span><span class="Delimiter">);</span>
 <span id="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#L76'>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#L76'>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#L76'>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>address<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L641" class="LineNr">641 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
+<span id="L642" class="LineNr">642 </span>  set&lt;address_element_info&gt;&amp; offset_info = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
 <span id="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#L76'>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#L76'>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#L76'>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>address<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L663" class="LineNr">663 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
+<span id="L664" class="LineNr">664 </span>  set&lt;address_element_info&gt;&amp; offset_info = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
 <span id="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#L76'>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>:address:foo:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>foo num<span class="Delimiter">)</span>: type<span class="Delimiter">}</span>
 <span id="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 0dbb1e09..6cf9462d 100644
--- a/html/056shape_shifting_recipe.cc.html
+++ b/html/056shape_shifting_recipe.cc.html
@@ -609,7 +609,7 @@ if ('onhashchange' in window) {
 <span id="L542" class="LineNr"> 542 </span>]
 <span id="L543" class="LineNr"> 543 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L544" class="LineNr"> 544 </span>  <span class="Normal">s</span>:text<span class="Special"> &lt;- </span><span class="Normal">new</span> [abc]
-<span id="L545" class="LineNr"> 545 </span>  <span class="Delimiter">{</span>x: <span class="Delimiter">(</span>c <span class="Delimiter">(</span><a href='043space.cc.html#L76'>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="L545" class="LineNr"> 545 </span>  <span class="Delimiter">{</span>x: <span class="Delimiter">(</span>c <span class="Delimiter">(</span>address array character<span class="Delimiter">)</span> number<span class="Delimiter">)}</span><span class="Special"> &lt;- </span>merge s<span class="Delimiter">,</span> <span class="Constant">34</span>
 <span id="L546" class="LineNr"> 546 </span>  foo x
 <span id="L547" class="LineNr"> 547 </span>]
 <span id="L548" class="LineNr"> 548 </span><span class="muRecipe">def</span> foo x:c:_bar:_baz [
@@ -748,7 +748,7 @@ if ('onhashchange' in window) {
 <span id="L681" class="LineNr"> 681 </span>  result<span class="Special"> &lt;- </span>get *x<span class="Delimiter">,</span> <span class="Constant">value:offset</span>
 <span id="L682" class="LineNr"> 682 </span>]
 <span id="L683" class="LineNr"> 683 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L684" class="LineNr"> 684 </span>  <span class="Constant">1</span>:&amp;:foo:&amp;:point<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>foo <a href='043space.cc.html#L76'>address</a> point<span class="Delimiter">)</span>: type<span class="Delimiter">}</span>
+<span id="L684" class="LineNr"> 684 </span>  <span class="Constant">1</span>:&amp;:foo:&amp;:point<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>foo address point<span class="Delimiter">)</span>: type<span class="Delimiter">}</span>
 <span id="L685" class="LineNr"> 685 </span>  <span class="Constant">2</span>:&amp;:point<span class="Special"> &lt;- </span>bar <span class="Constant">1</span>:&amp;:foo:&amp;:point
 <span id="L686" class="LineNr"> 686 </span>]
 <span id="L687" class="LineNr"> 687 </span><span class="Comment"># no errors; call to 'bar' successfully specialized</span>
diff --git a/html/057immutable.cc.html b/html/057immutable.cc.html
index 071bceba..bd08a8f2 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#L76'>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>address 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/061text.mu.html b/html/061text.mu.html
index f380a9d3..5c6d636c 100644
--- a/html/061text.mu.html
+++ b/html/061text.mu.html
@@ -73,1427 +73,1412 @@ if ('onhashchange' in window) {
 <span id="L11" class="LineNr">  11 </span>  a-len:num <span class="Special">&lt;-</span> length *a
 <span id="L12" class="LineNr">  12 </span>  b-len:num <span class="Special">&lt;-</span> length *b
 <span id="L13" class="LineNr">  13 </span>  <span class="Comment"># compare lengths</span>
-<span id="L14" class="LineNr">  14 </span>  <span class="Delimiter">{</span>
-<span id="L15" class="LineNr">  15 </span>  <span class="Conceal">¦</span> trace<span class="Constant"> 99</span>, <span class="Constant">[text-equal]</span>, <span class="Constant">[comparing lengths]</span>
-<span id="L16" class="LineNr">  16 </span>  <span class="Conceal">¦</span> length-equal?:bool <span class="Special">&lt;-</span> equal a-len, b-len
-<span id="L17" class="LineNr">  17 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> length-equal?
-<span id="L18" class="LineNr">  18 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span><span class="Constant"> 0</span>
-<span id="L19" class="LineNr">  19 </span>  <span class="Delimiter">}</span>
-<span id="L20" class="LineNr">  20 </span>  <span class="Comment"># compare each corresponding character</span>
-<span id="L21" class="LineNr">  21 </span>  trace<span class="Constant"> 99</span>, <span class="Constant">[text-equal]</span>, <span class="Constant">[comparing characters]</span>
-<span id="L22" class="LineNr">  22 </span>  i:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
-<span id="L23" class="LineNr">  23 </span>  <span class="Delimiter">{</span>
-<span id="L24" class="LineNr">  24 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-or-equal i, a-len
-<span id="L25" class="LineNr">  25 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
-<span id="L26" class="LineNr">  26 </span>  <span class="Conceal">¦</span> a2:char <span class="Special">&lt;-</span> index *a, i
-<span id="L27" class="LineNr">  27 </span>  <span class="Conceal">¦</span> b2:char <span class="Special">&lt;-</span> index *b, i
-<span id="L28" class="LineNr">  28 </span>  <span class="Conceal">¦</span> <span class="Delimiter">{</span>
-<span id="L29" class="LineNr">  29 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> chars-match?:bool <span class="Special">&lt;-</span> equal a2, b2
-<span id="L30" class="LineNr">  30 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">break-if</span> chars-match?
-<span id="L31" class="LineNr">  31 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">return</span><span class="Constant"> 0</span>
-<span id="L32" class="LineNr">  32 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L33" class="LineNr">  33 </span>  <span class="Conceal">¦</span> i <span class="Special">&lt;-</span> add i,<span class="Constant"> 1</span>
-<span id="L34" class="LineNr">  34 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
-<span id="L35" class="LineNr">  35 </span>  <span class="Delimiter">}</span>
-<span id="L36" class="LineNr">  36 </span>  <span class="muControl">return</span><span class="Constant"> 1</span>
-<span id="L37" class="LineNr">  37 </span>]
-<span id="L38" class="LineNr">  38 </span>
-<span id="L39" class="LineNr">  39 </span><span class="muScenario">scenario</span> text-equal-reflexive [
-<span id="L40" class="LineNr">  40 </span>  <span class="Constant">local-scope</span>
-<span id="L41" class="LineNr">  41 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L42" class="LineNr">  42 </span>  run [
-<span id="L43" class="LineNr">  43 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal x, x
-<span id="L44" class="LineNr">  44 </span>  ]
-<span id="L45" class="LineNr">  45 </span>  memory-should-contain [
-<span id="L46" class="LineNr">  46 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># x == x for all x</span>
-<span id="L47" class="LineNr">  47 </span>  ]
-<span id="L48" class="LineNr">  48 </span>]
-<span id="L49" class="LineNr">  49 </span>
-<span id="L50" class="LineNr">  50 </span><span class="muScenario">scenario</span> text-equal-identical [
-<span id="L51" class="LineNr">  51 </span>  <span class="Constant">local-scope</span>
-<span id="L52" class="LineNr">  52 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L53" class="LineNr">  53 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L54" class="LineNr">  54 </span>  run [
-<span id="L55" class="LineNr">  55 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal x, y
-<span id="L56" class="LineNr">  56 </span>  ]
-<span id="L57" class="LineNr">  57 </span>  memory-should-contain [
-<span id="L58" class="LineNr">  58 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># abc == abc</span>
-<span id="L59" class="LineNr">  59 </span>  ]
-<span id="L60" class="LineNr">  60 </span>]
-<span id="L61" class="LineNr">  61 </span>
-<span id="L62" class="LineNr">  62 </span><span class="muScenario">scenario</span> text-equal-distinct-lengths [
-<span id="L63" class="LineNr">  63 </span>  <span class="Constant">local-scope</span>
-<span id="L64" class="LineNr">  64 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L65" class="LineNr">  65 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[abcd]</span>
-<span id="L66" class="LineNr">  66 </span>  run [
-<span id="L67" class="LineNr">  67 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal x, y
+<span id="L14" class="LineNr">  14 </span>  trace<span class="Constant"> 99</span>, <span class="Constant">[text-equal]</span>, <span class="Constant">[comparing lengths]</span>
+<span id="L15" class="LineNr">  15 </span>  length-equal?:bool <span class="Special">&lt;-</span> equal a-len, b-len
+<span id="L16" class="LineNr">  16 </span>  <span class="muControl">return-unless</span> length-equal?, <span class="Constant">0/false</span>
+<span id="L17" class="LineNr">  17 </span>  <span class="Comment"># compare each corresponding character</span>
+<span id="L18" class="LineNr">  18 </span>  trace<span class="Constant"> 99</span>, <span class="Constant">[text-equal]</span>, <span class="Constant">[comparing characters]</span>
+<span id="L19" class="LineNr">  19 </span>  i:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
+<span id="L20" class="LineNr">  20 </span>  <span class="Delimiter">{</span>
+<span id="L21" class="LineNr">  21 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-or-equal i, a-len
+<span id="L22" class="LineNr">  22 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
+<span id="L23" class="LineNr">  23 </span>  <span class="Conceal">¦</span> a2:char <span class="Special">&lt;-</span> index *a, i
+<span id="L24" class="LineNr">  24 </span>  <span class="Conceal">¦</span> b2:char <span class="Special">&lt;-</span> index *b, i
+<span id="L25" class="LineNr">  25 </span>  <span class="Conceal">¦</span> chars-match?:bool <span class="Special">&lt;-</span> equal a2, b2
+<span id="L26" class="LineNr">  26 </span>  <span class="Conceal">¦</span> <span class="muControl">return-unless</span> chars-match?, <span class="Constant">0/false</span>
+<span id="L27" class="LineNr">  27 </span>  <span class="Conceal">¦</span> i <span class="Special">&lt;-</span> add i,<span class="Constant"> 1</span>
+<span id="L28" class="LineNr">  28 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
+<span id="L29" class="LineNr">  29 </span>  <span class="Delimiter">}</span>
+<span id="L30" class="LineNr">  30 </span>  <span class="muControl">return</span><span class="Constant"> 1</span>
+<span id="L31" class="LineNr">  31 </span>]
+<span id="L32" class="LineNr">  32 </span>
+<span id="L33" class="LineNr">  33 </span><span class="muScenario">scenario</span> text-equal-reflexive [
+<span id="L34" class="LineNr">  34 </span>  <span class="Constant">local-scope</span>
+<span id="L35" class="LineNr">  35 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L36" class="LineNr">  36 </span>  run [
+<span id="L37" class="LineNr">  37 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal x, x
+<span id="L38" class="LineNr">  38 </span>  ]
+<span id="L39" class="LineNr">  39 </span>  memory-should-contain [
+<span id="L40" class="LineNr">  40 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># x == x for all x</span>
+<span id="L41" class="LineNr">  41 </span>  ]
+<span id="L42" class="LineNr">  42 </span>]
+<span id="L43" class="LineNr">  43 </span>
+<span id="L44" class="LineNr">  44 </span><span class="muScenario">scenario</span> text-equal-identical [
+<span id="L45" class="LineNr">  45 </span>  <span class="Constant">local-scope</span>
+<span id="L46" class="LineNr">  46 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L47" class="LineNr">  47 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L48" class="LineNr">  48 </span>  run [
+<span id="L49" class="LineNr">  49 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal x, y
+<span id="L50" class="LineNr">  50 </span>  ]
+<span id="L51" class="LineNr">  51 </span>  memory-should-contain [
+<span id="L52" class="LineNr">  52 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># abc == abc</span>
+<span id="L53" class="LineNr">  53 </span>  ]
+<span id="L54" class="LineNr">  54 </span>]
+<span id="L55" class="LineNr">  55 </span>
+<span id="L56" class="LineNr">  56 </span><span class="muScenario">scenario</span> text-equal-distinct-lengths [
+<span id="L57" class="LineNr">  57 </span>  <span class="Constant">local-scope</span>
+<span id="L58" class="LineNr">  58 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L59" class="LineNr">  59 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[abcd]</span>
+<span id="L60" class="LineNr">  60 </span>  run [
+<span id="L61" class="LineNr">  61 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal x, y
+<span id="L62" class="LineNr">  62 </span>  ]
+<span id="L63" class="LineNr">  63 </span>  memory-should-contain [
+<span id="L64" class="LineNr">  64 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># abc != abcd</span>
+<span id="L65" class="LineNr">  65 </span>  ]
+<span id="L66" class="LineNr">  66 </span>  trace-should-contain [
+<span id="L67" class="LineNr">  67 </span>  <span class="Conceal">¦</span> text-equal: comparing lengths
 <span id="L68" class="LineNr">  68 </span>  ]
-<span id="L69" class="LineNr">  69 </span>  memory-should-contain [
-<span id="L70" class="LineNr">  70 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># abc != abcd</span>
+<span id="L69" class="LineNr">  69 </span>  trace-should-not-contain [
+<span id="L70" class="LineNr">  70 </span>  <span class="Conceal">¦</span> text-equal: comparing characters
 <span id="L71" class="LineNr">  71 </span>  ]
-<span id="L72" class="LineNr">  72 </span>  trace-should-contain [
-<span id="L73" class="LineNr">  73 </span>  <span class="Conceal">¦</span> text-equal: comparing lengths
-<span id="L74" class="LineNr">  74 </span>  ]
-<span id="L75" class="LineNr">  75 </span>  trace-should-not-contain [
-<span id="L76" class="LineNr">  76 </span>  <span class="Conceal">¦</span> text-equal: comparing characters
-<span id="L77" class="LineNr">  77 </span>  ]
-<span id="L78" class="LineNr">  78 </span>]
-<span id="L79" class="LineNr">  79 </span>
-<span id="L80" class="LineNr">  80 </span><span class="muScenario">scenario</span> text-equal-with-empty [
-<span id="L81" class="LineNr">  81 </span>  <span class="Constant">local-scope</span>
-<span id="L82" class="LineNr">  82 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[]</span>
-<span id="L83" class="LineNr">  83 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[abcd]</span>
-<span id="L84" class="LineNr">  84 </span>  run [
-<span id="L85" class="LineNr">  85 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal x, y
-<span id="L86" class="LineNr">  86 </span>  ]
-<span id="L87" class="LineNr">  87 </span>  memory-should-contain [
-<span id="L88" class="LineNr">  88 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># &quot;&quot; != abcd</span>
-<span id="L89" class="LineNr">  89 </span>  ]
-<span id="L90" class="LineNr">  90 </span>]
-<span id="L91" class="LineNr">  91 </span>
-<span id="L92" class="LineNr">  92 </span><span class="muScenario">scenario</span> text-equal-with-null [
-<span id="L93" class="LineNr">  93 </span>  <span class="Constant">local-scope</span>
-<span id="L94" class="LineNr">  94 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abcd]</span>
-<span id="L95" class="LineNr">  95 </span>  y:text <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
-<span id="L96" class="LineNr">  96 </span>  run [
-<span id="L97" class="LineNr">  97 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal x,<span class="Constant"> 0</span>
-<span id="L98" class="LineNr">  98 </span>  <span class="Conceal">¦</span> 11:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal<span class="Constant"> 0</span>, x
-<span id="L99" class="LineNr">  99 </span>  <span class="Conceal">¦</span> 12:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal x, y
-<span id="L100" class="LineNr"> 100 </span>  <span class="Conceal">¦</span> 13:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal y, x
-<span id="L101" class="LineNr"> 101 </span>  <span class="Conceal">¦</span> 14:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal y, y
-<span id="L102" class="LineNr"> 102 </span>  ]
-<span id="L103" class="LineNr"> 103 </span>  memory-should-contain [
-<span id="L104" class="LineNr"> 104 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
-<span id="L105" class="LineNr"> 105 </span>  <span class="Conceal">¦</span><span class="Constant"> 11</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
-<span id="L106" class="LineNr"> 106 </span>  <span class="Conceal">¦</span><span class="Constant"> 12</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
-<span id="L107" class="LineNr"> 107 </span>  <span class="Conceal">¦</span><span class="Constant"> 13</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
-<span id="L108" class="LineNr"> 108 </span>  <span class="Conceal">¦</span><span class="Constant"> 14</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>
-<span id="L109" class="LineNr"> 109 </span>  ]
-<span id="L110" class="LineNr"> 110 </span>  check-trace-count-for-label<span class="Constant"> 0</span>, <span class="Constant">[error]</span>
-<span id="L111" class="LineNr"> 111 </span>]
-<span id="L112" class="LineNr"> 112 </span>
-<span id="L113" class="LineNr"> 113 </span><span class="muScenario">scenario</span> text-equal-common-lengths-but-distinct [
-<span id="L114" class="LineNr"> 114 </span>  <span class="Constant">local-scope</span>
-<span id="L115" class="LineNr"> 115 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L116" class="LineNr"> 116 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[abd]</span>
-<span id="L117" class="LineNr"> 117 </span>  run [
-<span id="L118" class="LineNr"> 118 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal x, y
-<span id="L119" class="LineNr"> 119 </span>  ]
-<span id="L120" class="LineNr"> 120 </span>  memory-should-contain [
-<span id="L121" class="LineNr"> 121 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># abc != abd</span>
-<span id="L122" class="LineNr"> 122 </span>  ]
+<span id="L72" class="LineNr">  72 </span>]
+<span id="L73" class="LineNr">  73 </span>
+<span id="L74" class="LineNr">  74 </span><span class="muScenario">scenario</span> text-equal-with-empty [
+<span id="L75" class="LineNr">  75 </span>  <span class="Constant">local-scope</span>
+<span id="L76" class="LineNr">  76 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[]</span>
+<span id="L77" class="LineNr">  77 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[abcd]</span>
+<span id="L78" class="LineNr">  78 </span>  run [
+<span id="L79" class="LineNr">  79 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal x, y
+<span id="L80" class="LineNr">  80 </span>  ]
+<span id="L81" class="LineNr">  81 </span>  memory-should-contain [
+<span id="L82" class="LineNr">  82 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># &quot;&quot; != abcd</span>
+<span id="L83" class="LineNr">  83 </span>  ]
+<span id="L84" class="LineNr">  84 </span>]
+<span id="L85" class="LineNr">  85 </span>
+<span id="L86" class="LineNr">  86 </span><span class="muScenario">scenario</span> text-equal-with-null [
+<span id="L87" class="LineNr">  87 </span>  <span class="Constant">local-scope</span>
+<span id="L88" class="LineNr">  88 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abcd]</span>
+<span id="L89" class="LineNr">  89 </span>  y:text <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
+<span id="L90" class="LineNr">  90 </span>  run [
+<span id="L91" class="LineNr">  91 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal x,<span class="Constant"> 0</span>
+<span id="L92" class="LineNr">  92 </span>  <span class="Conceal">¦</span> 11:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal<span class="Constant"> 0</span>, x
+<span id="L93" class="LineNr">  93 </span>  <span class="Conceal">¦</span> 12:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal x, y
+<span id="L94" class="LineNr">  94 </span>  <span class="Conceal">¦</span> 13:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal y, x
+<span id="L95" class="LineNr">  95 </span>  <span class="Conceal">¦</span> 14:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal y, y
+<span id="L96" class="LineNr">  96 </span>  ]
+<span id="L97" class="LineNr">  97 </span>  memory-should-contain [
+<span id="L98" class="LineNr">  98 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
+<span id="L99" class="LineNr">  99 </span>  <span class="Conceal">¦</span><span class="Constant"> 11</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
+<span id="L100" class="LineNr"> 100 </span>  <span class="Conceal">¦</span><span class="Constant"> 12</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
+<span id="L101" class="LineNr"> 101 </span>  <span class="Conceal">¦</span><span class="Constant"> 13</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
+<span id="L102" class="LineNr"> 102 </span>  <span class="Conceal">¦</span><span class="Constant"> 14</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>
+<span id="L103" class="LineNr"> 103 </span>  ]
+<span id="L104" class="LineNr"> 104 </span>  check-trace-count-for-label<span class="Constant"> 0</span>, <span class="Constant">[error]</span>
+<span id="L105" class="LineNr"> 105 </span>]
+<span id="L106" class="LineNr"> 106 </span>
+<span id="L107" class="LineNr"> 107 </span><span class="muScenario">scenario</span> text-equal-common-lengths-but-distinct [
+<span id="L108" class="LineNr"> 108 </span>  <span class="Constant">local-scope</span>
+<span id="L109" class="LineNr"> 109 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L110" class="LineNr"> 110 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[abd]</span>
+<span id="L111" class="LineNr"> 111 </span>  run [
+<span id="L112" class="LineNr"> 112 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal x, y
+<span id="L113" class="LineNr"> 113 </span>  ]
+<span id="L114" class="LineNr"> 114 </span>  memory-should-contain [
+<span id="L115" class="LineNr"> 115 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># abc != abd</span>
+<span id="L116" class="LineNr"> 116 </span>  ]
+<span id="L117" class="LineNr"> 117 </span>]
+<span id="L118" class="LineNr"> 118 </span>
+<span id="L119" class="LineNr"> 119 </span><span class="Comment"># A new type to help incrementally construct texts.</span>
+<span id="L120" class="LineNr"> 120 </span><span class="muData">container</span> <a href='061text.mu.html#L120'>buffer</a>:_elem [
+<span id="L121" class="LineNr"> 121 </span>  length:num
+<span id="L122" class="LineNr"> 122 </span>  data:&amp;:@:_elem
 <span id="L123" class="LineNr"> 123 </span>]
 <span id="L124" class="LineNr"> 124 </span>
-<span id="L125" class="LineNr"> 125 </span><span class="Comment"># A new type to help incrementally construct texts.</span>
-<span id="L126" class="LineNr"> 126 </span><span class="muData">container</span> <a href='061text.mu.html#L126'>buffer</a>:_elem [
-<span id="L127" class="LineNr"> 127 </span>  length:num
-<span id="L128" class="LineNr"> 128 </span>  data:&amp;:@:_elem
-<span id="L129" class="LineNr"> 129 </span>]
-<span id="L130" class="LineNr"> 130 </span>
-<span id="L131" class="LineNr"> 131 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L131'>new-buffer</a> <a href='075channel.mu.html#L399'>capacity</a>:num<span class="muRecipe"> -&gt; </span>result:&amp;:<a href='061text.mu.html#L126'>buffer</a>:_elem [
-<span id="L132" class="LineNr"> 132 </span>  <span class="Constant">local-scope</span>
-<span id="L133" class="LineNr"> 133 </span>  <span class="Constant">load-ingredients</span>
-<span id="L134" class="LineNr"> 134 </span>  result <span class="Special">&lt;-</span> new <span class="Delimiter">{</span>(buffer _elem): type<span class="Delimiter">}</span>
-<span id="L135" class="LineNr"> 135 </span>  *result <span class="Special">&lt;-</span> put *result, <span class="Constant">length:offset</span>,<span class="Constant"> 0</span>
-<span id="L136" class="LineNr"> 136 </span>  <span class="Delimiter">{</span>
-<span id="L137" class="LineNr"> 137 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> <a href='075channel.mu.html#L399'>capacity</a>
-<span id="L138" class="LineNr"> 138 </span>  <span class="Conceal">¦</span> <span class="Comment"># capacity not provided</span>
-<span id="L139" class="LineNr"> 139 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L399'>capacity</a> <span class="Special">&lt;-</span> copy<span class="Constant"> 10</span>
-<span id="L140" class="LineNr"> 140 </span>  <span class="Delimiter">}</span>
-<span id="L141" class="LineNr"> 141 </span>  data:&amp;:@:_elem <span class="Special">&lt;-</span> new <span class="Constant">_elem:type</span>, <a href='075channel.mu.html#L399'>capacity</a>
-<span id="L142" class="LineNr"> 142 </span>  *result <span class="Special">&lt;-</span> put *result, <span class="Constant">data:offset</span>, data
-<span id="L143" class="LineNr"> 143 </span>  <span class="muControl">return</span> result
-<span id="L144" class="LineNr"> 144 </span>]
-<span id="L145" class="LineNr"> 145 </span>
-<span id="L146" class="LineNr"> 146 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L146'>grow-buffer</a> buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:_elem<span class="muRecipe"> -&gt; </span>buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:_elem [
-<span id="L147" class="LineNr"> 147 </span>  <span class="Constant">local-scope</span>
-<span id="L148" class="LineNr"> 148 </span>  <span class="Constant">load-ingredients</span>
-<span id="L149" class="LineNr"> 149 </span>  <span class="Comment"># double buffer size</span>
-<span id="L150" class="LineNr"> 150 </span>  olddata:&amp;:@:_elem <span class="Special">&lt;-</span> get *buf, <span class="Constant">data:offset</span>
-<span id="L151" class="LineNr"> 151 </span>  oldlen:num <span class="Special">&lt;-</span> length *olddata
-<span id="L152" class="LineNr"> 152 </span>  newlen:num <span class="Special">&lt;-</span> multiply oldlen,<span class="Constant"> 2</span>
-<span id="L153" class="LineNr"> 153 </span>  newdata:&amp;:@:_elem <span class="Special">&lt;-</span> new <span class="Constant">_elem:type</span>, newlen
-<span id="L154" class="LineNr"> 154 </span>  *buf <span class="Special">&lt;-</span> put *buf, <span class="Constant">data:offset</span>, newdata
-<span id="L155" class="LineNr"> 155 </span>  <span class="Comment"># copy old contents</span>
-<span id="L156" class="LineNr"> 156 </span>  i:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
-<span id="L157" class="LineNr"> 157 </span>  <span class="Delimiter">{</span>
-<span id="L158" class="LineNr"> 158 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-or-equal i, oldlen
-<span id="L159" class="LineNr"> 159 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
-<span id="L160" class="LineNr"> 160 </span>  <span class="Conceal">¦</span> src:_elem <span class="Special">&lt;-</span> index *olddata, i
-<span id="L161" class="LineNr"> 161 </span>  <span class="Conceal">¦</span> *newdata <span class="Special">&lt;-</span> put-index *newdata, i, src
-<span id="L162" class="LineNr"> 162 </span>  <span class="Conceal">¦</span> i <span class="Special">&lt;-</span> add i,<span class="Constant"> 1</span>
-<span id="L163" class="LineNr"> 163 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
-<span id="L164" class="LineNr"> 164 </span>  <span class="Delimiter">}</span>
-<span id="L165" class="LineNr"> 165 </span>]
-<span id="L166" class="LineNr"> 166 </span>
-<span id="L167" class="LineNr"> 167 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L167'>buffer-full?</a> in:&amp;:<a href='061text.mu.html#L126'>buffer</a>:_elem<span class="muRecipe"> -&gt; </span>result:bool [
-<span id="L168" class="LineNr"> 168 </span>  <span class="Constant">local-scope</span>
-<span id="L169" class="LineNr"> 169 </span>  <span class="Constant">load-ingredients</span>
-<span id="L170" class="LineNr"> 170 </span>  len:num <span class="Special">&lt;-</span> get *in, <span class="Constant">length:offset</span>
-<span id="L171" class="LineNr"> 171 </span>  s:&amp;:@:_elem <span class="Special">&lt;-</span> get *in, <span class="Constant">data:offset</span>
-<span id="L172" class="LineNr"> 172 </span>  <a href='075channel.mu.html#L399'>capacity</a>:num <span class="Special">&lt;-</span> length *s
-<span id="L173" class="LineNr"> 173 </span>  result <span class="Special">&lt;-</span> greater-or-equal len, <a href='075channel.mu.html#L399'>capacity</a>
-<span id="L174" class="LineNr"> 174 </span>]
-<span id="L175" class="LineNr"> 175 </span>
-<span id="L176" class="LineNr"> 176 </span><span class="Comment"># most broadly applicable definition of append to a buffer</span>
-<span id="L177" class="LineNr"> 177 </span><span class="muRecipe">def</span> append buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:_elem, x:_elem<span class="muRecipe"> -&gt; </span>buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:_elem [
-<span id="L178" class="LineNr"> 178 </span>  <span class="Constant">local-scope</span>
-<span id="L179" class="LineNr"> 179 </span>  <span class="Constant">load-ingredients</span>
-<span id="L180" class="LineNr"> 180 </span>  len:num <span class="Special">&lt;-</span> get *buf, <span class="Constant">length:offset</span>
-<span id="L181" class="LineNr"> 181 </span>  <span class="Delimiter">{</span>
-<span id="L182" class="LineNr"> 182 </span>  <span class="Conceal">¦</span> <span class="Comment"># grow buffer if necessary</span>
-<span id="L183" class="LineNr"> 183 </span>  <span class="Conceal">¦</span> full?:bool <span class="Special">&lt;-</span> <a href='061text.mu.html#L167'>buffer-full?</a> buf
-<span id="L184" class="LineNr"> 184 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> full?
-<span id="L185" class="LineNr"> 185 </span>  <span class="Conceal">¦</span> buf <span class="Special">&lt;-</span> <a href='061text.mu.html#L146'>grow-buffer</a> buf
-<span id="L186" class="LineNr"> 186 </span>  <span class="Delimiter">}</span>
-<span id="L187" class="LineNr"> 187 </span>  s:&amp;:@:_elem <span class="Special">&lt;-</span> get *buf, <span class="Constant">data:offset</span>
-<span id="L188" class="LineNr"> 188 </span>  *s <span class="Special">&lt;-</span> put-index *s, len, x
-<span id="L189" class="LineNr"> 189 </span>  len <span class="Special">&lt;-</span> add len,<span class="Constant"> 1</span>
-<span id="L190" class="LineNr"> 190 </span>  *buf <span class="Special">&lt;-</span> put *buf, <span class="Constant">length:offset</span>, len
-<span id="L191" class="LineNr"> 191 </span>]
-<span id="L192" class="LineNr"> 192 </span>
-<span id="L193" class="LineNr"> 193 </span><span class="Comment"># most broadly applicable definition of append to a buffer of characters: just</span>
-<span id="L194" class="LineNr"> 194 </span><span class="Comment"># call to-text</span>
-<span id="L195" class="LineNr"> 195 </span><span class="muRecipe">def</span> append buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char, x:_elem<span class="muRecipe"> -&gt; </span>buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char [
-<span id="L196" class="LineNr"> 196 </span>  <span class="Constant">local-scope</span>
-<span id="L197" class="LineNr"> 197 </span>  <span class="Constant">load-ingredients</span>
-<span id="L198" class="LineNr"> 198 </span>  text:text <span class="Special">&lt;-</span> to-text x
-<span id="L199" class="LineNr"> 199 </span>  buf <span class="Special">&lt;-</span> append buf, text
-<span id="L200" class="LineNr"> 200 </span>]
-<span id="L201" class="LineNr"> 201 </span>
-<span id="L202" class="LineNr"> 202 </span><span class="Comment"># specialization for characters that is backspace-aware</span>
-<span id="L203" class="LineNr"> 203 </span><span class="muRecipe">def</span> append buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char, c:char<span class="muRecipe"> -&gt; </span>buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char [
-<span id="L204" class="LineNr"> 204 </span>  <span class="Constant">local-scope</span>
-<span id="L205" class="LineNr"> 205 </span>  <span class="Constant">load-ingredients</span>
-<span id="L206" class="LineNr"> 206 </span>  len:num <span class="Special">&lt;-</span> get *buf, <span class="Constant">length:offset</span>
-<span id="L207" class="LineNr"> 207 </span>  <span class="Delimiter">{</span>
-<span id="L208" class="LineNr"> 208 </span>  <span class="Conceal">¦</span> <span class="Comment"># backspace? just drop last character if it exists and return</span>
-<span id="L209" class="LineNr"> 209 </span>  <span class="Conceal">¦</span> backspace?:bool <span class="Special">&lt;-</span> equal c, <span class="Constant">8/backspace</span>
-<span id="L210" class="LineNr"> 210 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> backspace?
-<span id="L211" class="LineNr"> 211 </span>  <span class="Conceal">¦</span> empty?:bool <span class="Special">&lt;-</span> lesser-or-equal len,<span class="Constant"> 0</span>
-<span id="L212" class="LineNr"> 212 </span>  <span class="Conceal">¦</span> <span class="muControl">return-if</span> empty?
-<span id="L213" class="LineNr"> 213 </span>  <span class="Conceal">¦</span> len <span class="Special">&lt;-</span> subtract len,<span class="Constant"> 1</span>
-<span id="L214" class="LineNr"> 214 </span>  <span class="Conceal">¦</span> *buf <span class="Special">&lt;-</span> put *buf, <span class="Constant">length:offset</span>, len
-<span id="L215" class="LineNr"> 215 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span>
+<span id="L125" class="LineNr"> 125 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L125'>new-buffer</a> <a href='075channel.mu.html#L399'>capacity</a>:num<span class="muRecipe"> -&gt; </span>result:&amp;:<a href='061text.mu.html#L120'>buffer</a>:_elem [
+<span id="L126" class="LineNr"> 126 </span>  <span class="Constant">local-scope</span>
+<span id="L127" class="LineNr"> 127 </span>  <span class="Constant">load-ingredients</span>
+<span id="L128" class="LineNr"> 128 </span>  result <span class="Special">&lt;-</span> new <span class="Delimiter">{</span>(buffer _elem): type<span class="Delimiter">}</span>
+<span id="L129" class="LineNr"> 129 </span>  *result <span class="Special">&lt;-</span> put *result, <span class="Constant">length:offset</span>,<span class="Constant"> 0</span>
+<span id="L130" class="LineNr"> 130 </span>  <span class="Delimiter">{</span>
+<span id="L131" class="LineNr"> 131 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> <a href='075channel.mu.html#L399'>capacity</a>
+<span id="L132" class="LineNr"> 132 </span>  <span class="Conceal">¦</span> <span class="Comment"># capacity not provided</span>
+<span id="L133" class="LineNr"> 133 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L399'>capacity</a> <span class="Special">&lt;-</span> copy<span class="Constant"> 10</span>
+<span id="L134" class="LineNr"> 134 </span>  <span class="Delimiter">}</span>
+<span id="L135" class="LineNr"> 135 </span>  data:&amp;:@:_elem <span class="Special">&lt;-</span> new <span class="Constant">_elem:type</span>, <a href='075channel.mu.html#L399'>capacity</a>
+<span id="L136" class="LineNr"> 136 </span>  *result <span class="Special">&lt;-</span> put *result, <span class="Constant">data:offset</span>, data
+<span id="L137" class="LineNr"> 137 </span>  <span class="muControl">return</span> result
+<span id="L138" class="LineNr"> 138 </span>]
+<span id="L139" class="LineNr"> 139 </span>
+<span id="L140" class="LineNr"> 140 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L140'>grow-buffer</a> buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:_elem<span class="muRecipe"> -&gt; </span>buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:_elem [
+<span id="L141" class="LineNr"> 141 </span>  <span class="Constant">local-scope</span>
+<span id="L142" class="LineNr"> 142 </span>  <span class="Constant">load-ingredients</span>
+<span id="L143" class="LineNr"> 143 </span>  <span class="Comment"># double buffer size</span>
+<span id="L144" class="LineNr"> 144 </span>  olddata:&amp;:@:_elem <span class="Special">&lt;-</span> get *buf, <span class="Constant">data:offset</span>
+<span id="L145" class="LineNr"> 145 </span>  oldlen:num <span class="Special">&lt;-</span> length *olddata
+<span id="L146" class="LineNr"> 146 </span>  newlen:num <span class="Special">&lt;-</span> multiply oldlen,<span class="Constant"> 2</span>
+<span id="L147" class="LineNr"> 147 </span>  newdata:&amp;:@:_elem <span class="Special">&lt;-</span> new <span class="Constant">_elem:type</span>, newlen
+<span id="L148" class="LineNr"> 148 </span>  *buf <span class="Special">&lt;-</span> put *buf, <span class="Constant">data:offset</span>, newdata
+<span id="L149" class="LineNr"> 149 </span>  <span class="Comment"># copy old contents</span>
+<span id="L150" class="LineNr"> 150 </span>  i:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
+<span id="L151" class="LineNr"> 151 </span>  <span class="Delimiter">{</span>
+<span id="L152" class="LineNr"> 152 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-or-equal i, oldlen
+<span id="L153" class="LineNr"> 153 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
+<span id="L154" class="LineNr"> 154 </span>  <span class="Conceal">¦</span> src:_elem <span class="Special">&lt;-</span> index *olddata, i
+<span id="L155" class="LineNr"> 155 </span>  <span class="Conceal">¦</span> *newdata <span class="Special">&lt;-</span> put-index *newdata, i, src
+<span id="L156" class="LineNr"> 156 </span>  <span class="Conceal">¦</span> i <span class="Special">&lt;-</span> add i,<span class="Constant"> 1</span>
+<span id="L157" class="LineNr"> 157 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</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 id="L161" class="LineNr"> 161 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L161'>buffer-full?</a> in:&amp;:<a href='061text.mu.html#L120'>buffer</a>:_elem<span class="muRecipe"> -&gt; </span>result:bool [
+<span id="L162" class="LineNr"> 162 </span>  <span class="Constant">local-scope</span>
+<span id="L163" class="LineNr"> 163 </span>  <span class="Constant">load-ingredients</span>
+<span id="L164" class="LineNr"> 164 </span>  len:num <span class="Special">&lt;-</span> get *in, <span class="Constant">length:offset</span>
+<span id="L165" class="LineNr"> 165 </span>  s:&amp;:@:_elem <span class="Special">&lt;-</span> get *in, <span class="Constant">data:offset</span>
+<span id="L166" class="LineNr"> 166 </span>  <a href='075channel.mu.html#L399'>capacity</a>:num <span class="Special">&lt;-</span> length *s
+<span id="L167" class="LineNr"> 167 </span>  result <span class="Special">&lt;-</span> greater-or-equal len, <a href='075channel.mu.html#L399'>capacity</a>
+<span id="L168" class="LineNr"> 168 </span>]
+<span id="L169" class="LineNr"> 169 </span>
+<span id="L170" class="LineNr"> 170 </span><span class="Comment"># most broadly applicable definition of append to a buffer</span>
+<span id="L171" class="LineNr"> 171 </span><span class="muRecipe">def</span> append buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:_elem, x:_elem<span class="muRecipe"> -&gt; </span>buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:_elem [
+<span id="L172" class="LineNr"> 172 </span>  <span class="Constant">local-scope</span>
+<span id="L173" class="LineNr"> 173 </span>  <span class="Constant">load-ingredients</span>
+<span id="L174" class="LineNr"> 174 </span>  len:num <span class="Special">&lt;-</span> get *buf, <span class="Constant">length:offset</span>
+<span id="L175" class="LineNr"> 175 </span>  <span class="Delimiter">{</span>
+<span id="L176" class="LineNr"> 176 </span>  <span class="Conceal">¦</span> <span class="Comment"># grow buffer if necessary</span>
+<span id="L177" class="LineNr"> 177 </span>  <span class="Conceal">¦</span> full?:bool <span class="Special">&lt;-</span> <a href='061text.mu.html#L161'>buffer-full?</a> buf
+<span id="L178" class="LineNr"> 178 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> full?
+<span id="L179" class="LineNr"> 179 </span>  <span class="Conceal">¦</span> buf <span class="Special">&lt;-</span> <a href='061text.mu.html#L140'>grow-buffer</a> buf
+<span id="L180" class="LineNr"> 180 </span>  <span class="Delimiter">}</span>
+<span id="L181" class="LineNr"> 181 </span>  s:&amp;:@:_elem <span class="Special">&lt;-</span> get *buf, <span class="Constant">data:offset</span>
+<span id="L182" class="LineNr"> 182 </span>  *s <span class="Special">&lt;-</span> put-index *s, len, x
+<span id="L183" class="LineNr"> 183 </span>  len <span class="Special">&lt;-</span> add len,<span class="Constant"> 1</span>
+<span id="L184" class="LineNr"> 184 </span>  *buf <span class="Special">&lt;-</span> put *buf, <span class="Constant">length:offset</span>, len
+<span id="L185" class="LineNr"> 185 </span>]
+<span id="L186" class="LineNr"> 186 </span>
+<span id="L187" class="LineNr"> 187 </span><span class="Comment"># most broadly applicable definition of append to a buffer of characters: just</span>
+<span id="L188" class="LineNr"> 188 </span><span class="Comment"># call to-text</span>
+<span id="L189" class="LineNr"> 189 </span><span class="muRecipe">def</span> append buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char, x:_elem<span class="muRecipe"> -&gt; </span>buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char [
+<span id="L190" class="LineNr"> 190 </span>  <span class="Constant">local-scope</span>
+<span id="L191" class="LineNr"> 191 </span>  <span class="Constant">load-ingredients</span>
+<span id="L192" class="LineNr"> 192 </span>  text:text <span class="Special">&lt;-</span> to-text x
+<span id="L193" class="LineNr"> 193 </span>  buf <span class="Special">&lt;-</span> append buf, text
+<span id="L194" class="LineNr"> 194 </span>]
+<span id="L195" class="LineNr"> 195 </span>
+<span id="L196" class="LineNr"> 196 </span><span class="Comment"># specialization for characters that is backspace-aware</span>
+<span id="L197" class="LineNr"> 197 </span><span class="muRecipe">def</span> append buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char, c:char<span class="muRecipe"> -&gt; </span>buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char [
+<span id="L198" class="LineNr"> 198 </span>  <span class="Constant">local-scope</span>
+<span id="L199" class="LineNr"> 199 </span>  <span class="Constant">load-ingredients</span>
+<span id="L200" class="LineNr"> 200 </span>  len:num <span class="Special">&lt;-</span> get *buf, <span class="Constant">length:offset</span>
+<span id="L201" class="LineNr"> 201 </span>  <span class="Delimiter">{</span>
+<span id="L202" class="LineNr"> 202 </span>  <span class="Conceal">¦</span> <span class="Comment"># backspace? just drop last character if it exists and return</span>
+<span id="L203" class="LineNr"> 203 </span>  <span class="Conceal">¦</span> backspace?:bool <span class="Special">&lt;-</span> equal c, <span class="Constant">8/backspace</span>
+<span id="L204" class="LineNr"> 204 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> backspace?
+<span id="L205" class="LineNr"> 205 </span>  <span class="Conceal">¦</span> empty?:bool <span class="Special">&lt;-</span> lesser-or-equal len,<span class="Constant"> 0</span>
+<span id="L206" class="LineNr"> 206 </span>  <span class="Conceal">¦</span> <span class="muControl">return-if</span> empty?
+<span id="L207" class="LineNr"> 207 </span>  <span class="Conceal">¦</span> len <span class="Special">&lt;-</span> subtract len,<span class="Constant"> 1</span>
+<span id="L208" class="LineNr"> 208 </span>  <span class="Conceal">¦</span> *buf <span class="Special">&lt;-</span> put *buf, <span class="Constant">length:offset</span>, len
+<span id="L209" class="LineNr"> 209 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span>
+<span id="L210" class="LineNr"> 210 </span>  <span class="Delimiter">}</span>
+<span id="L211" class="LineNr"> 211 </span>  <span class="Delimiter">{</span>
+<span id="L212" class="LineNr"> 212 </span>  <span class="Conceal">¦</span> <span class="Comment"># grow buffer if necessary</span>
+<span id="L213" class="LineNr"> 213 </span>  <span class="Conceal">¦</span> full?:bool <span class="Special">&lt;-</span> <a href='061text.mu.html#L161'>buffer-full?</a> buf
+<span id="L214" class="LineNr"> 214 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> full?
+<span id="L215" class="LineNr"> 215 </span>  <span class="Conceal">¦</span> buf <span class="Special">&lt;-</span> <a href='061text.mu.html#L140'>grow-buffer</a> buf
 <span id="L216" class="LineNr"> 216 </span>  <span class="Delimiter">}</span>
-<span id="L217" class="LineNr"> 217 </span>  <span class="Delimiter">{</span>
-<span id="L218" class="LineNr"> 218 </span>  <span class="Conceal">¦</span> <span class="Comment"># grow buffer if necessary</span>
-<span id="L219" class="LineNr"> 219 </span>  <span class="Conceal">¦</span> full?:bool <span class="Special">&lt;-</span> <a href='061text.mu.html#L167'>buffer-full?</a> buf
-<span id="L220" class="LineNr"> 220 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> full?
-<span id="L221" class="LineNr"> 221 </span>  <span class="Conceal">¦</span> buf <span class="Special">&lt;-</span> <a href='061text.mu.html#L146'>grow-buffer</a> buf
-<span id="L222" class="LineNr"> 222 </span>  <span class="Delimiter">}</span>
-<span id="L223" class="LineNr"> 223 </span>  s:text <span class="Special">&lt;-</span> get *buf, <span class="Constant">data:offset</span>
-<span id="L224" class="LineNr"> 224 </span>  *s <span class="Special">&lt;-</span> put-index *s, len, c
-<span id="L225" class="LineNr"> 225 </span>  len <span class="Special">&lt;-</span> add len,<span class="Constant"> 1</span>
-<span id="L226" class="LineNr"> 226 </span>  *buf <span class="Special">&lt;-</span> put *buf, <span class="Constant">length:offset</span>, len
-<span id="L227" class="LineNr"> 227 </span>]
-<span id="L228" class="LineNr"> 228 </span>
-<span id="L229" class="LineNr"> 229 </span><span class="muRecipe">def</span> append buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char, t:text<span class="muRecipe"> -&gt; </span>buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char [
-<span id="L230" class="LineNr"> 230 </span>  <span class="Constant">local-scope</span>
-<span id="L231" class="LineNr"> 231 </span>  <span class="Constant">load-ingredients</span>
-<span id="L232" class="LineNr"> 232 </span>  len:num <span class="Special">&lt;-</span> length *t
-<span id="L233" class="LineNr"> 233 </span>  i:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
-<span id="L234" class="LineNr"> 234 </span>  <span class="Delimiter">{</span>
-<span id="L235" class="LineNr"> 235 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-or-equal i, len
-<span id="L236" class="LineNr"> 236 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
-<span id="L237" class="LineNr"> 237 </span>  <span class="Conceal">¦</span> c:char <span class="Special">&lt;-</span> index *t, i
-<span id="L238" class="LineNr"> 238 </span>  <span class="Conceal">¦</span> buf <span class="Special">&lt;-</span> append buf, c
-<span id="L239" class="LineNr"> 239 </span>  <span class="Conceal">¦</span> i <span class="Special">&lt;-</span> add i,<span class="Constant"> 1</span>
-<span id="L240" class="LineNr"> 240 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
-<span id="L241" class="LineNr"> 241 </span>  <span class="Delimiter">}</span>
-<span id="L242" class="LineNr"> 242 </span>]
-<span id="L243" class="LineNr"> 243 </span>
-<span id="L244" class="LineNr"> 244 </span><span class="muScenario">scenario</span> append-to-empty-buffer [
-<span id="L245" class="LineNr"> 245 </span>  <span class="Constant">local-scope</span>
-<span id="L246" class="LineNr"> 246 </span>  x:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L131'>new-buffer</a>
-<span id="L247" class="LineNr"> 247 </span>  run [
-<span id="L248" class="LineNr"> 248 </span>  <span class="Conceal">¦</span> c:char <span class="Special">&lt;-</span> copy <span class="Constant">97/a</span>
-<span id="L249" class="LineNr"> 249 </span>  <span class="Conceal">¦</span> x <span class="Special">&lt;-</span> append x, c
-<span id="L250" class="LineNr"> 250 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> get *x, <span class="Constant">length:offset</span>
-<span id="L251" class="LineNr"> 251 </span>  <span class="Conceal">¦</span> s:text <span class="Special">&lt;-</span> get *x, <span class="Constant">data:offset</span>
-<span id="L252" class="LineNr"> 252 </span>  <span class="Conceal">¦</span> 11:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> index *s,<span class="Constant"> 0</span>
-<span id="L253" class="LineNr"> 253 </span>  <span class="Conceal">¦</span> 12:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> index *s,<span class="Constant"> 1</span>
-<span id="L254" class="LineNr"> 254 </span>  ]
-<span id="L255" class="LineNr"> 255 </span>  memory-should-contain [
-<span id="L256" class="LineNr"> 256 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># buffer length</span>
-<span id="L257" class="LineNr"> 257 </span>  <span class="Conceal">¦</span><span class="Constant"> 11</span> <span class="Special">&lt;-</span><span class="Constant"> 97</span>  <span class="Comment"># a</span>
-<span id="L258" class="LineNr"> 258 </span>  <span class="Conceal">¦</span><span class="Constant"> 12</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># rest of buffer is empty</span>
-<span id="L259" class="LineNr"> 259 </span>  ]
-<span id="L260" class="LineNr"> 260 </span>]
-<span id="L261" class="LineNr"> 261 </span>
-<span id="L262" class="LineNr"> 262 </span><span class="muScenario">scenario</span> append-to-buffer [
-<span id="L263" class="LineNr"> 263 </span>  <span class="Constant">local-scope</span>
-<span id="L264" class="LineNr"> 264 </span>  x:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L131'>new-buffer</a>
-<span id="L265" class="LineNr"> 265 </span>  c:char <span class="Special">&lt;-</span> copy <span class="Constant">97/a</span>
-<span id="L266" class="LineNr"> 266 </span>  x <span class="Special">&lt;-</span> append x, c
-<span id="L267" class="LineNr"> 267 </span>  run [
-<span id="L268" class="LineNr"> 268 </span>  <span class="Conceal">¦</span> c <span class="Special">&lt;-</span> copy <span class="Constant">98/b</span>
-<span id="L269" class="LineNr"> 269 </span>  <span class="Conceal">¦</span> x <span class="Special">&lt;-</span> append x, c
-<span id="L270" class="LineNr"> 270 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> get *x, <span class="Constant">length:offset</span>
-<span id="L271" class="LineNr"> 271 </span>  <span class="Conceal">¦</span> s:text <span class="Special">&lt;-</span> get *x, <span class="Constant">data:offset</span>
-<span id="L272" class="LineNr"> 272 </span>  <span class="Conceal">¦</span> 11:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> index *s,<span class="Constant"> 0</span>
-<span id="L273" class="LineNr"> 273 </span>  <span class="Conceal">¦</span> 12:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> index *s,<span class="Constant"> 1</span>
-<span id="L274" class="LineNr"> 274 </span>  <span class="Conceal">¦</span> 13:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> index *s,<span class="Constant"> 2</span>
+<span id="L217" class="LineNr"> 217 </span>  s:text <span class="Special">&lt;-</span> get *buf, <span class="Constant">data:offset</span>
+<span id="L218" class="LineNr"> 218 </span>  *s <span class="Special">&lt;-</span> put-index *s, len, c
+<span id="L219" class="LineNr"> 219 </span>  len <span class="Special">&lt;-</span> add len,<span class="Constant"> 1</span>
+<span id="L220" class="LineNr"> 220 </span>  *buf <span class="Special">&lt;-</span> put *buf, <span class="Constant">length:offset</span>, len
+<span id="L221" class="LineNr"> 221 </span>]
+<span id="L222" class="LineNr"> 222 </span>
+<span id="L223" class="LineNr"> 223 </span><span class="muRecipe">def</span> append buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char, t:text<span class="muRecipe"> -&gt; </span>buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char [
+<span id="L224" class="LineNr"> 224 </span>  <span class="Constant">local-scope</span>
+<span id="L225" class="LineNr"> 225 </span>  <span class="Constant">load-ingredients</span>
+<span id="L226" class="LineNr"> 226 </span>  len:num <span class="Special">&lt;-</span> length *t
+<span id="L227" class="LineNr"> 227 </span>  i:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
+<span id="L228" class="LineNr"> 228 </span>  <span class="Delimiter">{</span>
+<span id="L229" class="LineNr"> 229 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-or-equal i, len
+<span id="L230" class="LineNr"> 230 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
+<span id="L231" class="LineNr"> 231 </span>  <span class="Conceal">¦</span> c:char <span class="Special">&lt;-</span> index *t, i
+<span id="L232" class="LineNr"> 232 </span>  <span class="Conceal">¦</span> buf <span class="Special">&lt;-</span> append buf, c
+<span id="L233" class="LineNr"> 233 </span>  <span class="Conceal">¦</span> i <span class="Special">&lt;-</span> add i,<span class="Constant"> 1</span>
+<span id="L234" class="LineNr"> 234 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
+<span id="L235" class="LineNr"> 235 </span>  <span class="Delimiter">}</span>
+<span id="L236" class="LineNr"> 236 </span>]
+<span id="L237" class="LineNr"> 237 </span>
+<span id="L238" class="LineNr"> 238 </span><span class="muScenario">scenario</span> append-to-empty-buffer [
+<span id="L239" class="LineNr"> 239 </span>  <span class="Constant">local-scope</span>
+<span id="L240" class="LineNr"> 240 </span>  x:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L125'>new-buffer</a>
+<span id="L241" class="LineNr"> 241 </span>  run [
+<span id="L242" class="LineNr"> 242 </span>  <span class="Conceal">¦</span> c:char <span class="Special">&lt;-</span> copy <span class="Constant">97/a</span>
+<span id="L243" class="LineNr"> 243 </span>  <span class="Conceal">¦</span> x <span class="Special">&lt;-</span> append x, c
+<span id="L244" class="LineNr"> 244 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> get *x, <span class="Constant">length:offset</span>
+<span id="L245" class="LineNr"> 245 </span>  <span class="Conceal">¦</span> s:text <span class="Special">&lt;-</span> get *x, <span class="Constant">data:offset</span>
+<span id="L246" class="LineNr"> 246 </span>  <span class="Conceal">¦</span> 11:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> index *s,<span class="Constant"> 0</span>
+<span id="L247" class="LineNr"> 247 </span>  <span class="Conceal">¦</span> 12:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> index *s,<span class="Constant"> 1</span>
+<span id="L248" class="LineNr"> 248 </span>  ]
+<span id="L249" class="LineNr"> 249 </span>  memory-should-contain [
+<span id="L250" class="LineNr"> 250 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># buffer length</span>
+<span id="L251" class="LineNr"> 251 </span>  <span class="Conceal">¦</span><span class="Constant"> 11</span> <span class="Special">&lt;-</span><span class="Constant"> 97</span>  <span class="Comment"># a</span>
+<span id="L252" class="LineNr"> 252 </span>  <span class="Conceal">¦</span><span class="Constant"> 12</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># rest of buffer is empty</span>
+<span id="L253" class="LineNr"> 253 </span>  ]
+<span id="L254" class="LineNr"> 254 </span>]
+<span id="L255" class="LineNr"> 255 </span>
+<span id="L256" class="LineNr"> 256 </span><span class="muScenario">scenario</span> append-to-buffer [
+<span id="L257" class="LineNr"> 257 </span>  <span class="Constant">local-scope</span>
+<span id="L258" class="LineNr"> 258 </span>  x:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L125'>new-buffer</a>
+<span id="L259" class="LineNr"> 259 </span>  c:char <span class="Special">&lt;-</span> copy <span class="Constant">97/a</span>
+<span id="L260" class="LineNr"> 260 </span>  x <span class="Special">&lt;-</span> append x, c
+<span id="L261" class="LineNr"> 261 </span>  run [
+<span id="L262" class="LineNr"> 262 </span>  <span class="Conceal">¦</span> c <span class="Special">&lt;-</span> copy <span class="Constant">98/b</span>
+<span id="L263" class="LineNr"> 263 </span>  <span class="Conceal">¦</span> x <span class="Special">&lt;-</span> append x, c
+<span id="L264" class="LineNr"> 264 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> get *x, <span class="Constant">length:offset</span>
+<span id="L265" class="LineNr"> 265 </span>  <span class="Conceal">¦</span> s:text <span class="Special">&lt;-</span> get *x, <span class="Constant">data:offset</span>
+<span id="L266" class="LineNr"> 266 </span>  <span class="Conceal">¦</span> 11:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> index *s,<span class="Constant"> 0</span>
+<span id="L267" class="LineNr"> 267 </span>  <span class="Conceal">¦</span> 12:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> index *s,<span class="Constant"> 1</span>
+<span id="L268" class="LineNr"> 268 </span>  <span class="Conceal">¦</span> 13:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> index *s,<span class="Constant"> 2</span>
+<span id="L269" class="LineNr"> 269 </span>  ]
+<span id="L270" class="LineNr"> 270 </span>  memory-should-contain [
+<span id="L271" class="LineNr"> 271 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 2</span>  <span class="Comment"># buffer length</span>
+<span id="L272" class="LineNr"> 272 </span>  <span class="Conceal">¦</span><span class="Constant"> 11</span> <span class="Special">&lt;-</span><span class="Constant"> 97</span>  <span class="Comment"># a</span>
+<span id="L273" class="LineNr"> 273 </span>  <span class="Conceal">¦</span><span class="Constant"> 12</span> <span class="Special">&lt;-</span><span class="Constant"> 98</span>  <span class="Comment"># b</span>
+<span id="L274" class="LineNr"> 274 </span>  <span class="Conceal">¦</span><span class="Constant"> 13</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># rest of buffer is empty</span>
 <span id="L275" class="LineNr"> 275 </span>  ]
-<span id="L276" class="LineNr"> 276 </span>  memory-should-contain [
-<span id="L277" class="LineNr"> 277 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 2</span>  <span class="Comment"># buffer length</span>
-<span id="L278" class="LineNr"> 278 </span>  <span class="Conceal">¦</span><span class="Constant"> 11</span> <span class="Special">&lt;-</span><span class="Constant"> 97</span>  <span class="Comment"># a</span>
-<span id="L279" class="LineNr"> 279 </span>  <span class="Conceal">¦</span><span class="Constant"> 12</span> <span class="Special">&lt;-</span><span class="Constant"> 98</span>  <span class="Comment"># b</span>
-<span id="L280" class="LineNr"> 280 </span>  <span class="Conceal">¦</span><span class="Constant"> 13</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># rest of buffer is empty</span>
-<span id="L281" class="LineNr"> 281 </span>  ]
-<span id="L282" class="LineNr"> 282 </span>]
-<span id="L283" class="LineNr"> 283 </span>
-<span id="L284" class="LineNr"> 284 </span><span class="muScenario">scenario</span> append-grows-buffer [
-<span id="L285" class="LineNr"> 285 </span>  <span class="Constant">local-scope</span>
-<span id="L286" class="LineNr"> 286 </span>  x:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L131'>new-buffer</a><span class="Constant"> 3</span>
-<span id="L287" class="LineNr"> 287 </span>  s1:text <span class="Special">&lt;-</span> get *x, <span class="Constant">data:offset</span>
-<span id="L288" class="LineNr"> 288 </span>  x <span class="Special">&lt;-</span> append x, <span class="Constant">[abc]</span>  <span class="Comment"># buffer is now full</span>
-<span id="L289" class="LineNr"> 289 </span>  s2:text <span class="Special">&lt;-</span> get *x, <span class="Constant">data:offset</span>
-<span id="L290" class="LineNr"> 290 </span>  run [
-<span id="L291" class="LineNr"> 291 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal s1, s2
-<span id="L292" class="LineNr"> 292 </span>  <span class="Conceal">¦</span> 11:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *s2
-<span id="L293" class="LineNr"> 293 </span><span class="Constant">  </span><span class="Conceal">¦</span><span class="Constant"> +buffer-filled</span>
-<span id="L294" class="LineNr"> 294 </span>  <span class="Conceal">¦</span> c:char <span class="Special">&lt;-</span> copy <span class="Constant">100/d</span>
-<span id="L295" class="LineNr"> 295 </span>  <span class="Conceal">¦</span> x <span class="Special">&lt;-</span> append x, c
-<span id="L296" class="LineNr"> 296 </span>  <span class="Conceal">¦</span> s3:text <span class="Special">&lt;-</span> get *x, <span class="Constant">data:offset</span>
-<span id="L297" class="LineNr"> 297 </span>  <span class="Conceal">¦</span> 20:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal s1, s3
-<span id="L298" class="LineNr"> 298 </span>  <span class="Conceal">¦</span> 21:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> get *x, <span class="Constant">length:offset</span>
-<span id="L299" class="LineNr"> 299 </span>  <span class="Conceal">¦</span> 30:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *s3
-<span id="L300" class="LineNr"> 300 </span>  ]
-<span id="L301" class="LineNr"> 301 </span>  memory-should-contain [
-<span id="L302" class="LineNr"> 302 </span>  <span class="Conceal">¦</span> <span class="Comment"># before +buffer-filled</span>
-<span id="L303" class="LineNr"> 303 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>   <span class="Comment"># no change in data pointer after original append</span>
-<span id="L304" class="LineNr"> 304 </span>  <span class="Conceal">¦</span><span class="Constant"> 11</span> <span class="Special">&lt;-</span><span class="Constant"> 3</span>   <span class="Comment"># size of data</span>
-<span id="L305" class="LineNr"> 305 </span>  <span class="Conceal">¦</span><span class="Constant"> 12</span> <span class="Special">&lt;-</span><span class="Constant"> 97</span>  <span class="Comment"># data</span>
-<span id="L306" class="LineNr"> 306 </span>  <span class="Conceal">¦</span><span class="Constant"> 13</span> <span class="Special">&lt;-</span><span class="Constant"> 98</span>
-<span id="L307" class="LineNr"> 307 </span>  <span class="Conceal">¦</span><span class="Constant"> 14</span> <span class="Special">&lt;-</span><span class="Constant"> 99</span>
-<span id="L308" class="LineNr"> 308 </span>  <span class="Conceal">¦</span> <span class="Comment"># in the end</span>
-<span id="L309" class="LineNr"> 309 </span>  <span class="Conceal">¦</span><span class="Constant"> 20</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>   <span class="Comment"># data pointer has grown after second append</span>
-<span id="L310" class="LineNr"> 310 </span>  <span class="Conceal">¦</span><span class="Constant"> 21</span> <span class="Special">&lt;-</span><span class="Constant"> 4</span>   <span class="Comment"># final length</span>
-<span id="L311" class="LineNr"> 311 </span>  <span class="Conceal">¦</span><span class="Constant"> 30</span> <span class="Special">&lt;-</span><span class="Constant"> 6</span>   <span class="Comment"># but data's capacity has doubled</span>
-<span id="L312" class="LineNr"> 312 </span>  <span class="Conceal">¦</span><span class="Constant"> 31</span> <span class="Special">&lt;-</span><span class="Constant"> 97</span>  <span class="Comment"># data</span>
-<span id="L313" class="LineNr"> 313 </span>  <span class="Conceal">¦</span><span class="Constant"> 32</span> <span class="Special">&lt;-</span><span class="Constant"> 98</span>
-<span id="L314" class="LineNr"> 314 </span>  <span class="Conceal">¦</span><span class="Constant"> 33</span> <span class="Special">&lt;-</span><span class="Constant"> 99</span>
-<span id="L315" class="LineNr"> 315 </span>  <span class="Conceal">¦</span><span class="Constant"> 34</span> <span class="Special">&lt;-</span><span class="Constant"> 100</span>
-<span id="L316" class="LineNr"> 316 </span>  <span class="Conceal">¦</span><span class="Constant"> 35</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
-<span id="L317" class="LineNr"> 317 </span>  <span class="Conceal">¦</span><span class="Constant"> 36</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
-<span id="L318" class="LineNr"> 318 </span>  ]
-<span id="L319" class="LineNr"> 319 </span>]
-<span id="L320" class="LineNr"> 320 </span>
-<span id="L321" class="LineNr"> 321 </span><span class="muScenario">scenario</span> buffer-append-handles-backspace [
-<span id="L322" class="LineNr"> 322 </span>  <span class="Constant">local-scope</span>
-<span id="L323" class="LineNr"> 323 </span>  x:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L131'>new-buffer</a>
-<span id="L324" class="LineNr"> 324 </span>  x <span class="Special">&lt;-</span> append x, <span class="Constant">[ab]</span>
-<span id="L325" class="LineNr"> 325 </span>  run [
-<span id="L326" class="LineNr"> 326 </span>  <span class="Conceal">¦</span> c:char <span class="Special">&lt;-</span> copy <span class="Constant">8/backspace</span>
-<span id="L327" class="LineNr"> 327 </span>  <span class="Conceal">¦</span> x <span class="Special">&lt;-</span> append x, c
-<span id="L328" class="LineNr"> 328 </span>  <span class="Conceal">¦</span> s:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L344'>buffer-to-array</a> x
-<span id="L329" class="LineNr"> 329 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *s
-<span id="L330" class="LineNr"> 330 </span>  ]
-<span id="L331" class="LineNr"> 331 </span>  memory-should-contain [
-<span id="L332" class="LineNr"> 332 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>   <span class="Comment"># length</span>
-<span id="L333" class="LineNr"> 333 </span>  <span class="Conceal">¦</span><span class="Constant"> 11</span> <span class="Special">&lt;-</span><span class="Constant"> 97</span>  <span class="Comment"># contents</span>
-<span id="L334" class="LineNr"> 334 </span>  <span class="Conceal">¦</span><span class="Constant"> 12</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
-<span id="L335" class="LineNr"> 335 </span>  ]
+<span id="L276" class="LineNr"> 276 </span>]
+<span id="L277" class="LineNr"> 277 </span>
+<span id="L278" class="LineNr"> 278 </span><span class="muScenario">scenario</span> append-grows-buffer [
+<span id="L279" class="LineNr"> 279 </span>  <span class="Constant">local-scope</span>
+<span id="L280" class="LineNr"> 280 </span>  x:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L125'>new-buffer</a><span class="Constant"> 3</span>
+<span id="L281" class="LineNr"> 281 </span>  s1:text <span class="Special">&lt;-</span> get *x, <span class="Constant">data:offset</span>
+<span id="L282" class="LineNr"> 282 </span>  x <span class="Special">&lt;-</span> append x, <span class="Constant">[abc]</span>  <span class="Comment"># buffer is now full</span>
+<span id="L283" class="LineNr"> 283 </span>  s2:text <span class="Special">&lt;-</span> get *x, <span class="Constant">data:offset</span>
+<span id="L284" class="LineNr"> 284 </span>  run [
+<span id="L285" class="LineNr"> 285 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal s1, s2
+<span id="L286" class="LineNr"> 286 </span>  <span class="Conceal">¦</span> 11:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *s2
+<span id="L287" class="LineNr"> 287 </span><span class="Constant">  </span><span class="Conceal">¦</span><span class="Constant"> +buffer-filled</span>
+<span id="L288" class="LineNr"> 288 </span>  <span class="Conceal">¦</span> c:char <span class="Special">&lt;-</span> copy <span class="Constant">100/d</span>
+<span id="L289" class="LineNr"> 289 </span>  <span class="Conceal">¦</span> x <span class="Special">&lt;-</span> append x, c
+<span id="L290" class="LineNr"> 290 </span>  <span class="Conceal">¦</span> s3:text <span class="Special">&lt;-</span> get *x, <span class="Constant">data:offset</span>
+<span id="L291" class="LineNr"> 291 </span>  <span class="Conceal">¦</span> 20:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> equal s1, s3
+<span id="L292" class="LineNr"> 292 </span>  <span class="Conceal">¦</span> 21:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> get *x, <span class="Constant">length:offset</span>
+<span id="L293" class="LineNr"> 293 </span>  <span class="Conceal">¦</span> 30:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *s3
+<span id="L294" class="LineNr"> 294 </span>  ]
+<span id="L295" class="LineNr"> 295 </span>  memory-should-contain [
+<span id="L296" class="LineNr"> 296 </span>  <span class="Conceal">¦</span> <span class="Comment"># before +buffer-filled</span>
+<span id="L297" class="LineNr"> 297 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>   <span class="Comment"># no change in data pointer after original append</span>
+<span id="L298" class="LineNr"> 298 </span>  <span class="Conceal">¦</span><span class="Constant"> 11</span> <span class="Special">&lt;-</span><span class="Constant"> 3</span>   <span class="Comment"># size of data</span>
+<span id="L299" class="LineNr"> 299 </span>  <span class="Conceal">¦</span><span class="Constant"> 12</span> <span class="Special">&lt;-</span><span class="Constant"> 97</span>  <span class="Comment"># data</span>
+<span id="L300" class="LineNr"> 300 </span>  <span class="Conceal">¦</span><span class="Constant"> 13</span> <span class="Special">&lt;-</span><span class="Constant"> 98</span>
+<span id="L301" class="LineNr"> 301 </span>  <span class="Conceal">¦</span><span class="Constant"> 14</span> <span class="Special">&lt;-</span><span class="Constant"> 99</span>
+<span id="L302" class="LineNr"> 302 </span>  <span class="Conceal">¦</span> <span class="Comment"># in the end</span>
+<span id="L303" class="LineNr"> 303 </span>  <span class="Conceal">¦</span><span class="Constant"> 20</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>   <span class="Comment"># data pointer has grown after second append</span>
+<span id="L304" class="LineNr"> 304 </span>  <span class="Conceal">¦</span><span class="Constant"> 21</span> <span class="Special">&lt;-</span><span class="Constant"> 4</span>   <span class="Comment"># final length</span>
+<span id="L305" class="LineNr"> 305 </span>  <span class="Conceal">¦</span><span class="Constant"> 30</span> <span class="Special">&lt;-</span><span class="Constant"> 6</span>   <span class="Comment"># but data's capacity has doubled</span>
+<span id="L306" class="LineNr"> 306 </span>  <span class="Conceal">¦</span><span class="Constant"> 31</span> <span class="Special">&lt;-</span><span class="Constant"> 97</span>  <span class="Comment"># data</span>
+<span id="L307" class="LineNr"> 307 </span>  <span class="Conceal">¦</span><span class="Constant"> 32</span> <span class="Special">&lt;-</span><span class="Constant"> 98</span>
+<span id="L308" class="LineNr"> 308 </span>  <span class="Conceal">¦</span><span class="Constant"> 33</span> <span class="Special">&lt;-</span><span class="Constant"> 99</span>
+<span id="L309" class="LineNr"> 309 </span>  <span class="Conceal">¦</span><span class="Constant"> 34</span> <span class="Special">&lt;-</span><span class="Constant"> 100</span>
+<span id="L310" class="LineNr"> 310 </span>  <span class="Conceal">¦</span><span class="Constant"> 35</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
+<span id="L311" class="LineNr"> 311 </span>  <span class="Conceal">¦</span><span class="Constant"> 36</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
+<span id="L312" class="LineNr"> 312 </span>  ]
+<span id="L313" class="LineNr"> 313 </span>]
+<span id="L314" class="LineNr"> 314 </span>
+<span id="L315" class="LineNr"> 315 </span><span class="muScenario">scenario</span> buffer-append-handles-backspace [
+<span id="L316" class="LineNr"> 316 </span>  <span class="Constant">local-scope</span>
+<span id="L317" class="LineNr"> 317 </span>  x:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L125'>new-buffer</a>
+<span id="L318" class="LineNr"> 318 </span>  x <span class="Special">&lt;-</span> append x, <span class="Constant">[ab]</span>
+<span id="L319" class="LineNr"> 319 </span>  run [
+<span id="L320" class="LineNr"> 320 </span>  <span class="Conceal">¦</span> c:char <span class="Special">&lt;-</span> copy <span class="Constant">8/backspace</span>
+<span id="L321" class="LineNr"> 321 </span>  <span class="Conceal">¦</span> x <span class="Special">&lt;-</span> append x, c
+<span id="L322" class="LineNr"> 322 </span>  <span class="Conceal">¦</span> s:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L338'>buffer-to-array</a> x
+<span id="L323" class="LineNr"> 323 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *s
+<span id="L324" class="LineNr"> 324 </span>  ]
+<span id="L325" class="LineNr"> 325 </span>  memory-should-contain [
+<span id="L326" class="LineNr"> 326 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>   <span class="Comment"># length</span>
+<span id="L327" class="LineNr"> 327 </span>  <span class="Conceal">¦</span><span class="Constant"> 11</span> <span class="Special">&lt;-</span><span class="Constant"> 97</span>  <span class="Comment"># contents</span>
+<span id="L328" class="LineNr"> 328 </span>  <span class="Conceal">¦</span><span class="Constant"> 12</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
+<span id="L329" class="LineNr"> 329 </span>  ]
+<span id="L330" class="LineNr"> 330 </span>]
+<span id="L331" class="LineNr"> 331 </span>
+<span id="L332" class="LineNr"> 332 </span><span class="muScenario">scenario</span> append-to-buffer-of-non-characters [
+<span id="L333" class="LineNr"> 333 </span>  <span class="Constant">local-scope</span>
+<span id="L334" class="LineNr"> 334 </span>  x:&amp;:<a href='061text.mu.html#L120'>buffer</a>:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L125'>new-buffer</a> <span class="Constant">1/capacity</span>
+<span id="L335" class="LineNr"> 335 </span>  <span class="Comment"># no errors</span>
 <span id="L336" class="LineNr"> 336 </span>]
 <span id="L337" class="LineNr"> 337 </span>
-<span id="L338" class="LineNr"> 338 </span><span class="muScenario">scenario</span> append-to-buffer-of-non-characters [
+<span id="L338" class="LineNr"> 338 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L338'>buffer-to-array</a> in:&amp;:<a href='061text.mu.html#L120'>buffer</a>:_elem<span class="muRecipe"> -&gt; </span>result:&amp;:@:_elem [
 <span id="L339" class="LineNr"> 339 </span>  <span class="Constant">local-scope</span>
-<span id="L340" class="LineNr"> 340 </span>  x:&amp;:<a href='061text.mu.html#L126'>buffer</a>:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L131'>new-buffer</a> <span class="Constant">1/capacity</span>
-<span id="L341" class="LineNr"> 341 </span>  <span class="Comment"># no errors</span>
-<span id="L342" class="LineNr"> 342 </span>]
-<span id="L343" class="LineNr"> 343 </span>
-<span id="L344" class="LineNr"> 344 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L344'>buffer-to-array</a> in:&amp;:<a href='061text.mu.html#L126'>buffer</a>:_elem<span class="muRecipe"> -&gt; </span>result:&amp;:@:_elem [
-<span id="L345" class="LineNr"> 345 </span>  <span class="Constant">local-scope</span>
-<span id="L346" class="LineNr"> 346 </span>  <span class="Constant">load-ingredients</span>
-<span id="L347" class="LineNr"> 347 </span>  <span class="Delimiter">{</span>
-<span id="L348" class="LineNr"> 348 </span>  <span class="Conceal">¦</span> <span class="Comment"># propagate null buffer</span>
-<span id="L349" class="LineNr"> 349 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> in
-<span id="L350" class="LineNr"> 350 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span><span class="Constant"> 0</span>
-<span id="L351" class="LineNr"> 351 </span>  <span class="Delimiter">}</span>
-<span id="L352" class="LineNr"> 352 </span>  len:num <span class="Special">&lt;-</span> get *in, <span class="Constant">length:offset</span>
-<span id="L353" class="LineNr"> 353 </span>  s:&amp;:@:_elem <span class="Special">&lt;-</span> get *in, <span class="Constant">data:offset</span>
-<span id="L354" class="LineNr"> 354 </span>  <span class="Comment"># we can't just return s because it is usually the wrong length</span>
-<span id="L355" class="LineNr"> 355 </span>  result <span class="Special">&lt;-</span> new <span class="Constant">_elem:type</span>, len
-<span id="L356" class="LineNr"> 356 </span>  i:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
-<span id="L357" class="LineNr"> 357 </span>  <span class="Delimiter">{</span>
-<span id="L358" class="LineNr"> 358 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-or-equal i, len
-<span id="L359" class="LineNr"> 359 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
-<span id="L360" class="LineNr"> 360 </span>  <span class="Conceal">¦</span> src:_elem <span class="Special">&lt;-</span> index *s, i
-<span id="L361" class="LineNr"> 361 </span>  <span class="Conceal">¦</span> *result <span class="Special">&lt;-</span> put-index *result, i, src
-<span id="L362" class="LineNr"> 362 </span>  <span class="Conceal">¦</span> i <span class="Special">&lt;-</span> add i,<span class="Constant"> 1</span>
-<span id="L363" class="LineNr"> 363 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</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 id="L367" class="LineNr"> 367 </span><span class="Comment"># Append any number of texts together.</span>
-<span id="L368" class="LineNr"> 368 </span><span class="Comment"># A later layer also translates calls to this to implicitly call to-text, so</span>
-<span id="L369" class="LineNr"> 369 </span><span class="Comment"># append to string becomes effectively dynamically typed.</span>
-<span id="L370" class="LineNr"> 370 </span><span class="Comment">#</span>
-<span id="L371" class="LineNr"> 371 </span><span class="Comment"># Beware though: this hack restricts how much 'append' can be overridden. Any</span>
-<span id="L372" class="LineNr"> 372 </span><span class="Comment"># new variants that match:</span>
-<span id="L373" class="LineNr"> 373 </span><span class="Comment">#   append _:text, ___</span>
-<span id="L374" class="LineNr"> 374 </span><span class="Comment"># will never ever get used.</span>
-<span id="L375" class="LineNr"> 375 </span><span class="muRecipe">def</span> append first:text<span class="muRecipe"> -&gt; </span>result:text [
-<span id="L376" class="LineNr"> 376 </span>  <span class="Constant">local-scope</span>
-<span id="L377" class="LineNr"> 377 </span>  <span class="Constant">load-ingredients</span>
-<span id="L378" class="LineNr"> 378 </span>  buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L131'>new-buffer</a><span class="Constant"> 30</span>
-<span id="L379" class="LineNr"> 379 </span>  <span class="Comment"># append first ingredient</span>
-<span id="L380" class="LineNr"> 380 </span>  <span class="Delimiter">{</span>
-<span id="L381" class="LineNr"> 381 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> first
-<span id="L382" class="LineNr"> 382 </span>  <span class="Conceal">¦</span> buf <span class="Special">&lt;-</span> append buf, first
-<span id="L383" class="LineNr"> 383 </span>  <span class="Delimiter">}</span>
-<span id="L384" class="LineNr"> 384 </span>  <span class="Comment"># append remaining ingredients</span>
-<span id="L385" class="LineNr"> 385 </span>  <span class="Delimiter">{</span>
-<span id="L386" class="LineNr"> 386 </span>  <span class="Conceal">¦</span> arg:text, arg-found?:bool <span class="Special">&lt;-</span> <span class="Constant">next-ingredient</span>
-<span id="L387" class="LineNr"> 387 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> arg-found?
-<span id="L388" class="LineNr"> 388 </span>  <span class="Conceal">¦</span> <span class="muControl">loop-unless</span> arg
-<span id="L389" class="LineNr"> 389 </span>  <span class="Conceal">¦</span> buf <span class="Special">&lt;-</span> append buf, arg
-<span id="L390" class="LineNr"> 390 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
-<span id="L391" class="LineNr"> 391 </span>  <span class="Delimiter">}</span>
-<span id="L392" class="LineNr"> 392 </span>  result <span class="Special">&lt;-</span> <a href='061text.mu.html#L344'>buffer-to-array</a> buf
-<span id="L393" class="LineNr"> 393 </span>]
-<span id="L394" class="LineNr"> 394 </span>
-<span id="L395" class="LineNr"> 395 </span><span class="muScenario">scenario</span> text-append-1 [
-<span id="L396" class="LineNr"> 396 </span>  <span class="Constant">local-scope</span>
-<span id="L397" class="LineNr"> 397 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[hello,]</span>
-<span id="L398" class="LineNr"> 398 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[ world!]</span>
-<span id="L399" class="LineNr"> 399 </span>  run [
-<span id="L400" class="LineNr"> 400 </span>  <span class="Conceal">¦</span> z:text <span class="Special">&lt;-</span> append x, y
-<span id="L401" class="LineNr"> 401 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *z
-<span id="L402" class="LineNr"> 402 </span>  ]
-<span id="L403" class="LineNr"> 403 </span>  memory-should-contain [
-<span id="L404" class="LineNr"> 404 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[hello, world!]</span>
-<span id="L405" class="LineNr"> 405 </span>  ]
-<span id="L406" class="LineNr"> 406 </span>]
-<span id="L407" class="LineNr"> 407 </span>
-<span id="L408" class="LineNr"> 408 </span><span class="muScenario">scenario</span> text-append-null [
-<span id="L409" class="LineNr"> 409 </span>  <span class="Constant">local-scope</span>
-<span id="L410" class="LineNr"> 410 </span>  x:text <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
-<span id="L411" class="LineNr"> 411 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[ world!]</span>
-<span id="L412" class="LineNr"> 412 </span>  run [
-<span id="L413" class="LineNr"> 413 </span>  <span class="Conceal">¦</span> z:text <span class="Special">&lt;-</span> append x, y
-<span id="L414" class="LineNr"> 414 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *z
-<span id="L415" class="LineNr"> 415 </span>  ]
-<span id="L416" class="LineNr"> 416 </span>  memory-should-contain [
-<span id="L417" class="LineNr"> 417 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[ world!]</span>
-<span id="L418" class="LineNr"> 418 </span>  ]
-<span id="L419" class="LineNr"> 419 </span>]
-<span id="L420" class="LineNr"> 420 </span>
-<span id="L421" class="LineNr"> 421 </span><span class="muScenario">scenario</span> text-append-null-2 [
-<span id="L422" class="LineNr"> 422 </span>  <span class="Constant">local-scope</span>
-<span id="L423" class="LineNr"> 423 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[hello,]</span>
-<span id="L424" class="LineNr"> 424 </span>  y:text <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
-<span id="L425" class="LineNr"> 425 </span>  run [
-<span id="L426" class="LineNr"> 426 </span>  <span class="Conceal">¦</span> z:text <span class="Special">&lt;-</span> append x, y
-<span id="L427" class="LineNr"> 427 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *z
-<span id="L428" class="LineNr"> 428 </span>  ]
-<span id="L429" class="LineNr"> 429 </span>  memory-should-contain [
-<span id="L430" class="LineNr"> 430 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[hello,]</span>
-<span id="L431" class="LineNr"> 431 </span>  ]
-<span id="L432" class="LineNr"> 432 </span>]
-<span id="L433" class="LineNr"> 433 </span>
-<span id="L434" class="LineNr"> 434 </span><span class="muScenario">scenario</span> text-append-multiary [
-<span id="L435" class="LineNr"> 435 </span>  <span class="Constant">local-scope</span>
-<span id="L436" class="LineNr"> 436 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[hello, ]</span>
-<span id="L437" class="LineNr"> 437 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[world]</span>
-<span id="L438" class="LineNr"> 438 </span>  z:text <span class="Special">&lt;-</span> new <span class="Constant">[!]</span>
-<span id="L439" class="LineNr"> 439 </span>  run [
-<span id="L440" class="LineNr"> 440 </span>  <span class="Conceal">¦</span> z:text <span class="Special">&lt;-</span> append x, y, z
-<span id="L441" class="LineNr"> 441 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *z
-<span id="L442" class="LineNr"> 442 </span>  ]
-<span id="L443" class="LineNr"> 443 </span>  memory-should-contain [
-<span id="L444" class="LineNr"> 444 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[hello, world!]</span>
+<span id="L340" class="LineNr"> 340 </span>  <span class="Constant">load-ingredients</span>
+<span id="L341" class="LineNr"> 341 </span>  <span class="Comment"># propagate null buffer</span>
+<span id="L342" class="LineNr"> 342 </span>  <span class="muControl">return-unless</span> in,<span class="Constant"> 0</span>
+<span id="L343" class="LineNr"> 343 </span>  len:num <span class="Special">&lt;-</span> get *in, <span class="Constant">length:offset</span>
+<span id="L344" class="LineNr"> 344 </span>  s:&amp;:@:_elem <span class="Special">&lt;-</span> get *in, <span class="Constant">data:offset</span>
+<span id="L345" class="LineNr"> 345 </span>  <span class="Comment"># we can't just return s because it is usually the wrong length</span>
+<span id="L346" class="LineNr"> 346 </span>  result <span class="Special">&lt;-</span> new <span class="Constant">_elem:type</span>, len
+<span id="L347" class="LineNr"> 347 </span>  i:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
+<span id="L348" class="LineNr"> 348 </span>  <span class="Delimiter">{</span>
+<span id="L349" class="LineNr"> 349 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-or-equal i, len
+<span id="L350" class="LineNr"> 350 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
+<span id="L351" class="LineNr"> 351 </span>  <span class="Conceal">¦</span> src:_elem <span class="Special">&lt;-</span> index *s, i
+<span id="L352" class="LineNr"> 352 </span>  <span class="Conceal">¦</span> *result <span class="Special">&lt;-</span> put-index *result, i, src
+<span id="L353" class="LineNr"> 353 </span>  <span class="Conceal">¦</span> i <span class="Special">&lt;-</span> add i,<span class="Constant"> 1</span>
+<span id="L354" class="LineNr"> 354 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
+<span id="L355" class="LineNr"> 355 </span>  <span class="Delimiter">}</span>
+<span id="L356" class="LineNr"> 356 </span>]
+<span id="L357" class="LineNr"> 357 </span>
+<span id="L358" class="LineNr"> 358 </span><span class="Comment"># Append any number of texts together.</span>
+<span id="L359" class="LineNr"> 359 </span><span class="Comment"># A later layer also translates calls to this to implicitly call to-text, so</span>
+<span id="L360" class="LineNr"> 360 </span><span class="Comment"># append to string becomes effectively dynamically typed.</span>
+<span id="L361" class="LineNr"> 361 </span><span class="Comment">#</span>
+<span id="L362" class="LineNr"> 362 </span><span class="Comment"># Beware though: this hack restricts how much 'append' can be overridden. Any</span>
+<span id="L363" class="LineNr"> 363 </span><span class="Comment"># new variants that match:</span>
+<span id="L364" class="LineNr"> 364 </span><span class="Comment">#   append _:text, ___</span>
+<span id="L365" class="LineNr"> 365 </span><span class="Comment"># will never ever get used.</span>
+<span id="L366" class="LineNr"> 366 </span><span class="muRecipe">def</span> append first:text<span class="muRecipe"> -&gt; </span>result:text [
+<span id="L367" class="LineNr"> 367 </span>  <span class="Constant">local-scope</span>
+<span id="L368" class="LineNr"> 368 </span>  <span class="Constant">load-ingredients</span>
+<span id="L369" class="LineNr"> 369 </span>  buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L125'>new-buffer</a><span class="Constant"> 30</span>
+<span id="L370" class="LineNr"> 370 </span>  <span class="Comment"># append first ingredient</span>
+<span id="L371" class="LineNr"> 371 </span>  <span class="Delimiter">{</span>
+<span id="L372" class="LineNr"> 372 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> first
+<span id="L373" class="LineNr"> 373 </span>  <span class="Conceal">¦</span> buf <span class="Special">&lt;-</span> append buf, first
+<span id="L374" class="LineNr"> 374 </span>  <span class="Delimiter">}</span>
+<span id="L375" class="LineNr"> 375 </span>  <span class="Comment"># append remaining ingredients</span>
+<span id="L376" class="LineNr"> 376 </span>  <span class="Delimiter">{</span>
+<span id="L377" class="LineNr"> 377 </span>  <span class="Conceal">¦</span> arg:text, arg-found?:bool <span class="Special">&lt;-</span> <span class="Constant">next-ingredient</span>
+<span id="L378" class="LineNr"> 378 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> arg-found?
+<span id="L379" class="LineNr"> 379 </span>  <span class="Conceal">¦</span> <span class="muControl">loop-unless</span> arg
+<span id="L380" class="LineNr"> 380 </span>  <span class="Conceal">¦</span> buf <span class="Special">&lt;-</span> append buf, arg
+<span id="L381" class="LineNr"> 381 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
+<span id="L382" class="LineNr"> 382 </span>  <span class="Delimiter">}</span>
+<span id="L383" class="LineNr"> 383 </span>  result <span class="Special">&lt;-</span> <a href='061text.mu.html#L338'>buffer-to-array</a> buf
+<span id="L384" class="LineNr"> 384 </span>]
+<span id="L385" class="LineNr"> 385 </span>
+<span id="L386" class="LineNr"> 386 </span><span class="muScenario">scenario</span> text-append-1 [
+<span id="L387" class="LineNr"> 387 </span>  <span class="Constant">local-scope</span>
+<span id="L388" class="LineNr"> 388 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[hello,]</span>
+<span id="L389" class="LineNr"> 389 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[ world!]</span>
+<span id="L390" class="LineNr"> 390 </span>  run [
+<span id="L391" class="LineNr"> 391 </span>  <span class="Conceal">¦</span> z:text <span class="Special">&lt;-</span> append x, y
+<span id="L392" class="LineNr"> 392 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *z
+<span id="L393" class="LineNr"> 393 </span>  ]
+<span id="L394" class="LineNr"> 394 </span>  memory-should-contain [
+<span id="L395" class="LineNr"> 395 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[hello, world!]</span>
+<span id="L396" class="LineNr"> 396 </span>  ]
+<span id="L397" class="LineNr"> 397 </span>]
+<span id="L398" class="LineNr"> 398 </span>
+<span id="L399" class="LineNr"> 399 </span><span class="muScenario">scenario</span> text-append-null [
+<span id="L400" class="LineNr"> 400 </span>  <span class="Constant">local-scope</span>
+<span id="L401" class="LineNr"> 401 </span>  x:text <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
+<span id="L402" class="LineNr"> 402 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[ world!]</span>
+<span id="L403" class="LineNr"> 403 </span>  run [
+<span id="L404" class="LineNr"> 404 </span>  <span class="Conceal">¦</span> z:text <span class="Special">&lt;-</span> append x, y
+<span id="L405" class="LineNr"> 405 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *z
+<span id="L406" class="LineNr"> 406 </span>  ]
+<span id="L407" class="LineNr"> 407 </span>  memory-should-contain [
+<span id="L408" class="LineNr"> 408 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[ world!]</span>
+<span id="L409" class="LineNr"> 409 </span>  ]
+<span id="L410" class="LineNr"> 410 </span>]
+<span id="L411" class="LineNr"> 411 </span>
+<span id="L412" class="LineNr"> 412 </span><span class="muScenario">scenario</span> text-append-null-2 [
+<span id="L413" class="LineNr"> 413 </span>  <span class="Constant">local-scope</span>
+<span id="L414" class="LineNr"> 414 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[hello,]</span>
+<span id="L415" class="LineNr"> 415 </span>  y:text <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
+<span id="L416" class="LineNr"> 416 </span>  run [
+<span id="L417" class="LineNr"> 417 </span>  <span class="Conceal">¦</span> z:text <span class="Special">&lt;-</span> append x, y
+<span id="L418" class="LineNr"> 418 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *z
+<span id="L419" class="LineNr"> 419 </span>  ]
+<span id="L420" class="LineNr"> 420 </span>  memory-should-contain [
+<span id="L421" class="LineNr"> 421 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[hello,]</span>
+<span id="L422" class="LineNr"> 422 </span>  ]
+<span id="L423" class="LineNr"> 423 </span>]
+<span id="L424" class="LineNr"> 424 </span>
+<span id="L425" class="LineNr"> 425 </span><span class="muScenario">scenario</span> text-append-multiary [
+<span id="L426" class="LineNr"> 426 </span>  <span class="Constant">local-scope</span>
+<span id="L427" class="LineNr"> 427 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[hello, ]</span>
+<span id="L428" class="LineNr"> 428 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[world]</span>
+<span id="L429" class="LineNr"> 429 </span>  z:text <span class="Special">&lt;-</span> new <span class="Constant">[!]</span>
+<span id="L430" class="LineNr"> 430 </span>  run [
+<span id="L431" class="LineNr"> 431 </span>  <span class="Conceal">¦</span> z:text <span class="Special">&lt;-</span> append x, y, z
+<span id="L432" class="LineNr"> 432 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *z
+<span id="L433" class="LineNr"> 433 </span>  ]
+<span id="L434" class="LineNr"> 434 </span>  memory-should-contain [
+<span id="L435" class="LineNr"> 435 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[hello, world!]</span>
+<span id="L436" class="LineNr"> 436 </span>  ]
+<span id="L437" class="LineNr"> 437 </span>]
+<span id="L438" class="LineNr"> 438 </span>
+<span id="L439" class="LineNr"> 439 </span><span class="muScenario">scenario</span> replace-character-in-text [
+<span id="L440" class="LineNr"> 440 </span>  <span class="Constant">local-scope</span>
+<span id="L441" class="LineNr"> 441 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L442" class="LineNr"> 442 </span>  run [
+<span id="L443" class="LineNr"> 443 </span>  <span class="Conceal">¦</span> x <span class="Special">&lt;-</span> <a href='061text.mu.html#L451'>replace</a> x, <span class="Constant">98/b</span>, <span class="Constant">122/z</span>
+<span id="L444" class="LineNr"> 444 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *x
 <span id="L445" class="LineNr"> 445 </span>  ]
-<span id="L446" class="LineNr"> 446 </span>]
-<span id="L447" class="LineNr"> 447 </span>
-<span id="L448" class="LineNr"> 448 </span><span class="muScenario">scenario</span> replace-character-in-text [
-<span id="L449" class="LineNr"> 449 </span>  <span class="Constant">local-scope</span>
-<span id="L450" class="LineNr"> 450 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L451" class="LineNr"> 451 </span>  run [
-<span id="L452" class="LineNr"> 452 </span>  <span class="Conceal">¦</span> x <span class="Special">&lt;-</span> <a href='061text.mu.html#L460'>replace</a> x, <span class="Constant">98/b</span>, <span class="Constant">122/z</span>
-<span id="L453" class="LineNr"> 453 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *x
-<span id="L454" class="LineNr"> 454 </span>  ]
-<span id="L455" class="LineNr"> 455 </span>  memory-should-contain [
-<span id="L456" class="LineNr"> 456 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[azc]</span>
-<span id="L457" class="LineNr"> 457 </span>  ]
-<span id="L458" class="LineNr"> 458 </span>]
-<span id="L459" class="LineNr"> 459 </span>
-<span id="L460" class="LineNr"> 460 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L460'>replace</a> s:text, oldc:char, newc:char, from:num/optional<span class="muRecipe"> -&gt; </span>s:text [
-<span id="L461" class="LineNr"> 461 </span>  <span class="Constant">local-scope</span>
-<span id="L462" class="LineNr"> 462 </span>  <span class="Constant">load-ingredients</span>
-<span id="L463" class="LineNr"> 463 </span>  len:num <span class="Special">&lt;-</span> length *s
-<span id="L464" class="LineNr"> 464 </span>  i:num <span class="Special">&lt;-</span> find-next s, oldc, from
-<span id="L465" class="LineNr"> 465 </span>  done?:bool <span class="Special">&lt;-</span> greater-or-equal i, len
-<span id="L466" class="LineNr"> 466 </span>  <span class="muControl">return-if</span> done?
-<span id="L467" class="LineNr"> 467 </span>  *s <span class="Special">&lt;-</span> put-index *s, i, newc
-<span id="L468" class="LineNr"> 468 </span>  i <span class="Special">&lt;-</span> add i,<span class="Constant"> 1</span>
-<span id="L469" class="LineNr"> 469 </span>  s <span class="Special">&lt;-</span> <a href='061text.mu.html#L460'>replace</a> s, oldc, newc, i
-<span id="L470" class="LineNr"> 470 </span>]
-<span id="L471" class="LineNr"> 471 </span>
-<span id="L472" class="LineNr"> 472 </span><span class="muScenario">scenario</span> replace-character-at-start [
-<span id="L473" class="LineNr"> 473 </span>  <span class="Constant">local-scope</span>
-<span id="L474" class="LineNr"> 474 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L475" class="LineNr"> 475 </span>  run [
-<span id="L476" class="LineNr"> 476 </span>  <span class="Conceal">¦</span> x <span class="Special">&lt;-</span> <a href='061text.mu.html#L460'>replace</a> x, <span class="Constant">97/a</span>, <span class="Constant">122/z</span>
-<span id="L477" class="LineNr"> 477 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *x
-<span id="L478" class="LineNr"> 478 </span>  ]
-<span id="L479" class="LineNr"> 479 </span>  memory-should-contain [
-<span id="L480" class="LineNr"> 480 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[zbc]</span>
+<span id="L446" class="LineNr"> 446 </span>  memory-should-contain [
+<span id="L447" class="LineNr"> 447 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[azc]</span>
+<span id="L448" class="LineNr"> 448 </span>  ]
+<span id="L449" class="LineNr"> 449 </span>]
+<span id="L450" class="LineNr"> 450 </span>
+<span id="L451" class="LineNr"> 451 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L451'>replace</a> s:text, oldc:char, newc:char, from:num/optional<span class="muRecipe"> -&gt; </span>s:text [
+<span id="L452" class="LineNr"> 452 </span>  <span class="Constant">local-scope</span>
+<span id="L453" class="LineNr"> 453 </span>  <span class="Constant">load-ingredients</span>
+<span id="L454" class="LineNr"> 454 </span>  len:num <span class="Special">&lt;-</span> length *s
+<span id="L455" class="LineNr"> 455 </span>  i:num <span class="Special">&lt;-</span> find-next s, oldc, from
+<span id="L456" class="LineNr"> 456 </span>  done?:bool <span class="Special">&lt;-</span> greater-or-equal i, len
+<span id="L457" class="LineNr"> 457 </span>  <span class="muControl">return-if</span> done?
+<span id="L458" class="LineNr"> 458 </span>  *s <span class="Special">&lt;-</span> put-index *s, i, newc
+<span id="L459" class="LineNr"> 459 </span>  i <span class="Special">&lt;-</span> add i,<span class="Constant"> 1</span>
+<span id="L460" class="LineNr"> 460 </span>  s <span class="Special">&lt;-</span> <a href='061text.mu.html#L451'>replace</a> s, oldc, newc, i
+<span id="L461" class="LineNr"> 461 </span>]
+<span id="L462" class="LineNr"> 462 </span>
+<span id="L463" class="LineNr"> 463 </span><span class="muScenario">scenario</span> replace-character-at-start [
+<span id="L464" class="LineNr"> 464 </span>  <span class="Constant">local-scope</span>
+<span id="L465" class="LineNr"> 465 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L466" class="LineNr"> 466 </span>  run [
+<span id="L467" class="LineNr"> 467 </span>  <span class="Conceal">¦</span> x <span class="Special">&lt;-</span> <a href='061text.mu.html#L451'>replace</a> x, <span class="Constant">97/a</span>, <span class="Constant">122/z</span>
+<span id="L468" class="LineNr"> 468 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *x
+<span id="L469" class="LineNr"> 469 </span>  ]
+<span id="L470" class="LineNr"> 470 </span>  memory-should-contain [
+<span id="L471" class="LineNr"> 471 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[zbc]</span>
+<span id="L472" class="LineNr"> 472 </span>  ]
+<span id="L473" class="LineNr"> 473 </span>]
+<span id="L474" class="LineNr"> 474 </span>
+<span id="L475" class="LineNr"> 475 </span><span class="muScenario">scenario</span> replace-character-at-end [
+<span id="L476" class="LineNr"> 476 </span>  <span class="Constant">local-scope</span>
+<span id="L477" class="LineNr"> 477 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L478" class="LineNr"> 478 </span>  run [
+<span id="L479" class="LineNr"> 479 </span>  <span class="Conceal">¦</span> x <span class="Special">&lt;-</span> <a href='061text.mu.html#L451'>replace</a> x, <span class="Constant">99/c</span>, <span class="Constant">122/z</span>
+<span id="L480" class="LineNr"> 480 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *x
 <span id="L481" class="LineNr"> 481 </span>  ]
-<span id="L482" class="LineNr"> 482 </span>]
-<span id="L483" class="LineNr"> 483 </span>
-<span id="L484" class="LineNr"> 484 </span><span class="muScenario">scenario</span> replace-character-at-end [
-<span id="L485" class="LineNr"> 485 </span>  <span class="Constant">local-scope</span>
-<span id="L486" class="LineNr"> 486 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L487" class="LineNr"> 487 </span>  run [
-<span id="L488" class="LineNr"> 488 </span>  <span class="Conceal">¦</span> x <span class="Special">&lt;-</span> <a href='061text.mu.html#L460'>replace</a> x, <span class="Constant">99/c</span>, <span class="Constant">122/z</span>
-<span id="L489" class="LineNr"> 489 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *x
-<span id="L490" class="LineNr"> 490 </span>  ]
-<span id="L491" class="LineNr"> 491 </span>  memory-should-contain [
-<span id="L492" class="LineNr"> 492 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[abz]</span>
+<span id="L482" class="LineNr"> 482 </span>  memory-should-contain [
+<span id="L483" class="LineNr"> 483 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[abz]</span>
+<span id="L484" class="LineNr"> 484 </span>  ]
+<span id="L485" class="LineNr"> 485 </span>]
+<span id="L486" class="LineNr"> 486 </span>
+<span id="L487" class="LineNr"> 487 </span><span class="muScenario">scenario</span> replace-character-missing [
+<span id="L488" class="LineNr"> 488 </span>  <span class="Constant">local-scope</span>
+<span id="L489" class="LineNr"> 489 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L490" class="LineNr"> 490 </span>  run [
+<span id="L491" class="LineNr"> 491 </span>  <span class="Conceal">¦</span> x <span class="Special">&lt;-</span> <a href='061text.mu.html#L451'>replace</a> x, <span class="Constant">100/d</span>, <span class="Constant">122/z</span>
+<span id="L492" class="LineNr"> 492 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *x
 <span id="L493" class="LineNr"> 493 </span>  ]
-<span id="L494" class="LineNr"> 494 </span>]
-<span id="L495" class="LineNr"> 495 </span>
-<span id="L496" class="LineNr"> 496 </span><span class="muScenario">scenario</span> replace-character-missing [
-<span id="L497" class="LineNr"> 497 </span>  <span class="Constant">local-scope</span>
-<span id="L498" class="LineNr"> 498 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L499" class="LineNr"> 499 </span>  run [
-<span id="L500" class="LineNr"> 500 </span>  <span class="Conceal">¦</span> x <span class="Special">&lt;-</span> <a href='061text.mu.html#L460'>replace</a> x, <span class="Constant">100/d</span>, <span class="Constant">122/z</span>
-<span id="L501" class="LineNr"> 501 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *x
-<span id="L502" class="LineNr"> 502 </span>  ]
-<span id="L503" class="LineNr"> 503 </span>  memory-should-contain [
-<span id="L504" class="LineNr"> 504 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[abc]</span>
+<span id="L494" class="LineNr"> 494 </span>  memory-should-contain [
+<span id="L495" class="LineNr"> 495 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[abc]</span>
+<span id="L496" class="LineNr"> 496 </span>  ]
+<span id="L497" class="LineNr"> 497 </span>]
+<span id="L498" class="LineNr"> 498 </span>
+<span id="L499" class="LineNr"> 499 </span><span class="muScenario">scenario</span> replace-all-characters [
+<span id="L500" class="LineNr"> 500 </span>  <span class="Constant">local-scope</span>
+<span id="L501" class="LineNr"> 501 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[banana]</span>
+<span id="L502" class="LineNr"> 502 </span>  run [
+<span id="L503" class="LineNr"> 503 </span>  <span class="Conceal">¦</span> x <span class="Special">&lt;-</span> <a href='061text.mu.html#L451'>replace</a> x, <span class="Constant">97/a</span>, <span class="Constant">122/z</span>
+<span id="L504" class="LineNr"> 504 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *x
 <span id="L505" class="LineNr"> 505 </span>  ]
-<span id="L506" class="LineNr"> 506 </span>]
-<span id="L507" class="LineNr"> 507 </span>
-<span id="L508" class="LineNr"> 508 </span><span class="muScenario">scenario</span> replace-all-characters [
-<span id="L509" class="LineNr"> 509 </span>  <span class="Constant">local-scope</span>
-<span id="L510" class="LineNr"> 510 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[banana]</span>
-<span id="L511" class="LineNr"> 511 </span>  run [
-<span id="L512" class="LineNr"> 512 </span>  <span class="Conceal">¦</span> x <span class="Special">&lt;-</span> <a href='061text.mu.html#L460'>replace</a> x, <span class="Constant">97/a</span>, <span class="Constant">122/z</span>
-<span id="L513" class="LineNr"> 513 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *x
-<span id="L514" class="LineNr"> 514 </span>  ]
-<span id="L515" class="LineNr"> 515 </span>  memory-should-contain [
-<span id="L516" class="LineNr"> 516 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[bznznz]</span>
-<span id="L517" class="LineNr"> 517 </span>  ]
-<span id="L518" class="LineNr"> 518 </span>]
-<span id="L519" class="LineNr"> 519 </span>
-<span id="L520" class="LineNr"> 520 </span><span class="Comment"># replace underscores in first with remaining args</span>
-<span id="L521" class="LineNr"> 521 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L521'>interpolate</a> template:text<span class="muRecipe"> -&gt; </span>result:text [
-<span id="L522" class="LineNr"> 522 </span>  <span class="Constant">local-scope</span>
-<span id="L523" class="LineNr"> 523 </span>  <span class="Constant">load-ingredients</span>  <span class="Comment"># consume just the template</span>
-<span id="L524" class="LineNr"> 524 </span>  <span class="Comment"># compute result-len, space to allocate for result</span>
-<span id="L525" class="LineNr"> 525 </span>  tem-len:num <span class="Special">&lt;-</span> length *template
-<span id="L526" class="LineNr"> 526 </span>  result-len:num <span class="Special">&lt;-</span> copy tem-len
-<span id="L527" class="LineNr"> 527 </span>  <span class="Delimiter">{</span>
-<span id="L528" class="LineNr"> 528 </span>  <span class="Conceal">¦</span> <span class="Comment"># while ingredients remain</span>
-<span id="L529" class="LineNr"> 529 </span>  <span class="Conceal">¦</span> a:text, arg-received?:bool <span class="Special">&lt;-</span> <span class="Constant">next-ingredient</span>
-<span id="L530" class="LineNr"> 530 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> arg-received?
-<span id="L531" class="LineNr"> 531 </span>  <span class="Conceal">¦</span> <span class="Comment"># result-len = result-len + arg.length - 1 (for the 'underscore' being replaced)</span>
-<span id="L532" class="LineNr"> 532 </span>  <span class="Conceal">¦</span> a-len:num <span class="Special">&lt;-</span> length *a
-<span id="L533" class="LineNr"> 533 </span>  <span class="Conceal">¦</span> result-len <span class="Special">&lt;-</span> add result-len, a-len
-<span id="L534" class="LineNr"> 534 </span>  <span class="Conceal">¦</span> result-len <span class="Special">&lt;-</span> subtract result-len,<span class="Constant"> 1</span>
-<span id="L535" class="LineNr"> 535 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
-<span id="L536" class="LineNr"> 536 </span>  <span class="Delimiter">}</span>
-<span id="L537" class="LineNr"> 537 </span>  <span class="Constant">rewind-ingredients</span>
-<span id="L538" class="LineNr"> 538 </span>  _ <span class="Special">&lt;-</span> <span class="Constant">next-ingredient</span>  <span class="Comment"># skip template</span>
-<span id="L539" class="LineNr"> 539 </span>  result <span class="Special">&lt;-</span> new <span class="Constant">character:type</span>, result-len
-<span id="L540" class="LineNr"> 540 </span>  <span class="Comment"># repeatedly copy sections of template and 'holes' into result</span>
-<span id="L541" class="LineNr"> 541 </span>  result-idx:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
-<span id="L542" class="LineNr"> 542 </span>  i:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
-<span id="L543" class="LineNr"> 543 </span>  <span class="Delimiter">{</span>
-<span id="L544" class="LineNr"> 544 </span>  <span class="Conceal">¦</span> <span class="Comment"># while arg received</span>
-<span id="L545" class="LineNr"> 545 </span>  <span class="Conceal">¦</span> a:text, arg-received?:bool <span class="Special">&lt;-</span> <span class="Constant">next-ingredient</span>
-<span id="L546" class="LineNr"> 546 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> arg-received?
-<span id="L547" class="LineNr"> 547 </span>  <span class="Conceal">¦</span> <span class="Comment"># copy template into result until '_'</span>
-<span id="L548" class="LineNr"> 548 </span>  <span class="Conceal">¦</span> <span class="Delimiter">{</span>
-<span id="L549" class="LineNr"> 549 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment"># while i &lt; template.length</span>
-<span id="L550" class="LineNr"> 550 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> tem-done?:bool <span class="Special">&lt;-</span> greater-or-equal i, tem-len
-<span id="L551" class="LineNr"> 551 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">break-if</span> tem-done?, <span class="Constant">+done</span>
-<span id="L552" class="LineNr"> 552 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment"># while template[i] != '_'</span>
-<span id="L553" class="LineNr"> 553 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> in:char <span class="Special">&lt;-</span> index *template, i
-<span id="L554" class="LineNr"> 554 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> underscore?:bool <span class="Special">&lt;-</span> equal in, <span class="Constant">95/_</span>
-<span id="L555" class="LineNr"> 555 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">break-if</span> underscore?
-<span id="L556" class="LineNr"> 556 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment"># result[result-idx] = template[i]</span>
-<span id="L557" class="LineNr"> 557 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> *result <span class="Special">&lt;-</span> put-index *result, result-idx, in
-<span id="L558" class="LineNr"> 558 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> i <span class="Special">&lt;-</span> add i,<span class="Constant"> 1</span>
-<span id="L559" class="LineNr"> 559 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> result-idx <span class="Special">&lt;-</span> add result-idx,<span class="Constant"> 1</span>
-<span id="L560" class="LineNr"> 560 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">loop</span>
-<span id="L561" class="LineNr"> 561 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L562" class="LineNr"> 562 </span>  <span class="Conceal">¦</span> <span class="Comment"># copy 'a' into result</span>
-<span id="L563" class="LineNr"> 563 </span>  <span class="Conceal">¦</span> j:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
-<span id="L564" class="LineNr"> 564 </span>  <span class="Conceal">¦</span> <span class="Delimiter">{</span>
-<span id="L565" class="LineNr"> 565 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment"># while j &lt; a.length</span>
-<span id="L566" class="LineNr"> 566 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> arg-done?:bool <span class="Special">&lt;-</span> greater-or-equal j, a-len
-<span id="L567" class="LineNr"> 567 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">break-if</span> arg-done?
-<span id="L568" class="LineNr"> 568 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment"># result[result-idx] = a[j]</span>
-<span id="L569" class="LineNr"> 569 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> in:char <span class="Special">&lt;-</span> index *a, j
-<span id="L570" class="LineNr"> 570 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> *result <span class="Special">&lt;-</span> put-index *result, result-idx, in
-<span id="L571" class="LineNr"> 571 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> j <span class="Special">&lt;-</span> add j,<span class="Constant"> 1</span>
-<span id="L572" class="LineNr"> 572 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> result-idx <span class="Special">&lt;-</span> add result-idx,<span class="Constant"> 1</span>
-<span id="L573" class="LineNr"> 573 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">loop</span>
-<span id="L574" class="LineNr"> 574 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L575" class="LineNr"> 575 </span>  <span class="Conceal">¦</span> <span class="Comment"># skip '_' in template</span>
-<span id="L576" class="LineNr"> 576 </span>  <span class="Conceal">¦</span> i <span class="Special">&lt;-</span> add i,<span class="Constant"> 1</span>
-<span id="L577" class="LineNr"> 577 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>  <span class="Comment"># interpolate next arg</span>
-<span id="L578" class="LineNr"> 578 </span>  <span class="Delimiter">}</span>
-<span id="L579" class="LineNr"> 579 </span><span class="Constant">  +done</span>
-<span id="L580" class="LineNr"> 580 </span>  <span class="Comment"># done with holes; copy rest of template directly into result</span>
-<span id="L581" class="LineNr"> 581 </span>  <span class="Delimiter">{</span>
-<span id="L582" class="LineNr"> 582 </span>  <span class="Conceal">¦</span> <span class="Comment"># while i &lt; template.length</span>
-<span id="L583" class="LineNr"> 583 </span>  <span class="Conceal">¦</span> tem-done?:bool <span class="Special">&lt;-</span> greater-or-equal i, tem-len
-<span id="L584" class="LineNr"> 584 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> tem-done?
-<span id="L585" class="LineNr"> 585 </span>  <span class="Conceal">¦</span> <span class="Comment"># result[result-idx] = template[i]</span>
-<span id="L586" class="LineNr"> 586 </span>  <span class="Conceal">¦</span> in:char <span class="Special">&lt;-</span> index *template, i
-<span id="L587" class="LineNr"> 587 </span>  <span class="Conceal">¦</span> *result <span class="Special">&lt;-</span> put-index *result, result-idx, in
-<span id="L588" class="LineNr"> 588 </span>  <span class="Conceal">¦</span> i <span class="Special">&lt;-</span> add i,<span class="Constant"> 1</span>
-<span id="L589" class="LineNr"> 589 </span>  <span class="Conceal">¦</span> result-idx <span class="Special">&lt;-</span> add result-idx,<span class="Constant"> 1</span>
-<span id="L590" class="LineNr"> 590 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
-<span id="L591" class="LineNr"> 591 </span>  <span class="Delimiter">}</span>
-<span id="L592" class="LineNr"> 592 </span>]
-<span id="L593" class="LineNr"> 593 </span>
-<span id="L594" class="LineNr"> 594 </span><span class="muScenario">scenario</span> interpolate-works [
-<span id="L595" class="LineNr"> 595 </span>  <span class="Constant">local-scope</span>
-<span id="L596" class="LineNr"> 596 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc_ghi]</span>
-<span id="L597" class="LineNr"> 597 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[def]</span>
-<span id="L598" class="LineNr"> 598 </span>  run [
-<span id="L599" class="LineNr"> 599 </span>  <span class="Conceal">¦</span> z:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L521'>interpolate</a> x, y
-<span id="L600" class="LineNr"> 600 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *z
-<span id="L601" class="LineNr"> 601 </span>  ]
-<span id="L602" class="LineNr"> 602 </span>  memory-should-contain [
-<span id="L603" class="LineNr"> 603 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[abcdefghi]</span>
-<span id="L604" class="LineNr"> 604 </span>  ]
-<span id="L605" class="LineNr"> 605 </span>]
-<span id="L606" class="LineNr"> 606 </span>
-<span id="L607" class="LineNr"> 607 </span><span class="muScenario">scenario</span> interpolate-at-start [
-<span id="L608" class="LineNr"> 608 </span>  <span class="Constant">local-scope</span>
-<span id="L609" class="LineNr"> 609 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[_, hello!]</span>
-<span id="L610" class="LineNr"> 610 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L611" class="LineNr"> 611 </span>  run [
-<span id="L612" class="LineNr"> 612 </span>  <span class="Conceal">¦</span> z:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L521'>interpolate</a> x, y
-<span id="L613" class="LineNr"> 613 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *z
-<span id="L614" class="LineNr"> 614 </span>  ]
-<span id="L615" class="LineNr"> 615 </span>  memory-should-contain [
-<span id="L616" class="LineNr"> 616 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[abc, hello!]</span>
-<span id="L617" class="LineNr"> 617 </span>  <span class="Conceal">¦</span><span class="Constant"> 22</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># out of bounds</span>
-<span id="L618" class="LineNr"> 618 </span>  ]
-<span id="L619" class="LineNr"> 619 </span>]
-<span id="L620" class="LineNr"> 620 </span>
-<span id="L621" class="LineNr"> 621 </span><span class="muScenario">scenario</span> interpolate-at-end [
-<span id="L622" class="LineNr"> 622 </span>  <span class="Constant">local-scope</span>
-<span id="L623" class="LineNr"> 623 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[hello, _]</span>
-<span id="L624" class="LineNr"> 624 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L625" class="LineNr"> 625 </span>  run [
-<span id="L626" class="LineNr"> 626 </span>  <span class="Conceal">¦</span> z:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L521'>interpolate</a> x, y
-<span id="L627" class="LineNr"> 627 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *z
-<span id="L628" class="LineNr"> 628 </span>  ]
-<span id="L629" class="LineNr"> 629 </span>  memory-should-contain [
-<span id="L630" class="LineNr"> 630 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[hello, abc]</span>
-<span id="L631" class="LineNr"> 631 </span>  ]
-<span id="L632" class="LineNr"> 632 </span>]
-<span id="L633" class="LineNr"> 633 </span>
-<span id="L634" class="LineNr"> 634 </span><span class="Comment"># result:bool &lt;- space? c:char</span>
-<span id="L635" class="LineNr"> 635 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L635'>space?</a> c:char<span class="muRecipe"> -&gt; </span>result:bool [
-<span id="L636" class="LineNr"> 636 </span>  <span class="Constant">local-scope</span>
-<span id="L637" class="LineNr"> 637 </span>  <span class="Constant">load-ingredients</span>
-<span id="L638" class="LineNr"> 638 </span>  <span class="Comment"># most common case first</span>
-<span id="L639" class="LineNr"> 639 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">32/space</span>
-<span id="L640" class="LineNr"> 640 </span>  <span class="muControl">return-if</span> result
-<span id="L641" class="LineNr"> 641 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">10/newline</span>
-<span id="L642" class="LineNr"> 642 </span>  <span class="muControl">return-if</span> result
-<span id="L643" class="LineNr"> 643 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">9/tab</span>
-<span id="L644" class="LineNr"> 644 </span>  <span class="muControl">return-if</span> result
-<span id="L645" class="LineNr"> 645 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">13/carriage-return</span>
-<span id="L646" class="LineNr"> 646 </span>  <span class="muControl">return-if</span> result
-<span id="L647" class="LineNr"> 647 </span>  <span class="Comment"># remaining uncommon cases in sorted order</span>
-<span id="L648" class="LineNr"> 648 </span>  <span class="Comment"># <a href="http://unicode.org">http://unicode.org</a> code-points in unicode-set Z and Pattern_White_Space</span>
-<span id="L649" class="LineNr"> 649 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">11/ctrl-k</span>
-<span id="L650" class="LineNr"> 650 </span>  <span class="muControl">return-if</span> result
-<span id="L651" class="LineNr"> 651 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">12/ctrl-l</span>
-<span id="L652" class="LineNr"> 652 </span>  <span class="muControl">return-if</span> result
-<span id="L653" class="LineNr"> 653 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">133/ctrl-0085</span>
-<span id="L654" class="LineNr"> 654 </span>  <span class="muControl">return-if</span> result
-<span id="L655" class="LineNr"> 655 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">160/no-break-space</span>
-<span id="L656" class="LineNr"> 656 </span>  <span class="muControl">return-if</span> result
-<span id="L657" class="LineNr"> 657 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">5760/ogham-space-mark</span>
-<span id="L658" class="LineNr"> 658 </span>  <span class="muControl">return-if</span> result
-<span id="L659" class="LineNr"> 659 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8192/en-quad</span>
-<span id="L660" class="LineNr"> 660 </span>  <span class="muControl">return-if</span> result
-<span id="L661" class="LineNr"> 661 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8193/em-quad</span>
-<span id="L662" class="LineNr"> 662 </span>  <span class="muControl">return-if</span> result
-<span id="L663" class="LineNr"> 663 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8194/en-space</span>
-<span id="L664" class="LineNr"> 664 </span>  <span class="muControl">return-if</span> result
-<span id="L665" class="LineNr"> 665 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8195/em-space</span>
-<span id="L666" class="LineNr"> 666 </span>  <span class="muControl">return-if</span> result
-<span id="L667" class="LineNr"> 667 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8196/three-per-em-space</span>
-<span id="L668" class="LineNr"> 668 </span>  <span class="muControl">return-if</span> result
-<span id="L669" class="LineNr"> 669 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8197/four-per-em-space</span>
-<span id="L670" class="LineNr"> 670 </span>  <span class="muControl">return-if</span> result
-<span id="L671" class="LineNr"> 671 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8198/six-per-em-space</span>
-<span id="L672" class="LineNr"> 672 </span>  <span class="muControl">return-if</span> result
-<span id="L673" class="LineNr"> 673 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8199/figure-space</span>
-<span id="L674" class="LineNr"> 674 </span>  <span class="muControl">return-if</span> result
-<span id="L675" class="LineNr"> 675 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8200/punctuation-space</span>
-<span id="L676" class="LineNr"> 676 </span>  <span class="muControl">return-if</span> result
-<span id="L677" class="LineNr"> 677 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8201/thin-space</span>
-<span id="L678" class="LineNr"> 678 </span>  <span class="muControl">return-if</span> result
-<span id="L679" class="LineNr"> 679 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8202/hair-space</span>
-<span id="L680" class="LineNr"> 680 </span>  <span class="muControl">return-if</span> result
-<span id="L681" class="LineNr"> 681 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8206/left-to-right</span>
-<span id="L682" class="LineNr"> 682 </span>  <span class="muControl">return-if</span> result
-<span id="L683" class="LineNr"> 683 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8207/right-to-left</span>
-<span id="L684" class="LineNr"> 684 </span>  <span class="muControl">return-if</span> result
-<span id="L685" class="LineNr"> 685 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8232/line-separator</span>
-<span id="L686" class="LineNr"> 686 </span>  <span class="muControl">return-if</span> result
-<span id="L687" class="LineNr"> 687 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8233/paragraph-separator</span>
-<span id="L688" class="LineNr"> 688 </span>  <span class="muControl">return-if</span> result
-<span id="L689" class="LineNr"> 689 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8239/narrow-no-break-space</span>
-<span id="L690" class="LineNr"> 690 </span>  <span class="muControl">return-if</span> result
-<span id="L691" class="LineNr"> 691 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8287/medium-mathematical-space</span>
-<span id="L692" class="LineNr"> 692 </span>  <span class="muControl">return-if</span> result
-<span id="L693" class="LineNr"> 693 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">12288/ideographic-space</span>
-<span id="L694" class="LineNr"> 694 </span>]
-<span id="L695" class="LineNr"> 695 </span>
-<span id="L696" class="LineNr"> 696 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L696'>trim</a> s:text<span class="muRecipe"> -&gt; </span>result:text [
-<span id="L697" class="LineNr"> 697 </span>  <span class="Constant">local-scope</span>
-<span id="L698" class="LineNr"> 698 </span>  <span class="Constant">load-ingredients</span>
-<span id="L699" class="LineNr"> 699 </span>  len:num <span class="Special">&lt;-</span> length *s
-<span id="L700" class="LineNr"> 700 </span>  <span class="Comment"># left trim: compute start</span>
-<span id="L701" class="LineNr"> 701 </span>  start:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
-<span id="L702" class="LineNr"> 702 </span>  <span class="Delimiter">{</span>
-<span id="L703" class="LineNr"> 703 </span>  <span class="Conceal">¦</span> <span class="Delimiter">{</span>
-<span id="L704" class="LineNr"> 704 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> at-end?:bool <span class="Special">&lt;-</span> greater-or-equal start, len
-<span id="L705" class="LineNr"> 705 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">break-unless</span> at-end?
-<span id="L706" class="LineNr"> 706 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> result <span class="Special">&lt;-</span> new <span class="Constant">character:type</span>,<span class="Constant"> 0</span>
-<span id="L707" class="LineNr"> 707 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">return</span>
-<span id="L708" class="LineNr"> 708 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L709" class="LineNr"> 709 </span>  <span class="Conceal">¦</span> curr:char <span class="Special">&lt;-</span> index *s, start
-<span id="L710" class="LineNr"> 710 </span>  <span class="Conceal">¦</span> whitespace?:bool <span class="Special">&lt;-</span> <a href='061text.mu.html#L635'>space?</a> curr
-<span id="L711" class="LineNr"> 711 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> whitespace?
-<span id="L712" class="LineNr"> 712 </span>  <span class="Conceal">¦</span> start <span class="Special">&lt;-</span> add start,<span class="Constant"> 1</span>
-<span id="L713" class="LineNr"> 713 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
-<span id="L714" class="LineNr"> 714 </span>  <span class="Delimiter">}</span>
-<span id="L715" class="LineNr"> 715 </span>  <span class="Comment"># right trim: compute end</span>
-<span id="L716" class="LineNr"> 716 </span>  end:num <span class="Special">&lt;-</span> subtract len,<span class="Constant"> 1</span>
-<span id="L717" class="LineNr"> 717 </span>  <span class="Delimiter">{</span>
-<span id="L718" class="LineNr"> 718 </span>  <span class="Conceal">¦</span> not-at-start?:bool <span class="Special">&lt;-</span> greater-than end, start
-<span id="L719" class="LineNr"> 719 </span>  <span class="Conceal">¦</span> assert not-at-start?, <span class="Constant">[end ran up against start]</span>
-<span id="L720" class="LineNr"> 720 </span>  <span class="Conceal">¦</span> curr:char <span class="Special">&lt;-</span> index *s, end
-<span id="L721" class="LineNr"> 721 </span>  <span class="Conceal">¦</span> whitespace?:bool <span class="Special">&lt;-</span> <a href='061text.mu.html#L635'>space?</a> curr
-<span id="L722" class="LineNr"> 722 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> whitespace?
-<span id="L723" class="LineNr"> 723 </span>  <span class="Conceal">¦</span> end <span class="Special">&lt;-</span> subtract end,<span class="Constant"> 1</span>
-<span id="L724" class="LineNr"> 724 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
-<span id="L725" class="LineNr"> 725 </span>  <span class="Delimiter">}</span>
-<span id="L726" class="LineNr"> 726 </span>  <span class="Comment"># result = new character[end+1 - start]</span>
-<span id="L727" class="LineNr"> 727 </span>  new-len:num <span class="Special">&lt;-</span> subtract end, start,<span class="Constant"> -1</span>
-<span id="L728" class="LineNr"> 728 </span>  result:text <span class="Special">&lt;-</span> new <span class="Constant">character:type</span>, new-len
-<span id="L729" class="LineNr"> 729 </span>  <span class="Comment"># copy the untrimmed parts between start and end</span>
-<span id="L730" class="LineNr"> 730 </span>  i:num <span class="Special">&lt;-</span> copy start
-<span id="L731" class="LineNr"> 731 </span>  j:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
-<span id="L732" class="LineNr"> 732 </span>  <span class="Delimiter">{</span>
-<span id="L733" class="LineNr"> 733 </span>  <span class="Conceal">¦</span> <span class="Comment"># while i &lt;= end</span>
-<span id="L734" class="LineNr"> 734 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-than i, end
-<span id="L735" class="LineNr"> 735 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
-<span id="L736" class="LineNr"> 736 </span>  <span class="Conceal">¦</span> <span class="Comment"># result[j] = s[i]</span>
-<span id="L737" class="LineNr"> 737 </span>  <span class="Conceal">¦</span> src:char <span class="Special">&lt;-</span> index *s, i
-<span id="L738" class="LineNr"> 738 </span>  <span class="Conceal">¦</span> *result <span class="Special">&lt;-</span> put-index *result, j, src
-<span id="L739" class="LineNr"> 739 </span>  <span class="Conceal">¦</span> i <span class="Special">&lt;-</span> add i,<span class="Constant"> 1</span>
-<span id="L740" class="LineNr"> 740 </span>  <span class="Conceal">¦</span> j <span class="Special">&lt;-</span> add j,<span class="Constant"> 1</span>
-<span id="L741" class="LineNr"> 741 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
-<span id="L742" class="LineNr"> 742 </span>  <span class="Delimiter">}</span>
-<span id="L743" class="LineNr"> 743 </span>]
-<span id="L744" class="LineNr"> 744 </span>
-<span id="L745" class="LineNr"> 745 </span><span class="muScenario">scenario</span> trim-unmodified [
-<span id="L746" class="LineNr"> 746 </span>  <span class="Constant">local-scope</span>
-<span id="L747" class="LineNr"> 747 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L748" class="LineNr"> 748 </span>  run [
-<span id="L749" class="LineNr"> 749 </span>  <span class="Conceal">¦</span> y:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L696'>trim</a> x
-<span id="L750" class="LineNr"> 750 </span>  <span class="Conceal">¦</span> 1:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *y
-<span id="L751" class="LineNr"> 751 </span>  ]
-<span id="L752" class="LineNr"> 752 </span>  memory-should-contain [
-<span id="L753" class="LineNr"> 753 </span>  <span class="Conceal">¦</span> 1:array:character <span class="Special">&lt;-</span> <span class="Constant">[abc]</span>
+<span id="L506" class="LineNr"> 506 </span>  memory-should-contain [
+<span id="L507" class="LineNr"> 507 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[bznznz]</span>
+<span id="L508" class="LineNr"> 508 </span>  ]
+<span id="L509" class="LineNr"> 509 </span>]
+<span id="L510" class="LineNr"> 510 </span>
+<span id="L511" class="LineNr"> 511 </span><span class="Comment"># replace underscores in first with remaining args</span>
+<span id="L512" class="LineNr"> 512 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L512'>interpolate</a> template:text<span class="muRecipe"> -&gt; </span>result:text [
+<span id="L513" class="LineNr"> 513 </span>  <span class="Constant">local-scope</span>
+<span id="L514" class="LineNr"> 514 </span>  <span class="Constant">load-ingredients</span>  <span class="Comment"># consume just the template</span>
+<span id="L515" class="LineNr"> 515 </span>  <span class="Comment"># compute result-len, space to allocate for result</span>
+<span id="L516" class="LineNr"> 516 </span>  tem-len:num <span class="Special">&lt;-</span> length *template
+<span id="L517" class="LineNr"> 517 </span>  result-len:num <span class="Special">&lt;-</span> copy tem-len
+<span id="L518" class="LineNr"> 518 </span>  <span class="Delimiter">{</span>
+<span id="L519" class="LineNr"> 519 </span>  <span class="Conceal">¦</span> <span class="Comment"># while ingredients remain</span>
+<span id="L520" class="LineNr"> 520 </span>  <span class="Conceal">¦</span> a:text, arg-received?:bool <span class="Special">&lt;-</span> <span class="Constant">next-ingredient</span>
+<span id="L521" class="LineNr"> 521 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> arg-received?
+<span id="L522" class="LineNr"> 522 </span>  <span class="Conceal">¦</span> <span class="Comment"># result-len = result-len + arg.length - 1 (for the 'underscore' being replaced)</span>
+<span id="L523" class="LineNr"> 523 </span>  <span class="Conceal">¦</span> a-len:num <span class="Special">&lt;-</span> length *a
+<span id="L524" class="LineNr"> 524 </span>  <span class="Conceal">¦</span> result-len <span class="Special">&lt;-</span> add result-len, a-len
+<span id="L525" class="LineNr"> 525 </span>  <span class="Conceal">¦</span> result-len <span class="Special">&lt;-</span> subtract result-len,<span class="Constant"> 1</span>
+<span id="L526" class="LineNr"> 526 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
+<span id="L527" class="LineNr"> 527 </span>  <span class="Delimiter">}</span>
+<span id="L528" class="LineNr"> 528 </span>  <span class="Constant">rewind-ingredients</span>
+<span id="L529" class="LineNr"> 529 </span>  _ <span class="Special">&lt;-</span> <span class="Constant">next-ingredient</span>  <span class="Comment"># skip template</span>
+<span id="L530" class="LineNr"> 530 </span>  result <span class="Special">&lt;-</span> new <span class="Constant">character:type</span>, result-len
+<span id="L531" class="LineNr"> 531 </span>  <span class="Comment"># repeatedly copy sections of template and 'holes' into result</span>
+<span id="L532" class="LineNr"> 532 </span>  result-idx:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
+<span id="L533" class="LineNr"> 533 </span>  i:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
+<span id="L534" class="LineNr"> 534 </span>  <span class="Delimiter">{</span>
+<span id="L535" class="LineNr"> 535 </span>  <span class="Conceal">¦</span> <span class="Comment"># while arg received</span>
+<span id="L536" class="LineNr"> 536 </span>  <span class="Conceal">¦</span> a:text, arg-received?:bool <span class="Special">&lt;-</span> <span class="Constant">next-ingredient</span>
+<span id="L537" class="LineNr"> 537 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> arg-received?
+<span id="L538" class="LineNr"> 538 </span>  <span class="Conceal">¦</span> <span class="Comment"># copy template into result until '_'</span>
+<span id="L539" class="LineNr"> 539 </span>  <span class="Conceal">¦</span> <span class="Delimiter">{</span>
+<span id="L540" class="LineNr"> 540 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment"># while i &lt; template.length</span>
+<span id="L541" class="LineNr"> 541 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> tem-done?:bool <span class="Special">&lt;-</span> greater-or-equal i, tem-len
+<span id="L542" class="LineNr"> 542 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">break-if</span> tem-done?, <span class="Constant">+done</span>
+<span id="L543" class="LineNr"> 543 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment"># while template[i] != '_'</span>
+<span id="L544" class="LineNr"> 544 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> in:char <span class="Special">&lt;-</span> index *template, i
+<span id="L545" class="LineNr"> 545 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> underscore?:bool <span class="Special">&lt;-</span> equal in, <span class="Constant">95/_</span>
+<span id="L546" class="LineNr"> 546 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">break-if</span> underscore?
+<span id="L547" class="LineNr"> 547 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment"># result[result-idx] = template[i]</span>
+<span id="L548" class="LineNr"> 548 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> *result <span class="Special">&lt;-</span> put-index *result, result-idx, in
+<span id="L549" class="LineNr"> 549 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> i <span class="Special">&lt;-</span> add i,<span class="Constant"> 1</span>
+<span id="L550" class="LineNr"> 550 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> result-idx <span class="Special">&lt;-</span> add result-idx,<span class="Constant"> 1</span>
+<span id="L551" class="LineNr"> 551 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">loop</span>
+<span id="L552" class="LineNr"> 552 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L553" class="LineNr"> 553 </span>  <span class="Conceal">¦</span> <span class="Comment"># copy 'a' into result</span>
+<span id="L554" class="LineNr"> 554 </span>  <span class="Conceal">¦</span> j:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
+<span id="L555" class="LineNr"> 555 </span>  <span class="Conceal">¦</span> <span class="Delimiter">{</span>
+<span id="L556" class="LineNr"> 556 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment"># while j &lt; a.length</span>
+<span id="L557" class="LineNr"> 557 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> arg-done?:bool <span class="Special">&lt;-</span> greater-or-equal j, a-len
+<span id="L558" class="LineNr"> 558 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">break-if</span> arg-done?
+<span id="L559" class="LineNr"> 559 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment"># result[result-idx] = a[j]</span>
+<span id="L560" class="LineNr"> 560 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> in:char <span class="Special">&lt;-</span> index *a, j
+<span id="L561" class="LineNr"> 561 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> *result <span class="Special">&lt;-</span> put-index *result, result-idx, in
+<span id="L562" class="LineNr"> 562 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> j <span class="Special">&lt;-</span> add j,<span class="Constant"> 1</span>
+<span id="L563" class="LineNr"> 563 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> result-idx <span class="Special">&lt;-</span> add result-idx,<span class="Constant"> 1</span>
+<span id="L564" class="LineNr"> 564 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">loop</span>
+<span id="L565" class="LineNr"> 565 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L566" class="LineNr"> 566 </span>  <span class="Conceal">¦</span> <span class="Comment"># skip '_' in template</span>
+<span id="L567" class="LineNr"> 567 </span>  <span class="Conceal">¦</span> i <span class="Special">&lt;-</span> add i,<span class="Constant"> 1</span>
+<span id="L568" class="LineNr"> 568 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>  <span class="Comment"># interpolate next arg</span>
+<span id="L569" class="LineNr"> 569 </span>  <span class="Delimiter">}</span>
+<span id="L570" class="LineNr"> 570 </span><span class="Constant">  +done</span>
+<span id="L571" class="LineNr"> 571 </span>  <span class="Comment"># done with holes; copy rest of template directly into result</span>
+<span id="L572" class="LineNr"> 572 </span>  <span class="Delimiter">{</span>
+<span id="L573" class="LineNr"> 573 </span>  <span class="Conceal">¦</span> <span class="Comment"># while i &lt; template.length</span>
+<span id="L574" class="LineNr"> 574 </span>  <span class="Conceal">¦</span> tem-done?:bool <span class="Special">&lt;-</span> greater-or-equal i, tem-len
+<span id="L575" class="LineNr"> 575 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> tem-done?
+<span id="L576" class="LineNr"> 576 </span>  <span class="Conceal">¦</span> <span class="Comment"># result[result-idx] = template[i]</span>
+<span id="L577" class="LineNr"> 577 </span>  <span class="Conceal">¦</span> in:char <span class="Special">&lt;-</span> index *template, i
+<span id="L578" class="LineNr"> 578 </span>  <span class="Conceal">¦</span> *result <span class="Special">&lt;-</span> put-index *result, result-idx, in
+<span id="L579" class="LineNr"> 579 </span>  <span class="Conceal">¦</span> i <span class="Special">&lt;-</span> add i,<span class="Constant"> 1</span>
+<span id="L580" class="LineNr"> 580 </span>  <span class="Conceal">¦</span> result-idx <span class="Special">&lt;-</span> add result-idx,<span class="Constant"> 1</span>
+<span id="L581" class="LineNr"> 581 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
+<span id="L582" class="LineNr"> 582 </span>  <span class="Delimiter">}</span>
+<span id="L583" class="LineNr"> 583 </span>]
+<span id="L584" class="LineNr"> 584 </span>
+<span id="L585" class="LineNr"> 585 </span><span class="muScenario">scenario</span> interpolate-works [
+<span id="L586" class="LineNr"> 586 </span>  <span class="Constant">local-scope</span>
+<span id="L587" class="LineNr"> 587 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc_ghi]</span>
+<span id="L588" class="LineNr"> 588 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[def]</span>
+<span id="L589" class="LineNr"> 589 </span>  run [
+<span id="L590" class="LineNr"> 590 </span>  <span class="Conceal">¦</span> z:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L512'>interpolate</a> x, y
+<span id="L591" class="LineNr"> 591 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *z
+<span id="L592" class="LineNr"> 592 </span>  ]
+<span id="L593" class="LineNr"> 593 </span>  memory-should-contain [
+<span id="L594" class="LineNr"> 594 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[abcdefghi]</span>
+<span id="L595" class="LineNr"> 595 </span>  ]
+<span id="L596" class="LineNr"> 596 </span>]
+<span id="L597" class="LineNr"> 597 </span>
+<span id="L598" class="LineNr"> 598 </span><span class="muScenario">scenario</span> interpolate-at-start [
+<span id="L599" class="LineNr"> 599 </span>  <span class="Constant">local-scope</span>
+<span id="L600" class="LineNr"> 600 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[_, hello!]</span>
+<span id="L601" class="LineNr"> 601 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L602" class="LineNr"> 602 </span>  run [
+<span id="L603" class="LineNr"> 603 </span>  <span class="Conceal">¦</span> z:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L512'>interpolate</a> x, y
+<span id="L604" class="LineNr"> 604 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *z
+<span id="L605" class="LineNr"> 605 </span>  ]
+<span id="L606" class="LineNr"> 606 </span>  memory-should-contain [
+<span id="L607" class="LineNr"> 607 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[abc, hello!]</span>
+<span id="L608" class="LineNr"> 608 </span>  <span class="Conceal">¦</span><span class="Constant"> 22</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># out of bounds</span>
+<span id="L609" class="LineNr"> 609 </span>  ]
+<span id="L610" class="LineNr"> 610 </span>]
+<span id="L611" class="LineNr"> 611 </span>
+<span id="L612" class="LineNr"> 612 </span><span class="muScenario">scenario</span> interpolate-at-end [
+<span id="L613" class="LineNr"> 613 </span>  <span class="Constant">local-scope</span>
+<span id="L614" class="LineNr"> 614 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[hello, _]</span>
+<span id="L615" class="LineNr"> 615 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L616" class="LineNr"> 616 </span>  run [
+<span id="L617" class="LineNr"> 617 </span>  <span class="Conceal">¦</span> z:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L512'>interpolate</a> x, y
+<span id="L618" class="LineNr"> 618 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *z
+<span id="L619" class="LineNr"> 619 </span>  ]
+<span id="L620" class="LineNr"> 620 </span>  memory-should-contain [
+<span id="L621" class="LineNr"> 621 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[hello, abc]</span>
+<span id="L622" class="LineNr"> 622 </span>  ]
+<span id="L623" class="LineNr"> 623 </span>]
+<span id="L624" class="LineNr"> 624 </span>
+<span id="L625" class="LineNr"> 625 </span><span class="Comment"># result:bool &lt;- space? c:char</span>
+<span id="L626" class="LineNr"> 626 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L626'>space?</a> c:char<span class="muRecipe"> -&gt; </span>result:bool [
+<span id="L627" class="LineNr"> 627 </span>  <span class="Constant">local-scope</span>
+<span id="L628" class="LineNr"> 628 </span>  <span class="Constant">load-ingredients</span>
+<span id="L629" class="LineNr"> 629 </span>  <span class="Comment"># most common case first</span>
+<span id="L630" class="LineNr"> 630 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">32/space</span>
+<span id="L631" class="LineNr"> 631 </span>  <span class="muControl">return-if</span> result
+<span id="L632" class="LineNr"> 632 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">10/newline</span>
+<span id="L633" class="LineNr"> 633 </span>  <span class="muControl">return-if</span> result
+<span id="L634" class="LineNr"> 634 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">9/tab</span>
+<span id="L635" class="LineNr"> 635 </span>  <span class="muControl">return-if</span> result
+<span id="L636" class="LineNr"> 636 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">13/carriage-return</span>
+<span id="L637" class="LineNr"> 637 </span>  <span class="muControl">return-if</span> result
+<span id="L638" class="LineNr"> 638 </span>  <span class="Comment"># remaining uncommon cases in sorted order</span>
+<span id="L639" class="LineNr"> 639 </span>  <span class="Comment"># <a href="http://unicode.org">http://unicode.org</a> code-points in unicode-set Z and Pattern_White_Space</span>
+<span id="L640" class="LineNr"> 640 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">11/ctrl-k</span>
+<span id="L641" class="LineNr"> 641 </span>  <span class="muControl">return-if</span> result
+<span id="L642" class="LineNr"> 642 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">12/ctrl-l</span>
+<span id="L643" class="LineNr"> 643 </span>  <span class="muControl">return-if</span> result
+<span id="L644" class="LineNr"> 644 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">133/ctrl-0085</span>
+<span id="L645" class="LineNr"> 645 </span>  <span class="muControl">return-if</span> result
+<span id="L646" class="LineNr"> 646 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">160/no-break-space</span>
+<span id="L647" class="LineNr"> 647 </span>  <span class="muControl">return-if</span> result
+<span id="L648" class="LineNr"> 648 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">5760/ogham-space-mark</span>
+<span id="L649" class="LineNr"> 649 </span>  <span class="muControl">return-if</span> result
+<span id="L650" class="LineNr"> 650 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8192/en-quad</span>
+<span id="L651" class="LineNr"> 651 </span>  <span class="muControl">return-if</span> result
+<span id="L652" class="LineNr"> 652 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8193/em-quad</span>
+<span id="L653" class="LineNr"> 653 </span>  <span class="muControl">return-if</span> result
+<span id="L654" class="LineNr"> 654 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8194/en-space</span>
+<span id="L655" class="LineNr"> 655 </span>  <span class="muControl">return-if</span> result
+<span id="L656" class="LineNr"> 656 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8195/em-space</span>
+<span id="L657" class="LineNr"> 657 </span>  <span class="muControl">return-if</span> result
+<span id="L658" class="LineNr"> 658 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8196/three-per-em-space</span>
+<span id="L659" class="LineNr"> 659 </span>  <span class="muControl">return-if</span> result
+<span id="L660" class="LineNr"> 660 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8197/four-per-em-space</span>
+<span id="L661" class="LineNr"> 661 </span>  <span class="muControl">return-if</span> result
+<span id="L662" class="LineNr"> 662 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8198/six-per-em-space</span>
+<span id="L663" class="LineNr"> 663 </span>  <span class="muControl">return-if</span> result
+<span id="L664" class="LineNr"> 664 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8199/figure-space</span>
+<span id="L665" class="LineNr"> 665 </span>  <span class="muControl">return-if</span> result
+<span id="L666" class="LineNr"> 666 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8200/punctuation-space</span>
+<span id="L667" class="LineNr"> 667 </span>  <span class="muControl">return-if</span> result
+<span id="L668" class="LineNr"> 668 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8201/thin-space</span>
+<span id="L669" class="LineNr"> 669 </span>  <span class="muControl">return-if</span> result
+<span id="L670" class="LineNr"> 670 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8202/hair-space</span>
+<span id="L671" class="LineNr"> 671 </span>  <span class="muControl">return-if</span> result
+<span id="L672" class="LineNr"> 672 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8206/left-to-right</span>
+<span id="L673" class="LineNr"> 673 </span>  <span class="muControl">return-if</span> result
+<span id="L674" class="LineNr"> 674 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8207/right-to-left</span>
+<span id="L675" class="LineNr"> 675 </span>  <span class="muControl">return-if</span> result
+<span id="L676" class="LineNr"> 676 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8232/line-separator</span>
+<span id="L677" class="LineNr"> 677 </span>  <span class="muControl">return-if</span> result
+<span id="L678" class="LineNr"> 678 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8233/paragraph-separator</span>
+<span id="L679" class="LineNr"> 679 </span>  <span class="muControl">return-if</span> result
+<span id="L680" class="LineNr"> 680 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8239/narrow-no-break-space</span>
+<span id="L681" class="LineNr"> 681 </span>  <span class="muControl">return-if</span> result
+<span id="L682" class="LineNr"> 682 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">8287/medium-mathematical-space</span>
+<span id="L683" class="LineNr"> 683 </span>  <span class="muControl">return-if</span> result
+<span id="L684" class="LineNr"> 684 </span>  result <span class="Special">&lt;-</span> equal c, <span class="Constant">12288/ideographic-space</span>
+<span id="L685" class="LineNr"> 685 </span>]
+<span id="L686" class="LineNr"> 686 </span>
+<span id="L687" class="LineNr"> 687 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L687'>trim</a> s:text<span class="muRecipe"> -&gt; </span>result:text [
+<span id="L688" class="LineNr"> 688 </span>  <span class="Constant">local-scope</span>
+<span id="L689" class="LineNr"> 689 </span>  <span class="Constant">load-ingredients</span>
+<span id="L690" class="LineNr"> 690 </span>  len:num <span class="Special">&lt;-</span> length *s
+<span id="L691" class="LineNr"> 691 </span>  <span class="Comment"># left trim: compute start</span>
+<span id="L692" class="LineNr"> 692 </span>  start:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
+<span id="L693" class="LineNr"> 693 </span>  <span class="Delimiter">{</span>
+<span id="L694" class="LineNr"> 694 </span>  <span class="Conceal">¦</span> <span class="Delimiter">{</span>
+<span id="L695" class="LineNr"> 695 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> at-end?:bool <span class="Special">&lt;-</span> greater-or-equal start, len
+<span id="L696" class="LineNr"> 696 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">break-unless</span> at-end?
+<span id="L697" class="LineNr"> 697 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> result <span class="Special">&lt;-</span> new <span class="Constant">character:type</span>,<span class="Constant"> 0</span>
+<span id="L698" class="LineNr"> 698 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">return</span>
+<span id="L699" class="LineNr"> 699 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L700" class="LineNr"> 700 </span>  <span class="Conceal">¦</span> curr:char <span class="Special">&lt;-</span> index *s, start
+<span id="L701" class="LineNr"> 701 </span>  <span class="Conceal">¦</span> whitespace?:bool <span class="Special">&lt;-</span> <a href='061text.mu.html#L626'>space?</a> curr
+<span id="L702" class="LineNr"> 702 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> whitespace?
+<span id="L703" class="LineNr"> 703 </span>  <span class="Conceal">¦</span> start <span class="Special">&lt;-</span> add start,<span class="Constant"> 1</span>
+<span id="L704" class="LineNr"> 704 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
+<span id="L705" class="LineNr"> 705 </span>  <span class="Delimiter">}</span>
+<span id="L706" class="LineNr"> 706 </span>  <span class="Comment"># right trim: compute end</span>
+<span id="L707" class="LineNr"> 707 </span>  end:num <span class="Special">&lt;-</span> subtract len,<span class="Constant"> 1</span>
+<span id="L708" class="LineNr"> 708 </span>  <span class="Delimiter">{</span>
+<span id="L709" class="LineNr"> 709 </span>  <span class="Conceal">¦</span> not-at-start?:bool <span class="Special">&lt;-</span> greater-than end, start
+<span id="L710" class="LineNr"> 710 </span>  <span class="Conceal">¦</span> assert not-at-start?, <span class="Constant">[end ran up against start]</span>
+<span id="L711" class="LineNr"> 711 </span>  <span class="Conceal">¦</span> curr:char <span class="Special">&lt;-</span> index *s, end
+<span id="L712" class="LineNr"> 712 </span>  <span class="Conceal">¦</span> whitespace?:bool <span class="Special">&lt;-</span> <a href='061text.mu.html#L626'>space?</a> curr
+<span id="L713" class="LineNr"> 713 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> whitespace?
+<span id="L714" class="LineNr"> 714 </span>  <span class="Conceal">¦</span> end <span class="Special">&lt;-</span> subtract end,<span class="Constant"> 1</span>
+<span id="L715" class="LineNr"> 715 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
+<span id="L716" class="LineNr"> 716 </span>  <span class="Delimiter">}</span>
+<span id="L717" class="LineNr"> 717 </span>  <span class="Comment"># result = new character[end+1 - start]</span>
+<span id="L718" class="LineNr"> 718 </span>  new-len:num <span class="Special">&lt;-</span> subtract end, start,<span class="Constant"> -1</span>
+<span id="L719" class="LineNr"> 719 </span>  result:text <span class="Special">&lt;-</span> new <span class="Constant">character:type</span>, new-len
+<span id="L720" class="LineNr"> 720 </span>  <span class="Comment"># copy the untrimmed parts between start and end</span>
+<span id="L721" class="LineNr"> 721 </span>  i:num <span class="Special">&lt;-</span> copy start
+<span id="L722" class="LineNr"> 722 </span>  j:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
+<span id="L723" class="LineNr"> 723 </span>  <span class="Delimiter">{</span>
+<span id="L724" class="LineNr"> 724 </span>  <span class="Conceal">¦</span> <span class="Comment"># while i &lt;= end</span>
+<span id="L725" class="LineNr"> 725 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-than i, end
+<span id="L726" class="LineNr"> 726 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
+<span id="L727" class="LineNr"> 727 </span>  <span class="Conceal">¦</span> <span class="Comment"># result[j] = s[i]</span>
+<span id="L728" class="LineNr"> 728 </span>  <span class="Conceal">¦</span> src:char <span class="Special">&lt;-</span> index *s, i
+<span id="L729" class="LineNr"> 729 </span>  <span class="Conceal">¦</span> *result <span class="Special">&lt;-</span> put-index *result, j, src
+<span id="L730" class="LineNr"> 730 </span>  <span class="Conceal">¦</span> i <span class="Special">&lt;-</span> add i,<span class="Constant"> 1</span>
+<span id="L731" class="LineNr"> 731 </span>  <span class="Conceal">¦</span> j <span class="Special">&lt;-</span> add j,<span class="Constant"> 1</span>
+<span id="L732" class="LineNr"> 732 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
+<span id="L733" class="LineNr"> 733 </span>  <span class="Delimiter">}</span>
+<span id="L734" class="LineNr"> 734 </span>]
+<span id="L735" class="LineNr"> 735 </span>
+<span id="L736" class="LineNr"> 736 </span><span class="muScenario">scenario</span> trim-unmodified [
+<span id="L737" class="LineNr"> 737 </span>  <span class="Constant">local-scope</span>
+<span id="L738" class="LineNr"> 738 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L739" class="LineNr"> 739 </span>  run [
+<span id="L740" class="LineNr"> 740 </span>  <span class="Conceal">¦</span> y:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L687'>trim</a> x
+<span id="L741" class="LineNr"> 741 </span>  <span class="Conceal">¦</span> 1:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *y
+<span id="L742" class="LineNr"> 742 </span>  ]
+<span id="L743" class="LineNr"> 743 </span>  memory-should-contain [
+<span id="L744" class="LineNr"> 744 </span>  <span class="Conceal">¦</span> 1:array:character <span class="Special">&lt;-</span> <span class="Constant">[abc]</span>
+<span id="L745" class="LineNr"> 745 </span>  ]
+<span id="L746" class="LineNr"> 746 </span>]
+<span id="L747" class="LineNr"> 747 </span>
+<span id="L748" class="LineNr"> 748 </span><span class="muScenario">scenario</span> trim-left [
+<span id="L749" class="LineNr"> 749 </span>  <span class="Constant">local-scope</span>
+<span id="L750" class="LineNr"> 750 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[  abc]</span>
+<span id="L751" class="LineNr"> 751 </span>  run [
+<span id="L752" class="LineNr"> 752 </span>  <span class="Conceal">¦</span> y:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L687'>trim</a> x
+<span id="L753" class="LineNr"> 753 </span>  <span class="Conceal">¦</span> 1:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *y
 <span id="L754" class="LineNr"> 754 </span>  ]
-<span id="L755" class="LineNr"> 755 </span>]
-<span id="L756" class="LineNr"> 756 </span>
-<span id="L757" class="LineNr"> 757 </span><span class="muScenario">scenario</span> trim-left [
-<span id="L758" class="LineNr"> 758 </span>  <span class="Constant">local-scope</span>
-<span id="L759" class="LineNr"> 759 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[  abc]</span>
-<span id="L760" class="LineNr"> 760 </span>  run [
-<span id="L761" class="LineNr"> 761 </span>  <span class="Conceal">¦</span> y:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L696'>trim</a> x
-<span id="L762" class="LineNr"> 762 </span>  <span class="Conceal">¦</span> 1:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *y
-<span id="L763" class="LineNr"> 763 </span>  ]
-<span id="L764" class="LineNr"> 764 </span>  memory-should-contain [
-<span id="L765" class="LineNr"> 765 </span>  <span class="Conceal">¦</span> 1:array:character <span class="Special">&lt;-</span> <span class="Constant">[abc]</span>
+<span id="L755" class="LineNr"> 755 </span>  memory-should-contain [
+<span id="L756" class="LineNr"> 756 </span>  <span class="Conceal">¦</span> 1:array:character <span class="Special">&lt;-</span> <span class="Constant">[abc]</span>
+<span id="L757" class="LineNr"> 757 </span>  ]
+<span id="L758" class="LineNr"> 758 </span>]
+<span id="L759" class="LineNr"> 759 </span>
+<span id="L760" class="LineNr"> 760 </span><span class="muScenario">scenario</span> trim-right [
+<span id="L761" class="LineNr"> 761 </span>  <span class="Constant">local-scope</span>
+<span id="L762" class="LineNr"> 762 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc  ]</span>
+<span id="L763" class="LineNr"> 763 </span>  run [
+<span id="L764" class="LineNr"> 764 </span>  <span class="Conceal">¦</span> y:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L687'>trim</a> x
+<span id="L765" class="LineNr"> 765 </span>  <span class="Conceal">¦</span> 1:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *y
 <span id="L766" class="LineNr"> 766 </span>  ]
-<span id="L767" class="LineNr"> 767 </span>]
-<span id="L768" class="LineNr"> 768 </span>
-<span id="L769" class="LineNr"> 769 </span><span class="muScenario">scenario</span> trim-right [
-<span id="L770" class="LineNr"> 770 </span>  <span class="Constant">local-scope</span>
-<span id="L771" class="LineNr"> 771 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc  ]</span>
-<span id="L772" class="LineNr"> 772 </span>  run [
-<span id="L773" class="LineNr"> 773 </span>  <span class="Conceal">¦</span> y:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L696'>trim</a> x
-<span id="L774" class="LineNr"> 774 </span>  <span class="Conceal">¦</span> 1:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *y
-<span id="L775" class="LineNr"> 775 </span>  ]
-<span id="L776" class="LineNr"> 776 </span>  memory-should-contain [
-<span id="L777" class="LineNr"> 777 </span>  <span class="Conceal">¦</span> 1:array:character <span class="Special">&lt;-</span> <span class="Constant">[abc]</span>
+<span id="L767" class="LineNr"> 767 </span>  memory-should-contain [
+<span id="L768" class="LineNr"> 768 </span>  <span class="Conceal">¦</span> 1:array:character <span class="Special">&lt;-</span> <span class="Constant">[abc]</span>
+<span id="L769" class="LineNr"> 769 </span>  ]
+<span id="L770" class="LineNr"> 770 </span>]
+<span id="L771" class="LineNr"> 771 </span>
+<span id="L772" class="LineNr"> 772 </span><span class="muScenario">scenario</span> trim-left-right [
+<span id="L773" class="LineNr"> 773 </span>  <span class="Constant">local-scope</span>
+<span id="L774" class="LineNr"> 774 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[  abc   ]</span>
+<span id="L775" class="LineNr"> 775 </span>  run [
+<span id="L776" class="LineNr"> 776 </span>  <span class="Conceal">¦</span> y:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L687'>trim</a> x
+<span id="L777" class="LineNr"> 777 </span>  <span class="Conceal">¦</span> 1:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *y
 <span id="L778" class="LineNr"> 778 </span>  ]
-<span id="L779" class="LineNr"> 779 </span>]
-<span id="L780" class="LineNr"> 780 </span>
-<span id="L781" class="LineNr"> 781 </span><span class="muScenario">scenario</span> trim-left-right [
-<span id="L782" class="LineNr"> 782 </span>  <span class="Constant">local-scope</span>
-<span id="L783" class="LineNr"> 783 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[  abc   ]</span>
-<span id="L784" class="LineNr"> 784 </span>  run [
-<span id="L785" class="LineNr"> 785 </span>  <span class="Conceal">¦</span> y:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L696'>trim</a> x
-<span id="L786" class="LineNr"> 786 </span>  <span class="Conceal">¦</span> 1:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *y
-<span id="L787" class="LineNr"> 787 </span>  ]
-<span id="L788" class="LineNr"> 788 </span>  memory-should-contain [
-<span id="L789" class="LineNr"> 789 </span>  <span class="Conceal">¦</span> 1:array:character <span class="Special">&lt;-</span> <span class="Constant">[abc]</span>
-<span id="L790" class="LineNr"> 790 </span>  ]
-<span id="L791" class="LineNr"> 791 </span>]
-<span id="L792" class="LineNr"> 792 </span>
-<span id="L793" class="LineNr"> 793 </span><span class="muScenario">scenario</span> trim-newline-tab [
-<span id="L794" class="LineNr"> 794 </span>  <span class="Constant">local-scope</span>
-<span id="L795" class="LineNr"> 795 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[ abc</span>
-<span id="L796" class="LineNr"> 796 </span><span class="Constant">]</span>
-<span id="L797" class="LineNr"> 797 </span>  run [
-<span id="L798" class="LineNr"> 798 </span>  <span class="Conceal">¦</span> y:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L696'>trim</a> x
-<span id="L799" class="LineNr"> 799 </span>  <span class="Conceal">¦</span> 1:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *y
-<span id="L800" class="LineNr"> 800 </span>  ]
-<span id="L801" class="LineNr"> 801 </span>  memory-should-contain [
-<span id="L802" class="LineNr"> 802 </span>  <span class="Conceal">¦</span> 1:array:character <span class="Special">&lt;-</span> <span class="Constant">[abc]</span>
-<span id="L803" class="LineNr"> 803 </span>  ]
-<span id="L804" class="LineNr"> 804 </span>]
-<span id="L805" class="LineNr"> 805 </span>
-<span id="L806" class="LineNr"> 806 </span><span class="muRecipe">def</span> find-next text:text, pattern:char, idx:num<span class="muRecipe"> -&gt; </span>next-index:num [
-<span id="L807" class="LineNr"> 807 </span>  <span class="Constant">local-scope</span>
-<span id="L808" class="LineNr"> 808 </span>  <span class="Constant">load-ingredients</span>
-<span id="L809" class="LineNr"> 809 </span>  len:num <span class="Special">&lt;-</span> length *text
-<span id="L810" class="LineNr"> 810 </span>  <span class="Delimiter">{</span>
-<span id="L811" class="LineNr"> 811 </span>  <span class="Conceal">¦</span> eof?:bool <span class="Special">&lt;-</span> greater-or-equal idx, len
-<span id="L812" class="LineNr"> 812 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> eof?
-<span id="L813" class="LineNr"> 813 </span>  <span class="Conceal">¦</span> curr:char <span class="Special">&lt;-</span> index *text, idx
-<span id="L814" class="LineNr"> 814 </span>  <span class="Conceal">¦</span> found?:bool <span class="Special">&lt;-</span> equal curr, pattern
-<span id="L815" class="LineNr"> 815 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> found?
-<span id="L816" class="LineNr"> 816 </span>  <span class="Conceal">¦</span> idx <span class="Special">&lt;-</span> add idx,<span class="Constant"> 1</span>
-<span id="L817" class="LineNr"> 817 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
-<span id="L818" class="LineNr"> 818 </span>  <span class="Delimiter">}</span>
-<span id="L819" class="LineNr"> 819 </span>  <span class="muControl">return</span> idx
-<span id="L820" class="LineNr"> 820 </span>]
-<span id="L821" class="LineNr"> 821 </span>
-<span id="L822" class="LineNr"> 822 </span><span class="muScenario">scenario</span> text-find-next [
-<span id="L823" class="LineNr"> 823 </span>  <span class="Constant">local-scope</span>
-<span id="L824" class="LineNr"> 824 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[a/b]</span>
-<span id="L825" class="LineNr"> 825 </span>  run [
-<span id="L826" class="LineNr"> 826 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span>
-<span id="L827" class="LineNr"> 827 </span>  ]
-<span id="L828" class="LineNr"> 828 </span>  memory-should-contain [
-<span id="L829" class="LineNr"> 829 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>
-<span id="L830" class="LineNr"> 830 </span>  ]
-<span id="L831" class="LineNr"> 831 </span>]
-<span id="L832" class="LineNr"> 832 </span>
-<span id="L833" class="LineNr"> 833 </span><span class="muScenario">scenario</span> text-find-next-empty [
-<span id="L834" class="LineNr"> 834 </span>  <span class="Constant">local-scope</span>
-<span id="L835" class="LineNr"> 835 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[]</span>
-<span id="L836" class="LineNr"> 836 </span>  run [
-<span id="L837" class="LineNr"> 837 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span>
-<span id="L838" class="LineNr"> 838 </span>  ]
-<span id="L839" class="LineNr"> 839 </span>  memory-should-contain [
-<span id="L840" class="LineNr"> 840 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
-<span id="L841" class="LineNr"> 841 </span>  ]
-<span id="L842" class="LineNr"> 842 </span>]
-<span id="L843" class="LineNr"> 843 </span>
-<span id="L844" class="LineNr"> 844 </span><span class="muScenario">scenario</span> text-find-next-initial [
-<span id="L845" class="LineNr"> 845 </span>  <span class="Constant">local-scope</span>
-<span id="L846" class="LineNr"> 846 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[/abc]</span>
-<span id="L847" class="LineNr"> 847 </span>  run [
-<span id="L848" class="LineNr"> 848 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span>
-<span id="L849" class="LineNr"> 849 </span>  ]
-<span id="L850" class="LineNr"> 850 </span>  memory-should-contain [
-<span id="L851" class="LineNr"> 851 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># prefix match</span>
-<span id="L852" class="LineNr"> 852 </span>  ]
-<span id="L853" class="LineNr"> 853 </span>]
-<span id="L854" class="LineNr"> 854 </span>
-<span id="L855" class="LineNr"> 855 </span><span class="muScenario">scenario</span> text-find-next-final [
-<span id="L856" class="LineNr"> 856 </span>  <span class="Constant">local-scope</span>
-<span id="L857" class="LineNr"> 857 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc/]</span>
-<span id="L858" class="LineNr"> 858 </span>  run [
-<span id="L859" class="LineNr"> 859 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span>
-<span id="L860" class="LineNr"> 860 </span>  ]
-<span id="L861" class="LineNr"> 861 </span>  memory-should-contain [
-<span id="L862" class="LineNr"> 862 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 3</span>  <span class="Comment"># suffix match</span>
-<span id="L863" class="LineNr"> 863 </span>  ]
-<span id="L864" class="LineNr"> 864 </span>]
-<span id="L865" class="LineNr"> 865 </span>
-<span id="L866" class="LineNr"> 866 </span><span class="muScenario">scenario</span> text-find-next-missing [
-<span id="L867" class="LineNr"> 867 </span>  <span class="Constant">local-scope</span>
-<span id="L868" class="LineNr"> 868 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abcd]</span>
-<span id="L869" class="LineNr"> 869 </span>  run [
-<span id="L870" class="LineNr"> 870 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span>
-<span id="L871" class="LineNr"> 871 </span>  ]
-<span id="L872" class="LineNr"> 872 </span>  memory-should-contain [
-<span id="L873" class="LineNr"> 873 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 4</span>  <span class="Comment"># no match</span>
-<span id="L874" class="LineNr"> 874 </span>  ]
-<span id="L875" class="LineNr"> 875 </span>]
-<span id="L876" class="LineNr"> 876 </span>
-<span id="L877" class="LineNr"> 877 </span><span class="muScenario">scenario</span> text-find-next-invalid-index [
-<span id="L878" class="LineNr"> 878 </span>  <span class="Constant">local-scope</span>
-<span id="L879" class="LineNr"> 879 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L880" class="LineNr"> 880 </span>  run [
-<span id="L881" class="LineNr"> 881 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, <span class="Constant">47/slash</span>, <span class="Constant">4/start-index</span>
-<span id="L882" class="LineNr"> 882 </span>  ]
-<span id="L883" class="LineNr"> 883 </span>  memory-should-contain [
-<span id="L884" class="LineNr"> 884 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 4</span>  <span class="Comment"># no change</span>
-<span id="L885" class="LineNr"> 885 </span>  ]
-<span id="L886" class="LineNr"> 886 </span>]
-<span id="L887" class="LineNr"> 887 </span>
-<span id="L888" class="LineNr"> 888 </span><span class="muScenario">scenario</span> text-find-next-first [
-<span id="L889" class="LineNr"> 889 </span>  <span class="Constant">local-scope</span>
-<span id="L890" class="LineNr"> 890 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[ab/c/]</span>
-<span id="L891" class="LineNr"> 891 </span>  run [
-<span id="L892" class="LineNr"> 892 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span>
-<span id="L893" class="LineNr"> 893 </span>  ]
-<span id="L894" class="LineNr"> 894 </span>  memory-should-contain [
-<span id="L895" class="LineNr"> 895 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 2</span>  <span class="Comment"># first '/' of multiple</span>
-<span id="L896" class="LineNr"> 896 </span>  ]
-<span id="L897" class="LineNr"> 897 </span>]
-<span id="L898" class="LineNr"> 898 </span>
-<span id="L899" class="LineNr"> 899 </span><span class="muScenario">scenario</span> text-find-next-second [
-<span id="L900" class="LineNr"> 900 </span>  <span class="Constant">local-scope</span>
-<span id="L901" class="LineNr"> 901 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[ab/c/]</span>
-<span id="L902" class="LineNr"> 902 </span>  run [
-<span id="L903" class="LineNr"> 903 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, <span class="Constant">47/slash</span>, <span class="Constant">3/start-index</span>
-<span id="L904" class="LineNr"> 904 </span>  ]
-<span id="L905" class="LineNr"> 905 </span>  memory-should-contain [
-<span id="L906" class="LineNr"> 906 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 4</span>  <span class="Comment"># second '/' of multiple</span>
-<span id="L907" class="LineNr"> 907 </span>  ]
-<span id="L908" class="LineNr"> 908 </span>]
-<span id="L909" class="LineNr"> 909 </span>
-<span id="L910" class="LineNr"> 910 </span><span class="Comment"># search for a pattern of multiple characters</span>
-<span id="L911" class="LineNr"> 911 </span><span class="Comment"># fairly dumb algorithm</span>
-<span id="L912" class="LineNr"> 912 </span><span class="muRecipe">def</span> find-next text:text, pattern:text, idx:num<span class="muRecipe"> -&gt; </span>next-index:num [
-<span id="L913" class="LineNr"> 913 </span>  <span class="Constant">local-scope</span>
-<span id="L914" class="LineNr"> 914 </span>  <span class="Constant">load-ingredients</span>
-<span id="L915" class="LineNr"> 915 </span>  first:char <span class="Special">&lt;-</span> index *pattern,<span class="Constant"> 0</span>
-<span id="L916" class="LineNr"> 916 </span>  <span class="Comment"># repeatedly check for match at current idx</span>
-<span id="L917" class="LineNr"> 917 </span>  len:num <span class="Special">&lt;-</span> length *text
-<span id="L918" class="LineNr"> 918 </span>  <span class="Delimiter">{</span>
-<span id="L919" class="LineNr"> 919 </span>  <span class="Conceal">¦</span> <span class="Comment"># does some unnecessary work checking even when there isn't enough of text left</span>
-<span id="L920" class="LineNr"> 920 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-or-equal idx, len
-<span id="L921" class="LineNr"> 921 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
-<span id="L922" class="LineNr"> 922 </span>  <span class="Conceal">¦</span> found?:bool <span class="Special">&lt;-</span> <a href='061text.mu.html#L993'>match-at</a> text, pattern, idx
-<span id="L923" class="LineNr"> 923 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> found?
-<span id="L924" class="LineNr"> 924 </span>  <span class="Conceal">¦</span> idx <span class="Special">&lt;-</span> add idx,<span class="Constant"> 1</span>
-<span id="L925" class="LineNr"> 925 </span>  <span class="Conceal">¦</span> <span class="Comment"># optimization: skip past indices that definitely won't match</span>
-<span id="L926" class="LineNr"> 926 </span>  <span class="Conceal">¦</span> idx <span class="Special">&lt;-</span> find-next text, first, idx
-<span id="L927" class="LineNr"> 927 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
-<span id="L928" class="LineNr"> 928 </span>  <span class="Delimiter">}</span>
-<span id="L929" class="LineNr"> 929 </span>  <span class="muControl">return</span> idx
-<span id="L930" class="LineNr"> 930 </span>]
-<span id="L931" class="LineNr"> 931 </span>
-<span id="L932" class="LineNr"> 932 </span><span class="muScenario">scenario</span> find-next-text-1 [
-<span id="L933" class="LineNr"> 933 </span>  <span class="Constant">local-scope</span>
-<span id="L934" class="LineNr"> 934 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L935" class="LineNr"> 935 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[bc]</span>
-<span id="L936" class="LineNr"> 936 </span>  run [
-<span id="L937" class="LineNr"> 937 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, y,<span class="Constant"> 0</span>
-<span id="L938" class="LineNr"> 938 </span>  ]
-<span id="L939" class="LineNr"> 939 </span>  memory-should-contain [
-<span id="L940" class="LineNr"> 940 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>
+<span id="L779" class="LineNr"> 779 </span>  memory-should-contain [
+<span id="L780" class="LineNr"> 780 </span>  <span class="Conceal">¦</span> 1:array:character <span class="Special">&lt;-</span> <span class="Constant">[abc]</span>
+<span id="L781" class="LineNr"> 781 </span>  ]
+<span id="L782" class="LineNr"> 782 </span>]
+<span id="L783" class="LineNr"> 783 </span>
+<span id="L784" class="LineNr"> 784 </span><span class="muScenario">scenario</span> trim-newline-tab [
+<span id="L785" class="LineNr"> 785 </span>  <span class="Constant">local-scope</span>
+<span id="L786" class="LineNr"> 786 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[ abc</span>
+<span id="L787" class="LineNr"> 787 </span><span class="Constant">]</span>
+<span id="L788" class="LineNr"> 788 </span>  run [
+<span id="L789" class="LineNr"> 789 </span>  <span class="Conceal">¦</span> y:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L687'>trim</a> x
+<span id="L790" class="LineNr"> 790 </span>  <span class="Conceal">¦</span> 1:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *y
+<span id="L791" class="LineNr"> 791 </span>  ]
+<span id="L792" class="LineNr"> 792 </span>  memory-should-contain [
+<span id="L793" class="LineNr"> 793 </span>  <span class="Conceal">¦</span> 1:array:character <span class="Special">&lt;-</span> <span class="Constant">[abc]</span>
+<span id="L794" class="LineNr"> 794 </span>  ]
+<span id="L795" class="LineNr"> 795 </span>]
+<span id="L796" class="LineNr"> 796 </span>
+<span id="L797" class="LineNr"> 797 </span><span class="muRecipe">def</span> find-next text:text, pattern:char, idx:num<span class="muRecipe"> -&gt; </span>next-index:num [
+<span id="L798" class="LineNr"> 798 </span>  <span class="Constant">local-scope</span>
+<span id="L799" class="LineNr"> 799 </span>  <span class="Constant">load-ingredients</span>
+<span id="L800" class="LineNr"> 800 </span>  len:num <span class="Special">&lt;-</span> length *text
+<span id="L801" class="LineNr"> 801 </span>  <span class="Delimiter">{</span>
+<span id="L802" class="LineNr"> 802 </span>  <span class="Conceal">¦</span> eof?:bool <span class="Special">&lt;-</span> greater-or-equal idx, len
+<span id="L803" class="LineNr"> 803 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> eof?
+<span id="L804" class="LineNr"> 804 </span>  <span class="Conceal">¦</span> curr:char <span class="Special">&lt;-</span> index *text, idx
+<span id="L805" class="LineNr"> 805 </span>  <span class="Conceal">¦</span> found?:bool <span class="Special">&lt;-</span> equal curr, pattern
+<span id="L806" class="LineNr"> 806 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> found?
+<span id="L807" class="LineNr"> 807 </span>  <span class="Conceal">¦</span> idx <span class="Special">&lt;-</span> add idx,<span class="Constant"> 1</span>
+<span id="L808" class="LineNr"> 808 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
+<span id="L809" class="LineNr"> 809 </span>  <span class="Delimiter">}</span>
+<span id="L810" class="LineNr"> 810 </span>  <span class="muControl">return</span> idx
+<span id="L811" class="LineNr"> 811 </span>]
+<span id="L812" class="LineNr"> 812 </span>
+<span id="L813" class="LineNr"> 813 </span><span class="muScenario">scenario</span> text-find-next [
+<span id="L814" class="LineNr"> 814 </span>  <span class="Constant">local-scope</span>
+<span id="L815" class="LineNr"> 815 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[a/b]</span>
+<span id="L816" class="LineNr"> 816 </span>  run [
+<span id="L817" class="LineNr"> 817 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span>
+<span id="L818" class="LineNr"> 818 </span>  ]
+<span id="L819" class="LineNr"> 819 </span>  memory-should-contain [
+<span id="L820" class="LineNr"> 820 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>
+<span id="L821" class="LineNr"> 821 </span>  ]
+<span id="L822" class="LineNr"> 822 </span>]
+<span id="L823" class="LineNr"> 823 </span>
+<span id="L824" class="LineNr"> 824 </span><span class="muScenario">scenario</span> text-find-next-empty [
+<span id="L825" class="LineNr"> 825 </span>  <span class="Constant">local-scope</span>
+<span id="L826" class="LineNr"> 826 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[]</span>
+<span id="L827" class="LineNr"> 827 </span>  run [
+<span id="L828" class="LineNr"> 828 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span>
+<span id="L829" class="LineNr"> 829 </span>  ]
+<span id="L830" class="LineNr"> 830 </span>  memory-should-contain [
+<span id="L831" class="LineNr"> 831 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
+<span id="L832" class="LineNr"> 832 </span>  ]
+<span id="L833" class="LineNr"> 833 </span>]
+<span id="L834" class="LineNr"> 834 </span>
+<span id="L835" class="LineNr"> 835 </span><span class="muScenario">scenario</span> text-find-next-initial [
+<span id="L836" class="LineNr"> 836 </span>  <span class="Constant">local-scope</span>
+<span id="L837" class="LineNr"> 837 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[/abc]</span>
+<span id="L838" class="LineNr"> 838 </span>  run [
+<span id="L839" class="LineNr"> 839 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span>
+<span id="L840" class="LineNr"> 840 </span>  ]
+<span id="L841" class="LineNr"> 841 </span>  memory-should-contain [
+<span id="L842" class="LineNr"> 842 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># prefix match</span>
+<span id="L843" class="LineNr"> 843 </span>  ]
+<span id="L844" class="LineNr"> 844 </span>]
+<span id="L845" class="LineNr"> 845 </span>
+<span id="L846" class="LineNr"> 846 </span><span class="muScenario">scenario</span> text-find-next-final [
+<span id="L847" class="LineNr"> 847 </span>  <span class="Constant">local-scope</span>
+<span id="L848" class="LineNr"> 848 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc/]</span>
+<span id="L849" class="LineNr"> 849 </span>  run [
+<span id="L850" class="LineNr"> 850 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span>
+<span id="L851" class="LineNr"> 851 </span>  ]
+<span id="L852" class="LineNr"> 852 </span>  memory-should-contain [
+<span id="L853" class="LineNr"> 853 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 3</span>  <span class="Comment"># suffix match</span>
+<span id="L854" class="LineNr"> 854 </span>  ]
+<span id="L855" class="LineNr"> 855 </span>]
+<span id="L856" class="LineNr"> 856 </span>
+<span id="L857" class="LineNr"> 857 </span><span class="muScenario">scenario</span> text-find-next-missing [
+<span id="L858" class="LineNr"> 858 </span>  <span class="Constant">local-scope</span>
+<span id="L859" class="LineNr"> 859 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abcd]</span>
+<span id="L860" class="LineNr"> 860 </span>  run [
+<span id="L861" class="LineNr"> 861 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span>
+<span id="L862" class="LineNr"> 862 </span>  ]
+<span id="L863" class="LineNr"> 863 </span>  memory-should-contain [
+<span id="L864" class="LineNr"> 864 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 4</span>  <span class="Comment"># no match</span>
+<span id="L865" class="LineNr"> 865 </span>  ]
+<span id="L866" class="LineNr"> 866 </span>]
+<span id="L867" class="LineNr"> 867 </span>
+<span id="L868" class="LineNr"> 868 </span><span class="muScenario">scenario</span> text-find-next-invalid-index [
+<span id="L869" class="LineNr"> 869 </span>  <span class="Constant">local-scope</span>
+<span id="L870" class="LineNr"> 870 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L871" class="LineNr"> 871 </span>  run [
+<span id="L872" class="LineNr"> 872 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, <span class="Constant">47/slash</span>, <span class="Constant">4/start-index</span>
+<span id="L873" class="LineNr"> 873 </span>  ]
+<span id="L874" class="LineNr"> 874 </span>  memory-should-contain [
+<span id="L875" class="LineNr"> 875 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 4</span>  <span class="Comment"># no change</span>
+<span id="L876" class="LineNr"> 876 </span>  ]
+<span id="L877" class="LineNr"> 877 </span>]
+<span id="L878" class="LineNr"> 878 </span>
+<span id="L879" class="LineNr"> 879 </span><span class="muScenario">scenario</span> text-find-next-first [
+<span id="L880" class="LineNr"> 880 </span>  <span class="Constant">local-scope</span>
+<span id="L881" class="LineNr"> 881 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[ab/c/]</span>
+<span id="L882" class="LineNr"> 882 </span>  run [
+<span id="L883" class="LineNr"> 883 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span>
+<span id="L884" class="LineNr"> 884 </span>  ]
+<span id="L885" class="LineNr"> 885 </span>  memory-should-contain [
+<span id="L886" class="LineNr"> 886 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 2</span>  <span class="Comment"># first '/' of multiple</span>
+<span id="L887" class="LineNr"> 887 </span>  ]
+<span id="L888" class="LineNr"> 888 </span>]
+<span id="L889" class="LineNr"> 889 </span>
+<span id="L890" class="LineNr"> 890 </span><span class="muScenario">scenario</span> text-find-next-second [
+<span id="L891" class="LineNr"> 891 </span>  <span class="Constant">local-scope</span>
+<span id="L892" class="LineNr"> 892 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[ab/c/]</span>
+<span id="L893" class="LineNr"> 893 </span>  run [
+<span id="L894" class="LineNr"> 894 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, <span class="Constant">47/slash</span>, <span class="Constant">3/start-index</span>
+<span id="L895" class="LineNr"> 895 </span>  ]
+<span id="L896" class="LineNr"> 896 </span>  memory-should-contain [
+<span id="L897" class="LineNr"> 897 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 4</span>  <span class="Comment"># second '/' of multiple</span>
+<span id="L898" class="LineNr"> 898 </span>  ]
+<span id="L899" class="LineNr"> 899 </span>]
+<span id="L900" class="LineNr"> 900 </span>
+<span id="L901" class="LineNr"> 901 </span><span class="Comment"># search for a pattern of multiple characters</span>
+<span id="L902" class="LineNr"> 902 </span><span class="Comment"># fairly dumb algorithm</span>
+<span id="L903" class="LineNr"> 903 </span><span class="muRecipe">def</span> find-next text:text, pattern:text, idx:num<span class="muRecipe"> -&gt; </span>next-index:num [
+<span id="L904" class="LineNr"> 904 </span>  <span class="Constant">local-scope</span>
+<span id="L905" class="LineNr"> 905 </span>  <span class="Constant">load-ingredients</span>
+<span id="L906" class="LineNr"> 906 </span>  first:char <span class="Special">&lt;-</span> index *pattern,<span class="Constant"> 0</span>
+<span id="L907" class="LineNr"> 907 </span>  <span class="Comment"># repeatedly check for match at current idx</span>
+<span id="L908" class="LineNr"> 908 </span>  len:num <span class="Special">&lt;-</span> length *text
+<span id="L909" class="LineNr"> 909 </span>  <span class="Delimiter">{</span>
+<span id="L910" class="LineNr"> 910 </span>  <span class="Conceal">¦</span> <span class="Comment"># does some unnecessary work checking even when there isn't enough of text left</span>
+<span id="L911" class="LineNr"> 911 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-or-equal idx, len
+<span id="L912" class="LineNr"> 912 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
+<span id="L913" class="LineNr"> 913 </span>  <span class="Conceal">¦</span> found?:bool <span class="Special">&lt;-</span> <a href='061text.mu.html#L984'>match-at</a> text, pattern, idx
+<span id="L914" class="LineNr"> 914 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> found?
+<span id="L915" class="LineNr"> 915 </span>  <span class="Conceal">¦</span> idx <span class="Special">&lt;-</span> add idx,<span class="Constant"> 1</span>
+<span id="L916" class="LineNr"> 916 </span>  <span class="Conceal">¦</span> <span class="Comment"># optimization: skip past indices that definitely won't match</span>
+<span id="L917" class="LineNr"> 917 </span>  <span class="Conceal">¦</span> idx <span class="Special">&lt;-</span> find-next text, first, idx
+<span id="L918" class="LineNr"> 918 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
+<span id="L919" class="LineNr"> 919 </span>  <span class="Delimiter">}</span>
+<span id="L920" class="LineNr"> 920 </span>  <span class="muControl">return</span> idx
+<span id="L921" class="LineNr"> 921 </span>]
+<span id="L922" class="LineNr"> 922 </span>
+<span id="L923" class="LineNr"> 923 </span><span class="muScenario">scenario</span> find-next-text-1 [
+<span id="L924" class="LineNr"> 924 </span>  <span class="Constant">local-scope</span>
+<span id="L925" class="LineNr"> 925 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L926" class="LineNr"> 926 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[bc]</span>
+<span id="L927" class="LineNr"> 927 </span>  run [
+<span id="L928" class="LineNr"> 928 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, y,<span class="Constant"> 0</span>
+<span id="L929" class="LineNr"> 929 </span>  ]
+<span id="L930" class="LineNr"> 930 </span>  memory-should-contain [
+<span id="L931" class="LineNr"> 931 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>
+<span id="L932" class="LineNr"> 932 </span>  ]
+<span id="L933" class="LineNr"> 933 </span>]
+<span id="L934" class="LineNr"> 934 </span>
+<span id="L935" class="LineNr"> 935 </span><span class="muScenario">scenario</span> find-next-text-2 [
+<span id="L936" class="LineNr"> 936 </span>  <span class="Constant">local-scope</span>
+<span id="L937" class="LineNr"> 937 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abcd]</span>
+<span id="L938" class="LineNr"> 938 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[bc]</span>
+<span id="L939" class="LineNr"> 939 </span>  run [
+<span id="L940" class="LineNr"> 940 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, y,<span class="Constant"> 1</span>
 <span id="L941" class="LineNr"> 941 </span>  ]
-<span id="L942" class="LineNr"> 942 </span>]
-<span id="L943" class="LineNr"> 943 </span>
-<span id="L944" class="LineNr"> 944 </span><span class="muScenario">scenario</span> find-next-text-2 [
-<span id="L945" class="LineNr"> 945 </span>  <span class="Constant">local-scope</span>
-<span id="L946" class="LineNr"> 946 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abcd]</span>
-<span id="L947" class="LineNr"> 947 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[bc]</span>
-<span id="L948" class="LineNr"> 948 </span>  run [
-<span id="L949" class="LineNr"> 949 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, y,<span class="Constant"> 1</span>
-<span id="L950" class="LineNr"> 950 </span>  ]
-<span id="L951" class="LineNr"> 951 </span>  memory-should-contain [
-<span id="L952" class="LineNr"> 952 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>
+<span id="L942" class="LineNr"> 942 </span>  memory-should-contain [
+<span id="L943" class="LineNr"> 943 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>
+<span id="L944" class="LineNr"> 944 </span>  ]
+<span id="L945" class="LineNr"> 945 </span>]
+<span id="L946" class="LineNr"> 946 </span>
+<span id="L947" class="LineNr"> 947 </span><span class="muScenario">scenario</span> find-next-no-match [
+<span id="L948" class="LineNr"> 948 </span>  <span class="Constant">local-scope</span>
+<span id="L949" class="LineNr"> 949 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L950" class="LineNr"> 950 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[bd]</span>
+<span id="L951" class="LineNr"> 951 </span>  run [
+<span id="L952" class="LineNr"> 952 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, y,<span class="Constant"> 0</span>
 <span id="L953" class="LineNr"> 953 </span>  ]
-<span id="L954" class="LineNr"> 954 </span>]
-<span id="L955" class="LineNr"> 955 </span>
-<span id="L956" class="LineNr"> 956 </span><span class="muScenario">scenario</span> find-next-no-match [
-<span id="L957" class="LineNr"> 957 </span>  <span class="Constant">local-scope</span>
-<span id="L958" class="LineNr"> 958 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L959" class="LineNr"> 959 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[bd]</span>
-<span id="L960" class="LineNr"> 960 </span>  run [
-<span id="L961" class="LineNr"> 961 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, y,<span class="Constant"> 0</span>
-<span id="L962" class="LineNr"> 962 </span>  ]
-<span id="L963" class="LineNr"> 963 </span>  memory-should-contain [
-<span id="L964" class="LineNr"> 964 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 3</span>  <span class="Comment"># not found</span>
+<span id="L954" class="LineNr"> 954 </span>  memory-should-contain [
+<span id="L955" class="LineNr"> 955 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 3</span>  <span class="Comment"># not found</span>
+<span id="L956" class="LineNr"> 956 </span>  ]
+<span id="L957" class="LineNr"> 957 </span>]
+<span id="L958" class="LineNr"> 958 </span>
+<span id="L959" class="LineNr"> 959 </span><span class="muScenario">scenario</span> find-next-suffix-match [
+<span id="L960" class="LineNr"> 960 </span>  <span class="Constant">local-scope</span>
+<span id="L961" class="LineNr"> 961 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abcd]</span>
+<span id="L962" class="LineNr"> 962 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[cd]</span>
+<span id="L963" class="LineNr"> 963 </span>  run [
+<span id="L964" class="LineNr"> 964 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, y,<span class="Constant"> 0</span>
 <span id="L965" class="LineNr"> 965 </span>  ]
-<span id="L966" class="LineNr"> 966 </span>]
-<span id="L967" class="LineNr"> 967 </span>
-<span id="L968" class="LineNr"> 968 </span><span class="muScenario">scenario</span> find-next-suffix-match [
-<span id="L969" class="LineNr"> 969 </span>  <span class="Constant">local-scope</span>
-<span id="L970" class="LineNr"> 970 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abcd]</span>
-<span id="L971" class="LineNr"> 971 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[cd]</span>
-<span id="L972" class="LineNr"> 972 </span>  run [
-<span id="L973" class="LineNr"> 973 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, y,<span class="Constant"> 0</span>
-<span id="L974" class="LineNr"> 974 </span>  ]
-<span id="L975" class="LineNr"> 975 </span>  memory-should-contain [
-<span id="L976" class="LineNr"> 976 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 2</span>
+<span id="L966" class="LineNr"> 966 </span>  memory-should-contain [
+<span id="L967" class="LineNr"> 967 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 2</span>
+<span id="L968" class="LineNr"> 968 </span>  ]
+<span id="L969" class="LineNr"> 969 </span>]
+<span id="L970" class="LineNr"> 970 </span>
+<span id="L971" class="LineNr"> 971 </span><span class="muScenario">scenario</span> find-next-suffix-match-2 [
+<span id="L972" class="LineNr"> 972 </span>  <span class="Constant">local-scope</span>
+<span id="L973" class="LineNr"> 973 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abcd]</span>
+<span id="L974" class="LineNr"> 974 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[cde]</span>
+<span id="L975" class="LineNr"> 975 </span>  run [
+<span id="L976" class="LineNr"> 976 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, y,<span class="Constant"> 0</span>
 <span id="L977" class="LineNr"> 977 </span>  ]
-<span id="L978" class="LineNr"> 978 </span>]
-<span id="L979" class="LineNr"> 979 </span>
-<span id="L980" class="LineNr"> 980 </span><span class="muScenario">scenario</span> find-next-suffix-match-2 [
-<span id="L981" class="LineNr"> 981 </span>  <span class="Constant">local-scope</span>
-<span id="L982" class="LineNr"> 982 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abcd]</span>
-<span id="L983" class="LineNr"> 983 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[cde]</span>
-<span id="L984" class="LineNr"> 984 </span>  run [
-<span id="L985" class="LineNr"> 985 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> find-next x, y,<span class="Constant"> 0</span>
-<span id="L986" class="LineNr"> 986 </span>  ]
-<span id="L987" class="LineNr"> 987 </span>  memory-should-contain [
-<span id="L988" class="LineNr"> 988 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 4</span>  <span class="Comment"># not found</span>
-<span id="L989" class="LineNr"> 989 </span>  ]
-<span id="L990" class="LineNr"> 990 </span>]
-<span id="L991" class="LineNr"> 991 </span>
-<span id="L992" class="LineNr"> 992 </span><span class="Comment"># checks if pattern matches at index 'idx'</span>
-<span id="L993" class="LineNr"> 993 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L993'>match-at</a> text:text, pattern:text, idx:num<span class="muRecipe"> -&gt; </span>result:bool [
-<span id="L994" class="LineNr"> 994 </span>  <span class="Constant">local-scope</span>
-<span id="L995" class="LineNr"> 995 </span>  <span class="Constant">load-ingredients</span>
-<span id="L996" class="LineNr"> 996 </span>  pattern-len:num <span class="Special">&lt;-</span> length *pattern
-<span id="L997" class="LineNr"> 997 </span>  <span class="Comment"># check that there's space left for the pattern</span>
-<span id="L998" class="LineNr"> 998 </span>  <span class="Delimiter">{</span>
-<span id="L999" class="LineNr"> 999 </span>  <span class="Conceal">¦</span> x:num <span class="Special">&lt;-</span> length *text
-<span id="L1000" class="LineNr">1000 </span>  <span class="Conceal">¦</span> x <span class="Special">&lt;-</span> subtract x, pattern-len
-<span id="L1001" class="LineNr">1001 </span>  <span class="Conceal">¦</span> enough-room?:bool <span class="Special">&lt;-</span> lesser-or-equal idx, x
-<span id="L1002" class="LineNr">1002 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> enough-room?
-<span id="L1003" class="LineNr">1003 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span> <span class="Constant">0/not-found</span>
-<span id="L1004" class="LineNr">1004 </span>  <span class="Delimiter">}</span>
-<span id="L1005" class="LineNr">1005 </span>  <span class="Comment"># check each character of pattern</span>
-<span id="L1006" class="LineNr">1006 </span>  pattern-idx:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
-<span id="L1007" class="LineNr">1007 </span>  <span class="Delimiter">{</span>
-<span id="L1008" class="LineNr">1008 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-or-equal pattern-idx, pattern-len
-<span id="L1009" class="LineNr">1009 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
-<span id="L1010" class="LineNr">1010 </span>  <span class="Conceal">¦</span> c:char <span class="Special">&lt;-</span> index *text, idx
-<span id="L1011" class="LineNr">1011 </span>  <span class="Conceal">¦</span> exp:char <span class="Special">&lt;-</span> index *pattern, pattern-idx
-<span id="L1012" class="LineNr">1012 </span>  <span class="Conceal">¦</span> <span class="Delimiter">{</span>
-<span id="L1013" class="LineNr">1013 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> match?:bool <span class="Special">&lt;-</span> equal c, exp
-<span id="L1014" class="LineNr">1014 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">break-if</span> match?
-<span id="L1015" class="LineNr">1015 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">return</span> <span class="Constant">0/not-found</span>
-<span id="L1016" class="LineNr">1016 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L1017" class="LineNr">1017 </span>  <span class="Conceal">¦</span> idx <span class="Special">&lt;-</span> add idx,<span class="Constant"> 1</span>
-<span id="L1018" class="LineNr">1018 </span>  <span class="Conceal">¦</span> pattern-idx <span class="Special">&lt;-</span> add pattern-idx,<span class="Constant"> 1</span>
-<span id="L1019" class="LineNr">1019 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
-<span id="L1020" class="LineNr">1020 </span>  <span class="Delimiter">}</span>
-<span id="L1021" class="LineNr">1021 </span>  <span class="muControl">return</span> <span class="Constant">1/found</span>
-<span id="L1022" class="LineNr">1022 </span>]
-<span id="L1023" class="LineNr">1023 </span>
-<span id="L1024" class="LineNr">1024 </span><span class="muScenario">scenario</span> match-at-checks-pattern-at-index [
-<span id="L1025" class="LineNr">1025 </span>  <span class="Constant">local-scope</span>
-<span id="L1026" class="LineNr">1026 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L1027" class="LineNr">1027 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[ab]</span>
-<span id="L1028" class="LineNr">1028 </span>  run [
-<span id="L1029" class="LineNr">1029 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L993'>match-at</a> x, y,<span class="Constant"> 0</span>
-<span id="L1030" class="LineNr">1030 </span>  ]
-<span id="L1031" class="LineNr">1031 </span>  memory-should-contain [
-<span id="L1032" class="LineNr">1032 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># match found</span>
-<span id="L1033" class="LineNr">1033 </span>  ]
-<span id="L1034" class="LineNr">1034 </span>]
-<span id="L1035" class="LineNr">1035 </span>
-<span id="L1036" class="LineNr">1036 </span><span class="muScenario">scenario</span> match-at-reflexive [
-<span id="L1037" class="LineNr">1037 </span>  <span class="Constant">local-scope</span>
-<span id="L1038" class="LineNr">1038 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L1039" class="LineNr">1039 </span>  run [
-<span id="L1040" class="LineNr">1040 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L993'>match-at</a> x, x,<span class="Constant"> 0</span>
+<span id="L978" class="LineNr"> 978 </span>  memory-should-contain [
+<span id="L979" class="LineNr"> 979 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 4</span>  <span class="Comment"># not found</span>
+<span id="L980" class="LineNr"> 980 </span>  ]
+<span id="L981" class="LineNr"> 981 </span>]
+<span id="L982" class="LineNr"> 982 </span>
+<span id="L983" class="LineNr"> 983 </span><span class="Comment"># checks if pattern matches at index 'idx'</span>
+<span id="L984" class="LineNr"> 984 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L984'>match-at</a> text:text, pattern:text, idx:num<span class="muRecipe"> -&gt; </span>result:bool [
+<span id="L985" class="LineNr"> 985 </span>  <span class="Constant">local-scope</span>
+<span id="L986" class="LineNr"> 986 </span>  <span class="Constant">load-ingredients</span>
+<span id="L987" class="LineNr"> 987 </span>  pattern-len:num <span class="Special">&lt;-</span> length *pattern
+<span id="L988" class="LineNr"> 988 </span>  <span class="Comment"># check that there's space left for the pattern</span>
+<span id="L989" class="LineNr"> 989 </span>  x:num <span class="Special">&lt;-</span> length *text
+<span id="L990" class="LineNr"> 990 </span>  x <span class="Special">&lt;-</span> subtract x, pattern-len
+<span id="L991" class="LineNr"> 991 </span>  enough-room?:bool <span class="Special">&lt;-</span> lesser-or-equal idx, x
+<span id="L992" class="LineNr"> 992 </span>  <span class="muControl">return-unless</span> enough-room?, <span class="Constant">0/not-found</span>
+<span id="L993" class="LineNr"> 993 </span>  <span class="Comment"># check each character of pattern</span>
+<span id="L994" class="LineNr"> 994 </span>  pattern-idx:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
+<span id="L995" class="LineNr"> 995 </span>  <span class="Delimiter">{</span>
+<span id="L996" class="LineNr"> 996 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-or-equal pattern-idx, pattern-len
+<span id="L997" class="LineNr"> 997 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
+<span id="L998" class="LineNr"> 998 </span>  <span class="Conceal">¦</span> c:char <span class="Special">&lt;-</span> index *text, idx
+<span id="L999" class="LineNr"> 999 </span>  <span class="Conceal">¦</span> exp:char <span class="Special">&lt;-</span> index *pattern, pattern-idx
+<span id="L1000" class="LineNr">1000 </span>  <span class="Conceal">¦</span> match?:bool <span class="Special">&lt;-</span> equal c, exp
+<span id="L1001" class="LineNr">1001 </span>  <span class="Conceal">¦</span> <span class="muControl">return-unless</span> match?, <span class="Constant">0/not-found</span>
+<span id="L1002" class="LineNr">1002 </span>  <span class="Conceal">¦</span> idx <span class="Special">&lt;-</span> add idx,<span class="Constant"> 1</span>
+<span id="L1003" class="LineNr">1003 </span>  <span class="Conceal">¦</span> pattern-idx <span class="Special">&lt;-</span> add pattern-idx,<span class="Constant"> 1</span>
+<span id="L1004" class="LineNr">1004 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
+<span id="L1005" class="LineNr">1005 </span>  <span class="Delimiter">}</span>
+<span id="L1006" class="LineNr">1006 </span>  <span class="muControl">return</span> <span class="Constant">1/found</span>
+<span id="L1007" class="LineNr">1007 </span>]
+<span id="L1008" class="LineNr">1008 </span>
+<span id="L1009" class="LineNr">1009 </span><span class="muScenario">scenario</span> match-at-checks-pattern-at-index [
+<span id="L1010" class="LineNr">1010 </span>  <span class="Constant">local-scope</span>
+<span id="L1011" class="LineNr">1011 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L1012" class="LineNr">1012 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[ab]</span>
+<span id="L1013" class="LineNr">1013 </span>  run [
+<span id="L1014" class="LineNr">1014 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L984'>match-at</a> x, y,<span class="Constant"> 0</span>
+<span id="L1015" class="LineNr">1015 </span>  ]
+<span id="L1016" class="LineNr">1016 </span>  memory-should-contain [
+<span id="L1017" class="LineNr">1017 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># match found</span>
+<span id="L1018" class="LineNr">1018 </span>  ]
+<span id="L1019" class="LineNr">1019 </span>]
+<span id="L1020" class="LineNr">1020 </span>
+<span id="L1021" class="LineNr">1021 </span><span class="muScenario">scenario</span> match-at-reflexive [
+<span id="L1022" class="LineNr">1022 </span>  <span class="Constant">local-scope</span>
+<span id="L1023" class="LineNr">1023 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L1024" class="LineNr">1024 </span>  run [
+<span id="L1025" class="LineNr">1025 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L984'>match-at</a> x, x,<span class="Constant"> 0</span>
+<span id="L1026" class="LineNr">1026 </span>  ]
+<span id="L1027" class="LineNr">1027 </span>  memory-should-contain [
+<span id="L1028" class="LineNr">1028 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># match found</span>
+<span id="L1029" class="LineNr">1029 </span>  ]
+<span id="L1030" class="LineNr">1030 </span>]
+<span id="L1031" class="LineNr">1031 </span>
+<span id="L1032" class="LineNr">1032 </span><span class="muScenario">scenario</span> match-at-outside-bounds [
+<span id="L1033" class="LineNr">1033 </span>  <span class="Constant">local-scope</span>
+<span id="L1034" class="LineNr">1034 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L1035" class="LineNr">1035 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[a]</span>
+<span id="L1036" class="LineNr">1036 </span>  run [
+<span id="L1037" class="LineNr">1037 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L984'>match-at</a> x, y,<span class="Constant"> 4</span>
+<span id="L1038" class="LineNr">1038 </span>  ]
+<span id="L1039" class="LineNr">1039 </span>  memory-should-contain [
+<span id="L1040" class="LineNr">1040 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># never matches</span>
 <span id="L1041" class="LineNr">1041 </span>  ]
-<span id="L1042" class="LineNr">1042 </span>  memory-should-contain [
-<span id="L1043" class="LineNr">1043 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># match found</span>
-<span id="L1044" class="LineNr">1044 </span>  ]
-<span id="L1045" class="LineNr">1045 </span>]
-<span id="L1046" class="LineNr">1046 </span>
-<span id="L1047" class="LineNr">1047 </span><span class="muScenario">scenario</span> match-at-outside-bounds [
-<span id="L1048" class="LineNr">1048 </span>  <span class="Constant">local-scope</span>
-<span id="L1049" class="LineNr">1049 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L1050" class="LineNr">1050 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[a]</span>
-<span id="L1051" class="LineNr">1051 </span>  run [
-<span id="L1052" class="LineNr">1052 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L993'>match-at</a> x, y,<span class="Constant"> 4</span>
+<span id="L1042" class="LineNr">1042 </span>]
+<span id="L1043" class="LineNr">1043 </span>
+<span id="L1044" class="LineNr">1044 </span><span class="muScenario">scenario</span> match-at-empty-pattern [
+<span id="L1045" class="LineNr">1045 </span>  <span class="Constant">local-scope</span>
+<span id="L1046" class="LineNr">1046 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L1047" class="LineNr">1047 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[]</span>
+<span id="L1048" class="LineNr">1048 </span>  run [
+<span id="L1049" class="LineNr">1049 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L984'>match-at</a> x, y,<span class="Constant"> 0</span>
+<span id="L1050" class="LineNr">1050 </span>  ]
+<span id="L1051" class="LineNr">1051 </span>  memory-should-contain [
+<span id="L1052" class="LineNr">1052 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># always matches empty pattern given a valid index</span>
 <span id="L1053" class="LineNr">1053 </span>  ]
-<span id="L1054" class="LineNr">1054 </span>  memory-should-contain [
-<span id="L1055" class="LineNr">1055 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># never matches</span>
-<span id="L1056" class="LineNr">1056 </span>  ]
-<span id="L1057" class="LineNr">1057 </span>]
-<span id="L1058" class="LineNr">1058 </span>
-<span id="L1059" class="LineNr">1059 </span><span class="muScenario">scenario</span> match-at-empty-pattern [
-<span id="L1060" class="LineNr">1060 </span>  <span class="Constant">local-scope</span>
-<span id="L1061" class="LineNr">1061 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L1062" class="LineNr">1062 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[]</span>
-<span id="L1063" class="LineNr">1063 </span>  run [
-<span id="L1064" class="LineNr">1064 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L993'>match-at</a> x, y,<span class="Constant"> 0</span>
+<span id="L1054" class="LineNr">1054 </span>]
+<span id="L1055" class="LineNr">1055 </span>
+<span id="L1056" class="LineNr">1056 </span><span class="muScenario">scenario</span> match-at-empty-pattern-outside-bound [
+<span id="L1057" class="LineNr">1057 </span>  <span class="Constant">local-scope</span>
+<span id="L1058" class="LineNr">1058 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L1059" class="LineNr">1059 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[]</span>
+<span id="L1060" class="LineNr">1060 </span>  run [
+<span id="L1061" class="LineNr">1061 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L984'>match-at</a> x, y,<span class="Constant"> 4</span>
+<span id="L1062" class="LineNr">1062 </span>  ]
+<span id="L1063" class="LineNr">1063 </span>  memory-should-contain [
+<span id="L1064" class="LineNr">1064 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># no match</span>
 <span id="L1065" class="LineNr">1065 </span>  ]
-<span id="L1066" class="LineNr">1066 </span>  memory-should-contain [
-<span id="L1067" class="LineNr">1067 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># always matches empty pattern given a valid index</span>
-<span id="L1068" class="LineNr">1068 </span>  ]
-<span id="L1069" class="LineNr">1069 </span>]
-<span id="L1070" class="LineNr">1070 </span>
-<span id="L1071" class="LineNr">1071 </span><span class="muScenario">scenario</span> match-at-empty-pattern-outside-bound [
-<span id="L1072" class="LineNr">1072 </span>  <span class="Constant">local-scope</span>
-<span id="L1073" class="LineNr">1073 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L1074" class="LineNr">1074 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[]</span>
-<span id="L1075" class="LineNr">1075 </span>  run [
-<span id="L1076" class="LineNr">1076 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L993'>match-at</a> x, y,<span class="Constant"> 4</span>
+<span id="L1066" class="LineNr">1066 </span>]
+<span id="L1067" class="LineNr">1067 </span>
+<span id="L1068" class="LineNr">1068 </span><span class="muScenario">scenario</span> match-at-empty-text [
+<span id="L1069" class="LineNr">1069 </span>  <span class="Constant">local-scope</span>
+<span id="L1070" class="LineNr">1070 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[]</span>
+<span id="L1071" class="LineNr">1071 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L1072" class="LineNr">1072 </span>  run [
+<span id="L1073" class="LineNr">1073 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L984'>match-at</a> x, y,<span class="Constant"> 0</span>
+<span id="L1074" class="LineNr">1074 </span>  ]
+<span id="L1075" class="LineNr">1075 </span>  memory-should-contain [
+<span id="L1076" class="LineNr">1076 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># no match</span>
 <span id="L1077" class="LineNr">1077 </span>  ]
-<span id="L1078" class="LineNr">1078 </span>  memory-should-contain [
-<span id="L1079" class="LineNr">1079 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># no match</span>
-<span id="L1080" class="LineNr">1080 </span>  ]
-<span id="L1081" class="LineNr">1081 </span>]
-<span id="L1082" class="LineNr">1082 </span>
-<span id="L1083" class="LineNr">1083 </span><span class="muScenario">scenario</span> match-at-empty-text [
-<span id="L1084" class="LineNr">1084 </span>  <span class="Constant">local-scope</span>
-<span id="L1085" class="LineNr">1085 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[]</span>
-<span id="L1086" class="LineNr">1086 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L1087" class="LineNr">1087 </span>  run [
-<span id="L1088" class="LineNr">1088 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L993'>match-at</a> x, y,<span class="Constant"> 0</span>
-<span id="L1089" class="LineNr">1089 </span>  ]
-<span id="L1090" class="LineNr">1090 </span>  memory-should-contain [
-<span id="L1091" class="LineNr">1091 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># no match</span>
-<span id="L1092" class="LineNr">1092 </span>  ]
-<span id="L1093" class="LineNr">1093 </span>]
-<span id="L1094" class="LineNr">1094 </span>
-<span id="L1095" class="LineNr">1095 </span><span class="muScenario">scenario</span> match-at-empty-against-empty [
-<span id="L1096" class="LineNr">1096 </span>  <span class="Constant">local-scope</span>
-<span id="L1097" class="LineNr">1097 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[]</span>
-<span id="L1098" class="LineNr">1098 </span>  run [
-<span id="L1099" class="LineNr">1099 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L993'>match-at</a> x, x,<span class="Constant"> 0</span>
+<span id="L1078" class="LineNr">1078 </span>]
+<span id="L1079" class="LineNr">1079 </span>
+<span id="L1080" class="LineNr">1080 </span><span class="muScenario">scenario</span> match-at-empty-against-empty [
+<span id="L1081" class="LineNr">1081 </span>  <span class="Constant">local-scope</span>
+<span id="L1082" class="LineNr">1082 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[]</span>
+<span id="L1083" class="LineNr">1083 </span>  run [
+<span id="L1084" class="LineNr">1084 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L984'>match-at</a> x, x,<span class="Constant"> 0</span>
+<span id="L1085" class="LineNr">1085 </span>  ]
+<span id="L1086" class="LineNr">1086 </span>  memory-should-contain [
+<span id="L1087" class="LineNr">1087 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># matches because pattern is also empty</span>
+<span id="L1088" class="LineNr">1088 </span>  ]
+<span id="L1089" class="LineNr">1089 </span>]
+<span id="L1090" class="LineNr">1090 </span>
+<span id="L1091" class="LineNr">1091 </span><span class="muScenario">scenario</span> match-at-inside-bounds [
+<span id="L1092" class="LineNr">1092 </span>  <span class="Constant">local-scope</span>
+<span id="L1093" class="LineNr">1093 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L1094" class="LineNr">1094 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[bc]</span>
+<span id="L1095" class="LineNr">1095 </span>  run [
+<span id="L1096" class="LineNr">1096 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L984'>match-at</a> x, y,<span class="Constant"> 1</span>
+<span id="L1097" class="LineNr">1097 </span>  ]
+<span id="L1098" class="LineNr">1098 </span>  memory-should-contain [
+<span id="L1099" class="LineNr">1099 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># match</span>
 <span id="L1100" class="LineNr">1100 </span>  ]
-<span id="L1101" class="LineNr">1101 </span>  memory-should-contain [
-<span id="L1102" class="LineNr">1102 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># matches because pattern is also empty</span>
-<span id="L1103" class="LineNr">1103 </span>  ]
-<span id="L1104" class="LineNr">1104 </span>]
-<span id="L1105" class="LineNr">1105 </span>
-<span id="L1106" class="LineNr">1106 </span><span class="muScenario">scenario</span> match-at-inside-bounds [
-<span id="L1107" class="LineNr">1107 </span>  <span class="Constant">local-scope</span>
-<span id="L1108" class="LineNr">1108 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L1109" class="LineNr">1109 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[bc]</span>
-<span id="L1110" class="LineNr">1110 </span>  run [
-<span id="L1111" class="LineNr">1111 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L993'>match-at</a> x, y,<span class="Constant"> 1</span>
+<span id="L1101" class="LineNr">1101 </span>]
+<span id="L1102" class="LineNr">1102 </span>
+<span id="L1103" class="LineNr">1103 </span><span class="muScenario">scenario</span> match-at-inside-bounds-2 [
+<span id="L1104" class="LineNr">1104 </span>  <span class="Constant">local-scope</span>
+<span id="L1105" class="LineNr">1105 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L1106" class="LineNr">1106 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[bc]</span>
+<span id="L1107" class="LineNr">1107 </span>  run [
+<span id="L1108" class="LineNr">1108 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L984'>match-at</a> x, y,<span class="Constant"> 0</span>
+<span id="L1109" class="LineNr">1109 </span>  ]
+<span id="L1110" class="LineNr">1110 </span>  memory-should-contain [
+<span id="L1111" class="LineNr">1111 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># no match</span>
 <span id="L1112" class="LineNr">1112 </span>  ]
-<span id="L1113" class="LineNr">1113 </span>  memory-should-contain [
-<span id="L1114" class="LineNr">1114 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># match</span>
-<span id="L1115" class="LineNr">1115 </span>  ]
-<span id="L1116" class="LineNr">1116 </span>]
-<span id="L1117" class="LineNr">1117 </span>
-<span id="L1118" class="LineNr">1118 </span><span class="muScenario">scenario</span> match-at-inside-bounds-2 [
-<span id="L1119" class="LineNr">1119 </span>  <span class="Constant">local-scope</span>
-<span id="L1120" class="LineNr">1120 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L1121" class="LineNr">1121 </span>  y:text <span class="Special">&lt;-</span> new <span class="Constant">[bc]</span>
-<span id="L1122" class="LineNr">1122 </span>  run [
-<span id="L1123" class="LineNr">1123 </span>  <span class="Conceal">¦</span> 10:bool/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L993'>match-at</a> x, y,<span class="Constant"> 0</span>
-<span id="L1124" class="LineNr">1124 </span>  ]
-<span id="L1125" class="LineNr">1125 </span>  memory-should-contain [
-<span id="L1126" class="LineNr">1126 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># no match</span>
-<span id="L1127" class="LineNr">1127 </span>  ]
-<span id="L1128" class="LineNr">1128 </span>]
-<span id="L1129" class="LineNr">1129 </span>
-<span id="L1130" class="LineNr">1130 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L1130'>split</a> s:text, delim:char<span class="muRecipe"> -&gt; </span>result:&amp;:@:text [
-<span id="L1131" class="LineNr">1131 </span>  <span class="Constant">local-scope</span>
-<span id="L1132" class="LineNr">1132 </span>  <span class="Constant">load-ingredients</span>
-<span id="L1133" class="LineNr">1133 </span>  <span class="Comment"># empty text? return empty array</span>
-<span id="L1134" class="LineNr">1134 </span>  len:num <span class="Special">&lt;-</span> length *s
-<span id="L1135" class="LineNr">1135 </span>  <span class="Delimiter">{</span>
-<span id="L1136" class="LineNr">1136 </span>  <span class="Conceal">¦</span> empty?:bool <span class="Special">&lt;-</span> equal len,<span class="Constant"> 0</span>
-<span id="L1137" class="LineNr">1137 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> empty?
-<span id="L1138" class="LineNr">1138 </span>  <span class="Conceal">¦</span> result <span class="Special">&lt;-</span> new <span class="Delimiter">{</span>(address array character): type<span class="Delimiter">}</span>,<span class="Constant"> 0</span>
-<span id="L1139" class="LineNr">1139 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span>
-<span id="L1140" class="LineNr">1140 </span>  <span class="Delimiter">}</span>
-<span id="L1141" class="LineNr">1141 </span>  <span class="Comment"># count #pieces we need room for</span>
-<span id="L1142" class="LineNr">1142 </span>  count:num <span class="Special">&lt;-</span> copy<span class="Constant"> 1</span>  <span class="Comment"># n delimiters = n+1 pieces</span>
-<span id="L1143" class="LineNr">1143 </span>  idx:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
-<span id="L1144" class="LineNr">1144 </span>  <span class="Delimiter">{</span>
-<span id="L1145" class="LineNr">1145 </span>  <span class="Conceal">¦</span> idx <span class="Special">&lt;-</span> find-next s, delim, idx
-<span id="L1146" class="LineNr">1146 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-or-equal idx, len
-<span id="L1147" class="LineNr">1147 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
-<span id="L1148" class="LineNr">1148 </span>  <span class="Conceal">¦</span> idx <span class="Special">&lt;-</span> add idx,<span class="Constant"> 1</span>
-<span id="L1149" class="LineNr">1149 </span>  <span class="Conceal">¦</span> count <span class="Special">&lt;-</span> add count,<span class="Constant"> 1</span>
-<span id="L1150" class="LineNr">1150 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
-<span id="L1151" class="LineNr">1151 </span>  <span class="Delimiter">}</span>
-<span id="L1152" class="LineNr">1152 </span>  <span class="Comment"># allocate space</span>
-<span id="L1153" class="LineNr">1153 </span>  result <span class="Special">&lt;-</span> new <span class="Delimiter">{</span>(address array character): type<span class="Delimiter">}</span>, count
-<span id="L1154" class="LineNr">1154 </span>  <span class="Comment"># repeatedly copy slices start..end until delimiter into result[curr-result]</span>
-<span id="L1155" class="LineNr">1155 </span>  curr-result:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
-<span id="L1156" class="LineNr">1156 </span>  start:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
-<span id="L1157" class="LineNr">1157 </span>  <span class="Delimiter">{</span>
-<span id="L1158" class="LineNr">1158 </span>  <span class="Conceal">¦</span> <span class="Comment"># while next delim exists</span>
-<span id="L1159" class="LineNr">1159 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-or-equal start, len
-<span id="L1160" class="LineNr">1160 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
-<span id="L1161" class="LineNr">1161 </span>  <span class="Conceal">¦</span> end:num <span class="Special">&lt;-</span> find-next s, delim, start
-<span id="L1162" class="LineNr">1162 </span>  <span class="Conceal">¦</span> <span class="Comment"># copy start..end into result[curr-result]</span>
-<span id="L1163" class="LineNr">1163 </span>  <span class="Conceal">¦</span> dest:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1294'>copy-range</a> s, start, end
-<span id="L1164" class="LineNr">1164 </span>  <span class="Conceal">¦</span> *result <span class="Special">&lt;-</span> put-index *result, curr-result, dest
-<span id="L1165" class="LineNr">1165 </span>  <span class="Conceal">¦</span> <span class="Comment"># slide over to next slice</span>
-<span id="L1166" class="LineNr">1166 </span>  <span class="Conceal">¦</span> start <span class="Special">&lt;-</span> add end,<span class="Constant"> 1</span>
-<span id="L1167" class="LineNr">1167 </span>  <span class="Conceal">¦</span> curr-result <span class="Special">&lt;-</span> add curr-result,<span class="Constant"> 1</span>
-<span id="L1168" class="LineNr">1168 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
-<span id="L1169" class="LineNr">1169 </span>  <span class="Delimiter">}</span>
-<span id="L1170" class="LineNr">1170 </span>]
-<span id="L1171" class="LineNr">1171 </span>
-<span id="L1172" class="LineNr">1172 </span><span class="muScenario">scenario</span> text-split-1 [
-<span id="L1173" class="LineNr">1173 </span>  <span class="Constant">local-scope</span>
-<span id="L1174" class="LineNr">1174 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[a/b]</span>
-<span id="L1175" class="LineNr">1175 </span>  run [
-<span id="L1176" class="LineNr">1176 </span>  <span class="Conceal">¦</span> y:&amp;:@:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1130'>split</a> x, <span class="Constant">47/slash</span>
-<span id="L1177" class="LineNr">1177 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> length *y
-<span id="L1178" class="LineNr">1178 </span>  <span class="Conceal">¦</span> a:text <span class="Special">&lt;-</span> index *y,<span class="Constant"> 0</span>
-<span id="L1179" class="LineNr">1179 </span>  <span class="Conceal">¦</span> b:text <span class="Special">&lt;-</span> index *y,<span class="Constant"> 1</span>
-<span id="L1180" class="LineNr">1180 </span>  <span class="Conceal">¦</span> 20:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *a
-<span id="L1181" class="LineNr">1181 </span>  <span class="Conceal">¦</span> 30:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *b
-<span id="L1182" class="LineNr">1182 </span>  ]
-<span id="L1183" class="LineNr">1183 </span>  memory-should-contain [
-<span id="L1184" class="LineNr">1184 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 2</span>  <span class="Comment"># length of result</span>
-<span id="L1185" class="LineNr">1185 </span>  <span class="Conceal">¦</span> 20:array:character <span class="Special">&lt;-</span> <span class="Constant">[a]</span>
-<span id="L1186" class="LineNr">1186 </span>  <span class="Conceal">¦</span> 30:array:character <span class="Special">&lt;-</span> <span class="Constant">[b]</span>
+<span id="L1113" class="LineNr">1113 </span>]
+<span id="L1114" class="LineNr">1114 </span>
+<span id="L1115" class="LineNr">1115 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L1115'>split</a> s:text, delim:char<span class="muRecipe"> -&gt; </span>result:&amp;:@:text [
+<span id="L1116" class="LineNr">1116 </span>  <span class="Constant">local-scope</span>
+<span id="L1117" class="LineNr">1117 </span>  <span class="Constant">load-ingredients</span>
+<span id="L1118" class="LineNr">1118 </span>  <span class="Comment"># empty text? return empty array</span>
+<span id="L1119" class="LineNr">1119 </span>  len:num <span class="Special">&lt;-</span> length *s
+<span id="L1120" class="LineNr">1120 </span>  <span class="Delimiter">{</span>
+<span id="L1121" class="LineNr">1121 </span>  <span class="Conceal">¦</span> empty?:bool <span class="Special">&lt;-</span> equal len,<span class="Constant"> 0</span>
+<span id="L1122" class="LineNr">1122 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> empty?
+<span id="L1123" class="LineNr">1123 </span>  <span class="Conceal">¦</span> result <span class="Special">&lt;-</span> new <span class="Delimiter">{</span>(address array character): type<span class="Delimiter">}</span>,<span class="Constant"> 0</span>
+<span id="L1124" class="LineNr">1124 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span>
+<span id="L1125" class="LineNr">1125 </span>  <span class="Delimiter">}</span>
+<span id="L1126" class="LineNr">1126 </span>  <span class="Comment"># count #pieces we need room for</span>
+<span id="L1127" class="LineNr">1127 </span>  count:num <span class="Special">&lt;-</span> copy<span class="Constant"> 1</span>  <span class="Comment"># n delimiters = n+1 pieces</span>
+<span id="L1128" class="LineNr">1128 </span>  idx:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
+<span id="L1129" class="LineNr">1129 </span>  <span class="Delimiter">{</span>
+<span id="L1130" class="LineNr">1130 </span>  <span class="Conceal">¦</span> idx <span class="Special">&lt;-</span> find-next s, delim, idx
+<span id="L1131" class="LineNr">1131 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-or-equal idx, len
+<span id="L1132" class="LineNr">1132 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
+<span id="L1133" class="LineNr">1133 </span>  <span class="Conceal">¦</span> idx <span class="Special">&lt;-</span> add idx,<span class="Constant"> 1</span>
+<span id="L1134" class="LineNr">1134 </span>  <span class="Conceal">¦</span> count <span class="Special">&lt;-</span> add count,<span class="Constant"> 1</span>
+<span id="L1135" class="LineNr">1135 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
+<span id="L1136" class="LineNr">1136 </span>  <span class="Delimiter">}</span>
+<span id="L1137" class="LineNr">1137 </span>  <span class="Comment"># allocate space</span>
+<span id="L1138" class="LineNr">1138 </span>  result <span class="Special">&lt;-</span> new <span class="Delimiter">{</span>(address array character): type<span class="Delimiter">}</span>, count
+<span id="L1139" class="LineNr">1139 </span>  <span class="Comment"># repeatedly copy slices start..end until delimiter into result[curr-result]</span>
+<span id="L1140" class="LineNr">1140 </span>  curr-result:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
+<span id="L1141" class="LineNr">1141 </span>  start:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
+<span id="L1142" class="LineNr">1142 </span>  <span class="Delimiter">{</span>
+<span id="L1143" class="LineNr">1143 </span>  <span class="Conceal">¦</span> <span class="Comment"># while next delim exists</span>
+<span id="L1144" class="LineNr">1144 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-or-equal start, len
+<span id="L1145" class="LineNr">1145 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
+<span id="L1146" class="LineNr">1146 </span>  <span class="Conceal">¦</span> end:num <span class="Special">&lt;-</span> find-next s, delim, start
+<span id="L1147" class="LineNr">1147 </span>  <span class="Conceal">¦</span> <span class="Comment"># copy start..end into result[curr-result]</span>
+<span id="L1148" class="LineNr">1148 </span>  <span class="Conceal">¦</span> dest:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1279'>copy-range</a> s, start, end
+<span id="L1149" class="LineNr">1149 </span>  <span class="Conceal">¦</span> *result <span class="Special">&lt;-</span> put-index *result, curr-result, dest
+<span id="L1150" class="LineNr">1150 </span>  <span class="Conceal">¦</span> <span class="Comment"># slide over to next slice</span>
+<span id="L1151" class="LineNr">1151 </span>  <span class="Conceal">¦</span> start <span class="Special">&lt;-</span> add end,<span class="Constant"> 1</span>
+<span id="L1152" class="LineNr">1152 </span>  <span class="Conceal">¦</span> curr-result <span class="Special">&lt;-</span> add curr-result,<span class="Constant"> 1</span>
+<span id="L1153" class="LineNr">1153 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
+<span id="L1154" class="LineNr">1154 </span>  <span class="Delimiter">}</span>
+<span id="L1155" class="LineNr">1155 </span>]
+<span id="L1156" class="LineNr">1156 </span>
+<span id="L1157" class="LineNr">1157 </span><span class="muScenario">scenario</span> text-split-1 [
+<span id="L1158" class="LineNr">1158 </span>  <span class="Constant">local-scope</span>
+<span id="L1159" class="LineNr">1159 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[a/b]</span>
+<span id="L1160" class="LineNr">1160 </span>  run [
+<span id="L1161" class="LineNr">1161 </span>  <span class="Conceal">¦</span> y:&amp;:@:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1115'>split</a> x, <span class="Constant">47/slash</span>
+<span id="L1162" class="LineNr">1162 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> length *y
+<span id="L1163" class="LineNr">1163 </span>  <span class="Conceal">¦</span> a:text <span class="Special">&lt;-</span> index *y,<span class="Constant"> 0</span>
+<span id="L1164" class="LineNr">1164 </span>  <span class="Conceal">¦</span> b:text <span class="Special">&lt;-</span> index *y,<span class="Constant"> 1</span>
+<span id="L1165" class="LineNr">1165 </span>  <span class="Conceal">¦</span> 20:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *a
+<span id="L1166" class="LineNr">1166 </span>  <span class="Conceal">¦</span> 30:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *b
+<span id="L1167" class="LineNr">1167 </span>  ]
+<span id="L1168" class="LineNr">1168 </span>  memory-should-contain [
+<span id="L1169" class="LineNr">1169 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 2</span>  <span class="Comment"># length of result</span>
+<span id="L1170" class="LineNr">1170 </span>  <span class="Conceal">¦</span> 20:array:character <span class="Special">&lt;-</span> <span class="Constant">[a]</span>
+<span id="L1171" class="LineNr">1171 </span>  <span class="Conceal">¦</span> 30:array:character <span class="Special">&lt;-</span> <span class="Constant">[b]</span>
+<span id="L1172" class="LineNr">1172 </span>  ]
+<span id="L1173" class="LineNr">1173 </span>]
+<span id="L1174" class="LineNr">1174 </span>
+<span id="L1175" class="LineNr">1175 </span><span class="muScenario">scenario</span> text-split-2 [
+<span id="L1176" class="LineNr">1176 </span>  <span class="Constant">local-scope</span>
+<span id="L1177" class="LineNr">1177 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[a/b/c]</span>
+<span id="L1178" class="LineNr">1178 </span>  run [
+<span id="L1179" class="LineNr">1179 </span>  <span class="Conceal">¦</span> y:&amp;:@:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1115'>split</a> x, <span class="Constant">47/slash</span>
+<span id="L1180" class="LineNr">1180 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> length *y
+<span id="L1181" class="LineNr">1181 </span>  <span class="Conceal">¦</span> a:text <span class="Special">&lt;-</span> index *y,<span class="Constant"> 0</span>
+<span id="L1182" class="LineNr">1182 </span>  <span class="Conceal">¦</span> b:text <span class="Special">&lt;-</span> index *y,<span class="Constant"> 1</span>
+<span id="L1183" class="LineNr">1183 </span>  <span class="Conceal">¦</span> c:text <span class="Special">&lt;-</span> index *y,<span class="Constant"> 2</span>
+<span id="L1184" class="LineNr">1184 </span>  <span class="Conceal">¦</span> 20:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *a
+<span id="L1185" class="LineNr">1185 </span>  <span class="Conceal">¦</span> 30:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *b
+<span id="L1186" class="LineNr">1186 </span>  <span class="Conceal">¦</span> 40:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *c
 <span id="L1187" class="LineNr">1187 </span>  ]
-<span id="L1188" class="LineNr">1188 </span>]
-<span id="L1189" class="LineNr">1189 </span>
-<span id="L1190" class="LineNr">1190 </span><span class="muScenario">scenario</span> text-split-2 [
-<span id="L1191" class="LineNr">1191 </span>  <span class="Constant">local-scope</span>
-<span id="L1192" class="LineNr">1192 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[a/b/c]</span>
-<span id="L1193" class="LineNr">1193 </span>  run [
-<span id="L1194" class="LineNr">1194 </span>  <span class="Conceal">¦</span> y:&amp;:@:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1130'>split</a> x, <span class="Constant">47/slash</span>
-<span id="L1195" class="LineNr">1195 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> length *y
-<span id="L1196" class="LineNr">1196 </span>  <span class="Conceal">¦</span> a:text <span class="Special">&lt;-</span> index *y,<span class="Constant"> 0</span>
-<span id="L1197" class="LineNr">1197 </span>  <span class="Conceal">¦</span> b:text <span class="Special">&lt;-</span> index *y,<span class="Constant"> 1</span>
-<span id="L1198" class="LineNr">1198 </span>  <span class="Conceal">¦</span> c:text <span class="Special">&lt;-</span> index *y,<span class="Constant"> 2</span>
-<span id="L1199" class="LineNr">1199 </span>  <span class="Conceal">¦</span> 20:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *a
-<span id="L1200" class="LineNr">1200 </span>  <span class="Conceal">¦</span> 30:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *b
-<span id="L1201" class="LineNr">1201 </span>  <span class="Conceal">¦</span> 40:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *c
-<span id="L1202" class="LineNr">1202 </span>  ]
-<span id="L1203" class="LineNr">1203 </span>  memory-should-contain [
-<span id="L1204" class="LineNr">1204 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 3</span>  <span class="Comment"># length of result</span>
-<span id="L1205" class="LineNr">1205 </span>  <span class="Conceal">¦</span> 20:array:character <span class="Special">&lt;-</span> <span class="Constant">[a]</span>
-<span id="L1206" class="LineNr">1206 </span>  <span class="Conceal">¦</span> 30:array:character <span class="Special">&lt;-</span> <span class="Constant">[b]</span>
-<span id="L1207" class="LineNr">1207 </span>  <span class="Conceal">¦</span> 40:array:character <span class="Special">&lt;-</span> <span class="Constant">[c]</span>
+<span id="L1188" class="LineNr">1188 </span>  memory-should-contain [
+<span id="L1189" class="LineNr">1189 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 3</span>  <span class="Comment"># length of result</span>
+<span id="L1190" class="LineNr">1190 </span>  <span class="Conceal">¦</span> 20:array:character <span class="Special">&lt;-</span> <span class="Constant">[a]</span>
+<span id="L1191" class="LineNr">1191 </span>  <span class="Conceal">¦</span> 30:array:character <span class="Special">&lt;-</span> <span class="Constant">[b]</span>
+<span id="L1192" class="LineNr">1192 </span>  <span class="Conceal">¦</span> 40:array:character <span class="Special">&lt;-</span> <span class="Constant">[c]</span>
+<span id="L1193" class="LineNr">1193 </span>  ]
+<span id="L1194" class="LineNr">1194 </span>]
+<span id="L1195" class="LineNr">1195 </span>
+<span id="L1196" class="LineNr">1196 </span><span class="muScenario">scenario</span> text-split-missing [
+<span id="L1197" class="LineNr">1197 </span>  <span class="Constant">local-scope</span>
+<span id="L1198" class="LineNr">1198 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L1199" class="LineNr">1199 </span>  run [
+<span id="L1200" class="LineNr">1200 </span>  <span class="Conceal">¦</span> y:&amp;:@:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1115'>split</a> x, <span class="Constant">47/slash</span>
+<span id="L1201" class="LineNr">1201 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> length *y
+<span id="L1202" class="LineNr">1202 </span>  <span class="Conceal">¦</span> a:text <span class="Special">&lt;-</span> index *y,<span class="Constant"> 0</span>
+<span id="L1203" class="LineNr">1203 </span>  <span class="Conceal">¦</span> 20:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *a
+<span id="L1204" class="LineNr">1204 </span>  ]
+<span id="L1205" class="LineNr">1205 </span>  memory-should-contain [
+<span id="L1206" class="LineNr">1206 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># length of result</span>
+<span id="L1207" class="LineNr">1207 </span>  <span class="Conceal">¦</span> 20:array:character <span class="Special">&lt;-</span> <span class="Constant">[abc]</span>
 <span id="L1208" class="LineNr">1208 </span>  ]
 <span id="L1209" class="LineNr">1209 </span>]
 <span id="L1210" class="LineNr">1210 </span>
-<span id="L1211" class="LineNr">1211 </span><span class="muScenario">scenario</span> text-split-missing [
+<span id="L1211" class="LineNr">1211 </span><span class="muScenario">scenario</span> text-split-empty [
 <span id="L1212" class="LineNr">1212 </span>  <span class="Constant">local-scope</span>
-<span id="L1213" class="LineNr">1213 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L1213" class="LineNr">1213 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[]</span>
 <span id="L1214" class="LineNr">1214 </span>  run [
-<span id="L1215" class="LineNr">1215 </span>  <span class="Conceal">¦</span> y:&amp;:@:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1130'>split</a> x, <span class="Constant">47/slash</span>
+<span id="L1215" class="LineNr">1215 </span>  <span class="Conceal">¦</span> y:&amp;:@:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1115'>split</a> x, <span class="Constant">47/slash</span>
 <span id="L1216" class="LineNr">1216 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> length *y
-<span id="L1217" class="LineNr">1217 </span>  <span class="Conceal">¦</span> a:text <span class="Special">&lt;-</span> index *y,<span class="Constant"> 0</span>
-<span id="L1218" class="LineNr">1218 </span>  <span class="Conceal">¦</span> 20:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *a
-<span id="L1219" class="LineNr">1219 </span>  ]
-<span id="L1220" class="LineNr">1220 </span>  memory-should-contain [
-<span id="L1221" class="LineNr">1221 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># length of result</span>
-<span id="L1222" class="LineNr">1222 </span>  <span class="Conceal">¦</span> 20:array:character <span class="Special">&lt;-</span> <span class="Constant">[abc]</span>
-<span id="L1223" class="LineNr">1223 </span>  ]
-<span id="L1224" class="LineNr">1224 </span>]
-<span id="L1225" class="LineNr">1225 </span>
-<span id="L1226" class="LineNr">1226 </span><span class="muScenario">scenario</span> text-split-empty [
-<span id="L1227" class="LineNr">1227 </span>  <span class="Constant">local-scope</span>
-<span id="L1228" class="LineNr">1228 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[]</span>
-<span id="L1229" class="LineNr">1229 </span>  run [
-<span id="L1230" class="LineNr">1230 </span>  <span class="Conceal">¦</span> y:&amp;:@:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1130'>split</a> x, <span class="Constant">47/slash</span>
-<span id="L1231" class="LineNr">1231 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> length *y
-<span id="L1232" class="LineNr">1232 </span>  ]
-<span id="L1233" class="LineNr">1233 </span>  memory-should-contain [
-<span id="L1234" class="LineNr">1234 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># empty result</span>
-<span id="L1235" class="LineNr">1235 </span>  ]
-<span id="L1236" class="LineNr">1236 </span>]
-<span id="L1237" class="LineNr">1237 </span>
-<span id="L1238" class="LineNr">1238 </span><span class="muScenario">scenario</span> text-split-empty-piece [
-<span id="L1239" class="LineNr">1239 </span>  <span class="Constant">local-scope</span>
-<span id="L1240" class="LineNr">1240 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[a/b//c]</span>
-<span id="L1241" class="LineNr">1241 </span>  run [
-<span id="L1242" class="LineNr">1242 </span>  <span class="Conceal">¦</span> y:&amp;:@:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1130'>split</a> x:text, <span class="Constant">47/slash</span>
-<span id="L1243" class="LineNr">1243 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> length *y
-<span id="L1244" class="LineNr">1244 </span>  <span class="Conceal">¦</span> a:text <span class="Special">&lt;-</span> index *y,<span class="Constant"> 0</span>
-<span id="L1245" class="LineNr">1245 </span>  <span class="Conceal">¦</span> b:text <span class="Special">&lt;-</span> index *y,<span class="Constant"> 1</span>
-<span id="L1246" class="LineNr">1246 </span>  <span class="Conceal">¦</span> c:text <span class="Special">&lt;-</span> index *y,<span class="Constant"> 2</span>
-<span id="L1247" class="LineNr">1247 </span>  <span class="Conceal">¦</span> d:text <span class="Special">&lt;-</span> index *y,<span class="Constant"> 3</span>
-<span id="L1248" class="LineNr">1248 </span>  <span class="Conceal">¦</span> 20:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *a
-<span id="L1249" class="LineNr">1249 </span>  <span class="Conceal">¦</span> 30:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *b
-<span id="L1250" class="LineNr">1250 </span>  <span class="Conceal">¦</span> 40:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *c
-<span id="L1251" class="LineNr">1251 </span>  <span class="Conceal">¦</span> 50:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *d
-<span id="L1252" class="LineNr">1252 </span>  ]
-<span id="L1253" class="LineNr">1253 </span>  memory-should-contain [
-<span id="L1254" class="LineNr">1254 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 4</span>  <span class="Comment"># length of result</span>
-<span id="L1255" class="LineNr">1255 </span>  <span class="Conceal">¦</span> 20:array:character <span class="Special">&lt;-</span> <span class="Constant">[a]</span>
-<span id="L1256" class="LineNr">1256 </span>  <span class="Conceal">¦</span> 30:array:character <span class="Special">&lt;-</span> <span class="Constant">[b]</span>
-<span id="L1257" class="LineNr">1257 </span>  <span class="Conceal">¦</span> 40:array:character <span class="Special">&lt;-</span> <span class="Constant">[]</span>
-<span id="L1258" class="LineNr">1258 </span>  <span class="Conceal">¦</span> 50:array:character <span class="Special">&lt;-</span> <span class="Constant">[c]</span>
-<span id="L1259" class="LineNr">1259 </span>  ]
-<span id="L1260" class="LineNr">1260 </span>]
-<span id="L1261" class="LineNr">1261 </span>
-<span id="L1262" class="LineNr">1262 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L1262'>split-first</a> text:text, delim:char<span class="muRecipe"> -&gt; </span>x:text, y:text [
-<span id="L1263" class="LineNr">1263 </span>  <span class="Constant">local-scope</span>
-<span id="L1264" class="LineNr">1264 </span>  <span class="Constant">load-ingredients</span>
-<span id="L1265" class="LineNr">1265 </span>  <span class="Comment"># empty text? return empty texts</span>
-<span id="L1266" class="LineNr">1266 </span>  len:num <span class="Special">&lt;-</span> length *text
-<span id="L1267" class="LineNr">1267 </span>  <span class="Delimiter">{</span>
-<span id="L1268" class="LineNr">1268 </span>  <span class="Conceal">¦</span> empty?:bool <span class="Special">&lt;-</span> equal len,<span class="Constant"> 0</span>
-<span id="L1269" class="LineNr">1269 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> empty?
-<span id="L1270" class="LineNr">1270 </span>  <span class="Conceal">¦</span> x:text <span class="Special">&lt;-</span> new <span class="Constant">[]</span>
-<span id="L1271" class="LineNr">1271 </span>  <span class="Conceal">¦</span> y:text <span class="Special">&lt;-</span> new <span class="Constant">[]</span>
-<span id="L1272" class="LineNr">1272 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span>
-<span id="L1273" class="LineNr">1273 </span>  <span class="Delimiter">}</span>
-<span id="L1274" class="LineNr">1274 </span>  idx:num <span class="Special">&lt;-</span> find-next text, delim,<span class="Constant"> 0</span>
-<span id="L1275" class="LineNr">1275 </span>  x:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1294'>copy-range</a> text,<span class="Constant"> 0</span>, idx
-<span id="L1276" class="LineNr">1276 </span>  idx <span class="Special">&lt;-</span> add idx,<span class="Constant"> 1</span>
-<span id="L1277" class="LineNr">1277 </span>  y:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1294'>copy-range</a> text, idx, len
-<span id="L1278" class="LineNr">1278 </span>]
-<span id="L1279" class="LineNr">1279 </span>
-<span id="L1280" class="LineNr">1280 </span><span class="muScenario">scenario</span> text-split-first [
-<span id="L1281" class="LineNr">1281 </span>  <span class="Constant">local-scope</span>
-<span id="L1282" class="LineNr">1282 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[a/b]</span>
-<span id="L1283" class="LineNr">1283 </span>  run [
-<span id="L1284" class="LineNr">1284 </span>  <span class="Conceal">¦</span> y:text, z:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1262'>split-first</a> x, <span class="Constant">47/slash</span>
-<span id="L1285" class="LineNr">1285 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *y
-<span id="L1286" class="LineNr">1286 </span>  <span class="Conceal">¦</span> 20:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *z
-<span id="L1287" class="LineNr">1287 </span>  ]
-<span id="L1288" class="LineNr">1288 </span>  memory-should-contain [
-<span id="L1289" class="LineNr">1289 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[a]</span>
-<span id="L1290" class="LineNr">1290 </span>  <span class="Conceal">¦</span> 20:array:character <span class="Special">&lt;-</span> <span class="Constant">[b]</span>
-<span id="L1291" class="LineNr">1291 </span>  ]
-<span id="L1292" class="LineNr">1292 </span>]
-<span id="L1293" class="LineNr">1293 </span>
-<span id="L1294" class="LineNr">1294 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L1294'>copy-range</a> buf:text, start:num, end:num<span class="muRecipe"> -&gt; </span>result:text [
-<span id="L1295" class="LineNr">1295 </span>  <span class="Constant">local-scope</span>
-<span id="L1296" class="LineNr">1296 </span>  <span class="Constant">load-ingredients</span>
-<span id="L1297" class="LineNr">1297 </span>  <span class="Comment"># if end is out of bounds, trim it</span>
-<span id="L1298" class="LineNr">1298 </span>  len:num <span class="Special">&lt;-</span> length *buf
-<span id="L1299" class="LineNr">1299 </span>  end:num <span class="Special">&lt;-</span> min len, end
-<span id="L1300" class="LineNr">1300 </span>  <span class="Comment"># allocate space for result</span>
-<span id="L1301" class="LineNr">1301 </span>  len <span class="Special">&lt;-</span> subtract end, start
-<span id="L1302" class="LineNr">1302 </span>  result:text <span class="Special">&lt;-</span> new <span class="Constant">character:type</span>, len
-<span id="L1303" class="LineNr">1303 </span>  <span class="Comment"># copy start..end into result[curr-result]</span>
-<span id="L1304" class="LineNr">1304 </span>  src-idx:num <span class="Special">&lt;-</span> copy start
-<span id="L1305" class="LineNr">1305 </span>  dest-idx:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
-<span id="L1306" class="LineNr">1306 </span>  <span class="Delimiter">{</span>
-<span id="L1307" class="LineNr">1307 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-or-equal src-idx, end
-<span id="L1308" class="LineNr">1308 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
-<span id="L1309" class="LineNr">1309 </span>  <span class="Conceal">¦</span> src:char <span class="Special">&lt;-</span> index *buf, src-idx
-<span id="L1310" class="LineNr">1310 </span>  <span class="Conceal">¦</span> *result <span class="Special">&lt;-</span> put-index *result, dest-idx, src
-<span id="L1311" class="LineNr">1311 </span>  <span class="Conceal">¦</span> src-idx <span class="Special">&lt;-</span> add src-idx,<span class="Constant"> 1</span>
-<span id="L1312" class="LineNr">1312 </span>  <span class="Conceal">¦</span> dest-idx <span class="Special">&lt;-</span> add dest-idx,<span class="Constant"> 1</span>
-<span id="L1313" class="LineNr">1313 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
-<span id="L1314" class="LineNr">1314 </span>  <span class="Delimiter">}</span>
-<span id="L1315" class="LineNr">1315 </span>]
-<span id="L1316" class="LineNr">1316 </span>
-<span id="L1317" class="LineNr">1317 </span><span class="muScenario">scenario</span> copy-range-works [
-<span id="L1318" class="LineNr">1318 </span>  <span class="Constant">local-scope</span>
-<span id="L1319" class="LineNr">1319 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L1320" class="LineNr">1320 </span>  run [
-<span id="L1321" class="LineNr">1321 </span>  <span class="Conceal">¦</span> y:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1294'>copy-range</a> x,<span class="Constant"> 1</span>,<span class="Constant"> 3</span>
-<span id="L1322" class="LineNr">1322 </span>  <span class="Conceal">¦</span> 1:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *y
+<span id="L1217" class="LineNr">1217 </span>  ]
+<span id="L1218" class="LineNr">1218 </span>  memory-should-contain [
+<span id="L1219" class="LineNr">1219 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># empty result</span>
+<span id="L1220" class="LineNr">1220 </span>  ]
+<span id="L1221" class="LineNr">1221 </span>]
+<span id="L1222" class="LineNr">1222 </span>
+<span id="L1223" class="LineNr">1223 </span><span class="muScenario">scenario</span> text-split-empty-piece [
+<span id="L1224" class="LineNr">1224 </span>  <span class="Constant">local-scope</span>
+<span id="L1225" class="LineNr">1225 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[a/b//c]</span>
+<span id="L1226" class="LineNr">1226 </span>  run [
+<span id="L1227" class="LineNr">1227 </span>  <span class="Conceal">¦</span> y:&amp;:@:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1115'>split</a> x:text, <span class="Constant">47/slash</span>
+<span id="L1228" class="LineNr">1228 </span>  <span class="Conceal">¦</span> 10:num/<span class="Special">raw</span> <span class="Special">&lt;-</span> length *y
+<span id="L1229" class="LineNr">1229 </span>  <span class="Conceal">¦</span> a:text <span class="Special">&lt;-</span> index *y,<span class="Constant"> 0</span>
+<span id="L1230" class="LineNr">1230 </span>  <span class="Conceal">¦</span> b:text <span class="Special">&lt;-</span> index *y,<span class="Constant"> 1</span>
+<span id="L1231" class="LineNr">1231 </span>  <span class="Conceal">¦</span> c:text <span class="Special">&lt;-</span> index *y,<span class="Constant"> 2</span>
+<span id="L1232" class="LineNr">1232 </span>  <span class="Conceal">¦</span> d:text <span class="Special">&lt;-</span> index *y,<span class="Constant"> 3</span>
+<span id="L1233" class="LineNr">1233 </span>  <span class="Conceal">¦</span> 20:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *a
+<span id="L1234" class="LineNr">1234 </span>  <span class="Conceal">¦</span> 30:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *b
+<span id="L1235" class="LineNr">1235 </span>  <span class="Conceal">¦</span> 40:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *c
+<span id="L1236" class="LineNr">1236 </span>  <span class="Conceal">¦</span> 50:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *d
+<span id="L1237" class="LineNr">1237 </span>  ]
+<span id="L1238" class="LineNr">1238 </span>  memory-should-contain [
+<span id="L1239" class="LineNr">1239 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 4</span>  <span class="Comment"># length of result</span>
+<span id="L1240" class="LineNr">1240 </span>  <span class="Conceal">¦</span> 20:array:character <span class="Special">&lt;-</span> <span class="Constant">[a]</span>
+<span id="L1241" class="LineNr">1241 </span>  <span class="Conceal">¦</span> 30:array:character <span class="Special">&lt;-</span> <span class="Constant">[b]</span>
+<span id="L1242" class="LineNr">1242 </span>  <span class="Conceal">¦</span> 40:array:character <span class="Special">&lt;-</span> <span class="Constant">[]</span>
+<span id="L1243" class="LineNr">1243 </span>  <span class="Conceal">¦</span> 50:array:character <span class="Special">&lt;-</span> <span class="Constant">[c]</span>
+<span id="L1244" class="LineNr">1244 </span>  ]
+<span id="L1245" class="LineNr">1245 </span>]
+<span id="L1246" class="LineNr">1246 </span>
+<span id="L1247" class="LineNr">1247 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L1247'>split-first</a> text:text, delim:char<span class="muRecipe"> -&gt; </span>x:text, y:text [
+<span id="L1248" class="LineNr">1248 </span>  <span class="Constant">local-scope</span>
+<span id="L1249" class="LineNr">1249 </span>  <span class="Constant">load-ingredients</span>
+<span id="L1250" class="LineNr">1250 </span>  <span class="Comment"># empty text? return empty texts</span>
+<span id="L1251" class="LineNr">1251 </span>  len:num <span class="Special">&lt;-</span> length *text
+<span id="L1252" class="LineNr">1252 </span>  <span class="Delimiter">{</span>
+<span id="L1253" class="LineNr">1253 </span>  <span class="Conceal">¦</span> empty?:bool <span class="Special">&lt;-</span> equal len,<span class="Constant"> 0</span>
+<span id="L1254" class="LineNr">1254 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> empty?
+<span id="L1255" class="LineNr">1255 </span>  <span class="Conceal">¦</span> x:text <span class="Special">&lt;-</span> new <span class="Constant">[]</span>
+<span id="L1256" class="LineNr">1256 </span>  <span class="Conceal">¦</span> y:text <span class="Special">&lt;-</span> new <span class="Constant">[]</span>
+<span id="L1257" class="LineNr">1257 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span>
+<span id="L1258" class="LineNr">1258 </span>  <span class="Delimiter">}</span>
+<span id="L1259" class="LineNr">1259 </span>  idx:num <span class="Special">&lt;-</span> find-next text, delim,<span class="Constant"> 0</span>
+<span id="L1260" class="LineNr">1260 </span>  x:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1279'>copy-range</a> text,<span class="Constant"> 0</span>, idx
+<span id="L1261" class="LineNr">1261 </span>  idx <span class="Special">&lt;-</span> add idx,<span class="Constant"> 1</span>
+<span id="L1262" class="LineNr">1262 </span>  y:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1279'>copy-range</a> text, idx, len
+<span id="L1263" class="LineNr">1263 </span>]
+<span id="L1264" class="LineNr">1264 </span>
+<span id="L1265" class="LineNr">1265 </span><span class="muScenario">scenario</span> text-split-first [
+<span id="L1266" class="LineNr">1266 </span>  <span class="Constant">local-scope</span>
+<span id="L1267" class="LineNr">1267 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[a/b]</span>
+<span id="L1268" class="LineNr">1268 </span>  run [
+<span id="L1269" class="LineNr">1269 </span>  <span class="Conceal">¦</span> y:text, z:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1247'>split-first</a> x, <span class="Constant">47/slash</span>
+<span id="L1270" class="LineNr">1270 </span>  <span class="Conceal">¦</span> 10:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *y
+<span id="L1271" class="LineNr">1271 </span>  <span class="Conceal">¦</span> 20:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *z
+<span id="L1272" class="LineNr">1272 </span>  ]
+<span id="L1273" class="LineNr">1273 </span>  memory-should-contain [
+<span id="L1274" class="LineNr">1274 </span>  <span class="Conceal">¦</span> 10:array:character <span class="Special">&lt;-</span> <span class="Constant">[a]</span>
+<span id="L1275" class="LineNr">1275 </span>  <span class="Conceal">¦</span> 20:array:character <span class="Special">&lt;-</span> <span class="Constant">[b]</span>
+<span id="L1276" class="LineNr">1276 </span>  ]
+<span id="L1277" class="LineNr">1277 </span>]
+<span id="L1278" class="LineNr">1278 </span>
+<span id="L1279" class="LineNr">1279 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L1279'>copy-range</a> buf:text, start:num, end:num<span class="muRecipe"> -&gt; </span>result:text [
+<span id="L1280" class="LineNr">1280 </span>  <span class="Constant">local-scope</span>
+<span id="L1281" class="LineNr">1281 </span>  <span class="Constant">load-ingredients</span>
+<span id="L1282" class="LineNr">1282 </span>  <span class="Comment"># if end is out of bounds, trim it</span>
+<span id="L1283" class="LineNr">1283 </span>  len:num <span class="Special">&lt;-</span> length *buf
+<span id="L1284" class="LineNr">1284 </span>  end:num <span class="Special">&lt;-</span> min len, end
+<span id="L1285" class="LineNr">1285 </span>  <span class="Comment"># allocate space for result</span>
+<span id="L1286" class="LineNr">1286 </span>  len <span class="Special">&lt;-</span> subtract end, start
+<span id="L1287" class="LineNr">1287 </span>  result:text <span class="Special">&lt;-</span> new <span class="Constant">character:type</span>, len
+<span id="L1288" class="LineNr">1288 </span>  <span class="Comment"># copy start..end into result[curr-result]</span>
+<span id="L1289" class="LineNr">1289 </span>  src-idx:num <span class="Special">&lt;-</span> copy start
+<span id="L1290" class="LineNr">1290 </span>  dest-idx:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
+<span id="L1291" class="LineNr">1291 </span>  <span class="Delimiter">{</span>
+<span id="L1292" class="LineNr">1292 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-or-equal src-idx, end
+<span id="L1293" class="LineNr">1293 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
+<span id="L1294" class="LineNr">1294 </span>  <span class="Conceal">¦</span> src:char <span class="Special">&lt;-</span> index *buf, src-idx
+<span id="L1295" class="LineNr">1295 </span>  <span class="Conceal">¦</span> *result <span class="Special">&lt;-</span> put-index *result, dest-idx, src
+<span id="L1296" class="LineNr">1296 </span>  <span class="Conceal">¦</span> src-idx <span class="Special">&lt;-</span> add src-idx,<span class="Constant"> 1</span>
+<span id="L1297" class="LineNr">1297 </span>  <span class="Conceal">¦</span> dest-idx <span class="Special">&lt;-</span> add dest-idx,<span class="Constant"> 1</span>
+<span id="L1298" class="LineNr">1298 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
+<span id="L1299" class="LineNr">1299 </span>  <span class="Delimiter">}</span>
+<span id="L1300" class="LineNr">1300 </span>]
+<span id="L1301" class="LineNr">1301 </span>
+<span id="L1302" class="LineNr">1302 </span><span class="muScenario">scenario</span> copy-range-works [
+<span id="L1303" class="LineNr">1303 </span>  <span class="Constant">local-scope</span>
+<span id="L1304" class="LineNr">1304 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L1305" class="LineNr">1305 </span>  run [
+<span id="L1306" class="LineNr">1306 </span>  <span class="Conceal">¦</span> y:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1279'>copy-range</a> x,<span class="Constant"> 1</span>,<span class="Constant"> 3</span>
+<span id="L1307" class="LineNr">1307 </span>  <span class="Conceal">¦</span> 1:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *y
+<span id="L1308" class="LineNr">1308 </span>  ]
+<span id="L1309" class="LineNr">1309 </span>  memory-should-contain [
+<span id="L1310" class="LineNr">1310 </span>  <span class="Conceal">¦</span> 1:array:character <span class="Special">&lt;-</span> <span class="Constant">[bc]</span>
+<span id="L1311" class="LineNr">1311 </span>  ]
+<span id="L1312" class="LineNr">1312 </span>]
+<span id="L1313" class="LineNr">1313 </span>
+<span id="L1314" class="LineNr">1314 </span><span class="muScenario">scenario</span> copy-range-out-of-bounds [
+<span id="L1315" class="LineNr">1315 </span>  <span class="Constant">local-scope</span>
+<span id="L1316" class="LineNr">1316 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L1317" class="LineNr">1317 </span>  run [
+<span id="L1318" class="LineNr">1318 </span>  <span class="Conceal">¦</span> y:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1279'>copy-range</a> x,<span class="Constant"> 2</span>,<span class="Constant"> 4</span>
+<span id="L1319" class="LineNr">1319 </span>  <span class="Conceal">¦</span> 1:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *y
+<span id="L1320" class="LineNr">1320 </span>  ]
+<span id="L1321" class="LineNr">1321 </span>  memory-should-contain [
+<span id="L1322" class="LineNr">1322 </span>  <span class="Conceal">¦</span> 1:array:character <span class="Special">&lt;-</span> <span class="Constant">[c]</span>
 <span id="L1323" class="LineNr">1323 </span>  ]
-<span id="L1324" class="LineNr">1324 </span>  memory-should-contain [
-<span id="L1325" class="LineNr">1325 </span>  <span class="Conceal">¦</span> 1:array:character <span class="Special">&lt;-</span> <span class="Constant">[bc]</span>
-<span id="L1326" class="LineNr">1326 </span>  ]
-<span id="L1327" class="LineNr">1327 </span>]
-<span id="L1328" class="LineNr">1328 </span>
-<span id="L1329" class="LineNr">1329 </span><span class="muScenario">scenario</span> copy-range-out-of-bounds [
-<span id="L1330" class="LineNr">1330 </span>  <span class="Constant">local-scope</span>
-<span id="L1331" class="LineNr">1331 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L1332" class="LineNr">1332 </span>  run [
-<span id="L1333" class="LineNr">1333 </span>  <span class="Conceal">¦</span> y:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1294'>copy-range</a> x,<span class="Constant"> 2</span>,<span class="Constant"> 4</span>
-<span id="L1334" class="LineNr">1334 </span>  <span class="Conceal">¦</span> 1:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *y
+<span id="L1324" class="LineNr">1324 </span>]
+<span id="L1325" class="LineNr">1325 </span>
+<span id="L1326" class="LineNr">1326 </span><span class="muScenario">scenario</span> copy-range-out-of-bounds-2 [
+<span id="L1327" class="LineNr">1327 </span>  <span class="Constant">local-scope</span>
+<span id="L1328" class="LineNr">1328 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
+<span id="L1329" class="LineNr">1329 </span>  run [
+<span id="L1330" class="LineNr">1330 </span>  <span class="Conceal">¦</span> y:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1279'>copy-range</a> x,<span class="Constant"> 3</span>,<span class="Constant"> 3</span>
+<span id="L1331" class="LineNr">1331 </span>  <span class="Conceal">¦</span> 1:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *y
+<span id="L1332" class="LineNr">1332 </span>  ]
+<span id="L1333" class="LineNr">1333 </span>  memory-should-contain [
+<span id="L1334" class="LineNr">1334 </span>  <span class="Conceal">¦</span> 1:array:character <span class="Special">&lt;-</span> <span class="Constant">[]</span>
 <span id="L1335" class="LineNr">1335 </span>  ]
-<span id="L1336" class="LineNr">1336 </span>  memory-should-contain [
-<span id="L1337" class="LineNr">1337 </span>  <span class="Conceal">¦</span> 1:array:character <span class="Special">&lt;-</span> <span class="Constant">[c]</span>
-<span id="L1338" class="LineNr">1338 </span>  ]
-<span id="L1339" class="LineNr">1339 </span>]
-<span id="L1340" class="LineNr">1340 </span>
-<span id="L1341" class="LineNr">1341 </span><span class="muScenario">scenario</span> copy-range-out-of-bounds-2 [
-<span id="L1342" class="LineNr">1342 </span>  <span class="Constant">local-scope</span>
-<span id="L1343" class="LineNr">1343 </span>  x:text <span class="Special">&lt;-</span> new <span class="Constant">[abc]</span>
-<span id="L1344" class="LineNr">1344 </span>  run [
-<span id="L1345" class="LineNr">1345 </span>  <span class="Conceal">¦</span> y:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1294'>copy-range</a> x,<span class="Constant"> 3</span>,<span class="Constant"> 3</span>
-<span id="L1346" class="LineNr">1346 </span>  <span class="Conceal">¦</span> 1:@:char/<span class="Special">raw</span> <span class="Special">&lt;-</span> copy *y
-<span id="L1347" class="LineNr">1347 </span>  ]
-<span id="L1348" class="LineNr">1348 </span>  memory-should-contain [
-<span id="L1349" class="LineNr">1349 </span>  <span class="Conceal">¦</span> 1:array:character <span class="Special">&lt;-</span> <span class="Constant">[]</span>
-<span id="L1350" class="LineNr">1350 </span>  ]
-<span id="L1351" class="LineNr">1351 </span>]
-<span id="L1352" class="LineNr">1352 </span>
-<span id="L1353" class="LineNr">1353 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L1353'>parse-whole-number</a> in:text<span class="muRecipe"> -&gt; </span>out:num, error?:bool [
-<span id="L1354" class="LineNr">1354 </span>  <span class="Constant">local-scope</span>
-<span id="L1355" class="LineNr">1355 </span>  <span class="Constant">load-ingredients</span>
-<span id="L1356" class="LineNr">1356 </span>  out <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
-<span id="L1357" class="LineNr">1357 </span>  result:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>  <span class="Comment"># temporary location</span>
-<span id="L1358" class="LineNr">1358 </span>  i:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
-<span id="L1359" class="LineNr">1359 </span>  len:num <span class="Special">&lt;-</span> length *in
-<span id="L1360" class="LineNr">1360 </span>  <span class="Delimiter">{</span>
-<span id="L1361" class="LineNr">1361 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-or-equal i, len
-<span id="L1362" class="LineNr">1362 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
-<span id="L1363" class="LineNr">1363 </span>  <span class="Conceal">¦</span> c:char <span class="Special">&lt;-</span> index *in, i
-<span id="L1364" class="LineNr">1364 </span>  <span class="Conceal">¦</span> x:num <span class="Special">&lt;-</span> character-to-code c
-<span id="L1365" class="LineNr">1365 </span>  <span class="Conceal">¦</span> digit:num, error?:bool <span class="Special">&lt;-</span> <a href='061text.mu.html#L1377'>character-code-to-digit</a> x
-<span id="L1366" class="LineNr">1366 </span>  <span class="Conceal">¦</span> <span class="muControl">return-if</span> error?
-<span id="L1367" class="LineNr">1367 </span>  <span class="Conceal">¦</span> result <span class="Special">&lt;-</span> multiply result,<span class="Constant"> 10</span>
-<span id="L1368" class="LineNr">1368 </span>  <span class="Conceal">¦</span> result <span class="Special">&lt;-</span> add result, digit
-<span id="L1369" class="LineNr">1369 </span>  <span class="Conceal">¦</span> i <span class="Special">&lt;-</span> add i,<span class="Constant"> 1</span>
-<span id="L1370" class="LineNr">1370 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
-<span id="L1371" class="LineNr">1371 </span>  <span class="Delimiter">}</span>
-<span id="L1372" class="LineNr">1372 </span>  <span class="Comment"># no error; all digits were valid</span>
-<span id="L1373" class="LineNr">1373 </span>  out <span class="Special">&lt;-</span> copy result
-<span id="L1374" class="LineNr">1374 </span>]
-<span id="L1375" class="LineNr">1375 </span>
-<span id="L1376" class="LineNr">1376 </span><span class="Comment"># (contributed by Ella Couch)</span>
-<span id="L1377" class="LineNr">1377 </span><span class="muRecipe">recipe</span> <a href='061text.mu.html#L1377'>character-code-to-digit</a> character-code:number<span class="muRecipe"> -&gt; </span>result:number, error?:boolean [
-<span id="L1378" class="LineNr">1378 </span>  <span class="Constant">local-scope</span>
-<span id="L1379" class="LineNr">1379 </span>  <span class="Constant">load-ingredients</span>
-<span id="L1380" class="LineNr">1380 </span>  result <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
-<span id="L1381" class="LineNr">1381 </span>  error? <span class="Special">&lt;-</span> lesser-than character-code,<span class="Constant"> 48</span>  <span class="Comment"># '0'</span>
-<span id="L1382" class="LineNr">1382 </span>  <span class="muControl">return-if</span> error?
-<span id="L1383" class="LineNr">1383 </span>  error? <span class="Special">&lt;-</span> greater-than character-code,<span class="Constant"> 57</span>  <span class="Comment"># '9'</span>
-<span id="L1384" class="LineNr">1384 </span>  <span class="muControl">return-if</span> error?
-<span id="L1385" class="LineNr">1385 </span>  result <span class="Special">&lt;-</span> subtract character-code,<span class="Constant"> 48</span>
-<span id="L1386" class="LineNr">1386 </span>]
-<span id="L1387" class="LineNr">1387 </span>
-<span id="L1388" class="LineNr">1388 </span><span class="muScenario">scenario</span> character-code-to-digit-contain-only-digit [
-<span id="L1389" class="LineNr">1389 </span>  <span class="Constant">local-scope</span>
-<span id="L1390" class="LineNr">1390 </span>  a:number <span class="Special">&lt;-</span> copy<span class="Constant"> 48</span>  <span class="Comment"># character code for '0'</span>
-<span id="L1391" class="LineNr">1391 </span>  run [
-<span id="L1392" class="LineNr">1392 </span>  <span class="Conceal">¦</span> 10:number/<span class="Special">raw</span>, 11:boolean/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L1377'>character-code-to-digit</a> a
-<span id="L1393" class="LineNr">1393 </span>  ]
-<span id="L1394" class="LineNr">1394 </span>  memory-should-contain [
-<span id="L1395" class="LineNr">1395 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
-<span id="L1396" class="LineNr">1396 </span>  <span class="Conceal">¦</span><span class="Constant"> 11</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># no error</span>
-<span id="L1397" class="LineNr">1397 </span>  ]
-<span id="L1398" class="LineNr">1398 </span>]
-<span id="L1399" class="LineNr">1399 </span>
-<span id="L1400" class="LineNr">1400 </span><span class="muScenario">scenario</span> character-code-to-digit-contain-only-digit-2 [
-<span id="L1401" class="LineNr">1401 </span>  <span class="Constant">local-scope</span>
-<span id="L1402" class="LineNr">1402 </span>  a:number <span class="Special">&lt;-</span> copy<span class="Constant"> 57</span>  <span class="Comment"># character code for '9'</span>
-<span id="L1403" class="LineNr">1403 </span>  run [
-<span id="L1404" class="LineNr">1404 </span>  <span class="Conceal">¦</span> 1:number/<span class="Special">raw</span>, 2:boolean/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L1377'>character-code-to-digit</a> a
-<span id="L1405" class="LineNr">1405 </span>  ]
-<span id="L1406" class="LineNr">1406 </span>  memory-should-contain [
-<span id="L1407" class="LineNr">1407 </span>  <span class="Conceal">¦</span><span class="Constant"> 1</span> <span class="Special">&lt;-</span><span class="Constant"> 9</span>
-<span id="L1408" class="LineNr">1408 </span>  <span class="Conceal">¦</span><span class="Constant"> 2</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># no error</span>
-<span id="L1409" class="LineNr">1409 </span>  ]
-<span id="L1410" class="LineNr">1410 </span>]
-<span id="L1411" class="LineNr">1411 </span>
-<span id="L1412" class="LineNr">1412 </span><span class="muScenario">scenario</span> character-code-to-digit-handles-codes-lower-than-zero [
-<span id="L1413" class="LineNr">1413 </span>  <span class="Constant">local-scope</span>
-<span id="L1414" class="LineNr">1414 </span>  a:number <span class="Special">&lt;-</span> copy<span class="Constant"> 47</span>
-<span id="L1415" class="LineNr">1415 </span>  run [
-<span id="L1416" class="LineNr">1416 </span>  <span class="Conceal">¦</span> 10:number/<span class="Special">raw</span>, 11:boolean/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L1377'>character-code-to-digit</a> a
-<span id="L1417" class="LineNr">1417 </span>  ]
-<span id="L1418" class="LineNr">1418 </span>  memory-should-contain [
-<span id="L1419" class="LineNr">1419 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
-<span id="L1420" class="LineNr">1420 </span>  <span class="Conceal">¦</span><span class="Constant"> 11</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># error</span>
-<span id="L1421" class="LineNr">1421 </span>  ]
-<span id="L1422" class="LineNr">1422 </span>]
-<span id="L1423" class="LineNr">1423 </span>
-<span id="L1424" class="LineNr">1424 </span><span class="muScenario">scenario</span> character-code-to-digit-handles-codes-larger-than-nine [
-<span id="L1425" class="LineNr">1425 </span>  <span class="Constant">local-scope</span>
-<span id="L1426" class="LineNr">1426 </span>  a:number <span class="Special">&lt;-</span> copy<span class="Constant"> 58</span>
-<span id="L1427" class="LineNr">1427 </span>  run [
-<span id="L1428" class="LineNr">1428 </span>  <span class="Conceal">¦</span> 10:number/<span class="Special">raw</span>, 11:boolean/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L1377'>character-code-to-digit</a> a
-<span id="L1429" class="LineNr">1429 </span>  ]
-<span id="L1430" class="LineNr">1430 </span>  memory-should-contain [
-<span id="L1431" class="LineNr">1431 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
-<span id="L1432" class="LineNr">1432 </span>  <span class="Conceal">¦</span><span class="Constant"> 11</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># error</span>
-<span id="L1433" class="LineNr">1433 </span>  ]
-<span id="L1434" class="LineNr">1434 </span>]
+<span id="L1336" class="LineNr">1336 </span>]
+<span id="L1337" class="LineNr">1337 </span>
+<span id="L1338" class="LineNr">1338 </span><span class="muRecipe">def</span> <a href='061text.mu.html#L1338'>parse-whole-number</a> in:text<span class="muRecipe"> -&gt; </span>out:num, error?:bool [
+<span id="L1339" class="LineNr">1339 </span>  <span class="Constant">local-scope</span>
+<span id="L1340" class="LineNr">1340 </span>  <span class="Constant">load-ingredients</span>
+<span id="L1341" class="LineNr">1341 </span>  out <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
+<span id="L1342" class="LineNr">1342 </span>  result:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>  <span class="Comment"># temporary location</span>
+<span id="L1343" class="LineNr">1343 </span>  i:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
+<span id="L1344" class="LineNr">1344 </span>  len:num <span class="Special">&lt;-</span> length *in
+<span id="L1345" class="LineNr">1345 </span>  <span class="Delimiter">{</span>
+<span id="L1346" class="LineNr">1346 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> greater-or-equal i, len
+<span id="L1347" class="LineNr">1347 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
+<span id="L1348" class="LineNr">1348 </span>  <span class="Conceal">¦</span> c:char <span class="Special">&lt;-</span> index *in, i
+<span id="L1349" class="LineNr">1349 </span>  <span class="Conceal">¦</span> x:num <span class="Special">&lt;-</span> character-to-code c
+<span id="L1350" class="LineNr">1350 </span>  <span class="Conceal">¦</span> digit:num, error?:bool <span class="Special">&lt;-</span> <a href='061text.mu.html#L1362'>character-code-to-digit</a> x
+<span id="L1351" class="LineNr">1351 </span>  <span class="Conceal">¦</span> <span class="muControl">return-if</span> error?
+<span id="L1352" class="LineNr">1352 </span>  <span class="Conceal">¦</span> result <span class="Special">&lt;-</span> multiply result,<span class="Constant"> 10</span>
+<span id="L1353" class="LineNr">1353 </span>  <span class="Conceal">¦</span> result <span class="Special">&lt;-</span> add result, digit
+<span id="L1354" class="LineNr">1354 </span>  <span class="Conceal">¦</span> i <span class="Special">&lt;-</span> add i,<span class="Constant"> 1</span>
+<span id="L1355" class="LineNr">1355 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
+<span id="L1356" class="LineNr">1356 </span>  <span class="Delimiter">}</span>
+<span id="L1357" class="LineNr">1357 </span>  <span class="Comment"># no error; all digits were valid</span>
+<span id="L1358" class="LineNr">1358 </span>  out <span class="Special">&lt;-</span> copy result
+<span id="L1359" class="LineNr">1359 </span>]
+<span id="L1360" class="LineNr">1360 </span>
+<span id="L1361" class="LineNr">1361 </span><span class="Comment"># (contributed by Ella Couch)</span>
+<span id="L1362" class="LineNr">1362 </span><span class="muRecipe">recipe</span> <a href='061text.mu.html#L1362'>character-code-to-digit</a> character-code:number<span class="muRecipe"> -&gt; </span>result:number, error?:boolean [
+<span id="L1363" class="LineNr">1363 </span>  <span class="Constant">local-scope</span>
+<span id="L1364" class="LineNr">1364 </span>  <span class="Constant">load-ingredients</span>
+<span id="L1365" class="LineNr">1365 </span>  result <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
+<span id="L1366" class="LineNr">1366 </span>  error? <span class="Special">&lt;-</span> lesser-than character-code,<span class="Constant"> 48</span>  <span class="Comment"># '0'</span>
+<span id="L1367" class="LineNr">1367 </span>  <span class="muControl">return-if</span> error?
+<span id="L1368" class="LineNr">1368 </span>  error? <span class="Special">&lt;-</span> greater-than character-code,<span class="Constant"> 57</span>  <span class="Comment"># '9'</span>
+<span id="L1369" class="LineNr">1369 </span>  <span class="muControl">return-if</span> error?
+<span id="L1370" class="LineNr">1370 </span>  result <span class="Special">&lt;-</span> subtract character-code,<span class="Constant"> 48</span>
+<span id="L1371" class="LineNr">1371 </span>]
+<span id="L1372" class="LineNr">1372 </span>
+<span id="L1373" class="LineNr">1373 </span><span class="muScenario">scenario</span> character-code-to-digit-contain-only-digit [
+<span id="L1374" class="LineNr">1374 </span>  <span class="Constant">local-scope</span>
+<span id="L1375" class="LineNr">1375 </span>  a:number <span class="Special">&lt;-</span> copy<span class="Constant"> 48</span>  <span class="Comment"># character code for '0'</span>
+<span id="L1376" class="LineNr">1376 </span>  run [
+<span id="L1377" class="LineNr">1377 </span>  <span class="Conceal">¦</span> 10:number/<span class="Special">raw</span>, 11:boolean/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L1362'>character-code-to-digit</a> a
+<span id="L1378" class="LineNr">1378 </span>  ]
+<span id="L1379" class="LineNr">1379 </span>  memory-should-contain [
+<span id="L1380" class="LineNr">1380 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
+<span id="L1381" class="LineNr">1381 </span>  <span class="Conceal">¦</span><span class="Constant"> 11</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># no error</span>
+<span id="L1382" class="LineNr">1382 </span>  ]
+<span id="L1383" class="LineNr">1383 </span>]
+<span id="L1384" class="LineNr">1384 </span>
+<span id="L1385" class="LineNr">1385 </span><span class="muScenario">scenario</span> character-code-to-digit-contain-only-digit-2 [
+<span id="L1386" class="LineNr">1386 </span>  <span class="Constant">local-scope</span>
+<span id="L1387" class="LineNr">1387 </span>  a:number <span class="Special">&lt;-</span> copy<span class="Constant"> 57</span>  <span class="Comment"># character code for '9'</span>
+<span id="L1388" class="LineNr">1388 </span>  run [
+<span id="L1389" class="LineNr">1389 </span>  <span class="Conceal">¦</span> 1:number/<span class="Special">raw</span>, 2:boolean/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L1362'>character-code-to-digit</a> a
+<span id="L1390" class="LineNr">1390 </span>  ]
+<span id="L1391" class="LineNr">1391 </span>  memory-should-contain [
+<span id="L1392" class="LineNr">1392 </span>  <span class="Conceal">¦</span><span class="Constant"> 1</span> <span class="Special">&lt;-</span><span class="Constant"> 9</span>
+<span id="L1393" class="LineNr">1393 </span>  <span class="Conceal">¦</span><span class="Constant"> 2</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>  <span class="Comment"># no error</span>
+<span id="L1394" class="LineNr">1394 </span>  ]
+<span id="L1395" class="LineNr">1395 </span>]
+<span id="L1396" class="LineNr">1396 </span>
+<span id="L1397" class="LineNr">1397 </span><span class="muScenario">scenario</span> character-code-to-digit-handles-codes-lower-than-zero [
+<span id="L1398" class="LineNr">1398 </span>  <span class="Constant">local-scope</span>
+<span id="L1399" class="LineNr">1399 </span>  a:number <span class="Special">&lt;-</span> copy<span class="Constant"> 47</span>
+<span id="L1400" class="LineNr">1400 </span>  run [
+<span id="L1401" class="LineNr">1401 </span>  <span class="Conceal">¦</span> 10:number/<span class="Special">raw</span>, 11:boolean/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L1362'>character-code-to-digit</a> a
+<span id="L1402" class="LineNr">1402 </span>  ]
+<span id="L1403" class="LineNr">1403 </span>  memory-should-contain [
+<span id="L1404" class="LineNr">1404 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
+<span id="L1405" class="LineNr">1405 </span>  <span class="Conceal">¦</span><span class="Constant"> 11</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># error</span>
+<span id="L1406" class="LineNr">1406 </span>  ]
+<span id="L1407" class="LineNr">1407 </span>]
+<span id="L1408" class="LineNr">1408 </span>
+<span id="L1409" class="LineNr">1409 </span><span class="muScenario">scenario</span> character-code-to-digit-handles-codes-larger-than-nine [
+<span id="L1410" class="LineNr">1410 </span>  <span class="Constant">local-scope</span>
+<span id="L1411" class="LineNr">1411 </span>  a:number <span class="Special">&lt;-</span> copy<span class="Constant"> 58</span>
+<span id="L1412" class="LineNr">1412 </span>  run [
+<span id="L1413" class="LineNr">1413 </span>  <span class="Conceal">¦</span> 10:number/<span class="Special">raw</span>, 11:boolean/<span class="Special">raw</span> <span class="Special">&lt;-</span> <a href='061text.mu.html#L1362'>character-code-to-digit</a> a
+<span id="L1414" class="LineNr">1414 </span>  ]
+<span id="L1415" class="LineNr">1415 </span>  memory-should-contain [
+<span id="L1416" class="LineNr">1416 </span>  <span class="Conceal">¦</span><span class="Constant"> 10</span> <span class="Special">&lt;-</span><span class="Constant"> 0</span>
+<span id="L1417" class="LineNr">1417 </span>  <span class="Conceal">¦</span><span class="Constant"> 11</span> <span class="Special">&lt;-</span><span class="Constant"> 1</span>  <span class="Comment"># error</span>
+<span id="L1418" class="LineNr">1418 </span>  ]
+<span id="L1419" class="LineNr">1419 </span>]
 </pre>
 </body>
 </html>
diff --git a/html/062convert_ingredients_to_text.cc.html b/html/062convert_ingredients_to_text.cc.html
index c76b0b38..f207cbe1 100644
--- a/html/062convert_ingredients_to_text.cc.html
+++ b/html/062convert_ingredients_to_text.cc.html
@@ -137,7 +137,7 @@ if ('onhashchange' in window) {
 <span id="L74" class="LineNr"> 74 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L75" class="LineNr"> 75 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='014literal_string.cc.html#L126'>is_literal_text</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L76" class="LineNr"> 76 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ostringstream ingredient_name<span class="Delimiter">;</span>
-<span id="L77" class="LineNr"> 77 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ingredient_name &lt;&lt; <span class="Constant">&quot;stash_&quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">'_'</span> &lt;&lt; j &lt;&lt; <span class="Constant">&quot;:<a href='043space.cc.html#L76'>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;:address: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#L76'>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;:address: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#L76'>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;:address: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/064list.mu.html b/html/064list.mu.html
index 63c0d634..449c16e7 100644
--- a/html/064list.mu.html
+++ b/html/064list.mu.html
@@ -368,21 +368,21 @@ if ('onhashchange' in window) {
 <span id="L306" class="LineNr">306 </span><span class="muRecipe">def</span> to-text in:&amp;:<a href='064list.mu.html#L6'>list</a>:_elem<span class="muRecipe"> -&gt; </span>result:text [
 <span id="L307" class="LineNr">307 </span>  <span class="Constant">local-scope</span>
 <span id="L308" class="LineNr">308 </span>  <span class="Constant">load-ingredients</span>
-<span id="L309" class="LineNr">309 </span>  buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L131'>new-buffer</a><span class="Constant"> 80</span>
+<span id="L309" class="LineNr">309 </span>  buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L125'>new-buffer</a><span class="Constant"> 80</span>
 <span id="L310" class="LineNr">310 </span>  buf <span class="Special">&lt;-</span> to-buffer in, buf
-<span id="L311" class="LineNr">311 </span>  result <span class="Special">&lt;-</span> <a href='061text.mu.html#L344'>buffer-to-array</a> buf
+<span id="L311" class="LineNr">311 </span>  result <span class="Special">&lt;-</span> <a href='061text.mu.html#L338'>buffer-to-array</a> buf
 <span id="L312" class="LineNr">312 </span>]
 <span id="L313" class="LineNr">313 </span>
 <span id="L314" class="LineNr">314 </span><span class="Comment"># variant of 'to-text' which stops printing after a few elements (and so is robust to cycles)</span>
 <span id="L315" class="LineNr">315 </span><span class="muRecipe">def</span> to-text-line in:&amp;:<a href='064list.mu.html#L6'>list</a>:_elem<span class="muRecipe"> -&gt; </span>result:text [
 <span id="L316" class="LineNr">316 </span>  <span class="Constant">local-scope</span>
 <span id="L317" class="LineNr">317 </span>  <span class="Constant">load-ingredients</span>
-<span id="L318" class="LineNr">318 </span>  buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L131'>new-buffer</a><span class="Constant"> 80</span>
+<span id="L318" class="LineNr">318 </span>  buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L125'>new-buffer</a><span class="Constant"> 80</span>
 <span id="L319" class="LineNr">319 </span>  buf <span class="Special">&lt;-</span> to-buffer in, buf,<span class="Constant"> 6</span>  <span class="Comment"># max elements to display</span>
-<span id="L320" class="LineNr">320 </span>  result <span class="Special">&lt;-</span> <a href='061text.mu.html#L344'>buffer-to-array</a> buf
+<span id="L320" class="LineNr">320 </span>  result <span class="Special">&lt;-</span> <a href='061text.mu.html#L338'>buffer-to-array</a> buf
 <span id="L321" class="LineNr">321 </span>]
 <span id="L322" class="LineNr">322 </span>
-<span id="L323" class="LineNr">323 </span><span class="muRecipe">def</span> to-buffer in:&amp;:<a href='064list.mu.html#L6'>list</a>:_elem, buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char<span class="muRecipe"> -&gt; </span>buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char [
+<span id="L323" class="LineNr">323 </span><span class="muRecipe">def</span> to-buffer in:&amp;:<a href='064list.mu.html#L6'>list</a>:_elem, buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char<span class="muRecipe"> -&gt; </span>buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char [
 <span id="L324" class="LineNr">324 </span>  <span class="Constant">local-scope</span>
 <span id="L325" class="LineNr">325 </span>  <span class="Constant">load-ingredients</span>
 <span id="L326" class="LineNr">326 </span>  <span class="Delimiter">{</span>
diff --git a/html/065duplex_list.mu.html b/html/065duplex_list.mu.html
index f4191f54..d9642574 100644
--- a/html/065duplex_list.mu.html
+++ b/html/065duplex_list.mu.html
@@ -729,21 +729,21 @@ if ('onhashchange' in window) {
 <span id="L667" class="LineNr">667 </span><span class="muRecipe">def</span> to-text in:&amp;:<a href='065duplex_list.mu.html#L3'>duplex-list</a>:_elem<span class="muRecipe"> -&gt; </span>result:text [
 <span id="L668" class="LineNr">668 </span>  <span class="Constant">local-scope</span>
 <span id="L669" class="LineNr">669 </span>  <span class="Constant">load-ingredients</span>
-<span id="L670" class="LineNr">670 </span>  buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L131'>new-buffer</a><span class="Constant"> 80</span>
+<span id="L670" class="LineNr">670 </span>  buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L125'>new-buffer</a><span class="Constant"> 80</span>
 <span id="L671" class="LineNr">671 </span>  buf <span class="Special">&lt;-</span> to-buffer in, buf
-<span id="L672" class="LineNr">672 </span>  result <span class="Special">&lt;-</span> <a href='061text.mu.html#L344'>buffer-to-array</a> buf
+<span id="L672" class="LineNr">672 </span>  result <span class="Special">&lt;-</span> <a href='061text.mu.html#L338'>buffer-to-array</a> buf
 <span id="L673" class="LineNr">673 </span>]
 <span id="L674" class="LineNr">674 </span>
 <span id="L675" class="LineNr">675 </span><span class="Comment"># variant of 'to-text' which stops printing after a few elements (and so is robust to cycles)</span>
 <span id="L676" class="LineNr">676 </span><span class="muRecipe">def</span> to-text-line in:&amp;:<a href='065duplex_list.mu.html#L3'>duplex-list</a>:_elem<span class="muRecipe"> -&gt; </span>result:text [
 <span id="L677" class="LineNr">677 </span>  <span class="Constant">local-scope</span>
 <span id="L678" class="LineNr">678 </span>  <span class="Constant">load-ingredients</span>
-<span id="L679" class="LineNr">679 </span>  buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L131'>new-buffer</a><span class="Constant"> 80</span>
+<span id="L679" class="LineNr">679 </span>  buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L125'>new-buffer</a><span class="Constant"> 80</span>
 <span id="L680" class="LineNr">680 </span>  buf <span class="Special">&lt;-</span> to-buffer in, buf,<span class="Constant"> 6</span>  <span class="Comment"># max elements to display</span>
-<span id="L681" class="LineNr">681 </span>  result <span class="Special">&lt;-</span> <a href='061text.mu.html#L344'>buffer-to-array</a> buf
+<span id="L681" class="LineNr">681 </span>  result <span class="Special">&lt;-</span> <a href='061text.mu.html#L338'>buffer-to-array</a> buf
 <span id="L682" class="LineNr">682 </span>]
 <span id="L683" class="LineNr">683 </span>
-<span id="L684" class="LineNr">684 </span><span class="muRecipe">def</span> to-buffer in:&amp;:<a href='065duplex_list.mu.html#L3'>duplex-list</a>:_elem, buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char<span class="muRecipe"> -&gt; </span>buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char [
+<span id="L684" class="LineNr">684 </span><span class="muRecipe">def</span> to-buffer in:&amp;:<a href='065duplex_list.mu.html#L3'>duplex-list</a>:_elem, buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char<span class="muRecipe"> -&gt; </span>buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char [
 <span id="L685" class="LineNr">685 </span>  <span class="Constant">local-scope</span>
 <span id="L686" class="LineNr">686 </span>  <span class="Constant">load-ingredients</span>
 <span id="L687" class="LineNr">687 </span>  <span class="Delimiter">{</span>
diff --git a/html/066stream.mu.html b/html/066stream.mu.html
index 564a24bc..c8cee1a6 100644
--- a/html/066stream.mu.html
+++ b/html/066stream.mu.html
@@ -124,7 +124,7 @@ if ('onhashchange' in window) {
 <span id="L63" class="LineNr">63 </span>  idx:num <span class="Special">&lt;-</span> get *in, <span class="Constant">index:offset</span>
 <span id="L64" class="LineNr">64 </span>  s:text <span class="Special">&lt;-</span> get *in, <span class="Constant">data:offset</span>
 <span id="L65" class="LineNr">65 </span>  next-idx:num <span class="Special">&lt;-</span> find-next s, <span class="Constant">10/newline</span>, idx
-<span id="L66" class="LineNr">66 </span>  result <span class="Special">&lt;-</span> <a href='061text.mu.html#L1294'>copy-range</a> s, idx, next-idx
+<span id="L66" class="LineNr">66 </span>  result <span class="Special">&lt;-</span> <a href='061text.mu.html#L1279'>copy-range</a> s, idx, next-idx
 <span id="L67" class="LineNr">67 </span>  idx <span class="Special">&lt;-</span> add next-idx,<span class="Constant"> 1</span>  <span class="Comment"># skip newline</span>
 <span id="L68" class="LineNr">68 </span>  <span class="Comment"># write back</span>
 <span id="L69" class="LineNr">69 </span>  *in <span class="Special">&lt;-</span> put *in, <span class="Constant">index:offset</span>, idx
diff --git a/html/069hash.cc.html b/html/069hash.cc.html
index 9df18428..3f60a052 100644
--- a/html/069hash.cc.html
+++ b/html/069hash.cc.html
@@ -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#L76'>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#L76'>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> address = r<span class="Delimiter">.</span>value+<span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; size<span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> address += size_of<span class="Delimiter">(</span>elem<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="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#L76'>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>address<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#L76'>address</a> = r<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="Normal">int</span> address = r<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
 <span id="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 06ac9c73..3ec46cb0 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#L76'>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:address: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,14 +323,14 @@ 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#L325'>address_value</a><span class="Delimiter">(</span>canonized_in<span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L261" class="LineNr">261 </span>  <span class="Normal">int</span> in_address = <a href='071deep_copy.cc.html#L319'>payload_address</a><span class="Delimiter">(</span>canonized_in<span class="Delimiter">);</span>
-<span id="L262" class="LineNr">262 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: copying <a href='043space.cc.html#L76'>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 address &quot;</span> &lt;&lt; in_address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L263" class="LineNr">263 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>addresses_copied<span class="Delimiter">,</span> in_address<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L264" class="LineNr">264 </span>  <span class="Conceal">¦</span> <span class="Normal">int</span> out = get<span class="Delimiter">(</span>addresses_copied<span class="Delimiter">,</span> in_address<span class="Delimiter">);</span>
 <span id="L265" class="LineNr">265 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: copy already exists: &quot;</span> &lt;&lt; out &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L266" class="LineNr">266 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> out<span class="Delimiter">;</span>
 <span id="L267" class="LineNr">267 </span>  <span class="Delimiter">}</span>
 <span id="L268" class="LineNr">268 </span>  <span class="Normal">int</span> out = allocate<span class="Delimiter">(</span><a href='036refcount.cc.html#L92'>payload_size</a><span class="Delimiter">(</span>canonized_in<span class="Delimiter">));</span>
-<span id="L269" class="LineNr">269 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: new <a href='043space.cc.html#L76'>address</a> is &quot;</span> &lt;&lt; out &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L269" class="LineNr">269 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: new address is &quot;</span> &lt;&lt; out &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L270" class="LineNr">270 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>addresses_copied<span class="Delimiter">,</span> in_address<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
 <span id="L271" class="LineNr">271 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> payload = canonized_in<span class="Delimiter">;</span>
 <span id="L272" class="LineNr">272 </span>  payload<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
@@ -357,7 +357,7 @@ if ('onhashchange' in window) {
 <span id="L293" class="LineNr">293 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> canonized_in<span class="Delimiter">.</span>type<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L294" class="LineNr">294 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: scanning for addresses in &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>data<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L295" class="LineNr">295 </span>  <span class="Normal">const</span> container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> canonized_in<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L296" class="LineNr">296 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt;::const_iterator p = metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>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="L296" class="LineNr">296 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt;::const_iterator p = metadata<span class="Delimiter">.</span>address<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != metadata<span class="Delimiter">.</span>address<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L297" class="LineNr">297 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!all_match<span class="Delimiter">(</span>data<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L298" class="LineNr">298 </span>  <span class="Conceal">¦</span> <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;address_element_info&gt;::const_iterator info = p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  info != p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++info<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L299" class="LineNr">299 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// hack: skip primitive containers that do their own locking; they're designed to be shared between routines</span>
@@ -374,7 +374,7 @@ if ('onhashchange' in window) {
 <span id="L310" class="LineNr">310 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;address&quot;</span><span class="Delimiter">),</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">));</span>
 <span id="L311" class="LineNr">311 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>canonized_in<span class="Delimiter">.</span>value + info<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">);</span>
 <span id="L312" class="LineNr">312 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> curr<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;raw&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
-<span id="L313" class="LineNr">313 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: copying <a href='043space.cc.html#L76'>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="L313" class="LineNr">313 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: copying address &quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L314" class="LineNr">314 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> out<span class="Delimiter">.</span>at<span class="Delimiter">(</span>info<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">)</span> = <a href='071deep_copy.cc.html#L259'>deep_copy_address</a><span class="Delimiter">(</span>curr<span class="Delimiter">,</span> addresses_copied<span class="Delimiter">,</span> tmp<span class="Delimiter">);</span>
 <span id="L315" class="LineNr">315 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
 <span id="L316" class="LineNr">316 </span>  <span class="Delimiter">}</span>
diff --git a/html/072recipe.cc.html b/html/072recipe.cc.html
index 9b03b055..fd78c68b 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#L76'>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>address number<span class="Delimiter">)</span><span class="muRecipe"> -&gt; </span>number<span class="Delimiter">)}</span><span class="Special"> &lt;- </span>copy f
 <span id="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#L76'>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>address number<span class="Delimiter">)</span><span class="muRecipe"> -&gt; </span>number<span class="Delimiter">)},</span> <span class="Constant">2</span>:&amp;:num
 <span id="L336" class="LineNr">336 </span>]
 <span id="L337" class="LineNr">337 </span><span class="muRecipe">def</span> f x:&amp;:num<span class="muRecipe"> -&gt; </span>y:num [
 <span id="L338" class="LineNr">338 </span>  local-scope
diff --git a/html/075channel.mu.html b/html/075channel.mu.html
index 6cc72808..91122080 100644
--- a/html/075channel.mu.html
+++ b/html/075channel.mu.html
@@ -475,7 +475,7 @@ if ('onhashchange' in window) {
 <span id="L411" class="LineNr">411 </span>  <span class="Comment"># repeat forever</span>
 <span id="L412" class="LineNr">412 </span>  eof?:bool <span class="Special">&lt;-</span> copy <span class="Constant">0/false</span>
 <span id="L413" class="LineNr">413 </span>  <span class="Delimiter">{</span>
-<span id="L414" class="LineNr">414 </span>  <span class="Conceal">¦</span> line:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L131'>new-buffer</a><span class="Constant"> 30</span>
+<span id="L414" class="LineNr">414 </span>  <span class="Conceal">¦</span> line:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L125'>new-buffer</a><span class="Constant"> 30</span>
 <span id="L415" class="LineNr">415 </span>  <span class="Conceal">¦</span> <span class="Comment"># read characters from 'in' until newline, copy into line</span>
 <span id="L416" class="LineNr">416 </span>  <span class="Conceal">¦</span> <span class="Delimiter">{</span>
 <span id="L417" class="LineNr">417 </span><span class="Constant">  </span><span class="Conceal">¦</span><span class="Constant"> </span><span class="Conceal">¦</span><span class="Constant"> +next-character</span>
@@ -571,14 +571,14 @@ if ('onhashchange' in window) {
 <span id="L507" class="LineNr">507 </span><span class="muRecipe">def</span> <a href='075channel.mu.html#L507'>drain</a> <a href='075channel.mu.html#L43'>source</a>:&amp;:<a href='075channel.mu.html#L43'>source</a>:char<span class="muRecipe"> -&gt; </span>result:text, <a href='075channel.mu.html#L43'>source</a>:&amp;:<a href='075channel.mu.html#L43'>source</a>:char [
 <span id="L508" class="LineNr">508 </span>  <span class="Constant">local-scope</span>
 <span id="L509" class="LineNr">509 </span>  <span class="Constant">load-ingredients</span>
-<span id="L510" class="LineNr">510 </span>  buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L131'>new-buffer</a><span class="Constant"> 30</span>
+<span id="L510" class="LineNr">510 </span>  buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L125'>new-buffer</a><span class="Constant"> 30</span>
 <span id="L511" class="LineNr">511 </span>  <span class="Delimiter">{</span>
 <span id="L512" class="LineNr">512 </span>  <span class="Conceal">¦</span> c:char, done?:bool <span class="Special">&lt;-</span> read <a href='075channel.mu.html#L43'>source</a>
 <span id="L513" class="LineNr">513 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
 <span id="L514" class="LineNr">514 </span>  <span class="Conceal">¦</span> buf <span class="Special">&lt;-</span> append buf, c
 <span id="L515" class="LineNr">515 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
 <span id="L516" class="LineNr">516 </span>  <span class="Delimiter">}</span>
-<span id="L517" class="LineNr">517 </span>  result <span class="Special">&lt;-</span> <a href='061text.mu.html#L344'>buffer-to-array</a> buf
+<span id="L517" class="LineNr">517 </span>  result <span class="Special">&lt;-</span> <a href='061text.mu.html#L338'>buffer-to-array</a> buf
 <span id="L518" class="LineNr">518 </span>]
 </pre>
 </body>
diff --git a/html/088file.mu.html b/html/088file.mu.html
index 5ba2c541..88c45143 100644
--- a/html/088file.mu.html
+++ b/html/088file.mu.html
@@ -101,14 +101,14 @@ if ('onhashchange' in window) {
 <span id="L40" class="LineNr"> 40 </span>  <span class="Constant">load-ingredients</span>
 <span id="L41" class="LineNr"> 41 </span>  <a href='075channel.mu.html#L43'>source</a>:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, error?:bool <span class="Special">&lt;-</span> <a href='088file.mu.html#L21'>start-reading</a> <a href='088file.mu.html#L11'>resources</a>, filename
 <span id="L42" class="LineNr"> 42 </span>  <span class="muControl">return-if</span> error?, <span class="Constant">0/contents</span>
-<span id="L43" class="LineNr"> 43 </span>  buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L131'>new-buffer</a> <span class="Constant">30/capacity</span>
+<span id="L43" class="LineNr"> 43 </span>  buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L125'>new-buffer</a> <span class="Constant">30/capacity</span>
 <span id="L44" class="LineNr"> 44 </span>  <span class="Delimiter">{</span>
 <span id="L45" class="LineNr"> 45 </span>  <span class="Conceal">¦</span> c:char, done?:bool, <a href='075channel.mu.html#L43'>source</a> <span class="Special">&lt;-</span> read <a href='075channel.mu.html#L43'>source</a>
 <span id="L46" class="LineNr"> 46 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
 <span id="L47" class="LineNr"> 47 </span>  <span class="Conceal">¦</span> buf <span class="Special">&lt;-</span> append buf, c
 <span id="L48" class="LineNr"> 48 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
 <span id="L49" class="LineNr"> 49 </span>  <span class="Delimiter">}</span>
-<span id="L50" class="LineNr"> 50 </span>  contents <span class="Special">&lt;-</span> <a href='061text.mu.html#L344'>buffer-to-array</a> buf
+<span id="L50" class="LineNr"> 50 </span>  contents <span class="Special">&lt;-</span> <a href='061text.mu.html#L338'>buffer-to-array</a> buf
 <span id="L51" class="LineNr"> 51 </span>]
 <span id="L52" class="LineNr"> 52 </span>
 <span id="L53" class="LineNr"> 53 </span><span class="muRecipe">def</span> <a href='088file.mu.html#L53'>start-reading-from-fake-resource</a> <a href='088file.mu.html#L11'>resources</a>:&amp;:<a href='088file.mu.html#L11'>resources</a>, <a href='088file.mu.html#L16'>resource</a>:text<span class="muRecipe"> -&gt; </span>contents:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, error?:bool [
@@ -226,14 +226,14 @@ if ('onhashchange' in window) {
 <span id="L165" class="LineNr">165 </span>  lock:location <span class="Special">&lt;-</span> get-location *resources, <span class="Constant">lock:offset</span>
 <span id="L166" class="LineNr">166 </span>  wait-for-reset-then-set lock
 <span id="L167" class="LineNr">167 </span>  <span class="Comment"># compute new file contents</span>
-<span id="L168" class="LineNr">168 </span>  buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L131'>new-buffer</a><span class="Constant"> 30</span>
+<span id="L168" class="LineNr">168 </span>  buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L125'>new-buffer</a><span class="Constant"> 30</span>
 <span id="L169" class="LineNr">169 </span>  <span class="Delimiter">{</span>
 <span id="L170" class="LineNr">170 </span>  <span class="Conceal">¦</span> c:char, done?:bool, <a href='075channel.mu.html#L43'>source</a> <span class="Special">&lt;-</span> read <a href='075channel.mu.html#L43'>source</a>
 <span id="L171" class="LineNr">171 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
 <span id="L172" class="LineNr">172 </span>  <span class="Conceal">¦</span> buf <span class="Special">&lt;-</span> append buf, c
 <span id="L173" class="LineNr">173 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
 <span id="L174" class="LineNr">174 </span>  <span class="Delimiter">}</span>
-<span id="L175" class="LineNr">175 </span>  contents:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L344'>buffer-to-array</a> buf
+<span id="L175" class="LineNr">175 </span>  contents:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L338'>buffer-to-array</a> buf
 <span id="L176" class="LineNr">176 </span>  new-resource:<a href='088file.mu.html#L16'>resource</a> <span class="Special">&lt;-</span> merge filename, contents
 <span id="L177" class="LineNr">177 </span>  <span class="Comment"># write to resources</span>
 <span id="L178" class="LineNr">178 </span>  curr-filename:text <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
diff --git a/html/089scenario_filesystem.cc.html b/html/089scenario_filesystem.cc.html
index 3d4b33a0..031884b4 100644
--- a/html/089scenario_filesystem.cc.html
+++ b/html/089scenario_filesystem.cc.html
@@ -288,12 +288,12 @@ if ('onhashchange' in window) {
 <span id="L226" class="LineNr">226 </span>  <span class="Normal">int</span> resources_address = allocate<span class="Delimiter">(</span><a href='089scenario_filesystem.cc.html#L237'>size_of_resources</a><span class="Delimiter">());</span>
 <span id="L227" class="LineNr">227 </span>  curr = resources_address+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span>+<span class="Comment">/*</span><span class="Comment">offset of 'data' element</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L228" class="LineNr">228 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> resources_data_address<span class="Delimiter">);</span>
-<span id="L229" class="LineNr">229 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing resources data <a href='043space.cc.html#L76'>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">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing resources data address &quot;</span> &lt;&lt; resources_data_address &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; curr &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L230" class="LineNr">230 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> resources_address<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>  <span class="Comment">// initialize refcount</span>
 <span id="L231" class="LineNr">231 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing refcount 1 in location &quot;</span> &lt;&lt; resources_address &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L232" class="LineNr">232 </span>  <span class="Comment">// save in product</span>
 <span id="L233" class="LineNr">233 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> RESOURCES<span class="Delimiter">,</span> resources_address<span class="Delimiter">);</span>
-<span id="L234" class="LineNr">234 </span>  <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing resources <a href='043space.cc.html#L76'>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">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing resources address &quot;</span> &lt;&lt; resources_address &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; RESOURCES &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="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/092socket.mu.html b/html/092socket.mu.html
index 69f4fae8..23a8ac3a 100644
--- a/html/092socket.mu.html
+++ b/html/092socket.mu.html
@@ -146,7 +146,7 @@ if ('onhashchange' in window) {
 <span id="L84" class="LineNr"> 84 </span>  host:text, path:text <span class="Special">&lt;-</span> <a href='092socket.mu.html#L148'>split-at</a> uri, <span class="Constant">47/slash</span>
 <span id="L85" class="LineNr"> 85 </span>  socket:num <span class="Special">&lt;-</span> $open-client-socket host, port
 <span id="L86" class="LineNr"> 86 </span>  assert socket, <span class="Constant">[contents]</span>
-<span id="L87" class="LineNr"> 87 </span>  req:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L521'>interpolate</a> <span class="Constant">[GET _ HTTP/1.1]</span>, path
+<span id="L87" class="LineNr"> 87 </span>  req:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L512'>interpolate</a> <span class="Constant">[GET _ HTTP/1.1]</span>, path
 <span id="L88" class="LineNr"> 88 </span>  <a href='092socket.mu.html#L93'>request-socket</a> socket, req
 <span id="L89" class="LineNr"> 89 </span>  contents:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='075channel.mu.html#L47'>sink</a>:&amp;:<a href='075channel.mu.html#L47'>sink</a>:char <span class="Special">&lt;-</span> <a href='075channel.mu.html#L51'>new-channel</a><span class="Constant"> 10000</span>
 <span id="L90" class="LineNr"> 90 </span>  start-running <a href='092socket.mu.html#L125'>receive-from-client-socket-and-close</a> socket, <a href='075channel.mu.html#L47'>sink</a>
@@ -220,8 +220,8 @@ if ('onhashchange' in window) {
 <span id="L158" class="LineNr">158 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span>
 <span id="L159" class="LineNr">159 </span>  <span class="Delimiter">}</span>
 <span id="L160" class="LineNr">160 </span>  idx:num <span class="Special">&lt;-</span> find-next text, delim,<span class="Constant"> 0</span>
-<span id="L161" class="LineNr">161 </span>  x:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1294'>copy-range</a> text,<span class="Constant"> 0</span>, idx
-<span id="L162" class="LineNr">162 </span>  y:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1294'>copy-range</a> text, idx, len
+<span id="L161" class="LineNr">161 </span>  x:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1279'>copy-range</a> text,<span class="Constant"> 0</span>, idx
+<span id="L162" class="LineNr">162 </span>  y:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L1279'>copy-range</a> text, idx, len
 <span id="L163" class="LineNr">163 </span>]
 <span id="L164" class="LineNr">164 </span>
 <span id="L165" class="LineNr">165 </span><span class="muScenario">scenario</span> text-split-at [
diff --git a/html/101run_sandboxed.cc.html b/html/101run_sandboxed.cc.html
index 25f881e5..aa776257 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#L76'>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> address<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#L76'>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>address<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#L76'>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> address<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#L76'>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> address<span class="Delimiter">));</span>
 <span id="L492" class="LineNr">492 </span>  <span class="Identifier">return</span> <a href='038new_text.cc.html#L38'>new_mu_text</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span>str<span class="Delimiter">());</span>
 <span id="L493" class="LineNr">493 </span><span class="Delimiter">}</span>
 <span id="L494" class="LineNr">494 </span>
diff --git a/html/chessboard.mu.html b/html/chessboard.mu.html
index 4d77517e..7376039a 100644
--- a/html/chessboard.mu.html
+++ b/html/chessboard.mu.html
@@ -159,7 +159,7 @@ if ('onhashchange' in window) {
 <span id="L95" class="LineNr"> 95 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> buffered-stdin-in <span class="Special">&lt;-</span> <a href='075channel.mu.html#L312'>clear</a> buffered-stdin-in  <span class="Comment"># cleanup after error. todo: test this?</span>
 <span id="L96" class="LineNr"> 96 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">loop-if</span> error
 <span id="L97" class="LineNr"> 97 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L98" class="LineNr"> 98 </span>  <span class="Conceal">¦</span> <a href='chessboard.mu.html#L67'>board</a> <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L537'>make-move</a> <a href='chessboard.mu.html#L67'>board</a>, m
+<span id="L98" class="LineNr"> 98 </span>  <span class="Conceal">¦</span> <a href='chessboard.mu.html#L67'>board</a> <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L524'>make-move</a> <a href='chessboard.mu.html#L67'>board</a>, m
 <span id="L99" class="LineNr"> 99 </span>  <span class="Conceal">¦</span> <a href='081print.mu.html#L16'>screen</a> <span class="Special">&lt;-</span> <a href='081print.mu.html#L46'>clear-screen</a> <a href='081print.mu.html#L16'>screen</a>
 <span id="L100" class="LineNr">100 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
 <span id="L101" class="LineNr">101 </span>  <span class="Delimiter">}</span>
@@ -308,21 +308,21 @@ if ('onhashchange' in window) {
 <span id="L244" class="LineNr">244 </span>  <span class="Comment"># construct the move object</span>
 <span id="L245" class="LineNr">245 </span>  result:&amp;:<a href='chessboard.mu.html#L229'>move</a> <span class="Special">&lt;-</span> new <span class="Constant"><a href='chessboard.mu.html#L229'>move</a>:type</span>
 <span id="L246" class="LineNr">246 </span>  *result <span class="Special">&lt;-</span> put *result, <span class="Constant">from-file:offset</span>, from-file
-<span id="L247" class="LineNr">247 </span>  from-rank:num, quit?, error? <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L313'>read-rank</a> stdin, <a href='081print.mu.html#L16'>screen</a>
+<span id="L247" class="LineNr">247 </span>  from-rank:num, quit?, error? <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L304'>read-rank</a> stdin, <a href='081print.mu.html#L16'>screen</a>
 <span id="L248" class="LineNr">248 </span>  <span class="muControl">return-if</span> quit?, <span class="Constant">0/dummy</span>
 <span id="L249" class="LineNr">249 </span>  <span class="muControl">return-if</span> error?, <span class="Constant">0/dummy</span>
 <span id="L250" class="LineNr">250 </span>  *result <span class="Special">&lt;-</span> put *result, <span class="Constant">from-rank:offset</span>, from-rank
-<span id="L251" class="LineNr">251 </span>  error? <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L355'>expect-from-channel</a> stdin, <span class="Constant">45/dash</span>, <a href='081print.mu.html#L16'>screen</a>
+<span id="L251" class="LineNr">251 </span>  error? <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L342'>expect-from-channel</a> stdin, <span class="Constant">45/dash</span>, <a href='081print.mu.html#L16'>screen</a>
 <span id="L252" class="LineNr">252 </span>  <span class="muControl">return-if</span> error?, <span class="Constant">0/dummy</span>, <span class="Constant">0/quit</span>
 <span id="L253" class="LineNr">253 </span>  to-file:num, quit?, error? <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L266'>read-file</a> stdin, <a href='081print.mu.html#L16'>screen</a>
 <span id="L254" class="LineNr">254 </span>  <span class="muControl">return-if</span> quit?, <span class="Constant">0/dummy</span>
 <span id="L255" class="LineNr">255 </span>  <span class="muControl">return-if</span> error?, <span class="Constant">0/dummy</span>
 <span id="L256" class="LineNr">256 </span>  *result <span class="Special">&lt;-</span> put *result, <span class="Constant">to-file:offset</span>, to-file
-<span id="L257" class="LineNr">257 </span>  to-rank:num, quit?, error? <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L313'>read-rank</a> stdin, <a href='081print.mu.html#L16'>screen</a>
+<span id="L257" class="LineNr">257 </span>  to-rank:num, quit?, error? <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L304'>read-rank</a> stdin, <a href='081print.mu.html#L16'>screen</a>
 <span id="L258" class="LineNr">258 </span>  <span class="muControl">return-if</span> quit?, <span class="Constant">0/dummy</span>
 <span id="L259" class="LineNr">259 </span>  <span class="muControl">return-if</span> error?, <span class="Constant">0/dummy</span>
 <span id="L260" class="LineNr">260 </span>  *result <span class="Special">&lt;-</span> put *result, <span class="Constant">to-rank:offset</span>, to-rank
-<span id="L261" class="LineNr">261 </span>  error? <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L355'>expect-from-channel</a> stdin, <span class="Constant">10/newline</span>, <a href='081print.mu.html#L16'>screen</a>
+<span id="L261" class="LineNr">261 </span>  error? <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L342'>expect-from-channel</a> stdin, <span class="Constant">10/newline</span>, <a href='081print.mu.html#L16'>screen</a>
 <span id="L262" class="LineNr">262 </span>  <span class="muControl">return-if</span> error?, <span class="Constant">0/dummy</span>, <span class="Constant">0/quit</span>
 <span id="L263" class="LineNr">263 </span>]
 <span id="L264" class="LineNr">264 </span>
@@ -332,311 +332,298 @@ if ('onhashchange' in window) {
 <span id="L268" class="LineNr">268 </span>  <span class="Constant">load-ingredients</span>
 <span id="L269" class="LineNr">269 </span>  c:char, eof?:bool, stdin <span class="Special">&lt;-</span> read stdin
 <span id="L270" class="LineNr">270 </span>  <span class="muControl">return-if</span> eof?, <span class="Constant">0/dummy</span>, <span class="Constant">1/quit</span>, <span class="Constant">0/error</span>
-<span id="L271" class="LineNr">271 </span>  <span class="Delimiter">{</span>
-<span id="L272" class="LineNr">272 </span>  <span class="Conceal">¦</span> q-pressed?:bool <span class="Special">&lt;-</span> equal c, <span class="Constant">81/Q</span>
-<span id="L273" class="LineNr">273 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> q-pressed?
-<span id="L274" class="LineNr">274 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span> <span class="Constant">0/dummy</span>, <span class="Constant">1/quit</span>, <span class="Constant">0/error</span>
-<span id="L275" class="LineNr">275 </span>  <span class="Delimiter">}</span>
-<span id="L276" class="LineNr">276 </span>  <span class="Delimiter">{</span>
-<span id="L277" class="LineNr">277 </span>  <span class="Conceal">¦</span> q-pressed? <span class="Special">&lt;-</span> equal c, <span class="Constant">113/q</span>
-<span id="L278" class="LineNr">278 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> q-pressed?
-<span id="L279" class="LineNr">279 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span> <span class="Constant">0/dummy</span>, <span class="Constant">1/quit</span>, <span class="Constant">0/error</span>
-<span id="L280" class="LineNr">280 </span>  <span class="Delimiter">}</span>
-<span id="L281" class="LineNr">281 </span>  <span class="Delimiter">{</span>
-<span id="L282" class="LineNr">282 </span>  <span class="Conceal">¦</span> empty-fake-keyboard?:bool <span class="Special">&lt;-</span> equal c, <span class="Constant">0/eof</span>
-<span id="L283" class="LineNr">283 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> empty-fake-keyboard?
-<span id="L284" class="LineNr">284 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span> <span class="Constant">0/dummy</span>, <span class="Constant">1/quit</span>, <span class="Constant">0/error</span>
-<span id="L285" class="LineNr">285 </span>  <span class="Delimiter">}</span>
-<span id="L286" class="LineNr">286 </span>  <span class="Delimiter">{</span>
-<span id="L287" class="LineNr">287 </span>  <span class="Conceal">¦</span> newline?:bool <span class="Special">&lt;-</span> equal c, <span class="Constant">10/newline</span>
-<span id="L288" class="LineNr">288 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> newline?
-<span id="L289" class="LineNr">289 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, <span class="Constant">[that's not enough]</span>
-<span id="L290" class="LineNr">290 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span> <span class="Constant">0/dummy</span>, <span class="Constant">0/quit</span>, <span class="Constant">1/error</span>
-<span id="L291" class="LineNr">291 </span>  <span class="Delimiter">}</span>
-<span id="L292" class="LineNr">292 </span>  file:num <span class="Special">&lt;-</span> subtract c, <span class="Constant">97/a</span>
-<span id="L293" class="LineNr">293 </span>  <span class="Comment"># 'a' &lt;= file &lt;= 'h'</span>
-<span id="L294" class="LineNr">294 </span>  <span class="Delimiter">{</span>
-<span id="L295" class="LineNr">295 </span>  <span class="Conceal">¦</span> above-min:bool <span class="Special">&lt;-</span> greater-or-equal file,<span class="Constant"> 0</span>
-<span id="L296" class="LineNr">296 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> above-min
-<span id="L297" class="LineNr">297 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, <span class="Constant">[file too low: ]</span>
-<span id="L298" class="LineNr">298 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, c
-<span id="L299" class="LineNr">299 </span>  <span class="Conceal">¦</span> <a href='081print.mu.html#L752'>cursor-to-next-line</a> <a href='081print.mu.html#L16'>screen</a>
-<span id="L300" class="LineNr">300 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span> <span class="Constant">0/dummy</span>, <span class="Constant">0/quit</span>, <span class="Constant">1/error</span>
-<span id="L301" class="LineNr">301 </span>  <span class="Delimiter">}</span>
-<span id="L302" class="LineNr">302 </span>  <span class="Delimiter">{</span>
-<span id="L303" class="LineNr">303 </span>  <span class="Conceal">¦</span> below-max:bool <span class="Special">&lt;-</span> lesser-than file,<span class="Constant"> 8</span>
-<span id="L304" class="LineNr">304 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> below-max
-<span id="L305" class="LineNr">305 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, <span class="Constant">[file too high: ]</span>
-<span id="L306" class="LineNr">306 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, c
-<span id="L307" class="LineNr">307 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span> <span class="Constant">0/dummy</span>, <span class="Constant">0/quit</span>, <span class="Constant">1/error</span>
-<span id="L308" class="LineNr">308 </span>  <span class="Delimiter">}</span>
-<span id="L309" class="LineNr">309 </span>  <span class="muControl">return</span> file, <span class="Constant">0/quit</span>, <span class="Constant">0/error</span>
-<span id="L310" class="LineNr">310 </span>]
-<span id="L311" class="LineNr">311 </span>
-<span id="L312" class="LineNr">312 </span><span class="Comment"># valid values for rank: 0-7</span>
-<span id="L313" class="LineNr">313 </span><span class="muRecipe">def</span> <a href='chessboard.mu.html#L313'>read-rank</a> stdin:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a><span class="muRecipe"> -&gt; </span>rank:num, quit?:bool, error?:bool, stdin:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a> [
-<span id="L314" class="LineNr">314 </span>  <span class="Constant">local-scope</span>
-<span id="L315" class="LineNr">315 </span>  <span class="Constant">load-ingredients</span>
-<span id="L316" class="LineNr">316 </span>  c:char, eof?:bool, stdin <span class="Special">&lt;-</span> read stdin
-<span id="L317" class="LineNr">317 </span>  <span class="muControl">return-if</span> eof?, <span class="Constant">0/dummy</span>, <span class="Constant">1/quit</span>, <span class="Constant">0/error</span>
-<span id="L318" class="LineNr">318 </span>  <span class="Delimiter">{</span>
-<span id="L319" class="LineNr">319 </span>  <span class="Conceal">¦</span> q-pressed?:bool <span class="Special">&lt;-</span> equal c, <span class="Constant">8/Q</span>
-<span id="L320" class="LineNr">320 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> q-pressed?
-<span id="L321" class="LineNr">321 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span> <span class="Constant">0/dummy</span>, <span class="Constant">1/quit</span>, <span class="Constant">0/error</span>
-<span id="L322" class="LineNr">322 </span>  <span class="Delimiter">}</span>
+<span id="L271" class="LineNr">271 </span>  q-pressed?:bool <span class="Special">&lt;-</span> equal c, <span class="Constant">81/Q</span>
+<span id="L272" class="LineNr">272 </span>  <span class="muControl">return-if</span> q-pressed?, <span class="Constant">0/dummy</span>, <span class="Constant">1/quit</span>, <span class="Constant">0/error</span>
+<span id="L273" class="LineNr">273 </span>  q-pressed? <span class="Special">&lt;-</span> equal c, <span class="Constant">113/q</span>
+<span id="L274" class="LineNr">274 </span>  <span class="muControl">return-if</span> q-pressed?, <span class="Constant">0/dummy</span>, <span class="Constant">1/quit</span>, <span class="Constant">0/error</span>
+<span id="L275" class="LineNr">275 </span>  empty-fake-keyboard?:bool <span class="Special">&lt;-</span> equal c, <span class="Constant">0/eof</span>
+<span id="L276" class="LineNr">276 </span>  <span class="muControl">return-if</span> empty-fake-keyboard?, <span class="Constant">0/dummy</span>, <span class="Constant">1/quit</span>, <span class="Constant">0/error</span>
+<span id="L277" class="LineNr">277 </span>  <span class="Delimiter">{</span>
+<span id="L278" class="LineNr">278 </span>  <span class="Conceal">¦</span> newline?:bool <span class="Special">&lt;-</span> equal c, <span class="Constant">10/newline</span>
+<span id="L279" class="LineNr">279 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> newline?
+<span id="L280" class="LineNr">280 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, <span class="Constant">[that's not enough]</span>
+<span id="L281" class="LineNr">281 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span> <span class="Constant">0/dummy</span>, <span class="Constant">0/quit</span>, <span class="Constant">1/error</span>
+<span id="L282" class="LineNr">282 </span>  <span class="Delimiter">}</span>
+<span id="L283" class="LineNr">283 </span>  file:num <span class="Special">&lt;-</span> subtract c, <span class="Constant">97/a</span>
+<span id="L284" class="LineNr">284 </span>  <span class="Comment"># 'a' &lt;= file &lt;= 'h'</span>
+<span id="L285" class="LineNr">285 </span>  <span class="Delimiter">{</span>
+<span id="L286" class="LineNr">286 </span>  <span class="Conceal">¦</span> above-min:bool <span class="Special">&lt;-</span> greater-or-equal file,<span class="Constant"> 0</span>
+<span id="L287" class="LineNr">287 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> above-min
+<span id="L288" class="LineNr">288 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, <span class="Constant">[file too low: ]</span>
+<span id="L289" class="LineNr">289 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, c
+<span id="L290" class="LineNr">290 </span>  <span class="Conceal">¦</span> <a href='081print.mu.html#L752'>cursor-to-next-line</a> <a href='081print.mu.html#L16'>screen</a>
+<span id="L291" class="LineNr">291 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span> <span class="Constant">0/dummy</span>, <span class="Constant">0/quit</span>, <span class="Constant">1/error</span>
+<span id="L292" class="LineNr">292 </span>  <span class="Delimiter">}</span>
+<span id="L293" class="LineNr">293 </span>  <span class="Delimiter">{</span>
+<span id="L294" class="LineNr">294 </span>  <span class="Conceal">¦</span> below-max:bool <span class="Special">&lt;-</span> lesser-than file,<span class="Constant"> 8</span>
+<span id="L295" class="LineNr">295 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> below-max
+<span id="L296" class="LineNr">296 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, <span class="Constant">[file too high: ]</span>
+<span id="L297" class="LineNr">297 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, c
+<span id="L298" class="LineNr">298 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span> <span class="Constant">0/dummy</span>, <span class="Constant">0/quit</span>, <span class="Constant">1/error</span>
+<span id="L299" class="LineNr">299 </span>  <span class="Delimiter">}</span>
+<span id="L300" class="LineNr">300 </span>  <span class="muControl">return</span> file, <span class="Constant">0/quit</span>, <span class="Constant">0/error</span>
+<span id="L301" class="LineNr">301 </span>]
+<span id="L302" class="LineNr">302 </span>
+<span id="L303" class="LineNr">303 </span><span class="Comment"># valid values for rank: 0-7</span>
+<span id="L304" class="LineNr">304 </span><span class="muRecipe">def</span> <a href='chessboard.mu.html#L304'>read-rank</a> stdin:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a><span class="muRecipe"> -&gt; </span>rank:num, quit?:bool, error?:bool, stdin:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a> [
+<span id="L305" class="LineNr">305 </span>  <span class="Constant">local-scope</span>
+<span id="L306" class="LineNr">306 </span>  <span class="Constant">load-ingredients</span>
+<span id="L307" class="LineNr">307 </span>  c:char, eof?:bool, stdin <span class="Special">&lt;-</span> read stdin
+<span id="L308" class="LineNr">308 </span>  <span class="muControl">return-if</span> eof?, <span class="Constant">0/dummy</span>, <span class="Constant">1/quit</span>, <span class="Constant">0/error</span>
+<span id="L309" class="LineNr">309 </span>  q-pressed?:bool <span class="Special">&lt;-</span> equal c, <span class="Constant">81/Q</span>
+<span id="L310" class="LineNr">310 </span>  <span class="muControl">return-if</span> q-pressed?, <span class="Constant">0/dummy</span>, <span class="Constant">1/quit</span>, <span class="Constant">0/error</span>
+<span id="L311" class="LineNr">311 </span>  q-pressed? <span class="Special">&lt;-</span> equal c, <span class="Constant">113/q</span>
+<span id="L312" class="LineNr">312 </span>  <span class="muControl">return-if</span> q-pressed?, <span class="Constant">0/dummy</span>, <span class="Constant">1/quit</span>, <span class="Constant">0/error</span>
+<span id="L313" class="LineNr">313 </span>  empty-fake-keyboard?:bool <span class="Special">&lt;-</span> equal c, <span class="Constant">0/eof</span>
+<span id="L314" class="LineNr">314 </span>  <span class="muControl">return-if</span> empty-fake-keyboard?, <span class="Constant">0/dummy</span>, <span class="Constant">1/quit</span>, <span class="Constant">0/error</span>
+<span id="L315" class="LineNr">315 </span>  <span class="Delimiter">{</span>
+<span id="L316" class="LineNr">316 </span>  <span class="Conceal">¦</span> newline?:bool <span class="Special">&lt;-</span> equal c,<span class="Constant"> 10</span>  <span class="Comment"># newline</span>
+<span id="L317" class="LineNr">317 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> newline?
+<span id="L318" class="LineNr">318 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, <span class="Constant">[that's not enough]</span>
+<span id="L319" class="LineNr">319 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span> <span class="Constant">0/dummy</span>, <span class="Constant">0/quit</span>, <span class="Constant">1/error</span>
+<span id="L320" class="LineNr">320 </span>  <span class="Delimiter">}</span>
+<span id="L321" class="LineNr">321 </span>  rank:num <span class="Special">&lt;-</span> subtract c, <span class="Constant">49/'1'</span>
+<span id="L322" class="LineNr">322 </span>  <span class="Comment"># assert'1' &lt;= rank &lt;= '8'</span>
 <span id="L323" class="LineNr">323 </span>  <span class="Delimiter">{</span>
-<span id="L324" class="LineNr">324 </span>  <span class="Conceal">¦</span> q-pressed? <span class="Special">&lt;-</span> equal c, <span class="Constant">113/q</span>
-<span id="L325" class="LineNr">325 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> q-pressed?
-<span id="L326" class="LineNr">326 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span> <span class="Constant">0/dummy</span>, <span class="Constant">1/quit</span>, <span class="Constant">0/error</span>
-<span id="L327" class="LineNr">327 </span>  <span class="Delimiter">}</span>
-<span id="L328" class="LineNr">328 </span>  <span class="Delimiter">{</span>
-<span id="L329" class="LineNr">329 </span>  <span class="Conceal">¦</span> newline?:bool <span class="Special">&lt;-</span> equal c,<span class="Constant"> 10</span>  <span class="Comment"># newline</span>
-<span id="L330" class="LineNr">330 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> newline?
-<span id="L331" class="LineNr">331 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, <span class="Constant">[that's not enough]</span>
-<span id="L332" class="LineNr">332 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span> <span class="Constant">0/dummy</span>, <span class="Constant">0/quit</span>, <span class="Constant">1/error</span>
-<span id="L333" class="LineNr">333 </span>  <span class="Delimiter">}</span>
-<span id="L334" class="LineNr">334 </span>  rank:num <span class="Special">&lt;-</span> subtract c, <span class="Constant">49/'1'</span>
-<span id="L335" class="LineNr">335 </span>  <span class="Comment"># assert'1' &lt;= rank &lt;= '8'</span>
-<span id="L336" class="LineNr">336 </span>  <span class="Delimiter">{</span>
-<span id="L337" class="LineNr">337 </span>  <span class="Conceal">¦</span> above-min:bool <span class="Special">&lt;-</span> greater-or-equal rank,<span class="Constant"> 0</span>
-<span id="L338" class="LineNr">338 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> above-min
-<span id="L339" class="LineNr">339 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, <span class="Constant">[rank too low: ]</span>
-<span id="L340" class="LineNr">340 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, c
-<span id="L341" class="LineNr">341 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span> <span class="Constant">0/dummy</span>, <span class="Constant">0/quit</span>, <span class="Constant">1/error</span>
-<span id="L342" class="LineNr">342 </span>  <span class="Delimiter">}</span>
-<span id="L343" class="LineNr">343 </span>  <span class="Delimiter">{</span>
-<span id="L344" class="LineNr">344 </span>  <span class="Conceal">¦</span> below-max:bool <span class="Special">&lt;-</span> lesser-or-equal rank,<span class="Constant"> 7</span>
-<span id="L345" class="LineNr">345 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> below-max
-<span id="L346" class="LineNr">346 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, <span class="Constant">[rank too high: ]</span>
-<span id="L347" class="LineNr">347 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, c
-<span id="L348" class="LineNr">348 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span> <span class="Constant">0/dummy</span>, <span class="Constant">0/quit</span>, <span class="Constant">1/error</span>
-<span id="L349" class="LineNr">349 </span>  <span class="Delimiter">}</span>
-<span id="L350" class="LineNr">350 </span>  <span class="muControl">return</span> rank, <span class="Constant">0/quit</span>, <span class="Constant">0/error</span>
-<span id="L351" class="LineNr">351 </span>]
-<span id="L352" class="LineNr">352 </span>
-<span id="L353" class="LineNr">353 </span><span class="Comment"># read a character from the given channel and check that it's what we expect</span>
-<span id="L354" class="LineNr">354 </span><span class="Comment"># return true on error</span>
-<span id="L355" class="LineNr">355 </span><span class="muRecipe">def</span> <a href='chessboard.mu.html#L355'>expect-from-channel</a> stdin:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, expected:char, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a><span class="muRecipe"> -&gt; </span>result:bool, stdin:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a> [
+<span id="L324" class="LineNr">324 </span>  <span class="Conceal">¦</span> above-min:bool <span class="Special">&lt;-</span> greater-or-equal rank,<span class="Constant"> 0</span>
+<span id="L325" class="LineNr">325 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> above-min
+<span id="L326" class="LineNr">326 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, <span class="Constant">[rank too low: ]</span>
+<span id="L327" class="LineNr">327 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, c
+<span id="L328" class="LineNr">328 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span> <span class="Constant">0/dummy</span>, <span class="Constant">0/quit</span>, <span class="Constant">1/error</span>
+<span id="L329" class="LineNr">329 </span>  <span class="Delimiter">}</span>
+<span id="L330" class="LineNr">330 </span>  <span class="Delimiter">{</span>
+<span id="L331" class="LineNr">331 </span>  <span class="Conceal">¦</span> below-max:bool <span class="Special">&lt;-</span> lesser-or-equal rank,<span class="Constant"> 7</span>
+<span id="L332" class="LineNr">332 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> below-max
+<span id="L333" class="LineNr">333 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, <span class="Constant">[rank too high: ]</span>
+<span id="L334" class="LineNr">334 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, c
+<span id="L335" class="LineNr">335 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span> <span class="Constant">0/dummy</span>, <span class="Constant">0/quit</span>, <span class="Constant">1/error</span>
+<span id="L336" class="LineNr">336 </span>  <span class="Delimiter">}</span>
+<span id="L337" class="LineNr">337 </span>  <span class="muControl">return</span> rank, <span class="Constant">0/quit</span>, <span class="Constant">0/error</span>
+<span id="L338" class="LineNr">338 </span>]
+<span id="L339" class="LineNr">339 </span>
+<span id="L340" class="LineNr">340 </span><span class="Comment"># read a character from the given channel and check that it's what we expect</span>
+<span id="L341" class="LineNr">341 </span><span class="Comment"># return true on error</span>
+<span id="L342" class="LineNr">342 </span><span class="muRecipe">def</span> <a href='chessboard.mu.html#L342'>expect-from-channel</a> stdin:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, expected:char, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a><span class="muRecipe"> -&gt; </span>result:bool, stdin:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a> [
+<span id="L343" class="LineNr">343 </span>  <span class="Constant">local-scope</span>
+<span id="L344" class="LineNr">344 </span>  <span class="Constant">load-ingredients</span>
+<span id="L345" class="LineNr">345 </span>  c:char, eof?:bool, stdin <span class="Special">&lt;-</span> read stdin
+<span id="L346" class="LineNr">346 </span>  <span class="muControl">return-if</span> eof? <span class="Constant">1/true</span>
+<span id="L347" class="LineNr">347 </span>  <span class="Delimiter">{</span>
+<span id="L348" class="LineNr">348 </span>  <span class="Conceal">¦</span> match?:bool <span class="Special">&lt;-</span> equal c, expected
+<span id="L349" class="LineNr">349 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> match?
+<span id="L350" class="LineNr">350 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, <span class="Constant">[expected character not found]</span>
+<span id="L351" class="LineNr">351 </span>  <span class="Delimiter">}</span>
+<span id="L352" class="LineNr">352 </span>  result <span class="Special">&lt;-</span> not match?
+<span id="L353" class="LineNr">353 </span>]
+<span id="L354" class="LineNr">354 </span>
+<span id="L355" class="LineNr">355 </span><span class="muScenario">scenario</span> read-move-blocking [
 <span id="L356" class="LineNr">356 </span>  <span class="Constant">local-scope</span>
-<span id="L357" class="LineNr">357 </span>  <span class="Constant">load-ingredients</span>
-<span id="L358" class="LineNr">358 </span>  c:char, eof?:bool, stdin <span class="Special">&lt;-</span> read stdin
-<span id="L359" class="LineNr">359 </span>  <span class="muControl">return-if</span> eof? <span class="Constant">1/true</span>
-<span id="L360" class="LineNr">360 </span>  <span class="Delimiter">{</span>
-<span id="L361" class="LineNr">361 </span>  <span class="Conceal">¦</span> match?:bool <span class="Special">&lt;-</span> equal c, expected
-<span id="L362" class="LineNr">362 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> match?
-<span id="L363" class="LineNr">363 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, <span class="Constant">[expected character not found]</span>
-<span id="L364" class="LineNr">364 </span>  <span class="Delimiter">}</span>
-<span id="L365" class="LineNr">365 </span>  result <span class="Special">&lt;-</span> not match?
-<span id="L366" class="LineNr">366 </span>]
-<span id="L367" class="LineNr">367 </span>
-<span id="L368" class="LineNr">368 </span><span class="muScenario">scenario</span> read-move-blocking [
-<span id="L369" class="LineNr">369 </span>  <span class="Constant">local-scope</span>
-<span id="L370" class="LineNr">370 </span>  assume-screen <span class="Constant">20/width</span>, <span class="Constant">2/height</span>
-<span id="L371" class="LineNr">371 </span>  <a href='075channel.mu.html#L43'>source</a>:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='075channel.mu.html#L47'>sink</a>:&amp;:<a href='075channel.mu.html#L47'>sink</a>:char <span class="Special">&lt;-</span> <a href='075channel.mu.html#L51'>new-channel</a> <span class="Constant">2/capacity</span>
-<span id="L372" class="LineNr">372 </span>  read-move-routine:num/routine <span class="Special">&lt;-</span> start-running <a href='chessboard.mu.html#L238'>read-move</a>, <a href='075channel.mu.html#L43'>source</a>, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>
-<span id="L373" class="LineNr">373 </span>  run [
-<span id="L374" class="LineNr">374 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' is waiting for input</span>
-<span id="L375" class="LineNr">375 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
-<span id="L376" class="LineNr">376 </span>  <span class="Conceal">¦</span> read-move-state:num <span class="Special">&lt;-</span> routine-state read-move-routine
-<span id="L377" class="LineNr">377 </span>  <span class="Conceal">¦</span> waiting?:bool <span class="Special">&lt;-</span> not-equal read-move-state, <span class="Constant">2/discontinued</span>
-<span id="L378" class="LineNr">378 </span>  <span class="Conceal">¦</span> assert waiting?, <span class="Constant">[ </span>
-<span id="L379" class="LineNr">379 </span><span class="Constant">F read-move-blocking: routine failed to pause after coming up (before any keys were pressed)]</span>
-<span id="L380" class="LineNr">380 </span>  <span class="Conceal">¦</span> <span class="Comment"># press 'a'</span>
-<span id="L381" class="LineNr">381 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">97/a</span>
-<span id="L382" class="LineNr">382 </span>  <span class="Conceal">¦</span> restart read-move-routine
-<span id="L383" class="LineNr">383 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' still waiting for input</span>
-<span id="L384" class="LineNr">384 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
-<span id="L385" class="LineNr">385 </span>  <span class="Conceal">¦</span> read-move-state <span class="Special">&lt;-</span> routine-state read-move-routine
-<span id="L386" class="LineNr">386 </span>  <span class="Conceal">¦</span> waiting? <span class="Special">&lt;-</span> not-equal read-move-state, <span class="Constant">2/discontinued</span>
-<span id="L387" class="LineNr">387 </span>  <span class="Conceal">¦</span> assert waiting?, <span class="Constant">[ </span>
-<span id="L388" class="LineNr">388 </span><span class="Constant">F read-move-blocking: routine failed to pause after rank 'a']</span>
-<span id="L389" class="LineNr">389 </span>  <span class="Conceal">¦</span> <span class="Comment"># press '2'</span>
-<span id="L390" class="LineNr">390 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">50/'2'</span>
-<span id="L391" class="LineNr">391 </span>  <span class="Conceal">¦</span> restart read-move-routine
-<span id="L392" class="LineNr">392 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' still waiting for input</span>
-<span id="L393" class="LineNr">393 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
-<span id="L394" class="LineNr">394 </span>  <span class="Conceal">¦</span> read-move-state <span class="Special">&lt;-</span> routine-state read-move-routine
-<span id="L395" class="LineNr">395 </span>  <span class="Conceal">¦</span> waiting? <span class="Special">&lt;-</span> not-equal read-move-state, <span class="Constant">2/discontinued</span>
-<span id="L396" class="LineNr">396 </span>  <span class="Conceal">¦</span> assert waiting?, <span class="Constant">[ </span>
-<span id="L397" class="LineNr">397 </span><span class="Constant">F read-move-blocking: routine failed to pause after file 'a2']</span>
-<span id="L398" class="LineNr">398 </span>  <span class="Conceal">¦</span> <span class="Comment"># press '-'</span>
-<span id="L399" class="LineNr">399 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">45/'-'</span>
-<span id="L400" class="LineNr">400 </span>  <span class="Conceal">¦</span> restart read-move-routine
-<span id="L401" class="LineNr">401 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' still waiting for input</span>
-<span id="L402" class="LineNr">402 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
-<span id="L403" class="LineNr">403 </span>  <span class="Conceal">¦</span> read-move-state <span class="Special">&lt;-</span> routine-state read-move-routine
-<span id="L404" class="LineNr">404 </span>  <span class="Conceal">¦</span> waiting? <span class="Special">&lt;-</span> not-equal read-move-state, <span class="Constant">2/discontinued</span>
-<span id="L405" class="LineNr">405 </span>  <span class="Conceal">¦</span> assert waiting?, <span class="Constant">[ </span>
-<span id="L406" class="LineNr">406 </span><span class="Constant">F read-move-blocking: routine failed to pause after hyphen 'a2-']</span>
-<span id="L407" class="LineNr">407 </span>  <span class="Conceal">¦</span> <span class="Comment"># press 'a'</span>
-<span id="L408" class="LineNr">408 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">97/a</span>
-<span id="L409" class="LineNr">409 </span>  <span class="Conceal">¦</span> restart read-move-routine
-<span id="L410" class="LineNr">410 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' still waiting for input</span>
-<span id="L411" class="LineNr">411 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
-<span id="L412" class="LineNr">412 </span>  <span class="Conceal">¦</span> read-move-state <span class="Special">&lt;-</span> routine-state read-move-routine
-<span id="L413" class="LineNr">413 </span>  <span class="Conceal">¦</span> waiting? <span class="Special">&lt;-</span> not-equal read-move-state, <span class="Constant">2/discontinued</span>
-<span id="L414" class="LineNr">414 </span>  <span class="Conceal">¦</span> assert waiting?, <span class="Constant">[ </span>
-<span id="L415" class="LineNr">415 </span><span class="Constant">F read-move-blocking: routine failed to pause after rank 'a2-a']</span>
-<span id="L416" class="LineNr">416 </span>  <span class="Conceal">¦</span> <span class="Comment"># press '4'</span>
-<span id="L417" class="LineNr">417 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">52/'4'</span>
-<span id="L418" class="LineNr">418 </span>  <span class="Conceal">¦</span> restart read-move-routine
-<span id="L419" class="LineNr">419 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' still waiting for input</span>
-<span id="L420" class="LineNr">420 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
-<span id="L421" class="LineNr">421 </span>  <span class="Conceal">¦</span> read-move-state <span class="Special">&lt;-</span> routine-state read-move-routine
-<span id="L422" class="LineNr">422 </span>  <span class="Conceal">¦</span> waiting? <span class="Special">&lt;-</span> not-equal read-move-state, <span class="Constant">2/discontinued</span>
-<span id="L423" class="LineNr">423 </span>  <span class="Conceal">¦</span> assert waiting?, <span class="Constant">[ </span>
-<span id="L424" class="LineNr">424 </span><span class="Constant">F read-move-blocking: routine failed to pause after file 'a2-a4']</span>
-<span id="L425" class="LineNr">425 </span>  <span class="Conceal">¦</span> <span class="Comment"># press 'newline'</span>
-<span id="L426" class="LineNr">426 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>,<span class="Constant"> 10</span>  <span class="Comment"># newline</span>
-<span id="L427" class="LineNr">427 </span>  <span class="Conceal">¦</span> restart read-move-routine
-<span id="L428" class="LineNr">428 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' now completes</span>
-<span id="L429" class="LineNr">429 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
-<span id="L430" class="LineNr">430 </span>  <span class="Conceal">¦</span> read-move-state <span class="Special">&lt;-</span> routine-state read-move-routine
-<span id="L431" class="LineNr">431 </span>  <span class="Conceal">¦</span> completed?:bool <span class="Special">&lt;-</span> equal read-move-state, <span class="Constant">1/completed</span>
-<span id="L432" class="LineNr">432 </span>  <span class="Conceal">¦</span> assert completed?, <span class="Constant">[ </span>
-<span id="L433" class="LineNr">433 </span><span class="Constant">F read-move-blocking: routine failed to terminate on newline]</span>
-<span id="L434" class="LineNr">434 </span>  <span class="Conceal">¦</span> trace<span class="Constant"> 1</span>, <span class="Constant">[test]</span>, <span class="Constant">[reached end]</span>
-<span id="L435" class="LineNr">435 </span>  ]
-<span id="L436" class="LineNr">436 </span>  trace-should-contain [
-<span id="L437" class="LineNr">437 </span>  <span class="Conceal">¦</span> test: reached end
-<span id="L438" class="LineNr">438 </span>  ]
-<span id="L439" class="LineNr">439 </span>]
-<span id="L440" class="LineNr">440 </span>
-<span id="L441" class="LineNr">441 </span><span class="muScenario">scenario</span> read-move-quit [
-<span id="L442" class="LineNr">442 </span>  <span class="Constant">local-scope</span>
-<span id="L443" class="LineNr">443 </span>  assume-screen <span class="Constant">20/width</span>, <span class="Constant">2/height</span>
-<span id="L444" class="LineNr">444 </span>  <a href='075channel.mu.html#L43'>source</a>:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='075channel.mu.html#L47'>sink</a>:&amp;:<a href='075channel.mu.html#L47'>sink</a>:char <span class="Special">&lt;-</span> <a href='075channel.mu.html#L51'>new-channel</a> <span class="Constant">2/capacity</span>
-<span id="L445" class="LineNr">445 </span>  read-move-routine:num <span class="Special">&lt;-</span> start-running <a href='chessboard.mu.html#L238'>read-move</a>, <a href='075channel.mu.html#L43'>source</a>, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>
-<span id="L446" class="LineNr">446 </span>  run [
-<span id="L447" class="LineNr">447 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' is waiting for input</span>
-<span id="L448" class="LineNr">448 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
-<span id="L449" class="LineNr">449 </span>  <span class="Conceal">¦</span> read-move-state:num <span class="Special">&lt;-</span> routine-state read-move-routine
-<span id="L450" class="LineNr">450 </span>  <span class="Conceal">¦</span> waiting?:bool <span class="Special">&lt;-</span> not-equal read-move-state, <span class="Constant">2/discontinued</span>
-<span id="L451" class="LineNr">451 </span>  <span class="Conceal">¦</span> assert waiting?, <span class="Constant">[ </span>
-<span id="L452" class="LineNr">452 </span><span class="Constant">F read-move-quit: routine failed to pause after coming up (before any keys were pressed)]</span>
-<span id="L453" class="LineNr">453 </span>  <span class="Conceal">¦</span> <span class="Comment"># press 'q'</span>
-<span id="L454" class="LineNr">454 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">113/q</span>
-<span id="L455" class="LineNr">455 </span>  <span class="Conceal">¦</span> restart read-move-routine
-<span id="L456" class="LineNr">456 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' completes</span>
-<span id="L457" class="LineNr">457 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
-<span id="L458" class="LineNr">458 </span>  <span class="Conceal">¦</span> read-move-state <span class="Special">&lt;-</span> routine-state read-move-routine
-<span id="L459" class="LineNr">459 </span>  <span class="Conceal">¦</span> completed?:bool <span class="Special">&lt;-</span> equal read-move-state, <span class="Constant">1/completed</span>
-<span id="L460" class="LineNr">460 </span>  <span class="Conceal">¦</span> assert completed?, <span class="Constant">[ </span>
-<span id="L461" class="LineNr">461 </span><span class="Constant">F read-move-quit: routine failed to terminate on 'q']</span>
-<span id="L462" class="LineNr">462 </span>  <span class="Conceal">¦</span> trace<span class="Constant"> 1</span>, <span class="Constant">[test]</span>, <span class="Constant">[reached end]</span>
-<span id="L463" class="LineNr">463 </span>  ]
-<span id="L464" class="LineNr">464 </span>  trace-should-contain [
-<span id="L465" class="LineNr">465 </span>  <span class="Conceal">¦</span> test: reached end
-<span id="L466" class="LineNr">466 </span>  ]
-<span id="L467" class="LineNr">467 </span>]
-<span id="L468" class="LineNr">468 </span>
-<span id="L469" class="LineNr">469 </span><span class="muScenario">scenario</span> read-move-illegal-file [
-<span id="L470" class="LineNr">470 </span>  <span class="Constant">local-scope</span>
-<span id="L471" class="LineNr">471 </span>  assume-screen <span class="Constant">20/width</span>, <span class="Constant">2/height</span>
-<span id="L472" class="LineNr">472 </span>  <a href='075channel.mu.html#L43'>source</a>:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='075channel.mu.html#L47'>sink</a>:&amp;:<a href='075channel.mu.html#L47'>sink</a>:char <span class="Special">&lt;-</span> <a href='075channel.mu.html#L51'>new-channel</a> <span class="Constant">2/capacity</span>
-<span id="L473" class="LineNr">473 </span>  read-move-routine:num <span class="Special">&lt;-</span> start-running <a href='chessboard.mu.html#L238'>read-move</a>, <a href='075channel.mu.html#L43'>source</a>, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>
-<span id="L474" class="LineNr">474 </span>  run [
-<span id="L475" class="LineNr">475 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' is waiting for input</span>
-<span id="L476" class="LineNr">476 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
-<span id="L477" class="LineNr">477 </span>  <span class="Conceal">¦</span> read-move-state:num <span class="Special">&lt;-</span> routine-state read-move-routine
-<span id="L478" class="LineNr">478 </span>  <span class="Conceal">¦</span> waiting?:bool <span class="Special">&lt;-</span> not-equal read-move-state, <span class="Constant">2/discontinued</span>
-<span id="L479" class="LineNr">479 </span>  <span class="Conceal">¦</span> assert waiting?, <span class="Constant">[ </span>
-<span id="L480" class="LineNr">480 </span><span class="Constant">F read-move-illegal-file: routine failed to pause after coming up (before any keys were pressed)]</span>
-<span id="L481" class="LineNr">481 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">50/'2'</span>
-<span id="L482" class="LineNr">482 </span>  <span class="Conceal">¦</span> restart read-move-routine
-<span id="L483" class="LineNr">483 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
-<span id="L484" class="LineNr">484 </span>  ]
-<span id="L485" class="LineNr">485 </span>  screen-should-contain [
-<span id="L486" class="LineNr">486 </span>  <span class="Conceal">¦</span><span class="Constant"> .file too low: 2     .</span>
-<span id="L487" class="LineNr">487 </span>  <span class="Conceal">¦</span><span class="Constant"> .                    .</span>
-<span id="L488" class="LineNr">488 </span>  ]
-<span id="L489" class="LineNr">489 </span>]
-<span id="L490" class="LineNr">490 </span>
-<span id="L491" class="LineNr">491 </span><span class="muScenario">scenario</span> read-move-illegal-rank [
-<span id="L492" class="LineNr">492 </span>  <span class="Constant">local-scope</span>
-<span id="L493" class="LineNr">493 </span>  assume-screen <span class="Constant">20/width</span>, <span class="Constant">2/height</span>
-<span id="L494" class="LineNr">494 </span>  <a href='075channel.mu.html#L43'>source</a>:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='075channel.mu.html#L47'>sink</a>:&amp;:<a href='075channel.mu.html#L47'>sink</a>:char <span class="Special">&lt;-</span> <a href='075channel.mu.html#L51'>new-channel</a> <span class="Constant">2/capacity</span>
-<span id="L495" class="LineNr">495 </span>  read-move-routine:num <span class="Special">&lt;-</span> start-running <a href='chessboard.mu.html#L238'>read-move</a>, <a href='075channel.mu.html#L43'>source</a>, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>
-<span id="L496" class="LineNr">496 </span>  run [
-<span id="L497" class="LineNr">497 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' is waiting for input</span>
-<span id="L498" class="LineNr">498 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
-<span id="L499" class="LineNr">499 </span>  <span class="Conceal">¦</span> read-move-state:num <span class="Special">&lt;-</span> routine-state read-move-routine
-<span id="L500" class="LineNr">500 </span>  <span class="Conceal">¦</span> waiting?:bool <span class="Special">&lt;-</span> not-equal read-move-state, <span class="Constant">2/discontinued</span>
-<span id="L501" class="LineNr">501 </span>  <span class="Conceal">¦</span> assert waiting?, <span class="Constant">[ </span>
-<span id="L502" class="LineNr">502 </span><span class="Constant">F read-move-illegal-rank: routine failed to pause after coming up (before any keys were pressed)]</span>
-<span id="L503" class="LineNr">503 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">97/a</span>
-<span id="L504" class="LineNr">504 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">97/a</span>
-<span id="L505" class="LineNr">505 </span>  <span class="Conceal">¦</span> restart read-move-routine
-<span id="L506" class="LineNr">506 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
-<span id="L507" class="LineNr">507 </span>  ]
-<span id="L508" class="LineNr">508 </span>  screen-should-contain [
-<span id="L509" class="LineNr">509 </span>  <span class="Conceal">¦</span><span class="Constant"> .rank too high: a    .</span>
-<span id="L510" class="LineNr">510 </span>  <span class="Conceal">¦</span><span class="Constant"> .                    .</span>
-<span id="L511" class="LineNr">511 </span>  ]
-<span id="L512" class="LineNr">512 </span>]
-<span id="L513" class="LineNr">513 </span>
-<span id="L514" class="LineNr">514 </span><span class="muScenario">scenario</span> read-move-empty [
-<span id="L515" class="LineNr">515 </span>  <span class="Constant">local-scope</span>
-<span id="L516" class="LineNr">516 </span>  assume-screen <span class="Constant">20/width</span>, <span class="Constant">2/height</span>
-<span id="L517" class="LineNr">517 </span>  <a href='075channel.mu.html#L43'>source</a>:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='075channel.mu.html#L47'>sink</a>:&amp;:<a href='075channel.mu.html#L47'>sink</a>:char <span class="Special">&lt;-</span> <a href='075channel.mu.html#L51'>new-channel</a> <span class="Constant">2/capacity</span>
-<span id="L518" class="LineNr">518 </span>  read-move-routine:num <span class="Special">&lt;-</span> start-running <a href='chessboard.mu.html#L238'>read-move</a>, <a href='075channel.mu.html#L43'>source</a>, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>
-<span id="L519" class="LineNr">519 </span>  run [
-<span id="L520" class="LineNr">520 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' is waiting for input</span>
-<span id="L521" class="LineNr">521 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
-<span id="L522" class="LineNr">522 </span>  <span class="Conceal">¦</span> read-move-state:num <span class="Special">&lt;-</span> routine-state read-move-routine
-<span id="L523" class="LineNr">523 </span>  <span class="Conceal">¦</span> waiting?:bool <span class="Special">&lt;-</span> not-equal read-move-state, <span class="Constant">2/discontinued</span>
-<span id="L524" class="LineNr">524 </span>  <span class="Conceal">¦</span> assert waiting?, <span class="Constant">[ </span>
-<span id="L525" class="LineNr">525 </span><span class="Constant">F read-move-empty: routine failed to pause after coming up (before any keys were pressed)]</span>
-<span id="L526" class="LineNr">526 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">10/newline</span>
-<span id="L527" class="LineNr">527 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">97/a</span>
-<span id="L528" class="LineNr">528 </span>  <span class="Conceal">¦</span> restart read-move-routine
-<span id="L529" class="LineNr">529 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
-<span id="L530" class="LineNr">530 </span>  ]
-<span id="L531" class="LineNr">531 </span>  screen-should-contain [
-<span id="L532" class="LineNr">532 </span>  <span class="Conceal">¦</span><span class="Constant"> .that's not enough   .</span>
-<span id="L533" class="LineNr">533 </span>  <span class="Conceal">¦</span><span class="Constant"> .                    .</span>
-<span id="L534" class="LineNr">534 </span>  ]
-<span id="L535" class="LineNr">535 </span>]
-<span id="L536" class="LineNr">536 </span>
-<span id="L537" class="LineNr">537 </span><span class="muRecipe">def</span> <a href='chessboard.mu.html#L537'>make-move</a> <a href='chessboard.mu.html#L67'>board</a>:<a href='chessboard.mu.html#L67'>board</a>, m:&amp;:<a href='chessboard.mu.html#L229'>move</a><span class="muRecipe"> -&gt; </span><a href='chessboard.mu.html#L67'>board</a>:<a href='chessboard.mu.html#L67'>board</a> [
-<span id="L538" class="LineNr">538 </span>  <span class="Constant">local-scope</span>
-<span id="L539" class="LineNr">539 </span>  <span class="Constant">load-ingredients</span>
-<span id="L540" class="LineNr">540 </span>  from-file:num <span class="Special">&lt;-</span> get *m, <span class="Constant">from-file:offset</span>
-<span id="L541" class="LineNr">541 </span>  from-rank:num <span class="Special">&lt;-</span> get *m, <span class="Constant">from-rank:offset</span>
-<span id="L542" class="LineNr">542 </span>  to-file:num <span class="Special">&lt;-</span> get *m, <span class="Constant">to-file:offset</span>
-<span id="L543" class="LineNr">543 </span>  to-rank:num <span class="Special">&lt;-</span> get *m, <span class="Constant">to-rank:offset</span>
-<span id="L544" class="LineNr">544 </span>  from-f:&amp;:@:char <span class="Special">&lt;-</span> index *board, from-file
-<span id="L545" class="LineNr">545 </span>  to-f:&amp;:@:char <span class="Special">&lt;-</span> index *board, to-file
-<span id="L546" class="LineNr">546 </span>  src:char/square <span class="Special">&lt;-</span> index *from-f, from-rank
-<span id="L547" class="LineNr">547 </span>  *to-f <span class="Special">&lt;-</span> put-index *to-f, to-rank, src
-<span id="L548" class="LineNr">548 </span>  *from-f <span class="Special">&lt;-</span> put-index *from-f, from-rank, <span class="Constant">32/space</span>
-<span id="L549" class="LineNr">549 </span>]
-<span id="L550" class="LineNr">550 </span>
-<span id="L551" class="LineNr">551 </span><span class="muScenario">scenario</span> making-a-move [
-<span id="L552" class="LineNr">552 </span>  <span class="Constant">local-scope</span>
-<span id="L553" class="LineNr">553 </span>  assume-screen <span class="Constant">30/width</span>, <span class="Constant">12/height</span>
-<span id="L554" class="LineNr">554 </span>  <a href='chessboard.mu.html#L67'>board</a>:<a href='chessboard.mu.html#L67'>board</a> <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L180'>initial-position</a>
-<span id="L555" class="LineNr">555 </span>  <a href='chessboard.mu.html#L229'>move</a>:&amp;:<a href='chessboard.mu.html#L229'>move</a> <span class="Special">&lt;-</span> new <span class="Constant"><a href='chessboard.mu.html#L229'>move</a>:type</span>
-<span id="L556" class="LineNr">556 </span>  *move <span class="Special">&lt;-</span> merge <span class="Constant">6/g</span>, <span class="Constant">1/'2'</span>, <span class="Constant">6/g</span>, <span class="Constant">3/'4'</span>
-<span id="L557" class="LineNr">557 </span>  run [
-<span id="L558" class="LineNr">558 </span>  <span class="Conceal">¦</span> <a href='chessboard.mu.html#L67'>board</a> <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L537'>make-move</a> <a href='chessboard.mu.html#L67'>board</a>, <a href='chessboard.mu.html#L229'>move</a>
-<span id="L559" class="LineNr">559 </span>  <span class="Conceal">¦</span> <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a> <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L144'>print-board</a> <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>, <a href='chessboard.mu.html#L67'>board</a>
-<span id="L560" class="LineNr">560 </span>  ]
-<span id="L561" class="LineNr">561 </span>  screen-should-contain [
-<span id="L562" class="LineNr">562 </span>  <span class="Comment">#  012345678901234567890123456789</span>
-<span id="L563" class="LineNr">563 </span>  <span class="Conceal">¦</span><span class="Constant"> .8 | r n b q k b n r           .</span>
-<span id="L564" class="LineNr">564 </span>  <span class="Conceal">¦</span><span class="Constant"> .7 | p p p p p p p p           .</span>
-<span id="L565" class="LineNr">565 </span>  <span class="Conceal">¦</span><span class="Constant"> .6 |                           .</span>
-<span id="L566" class="LineNr">566 </span>  <span class="Conceal">¦</span><span class="Constant"> .5 |                           .</span>
-<span id="L567" class="LineNr">567 </span>  <span class="Conceal">¦</span><span class="Constant"> .4 |             P             .</span>
-<span id="L568" class="LineNr">568 </span>  <span class="Conceal">¦</span><span class="Constant"> .3 |                           .</span>
-<span id="L569" class="LineNr">569 </span>  <span class="Conceal">¦</span><span class="Constant"> .2 | P P P P P P   P           .</span>
-<span id="L570" class="LineNr">570 </span>  <span class="Conceal">¦</span><span class="Constant"> .1 | R N B Q K B N R           .</span>
-<span id="L571" class="LineNr">571 </span>  <span class="Conceal">¦</span><span class="Constant"> .  +----------------           .</span>
-<span id="L572" class="LineNr">572 </span>  <span class="Conceal">¦</span><span class="Constant"> .    a b c d e f g h           .</span>
-<span id="L573" class="LineNr">573 </span>  <span class="Conceal">¦</span><span class="Constant"> .                              .</span>
-<span id="L574" class="LineNr">574 </span>  ]
-<span id="L575" class="LineNr">575 </span>]
+<span id="L357" class="LineNr">357 </span>  assume-screen <span class="Constant">20/width</span>, <span class="Constant">2/height</span>
+<span id="L358" class="LineNr">358 </span>  <a href='075channel.mu.html#L43'>source</a>:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='075channel.mu.html#L47'>sink</a>:&amp;:<a href='075channel.mu.html#L47'>sink</a>:char <span class="Special">&lt;-</span> <a href='075channel.mu.html#L51'>new-channel</a> <span class="Constant">2/capacity</span>
+<span id="L359" class="LineNr">359 </span>  read-move-routine:num/routine <span class="Special">&lt;-</span> start-running <a href='chessboard.mu.html#L238'>read-move</a>, <a href='075channel.mu.html#L43'>source</a>, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>
+<span id="L360" class="LineNr">360 </span>  run [
+<span id="L361" class="LineNr">361 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' is waiting for input</span>
+<span id="L362" class="LineNr">362 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
+<span id="L363" class="LineNr">363 </span>  <span class="Conceal">¦</span> read-move-state:num <span class="Special">&lt;-</span> routine-state read-move-routine
+<span id="L364" class="LineNr">364 </span>  <span class="Conceal">¦</span> waiting?:bool <span class="Special">&lt;-</span> not-equal read-move-state, <span class="Constant">2/discontinued</span>
+<span id="L365" class="LineNr">365 </span>  <span class="Conceal">¦</span> assert waiting?, <span class="Constant">[ </span>
+<span id="L366" class="LineNr">366 </span><span class="Constant">F read-move-blocking: routine failed to pause after coming up (before any keys were pressed)]</span>
+<span id="L367" class="LineNr">367 </span>  <span class="Conceal">¦</span> <span class="Comment"># press 'a'</span>
+<span id="L368" class="LineNr">368 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">97/a</span>
+<span id="L369" class="LineNr">369 </span>  <span class="Conceal">¦</span> restart read-move-routine
+<span id="L370" class="LineNr">370 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' still waiting for input</span>
+<span id="L371" class="LineNr">371 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
+<span id="L372" class="LineNr">372 </span>  <span class="Conceal">¦</span> read-move-state <span class="Special">&lt;-</span> routine-state read-move-routine
+<span id="L373" class="LineNr">373 </span>  <span class="Conceal">¦</span> waiting? <span class="Special">&lt;-</span> not-equal read-move-state, <span class="Constant">2/discontinued</span>
+<span id="L374" class="LineNr">374 </span>  <span class="Conceal">¦</span> assert waiting?, <span class="Constant">[ </span>
+<span id="L375" class="LineNr">375 </span><span class="Constant">F read-move-blocking: routine failed to pause after rank 'a']</span>
+<span id="L376" class="LineNr">376 </span>  <span class="Conceal">¦</span> <span class="Comment"># press '2'</span>
+<span id="L377" class="LineNr">377 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">50/'2'</span>
+<span id="L378" class="LineNr">378 </span>  <span class="Conceal">¦</span> restart read-move-routine
+<span id="L379" class="LineNr">379 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' still waiting for input</span>
+<span id="L380" class="LineNr">380 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
+<span id="L381" class="LineNr">381 </span>  <span class="Conceal">¦</span> read-move-state <span class="Special">&lt;-</span> routine-state read-move-routine
+<span id="L382" class="LineNr">382 </span>  <span class="Conceal">¦</span> waiting? <span class="Special">&lt;-</span> not-equal read-move-state, <span class="Constant">2/discontinued</span>
+<span id="L383" class="LineNr">383 </span>  <span class="Conceal">¦</span> assert waiting?, <span class="Constant">[ </span>
+<span id="L384" class="LineNr">384 </span><span class="Constant">F read-move-blocking: routine failed to pause after file 'a2']</span>
+<span id="L385" class="LineNr">385 </span>  <span class="Conceal">¦</span> <span class="Comment"># press '-'</span>
+<span id="L386" class="LineNr">386 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">45/'-'</span>
+<span id="L387" class="LineNr">387 </span>  <span class="Conceal">¦</span> restart read-move-routine
+<span id="L388" class="LineNr">388 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' still waiting for input</span>
+<span id="L389" class="LineNr">389 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
+<span id="L390" class="LineNr">390 </span>  <span class="Conceal">¦</span> read-move-state <span class="Special">&lt;-</span> routine-state read-move-routine
+<span id="L391" class="LineNr">391 </span>  <span class="Conceal">¦</span> waiting? <span class="Special">&lt;-</span> not-equal read-move-state, <span class="Constant">2/discontinued</span>
+<span id="L392" class="LineNr">392 </span>  <span class="Conceal">¦</span> assert waiting?, <span class="Constant">[ </span>
+<span id="L393" class="LineNr">393 </span><span class="Constant">F read-move-blocking: routine failed to pause after hyphen 'a2-']</span>
+<span id="L394" class="LineNr">394 </span>  <span class="Conceal">¦</span> <span class="Comment"># press 'a'</span>
+<span id="L395" class="LineNr">395 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">97/a</span>
+<span id="L396" class="LineNr">396 </span>  <span class="Conceal">¦</span> restart read-move-routine
+<span id="L397" class="LineNr">397 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' still waiting for input</span>
+<span id="L398" class="LineNr">398 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
+<span id="L399" class="LineNr">399 </span>  <span class="Conceal">¦</span> read-move-state <span class="Special">&lt;-</span> routine-state read-move-routine
+<span id="L400" class="LineNr">400 </span>  <span class="Conceal">¦</span> waiting? <span class="Special">&lt;-</span> not-equal read-move-state, <span class="Constant">2/discontinued</span>
+<span id="L401" class="LineNr">401 </span>  <span class="Conceal">¦</span> assert waiting?, <span class="Constant">[ </span>
+<span id="L402" class="LineNr">402 </span><span class="Constant">F read-move-blocking: routine failed to pause after rank 'a2-a']</span>
+<span id="L403" class="LineNr">403 </span>  <span class="Conceal">¦</span> <span class="Comment"># press '4'</span>
+<span id="L404" class="LineNr">404 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">52/'4'</span>
+<span id="L405" class="LineNr">405 </span>  <span class="Conceal">¦</span> restart read-move-routine
+<span id="L406" class="LineNr">406 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' still waiting for input</span>
+<span id="L407" class="LineNr">407 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
+<span id="L408" class="LineNr">408 </span>  <span class="Conceal">¦</span> read-move-state <span class="Special">&lt;-</span> routine-state read-move-routine
+<span id="L409" class="LineNr">409 </span>  <span class="Conceal">¦</span> waiting? <span class="Special">&lt;-</span> not-equal read-move-state, <span class="Constant">2/discontinued</span>
+<span id="L410" class="LineNr">410 </span>  <span class="Conceal">¦</span> assert waiting?, <span class="Constant">[ </span>
+<span id="L411" class="LineNr">411 </span><span class="Constant">F read-move-blocking: routine failed to pause after file 'a2-a4']</span>
+<span id="L412" class="LineNr">412 </span>  <span class="Conceal">¦</span> <span class="Comment"># press 'newline'</span>
+<span id="L413" class="LineNr">413 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>,<span class="Constant"> 10</span>  <span class="Comment"># newline</span>
+<span id="L414" class="LineNr">414 </span>  <span class="Conceal">¦</span> restart read-move-routine
+<span id="L415" class="LineNr">415 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' now completes</span>
+<span id="L416" class="LineNr">416 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
+<span id="L417" class="LineNr">417 </span>  <span class="Conceal">¦</span> read-move-state <span class="Special">&lt;-</span> routine-state read-move-routine
+<span id="L418" class="LineNr">418 </span>  <span class="Conceal">¦</span> completed?:bool <span class="Special">&lt;-</span> equal read-move-state, <span class="Constant">1/completed</span>
+<span id="L419" class="LineNr">419 </span>  <span class="Conceal">¦</span> assert completed?, <span class="Constant">[ </span>
+<span id="L420" class="LineNr">420 </span><span class="Constant">F read-move-blocking: routine failed to terminate on newline]</span>
+<span id="L421" class="LineNr">421 </span>  <span class="Conceal">¦</span> trace<span class="Constant"> 1</span>, <span class="Constant">[test]</span>, <span class="Constant">[reached end]</span>
+<span id="L422" class="LineNr">422 </span>  ]
+<span id="L423" class="LineNr">423 </span>  trace-should-contain [
+<span id="L424" class="LineNr">424 </span>  <span class="Conceal">¦</span> test: reached end
+<span id="L425" class="LineNr">425 </span>  ]
+<span id="L426" class="LineNr">426 </span>]
+<span id="L427" class="LineNr">427 </span>
+<span id="L428" class="LineNr">428 </span><span class="muScenario">scenario</span> read-move-quit [
+<span id="L429" class="LineNr">429 </span>  <span class="Constant">local-scope</span>
+<span id="L430" class="LineNr">430 </span>  assume-screen <span class="Constant">20/width</span>, <span class="Constant">2/height</span>
+<span id="L431" class="LineNr">431 </span>  <a href='075channel.mu.html#L43'>source</a>:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='075channel.mu.html#L47'>sink</a>:&amp;:<a href='075channel.mu.html#L47'>sink</a>:char <span class="Special">&lt;-</span> <a href='075channel.mu.html#L51'>new-channel</a> <span class="Constant">2/capacity</span>
+<span id="L432" class="LineNr">432 </span>  read-move-routine:num <span class="Special">&lt;-</span> start-running <a href='chessboard.mu.html#L238'>read-move</a>, <a href='075channel.mu.html#L43'>source</a>, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>
+<span id="L433" class="LineNr">433 </span>  run [
+<span id="L434" class="LineNr">434 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' is waiting for input</span>
+<span id="L435" class="LineNr">435 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
+<span id="L436" class="LineNr">436 </span>  <span class="Conceal">¦</span> read-move-state:num <span class="Special">&lt;-</span> routine-state read-move-routine
+<span id="L437" class="LineNr">437 </span>  <span class="Conceal">¦</span> waiting?:bool <span class="Special">&lt;-</span> not-equal read-move-state, <span class="Constant">2/discontinued</span>
+<span id="L438" class="LineNr">438 </span>  <span class="Conceal">¦</span> assert waiting?, <span class="Constant">[ </span>
+<span id="L439" class="LineNr">439 </span><span class="Constant">F read-move-quit: routine failed to pause after coming up (before any keys were pressed)]</span>
+<span id="L440" class="LineNr">440 </span>  <span class="Conceal">¦</span> <span class="Comment"># press 'q'</span>
+<span id="L441" class="LineNr">441 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">113/q</span>
+<span id="L442" class="LineNr">442 </span>  <span class="Conceal">¦</span> restart read-move-routine
+<span id="L443" class="LineNr">443 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' completes</span>
+<span id="L444" class="LineNr">444 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
+<span id="L445" class="LineNr">445 </span>  <span class="Conceal">¦</span> read-move-state <span class="Special">&lt;-</span> routine-state read-move-routine
+<span id="L446" class="LineNr">446 </span>  <span class="Conceal">¦</span> completed?:bool <span class="Special">&lt;-</span> equal read-move-state, <span class="Constant">1/completed</span>
+<span id="L447" class="LineNr">447 </span>  <span class="Conceal">¦</span> assert completed?, <span class="Constant">[ </span>
+<span id="L448" class="LineNr">448 </span><span class="Constant">F read-move-quit: routine failed to terminate on 'q']</span>
+<span id="L449" class="LineNr">449 </span>  <span class="Conceal">¦</span> trace<span class="Constant"> 1</span>, <span class="Constant">[test]</span>, <span class="Constant">[reached end]</span>
+<span id="L450" class="LineNr">450 </span>  ]
+<span id="L451" class="LineNr">451 </span>  trace-should-contain [
+<span id="L452" class="LineNr">452 </span>  <span class="Conceal">¦</span> test: reached end
+<span id="L453" class="LineNr">453 </span>  ]
+<span id="L454" class="LineNr">454 </span>]
+<span id="L455" class="LineNr">455 </span>
+<span id="L456" class="LineNr">456 </span><span class="muScenario">scenario</span> read-move-illegal-file [
+<span id="L457" class="LineNr">457 </span>  <span class="Constant">local-scope</span>
+<span id="L458" class="LineNr">458 </span>  assume-screen <span class="Constant">20/width</span>, <span class="Constant">2/height</span>
+<span id="L459" class="LineNr">459 </span>  <a href='075channel.mu.html#L43'>source</a>:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='075channel.mu.html#L47'>sink</a>:&amp;:<a href='075channel.mu.html#L47'>sink</a>:char <span class="Special">&lt;-</span> <a href='075channel.mu.html#L51'>new-channel</a> <span class="Constant">2/capacity</span>
+<span id="L460" class="LineNr">460 </span>  read-move-routine:num <span class="Special">&lt;-</span> start-running <a href='chessboard.mu.html#L238'>read-move</a>, <a href='075channel.mu.html#L43'>source</a>, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>
+<span id="L461" class="LineNr">461 </span>  run [
+<span id="L462" class="LineNr">462 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' is waiting for input</span>
+<span id="L463" class="LineNr">463 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
+<span id="L464" class="LineNr">464 </span>  <span class="Conceal">¦</span> read-move-state:num <span class="Special">&lt;-</span> routine-state read-move-routine
+<span id="L465" class="LineNr">465 </span>  <span class="Conceal">¦</span> waiting?:bool <span class="Special">&lt;-</span> not-equal read-move-state, <span class="Constant">2/discontinued</span>
+<span id="L466" class="LineNr">466 </span>  <span class="Conceal">¦</span> assert waiting?, <span class="Constant">[ </span>
+<span id="L467" class="LineNr">467 </span><span class="Constant">F read-move-illegal-file: routine failed to pause after coming up (before any keys were pressed)]</span>
+<span id="L468" class="LineNr">468 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">50/'2'</span>
+<span id="L469" class="LineNr">469 </span>  <span class="Conceal">¦</span> restart read-move-routine
+<span id="L470" class="LineNr">470 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
+<span id="L471" class="LineNr">471 </span>  ]
+<span id="L472" class="LineNr">472 </span>  screen-should-contain [
+<span id="L473" class="LineNr">473 </span>  <span class="Conceal">¦</span><span class="Constant"> .file too low: 2     .</span>
+<span id="L474" class="LineNr">474 </span>  <span class="Conceal">¦</span><span class="Constant"> .                    .</span>
+<span id="L475" class="LineNr">475 </span>  ]
+<span id="L476" class="LineNr">476 </span>]
+<span id="L477" class="LineNr">477 </span>
+<span id="L478" class="LineNr">478 </span><span class="muScenario">scenario</span> read-move-illegal-rank [
+<span id="L479" class="LineNr">479 </span>  <span class="Constant">local-scope</span>
+<span id="L480" class="LineNr">480 </span>  assume-screen <span class="Constant">20/width</span>, <span class="Constant">2/height</span>
+<span id="L481" class="LineNr">481 </span>  <a href='075channel.mu.html#L43'>source</a>:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='075channel.mu.html#L47'>sink</a>:&amp;:<a href='075channel.mu.html#L47'>sink</a>:char <span class="Special">&lt;-</span> <a href='075channel.mu.html#L51'>new-channel</a> <span class="Constant">2/capacity</span>
+<span id="L482" class="LineNr">482 </span>  read-move-routine:num <span class="Special">&lt;-</span> start-running <a href='chessboard.mu.html#L238'>read-move</a>, <a href='075channel.mu.html#L43'>source</a>, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>
+<span id="L483" class="LineNr">483 </span>  run [
+<span id="L484" class="LineNr">484 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' is waiting for input</span>
+<span id="L485" class="LineNr">485 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
+<span id="L486" class="LineNr">486 </span>  <span class="Conceal">¦</span> read-move-state:num <span class="Special">&lt;-</span> routine-state read-move-routine
+<span id="L487" class="LineNr">487 </span>  <span class="Conceal">¦</span> waiting?:bool <span class="Special">&lt;-</span> not-equal read-move-state, <span class="Constant">2/discontinued</span>
+<span id="L488" class="LineNr">488 </span>  <span class="Conceal">¦</span> assert waiting?, <span class="Constant">[ </span>
+<span id="L489" class="LineNr">489 </span><span class="Constant">F read-move-illegal-rank: routine failed to pause after coming up (before any keys were pressed)]</span>
+<span id="L490" class="LineNr">490 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">97/a</span>
+<span id="L491" class="LineNr">491 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">97/a</span>
+<span id="L492" class="LineNr">492 </span>  <span class="Conceal">¦</span> restart read-move-routine
+<span id="L493" class="LineNr">493 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
+<span id="L494" class="LineNr">494 </span>  ]
+<span id="L495" class="LineNr">495 </span>  screen-should-contain [
+<span id="L496" class="LineNr">496 </span>  <span class="Conceal">¦</span><span class="Constant"> .rank too high: a    .</span>
+<span id="L497" class="LineNr">497 </span>  <span class="Conceal">¦</span><span class="Constant"> .                    .</span>
+<span id="L498" class="LineNr">498 </span>  ]
+<span id="L499" class="LineNr">499 </span>]
+<span id="L500" class="LineNr">500 </span>
+<span id="L501" class="LineNr">501 </span><span class="muScenario">scenario</span> read-move-empty [
+<span id="L502" class="LineNr">502 </span>  <span class="Constant">local-scope</span>
+<span id="L503" class="LineNr">503 </span>  assume-screen <span class="Constant">20/width</span>, <span class="Constant">2/height</span>
+<span id="L504" class="LineNr">504 </span>  <a href='075channel.mu.html#L43'>source</a>:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='075channel.mu.html#L47'>sink</a>:&amp;:<a href='075channel.mu.html#L47'>sink</a>:char <span class="Special">&lt;-</span> <a href='075channel.mu.html#L51'>new-channel</a> <span class="Constant">2/capacity</span>
+<span id="L505" class="LineNr">505 </span>  read-move-routine:num <span class="Special">&lt;-</span> start-running <a href='chessboard.mu.html#L238'>read-move</a>, <a href='075channel.mu.html#L43'>source</a>, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>
+<span id="L506" class="LineNr">506 </span>  run [
+<span id="L507" class="LineNr">507 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' is waiting for input</span>
+<span id="L508" class="LineNr">508 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
+<span id="L509" class="LineNr">509 </span>  <span class="Conceal">¦</span> read-move-state:num <span class="Special">&lt;-</span> routine-state read-move-routine
+<span id="L510" class="LineNr">510 </span>  <span class="Conceal">¦</span> waiting?:bool <span class="Special">&lt;-</span> not-equal read-move-state, <span class="Constant">2/discontinued</span>
+<span id="L511" class="LineNr">511 </span>  <span class="Conceal">¦</span> assert waiting?, <span class="Constant">[ </span>
+<span id="L512" class="LineNr">512 </span><span class="Constant">F read-move-empty: routine failed to pause after coming up (before any keys were pressed)]</span>
+<span id="L513" class="LineNr">513 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">10/newline</span>
+<span id="L514" class="LineNr">514 </span>  <span class="Conceal">¦</span> <a href='075channel.mu.html#L47'>sink</a> <span class="Special">&lt;-</span> <a href='075channel.mu.html#L67'>write</a> <a href='075channel.mu.html#L47'>sink</a>, <span class="Constant">97/a</span>
+<span id="L515" class="LineNr">515 </span>  <span class="Conceal">¦</span> restart read-move-routine
+<span id="L516" class="LineNr">516 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
+<span id="L517" class="LineNr">517 </span>  ]
+<span id="L518" class="LineNr">518 </span>  screen-should-contain [
+<span id="L519" class="LineNr">519 </span>  <span class="Conceal">¦</span><span class="Constant"> .that's not enough   .</span>
+<span id="L520" class="LineNr">520 </span>  <span class="Conceal">¦</span><span class="Constant"> .                    .</span>
+<span id="L521" class="LineNr">521 </span>  ]
+<span id="L522" class="LineNr">522 </span>]
+<span id="L523" class="LineNr">523 </span>
+<span id="L524" class="LineNr">524 </span><span class="muRecipe">def</span> <a href='chessboard.mu.html#L524'>make-move</a> <a href='chessboard.mu.html#L67'>board</a>:<a href='chessboard.mu.html#L67'>board</a>, m:&amp;:<a href='chessboard.mu.html#L229'>move</a><span class="muRecipe"> -&gt; </span><a href='chessboard.mu.html#L67'>board</a>:<a href='chessboard.mu.html#L67'>board</a> [
+<span id="L525" class="LineNr">525 </span>  <span class="Constant">local-scope</span>
+<span id="L526" class="LineNr">526 </span>  <span class="Constant">load-ingredients</span>
+<span id="L527" class="LineNr">527 </span>  from-file:num <span class="Special">&lt;-</span> get *m, <span class="Constant">from-file:offset</span>
+<span id="L528" class="LineNr">528 </span>  from-rank:num <span class="Special">&lt;-</span> get *m, <span class="Constant">from-rank:offset</span>
+<span id="L529" class="LineNr">529 </span>  to-file:num <span class="Special">&lt;-</span> get *m, <span class="Constant">to-file:offset</span>
+<span id="L530" class="LineNr">530 </span>  to-rank:num <span class="Special">&lt;-</span> get *m, <span class="Constant">to-rank:offset</span>
+<span id="L531" class="LineNr">531 </span>  from-f:&amp;:@:char <span class="Special">&lt;-</span> index *board, from-file
+<span id="L532" class="LineNr">532 </span>  to-f:&amp;:@:char <span class="Special">&lt;-</span> index *board, to-file
+<span id="L533" class="LineNr">533 </span>  src:char/square <span class="Special">&lt;-</span> index *from-f, from-rank
+<span id="L534" class="LineNr">534 </span>  *to-f <span class="Special">&lt;-</span> put-index *to-f, to-rank, src
+<span id="L535" class="LineNr">535 </span>  *from-f <span class="Special">&lt;-</span> put-index *from-f, from-rank, <span class="Constant">32/space</span>
+<span id="L536" class="LineNr">536 </span>]
+<span id="L537" class="LineNr">537 </span>
+<span id="L538" class="LineNr">538 </span><span class="muScenario">scenario</span> making-a-move [
+<span id="L539" class="LineNr">539 </span>  <span class="Constant">local-scope</span>
+<span id="L540" class="LineNr">540 </span>  assume-screen <span class="Constant">30/width</span>, <span class="Constant">12/height</span>
+<span id="L541" class="LineNr">541 </span>  <a href='chessboard.mu.html#L67'>board</a>:<a href='chessboard.mu.html#L67'>board</a> <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L180'>initial-position</a>
+<span id="L542" class="LineNr">542 </span>  <a href='chessboard.mu.html#L229'>move</a>:&amp;:<a href='chessboard.mu.html#L229'>move</a> <span class="Special">&lt;-</span> new <span class="Constant"><a href='chessboard.mu.html#L229'>move</a>:type</span>
+<span id="L543" class="LineNr">543 </span>  *move <span class="Special">&lt;-</span> merge <span class="Constant">6/g</span>, <span class="Constant">1/'2'</span>, <span class="Constant">6/g</span>, <span class="Constant">3/'4'</span>
+<span id="L544" class="LineNr">544 </span>  run [
+<span id="L545" class="LineNr">545 </span>  <span class="Conceal">¦</span> <a href='chessboard.mu.html#L67'>board</a> <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L524'>make-move</a> <a href='chessboard.mu.html#L67'>board</a>, <a href='chessboard.mu.html#L229'>move</a>
+<span id="L546" class="LineNr">546 </span>  <span class="Conceal">¦</span> <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a> <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L144'>print-board</a> <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>, <a href='chessboard.mu.html#L67'>board</a>
+<span id="L547" class="LineNr">547 </span>  ]
+<span id="L548" class="LineNr">548 </span>  screen-should-contain [
+<span id="L549" class="LineNr">549 </span>  <span class="Comment">#  012345678901234567890123456789</span>
+<span id="L550" class="LineNr">550 </span>  <span class="Conceal">¦</span><span class="Constant"> .8 | r n b q k b n r           .</span>
+<span id="L551" class="LineNr">551 </span>  <span class="Conceal">¦</span><span class="Constant"> .7 | p p p p p p p p           .</span>
+<span id="L552" class="LineNr">552 </span>  <span class="Conceal">¦</span><span class="Constant"> .6 |                           .</span>
+<span id="L553" class="LineNr">553 </span>  <span class="Conceal">¦</span><span class="Constant"> .5 |                           .</span>
+<span id="L554" class="LineNr">554 </span>  <span class="Conceal">¦</span><span class="Constant"> .4 |             P             .</span>
+<span id="L555" class="LineNr">555 </span>  <span class="Conceal">¦</span><span class="Constant"> .3 |                           .</span>
+<span id="L556" class="LineNr">556 </span>  <span class="Conceal">¦</span><span class="Constant"> .2 | P P P P P P   P           .</span>
+<span id="L557" class="LineNr">557 </span>  <span class="Conceal">¦</span><span class="Constant"> .1 | R N B Q K B N R           .</span>
+<span id="L558" class="LineNr">558 </span>  <span class="Conceal">¦</span><span class="Constant"> .  +----------------           .</span>
+<span id="L559" class="LineNr">559 </span>  <span class="Conceal">¦</span><span class="Constant"> .    a b c d e f g h           .</span>
+<span id="L560" class="LineNr">560 </span>  <span class="Conceal">¦</span><span class="Constant"> .                              .</span>
+<span id="L561" class="LineNr">561 </span>  ]
+<span id="L562" class="LineNr">562 </span>]
 </pre>
 </body>
 </html>
diff --git a/html/edit/003-shortcuts.mu.html b/html/edit/003-shortcuts.mu.html
index bd31740a..1cb4f6a3 100644
--- a/html/edit/003-shortcuts.mu.html
+++ b/html/edit/003-shortcuts.mu.html
@@ -2035,7 +2035,7 @@ if ('onhashchange' in window) {
 <span id="L1973" class="LineNr">1973 </span>  <span class="Constant">load-ingredients</span>
 <span id="L1974" class="LineNr">1974 </span>  curr-column:num <span class="Special">&lt;-</span> get *editor, <span class="Constant">cursor-column:offset</span>
 <span id="L1975" class="LineNr">1975 </span>  <span class="Comment"># accumulate the current line as text and render it</span>
-<span id="L1976" class="LineNr">1976 </span>  buf:&amp;:<a href='../061text.mu.html#L126'>buffer</a>:char <span class="Special">&lt;-</span> <a href='../061text.mu.html#L131'>new-buffer</a><span class="Constant"> 30</span>  <span class="Comment"># accumulator for the text we need to render</span>
+<span id="L1976" class="LineNr">1976 </span>  buf:&amp;:<a href='../061text.mu.html#L120'>buffer</a>:char <span class="Special">&lt;-</span> <a href='../061text.mu.html#L125'>new-buffer</a><span class="Constant"> 30</span>  <span class="Comment"># accumulator for the text we need to render</span>
 <span id="L1977" class="LineNr">1977 </span>  curr:&amp;:<a href='../065duplex_list.mu.html#L3'>duplex-list</a>:char <span class="Special">&lt;-</span> get *editor, <span class="Constant">before-cursor:offset</span>
 <span id="L1978" class="LineNr">1978 </span>  i:num <span class="Special">&lt;-</span> copy curr-column
 <span id="L1979" class="LineNr">1979 </span>  right:num <span class="Special">&lt;-</span> get *editor, <span class="Constant">right:offset</span>
@@ -2059,7 +2059,7 @@ if ('onhashchange' in window) {
 <span id="L1997" class="LineNr">1997 </span>  end:num <span class="Special">&lt;-</span> subtract right, left
 <span id="L1998" class="LineNr">1998 </span>  wrap?:bool <span class="Special">&lt;-</span> greater-or-equal old-row-len, end
 <span id="L1999" class="LineNr">1999 </span>  <span class="muControl">return-if</span> wrap?, <span class="Constant">1/go-render</span>
-<span id="L2000" class="LineNr">2000 </span>  curr-line:text <span class="Special">&lt;-</span> <a href='../061text.mu.html#L344'>buffer-to-array</a> buf
+<span id="L2000" class="LineNr">2000 </span>  curr-line:text <span class="Special">&lt;-</span> <a href='../061text.mu.html#L338'>buffer-to-array</a> buf
 <span id="L2001" class="LineNr">2001 </span>  curr-row:num <span class="Special">&lt;-</span> get *editor, <span class="Constant">cursor-row:offset</span>
 <span id="L2002" class="LineNr">2002 </span>  <a href='003-shortcuts.mu.html#L2062'>render-code</a> <a href='../081print.mu.html#L16'>screen</a>, curr-line, curr-column, right, curr-row
 <span id="L2003" class="LineNr">2003 </span>  <span class="muControl">return</span> <span class="Constant">0/dont-render</span>
diff --git a/html/edit/005-sandbox.mu.html b/html/edit/005-sandbox.mu.html
index b48c7e40..5272c8bd 100644
--- a/html/edit/005-sandbox.mu.html
+++ b/html/edit/005-sandbox.mu.html
@@ -746,7 +746,7 @@ if ('onhashchange' in window) {
 <span id="L683" class="LineNr"> 683 </span><span class="muRecipe">def</span> <a href='005-sandbox.mu.html#L683'>editor-contents</a> editor:&amp;:editor<span class="muRecipe"> -&gt; </span>result:text [
 <span id="L684" class="LineNr"> 684 </span>  <span class="Constant">local-scope</span>
 <span id="L685" class="LineNr"> 685 </span>  <span class="Constant">load-ingredients</span>
-<span id="L686" class="LineNr"> 686 </span>  buf:&amp;:<a href='../061text.mu.html#L126'>buffer</a>:char <span class="Special">&lt;-</span> <a href='../061text.mu.html#L131'>new-buffer</a><span class="Constant"> 80</span>
+<span id="L686" class="LineNr"> 686 </span>  buf:&amp;:<a href='../061text.mu.html#L120'>buffer</a>:char <span class="Special">&lt;-</span> <a href='../061text.mu.html#L125'>new-buffer</a><span class="Constant"> 80</span>
 <span id="L687" class="LineNr"> 687 </span>  curr:&amp;:<a href='../065duplex_list.mu.html#L3'>duplex-list</a>:char <span class="Special">&lt;-</span> get *editor, <span class="Constant">data:offset</span>
 <span id="L688" class="LineNr"> 688 </span>  <span class="Comment"># skip § sentinel</span>
 <span id="L689" class="LineNr"> 689 </span>  assert curr, <span class="Constant">[editor without data is illegal; must have at least a sentinel]</span>
@@ -759,7 +759,7 @@ if ('onhashchange' in window) {
 <span id="L696" class="LineNr"> 696 </span>  <span class="Conceal">¦</span> curr <span class="Special">&lt;-</span> <a href='../065duplex_list.mu.html#L29'>next</a> curr
 <span id="L697" class="LineNr"> 697 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
 <span id="L698" class="LineNr"> 698 </span>  <span class="Delimiter">}</span>
-<span id="L699" class="LineNr"> 699 </span>  result <span class="Special">&lt;-</span> <a href='../061text.mu.html#L344'>buffer-to-array</a> buf
+<span id="L699" class="LineNr"> 699 </span>  result <span class="Special">&lt;-</span> <a href='../061text.mu.html#L338'>buffer-to-array</a> buf
 <span id="L700" class="LineNr"> 700 </span>]
 <span id="L701" class="LineNr"> 701 </span>
 <span id="L702" class="LineNr"> 702 </span><span class="muScenario">scenario</span> editor-provides-edited-contents [
diff --git a/html/edit/011-errors.mu.html b/html/edit/011-errors.mu.html
index db0cfa72..8349e70d 100644
--- a/html/edit/011-errors.mu.html
+++ b/html/edit/011-errors.mu.html
@@ -148,7 +148,7 @@ if ('onhashchange' in window) {
 <span id="L85" class="LineNr"> 85 </span>  <span class="Conceal">¦</span> sandboxes-completed-successfully?:bool <span class="Special">&lt;-</span> equal error-index,<span class="Constant"> -1</span>
 <span id="L86" class="LineNr"> 86 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> sandboxes-completed-successfully?
 <span id="L87" class="LineNr"> 87 </span>  <span class="Conceal">¦</span> error-index-text:text <span class="Special">&lt;-</span> to-text error-index
-<span id="L88" class="LineNr"> 88 </span>  <span class="Conceal">¦</span> status:text <span class="Special">&lt;-</span> <a href='../061text.mu.html#L521'>interpolate</a> <span class="Constant">[errors found (_)    ]</span>, error-index-text
+<span id="L88" class="LineNr"> 88 </span>  <span class="Conceal">¦</span> status:text <span class="Special">&lt;-</span> <a href='../061text.mu.html#L512'>interpolate</a> <span class="Constant">[errors found (_)    ]</span>, error-index-text
 <span id="L89" class="LineNr"> 89 </span>  <span class="Conceal">¦</span> <a href='005-sandbox.mu.html#L217'>update-status</a> <a href='../081print.mu.html#L16'>screen</a>, status, <span class="Constant">1/red</span>
 <span id="L90" class="LineNr"> 90 </span>  <span class="Delimiter">}</span>
 <span id="L91" class="LineNr"> 91 </span>]
diff --git a/html/factorial.mu.html b/html/factorial.mu.html
index db134e8f..da3f44eb 100644
--- a/html/factorial.mu.html
+++ b/html/factorial.mu.html
@@ -19,7 +19,6 @@ a:hover { text-decoration: underline; }
 .muScenario { color: #00af00; }
 .Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
-.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
@@ -71,27 +70,23 @@ if ('onhashchange' in window) {
 <span id="L10" class="LineNr">10 </span><span class="muRecipe">def</span> <a href='factorial.mu.html#L10'>factorial</a> n:num<span class="muRecipe"> -&gt; </span>result:num [
 <span id="L11" class="LineNr">11 </span>  <span class="Constant">local-scope</span>
 <span id="L12" class="LineNr">12 </span>  <span class="Constant">load-ingredients</span>
-<span id="L13" class="LineNr">13 </span>  <span class="Delimiter">{</span>
-<span id="L14" class="LineNr">14 </span>  <span class="Conceal">¦</span> <span class="Comment"># if n=0 return 1</span>
-<span id="L15" class="LineNr">15 </span>  <span class="Conceal">¦</span> zero?:bool <span class="Special">&lt;-</span> equal n,<span class="Constant"> 0</span>
-<span id="L16" class="LineNr">16 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> zero?
-<span id="L17" class="LineNr">17 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span><span class="Constant"> 1</span>
-<span id="L18" class="LineNr">18 </span>  <span class="Delimiter">}</span>
-<span id="L19" class="LineNr">19 </span>  <span class="Comment"># return n * factorial(n-1)</span>
-<span id="L20" class="LineNr">20 </span>  x:num <span class="Special">&lt;-</span> subtract n,<span class="Constant"> 1</span>
-<span id="L21" class="LineNr">21 </span>  subresult:num <span class="Special">&lt;-</span> <a href='factorial.mu.html#L10'>factorial</a> x
-<span id="L22" class="LineNr">22 </span>  result <span class="Special">&lt;-</span> multiply subresult, n
-<span id="L23" class="LineNr">23 </span>]
-<span id="L24" class="LineNr">24 </span>
-<span id="L25" class="LineNr">25 </span><span class="Comment"># unit test</span>
-<span id="L26" class="LineNr">26 </span><span class="muScenario">scenario</span> factorial-test [
-<span id="L27" class="LineNr">27 </span>  run [
-<span id="L28" class="LineNr">28 </span>  <span class="Conceal">¦</span> 1:num <span class="Special">&lt;-</span> <a href='factorial.mu.html#L10'>factorial</a><span class="Constant"> 5</span>
-<span id="L29" class="LineNr">29 </span>  ]
-<span id="L30" class="LineNr">30 </span>  memory-should-contain [
-<span id="L31" class="LineNr">31 </span>  <span class="Conceal">¦</span><span class="Constant"> 1</span> <span class="Special">&lt;-</span><span class="Constant"> 120</span>
-<span id="L32" class="LineNr">32 </span>  ]
-<span id="L33" class="LineNr">33 </span>]
+<span id="L13" class="LineNr">13 </span>  <span class="Comment"># if n=0 return 1</span>
+<span id="L14" class="LineNr">14 </span>  <span class="muControl">return-unless</span> n,<span class="Constant"> 1</span>
+<span id="L15" class="LineNr">15 </span>  <span class="Comment"># return n * factorial(n-1)</span>
+<span id="L16" class="LineNr">16 </span>  x:num <span class="Special">&lt;-</span> subtract n,<span class="Constant"> 1</span>
+<span id="L17" class="LineNr">17 </span>  subresult:num <span class="Special">&lt;-</span> <a href='factorial.mu.html#L10'>factorial</a> x
+<span id="L18" class="LineNr">18 </span>  result <span class="Special">&lt;-</span> multiply subresult, n
+<span id="L19" class="LineNr">19 </span>]
+<span id="L20" class="LineNr">20 </span>
+<span id="L21" class="LineNr">21 </span><span class="Comment"># unit test</span>
+<span id="L22" class="LineNr">22 </span><span class="muScenario">scenario</span> factorial-test [
+<span id="L23" class="LineNr">23 </span>  run [
+<span id="L24" class="LineNr">24 </span>  <span class="Conceal">¦</span> 1:num <span class="Special">&lt;-</span> <a href='factorial.mu.html#L10'>factorial</a><span class="Constant"> 5</span>
+<span id="L25" class="LineNr">25 </span>  ]
+<span id="L26" class="LineNr">26 </span>  memory-should-contain [
+<span id="L27" class="LineNr">27 </span>  <span class="Conceal">¦</span><span class="Constant"> 1</span> <span class="Special">&lt;-</span><span class="Constant"> 120</span>
+<span id="L28" class="LineNr">28 </span>  ]
+<span id="L29" class="LineNr">29 </span>]
 </pre>
 </body>
 </html>
diff --git a/html/http-client.mu.html b/html/http-client.mu.html
index 20a65f05..119a9b6d 100644
--- a/html/http-client.mu.html
+++ b/html/http-client.mu.html
@@ -64,7 +64,7 @@ if ('onhashchange' in window) {
 <span id="L4" class="LineNr"> 4 </span>  <span class="Constant">local-scope</span>
 <span id="L5" class="LineNr"> 5 </span>  google:&amp;:<a href='075channel.mu.html#L43'>source</a>:char <span class="Special">&lt;-</span> <a href='092socket.mu.html#L69'>start-reading-from-network</a> <span class="Constant">0/real-resources</span>, <span class="Constant">[google.com/]</span>
 <span id="L6" class="LineNr"> 6 </span>  n:num <span class="Special">&lt;-</span> copy<span class="Constant"> 0</span>
-<span id="L7" class="LineNr"> 7 </span>  buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L131'>new-buffer</a><span class="Constant"> 30</span>
+<span id="L7" class="LineNr"> 7 </span>  buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L125'>new-buffer</a><span class="Constant"> 30</span>
 <span id="L8" class="LineNr"> 8 </span>  <span class="Delimiter">{</span>
 <span id="L9" class="LineNr"> 9 </span>  <span class="Conceal">¦</span> c:char, done?:bool <span class="Special">&lt;-</span> read google
 <span id="L10" class="LineNr">10 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
@@ -72,7 +72,7 @@ if ('onhashchange' in window) {
 <span id="L12" class="LineNr">12 </span>  <span class="Conceal">¦</span> buf <span class="Special">&lt;-</span> append buf, c
 <span id="L13" class="LineNr">13 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
 <span id="L14" class="LineNr">14 </span>  <span class="Delimiter">}</span>
-<span id="L15" class="LineNr">15 </span>  result:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L344'>buffer-to-array</a> buf
+<span id="L15" class="LineNr">15 </span>  result:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L338'>buffer-to-array</a> buf
 <span id="L16" class="LineNr">16 </span>  open-console
 <span id="L17" class="LineNr">17 </span>  <a href='081print.mu.html#L46'>clear-screen</a> <span class="Constant">0/screen</span>  <span class="Comment"># non-scrolling app</span>
 <span id="L18" class="LineNr">18 </span>  len:num <span class="Special">&lt;-</span> length *result
diff --git a/html/lambda-to-mu.mu.html b/html/lambda-to-mu.mu.html
index c671327a..b12152bd 100644
--- a/html/lambda-to-mu.mu.html
+++ b/html/lambda-to-mu.mu.html
@@ -256,7 +256,7 @@ if ('onhashchange' in window) {
 <span id="L192" class="LineNr">192 </span>  <span class="Delimiter">{</span>
 <span id="L193" class="LineNr">193 </span>  <span class="Conceal">¦</span> <span class="muControl">break-if</span> pair?
 <span id="L194" class="LineNr">194 </span>  <span class="Conceal">¦</span> <span class="Comment"># atom</span>
-<span id="L195" class="LineNr">195 </span>  <span class="Conceal">¦</span> buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L131'>new-buffer</a><span class="Constant"> 30</span>
+<span id="L195" class="LineNr">195 </span>  <span class="Conceal">¦</span> buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L125'>new-buffer</a><span class="Constant"> 30</span>
 <span id="L196" class="LineNr">196 </span>  <span class="Conceal">¦</span> <span class="Delimiter">{</span>
 <span id="L197" class="LineNr">197 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> <a href='066stream.mu.html#L72'>end-of-stream?</a> in
 <span id="L198" class="LineNr">198 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
@@ -264,13 +264,13 @@ if ('onhashchange' in window) {
 <span id="L200" class="LineNr">200 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> c:char <span class="Special">&lt;-</span> <a href='066stream.mu.html#L42'>peek</a> in
 <span id="L201" class="LineNr">201 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> done? <span class="Special">&lt;-</span> equal c, <span class="Constant">41/close-paren</span>
 <span id="L202" class="LineNr">202 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
-<span id="L203" class="LineNr">203 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> done? <span class="Special">&lt;-</span> <a href='061text.mu.html#L635'>space?</a> c
+<span id="L203" class="LineNr">203 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> done? <span class="Special">&lt;-</span> <a href='061text.mu.html#L626'>space?</a> c
 <span id="L204" class="LineNr">204 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">break-if</span> done?
 <span id="L205" class="LineNr">205 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> c <span class="Special">&lt;-</span> read in
 <span id="L206" class="LineNr">206 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> buf <span class="Special">&lt;-</span> append buf, c
 <span id="L207" class="LineNr">207 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="muControl">loop</span>
 <span id="L208" class="LineNr">208 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L209" class="LineNr">209 </span>  <span class="Conceal">¦</span> s:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L344'>buffer-to-array</a> buf
+<span id="L209" class="LineNr">209 </span>  <span class="Conceal">¦</span> s:text <span class="Special">&lt;-</span> <a href='061text.mu.html#L338'>buffer-to-array</a> buf
 <span id="L210" class="LineNr">210 </span>  <span class="Conceal">¦</span> out <span class="Special">&lt;-</span> <a href='lambda-to-mu.mu.html#L42'>new-atom</a> s
 <span id="L211" class="LineNr">211 </span>  <span class="Delimiter">}</span>
 <span id="L212" class="LineNr">212 </span>  <span class="Delimiter">{</span>
@@ -342,8 +342,8 @@ if ('onhashchange' in window) {
 <span id="L278" class="LineNr">278 </span>  <span class="Conceal">¦</span> done?:bool <span class="Special">&lt;-</span> <a href='066stream.mu.html#L72'>end-of-stream?</a> in
 <span id="L279" class="LineNr">279 </span>  <span class="Conceal">¦</span> <span class="muControl">return-if</span> done?, <span class="Constant">0/null</span>
 <span id="L280" class="LineNr">280 </span>  <span class="Conceal">¦</span> c:char <span class="Special">&lt;-</span> <a href='066stream.mu.html#L42'>peek</a> in
-<span id="L281" class="LineNr">281 </span>  <span class="Conceal">¦</span> <a href='061text.mu.html#L635'>space?</a>:bool <span class="Special">&lt;-</span> <a href='061text.mu.html#L635'>space?</a> c
-<span id="L282" class="LineNr">282 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> <a href='061text.mu.html#L635'>space?</a>
+<span id="L281" class="LineNr">281 </span>  <span class="Conceal">¦</span> <a href='061text.mu.html#L626'>space?</a>:bool <span class="Special">&lt;-</span> <a href='061text.mu.html#L626'>space?</a> c
+<span id="L282" class="LineNr">282 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> <a href='061text.mu.html#L626'>space?</a>
 <span id="L283" class="LineNr">283 </span>  <span class="Conceal">¦</span> read in  <span class="Comment"># skip</span>
 <span id="L284" class="LineNr">284 </span>  <span class="Conceal">¦</span> <span class="muControl">loop</span>
 <span id="L285" class="LineNr">285 </span>  <span class="Delimiter">}</span>
@@ -352,12 +352,12 @@ if ('onhashchange' in window) {
 <span id="L288" class="LineNr">288 </span><span class="muRecipe">def</span> to-text x:&amp;:<a href='lambda-to-mu.mu.html#L31'>cell</a><span class="muRecipe"> -&gt; </span>out:text [
 <span id="L289" class="LineNr">289 </span>  <span class="Constant">local-scope</span>
 <span id="L290" class="LineNr">290 </span>  <span class="Constant">load-ingredients</span>
-<span id="L291" class="LineNr">291 </span>  buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L131'>new-buffer</a><span class="Constant"> 30</span>
+<span id="L291" class="LineNr">291 </span>  buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L125'>new-buffer</a><span class="Constant"> 30</span>
 <span id="L292" class="LineNr">292 </span>  buf <span class="Special">&lt;-</span> to-buffer x, buf
-<span id="L293" class="LineNr">293 </span>  out <span class="Special">&lt;-</span> <a href='061text.mu.html#L344'>buffer-to-array</a> buf
+<span id="L293" class="LineNr">293 </span>  out <span class="Special">&lt;-</span> <a href='061text.mu.html#L338'>buffer-to-array</a> buf
 <span id="L294" class="LineNr">294 </span>]
 <span id="L295" class="LineNr">295 </span>
-<span id="L296" class="LineNr">296 </span><span class="muRecipe">def</span> to-buffer x:&amp;:<a href='lambda-to-mu.mu.html#L31'>cell</a>, buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char<span class="muRecipe"> -&gt; </span>buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char [
+<span id="L296" class="LineNr">296 </span><span class="muRecipe">def</span> to-buffer x:&amp;:<a href='lambda-to-mu.mu.html#L31'>cell</a>, buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char<span class="muRecipe"> -&gt; </span>buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char [
 <span id="L297" class="LineNr">297 </span>  <span class="Constant">local-scope</span>
 <span id="L298" class="LineNr">298 </span>  <span class="Constant">load-ingredients</span>
 <span id="L299" class="LineNr">299 </span>  <span class="Comment"># base case: empty cell</span>
@@ -639,12 +639,12 @@ if ('onhashchange' in window) {
 <span id="L575" class="LineNr">575 </span><span class="muRecipe">def</span> to-mu in:&amp;:<a href='lambda-to-mu.mu.html#L31'>cell</a><span class="muRecipe"> -&gt; </span>out:text [
 <span id="L576" class="LineNr">576 </span>  <span class="Constant">local-scope</span>
 <span id="L577" class="LineNr">577 </span>  <span class="Constant">load-ingredients</span>
-<span id="L578" class="LineNr">578 </span>  buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L131'>new-buffer</a><span class="Constant"> 30</span>
+<span id="L578" class="LineNr">578 </span>  buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char <span class="Special">&lt;-</span> <a href='061text.mu.html#L125'>new-buffer</a><span class="Constant"> 30</span>
 <span id="L579" class="LineNr">579 </span>  buf <span class="Special">&lt;-</span> to-mu in, buf
-<span id="L580" class="LineNr">580 </span>  out <span class="Special">&lt;-</span> <a href='061text.mu.html#L344'>buffer-to-array</a> buf
+<span id="L580" class="LineNr">580 </span>  out <span class="Special">&lt;-</span> <a href='061text.mu.html#L338'>buffer-to-array</a> buf
 <span id="L581" class="LineNr">581 </span>]
 <span id="L582" class="LineNr">582 </span>
-<span id="L583" class="LineNr">583 </span><span class="muRecipe">def</span> to-mu in:&amp;:<a href='lambda-to-mu.mu.html#L31'>cell</a>, buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char<span class="muRecipe"> -&gt; </span>buf:&amp;:<a href='061text.mu.html#L126'>buffer</a>:char, result-name:text [
+<span id="L583" class="LineNr">583 </span><span class="muRecipe">def</span> to-mu in:&amp;:<a href='lambda-to-mu.mu.html#L31'>cell</a>, buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char<span class="muRecipe"> -&gt; </span>buf:&amp;:<a href='061text.mu.html#L120'>buffer</a>:char, result-name:text [
 <span id="L584" class="LineNr">584 </span>  <span class="Constant">local-scope</span>
 <span id="L585" class="LineNr">585 </span>  <span class="Constant">load-ingredients</span>
 <span id="L586" class="LineNr">586 </span>  <span class="Comment"># null cell? no change.</span>
diff --git a/html/tangle.mu.html b/html/tangle.mu.html
index 8f405380..f00b1093 100644
--- a/html/tangle.mu.html
+++ b/html/tangle.mu.html
@@ -16,6 +16,7 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
+.muControl { color: #c0a020; }
 .Conceal { color: #4e4e4e; }
 .Delimiter { color: #800080; }
 .Special { color: #c00000; }
@@ -23,7 +24,6 @@ a:hover { text-decoration: underline; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .LineNr { color: #444444; }
-.muControl { color: #c0a020; }
 -->
 </style>
 
@@ -63,38 +63,37 @@ if ('onhashchange' in window) {
 <span id="L3" class="LineNr"> 3 </span><span class="Comment"># We construct a factorial function with separate base and recursive cases.</span>
 <span id="L4" class="LineNr"> 4 </span><span class="Comment"># Compare factorial.mu.</span>
 <span id="L5" class="LineNr"> 5 </span><span class="Comment">#</span>
-<span id="L6" class="LineNr"> 6 </span><span class="Comment"># This isn't a very tasteful example, just a simple demonstration of</span>
+<span id="L6" class="LineNr"> 6 </span><span class="Comment"># This isn't a very tasteful example, just a basic demonstration of</span>
 <span id="L7" class="LineNr"> 7 </span><span class="Comment"># possibilities.</span>
 <span id="L8" class="LineNr"> 8 </span>
 <span id="L9" class="LineNr"> 9 </span><span class="muRecipe">def</span> <a href='tangle.mu.html#L9'>factorial</a> n:num<span class="muRecipe"> -&gt; </span>result:num [
 <span id="L10" class="LineNr">10 </span>  <span class="Constant">local-scope</span>
 <span id="L11" class="LineNr">11 </span>  <span class="Constant">load-ingredients</span>
-<span id="L12" class="LineNr">12 </span>  <span class="Delimiter">{</span>
-<span id="L13" class="LineNr">13 </span><span class="Constant">  </span><span class="Conceal">¦</span><span class="Constant"> <a href='tangle.mu.html#L13'>&lt;base-case&gt;</a></span>
-<span id="L14" class="LineNr">14 </span>  <span class="Delimiter">}</span>
-<span id="L15" class="LineNr">15 </span><span class="Constant">  <a href='tangle.mu.html#L15'>&lt;recursive-case&gt;</a></span>
-<span id="L16" class="LineNr">16 </span>]
-<span id="L17" class="LineNr">17 </span>
-<span id="L18" class="LineNr">18 </span><span class="muRecipe">after</span> <span class="Constant"><a href='tangle.mu.html#L13'>&lt;base-case&gt;</a></span> [
-<span id="L19" class="LineNr">19 </span>  <span class="Comment"># if n=0 return 1</span>
-<span id="L20" class="LineNr">20 </span>  zero?:bool <span class="Special">&lt;-</span> equal n,<span class="Constant"> 0</span>
-<span id="L21" class="LineNr">21 </span>  <span class="muControl">break-unless</span> zero?
-<span id="L22" class="LineNr">22 </span>  <span class="muControl">return</span><span class="Constant"> 1</span>
-<span id="L23" class="LineNr">23 </span>]
-<span id="L24" class="LineNr">24 </span>
-<span id="L25" class="LineNr">25 </span><span class="muRecipe">after</span> <span class="Constant"><a href='tangle.mu.html#L15'>&lt;recursive-case&gt;</a></span> [
-<span id="L26" class="LineNr">26 </span>  <span class="Comment"># return n * factorial(n - 1)</span>
-<span id="L27" class="LineNr">27 </span>  x:num <span class="Special">&lt;-</span> subtract n,<span class="Constant"> 1</span>
-<span id="L28" class="LineNr">28 </span>  subresult:num <span class="Special">&lt;-</span> <a href='tangle.mu.html#L9'>factorial</a> x
-<span id="L29" class="LineNr">29 </span>  result <span class="Special">&lt;-</span> multiply subresult, n
-<span id="L30" class="LineNr">30 </span>]
-<span id="L31" class="LineNr">31 </span>
-<span id="L32" class="LineNr">32 </span><span class="muRecipe">def</span> <a href='tangle.mu.html#L32'>main</a> [
-<span id="L33" class="LineNr">33 </span>  1:num <span class="Special">&lt;-</span> <a href='tangle.mu.html#L9'>factorial</a><span class="Constant"> 5</span>
-<span id="L34" class="LineNr">34 </span>  <span class="Comment"># trailing space in next line is to help with syntax highlighting</span>
-<span id="L35" class="LineNr">35 </span>  $print <span class="Constant">[result: ]</span>, 1:num, <span class="Constant">[ </span>
-<span id="L36" class="LineNr">36 </span><span class="Constant">]</span>
-<span id="L37" class="LineNr">37 </span>]
+<span id="L12" class="LineNr">12 </span><span class="Constant">  <a href='tangle.mu.html#L12'>&lt;factorial-cases&gt;</a></span>
+<span id="L13" class="LineNr">13 </span>]
+<span id="L14" class="LineNr">14 </span>
+<span id="L15" class="LineNr">15 </span><span class="muRecipe">after</span> <span class="Constant"><a href='tangle.mu.html#L12'>&lt;factorial-cases&gt;</a></span> [
+<span id="L16" class="LineNr">16 </span>  <span class="Comment"># if n=0 return 1</span>
+<span id="L17" class="LineNr">17 </span>  <span class="muControl">return-unless</span> n,<span class="Constant"> 1</span>
+<span id="L18" class="LineNr">18 </span>]
+<span id="L19" class="LineNr">19 </span>
+<span id="L20" class="LineNr">20 </span><span class="muRecipe">after</span> <span class="Constant"><a href='tangle.mu.html#L12'>&lt;factorial-cases&gt;</a></span> [
+<span id="L21" class="LineNr">21 </span>  <span class="Comment"># return n * factorial(n - 1)</span>
+<span id="L22" class="LineNr">22 </span>  <span class="Delimiter">{</span>
+<span id="L23" class="LineNr">23 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> n
+<span id="L24" class="LineNr">24 </span>  <span class="Conceal">¦</span> x:num <span class="Special">&lt;-</span> subtract n,<span class="Constant"> 1</span>
+<span id="L25" class="LineNr">25 </span>  <span class="Conceal">¦</span> subresult:num <span class="Special">&lt;-</span> <a href='tangle.mu.html#L9'>factorial</a> x
+<span id="L26" class="LineNr">26 </span>  <span class="Conceal">¦</span> result <span class="Special">&lt;-</span> multiply subresult, n
+<span id="L27" class="LineNr">27 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span> result
+<span id="L28" class="LineNr">28 </span>  <span class="Delimiter">}</span>
+<span id="L29" class="LineNr">29 </span>]
+<span id="L30" class="LineNr">30 </span>
+<span id="L31" class="LineNr">31 </span><span class="muRecipe">def</span> <a href='tangle.mu.html#L31'>main</a> [
+<span id="L32" class="LineNr">32 </span>  1:num <span class="Special">&lt;-</span> <a href='tangle.mu.html#L9'>factorial</a><span class="Constant"> 5</span>
+<span id="L33" class="LineNr">33 </span>  <span class="Comment"># trailing space in next line is to help with syntax highlighting</span>
+<span id="L34" class="LineNr">34 </span>  $print <span class="Constant">[result: ]</span>, 1:num, <span class="Constant">[ </span>
+<span id="L35" class="LineNr">35 </span><span class="Constant">]</span>
+<span id="L36" class="LineNr">36 </span>]
 </pre>
 </body>
 </html>