From 5cb8c5d2aafaf268e599d684ca938ff0eeb7d70e Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Tue, 24 Nov 2015 07:03:11 -0500
Subject: Latest sample html

---
 doc/sample_html/cogapp___init___py.html        |    4 +-
 doc/sample_html/cogapp___main___py.html        |    4 +-
 doc/sample_html/cogapp_backward_py.html        |    4 +-
 doc/sample_html/cogapp_cogapp_py.html          |  878 +++++------
 doc/sample_html/cogapp_makefiles_py.html       |   66 +-
 doc/sample_html/cogapp_test_cogapp_py.html     | 1958 ++++++++++++------------
 doc/sample_html/cogapp_test_makefiles_py.html  |    4 +-
 doc/sample_html/cogapp_test_whiteutils_py.html |    4 +-
 doc/sample_html/cogapp_whiteutils_py.html      |    4 +-
 doc/sample_html/index.html                     |   30 +-
 doc/sample_html/status.json                    |    2 +-
 11 files changed, 1479 insertions(+), 1479 deletions(-)

(limited to 'doc/sample_html')

diff --git a/doc/sample_html/cogapp___init___py.html b/doc/sample_html/cogapp___init___py.html
index 230f2166..4003d77a 100644
--- a/doc/sample_html/cogapp___init___py.html
+++ b/doc/sample_html/cogapp___init___py.html
@@ -99,8 +99,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.2</a>,
-            created at 2015-11-04 05:20
+            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.3</a>,
+            created at 2015-11-24 07:02
         </p>
     </div>
 </div>
diff --git a/doc/sample_html/cogapp___main___py.html b/doc/sample_html/cogapp___main___py.html
index 2f1d82c0..c805cbee 100644
--- a/doc/sample_html/cogapp___main___py.html
+++ b/doc/sample_html/cogapp___main___py.html
@@ -91,8 +91,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.2</a>,
-            created at 2015-11-04 05:20
+            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.3</a>,
+            created at 2015-11-24 07:02
         </p>
     </div>
 </div>
diff --git a/doc/sample_html/cogapp_backward_py.html b/doc/sample_html/cogapp_backward_py.html
index eda8764f..c0eb8cc2 100644
--- a/doc/sample_html/cogapp_backward_py.html
+++ b/doc/sample_html/cogapp_backward_py.html
@@ -133,8 +133,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.2</a>,
-            created at 2015-11-04 05:20
+            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.3</a>,
+            created at 2015-11-24 07:02
         </p>
     </div>
 </div>
diff --git a/doc/sample_html/cogapp_cogapp_py.html b/doc/sample_html/cogapp_cogapp_py.html
index c7b99af3..26c6df75 100644
--- a/doc/sample_html/cogapp_cogapp_py.html
+++ b/doc/sample_html/cogapp_cogapp_py.html
@@ -8,7 +8,7 @@
     
     
     <meta http-equiv="X-UA-Compatible" content="IE=emulateIE7" />
-    <title>Coverage for cogapp/cogapp.py: 98.82%</title>
+    <title>Coverage for cogapp/cogapp.py: 47.88%</title>
     <link rel="stylesheet" href="style.css" type="text/css">
     
     <script type="text/javascript" src="jquery.min.js"></script>
@@ -24,19 +24,19 @@
 <div id="header">
     <div class="content">
         <h1>Coverage for <b>cogapp/cogapp.py</b> :
-            <span class="pc_cov">98.82%</span>
+            <span class="pc_cov">47.88%</span>
         </h1>
 
         <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" />
 
         <h2 class="stats">
             423 statements &nbsp;
-            <span class="run hide_run shortkey_r button_toggle_run">420 run</span>
-            <span class="mis shortkey_m button_toggle_mis">3 missing</span>
+            <span class="run hide_run shortkey_r button_toggle_run">229 run</span>
+            <span class="mis shortkey_m button_toggle_mis">194 missing</span>
             <span class="exc shortkey_x button_toggle_exc">4 excluded</span>
 
             
-                <span class="par run hide_run shortkey_p button_toggle_par">4 partial</span>
+                <span class="par run hide_run shortkey_p button_toggle_par">26 partial</span>
             
         </h2>
     </div>
@@ -126,10 +126,10 @@
 <p id="n55" class="pln"><a href="#n55">55</a></p>
 <p id="n56" class="pln"><a href="#n56">56</a></p>
 <p id="n57" class="stm run hide_run"><a href="#n57">57</a></p>
-<p id="n58" class="stm run hide_run"><a href="#n58">58</a></p>
+<p id="n58" class="stm par run hide_run"><a href="#n58">58</a></p>
 <p id="n59" class="stm run hide_run"><a href="#n59">59</a></p>
 <p id="n60" class="pln"><a href="#n60">60</a></p>
-<p id="n61" class="stm run hide_run"><a href="#n61">61</a></p>
+<p id="n61" class="stm mis"><a href="#n61">61</a></p>
 <p id="n62" class="pln"><a href="#n62">62</a></p>
 <p id="n63" class="stm run hide_run"><a href="#n63">63</a></p>
 <p id="n64" class="pln"><a href="#n64">64</a></p>
@@ -156,16 +156,16 @@
 <p id="n85" class="stm run hide_run"><a href="#n85">85</a></p>
 <p id="n86" class="pln"><a href="#n86">86</a></p>
 <p id="n87" class="pln"><a href="#n87">87</a></p>
-<p id="n88" class="stm run hide_run"><a href="#n88">88</a></p>
+<p id="n88" class="stm par run hide_run"><a href="#n88">88</a></p>
 <p id="n89" class="stm run hide_run"><a href="#n89">89</a></p>
-<p id="n90" class="stm run hide_run"><a href="#n90">90</a></p>
-<p id="n91" class="stm run hide_run"><a href="#n91">91</a></p>
+<p id="n90" class="stm par run hide_run"><a href="#n90">90</a></p>
+<p id="n91" class="stm mis"><a href="#n91">91</a></p>
 <p id="n92" class="pln"><a href="#n92">92</a></p>
 <p id="n93" class="stm run hide_run"><a href="#n93">93</a></p>
-<p id="n94" class="stm run hide_run"><a href="#n94">94</a></p>
+<p id="n94" class="stm mis"><a href="#n94">94</a></p>
 <p id="n95" class="pln"><a href="#n95">95</a></p>
 <p id="n96" class="stm run hide_run"><a href="#n96">96</a></p>
-<p id="n97" class="stm run hide_run"><a href="#n97">97</a></p>
+<p id="n97" class="stm mis"><a href="#n97">97</a></p>
 <p id="n98" class="pln"><a href="#n98">98</a></p>
 <p id="n99" class="pln"><a href="#n99">99</a></p>
 <p id="n100" class="stm run hide_run"><a href="#n100">100</a></p>
@@ -225,7 +225,7 @@
 <p id="n154" class="stm run hide_run"><a href="#n154">154</a></p>
 <p id="n155" class="pln"><a href="#n155">155</a></p>
 <p id="n156" class="stm run hide_run"><a href="#n156">156</a></p>
-<p id="n157" class="stm run hide_run"><a href="#n157">157</a></p>
+<p id="n157" class="stm mis"><a href="#n157">157</a></p>
 <p id="n158" class="pln"><a href="#n158">158</a></p>
 <p id="n159" class="stm run hide_run"><a href="#n159">159</a></p>
 <p id="n160" class="pln"><a href="#n160">160</a></p>
@@ -253,7 +253,7 @@
 <p id="n182" class="pln"><a href="#n182">182</a></p>
 <p id="n183" class="pln"><a href="#n183">183</a></p>
 <p id="n184" class="pln"><a href="#n184">184</a></p>
-<p id="n185" class="stm run hide_run"><a href="#n185">185</a></p>
+<p id="n185" class="stm mis"><a href="#n185">185</a></p>
 <p id="n186" class="pln"><a href="#n186">186</a></p>
 <p id="n187" class="pln"><a href="#n187">187</a></p>
 <p id="n188" class="stm run hide_run"><a href="#n188">188</a></p>
@@ -301,23 +301,23 @@
 <p id="n230" class="stm run hide_run"><a href="#n230">230</a></p>
 <p id="n231" class="pln"><a href="#n231">231</a></p>
 <p id="n232" class="pln"><a href="#n232">232</a></p>
-<p id="n233" class="stm run hide_run"><a href="#n233">233</a></p>
+<p id="n233" class="stm mis"><a href="#n233">233</a></p>
 <p id="n234" class="pln"><a href="#n234">234</a></p>
 <p id="n235" class="stm run hide_run"><a href="#n235">235</a></p>
 <p id="n236" class="pln"><a href="#n236">236</a></p>
 <p id="n237" class="pln"><a href="#n237">237</a></p>
-<p id="n238" class="stm run hide_run"><a href="#n238">238</a></p>
+<p id="n238" class="stm mis"><a href="#n238">238</a></p>
 <p id="n239" class="pln"><a href="#n239">239</a></p>
 <p id="n240" class="stm run hide_run"><a href="#n240">240</a></p>
 <p id="n241" class="pln"><a href="#n241">241</a></p>
 <p id="n242" class="pln"><a href="#n242">242</a></p>
-<p id="n243" class="stm run hide_run"><a href="#n243">243</a></p>
-<p id="n244" class="stm run hide_run"><a href="#n244">244</a></p>
+<p id="n243" class="stm mis"><a href="#n243">243</a></p>
+<p id="n244" class="stm mis"><a href="#n244">244</a></p>
 <p id="n245" class="pln"><a href="#n245">245</a></p>
 <p id="n246" class="stm run hide_run"><a href="#n246">246</a></p>
 <p id="n247" class="pln"><a href="#n247">247</a></p>
-<p id="n248" class="stm run hide_run"><a href="#n248">248</a></p>
-<p id="n249" class="stm run hide_run"><a href="#n249">249</a></p>
+<p id="n248" class="stm mis"><a href="#n248">248</a></p>
+<p id="n249" class="stm mis"><a href="#n249">249</a></p>
 <p id="n250" class="pln"><a href="#n250">250</a></p>
 <p id="n251" class="pln"><a href="#n251">251</a></p>
 <p id="n252" class="pln"><a href="#n252">252</a></p>
@@ -325,67 +325,67 @@
 <p id="n254" class="pln"><a href="#n254">254</a></p>
 <p id="n255" class="pln"><a href="#n255">255</a></p>
 <p id="n256" class="pln"><a href="#n256">256</a></p>
-<p id="n257" class="stm run hide_run"><a href="#n257">257</a></p>
-<p id="n258" class="stm run hide_run"><a href="#n258">258</a></p>
+<p id="n257" class="stm mis"><a href="#n257">257</a></p>
+<p id="n258" class="stm mis"><a href="#n258">258</a></p>
 <p id="n259" class="pln"><a href="#n259">259</a></p>
 <p id="n260" class="pln"><a href="#n260">260</a></p>
-<p id="n261" class="stm run hide_run"><a href="#n261">261</a></p>
-<p id="n262" class="stm run hide_run"><a href="#n262">262</a></p>
-<p id="n263" class="stm run hide_run"><a href="#n263">263</a></p>
-<p id="n264" class="stm run hide_run"><a href="#n264">264</a></p>
-<p id="n265" class="stm run hide_run"><a href="#n265">265</a></p>
-<p id="n266" class="stm run hide_run"><a href="#n266">266</a></p>
-<p id="n267" class="stm run hide_run"><a href="#n267">267</a></p>
-<p id="n268" class="stm run hide_run"><a href="#n268">268</a></p>
-<p id="n269" class="stm run hide_run"><a href="#n269">269</a></p>
-<p id="n270" class="stm run hide_run"><a href="#n270">270</a></p>
-<p id="n271" class="stm run hide_run"><a href="#n271">271</a></p>
-<p id="n272" class="stm run hide_run"><a href="#n272">272</a></p>
-<p id="n273" class="stm run hide_run"><a href="#n273">273</a></p>
-<p id="n274" class="stm run hide_run"><a href="#n274">274</a></p>
-<p id="n275" class="stm run hide_run"><a href="#n275">275</a></p>
-<p id="n276" class="stm run hide_run"><a href="#n276">276</a></p>
-<p id="n277" class="stm run hide_run"><a href="#n277">277</a></p>
-<p id="n278" class="stm run hide_run"><a href="#n278">278</a></p>
-<p id="n279" class="stm run hide_run"><a href="#n279">279</a></p>
-<p id="n280" class="stm run hide_run"><a href="#n280">280</a></p>
-<p id="n281" class="stm run hide_run"><a href="#n281">281</a></p>
-<p id="n282" class="stm run hide_run"><a href="#n282">282</a></p>
-<p id="n283" class="stm run hide_run"><a href="#n283">283</a></p>
-<p id="n284" class="stm run hide_run"><a href="#n284">284</a></p>
-<p id="n285" class="stm run hide_run"><a href="#n285">285</a></p>
-<p id="n286" class="stm run hide_run"><a href="#n286">286</a></p>
-<p id="n287" class="stm run hide_run"><a href="#n287">287</a></p>
-<p id="n288" class="stm run hide_run"><a href="#n288">288</a></p>
-<p id="n289" class="stm run hide_run"><a href="#n289">289</a></p>
-<p id="n290" class="stm run hide_run"><a href="#n290">290</a></p>
-<p id="n291" class="stm run hide_run"><a href="#n291">291</a></p>
-<p id="n292" class="stm run hide_run"><a href="#n292">292</a></p>
-<p id="n293" class="stm run hide_run"><a href="#n293">293</a></p>
-<p id="n294" class="stm run hide_run"><a href="#n294">294</a></p>
-<p id="n295" class="stm run hide_run"><a href="#n295">295</a></p>
-<p id="n296" class="stm run hide_run"><a href="#n296">296</a></p>
+<p id="n261" class="stm mis"><a href="#n261">261</a></p>
+<p id="n262" class="stm mis"><a href="#n262">262</a></p>
+<p id="n263" class="stm mis"><a href="#n263">263</a></p>
+<p id="n264" class="stm mis"><a href="#n264">264</a></p>
+<p id="n265" class="stm mis"><a href="#n265">265</a></p>
+<p id="n266" class="stm mis"><a href="#n266">266</a></p>
+<p id="n267" class="stm mis"><a href="#n267">267</a></p>
+<p id="n268" class="stm mis"><a href="#n268">268</a></p>
+<p id="n269" class="stm mis"><a href="#n269">269</a></p>
+<p id="n270" class="stm mis"><a href="#n270">270</a></p>
+<p id="n271" class="stm mis"><a href="#n271">271</a></p>
+<p id="n272" class="stm mis"><a href="#n272">272</a></p>
+<p id="n273" class="stm mis"><a href="#n273">273</a></p>
+<p id="n274" class="stm mis"><a href="#n274">274</a></p>
+<p id="n275" class="stm mis"><a href="#n275">275</a></p>
+<p id="n276" class="stm mis"><a href="#n276">276</a></p>
+<p id="n277" class="stm mis"><a href="#n277">277</a></p>
+<p id="n278" class="stm mis"><a href="#n278">278</a></p>
+<p id="n279" class="stm mis"><a href="#n279">279</a></p>
+<p id="n280" class="stm mis"><a href="#n280">280</a></p>
+<p id="n281" class="stm mis"><a href="#n281">281</a></p>
+<p id="n282" class="stm mis"><a href="#n282">282</a></p>
+<p id="n283" class="stm mis"><a href="#n283">283</a></p>
+<p id="n284" class="stm mis"><a href="#n284">284</a></p>
+<p id="n285" class="stm mis"><a href="#n285">285</a></p>
+<p id="n286" class="stm mis"><a href="#n286">286</a></p>
+<p id="n287" class="stm mis"><a href="#n287">287</a></p>
+<p id="n288" class="stm mis"><a href="#n288">288</a></p>
+<p id="n289" class="stm mis"><a href="#n289">289</a></p>
+<p id="n290" class="stm mis"><a href="#n290">290</a></p>
+<p id="n291" class="stm mis"><a href="#n291">291</a></p>
+<p id="n292" class="stm mis"><a href="#n292">292</a></p>
+<p id="n293" class="stm mis"><a href="#n293">293</a></p>
+<p id="n294" class="stm mis"><a href="#n294">294</a></p>
+<p id="n295" class="stm mis"><a href="#n295">295</a></p>
+<p id="n296" class="stm mis"><a href="#n296">296</a></p>
 <p id="n297" class="pln"><a href="#n297">297</a></p>
 <p id="n298" class="pln"><a href="#n298">298</a></p>
 <p id="n299" class="pln"><a href="#n299">299</a></p>
 <p id="n300" class="exc"><a href="#n300">300</a></p>
 <p id="n301" class="pln"><a href="#n301">301</a></p>
 <p id="n302" class="stm run hide_run"><a href="#n302">302</a></p>
-<p id="n303" class="stm run hide_run"><a href="#n303">303</a></p>
-<p id="n304" class="stm run hide_run"><a href="#n304">304</a></p>
-<p id="n305" class="stm run hide_run"><a href="#n305">305</a></p>
-<p id="n306" class="stm run hide_run"><a href="#n306">306</a></p>
+<p id="n303" class="stm mis"><a href="#n303">303</a></p>
+<p id="n304" class="stm mis"><a href="#n304">304</a></p>
+<p id="n305" class="stm mis"><a href="#n305">305</a></p>
+<p id="n306" class="stm mis"><a href="#n306">306</a></p>
 <p id="n307" class="pln"><a href="#n307">307</a></p>
 <p id="n308" class="pln"><a href="#n308">308</a></p>
 <p id="n309" class="pln"><a href="#n309">309</a></p>
 <p id="n310" class="stm run hide_run"><a href="#n310">310</a></p>
 <p id="n311" class="pln"><a href="#n311">311</a></p>
 <p id="n312" class="pln"><a href="#n312">312</a></p>
-<p id="n313" class="stm run hide_run"><a href="#n313">313</a></p>
-<p id="n314" class="stm run hide_run"><a href="#n314">314</a></p>
+<p id="n313" class="stm mis"><a href="#n313">313</a></p>
+<p id="n314" class="stm mis"><a href="#n314">314</a></p>
 <p id="n315" class="pln"><a href="#n315">315</a></p>
-<p id="n316" class="stm run hide_run"><a href="#n316">316</a></p>
-<p id="n317" class="stm run hide_run"><a href="#n317">317</a></p>
+<p id="n316" class="stm mis"><a href="#n316">316</a></p>
+<p id="n317" class="stm mis"><a href="#n317">317</a></p>
 <p id="n318" class="pln"><a href="#n318">318</a></p>
 <p id="n319" class="pln"><a href="#n319">319</a></p>
 <p id="n320" class="stm run hide_run"><a href="#n320">320</a></p>
@@ -403,7 +403,7 @@
 <p id="n332" class="stm run hide_run"><a href="#n332">332</a></p>
 <p id="n333" class="pln"><a href="#n333">333</a></p>
 <p id="n334" class="stm run hide_run"><a href="#n334">334</a></p>
-<p id="n335" class="stm run hide_run"><a href="#n335">335</a></p>
+<p id="n335" class="stm mis"><a href="#n335">335</a></p>
 <p id="n336" class="pln"><a href="#n336">336</a></p>
 <p id="n337" class="stm run hide_run"><a href="#n337">337</a></p>
 <p id="n338" class="stm run hide_run"><a href="#n338">338</a></p>
@@ -425,26 +425,26 @@
 <p id="n354" class="stm run hide_run"><a href="#n354">354</a></p>
 <p id="n355" class="pln"><a href="#n355">355</a></p>
 <p id="n356" class="pln"><a href="#n356">356</a></p>
-<p id="n357" class="stm run hide_run"><a href="#n357">357</a></p>
-<p id="n358" class="stm run hide_run"><a href="#n358">358</a></p>
-<p id="n359" class="stm par run hide_run"><a href="#n359">359</a></p>
+<p id="n357" class="stm mis"><a href="#n357">357</a></p>
+<p id="n358" class="stm mis"><a href="#n358">358</a></p>
+<p id="n359" class="stm mis"><a href="#n359">359</a></p>
 <p id="n360" class="stm mis"><a href="#n360">360</a></p>
-<p id="n361" class="stm run hide_run"><a href="#n361">361</a></p>
-<p id="n362" class="stm par run hide_run"><a href="#n362">362</a></p>
+<p id="n361" class="stm mis"><a href="#n361">361</a></p>
+<p id="n362" class="stm mis"><a href="#n362">362</a></p>
 <p id="n363" class="stm mis"><a href="#n363">363</a></p>
 <p id="n364" class="pln"><a href="#n364">364</a></p>
-<p id="n365" class="stm run hide_run"><a href="#n365">365</a></p>
-<p id="n366" class="stm run hide_run"><a href="#n366">366</a></p>
+<p id="n365" class="stm mis"><a href="#n365">365</a></p>
+<p id="n366" class="stm mis"><a href="#n366">366</a></p>
 <p id="n367" class="pln"><a href="#n367">367</a></p>
 <p id="n368" class="stm run hide_run"><a href="#n368">368</a></p>
 <p id="n369" class="pln"><a href="#n369">369</a></p>
-<p id="n370" class="stm run hide_run"><a href="#n370">370</a></p>
-<p id="n371" class="stm run hide_run"><a href="#n371">371</a></p>
+<p id="n370" class="stm mis"><a href="#n370">370</a></p>
+<p id="n371" class="stm mis"><a href="#n371">371</a></p>
 <p id="n372" class="pln"><a href="#n372">372</a></p>
-<p id="n373" class="stm run hide_run"><a href="#n373">373</a></p>
-<p id="n374" class="stm par run hide_run"><a href="#n374">374</a></p>
+<p id="n373" class="stm mis"><a href="#n373">373</a></p>
+<p id="n374" class="stm mis"><a href="#n374">374</a></p>
 <p id="n375" class="stm mis"><a href="#n375">375</a></p>
-<p id="n376" class="stm run hide_run"><a href="#n376">376</a></p>
+<p id="n376" class="stm mis"><a href="#n376">376</a></p>
 <p id="n377" class="pln"><a href="#n377">377</a></p>
 <p id="n378" class="stm run hide_run"><a href="#n378">378</a></p>
 <p id="n379" class="pln"><a href="#n379">379</a></p>
@@ -455,14 +455,14 @@
 <p id="n384" class="stm run hide_run"><a href="#n384">384</a></p>
 <p id="n385" class="stm run hide_run"><a href="#n385">385</a></p>
 <p id="n386" class="pln"><a href="#n386">386</a></p>
-<p id="n387" class="stm run hide_run"><a href="#n387">387</a></p>
+<p id="n387" class="stm par run hide_run"><a href="#n387">387</a></p>
 <p id="n388" class="pln"><a href="#n388">388</a></p>
-<p id="n389" class="stm run hide_run"><a href="#n389">389</a></p>
-<p id="n390" class="stm run hide_run"><a href="#n390">390</a></p>
-<p id="n391" class="stm run hide_run"><a href="#n391">391</a></p>
+<p id="n389" class="stm mis"><a href="#n389">389</a></p>
+<p id="n390" class="stm mis"><a href="#n390">390</a></p>
+<p id="n391" class="stm par run hide_run"><a href="#n391">391</a></p>
 <p id="n392" class="pln"><a href="#n392">392</a></p>
-<p id="n393" class="stm run hide_run"><a href="#n393">393</a></p>
-<p id="n394" class="stm run hide_run"><a href="#n394">394</a></p>
+<p id="n393" class="stm mis"><a href="#n393">393</a></p>
+<p id="n394" class="stm mis"><a href="#n394">394</a></p>
 <p id="n395" class="pln"><a href="#n395">395</a></p>
 <p id="n396" class="stm run hide_run"><a href="#n396">396</a></p>
 <p id="n397" class="stm run hide_run"><a href="#n397">397</a></p>
@@ -473,7 +473,7 @@
 <p id="n402" class="stm run hide_run"><a href="#n402">402</a></p>
 <p id="n403" class="pln"><a href="#n403">403</a></p>
 <p id="n404" class="pln"><a href="#n404">404</a></p>
-<p id="n405" class="stm run hide_run"><a href="#n405">405</a></p>
+<p id="n405" class="stm par run hide_run"><a href="#n405">405</a></p>
 <p id="n406" class="stm run hide_run"><a href="#n406">406</a></p>
 <p id="n407" class="pln"><a href="#n407">407</a></p>
 <p id="n408" class="pln"><a href="#n408">408</a></p>
@@ -484,17 +484,17 @@
 <p id="n413" class="stm run hide_run"><a href="#n413">413</a></p>
 <p id="n414" class="pln"><a href="#n414">414</a></p>
 <p id="n415" class="stm run hide_run"><a href="#n415">415</a></p>
-<p id="n416" class="stm run hide_run"><a href="#n416">416</a></p>
-<p id="n417" class="stm run hide_run"><a href="#n417">417</a></p>
+<p id="n416" class="stm par run hide_run"><a href="#n416">416</a></p>
+<p id="n417" class="stm mis"><a href="#n417">417</a></p>
 <p id="n418" class="pln"><a href="#n418">418</a></p>
-<p id="n419" class="stm run hide_run"><a href="#n419">419</a></p>
-<p id="n420" class="stm run hide_run"><a href="#n420">420</a></p>
+<p id="n419" class="stm par run hide_run"><a href="#n419">419</a></p>
+<p id="n420" class="stm mis"><a href="#n420">420</a></p>
 <p id="n421" class="pln"><a href="#n421">421</a></p>
 <p id="n422" class="stm run hide_run"><a href="#n422">422</a></p>
 <p id="n423" class="stm run hide_run"><a href="#n423">423</a></p>
 <p id="n424" class="stm run hide_run"><a href="#n424">424</a></p>
 <p id="n425" class="stm run hide_run"><a href="#n425">425</a></p>
-<p id="n426" class="stm run hide_run"><a href="#n426">426</a></p>
+<p id="n426" class="stm par run hide_run"><a href="#n426">426</a></p>
 <p id="n427" class="stm run hide_run"><a href="#n427">427</a></p>
 <p id="n428" class="pln"><a href="#n428">428</a></p>
 <p id="n429" class="pln"><a href="#n429">429</a></p>
@@ -521,22 +521,22 @@
 <p id="n450" class="pln"><a href="#n450">450</a></p>
 <p id="n451" class="pln"><a href="#n451">451</a></p>
 <p id="n452" class="stm run hide_run"><a href="#n452">452</a></p>
-<p id="n453" class="stm run hide_run"><a href="#n453">453</a></p>
-<p id="n454" class="stm run hide_run"><a href="#n454">454</a></p>
+<p id="n453" class="stm par run hide_run"><a href="#n453">453</a></p>
+<p id="n454" class="stm mis"><a href="#n454">454</a></p>
 <p id="n455" class="pln"><a href="#n455">455</a></p>
-<p id="n456" class="stm run hide_run"><a href="#n456">456</a></p>
-<p id="n457" class="stm run hide_run"><a href="#n457">457</a></p>
+<p id="n456" class="stm par run hide_run"><a href="#n456">456</a></p>
+<p id="n457" class="stm mis"><a href="#n457">457</a></p>
 <p id="n458" class="pln"><a href="#n458">458</a></p>
-<p id="n459" class="stm run hide_run"><a href="#n459">459</a></p>
+<p id="n459" class="stm par run hide_run"><a href="#n459">459</a></p>
 <p id="n460" class="stm run hide_run"><a href="#n460">460</a></p>
 <p id="n461" class="stm run hide_run"><a href="#n461">461</a></p>
 <p id="n462" class="stm run hide_run"><a href="#n462">462</a></p>
-<p id="n463" class="stm run hide_run"><a href="#n463">463</a></p>
-<p id="n464" class="stm run hide_run"><a href="#n464">464</a></p>
+<p id="n463" class="stm par run hide_run"><a href="#n463">463</a></p>
+<p id="n464" class="stm mis"><a href="#n464">464</a></p>
 <p id="n465" class="pln"><a href="#n465">465</a></p>
 <p id="n466" class="pln"><a href="#n466">466</a></p>
 <p id="n467" class="pln"><a href="#n467">467</a></p>
-<p id="n468" class="stm run hide_run"><a href="#n468">468</a></p>
+<p id="n468" class="stm par run hide_run"><a href="#n468">468</a></p>
 <p id="n469" class="stm run hide_run"><a href="#n469">469</a></p>
 <p id="n470" class="stm run hide_run"><a href="#n470">470</a></p>
 <p id="n471" class="pln"><a href="#n471">471</a></p>
@@ -547,20 +547,20 @@
 <p id="n476" class="stm run hide_run"><a href="#n476">476</a></p>
 <p id="n477" class="stm run hide_run"><a href="#n477">477</a></p>
 <p id="n478" class="stm run hide_run"><a href="#n478">478</a></p>
-<p id="n479" class="stm run hide_run"><a href="#n479">479</a></p>
-<p id="n480" class="stm run hide_run"><a href="#n480">480</a></p>
+<p id="n479" class="stm par run hide_run"><a href="#n479">479</a></p>
+<p id="n480" class="stm mis"><a href="#n480">480</a></p>
 <p id="n481" class="pln"><a href="#n481">481</a></p>
-<p id="n482" class="stm run hide_run"><a href="#n482">482</a></p>
-<p id="n483" class="stm run hide_run"><a href="#n483">483</a></p>
+<p id="n482" class="stm par run hide_run"><a href="#n482">482</a></p>
+<p id="n483" class="stm mis"><a href="#n483">483</a></p>
 <p id="n484" class="pln"><a href="#n484">484</a></p>
 <p id="n485" class="stm run hide_run"><a href="#n485">485</a></p>
 <p id="n486" class="stm run hide_run"><a href="#n486">486</a></p>
 <p id="n487" class="stm run hide_run"><a href="#n487">487</a></p>
 <p id="n488" class="stm run hide_run"><a href="#n488">488</a></p>
 <p id="n489" class="pln"><a href="#n489">489</a></p>
-<p id="n490" class="stm run hide_run"><a href="#n490">490</a></p>
+<p id="n490" class="stm par run hide_run"><a href="#n490">490</a></p>
 <p id="n491" class="pln"><a href="#n491">491</a></p>
-<p id="n492" class="stm run hide_run"><a href="#n492">492</a></p>
+<p id="n492" class="stm mis"><a href="#n492">492</a></p>
 <p id="n493" class="pln"><a href="#n493">493</a></p>
 <p id="n494" class="pln"><a href="#n494">494</a></p>
 <p id="n495" class="pln"><a href="#n495">495</a></p>
@@ -569,7 +569,7 @@
 <p id="n498" class="pln"><a href="#n498">498</a></p>
 <p id="n499" class="pln"><a href="#n499">499</a></p>
 <p id="n500" class="stm run hide_run"><a href="#n500">500</a></p>
-<p id="n501" class="stm run hide_run"><a href="#n501">501</a></p>
+<p id="n501" class="stm par run hide_run"><a href="#n501">501</a></p>
 <p id="n502" class="stm run hide_run"><a href="#n502">502</a></p>
 <p id="n503" class="stm run hide_run"><a href="#n503">503</a></p>
 <p id="n504" class="stm run hide_run"><a href="#n504">504</a></p>
@@ -581,35 +581,35 @@
 <p id="n510" class="pln"><a href="#n510">510</a></p>
 <p id="n511" class="pln"><a href="#n511">511</a></p>
 <p id="n512" class="stm run hide_run"><a href="#n512">512</a></p>
-<p id="n513" class="stm run hide_run"><a href="#n513">513</a></p>
-<p id="n514" class="stm run hide_run"><a href="#n514">514</a></p>
-<p id="n515" class="stm run hide_run"><a href="#n515">515</a></p>
-<p id="n516" class="stm run hide_run"><a href="#n516">516</a></p>
-<p id="n517" class="stm run hide_run"><a href="#n517">517</a></p>
+<p id="n513" class="stm par run hide_run"><a href="#n513">513</a></p>
+<p id="n514" class="stm mis"><a href="#n514">514</a></p>
+<p id="n515" class="stm mis"><a href="#n515">515</a></p>
+<p id="n516" class="stm mis"><a href="#n516">516</a></p>
+<p id="n517" class="stm mis"><a href="#n517">517</a></p>
 <p id="n518" class="pln"><a href="#n518">518</a></p>
 <p id="n519" class="pln"><a href="#n519">519</a></p>
-<p id="n520" class="stm run hide_run"><a href="#n520">520</a></p>
+<p id="n520" class="stm mis"><a href="#n520">520</a></p>
 <p id="n521" class="pln"><a href="#n521">521</a></p>
 <p id="n522" class="pln"><a href="#n522">522</a></p>
-<p id="n523" class="stm run hide_run"><a href="#n523">523</a></p>
-<p id="n524" class="stm run hide_run"><a href="#n524">524</a></p>
+<p id="n523" class="stm mis"><a href="#n523">523</a></p>
+<p id="n524" class="stm mis"><a href="#n524">524</a></p>
 <p id="n525" class="pln"><a href="#n525">525</a></p>
 <p id="n526" class="pln"><a href="#n526">526</a></p>
 <p id="n527" class="pln"><a href="#n527">527</a></p>
-<p id="n528" class="stm run hide_run"><a href="#n528">528</a></p>
-<p id="n529" class="stm run hide_run"><a href="#n529">529</a></p>
+<p id="n528" class="stm par run hide_run"><a href="#n528">528</a></p>
+<p id="n529" class="stm mis"><a href="#n529">529</a></p>
 <p id="n530" class="pln"><a href="#n530">530</a></p>
-<p id="n531" class="stm run hide_run"><a href="#n531">531</a></p>
+<p id="n531" class="stm par run hide_run"><a href="#n531">531</a></p>
 <p id="n532" class="stm run hide_run"><a href="#n532">532</a></p>
 <p id="n533" class="stm run hide_run"><a href="#n533">533</a></p>
 <p id="n534" class="pln"><a href="#n534">534</a></p>
-<p id="n535" class="stm run hide_run"><a href="#n535">535</a></p>
-<p id="n536" class="stm run hide_run"><a href="#n536">536</a></p>
+<p id="n535" class="stm par run hide_run"><a href="#n535">535</a></p>
+<p id="n536" class="stm mis"><a href="#n536">536</a></p>
 <p id="n537" class="pln"><a href="#n537">537</a></p>
-<p id="n538" class="stm run hide_run"><a href="#n538">538</a></p>
-<p id="n539" class="stm run hide_run"><a href="#n539">539</a></p>
-<p id="n540" class="stm run hide_run"><a href="#n540">540</a></p>
-<p id="n541" class="stm run hide_run"><a href="#n541">541</a></p>
+<p id="n538" class="stm par run hide_run"><a href="#n538">538</a></p>
+<p id="n539" class="stm mis"><a href="#n539">539</a></p>
+<p id="n540" class="stm par run hide_run"><a href="#n540">540</a></p>
+<p id="n541" class="stm mis"><a href="#n541">541</a></p>
 <p id="n542" class="pln"><a href="#n542">542</a></p>
 <p id="n543" class="pln"><a href="#n543">543</a></p>
 <p id="n544" class="pln"><a href="#n544">544</a></p>
@@ -619,10 +619,10 @@
 <p id="n548" class="pln"><a href="#n548">548</a></p>
 <p id="n549" class="pln"><a href="#n549">549</a></p>
 <p id="n550" class="pln"><a href="#n550">550</a></p>
-<p id="n551" class="stm run hide_run"><a href="#n551">551</a></p>
+<p id="n551" class="stm par run hide_run"><a href="#n551">551</a></p>
 <p id="n552" class="pln"><a href="#n552">552</a></p>
-<p id="n553" class="stm run hide_run"><a href="#n553">553</a></p>
-<p id="n554" class="stm run hide_run"><a href="#n554">554</a></p>
+<p id="n553" class="stm mis"><a href="#n553">553</a></p>
+<p id="n554" class="stm mis"><a href="#n554">554</a></p>
 <p id="n555" class="stm run hide_run"><a href="#n555">555</a></p>
 <p id="n556" class="pln"><a href="#n556">556</a></p>
 <p id="n557" class="stm run hide_run"><a href="#n557">557</a></p>
@@ -637,162 +637,162 @@
 <p id="n566" class="stm run hide_run"><a href="#n566">566</a></p>
 <p id="n567" class="pln"><a href="#n567">567</a></p>
 <p id="n568" class="pln"><a href="#n568">568</a></p>
-<p id="n569" class="stm run hide_run"><a href="#n569">569</a></p>
+<p id="n569" class="stm mis"><a href="#n569">569</a></p>
 <p id="n570" class="pln"><a href="#n570">570</a></p>
-<p id="n571" class="stm run hide_run"><a href="#n571">571</a></p>
+<p id="n571" class="stm mis"><a href="#n571">571</a></p>
 <p id="n572" class="pln"><a href="#n572">572</a></p>
-<p id="n573" class="stm run hide_run"><a href="#n573">573</a></p>
-<p id="n574" class="stm run hide_run"><a href="#n574">574</a></p>
-<p id="n575" class="stm run hide_run"><a href="#n575">575</a></p>
-<p id="n576" class="stm run hide_run"><a href="#n576">576</a></p>
+<p id="n573" class="stm mis"><a href="#n573">573</a></p>
+<p id="n574" class="stm mis"><a href="#n574">574</a></p>
+<p id="n575" class="stm mis"><a href="#n575">575</a></p>
+<p id="n576" class="stm mis"><a href="#n576">576</a></p>
 <p id="n577" class="pln"><a href="#n577">577</a></p>
 <p id="n578" class="pln"><a href="#n578">578</a></p>
-<p id="n579" class="stm run hide_run"><a href="#n579">579</a></p>
-<p id="n580" class="stm run hide_run"><a href="#n580">580</a></p>
-<p id="n581" class="stm run hide_run"><a href="#n581">581</a></p>
-<p id="n582" class="stm run hide_run"><a href="#n582">582</a></p>
+<p id="n579" class="stm mis"><a href="#n579">579</a></p>
+<p id="n580" class="stm mis"><a href="#n580">580</a></p>
+<p id="n581" class="stm mis"><a href="#n581">581</a></p>
+<p id="n582" class="stm mis"><a href="#n582">582</a></p>
 <p id="n583" class="pln"><a href="#n583">583</a></p>
 <p id="n584" class="stm run hide_run"><a href="#n584">584</a></p>
-<p id="n585" class="stm run hide_run"><a href="#n585">585</a></p>
-<p id="n586" class="stm run hide_run"><a href="#n586">586</a></p>
+<p id="n585" class="stm mis"><a href="#n585">585</a></p>
+<p id="n586" class="stm mis"><a href="#n586">586</a></p>
 <p id="n587" class="pln"><a href="#n587">587</a></p>
 <p id="n588" class="stm run hide_run"><a href="#n588">588</a></p>
-<p id="n589" class="stm run hide_run"><a href="#n589">589</a></p>
-<p id="n590" class="stm run hide_run"><a href="#n590">590</a></p>
-<p id="n591" class="stm run hide_run"><a href="#n591">591</a></p>
+<p id="n589" class="stm mis"><a href="#n589">589</a></p>
+<p id="n590" class="stm mis"><a href="#n590">590</a></p>
+<p id="n591" class="stm mis"><a href="#n591">591</a></p>
 <p id="n592" class="pln"><a href="#n592">592</a></p>
 <p id="n593" class="stm run hide_run"><a href="#n593">593</a></p>
-<p id="n594" class="stm run hide_run"><a href="#n594">594</a></p>
-<p id="n595" class="stm run hide_run"><a href="#n595">595</a></p>
+<p id="n594" class="stm mis"><a href="#n594">594</a></p>
+<p id="n595" class="stm mis"><a href="#n595">595</a></p>
 <p id="n596" class="pln"><a href="#n596">596</a></p>
 <p id="n597" class="stm run hide_run"><a href="#n597">597</a></p>
 <p id="n598" class="pln"><a href="#n598">598</a></p>
 <p id="n599" class="pln"><a href="#n599">599</a></p>
 <p id="n600" class="pln"><a href="#n600">600</a></p>
-<p id="n601" class="stm run hide_run"><a href="#n601">601</a></p>
-<p id="n602" class="stm run hide_run"><a href="#n602">602</a></p>
+<p id="n601" class="stm mis"><a href="#n601">601</a></p>
+<p id="n602" class="stm mis"><a href="#n602">602</a></p>
 <p id="n603" class="pln"><a href="#n603">603</a></p>
-<p id="n604" class="stm run hide_run"><a href="#n604">604</a></p>
-<p id="n605" class="stm run hide_run"><a href="#n605">605</a></p>
+<p id="n604" class="stm mis"><a href="#n604">604</a></p>
+<p id="n605" class="stm mis"><a href="#n605">605</a></p>
 <p id="n606" class="pln"><a href="#n606">606</a></p>
 <p id="n607" class="pln"><a href="#n607">607</a></p>
-<p id="n608" class="stm run hide_run"><a href="#n608">608</a></p>
+<p id="n608" class="stm mis"><a href="#n608">608</a></p>
 <p id="n609" class="pln"><a href="#n609">609</a></p>
 <p id="n610" class="pln"><a href="#n610">610</a></p>
-<p id="n611" class="stm run hide_run"><a href="#n611">611</a></p>
-<p id="n612" class="stm run hide_run"><a href="#n612">612</a></p>
-<p id="n613" class="stm run hide_run"><a href="#n613">613</a></p>
+<p id="n611" class="stm mis"><a href="#n611">611</a></p>
+<p id="n612" class="stm mis"><a href="#n612">612</a></p>
+<p id="n613" class="stm mis"><a href="#n613">613</a></p>
 <p id="n614" class="pln"><a href="#n614">614</a></p>
 <p id="n615" class="pln"><a href="#n615">615</a></p>
-<p id="n616" class="stm run hide_run"><a href="#n616">616</a></p>
-<p id="n617" class="stm run hide_run"><a href="#n617">617</a></p>
-<p id="n618" class="stm run hide_run"><a href="#n618">618</a></p>
+<p id="n616" class="stm mis"><a href="#n616">616</a></p>
+<p id="n617" class="stm mis"><a href="#n617">617</a></p>
+<p id="n618" class="stm mis"><a href="#n618">618</a></p>
 <p id="n619" class="pln"><a href="#n619">619</a></p>
-<p id="n620" class="stm run hide_run"><a href="#n620">620</a></p>
-<p id="n621" class="stm run hide_run"><a href="#n621">621</a></p>
-<p id="n622" class="stm run hide_run"><a href="#n622">622</a></p>
-<p id="n623" class="stm run hide_run"><a href="#n623">623</a></p>
-<p id="n624" class="stm run hide_run"><a href="#n624">624</a></p>
-<p id="n625" class="stm run hide_run"><a href="#n625">625</a></p>
-<p id="n626" class="stm run hide_run"><a href="#n626">626</a></p>
-<p id="n627" class="stm run hide_run"><a href="#n627">627</a></p>
-<p id="n628" class="stm run hide_run"><a href="#n628">628</a></p>
-<p id="n629" class="stm run hide_run"><a href="#n629">629</a></p>
-<p id="n630" class="stm run hide_run"><a href="#n630">630</a></p>
-<p id="n631" class="stm run hide_run"><a href="#n631">631</a></p>
+<p id="n620" class="stm mis"><a href="#n620">620</a></p>
+<p id="n621" class="stm mis"><a href="#n621">621</a></p>
+<p id="n622" class="stm mis"><a href="#n622">622</a></p>
+<p id="n623" class="stm mis"><a href="#n623">623</a></p>
+<p id="n624" class="stm mis"><a href="#n624">624</a></p>
+<p id="n625" class="stm mis"><a href="#n625">625</a></p>
+<p id="n626" class="stm mis"><a href="#n626">626</a></p>
+<p id="n627" class="stm mis"><a href="#n627">627</a></p>
+<p id="n628" class="stm mis"><a href="#n628">628</a></p>
+<p id="n629" class="stm mis"><a href="#n629">629</a></p>
+<p id="n630" class="stm mis"><a href="#n630">630</a></p>
+<p id="n631" class="stm mis"><a href="#n631">631</a></p>
 <p id="n632" class="pln"><a href="#n632">632</a></p>
 <p id="n633" class="pln"><a href="#n633">633</a></p>
 <p id="n634" class="pln"><a href="#n634">634</a></p>
 <p id="n635" class="pln"><a href="#n635">635</a></p>
 <p id="n636" class="pln"><a href="#n636">636</a></p>
-<p id="n637" class="stm run hide_run"><a href="#n637">637</a></p>
-<p id="n638" class="stm run hide_run"><a href="#n638">638</a></p>
+<p id="n637" class="stm mis"><a href="#n637">637</a></p>
+<p id="n638" class="stm mis"><a href="#n638">638</a></p>
 <p id="n639" class="pln"><a href="#n639">639</a></p>
-<p id="n640" class="stm run hide_run"><a href="#n640">640</a></p>
+<p id="n640" class="stm mis"><a href="#n640">640</a></p>
 <p id="n641" class="pln"><a href="#n641">641</a></p>
-<p id="n642" class="stm run hide_run"><a href="#n642">642</a></p>
+<p id="n642" class="stm mis"><a href="#n642">642</a></p>
 <p id="n643" class="pln"><a href="#n643">643</a></p>
 <p id="n644" class="stm run hide_run"><a href="#n644">644</a></p>
 <p id="n645" class="pln"><a href="#n645">645</a></p>
 <p id="n646" class="pln"><a href="#n646">646</a></p>
-<p id="n647" class="stm run hide_run"><a href="#n647">647</a></p>
-<p id="n648" class="stm run hide_run"><a href="#n648">648</a></p>
-<p id="n649" class="stm run hide_run"><a href="#n649">649</a></p>
-<p id="n650" class="stm run hide_run"><a href="#n650">650</a></p>
+<p id="n647" class="stm mis"><a href="#n647">647</a></p>
+<p id="n648" class="stm mis"><a href="#n648">648</a></p>
+<p id="n649" class="stm mis"><a href="#n649">649</a></p>
+<p id="n650" class="stm mis"><a href="#n650">650</a></p>
 <p id="n651" class="pln"><a href="#n651">651</a></p>
-<p id="n652" class="stm run hide_run"><a href="#n652">652</a></p>
-<p id="n653" class="stm run hide_run"><a href="#n653">653</a></p>
-<p id="n654" class="stm run hide_run"><a href="#n654">654</a></p>
+<p id="n652" class="stm mis"><a href="#n652">652</a></p>
+<p id="n653" class="stm mis"><a href="#n653">653</a></p>
+<p id="n654" class="stm mis"><a href="#n654">654</a></p>
 <p id="n655" class="pln"><a href="#n655">655</a></p>
-<p id="n656" class="stm run hide_run"><a href="#n656">656</a></p>
-<p id="n657" class="stm run hide_run"><a href="#n657">657</a></p>
-<p id="n658" class="stm run hide_run"><a href="#n658">658</a></p>
-<p id="n659" class="stm run hide_run"><a href="#n659">659</a></p>
+<p id="n656" class="stm mis"><a href="#n656">656</a></p>
+<p id="n657" class="stm mis"><a href="#n657">657</a></p>
+<p id="n658" class="stm mis"><a href="#n658">658</a></p>
+<p id="n659" class="stm mis"><a href="#n659">659</a></p>
 <p id="n660" class="pln"><a href="#n660">660</a></p>
 <p id="n661" class="stm run hide_run"><a href="#n661">661</a></p>
 <p id="n662" class="pln"><a href="#n662">662</a></p>
 <p id="n663" class="pln"><a href="#n663">663</a></p>
-<p id="n664" class="stm run hide_run"><a href="#n664">664</a></p>
-<p id="n665" class="stm run hide_run"><a href="#n665">665</a></p>
+<p id="n664" class="stm mis"><a href="#n664">664</a></p>
+<p id="n665" class="stm mis"><a href="#n665">665</a></p>
 <p id="n666" class="pln"><a href="#n666">666</a></p>
-<p id="n667" class="stm run hide_run"><a href="#n667">667</a></p>
-<p id="n668" class="stm run hide_run"><a href="#n668">668</a></p>
+<p id="n667" class="stm mis"><a href="#n667">667</a></p>
+<p id="n668" class="stm mis"><a href="#n668">668</a></p>
 <p id="n669" class="pln"><a href="#n669">669</a></p>
-<p id="n670" class="stm run hide_run"><a href="#n670">670</a></p>
-<p id="n671" class="stm run hide_run"><a href="#n671">671</a></p>
-<p id="n672" class="stm run hide_run"><a href="#n672">672</a></p>
-<p id="n673" class="stm run hide_run"><a href="#n673">673</a></p>
+<p id="n670" class="stm mis"><a href="#n670">670</a></p>
+<p id="n671" class="stm mis"><a href="#n671">671</a></p>
+<p id="n672" class="stm mis"><a href="#n672">672</a></p>
+<p id="n673" class="stm mis"><a href="#n673">673</a></p>
 <p id="n674" class="pln"><a href="#n674">674</a></p>
-<p id="n675" class="stm run hide_run"><a href="#n675">675</a></p>
+<p id="n675" class="stm mis"><a href="#n675">675</a></p>
 <p id="n676" class="pln"><a href="#n676">676</a></p>
-<p id="n677" class="stm run hide_run"><a href="#n677">677</a></p>
+<p id="n677" class="stm mis"><a href="#n677">677</a></p>
 <p id="n678" class="pln"><a href="#n678">678</a></p>
 <p id="n679" class="stm run hide_run"><a href="#n679">679</a></p>
 <p id="n680" class="pln"><a href="#n680">680</a></p>
 <p id="n681" class="pln"><a href="#n681">681</a></p>
 <p id="n682" class="pln"><a href="#n682">682</a></p>
 <p id="n683" class="pln"><a href="#n683">683</a></p>
-<p id="n684" class="stm run hide_run"><a href="#n684">684</a></p>
+<p id="n684" class="stm mis"><a href="#n684">684</a></p>
 <p id="n685" class="pln"><a href="#n685">685</a></p>
 <p id="n686" class="pln"><a href="#n686">686</a></p>
-<p id="n687" class="stm run hide_run"><a href="#n687">687</a></p>
-<p id="n688" class="stm run hide_run"><a href="#n688">688</a></p>
-<p id="n689" class="stm run hide_run"><a href="#n689">689</a></p>
+<p id="n687" class="stm mis"><a href="#n687">687</a></p>
+<p id="n688" class="stm mis"><a href="#n688">688</a></p>
+<p id="n689" class="stm mis"><a href="#n689">689</a></p>
 <p id="n690" class="pln"><a href="#n690">690</a></p>
-<p id="n691" class="stm run hide_run"><a href="#n691">691</a></p>
-<p id="n692" class="stm run hide_run"><a href="#n692">692</a></p>
-<p id="n693" class="stm run hide_run"><a href="#n693">693</a></p>
+<p id="n691" class="stm mis"><a href="#n691">691</a></p>
+<p id="n692" class="stm mis"><a href="#n692">692</a></p>
+<p id="n693" class="stm mis"><a href="#n693">693</a></p>
 <p id="n694" class="pln"><a href="#n694">694</a></p>
-<p id="n695" class="stm run hide_run"><a href="#n695">695</a></p>
-<p id="n696" class="stm run hide_run"><a href="#n696">696</a></p>
-<p id="n697" class="stm run hide_run"><a href="#n697">697</a></p>
+<p id="n695" class="stm mis"><a href="#n695">695</a></p>
+<p id="n696" class="stm mis"><a href="#n696">696</a></p>
+<p id="n697" class="stm mis"><a href="#n697">697</a></p>
 <p id="n698" class="pln"><a href="#n698">698</a></p>
-<p id="n699" class="stm run hide_run"><a href="#n699">699</a></p>
-<p id="n700" class="stm run hide_run"><a href="#n700">700</a></p>
-<p id="n701" class="stm run hide_run"><a href="#n701">701</a></p>
+<p id="n699" class="stm mis"><a href="#n699">699</a></p>
+<p id="n700" class="stm mis"><a href="#n700">700</a></p>
+<p id="n701" class="stm mis"><a href="#n701">701</a></p>
 <p id="n702" class="pln"><a href="#n702">702</a></p>
-<p id="n703" class="stm run hide_run"><a href="#n703">703</a></p>
+<p id="n703" class="stm mis"><a href="#n703">703</a></p>
 <p id="n704" class="pln"><a href="#n704">704</a></p>
 <p id="n705" class="stm run hide_run"><a href="#n705">705</a></p>
 <p id="n706" class="pln"><a href="#n706">706</a></p>
 <p id="n707" class="pln"><a href="#n707">707</a></p>
 <p id="n708" class="pln"><a href="#n708">708</a></p>
-<p id="n709" class="stm run hide_run"><a href="#n709">709</a></p>
-<p id="n710" class="stm run hide_run"><a href="#n710">710</a></p>
-<p id="n711" class="stm run hide_run"><a href="#n711">711</a></p>
-<p id="n712" class="stm run hide_run"><a href="#n712">712</a></p>
-<p id="n713" class="stm run hide_run"><a href="#n713">713</a></p>
-<p id="n714" class="stm run hide_run"><a href="#n714">714</a></p>
-<p id="n715" class="stm run hide_run"><a href="#n715">715</a></p>
-<p id="n716" class="stm run hide_run"><a href="#n716">716</a></p>
-<p id="n717" class="stm run hide_run"><a href="#n717">717</a></p>
-<p id="n718" class="stm run hide_run"><a href="#n718">718</a></p>
-<p id="n719" class="stm run hide_run"><a href="#n719">719</a></p>
-<p id="n720" class="stm run hide_run"><a href="#n720">720</a></p>
-<p id="n721" class="stm run hide_run"><a href="#n721">721</a></p>
-<p id="n722" class="stm run hide_run"><a href="#n722">722</a></p>
-<p id="n723" class="stm run hide_run"><a href="#n723">723</a></p>
-<p id="n724" class="stm run hide_run"><a href="#n724">724</a></p>
+<p id="n709" class="stm mis"><a href="#n709">709</a></p>
+<p id="n710" class="stm mis"><a href="#n710">710</a></p>
+<p id="n711" class="stm mis"><a href="#n711">711</a></p>
+<p id="n712" class="stm mis"><a href="#n712">712</a></p>
+<p id="n713" class="stm mis"><a href="#n713">713</a></p>
+<p id="n714" class="stm mis"><a href="#n714">714</a></p>
+<p id="n715" class="stm mis"><a href="#n715">715</a></p>
+<p id="n716" class="stm mis"><a href="#n716">716</a></p>
+<p id="n717" class="stm mis"><a href="#n717">717</a></p>
+<p id="n718" class="stm mis"><a href="#n718">718</a></p>
+<p id="n719" class="stm mis"><a href="#n719">719</a></p>
+<p id="n720" class="stm mis"><a href="#n720">720</a></p>
+<p id="n721" class="stm mis"><a href="#n721">721</a></p>
+<p id="n722" class="stm mis"><a href="#n722">722</a></p>
+<p id="n723" class="stm mis"><a href="#n723">723</a></p>
+<p id="n724" class="stm mis"><a href="#n724">724</a></p>
 <p id="n725" class="pln"><a href="#n725">725</a></p>
 <p id="n726" class="pln"><a href="#n726">726</a></p>
 <p id="n727" class="pln"><a href="#n727">727</a></p>
@@ -904,10 +904,10 @@
 <p id="t55" class="pln">&nbsp; &nbsp; <span class="str">&quot;&quot;&quot; Any exception raised by Cog.</span><span class="strut">&nbsp;</span></p>
 <p id="t56" class="pln"><span class="str">&nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t57" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">msg</span><span class="op">,</span> <span class="nam">file</span><span class="op">=</span><span class="str">&#39;&#39;</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="num">0</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t58" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">file</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t58" class="stm par run hide_run"><span class="annotate" title="Line 58 was executed, but never jumped to line 61">58&#x202F;&#x219B;&#x202F;61 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">file</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t59" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">Exception</span><span class="op">.</span><span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="str">&quot;%s(%d): %s&quot;</span> <span class="op">%</span> <span class="op">(</span><span class="nam">file</span><span class="op">,</span> <span class="nam">line</span><span class="op">,</span> <span class="nam">msg</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t60" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t61" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">Exception</span><span class="op">.</span><span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">msg</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t61" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">Exception</span><span class="op">.</span><span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">msg</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t62" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t63" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="nam">CogError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t64" class="pln">&nbsp; &nbsp; <span class="str">&quot;&quot;&quot; An error in usage of command-line arguments in cog.</span><span class="strut">&nbsp;</span></p>
@@ -934,16 +934,16 @@
 <p id="t85" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">setOutput</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">stdout</span><span class="op">=</span><span class="nam">None</span><span class="op">,</span> <span class="nam">stderr</span><span class="op">=</span><span class="nam">None</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t86" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&quot;&quot;&quot; Assign new files for standard out and/or standard error.</span><span class="strut">&nbsp;</span></p>
 <p id="t87" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t88" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">stdout</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t88" class="stm par run hide_run"><span class="annotate" title="Line 88 was executed, but never jumped to line 90">88&#x202F;&#x219B;&#x202F;90 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">stdout</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t89" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">stdout</span> <span class="op">=</span> <span class="nam">stdout</span><span class="strut">&nbsp;</span></p>
-<p id="t90" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">stderr</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t91" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">stderr</span> <span class="op">=</span> <span class="nam">stderr</span><span class="strut">&nbsp;</span></p>
+<p id="t90" class="stm par run hide_run"><span class="annotate" title="Line 90 was executed, but never jumped to line 91">90&#x202F;&#x219B;&#x202F;91 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">stderr</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t91" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">stderr</span> <span class="op">=</span> <span class="nam">stderr</span><span class="strut">&nbsp;</span></p>
 <p id="t92" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t93" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">prout</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">s</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="str">&quot;\n&quot;</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t94" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">print</span><span class="op">(</span><span class="nam">s</span><span class="op">,</span> <span class="nam">file</span><span class="op">=</span><span class="nam">self</span><span class="op">.</span><span class="nam">stdout</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="nam">end</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t94" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">print</span><span class="op">(</span><span class="nam">s</span><span class="op">,</span> <span class="nam">file</span><span class="op">=</span><span class="nam">self</span><span class="op">.</span><span class="nam">stdout</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="nam">end</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t95" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t96" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">prerr</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">s</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="str">&quot;\n&quot;</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t97" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">print</span><span class="op">(</span><span class="nam">s</span><span class="op">,</span> <span class="nam">file</span><span class="op">=</span><span class="nam">self</span><span class="op">.</span><span class="nam">stderr</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="nam">end</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t97" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">print</span><span class="op">(</span><span class="nam">s</span><span class="op">,</span> <span class="nam">file</span><span class="op">=</span><span class="nam">self</span><span class="op">.</span><span class="nam">stderr</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="nam">end</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t98" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t99" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t100" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogGenerator</span><span class="op">(</span><span class="nam">Redirectable</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
@@ -1003,7 +1003,7 @@
 <p id="t154" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">outstring</span><span class="op">,</span> <span class="nam">prefOut</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t155" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t156" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">msg</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">s</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t157" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">&quot;Message: &quot;</span><span class="op">+</span><span class="nam">s</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t157" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">&quot;Message: &quot;</span><span class="op">+</span><span class="nam">s</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t158" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t159" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">out</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sOut</span><span class="op">=</span><span class="str">&#39;&#39;</span><span class="op">,</span> <span class="nam">dedent</span><span class="op">=</span><span class="nam">False</span><span class="op">,</span> <span class="nam">trimblanklines</span><span class="op">=</span><span class="nam">False</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t160" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&quot;&quot;&quot; The cog.out function.</span><span class="strut">&nbsp;</span></p>
@@ -1031,7 +1031,7 @@
 <p id="t182" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; this function.&nbsp; It will display the error without a scary Python</span><span class="strut">&nbsp;</span></p>
 <p id="t183" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; traceback.</span><span class="strut">&nbsp;</span></p>
 <p id="t184" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t185" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogGeneratedError</span><span class="op">(</span><span class="nam">msg</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t185" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogGeneratedError</span><span class="op">(</span><span class="nam">msg</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t186" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t187" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t188" class="stm run hide_run"><span class="key">class</span> <span class="nam">NumberedFileReader</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
@@ -1079,23 +1079,23 @@
 <p id="t230" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">__eq__</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">other</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t231" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&quot;&quot;&quot; Comparison operator for tests to use.</span><span class="strut">&nbsp;</span></p>
 <p id="t232" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t233" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="nam">self</span><span class="op">.</span><span class="nam">__dict__</span> <span class="op">==</span> <span class="nam">other</span><span class="op">.</span><span class="nam">__dict__</span><span class="strut">&nbsp;</span></p>
+<p id="t233" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="nam">self</span><span class="op">.</span><span class="nam">__dict__</span> <span class="op">==</span> <span class="nam">other</span><span class="op">.</span><span class="nam">__dict__</span><span class="strut">&nbsp;</span></p>
 <p id="t234" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t235" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">clone</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t236" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&quot;&quot;&quot; Make a clone of these options, for further refinement.</span><span class="strut">&nbsp;</span></p>
 <p id="t237" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t238" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="nam">copy</span><span class="op">.</span><span class="nam">deepcopy</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t238" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="nam">copy</span><span class="op">.</span><span class="nam">deepcopy</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t239" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t240" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">addToIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">dirs</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t241" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&quot;&quot;&quot; Add directories to the include path.</span><span class="strut">&nbsp;</span></p>
 <p id="t242" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t243" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">dirs</span> <span class="op">=</span> <span class="nam">dirs</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">pathsep</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t244" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">includePath</span><span class="op">.</span><span class="nam">extend</span><span class="op">(</span><span class="nam">dirs</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t243" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">dirs</span> <span class="op">=</span> <span class="nam">dirs</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">pathsep</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t244" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">includePath</span><span class="op">.</span><span class="nam">extend</span><span class="op">(</span><span class="nam">dirs</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t245" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t246" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">parseArgs</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">argv</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t247" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Parse the command line arguments.</span><span class="strut">&nbsp;</span></p>
-<p id="t248" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t249" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">opts</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">args</span> <span class="op">=</span> <span class="nam">getopt</span><span class="op">.</span><span class="nam">getopt</span><span class="op">(</span><span class="strut">&nbsp;</span></p>
+<p id="t248" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t249" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">opts</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">args</span> <span class="op">=</span> <span class="nam">getopt</span><span class="op">.</span><span class="nam">getopt</span><span class="op">(</span><span class="strut">&nbsp;</span></p>
 <p id="t250" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">argv</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t251" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;cdD:eI:n:o:rs:Uvw:xz&#39;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t252" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">[</span><span class="strut">&nbsp;</span></p>
@@ -1103,67 +1103,67 @@
 <p id="t254" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;verbosity=&#39;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t255" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">]</span><span class="strut">&nbsp;</span></p>
 <p id="t256" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t257" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">except</span> <span class="nam">getopt</span><span class="op">.</span><span class="nam">error</span> <span class="key">as</span> <span class="nam">msg</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t258" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="nam">msg</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t257" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">except</span> <span class="nam">getopt</span><span class="op">.</span><span class="nam">error</span> <span class="key">as</span> <span class="nam">msg</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t258" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="nam">msg</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t259" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t260" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Handle the command line arguments.</span><span class="strut">&nbsp;</span></p>
-<p id="t261" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">for</span> <span class="nam">o</span><span class="op">,</span> <span class="nam">a</span> <span class="key">in</span> <span class="nam">opts</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t262" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-c&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t263" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">bHashOutput</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
-<p id="t264" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-d&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t265" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">bDeleteCode</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
-<p id="t266" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-D&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t267" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">a</span><span class="op">.</span><span class="nam">count</span><span class="op">(</span><span class="str">&#39;=&#39;</span><span class="op">)</span> <span class="op">&lt;</span> <span class="num">1</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t268" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="str">&quot;-D takes a name=value argument&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t269" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">name</span><span class="op">,</span> <span class="nam">value</span> <span class="op">=</span> <span class="nam">a</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="str">&#39;=&#39;</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t270" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">defines</span><span class="op">[</span><span class="nam">name</span><span class="op">]</span> <span class="op">=</span> <span class="nam">value</span><span class="strut">&nbsp;</span></p>
-<p id="t271" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-e&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t272" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">bWarnEmpty</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
-<p id="t273" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-I&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t274" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">addToIncludePath</span><span class="op">(</span><span class="nam">a</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t275" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-n&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t276" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">sEncoding</span> <span class="op">=</span> <span class="nam">a</span><span class="strut">&nbsp;</span></p>
-<p id="t277" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-o&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t278" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">sOutputName</span> <span class="op">=</span> <span class="nam">a</span><span class="strut">&nbsp;</span></p>
-<p id="t279" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-r&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t280" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">bReplace</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
-<p id="t281" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-s&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t282" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">sSuffix</span> <span class="op">=</span> <span class="nam">a</span><span class="strut">&nbsp;</span></p>
-<p id="t283" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-U&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t284" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">bNewlines</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
-<p id="t285" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-v&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t286" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">bShowVersion</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
-<p id="t287" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-w&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t288" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">sMakeWritableCmd</span> <span class="op">=</span> <span class="nam">a</span><span class="strut">&nbsp;</span></p>
-<p id="t289" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-x&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t290" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">bNoGenerate</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
-<p id="t291" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-z&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t292" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">bEofCanBeEnd</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
-<p id="t293" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;--markers&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t294" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">_parse_markers</span><span class="op">(</span><span class="nam">a</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t295" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;--verbosity&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t296" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">verbosity</span> <span class="op">=</span> <span class="nam">int</span><span class="op">(</span><span class="nam">a</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t261" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">for</span> <span class="nam">o</span><span class="op">,</span> <span class="nam">a</span> <span class="key">in</span> <span class="nam">opts</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t262" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-c&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t263" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">bHashOutput</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
+<p id="t264" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-d&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t265" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">bDeleteCode</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
+<p id="t266" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-D&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t267" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">a</span><span class="op">.</span><span class="nam">count</span><span class="op">(</span><span class="str">&#39;=&#39;</span><span class="op">)</span> <span class="op">&lt;</span> <span class="num">1</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t268" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="str">&quot;-D takes a name=value argument&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t269" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">name</span><span class="op">,</span> <span class="nam">value</span> <span class="op">=</span> <span class="nam">a</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="str">&#39;=&#39;</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t270" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">defines</span><span class="op">[</span><span class="nam">name</span><span class="op">]</span> <span class="op">=</span> <span class="nam">value</span><span class="strut">&nbsp;</span></p>
+<p id="t271" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-e&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t272" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">bWarnEmpty</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
+<p id="t273" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-I&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t274" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">addToIncludePath</span><span class="op">(</span><span class="nam">a</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t275" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-n&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t276" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">sEncoding</span> <span class="op">=</span> <span class="nam">a</span><span class="strut">&nbsp;</span></p>
+<p id="t277" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-o&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t278" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">sOutputName</span> <span class="op">=</span> <span class="nam">a</span><span class="strut">&nbsp;</span></p>
+<p id="t279" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-r&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t280" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">bReplace</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
+<p id="t281" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-s&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t282" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">sSuffix</span> <span class="op">=</span> <span class="nam">a</span><span class="strut">&nbsp;</span></p>
+<p id="t283" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-U&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t284" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">bNewlines</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
+<p id="t285" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-v&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t286" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">bShowVersion</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
+<p id="t287" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-w&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t288" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">sMakeWritableCmd</span> <span class="op">=</span> <span class="nam">a</span><span class="strut">&nbsp;</span></p>
+<p id="t289" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-x&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t290" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">bNoGenerate</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
+<p id="t291" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;-z&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t292" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">bEofCanBeEnd</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
+<p id="t293" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;--markers&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t294" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">_parse_markers</span><span class="op">(</span><span class="nam">a</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t295" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">&#39;--verbosity&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t296" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">verbosity</span> <span class="op">=</span> <span class="nam">int</span><span class="op">(</span><span class="nam">a</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t297" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t298" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Since getopt.getopt is given a list of possible flags,</span><span class="strut">&nbsp;</span></p>
 <p id="t299" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># this is an internal error.</span><span class="strut">&nbsp;</span></p>
 <p id="t300" class="exc">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogInternalError</span><span class="op">(</span><span class="str">&quot;Don&#39;t understand argument %s&quot;</span> <span class="op">%</span> <span class="nam">o</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t301" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t302" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">_parse_markers</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">val</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t303" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t304" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">sEndOutput</span> <span class="op">=</span> <span class="nam">val</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="str">&#39; &#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t305" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">except</span> <span class="nam">ValueError</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t306" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="strut">&nbsp;</span></p>
+<p id="t303" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t304" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">sEndOutput</span> <span class="op">=</span> <span class="nam">val</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="str">&#39; &#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t305" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">except</span> <span class="nam">ValueError</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t306" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="strut">&nbsp;</span></p>
 <p id="t307" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;--markers requires 3 values separated by spaces, could not parse %r&#39;</span> <span class="op">%</span> <span class="nam">val</span><span class="strut">&nbsp;</span></p>
 <p id="t308" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t309" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t310" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">validate</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t311" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&quot;&quot;&quot; Does nothing if everything is OK, raises CogError&#39;s if it&#39;s not.</span><span class="strut">&nbsp;</span></p>
 <p id="t312" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t313" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">bReplace</span> <span class="key">and</span> <span class="nam">self</span><span class="op">.</span><span class="nam">bDeleteCode</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t314" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="str">&quot;Can&#39;t use -d with -r (or you would delete all your source!)&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t313" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">bReplace</span> <span class="key">and</span> <span class="nam">self</span><span class="op">.</span><span class="nam">bDeleteCode</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t314" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="str">&quot;Can&#39;t use -d with -r (or you would delete all your source!)&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t315" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t316" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">bReplace</span> <span class="key">and</span> <span class="nam">self</span><span class="op">.</span><span class="nam">sOutputName</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t317" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="str">&quot;Can&#39;t use -o with -r (they are opposites)&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t316" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">bReplace</span> <span class="key">and</span> <span class="nam">self</span><span class="op">.</span><span class="nam">sOutputName</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t317" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="str">&quot;Can&#39;t use -o with -r (they are opposites)&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t318" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t319" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t320" class="stm run hide_run"><span class="key">class</span> <span class="nam">Cog</span><span class="op">(</span><span class="nam">Redirectable</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
@@ -1181,7 +1181,7 @@
 <p id="t332" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">sEndFormat</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span> <span class="op">+</span> <span class="str">&#39; (checksum: %s)&#39;</span><span class="strut">&nbsp;</span></p>
 <p id="t333" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t334" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">showWarning</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">msg</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t335" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">&quot;Warning: &quot;</span><span class="op">+</span><span class="nam">msg</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t335" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">&quot;Warning: &quot;</span><span class="op">+</span><span class="nam">msg</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t336" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t337" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">isBeginSpecLine</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">s</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t338" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sBeginSpec</span> <span class="key">in</span> <span class="nam">s</span><span class="strut">&nbsp;</span></p>
@@ -1203,26 +1203,26 @@
 <p id="t354" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">openOutputFile</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t355" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&quot;&quot;&quot; Open an output file, taking all the details into account.</span><span class="strut">&nbsp;</span></p>
 <p id="t356" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t357" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">opts</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t358" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">mode</span> <span class="op">=</span> <span class="str">&quot;w&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t359" class="stm par run hide_run"><span class="annotate" title="Line 359 was executed, but never jumped to line 360">359&#x202F;&#x219B;&#x202F;360 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">PY3</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t357" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">opts</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t358" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">mode</span> <span class="op">=</span> <span class="str">&quot;w&quot;</span><span class="strut">&nbsp;</span></p>
+<p id="t359" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">PY3</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t360" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">opts</span><span class="op">[</span><span class="str">&#39;encoding&#39;</span><span class="op">]</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEncoding</span><span class="strut">&nbsp;</span></p>
-<p id="t361" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bNewlines</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t362" class="stm par run hide_run"><span class="annotate" title="Line 362 was executed, but never jumped to line 363">362&#x202F;&#x219B;&#x202F;363 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">PY3</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t361" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bNewlines</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t362" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">PY3</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t363" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">opts</span><span class="op">[</span><span class="str">&#39;newline&#39;</span><span class="op">]</span> <span class="op">=</span> <span class="str">&quot;\n&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t364" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t365" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">mode</span> <span class="op">=</span> <span class="str">&quot;wb&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t366" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="nam">open</span><span class="op">(</span><span class="nam">fname</span><span class="op">,</span> <span class="nam">mode</span><span class="op">,</span> <span class="op">**</span><span class="nam">opts</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t365" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">mode</span> <span class="op">=</span> <span class="str">&quot;wb&quot;</span><span class="strut">&nbsp;</span></p>
+<p id="t366" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="nam">open</span><span class="op">(</span><span class="nam">fname</span><span class="op">,</span> <span class="nam">mode</span><span class="op">,</span> <span class="op">**</span><span class="nam">opts</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t367" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t368" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">openInputFile</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t369" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&quot;&quot;&quot; Open an input file. &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t370" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">fname</span> <span class="op">==</span> <span class="str">&quot;-&quot;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t371" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">stdin</span><span class="strut">&nbsp;</span></p>
+<p id="t370" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">fname</span> <span class="op">==</span> <span class="str">&quot;-&quot;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t371" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">stdin</span><span class="strut">&nbsp;</span></p>
 <p id="t372" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t373" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">opts</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t374" class="stm par run hide_run"><span class="annotate" title="Line 374 was executed, but never jumped to line 375">374&#x202F;&#x219B;&#x202F;375 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">PY3</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t373" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">opts</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t374" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">PY3</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t375" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">opts</span><span class="op">[</span><span class="str">&#39;encoding&#39;</span><span class="op">]</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEncoding</span><span class="strut">&nbsp;</span></p>
-<p id="t376" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="nam">open</span><span class="op">(</span><span class="nam">fname</span><span class="op">,</span> <span class="str">&quot;r&quot;</span><span class="op">,</span> <span class="op">**</span><span class="nam">opts</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t376" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="nam">open</span><span class="op">(</span><span class="nam">fname</span><span class="op">,</span> <span class="str">&quot;r&quot;</span><span class="op">,</span> <span class="op">**</span><span class="nam">opts</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t377" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t378" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">processFile</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">fIn</span><span class="op">,</span> <span class="nam">fOut</span><span class="op">,</span> <span class="nam">fname</span><span class="op">=</span><span class="nam">None</span><span class="op">,</span> <span class="nam">globals</span><span class="op">=</span><span class="nam">None</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t379" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&quot;&quot;&quot; Process an input file object to an output file object.</span><span class="strut">&nbsp;</span></p>
@@ -1233,14 +1233,14 @@
 <p id="t384" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sFileOut</span> <span class="op">=</span> <span class="nam">fname</span> <span class="key">or</span> <span class="str">&#39;&#39;</span><span class="strut">&nbsp;</span></p>
 <p id="t385" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">fInToClose</span> <span class="op">=</span> <span class="nam">fOutToClose</span> <span class="op">=</span> <span class="nam">None</span><span class="strut">&nbsp;</span></p>
 <p id="t386" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Convert filenames to files.</span><span class="strut">&nbsp;</span></p>
-<p id="t387" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">fIn</span><span class="op">,</span> <span class="nam">string_types</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t387" class="stm par run hide_run"><span class="annotate" title="Line 387 was executed, but never jumped to line 389">387&#x202F;&#x219B;&#x202F;389 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">fIn</span><span class="op">,</span> <span class="nam">string_types</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t388" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Open the input file.</span><span class="strut">&nbsp;</span></p>
-<p id="t389" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sFileIn</span> <span class="op">=</span> <span class="nam">fIn</span><span class="strut">&nbsp;</span></p>
-<p id="t390" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">fIn</span> <span class="op">=</span> <span class="nam">fInToClose</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">openInputFile</span><span class="op">(</span><span class="nam">fIn</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t391" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">fOut</span><span class="op">,</span> <span class="nam">string_types</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t389" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sFileIn</span> <span class="op">=</span> <span class="nam">fIn</span><span class="strut">&nbsp;</span></p>
+<p id="t390" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">fIn</span> <span class="op">=</span> <span class="nam">fInToClose</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">openInputFile</span><span class="op">(</span><span class="nam">fIn</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t391" class="stm par run hide_run"><span class="annotate" title="Line 391 was executed, but never jumped to line 393">391&#x202F;&#x219B;&#x202F;393 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">fOut</span><span class="op">,</span> <span class="nam">string_types</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t392" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Open the output file.</span><span class="strut">&nbsp;</span></p>
-<p id="t393" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sFileOut</span> <span class="op">=</span> <span class="nam">fOut</span><span class="strut">&nbsp;</span></p>
-<p id="t394" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">fOut</span> <span class="op">=</span> <span class="nam">fOutToClose</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">openOutputFile</span><span class="op">(</span><span class="nam">fOut</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t393" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sFileOut</span> <span class="op">=</span> <span class="nam">fOut</span><span class="strut">&nbsp;</span></p>
+<p id="t394" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">fOut</span> <span class="op">=</span> <span class="nam">fOutToClose</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">openOutputFile</span><span class="op">(</span><span class="nam">fOut</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t395" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t396" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t397" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">fIn</span> <span class="op">=</span> <span class="nam">NumberedFileReader</span><span class="op">(</span><span class="nam">fIn</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
@@ -1251,7 +1251,7 @@
 <p id="t402" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">outFile</span> <span class="op">=</span> <span class="nam">sFileOut</span><span class="strut">&nbsp;</span></p>
 <p id="t403" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t404" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># The globals dict we&#39;ll use for this file.</span><span class="strut">&nbsp;</span></p>
-<p id="t405" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">globals</span> <span class="key">is</span> <span class="nam">None</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t405" class="stm par run hide_run"><span class="annotate" title="Line 405 was executed, but never jumped to line 409">405&#x202F;&#x219B;&#x202F;409 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">globals</span> <span class="key">is</span> <span class="nam">None</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t406" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">globals</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t407" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t408" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># If there are any global defines, put them in the globals.</span><span class="strut">&nbsp;</span></p>
@@ -1262,17 +1262,17 @@
 <p id="t413" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">while</span> <span class="nam">l</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t414" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Find the next spec begin</span><span class="strut">&nbsp;</span></p>
 <p id="t415" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">while</span> <span class="nam">l</span> <span class="key">and</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isBeginSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t416" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t417" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">&quot;Unexpected &#39;%s&#39;&quot;</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t416" class="stm par run hide_run"><span class="annotate" title="Line 416 was executed, but never jumped to line 417">416&#x202F;&#x219B;&#x202F;417 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t417" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">&quot;Unexpected &#39;%s&#39;&quot;</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t418" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t419" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndOutputLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t420" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">&quot;Unexpected &#39;%s&#39;&quot;</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t419" class="stm par run hide_run"><span class="annotate" title="Line 419 was executed, but never jumped to line 420">419&#x202F;&#x219B;&#x202F;420 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndOutputLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t420" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">&quot;Unexpected &#39;%s&#39;&quot;</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t421" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t422" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">fOut</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t423" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">l</span> <span class="op">=</span> <span class="nam">fIn</span><span class="op">.</span><span class="nam">readline</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t424" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">l</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t425" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">break</span><span class="strut">&nbsp;</span></p>
-<p id="t426" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bDeleteCode</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t426" class="stm par run hide_run"><span class="annotate" title="Line 426 was executed, but never jumped to line 430">426&#x202F;&#x219B;&#x202F;430 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bDeleteCode</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t427" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">fOut</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t428" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t429" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># l is the begin spec</span><span class="strut">&nbsp;</span></p>
@@ -1299,22 +1299,22 @@
 <p id="t450" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t451" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Get all the lines in the spec</span><span class="strut">&nbsp;</span></p>
 <p id="t452" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">while</span> <span class="nam">l</span> <span class="key">and</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t453" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isBeginSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t454" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">&quot;Unexpected &#39;%s&#39;&quot;</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t453" class="stm par run hide_run"><span class="annotate" title="Line 453 was executed, but never jumped to line 454">453&#x202F;&#x219B;&#x202F;454 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isBeginSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t454" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">&quot;Unexpected &#39;%s&#39;&quot;</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t455" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t456" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndOutputLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t457" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">&quot;Unexpected &#39;%s&#39;&quot;</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t456" class="stm par run hide_run"><span class="annotate" title="Line 456 was executed, but never jumped to line 457">456&#x202F;&#x219B;&#x202F;457 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndOutputLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t457" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">&quot;Unexpected &#39;%s&#39;&quot;</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t458" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t459" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bDeleteCode</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t459" class="stm par run hide_run"><span class="annotate" title="Line 459 was executed, but never jumped to line 461">459&#x202F;&#x219B;&#x202F;461 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bDeleteCode</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t460" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">fOut</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t461" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">gen</span><span class="op">.</span><span class="nam">parseLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t462" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">l</span> <span class="op">=</span> <span class="nam">fIn</span><span class="op">.</span><span class="nam">readline</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t463" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">l</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t464" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="strut">&nbsp;</span></p>
+<p id="t463" class="stm par run hide_run"><span class="annotate" title="Line 463 was executed, but never jumped to line 464">463&#x202F;&#x219B;&#x202F;464 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">l</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t464" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="strut">&nbsp;</span></p>
 <p id="t465" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&quot;Cog block begun but never ended.&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t466" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">firstLineNum</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t467" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t468" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bDeleteCode</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t468" class="stm par run hide_run"><span class="annotate" title="Line 468 was executed, but never jumped to line 470">468&#x202F;&#x219B;&#x202F;470 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bDeleteCode</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t469" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">fOut</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t470" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">gen</span><span class="op">.</span><span class="nam">parseMarker</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t471" class="pln"><span class="strut">&nbsp;</span></p>
@@ -1325,20 +1325,20 @@
 <p id="t476" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">previous</span> <span class="op">=</span> <span class="str">&quot;&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t477" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">hasher</span> <span class="op">=</span> <span class="nam">hashlib</span><span class="op">.</span><span class="nam">md5</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t478" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">while</span> <span class="nam">l</span> <span class="key">and</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndOutputLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t479" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isBeginSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t480" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">&quot;Unexpected &#39;%s&#39;&quot;</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t479" class="stm par run hide_run"><span class="annotate" title="Line 479 was executed, but never jumped to line 480">479&#x202F;&#x219B;&#x202F;480 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isBeginSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t480" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">&quot;Unexpected &#39;%s&#39;&quot;</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t481" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t482" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t483" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">&quot;Unexpected &#39;%s&#39;&quot;</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t482" class="stm par run hide_run"><span class="annotate" title="Line 482 was executed, but never jumped to line 483">482&#x202F;&#x219B;&#x202F;483 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t483" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">&quot;Unexpected &#39;%s&#39;&quot;</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t484" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t485" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">previous</span> <span class="op">+=</span> <span class="nam">l</span><span class="strut">&nbsp;</span></p>
 <p id="t486" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">hasher</span><span class="op">.</span><span class="nam">update</span><span class="op">(</span><span class="nam">to_bytes</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t487" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">l</span> <span class="op">=</span> <span class="nam">fIn</span><span class="op">.</span><span class="nam">readline</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t488" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">curHash</span> <span class="op">=</span> <span class="nam">hasher</span><span class="op">.</span><span class="nam">hexdigest</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t489" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t490" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">l</span> <span class="key">and</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bEofCanBeEnd</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t490" class="stm par run hide_run"><span class="annotate" title="Line 490 was executed, but never jumped to line 492">490&#x202F;&#x219B;&#x202F;492 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">l</span> <span class="key">and</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bEofCanBeEnd</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t491" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># We reached end of file before we found the end output line.</span><span class="strut">&nbsp;</span></p>
-<p id="t492" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">&quot;Missing &#39;%s&#39; before end of file.&quot;</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t492" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">&quot;Missing &#39;%s&#39; before end of file.&quot;</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t493" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t494" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t495" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Make the previous output available to the current code</span><span class="strut">&nbsp;</span></p>
@@ -1347,7 +1347,7 @@
 <p id="t498" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Write the output of the spec to be the new output if we&#39;re</span><span class="strut">&nbsp;</span></p>
 <p id="t499" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># supposed to generate code.</span><span class="strut">&nbsp;</span></p>
 <p id="t500" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">hasher</span> <span class="op">=</span> <span class="nam">hashlib</span><span class="op">.</span><span class="nam">md5</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t501" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bNoGenerate</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t501" class="stm par run hide_run"><span class="annotate" title="Line 501 was executed, but never jumped to line 507">501&#x202F;&#x219B;&#x202F;507 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bNoGenerate</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t502" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sFile</span> <span class="op">=</span> <span class="str">&quot;%s+%d&quot;</span> <span class="op">%</span> <span class="op">(</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">firstLineNum</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t503" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sGen</span> <span class="op">=</span> <span class="nam">gen</span><span class="op">.</span><span class="nam">evaluate</span><span class="op">(</span><span class="nam">cog</span><span class="op">=</span><span class="nam">self</span><span class="op">,</span> <span class="nam">globals</span><span class="op">=</span><span class="nam">globals</span><span class="op">,</span> <span class="nam">fname</span><span class="op">=</span><span class="nam">sFile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t504" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sGen</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">suffixLines</span><span class="op">(</span><span class="nam">sGen</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
@@ -1359,35 +1359,35 @@
 <p id="t510" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t511" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Write the ending output line</span><span class="strut">&nbsp;</span></p>
 <p id="t512" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">hashMatch</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">reEndOutput</span><span class="op">.</span><span class="nam">search</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t513" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bHashOutput</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t514" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">hashMatch</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t515" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">oldHash</span> <span class="op">=</span> <span class="nam">hashMatch</span><span class="op">.</span><span class="nam">groupdict</span><span class="op">(</span><span class="op">)</span><span class="op">[</span><span class="str">&#39;hash&#39;</span><span class="op">]</span><span class="strut">&nbsp;</span></p>
-<p id="t516" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">oldHash</span> <span class="op">!=</span> <span class="nam">curHash</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t517" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">&quot;Output has been edited! Delete old checksum to unprotect.&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t513" class="stm par run hide_run"><span class="annotate" title="Line 513 was executed, but never jumped to line 514">513&#x202F;&#x219B;&#x202F;514 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bHashOutput</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t514" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">hashMatch</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t515" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">oldHash</span> <span class="op">=</span> <span class="nam">hashMatch</span><span class="op">.</span><span class="nam">groupdict</span><span class="op">(</span><span class="op">)</span><span class="op">[</span><span class="str">&#39;hash&#39;</span><span class="op">]</span><span class="strut">&nbsp;</span></p>
+<p id="t516" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">oldHash</span> <span class="op">!=</span> <span class="nam">curHash</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t517" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">&quot;Output has been edited! Delete old checksum to unprotect.&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t518" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t519" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Create a new end line with the correct hash.</span><span class="strut">&nbsp;</span></p>
-<p id="t520" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">endpieces</span> <span class="op">=</span> <span class="nam">l</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="nam">hashMatch</span><span class="op">.</span><span class="nam">group</span><span class="op">(</span><span class="num">0</span><span class="op">)</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t520" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">endpieces</span> <span class="op">=</span> <span class="nam">l</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="nam">hashMatch</span><span class="op">.</span><span class="nam">group</span><span class="op">(</span><span class="num">0</span><span class="op">)</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t521" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t522" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># There was no old hash, but we want a new hash.</span><span class="strut">&nbsp;</span></p>
-<p id="t523" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">endpieces</span> <span class="op">=</span> <span class="nam">l</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t524" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">l</span> <span class="op">=</span> <span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">sEndFormat</span> <span class="op">%</span> <span class="nam">newHash</span><span class="op">)</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">endpieces</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t523" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">endpieces</span> <span class="op">=</span> <span class="nam">l</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t524" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">l</span> <span class="op">=</span> <span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">sEndFormat</span> <span class="op">%</span> <span class="nam">newHash</span><span class="op">)</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">endpieces</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t525" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t526" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># We don&#39;t want hashes output, so if there was one, get rid of</span><span class="strut">&nbsp;</span></p>
 <p id="t527" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># it.</span><span class="strut">&nbsp;</span></p>
-<p id="t528" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">hashMatch</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t529" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">l</span> <span class="op">=</span> <span class="nam">l</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="nam">hashMatch</span><span class="op">.</span><span class="nam">groupdict</span><span class="op">(</span><span class="op">)</span><span class="op">[</span><span class="str">&#39;hashsect&#39;</span><span class="op">]</span><span class="op">,</span> <span class="str">&#39;&#39;</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t528" class="stm par run hide_run"><span class="annotate" title="Line 528 was executed, but never jumped to line 529">528&#x202F;&#x219B;&#x202F;529 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">hashMatch</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t529" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">l</span> <span class="op">=</span> <span class="nam">l</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="nam">hashMatch</span><span class="op">.</span><span class="nam">groupdict</span><span class="op">(</span><span class="op">)</span><span class="op">[</span><span class="str">&#39;hashsect&#39;</span><span class="op">]</span><span class="op">,</span> <span class="str">&#39;&#39;</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t530" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t531" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bDeleteCode</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t531" class="stm par run hide_run"><span class="annotate" title="Line 531 was executed, but never jumped to line 533">531&#x202F;&#x219B;&#x202F;533 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bDeleteCode</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t532" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">fOut</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t533" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">l</span> <span class="op">=</span> <span class="nam">fIn</span><span class="op">.</span><span class="nam">readline</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t534" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t535" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">bSawCog</span> <span class="key">and</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bWarnEmpty</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t536" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">showWarning</span><span class="op">(</span><span class="str">&quot;no cog code found in %s&quot;</span> <span class="op">%</span> <span class="nam">sFileIn</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t535" class="stm par run hide_run"><span class="annotate" title="Line 535 was executed, but never jumped to line 536">535&#x202F;&#x219B;&#x202F;536 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">bSawCog</span> <span class="key">and</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bWarnEmpty</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t536" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">showWarning</span><span class="op">(</span><span class="str">&quot;no cog code found in %s&quot;</span> <span class="op">%</span> <span class="nam">sFileIn</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t537" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">finally</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t538" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">fInToClose</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t539" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">fInToClose</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t540" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">fOutToClose</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t541" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">fOutToClose</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t538" class="stm par run hide_run"><span class="annotate" title="Line 538 was executed, but never jumped to line 539">538&#x202F;&#x219B;&#x202F;539 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">fInToClose</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t539" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">fInToClose</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t540" class="stm par run hide_run"><span class="annotate" title="Line 540 was executed, but never jumped to line 541">540&#x202F;&#x219B;&#x202F;541 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">fOutToClose</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t541" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">fOutToClose</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t542" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t543" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t544" class="pln">&nbsp; &nbsp; <span class="com"># A regex for non-empty lines, used by suffixLines.</span><span class="strut">&nbsp;</span></p>
@@ -1397,10 +1397,10 @@
 <p id="t548" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&quot;&quot;&quot; Add suffixes to the lines in text, if our options desire it.</span><span class="strut">&nbsp;</span></p>
 <p id="t549" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; text is many lines, as a single string.</span><span class="strut">&nbsp;</span></p>
 <p id="t550" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t551" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sSuffix</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t551" class="stm par run hide_run"><span class="annotate" title="Line 551 was executed, but never jumped to line 553">551&#x202F;&#x219B;&#x202F;553 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sSuffix</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t552" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Find all non-blank lines, and add the suffix to the end.</span><span class="strut">&nbsp;</span></p>
-<p id="t553" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">repl</span> <span class="op">=</span> <span class="str">r&quot;\g&lt;0&gt;&quot;</span> <span class="op">+</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sSuffix</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="str">&#39;\\&#39;</span><span class="op">,</span> <span class="str">&#39;\\\\&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t554" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">text</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">reNonEmptyLines</span><span class="op">.</span><span class="nam">sub</span><span class="op">(</span><span class="nam">repl</span><span class="op">,</span> <span class="nam">text</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t553" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">repl</span> <span class="op">=</span> <span class="str">r&quot;\g&lt;0&gt;&quot;</span> <span class="op">+</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sSuffix</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="str">&#39;\\&#39;</span><span class="op">,</span> <span class="str">&#39;\\\\&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t554" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">text</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">reNonEmptyLines</span><span class="op">.</span><span class="nam">sub</span><span class="op">(</span><span class="nam">repl</span><span class="op">,</span> <span class="nam">text</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t555" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="nam">text</span><span class="strut">&nbsp;</span></p>
 <p id="t556" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t557" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">processString</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sInput</span><span class="op">,</span> <span class="nam">fname</span><span class="op">=</span><span class="nam">None</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
@@ -1415,162 +1415,162 @@
 <p id="t566" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">replaceFile</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sOldPath</span><span class="op">,</span> <span class="nam">sNewText</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t567" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&quot;&quot;&quot; Replace file sOldPath with the contents sNewText</span><span class="strut">&nbsp;</span></p>
 <p id="t568" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t569" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">sOldPath</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t569" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">sOldPath</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t570" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Need to ensure we can write.</span><span class="strut">&nbsp;</span></p>
-<p id="t571" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sMakeWritableCmd</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t571" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sMakeWritableCmd</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t572" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Use an external command to make the file writable.</span><span class="strut">&nbsp;</span></p>
-<p id="t573" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">cmd</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sMakeWritableCmd</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="str">&#39;%s&#39;</span><span class="op">,</span> <span class="nam">sOldPath</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t574" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">stdout</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">popen</span><span class="op">(</span><span class="nam">cmd</span><span class="op">)</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t575" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">sOldPath</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t576" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">&quot;Couldn&#39;t make %s writable&quot;</span> <span class="op">%</span> <span class="nam">sOldPath</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t573" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">cmd</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sMakeWritableCmd</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="str">&#39;%s&#39;</span><span class="op">,</span> <span class="nam">sOldPath</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t574" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">stdout</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">popen</span><span class="op">(</span><span class="nam">cmd</span><span class="op">)</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t575" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">sOldPath</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t576" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">&quot;Couldn&#39;t make %s writable&quot;</span> <span class="op">%</span> <span class="nam">sOldPath</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t577" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t578" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Can&#39;t write!</span><span class="strut">&nbsp;</span></p>
-<p id="t579" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">&quot;Can&#39;t overwrite %s&quot;</span> <span class="op">%</span> <span class="nam">sOldPath</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t580" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">f</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">openOutputFile</span><span class="op">(</span><span class="nam">sOldPath</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t581" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">f</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">sNewText</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t582" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">f</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t579" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">&quot;Can&#39;t overwrite %s&quot;</span> <span class="op">%</span> <span class="nam">sOldPath</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t580" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">f</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">openOutputFile</span><span class="op">(</span><span class="nam">sOldPath</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t581" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">f</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">sNewText</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t582" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">f</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t583" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t584" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">saveIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t585" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">savedInclude</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">includePath</span><span class="op">[</span><span class="op">:</span><span class="op">]</span><span class="strut">&nbsp;</span></p>
-<p id="t586" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">savedSysPath</span> <span class="op">=</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">[</span><span class="op">:</span><span class="op">]</span><span class="strut">&nbsp;</span></p>
+<p id="t585" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">savedInclude</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">includePath</span><span class="op">[</span><span class="op">:</span><span class="op">]</span><span class="strut">&nbsp;</span></p>
+<p id="t586" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">savedSysPath</span> <span class="op">=</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">[</span><span class="op">:</span><span class="op">]</span><span class="strut">&nbsp;</span></p>
 <p id="t587" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t588" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">restoreIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t589" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">includePath</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">savedInclude</span><span class="strut">&nbsp;</span></p>
-<p id="t590" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">path</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">includePath</span><span class="strut">&nbsp;</span></p>
-<p id="t591" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">savedSysPath</span><span class="strut">&nbsp;</span></p>
+<p id="t589" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">includePath</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">savedInclude</span><span class="strut">&nbsp;</span></p>
+<p id="t590" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">path</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">includePath</span><span class="strut">&nbsp;</span></p>
+<p id="t591" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">savedSysPath</span><span class="strut">&nbsp;</span></p>
 <p id="t592" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t593" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">addToIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">includePath</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t594" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">extend</span><span class="op">(</span><span class="nam">includePath</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t595" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">extend</span><span class="op">(</span><span class="nam">includePath</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t594" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">extend</span><span class="op">(</span><span class="nam">includePath</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t595" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">extend</span><span class="op">(</span><span class="nam">includePath</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t596" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t597" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">processOneFile</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sFile</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t598" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&quot;&quot;&quot; Process one filename through cog.</span><span class="strut">&nbsp;</span></p>
 <p id="t599" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t600" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t601" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">saveIncludePath</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t602" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">bNeedNewline</span> <span class="op">=</span> <span class="nam">False</span><span class="strut">&nbsp;</span></p>
+<p id="t601" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">saveIncludePath</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t602" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">bNeedNewline</span> <span class="op">=</span> <span class="nam">False</span><span class="strut">&nbsp;</span></p>
 <p id="t603" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t604" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t605" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">addToIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">includePath</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t604" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t605" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">addToIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">includePath</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t606" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Since we know where the input file came from,</span><span class="strut">&nbsp;</span></p>
 <p id="t607" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># push its directory onto the include path.</span><span class="strut">&nbsp;</span></p>
-<p id="t608" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">addToIncludePath</span><span class="op">(</span><span class="op">[</span><span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">dirname</span><span class="op">(</span><span class="nam">sFile</span><span class="op">)</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t608" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">addToIncludePath</span><span class="op">(</span><span class="op">[</span><span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">dirname</span><span class="op">(</span><span class="nam">sFile</span><span class="op">)</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t609" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t610" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># How we process the file depends on where the output is going.</span><span class="strut">&nbsp;</span></p>
-<p id="t611" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sOutputName</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t612" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">processFile</span><span class="op">(</span><span class="nam">sFile</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sOutputName</span><span class="op">,</span> <span class="nam">sFile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t613" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bReplace</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t611" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sOutputName</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t612" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">processFile</span><span class="op">(</span><span class="nam">sFile</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sOutputName</span><span class="op">,</span> <span class="nam">sFile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t613" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">elif</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bReplace</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t614" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># We want to replace the cog file with the output,</span><span class="strut">&nbsp;</span></p>
 <p id="t615" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># but only if they differ.</span><span class="strut">&nbsp;</span></p>
-<p id="t616" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">verbosity</span> <span class="op">&gt;=</span> <span class="num">2</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t617" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">&quot;Cogging %s&quot;</span> <span class="op">%</span> <span class="nam">sFile</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="str">&quot;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t618" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">bNeedNewline</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
+<p id="t616" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">verbosity</span> <span class="op">&gt;=</span> <span class="num">2</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t617" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">&quot;Cogging %s&quot;</span> <span class="op">%</span> <span class="nam">sFile</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="str">&quot;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t618" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">bNeedNewline</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
 <p id="t619" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t620" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t621" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">fOldFile</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">openInputFile</span><span class="op">(</span><span class="nam">sFile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t622" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sOldText</span> <span class="op">=</span> <span class="nam">fOldFile</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t623" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">fOldFile</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t624" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sNewText</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">sOldText</span><span class="op">,</span> <span class="nam">fname</span><span class="op">=</span><span class="nam">sFile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t625" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">sOldText</span> <span class="op">!=</span> <span class="nam">sNewText</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t626" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">verbosity</span> <span class="op">&gt;=</span> <span class="num">1</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t627" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">verbosity</span> <span class="op">&lt;</span> <span class="num">2</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t628" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">&quot;Cogging %s&quot;</span> <span class="op">%</span> <span class="nam">sFile</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="str">&quot;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t629" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">&quot;&nbsp; (changed)&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t630" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">bNeedNewline</span> <span class="op">=</span> <span class="nam">False</span><span class="strut">&nbsp;</span></p>
-<p id="t631" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">replaceFile</span><span class="op">(</span><span class="nam">sFile</span><span class="op">,</span> <span class="nam">sNewText</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t620" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t621" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">fOldFile</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">openInputFile</span><span class="op">(</span><span class="nam">sFile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t622" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sOldText</span> <span class="op">=</span> <span class="nam">fOldFile</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t623" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">fOldFile</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t624" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sNewText</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">sOldText</span><span class="op">,</span> <span class="nam">fname</span><span class="op">=</span><span class="nam">sFile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t625" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">sOldText</span> <span class="op">!=</span> <span class="nam">sNewText</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t626" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">verbosity</span> <span class="op">&gt;=</span> <span class="num">1</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t627" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">verbosity</span> <span class="op">&lt;</span> <span class="num">2</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t628" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">&quot;Cogging %s&quot;</span> <span class="op">%</span> <span class="nam">sFile</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="str">&quot;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t629" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">&quot;&nbsp; (changed)&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t630" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">bNeedNewline</span> <span class="op">=</span> <span class="nam">False</span><span class="strut">&nbsp;</span></p>
+<p id="t631" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">replaceFile</span><span class="op">(</span><span class="nam">sFile</span><span class="op">,</span> <span class="nam">sNewText</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t632" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">finally</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t633" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># The try-finally block is so we can print a partial line</span><span class="strut">&nbsp;</span></p>
 <p id="t634" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># with the name of the file, and print (changed) on the</span><span class="strut">&nbsp;</span></p>
 <p id="t635" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># same line, but also make sure to break the line before</span><span class="strut">&nbsp;</span></p>
 <p id="t636" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># any traceback.</span><span class="strut">&nbsp;</span></p>
-<p id="t637" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">bNeedNewline</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t638" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">&quot;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t637" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">bNeedNewline</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t638" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">&quot;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t639" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t640" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">processFile</span><span class="op">(</span><span class="nam">sFile</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">stdout</span><span class="op">,</span> <span class="nam">sFile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t640" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">processFile</span><span class="op">(</span><span class="nam">sFile</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">stdout</span><span class="op">,</span> <span class="nam">sFile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t641" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">finally</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t642" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">restoreIncludePath</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t642" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">restoreIncludePath</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t643" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t644" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">processFileList</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sFileList</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t645" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&quot;&quot;&quot; Process the files in a file list.</span><span class="strut">&nbsp;</span></p>
 <p id="t646" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t647" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">flist</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">openInputFile</span><span class="op">(</span><span class="nam">sFileList</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t648" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">lines</span> <span class="op">=</span> <span class="nam">flist</span><span class="op">.</span><span class="nam">readlines</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t649" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">flist</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t650" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">for</span> <span class="nam">l</span> <span class="key">in</span> <span class="nam">lines</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t647" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">flist</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">openInputFile</span><span class="op">(</span><span class="nam">sFileList</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t648" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">lines</span> <span class="op">=</span> <span class="nam">flist</span><span class="op">.</span><span class="nam">readlines</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t649" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">flist</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t650" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">for</span> <span class="nam">l</span> <span class="key">in</span> <span class="nam">lines</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t651" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Use shlex to parse the line like a shell.</span><span class="strut">&nbsp;</span></p>
-<p id="t652" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">lex</span> <span class="op">=</span> <span class="nam">shlex</span><span class="op">.</span><span class="nam">shlex</span><span class="op">(</span><span class="nam">l</span><span class="op">,</span> <span class="nam">posix</span><span class="op">=</span><span class="nam">True</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t653" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">lex</span><span class="op">.</span><span class="nam">whitespace_split</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
-<p id="t654" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">lex</span><span class="op">.</span><span class="nam">commenters</span> <span class="op">=</span> <span class="str">&#39;#&#39;</span><span class="strut">&nbsp;</span></p>
+<p id="t652" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">lex</span> <span class="op">=</span> <span class="nam">shlex</span><span class="op">.</span><span class="nam">shlex</span><span class="op">(</span><span class="nam">l</span><span class="op">,</span> <span class="nam">posix</span><span class="op">=</span><span class="nam">True</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t653" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">lex</span><span class="op">.</span><span class="nam">whitespace_split</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
+<p id="t654" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">lex</span><span class="op">.</span><span class="nam">commenters</span> <span class="op">=</span> <span class="str">&#39;#&#39;</span><span class="strut">&nbsp;</span></p>
 <p id="t655" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># No escapes, so that backslash can be part of the path</span><span class="strut">&nbsp;</span></p>
-<p id="t656" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">lex</span><span class="op">.</span><span class="nam">escape</span> <span class="op">=</span> <span class="str">&#39;&#39;</span><span class="strut">&nbsp;</span></p>
-<p id="t657" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">args</span> <span class="op">=</span> <span class="nam">list</span><span class="op">(</span><span class="nam">lex</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t658" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">args</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t659" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">processArguments</span><span class="op">(</span><span class="nam">args</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t656" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">lex</span><span class="op">.</span><span class="nam">escape</span> <span class="op">=</span> <span class="str">&#39;&#39;</span><span class="strut">&nbsp;</span></p>
+<p id="t657" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">args</span> <span class="op">=</span> <span class="nam">list</span><span class="op">(</span><span class="nam">lex</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t658" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">args</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t659" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">processArguments</span><span class="op">(</span><span class="nam">args</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t660" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t661" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">processArguments</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">args</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t662" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&quot;&quot;&quot; Process one command-line.</span><span class="strut">&nbsp;</span></p>
 <p id="t663" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t664" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">saved_options</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="strut">&nbsp;</span></p>
-<p id="t665" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">options</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">clone</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t664" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">saved_options</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="strut">&nbsp;</span></p>
+<p id="t665" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">options</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">clone</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t666" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t667" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="nam">args</span><span class="op">[</span><span class="num">1</span><span class="op">:</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t668" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">validate</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t667" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="nam">args</span><span class="op">[</span><span class="num">1</span><span class="op">:</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t668" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">validate</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t669" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t670" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">args</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="op">[</span><span class="num">0</span><span class="op">]</span> <span class="op">==</span> <span class="str">&#39;@&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t671" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sOutputName</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t672" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="str">&quot;Can&#39;t use -o with @file&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t673" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">processFileList</span><span class="op">(</span><span class="nam">args</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="op">[</span><span class="num">1</span><span class="op">:</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t670" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">args</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="op">[</span><span class="num">0</span><span class="op">]</span> <span class="op">==</span> <span class="str">&#39;@&#39;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t671" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sOutputName</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t672" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="str">&quot;Can&#39;t use -o with @file&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t673" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">processFileList</span><span class="op">(</span><span class="nam">args</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="op">[</span><span class="num">1</span><span class="op">:</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t674" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t675" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">processOneFile</span><span class="op">(</span><span class="nam">args</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t675" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">processOneFile</span><span class="op">(</span><span class="nam">args</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t676" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t677" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">options</span> <span class="op">=</span> <span class="nam">saved_options</span><span class="strut">&nbsp;</span></p>
+<p id="t677" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">options</span> <span class="op">=</span> <span class="nam">saved_options</span><span class="strut">&nbsp;</span></p>
 <p id="t678" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t679" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">callableMain</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">argv</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t680" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&quot;&quot;&quot; All of command-line cog, but in a callable form.</span><span class="strut">&nbsp;</span></p>
 <p id="t681" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; This is used by main.</span><span class="strut">&nbsp;</span></p>
 <p id="t682" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; argv is the equivalent of sys.argv.</span><span class="strut">&nbsp;</span></p>
 <p id="t683" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t684" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">argv</span> <span class="op">=</span> <span class="nam">argv</span><span class="op">[</span><span class="num">1</span><span class="op">:</span><span class="op">]</span><span class="strut">&nbsp;</span></p>
+<p id="t684" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">argv</span> <span class="op">=</span> <span class="nam">argv</span><span class="op">[</span><span class="num">1</span><span class="op">:</span><span class="op">]</span><span class="strut">&nbsp;</span></p>
 <p id="t685" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t686" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Provide help if asked for anywhere in the command line.</span><span class="strut">&nbsp;</span></p>
-<p id="t687" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="str">&#39;-?&#39;</span> <span class="key">in</span> <span class="nam">argv</span> <span class="key">or</span> <span class="str">&#39;-h&#39;</span> <span class="key">in</span> <span class="nam">argv</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t688" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prerr</span><span class="op">(</span><span class="nam">usage</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="str">&quot;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t689" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span><span class="strut">&nbsp;</span></p>
+<p id="t687" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="str">&#39;-?&#39;</span> <span class="key">in</span> <span class="nam">argv</span> <span class="key">or</span> <span class="str">&#39;-h&#39;</span> <span class="key">in</span> <span class="nam">argv</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t688" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prerr</span><span class="op">(</span><span class="nam">usage</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="str">&quot;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t689" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span><span class="strut">&nbsp;</span></p>
 <p id="t690" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t691" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="nam">argv</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t692" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">validate</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t693" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">_fixEndOutputPatterns</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t691" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="nam">argv</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t692" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">validate</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t693" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">_fixEndOutputPatterns</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t694" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t695" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bShowVersion</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t696" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">&quot;Cog version %s&quot;</span> <span class="op">%</span> <span class="nam">__version__</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t697" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span><span class="strut">&nbsp;</span></p>
+<p id="t695" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bShowVersion</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t696" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">&quot;Cog version %s&quot;</span> <span class="op">%</span> <span class="nam">__version__</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t697" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span><span class="strut">&nbsp;</span></p>
 <p id="t698" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t699" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">args</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t700" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">for</span> <span class="nam">a</span> <span class="key">in</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">args</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t701" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">processArguments</span><span class="op">(</span><span class="op">[</span><span class="nam">a</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t699" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">args</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t700" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">for</span> <span class="nam">a</span> <span class="key">in</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">args</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t701" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">processArguments</span><span class="op">(</span><span class="op">[</span><span class="nam">a</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t702" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t703" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="str">&quot;No files to process&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t703" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="str">&quot;No files to process&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t704" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t705" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">main</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">argv</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t706" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&quot;&quot;&quot; Handle the command-line execution for cog.</span><span class="strut">&nbsp;</span></p>
 <p id="t707" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t708" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t709" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t710" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="nam">argv</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t711" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="num">0</span><span class="strut">&nbsp;</span></p>
-<p id="t712" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">except</span> <span class="nam">CogUsageError</span> <span class="key">as</span> <span class="nam">err</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t713" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prerr</span><span class="op">(</span><span class="nam">err</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t714" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prerr</span><span class="op">(</span><span class="str">&quot;(for help use -?)&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t715" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
-<p id="t716" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">except</span> <span class="nam">CogGeneratedError</span> <span class="key">as</span> <span class="nam">err</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t717" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prerr</span><span class="op">(</span><span class="str">&quot;Error: %s&quot;</span> <span class="op">%</span> <span class="nam">err</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t718" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="num">3</span><span class="strut">&nbsp;</span></p>
-<p id="t719" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">except</span> <span class="nam">CogError</span> <span class="key">as</span> <span class="nam">err</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t720" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prerr</span><span class="op">(</span><span class="nam">err</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t721" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t722" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">except</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t723" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">traceback</span><span class="op">.</span><span class="nam">print_exc</span><span class="op">(</span><span class="nam">None</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">stderr</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t724" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t709" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t710" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="nam">argv</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t711" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="num">0</span><span class="strut">&nbsp;</span></p>
+<p id="t712" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">except</span> <span class="nam">CogUsageError</span> <span class="key">as</span> <span class="nam">err</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t713" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prerr</span><span class="op">(</span><span class="nam">err</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t714" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prerr</span><span class="op">(</span><span class="str">&quot;(for help use -?)&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t715" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
+<p id="t716" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">except</span> <span class="nam">CogGeneratedError</span> <span class="key">as</span> <span class="nam">err</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t717" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prerr</span><span class="op">(</span><span class="str">&quot;Error: %s&quot;</span> <span class="op">%</span> <span class="nam">err</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t718" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="num">3</span><span class="strut">&nbsp;</span></p>
+<p id="t719" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">except</span> <span class="nam">CogError</span> <span class="key">as</span> <span class="nam">err</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t720" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">prerr</span><span class="op">(</span><span class="nam">err</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t721" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t722" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">except</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t723" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">traceback</span><span class="op">.</span><span class="nam">print_exc</span><span class="op">(</span><span class="nam">None</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">stderr</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t724" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
 <p id="t725" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t726" class="pln"><span class="com"># History:</span><span class="strut">&nbsp;</span></p>
 <p id="t727" class="pln"><span class="com"># 20040210: First public version.</span><span class="strut">&nbsp;</span></p>
@@ -1631,8 +1631,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.2</a>,
-            created at 2015-11-04 05:20
+            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.3</a>,
+            created at 2015-11-24 07:02
         </p>
     </div>
 </div>
diff --git a/doc/sample_html/cogapp_makefiles_py.html b/doc/sample_html/cogapp_makefiles_py.html
index a2261347..a2514c8d 100644
--- a/doc/sample_html/cogapp_makefiles_py.html
+++ b/doc/sample_html/cogapp_makefiles_py.html
@@ -8,7 +8,7 @@
     
     
     <meta http-equiv="X-UA-Compatible" content="IE=emulateIE7" />
-    <title>Coverage for cogapp/makefiles.py: 64.29%</title>
+    <title>Coverage for cogapp/makefiles.py: 19.05%</title>
     <link rel="stylesheet" href="style.css" type="text/css">
     
     <script type="text/javascript" src="jquery.min.js"></script>
@@ -24,19 +24,19 @@
 <div id="header">
     <div class="content">
         <h1>Coverage for <b>cogapp/makefiles.py</b> :
-            <span class="pc_cov">64.29%</span>
+            <span class="pc_cov">19.05%</span>
         </h1>
 
         <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" />
 
         <h2 class="stats">
             28 statements &nbsp;
-            <span class="run hide_run shortkey_r button_toggle_run">21 run</span>
-            <span class="mis shortkey_m button_toggle_mis">7 missing</span>
+            <span class="run hide_run shortkey_r button_toggle_run">8 run</span>
+            <span class="mis shortkey_m button_toggle_mis">20 missing</span>
             <span class="exc shortkey_x button_toggle_exc">3 excluded</span>
 
             
-                <span class="par run hide_run shortkey_p button_toggle_par">2 partial</span>
+                <span class="par run hide_run shortkey_p button_toggle_par">0 partial</span>
             
         </h2>
     </div>
@@ -86,20 +86,20 @@
 <p id="n15" class="stm run hide_run"><a href="#n15">15</a></p>
 <p id="n16" class="pln"><a href="#n16">16</a></p>
 <p id="n17" class="pln"><a href="#n17">17</a></p>
-<p id="n18" class="stm run hide_run"><a href="#n18">18</a></p>
-<p id="n19" class="stm run hide_run"><a href="#n19">19</a></p>
-<p id="n20" class="stm run hide_run"><a href="#n20">20</a></p>
-<p id="n21" class="stm run hide_run"><a href="#n21">21</a></p>
-<p id="n22" class="stm par run hide_run"><a href="#n22">22</a></p>
-<p id="n23" class="stm run hide_run"><a href="#n23">23</a></p>
-<p id="n24" class="stm run hide_run"><a href="#n24">24</a></p>
-<p id="n25" class="stm run hide_run"><a href="#n25">25</a></p>
-<p id="n26" class="stm run hide_run"><a href="#n26">26</a></p>
-<p id="n27" class="stm run hide_run"><a href="#n27">27</a></p>
+<p id="n18" class="stm mis"><a href="#n18">18</a></p>
+<p id="n19" class="stm mis"><a href="#n19">19</a></p>
+<p id="n20" class="stm mis"><a href="#n20">20</a></p>
+<p id="n21" class="stm mis"><a href="#n21">21</a></p>
+<p id="n22" class="stm mis"><a href="#n22">22</a></p>
+<p id="n23" class="stm mis"><a href="#n23">23</a></p>
+<p id="n24" class="stm mis"><a href="#n24">24</a></p>
+<p id="n25" class="stm mis"><a href="#n25">25</a></p>
+<p id="n26" class="stm mis"><a href="#n26">26</a></p>
+<p id="n27" class="stm mis"><a href="#n27">27</a></p>
 <p id="n28" class="pln"><a href="#n28">28</a></p>
-<p id="n29" class="stm par run hide_run"><a href="#n29">29</a></p>
-<p id="n30" class="stm run hide_run"><a href="#n30">30</a></p>
-<p id="n31" class="stm run hide_run"><a href="#n31">31</a></p>
+<p id="n29" class="stm mis"><a href="#n29">29</a></p>
+<p id="n30" class="stm mis"><a href="#n30">30</a></p>
+<p id="n31" class="stm mis"><a href="#n31">31</a></p>
 <p id="n32" class="pln"><a href="#n32">32</a></p>
 <p id="n33" class="stm run hide_run"><a href="#n33">33</a></p>
 <p id="n34" class="pln"><a href="#n34">34</a></p>
@@ -152,20 +152,20 @@
 <p id="t15" class="stm run hide_run"><span class="key">def</span> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">basedir</span><span class="op">=</span><span class="str">&#39;.&#39;</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t16" class="pln">&nbsp; &nbsp; <span class="str">&quot;&quot;&quot; Create files from the dictionary `d`, in the directory named by `basedir`.</span><span class="strut">&nbsp;</span></p>
 <p id="t17" class="pln"><span class="str">&nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t18" class="stm run hide_run">&nbsp; &nbsp; <span class="key">for</span> <span class="nam">name</span><span class="op">,</span> <span class="nam">contents</span> <span class="key">in</span> <span class="nam">d</span><span class="op">.</span><span class="nam">items</span><span class="op">(</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t19" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">child</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">basedir</span><span class="op">,</span> <span class="nam">name</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t20" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">contents</span><span class="op">,</span> <span class="nam">string_types</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t21" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">mode</span> <span class="op">=</span> <span class="str">&#39;w&#39;</span><span class="strut">&nbsp;</span></p>
-<p id="t22" class="stm par run hide_run"><span class="annotate" title="Line 22 was executed, but never jumped to line 24">22&#x202F;&#x219B;&#x202F;24 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">contents</span><span class="op">,</span> <span class="nam">bytes_types</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t23" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">mode</span> <span class="op">+=</span> <span class="str">&quot;b&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t24" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">f</span> <span class="op">=</span> <span class="nam">open</span><span class="op">(</span><span class="nam">child</span><span class="op">,</span> <span class="nam">mode</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t25" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">contents</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">contents</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t26" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">f</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">contents</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t27" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">f</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t18" class="stm mis">&nbsp; &nbsp; <span class="key">for</span> <span class="nam">name</span><span class="op">,</span> <span class="nam">contents</span> <span class="key">in</span> <span class="nam">d</span><span class="op">.</span><span class="nam">items</span><span class="op">(</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t19" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">child</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">basedir</span><span class="op">,</span> <span class="nam">name</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t20" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">contents</span><span class="op">,</span> <span class="nam">string_types</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t21" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">mode</span> <span class="op">=</span> <span class="str">&#39;w&#39;</span><span class="strut">&nbsp;</span></p>
+<p id="t22" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">contents</span><span class="op">,</span> <span class="nam">bytes_types</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t23" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">mode</span> <span class="op">+=</span> <span class="str">&quot;b&quot;</span><span class="strut">&nbsp;</span></p>
+<p id="t24" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">f</span> <span class="op">=</span> <span class="nam">open</span><span class="op">(</span><span class="nam">child</span><span class="op">,</span> <span class="nam">mode</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t25" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">contents</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">contents</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t26" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">f</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">contents</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t27" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">f</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t28" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t29" class="stm par run hide_run"><span class="annotate" title="Line 29 was executed, but never jumped to line 31">29&#x202F;&#x219B;&#x202F;31 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">child</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t30" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">os</span><span class="op">.</span><span class="nam">mkdir</span><span class="op">(</span><span class="nam">child</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t31" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">contents</span><span class="op">,</span> <span class="nam">child</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t29" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">child</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t30" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">os</span><span class="op">.</span><span class="nam">mkdir</span><span class="op">(</span><span class="nam">child</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t31" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">contents</span><span class="op">,</span> <span class="nam">child</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t32" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t33" class="stm run hide_run"><span class="key">def</span> <span class="nam">removeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">basedir</span><span class="op">=</span><span class="str">&#39;.&#39;</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t34" class="pln">&nbsp; &nbsp; <span class="str">&quot;&quot;&quot; Remove the files created by makeFiles.</span><span class="strut">&nbsp;</span></p>
@@ -207,8 +207,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.2</a>,
-            created at 2015-11-04 05:20
+            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.3</a>,
+            created at 2015-11-24 07:02
         </p>
     </div>
 </div>
diff --git a/doc/sample_html/cogapp_test_cogapp_py.html b/doc/sample_html/cogapp_test_cogapp_py.html
index 6b5c5709..d6ee3711 100644
--- a/doc/sample_html/cogapp_test_cogapp_py.html
+++ b/doc/sample_html/cogapp_test_cogapp_py.html
@@ -8,7 +8,7 @@
     
     
     <meta http-equiv="X-UA-Compatible" content="IE=emulateIE7" />
-    <title>Coverage for cogapp/test_cogapp.py: 99.86%</title>
+    <title>Coverage for cogapp/test_cogapp.py: 30.99%</title>
     <link rel="stylesheet" href="style.css" type="text/css">
     
     <script type="text/javascript" src="jquery.min.js"></script>
@@ -24,19 +24,19 @@
 <div id="header">
     <div class="content">
         <h1>Coverage for <b>cogapp/test_cogapp.py</b> :
-            <span class="pc_cov">99.86%</span>
+            <span class="pc_cov">30.99%</span>
         </h1>
 
         <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" />
 
         <h2 class="stats">
             704 statements &nbsp;
-            <span class="run hide_run shortkey_r button_toggle_run">704 run</span>
-            <span class="mis shortkey_m button_toggle_mis">0 missing</span>
+            <span class="run hide_run shortkey_r button_toggle_run">218 run</span>
+            <span class="mis shortkey_m button_toggle_mis">486 missing</span>
             <span class="exc shortkey_x button_toggle_exc">6 excluded</span>
 
             
-                <span class="par run hide_run shortkey_p button_toggle_par">1 partial</span>
+                <span class="par run hide_run shortkey_p button_toggle_par">0 partial</span>
             
         </h2>
     </div>
@@ -500,46 +500,46 @@
 <p id="n429" class="pln"><a href="#n429">429</a></p>
 <p id="n430" class="pln"><a href="#n430">430</a></p>
 <p id="n431" class="stm run hide_run"><a href="#n431">431</a></p>
-<p id="n432" class="stm run hide_run"><a href="#n432">432</a></p>
-<p id="n433" class="stm run hide_run"><a href="#n433">433</a></p>
-<p id="n434" class="stm run hide_run"><a href="#n434">434</a></p>
-<p id="n435" class="stm run hide_run"><a href="#n435">435</a></p>
-<p id="n436" class="stm run hide_run"><a href="#n436">436</a></p>
-<p id="n437" class="stm run hide_run"><a href="#n437">437</a></p>
-<p id="n438" class="stm run hide_run"><a href="#n438">438</a></p>
+<p id="n432" class="stm mis"><a href="#n432">432</a></p>
+<p id="n433" class="stm mis"><a href="#n433">433</a></p>
+<p id="n434" class="stm mis"><a href="#n434">434</a></p>
+<p id="n435" class="stm mis"><a href="#n435">435</a></p>
+<p id="n436" class="stm mis"><a href="#n436">436</a></p>
+<p id="n437" class="stm mis"><a href="#n437">437</a></p>
+<p id="n438" class="stm mis"><a href="#n438">438</a></p>
 <p id="n439" class="pln"><a href="#n439">439</a></p>
 <p id="n440" class="stm run hide_run"><a href="#n440">440</a></p>
-<p id="n441" class="stm run hide_run"><a href="#n441">441</a></p>
-<p id="n442" class="stm run hide_run"><a href="#n442">442</a></p>
-<p id="n443" class="stm run hide_run"><a href="#n443">443</a></p>
-<p id="n444" class="stm run hide_run"><a href="#n444">444</a></p>
-<p id="n445" class="stm run hide_run"><a href="#n445">445</a></p>
-<p id="n446" class="stm run hide_run"><a href="#n446">446</a></p>
-<p id="n447" class="stm run hide_run"><a href="#n447">447</a></p>
-<p id="n448" class="stm run hide_run"><a href="#n448">448</a></p>
-<p id="n449" class="stm run hide_run"><a href="#n449">449</a></p>
+<p id="n441" class="stm mis"><a href="#n441">441</a></p>
+<p id="n442" class="stm mis"><a href="#n442">442</a></p>
+<p id="n443" class="stm mis"><a href="#n443">443</a></p>
+<p id="n444" class="stm mis"><a href="#n444">444</a></p>
+<p id="n445" class="stm mis"><a href="#n445">445</a></p>
+<p id="n446" class="stm mis"><a href="#n446">446</a></p>
+<p id="n447" class="stm mis"><a href="#n447">447</a></p>
+<p id="n448" class="stm mis"><a href="#n448">448</a></p>
+<p id="n449" class="stm mis"><a href="#n449">449</a></p>
 <p id="n450" class="pln"><a href="#n450">450</a></p>
 <p id="n451" class="stm run hide_run"><a href="#n451">451</a></p>
 <p id="n452" class="pln"><a href="#n452">452</a></p>
-<p id="n453" class="stm run hide_run"><a href="#n453">453</a></p>
-<p id="n454" class="stm run hide_run"><a href="#n454">454</a></p>
-<p id="n455" class="stm run hide_run"><a href="#n455">455</a></p>
-<p id="n456" class="stm run hide_run"><a href="#n456">456</a></p>
-<p id="n457" class="stm run hide_run"><a href="#n457">457</a></p>
+<p id="n453" class="stm mis"><a href="#n453">453</a></p>
+<p id="n454" class="stm mis"><a href="#n454">454</a></p>
+<p id="n455" class="stm mis"><a href="#n455">455</a></p>
+<p id="n456" class="stm mis"><a href="#n456">456</a></p>
+<p id="n457" class="stm mis"><a href="#n457">457</a></p>
 <p id="n458" class="pln"><a href="#n458">458</a></p>
 <p id="n459" class="stm run hide_run"><a href="#n459">459</a></p>
-<p id="n460" class="stm run hide_run"><a href="#n460">460</a></p>
-<p id="n461" class="stm run hide_run"><a href="#n461">461</a></p>
-<p id="n462" class="stm run hide_run"><a href="#n462">462</a></p>
-<p id="n463" class="stm run hide_run"><a href="#n463">463</a></p>
-<p id="n464" class="stm run hide_run"><a href="#n464">464</a></p>
+<p id="n460" class="stm mis"><a href="#n460">460</a></p>
+<p id="n461" class="stm mis"><a href="#n461">461</a></p>
+<p id="n462" class="stm mis"><a href="#n462">462</a></p>
+<p id="n463" class="stm mis"><a href="#n463">463</a></p>
+<p id="n464" class="stm mis"><a href="#n464">464</a></p>
 <p id="n465" class="pln"><a href="#n465">465</a></p>
 <p id="n466" class="stm run hide_run"><a href="#n466">466</a></p>
-<p id="n467" class="stm run hide_run"><a href="#n467">467</a></p>
-<p id="n468" class="stm run hide_run"><a href="#n468">468</a></p>
-<p id="n469" class="stm run hide_run"><a href="#n469">469</a></p>
-<p id="n470" class="stm run hide_run"><a href="#n470">470</a></p>
-<p id="n471" class="stm run hide_run"><a href="#n471">471</a></p>
+<p id="n467" class="stm mis"><a href="#n467">467</a></p>
+<p id="n468" class="stm mis"><a href="#n468">468</a></p>
+<p id="n469" class="stm mis"><a href="#n469">469</a></p>
+<p id="n470" class="stm mis"><a href="#n470">470</a></p>
+<p id="n471" class="stm mis"><a href="#n471">471</a></p>
 <p id="n472" class="pln"><a href="#n472">472</a></p>
 <p id="n473" class="pln"><a href="#n473">473</a></p>
 <p id="n474" class="stm run hide_run"><a href="#n474">474</a></p>
@@ -548,28 +548,28 @@
 <p id="n477" class="pln"><a href="#n477">477</a></p>
 <p id="n478" class="pln"><a href="#n478">478</a></p>
 <p id="n479" class="stm run hide_run"><a href="#n479">479</a></p>
-<p id="n480" class="stm run hide_run"><a href="#n480">480</a></p>
-<p id="n481" class="stm run hide_run"><a href="#n481">481</a></p>
-<p id="n482" class="stm run hide_run"><a href="#n482">482</a></p>
+<p id="n480" class="stm mis"><a href="#n480">480</a></p>
+<p id="n481" class="stm mis"><a href="#n481">481</a></p>
+<p id="n482" class="stm mis"><a href="#n482">482</a></p>
 <p id="n483" class="pln"><a href="#n483">483</a></p>
 <p id="n484" class="stm run hide_run"><a href="#n484">484</a></p>
-<p id="n485" class="stm run hide_run"><a href="#n485">485</a></p>
+<p id="n485" class="stm mis"><a href="#n485">485</a></p>
 <p id="n486" class="pln"><a href="#n486">486</a></p>
 <p id="n487" class="pln"><a href="#n487">487</a></p>
 <p id="n488" class="pln"><a href="#n488">488</a></p>
 <p id="n489" class="pln"><a href="#n489">489</a></p>
-<p id="n490" class="stm run hide_run"><a href="#n490">490</a></p>
+<p id="n490" class="stm mis"><a href="#n490">490</a></p>
 <p id="n491" class="pln"><a href="#n491">491</a></p>
 <p id="n492" class="stm run hide_run"><a href="#n492">492</a></p>
-<p id="n493" class="stm run hide_run"><a href="#n493">493</a></p>
+<p id="n493" class="stm mis"><a href="#n493">493</a></p>
 <p id="n494" class="pln"><a href="#n494">494</a></p>
 <p id="n495" class="pln"><a href="#n495">495</a></p>
 <p id="n496" class="pln"><a href="#n496">496</a></p>
 <p id="n497" class="pln"><a href="#n497">497</a></p>
 <p id="n498" class="pln"><a href="#n498">498</a></p>
-<p id="n499" class="stm run hide_run"><a href="#n499">499</a></p>
+<p id="n499" class="stm mis"><a href="#n499">499</a></p>
 <p id="n500" class="pln"><a href="#n500">500</a></p>
-<p id="n501" class="stm run hide_run"><a href="#n501">501</a></p>
+<p id="n501" class="stm mis"><a href="#n501">501</a></p>
 <p id="n502" class="pln"><a href="#n502">502</a></p>
 <p id="n503" class="pln"><a href="#n503">503</a></p>
 <p id="n504" class="pln"><a href="#n504">504</a></p>
@@ -578,47 +578,47 @@
 <p id="n507" class="pln"><a href="#n507">507</a></p>
 <p id="n508" class="pln"><a href="#n508">508</a></p>
 <p id="n509" class="pln"><a href="#n509">509</a></p>
-<p id="n510" class="stm run hide_run"><a href="#n510">510</a></p>
+<p id="n510" class="stm mis"><a href="#n510">510</a></p>
 <p id="n511" class="pln"><a href="#n511">511</a></p>
 <p id="n512" class="stm run hide_run"><a href="#n512">512</a></p>
-<p id="n513" class="stm run hide_run"><a href="#n513">513</a></p>
+<p id="n513" class="stm mis"><a href="#n513">513</a></p>
 <p id="n514" class="pln"><a href="#n514">514</a></p>
 <p id="n515" class="pln"><a href="#n515">515</a></p>
-<p id="n516" class="stm run hide_run"><a href="#n516">516</a></p>
+<p id="n516" class="stm mis"><a href="#n516">516</a></p>
 <p id="n517" class="pln"><a href="#n517">517</a></p>
-<p id="n518" class="stm run hide_run"><a href="#n518">518</a></p>
+<p id="n518" class="stm mis"><a href="#n518">518</a></p>
 <p id="n519" class="pln"><a href="#n519">519</a></p>
 <p id="n520" class="pln"><a href="#n520">520</a></p>
 <p id="n521" class="pln"><a href="#n521">521</a></p>
 <p id="n522" class="pln"><a href="#n522">522</a></p>
 <p id="n523" class="pln"><a href="#n523">523</a></p>
 <p id="n524" class="pln"><a href="#n524">524</a></p>
-<p id="n525" class="stm run hide_run"><a href="#n525">525</a></p>
+<p id="n525" class="stm mis"><a href="#n525">525</a></p>
 <p id="n526" class="pln"><a href="#n526">526</a></p>
 <p id="n527" class="stm run hide_run"><a href="#n527">527</a></p>
-<p id="n528" class="stm run hide_run"><a href="#n528">528</a></p>
+<p id="n528" class="stm mis"><a href="#n528">528</a></p>
 <p id="n529" class="pln"><a href="#n529">529</a></p>
 <p id="n530" class="pln"><a href="#n530">530</a></p>
-<p id="n531" class="stm run hide_run"><a href="#n531">531</a></p>
+<p id="n531" class="stm mis"><a href="#n531">531</a></p>
 <p id="n532" class="pln"><a href="#n532">532</a></p>
-<p id="n533" class="stm run hide_run"><a href="#n533">533</a></p>
+<p id="n533" class="stm mis"><a href="#n533">533</a></p>
 <p id="n534" class="pln"><a href="#n534">534</a></p>
 <p id="n535" class="pln"><a href="#n535">535</a></p>
 <p id="n536" class="pln"><a href="#n536">536</a></p>
 <p id="n537" class="pln"><a href="#n537">537</a></p>
 <p id="n538" class="pln"><a href="#n538">538</a></p>
 <p id="n539" class="pln"><a href="#n539">539</a></p>
-<p id="n540" class="stm run hide_run"><a href="#n540">540</a></p>
+<p id="n540" class="stm mis"><a href="#n540">540</a></p>
 <p id="n541" class="pln"><a href="#n541">541</a></p>
 <p id="n542" class="stm run hide_run"><a href="#n542">542</a></p>
-<p id="n543" class="stm run hide_run"><a href="#n543">543</a></p>
+<p id="n543" class="stm mis"><a href="#n543">543</a></p>
 <p id="n544" class="pln"><a href="#n544">544</a></p>
 <p id="n545" class="pln"><a href="#n545">545</a></p>
 <p id="n546" class="pln"><a href="#n546">546</a></p>
 <p id="n547" class="pln"><a href="#n547">547</a></p>
-<p id="n548" class="stm run hide_run"><a href="#n548">548</a></p>
+<p id="n548" class="stm mis"><a href="#n548">548</a></p>
 <p id="n549" class="pln"><a href="#n549">549</a></p>
-<p id="n550" class="stm run hide_run"><a href="#n550">550</a></p>
+<p id="n550" class="stm mis"><a href="#n550">550</a></p>
 <p id="n551" class="pln"><a href="#n551">551</a></p>
 <p id="n552" class="pln"><a href="#n552">552</a></p>
 <p id="n553" class="pln"><a href="#n553">553</a></p>
@@ -627,19 +627,19 @@
 <p id="n556" class="pln"><a href="#n556">556</a></p>
 <p id="n557" class="pln"><a href="#n557">557</a></p>
 <p id="n558" class="pln"><a href="#n558">558</a></p>
-<p id="n559" class="stm run hide_run"><a href="#n559">559</a></p>
+<p id="n559" class="stm mis"><a href="#n559">559</a></p>
 <p id="n560" class="pln"><a href="#n560">560</a></p>
 <p id="n561" class="stm run hide_run"><a href="#n561">561</a></p>
-<p id="n562" class="stm run hide_run"><a href="#n562">562</a></p>
+<p id="n562" class="stm mis"><a href="#n562">562</a></p>
 <p id="n563" class="pln"><a href="#n563">563</a></p>
 <p id="n564" class="pln"><a href="#n564">564</a></p>
 <p id="n565" class="pln"><a href="#n565">565</a></p>
 <p id="n566" class="pln"><a href="#n566">566</a></p>
 <p id="n567" class="pln"><a href="#n567">567</a></p>
 <p id="n568" class="pln"><a href="#n568">568</a></p>
-<p id="n569" class="stm run hide_run"><a href="#n569">569</a></p>
+<p id="n569" class="stm mis"><a href="#n569">569</a></p>
 <p id="n570" class="pln"><a href="#n570">570</a></p>
-<p id="n571" class="stm run hide_run"><a href="#n571">571</a></p>
+<p id="n571" class="stm mis"><a href="#n571">571</a></p>
 <p id="n572" class="pln"><a href="#n572">572</a></p>
 <p id="n573" class="pln"><a href="#n573">573</a></p>
 <p id="n574" class="pln"><a href="#n574">574</a></p>
@@ -650,19 +650,19 @@
 <p id="n579" class="pln"><a href="#n579">579</a></p>
 <p id="n580" class="pln"><a href="#n580">580</a></p>
 <p id="n581" class="pln"><a href="#n581">581</a></p>
-<p id="n582" class="stm run hide_run"><a href="#n582">582</a></p>
+<p id="n582" class="stm mis"><a href="#n582">582</a></p>
 <p id="n583" class="pln"><a href="#n583">583</a></p>
 <p id="n584" class="stm run hide_run"><a href="#n584">584</a></p>
-<p id="n585" class="stm run hide_run"><a href="#n585">585</a></p>
+<p id="n585" class="stm mis"><a href="#n585">585</a></p>
 <p id="n586" class="pln"><a href="#n586">586</a></p>
 <p id="n587" class="pln"><a href="#n587">587</a></p>
 <p id="n588" class="pln"><a href="#n588">588</a></p>
 <p id="n589" class="pln"><a href="#n589">589</a></p>
 <p id="n590" class="pln"><a href="#n590">590</a></p>
 <p id="n591" class="pln"><a href="#n591">591</a></p>
-<p id="n592" class="stm run hide_run"><a href="#n592">592</a></p>
+<p id="n592" class="stm mis"><a href="#n592">592</a></p>
 <p id="n593" class="pln"><a href="#n593">593</a></p>
-<p id="n594" class="stm run hide_run"><a href="#n594">594</a></p>
+<p id="n594" class="stm mis"><a href="#n594">594</a></p>
 <p id="n595" class="pln"><a href="#n595">595</a></p>
 <p id="n596" class="pln"><a href="#n596">596</a></p>
 <p id="n597" class="pln"><a href="#n597">597</a></p>
@@ -673,7 +673,7 @@
 <p id="n602" class="pln"><a href="#n602">602</a></p>
 <p id="n603" class="pln"><a href="#n603">603</a></p>
 <p id="n604" class="pln"><a href="#n604">604</a></p>
-<p id="n605" class="stm run hide_run"><a href="#n605">605</a></p>
+<p id="n605" class="stm mis"><a href="#n605">605</a></p>
 <p id="n606" class="pln"><a href="#n606">606</a></p>
 <p id="n607" class="pln"><a href="#n607">607</a></p>
 <p id="n608" class="stm run hide_run"><a href="#n608">608</a></p>
@@ -681,27 +681,27 @@
 <p id="n610" class="pln"><a href="#n610">610</a></p>
 <p id="n611" class="pln"><a href="#n611">611</a></p>
 <p id="n612" class="stm run hide_run"><a href="#n612">612</a></p>
-<p id="n613" class="stm run hide_run"><a href="#n613">613</a></p>
+<p id="n613" class="stm mis"><a href="#n613">613</a></p>
 <p id="n614" class="pln"><a href="#n614">614</a></p>
 <p id="n615" class="pln"><a href="#n615">615</a></p>
 <p id="n616" class="pln"><a href="#n616">616</a></p>
 <p id="n617" class="pln"><a href="#n617">617</a></p>
-<p id="n618" class="stm run hide_run"><a href="#n618">618</a></p>
-<p id="n619" class="stm run hide_run"><a href="#n619">619</a></p>
-<p id="n620" class="stm run hide_run"><a href="#n620">620</a></p>
+<p id="n618" class="stm mis"><a href="#n618">618</a></p>
+<p id="n619" class="stm mis"><a href="#n619">619</a></p>
+<p id="n620" class="stm mis"><a href="#n620">620</a></p>
 <p id="n621" class="pln"><a href="#n621">621</a></p>
 <p id="n622" class="stm run hide_run"><a href="#n622">622</a></p>
-<p id="n623" class="stm run hide_run"><a href="#n623">623</a></p>
+<p id="n623" class="stm mis"><a href="#n623">623</a></p>
 <p id="n624" class="pln"><a href="#n624">624</a></p>
 <p id="n625" class="pln"><a href="#n625">625</a></p>
 <p id="n626" class="pln"><a href="#n626">626</a></p>
 <p id="n627" class="pln"><a href="#n627">627</a></p>
-<p id="n628" class="stm run hide_run"><a href="#n628">628</a></p>
-<p id="n629" class="stm run hide_run"><a href="#n629">629</a></p>
-<p id="n630" class="stm run hide_run"><a href="#n630">630</a></p>
+<p id="n628" class="stm mis"><a href="#n628">628</a></p>
+<p id="n629" class="stm mis"><a href="#n629">629</a></p>
+<p id="n630" class="stm mis"><a href="#n630">630</a></p>
 <p id="n631" class="pln"><a href="#n631">631</a></p>
 <p id="n632" class="stm run hide_run"><a href="#n632">632</a></p>
-<p id="n633" class="stm run hide_run"><a href="#n633">633</a></p>
+<p id="n633" class="stm mis"><a href="#n633">633</a></p>
 <p id="n634" class="pln"><a href="#n634">634</a></p>
 <p id="n635" class="pln"><a href="#n635">635</a></p>
 <p id="n636" class="pln"><a href="#n636">636</a></p>
@@ -715,8 +715,8 @@
 <p id="n644" class="pln"><a href="#n644">644</a></p>
 <p id="n645" class="pln"><a href="#n645">645</a></p>
 <p id="n646" class="pln"><a href="#n646">646</a></p>
-<p id="n647" class="stm run hide_run"><a href="#n647">647</a></p>
-<p id="n648" class="stm run hide_run"><a href="#n648">648</a></p>
+<p id="n647" class="stm mis"><a href="#n647">647</a></p>
+<p id="n648" class="stm mis"><a href="#n648">648</a></p>
 <p id="n649" class="pln"><a href="#n649">649</a></p>
 <p id="n650" class="pln"><a href="#n650">650</a></p>
 <p id="n651" class="stm run hide_run"><a href="#n651">651</a></p>
@@ -728,63 +728,63 @@
 <p id="n657" class="pln"><a href="#n657">657</a></p>
 <p id="n658" class="pln"><a href="#n658">658</a></p>
 <p id="n659" class="pln"><a href="#n659">659</a></p>
-<p id="n660" class="stm run hide_run"><a href="#n660">660</a></p>
-<p id="n661" class="stm run hide_run"><a href="#n661">661</a></p>
-<p id="n662" class="stm run hide_run"><a href="#n662">662</a></p>
+<p id="n660" class="stm mis"><a href="#n660">660</a></p>
+<p id="n661" class="stm mis"><a href="#n661">661</a></p>
+<p id="n662" class="stm mis"><a href="#n662">662</a></p>
 <p id="n663" class="pln"><a href="#n663">663</a></p>
 <p id="n664" class="stm run hide_run"><a href="#n664">664</a></p>
-<p id="n665" class="stm run hide_run"><a href="#n665">665</a></p>
-<p id="n666" class="stm run hide_run"><a href="#n666">666</a></p>
-<p id="n667" class="stm run hide_run"><a href="#n667">667</a></p>
+<p id="n665" class="stm mis"><a href="#n665">665</a></p>
+<p id="n666" class="stm mis"><a href="#n666">666</a></p>
+<p id="n667" class="stm mis"><a href="#n667">667</a></p>
 <p id="n668" class="pln"><a href="#n668">668</a></p>
 <p id="n669" class="stm run hide_run"><a href="#n669">669</a></p>
-<p id="n670" class="stm run hide_run"><a href="#n670">670</a></p>
-<p id="n671" class="stm run hide_run"><a href="#n671">671</a></p>
-<p id="n672" class="stm run hide_run"><a href="#n672">672</a></p>
-<p id="n673" class="stm run hide_run"><a href="#n673">673</a></p>
-<p id="n674" class="stm run hide_run"><a href="#n674">674</a></p>
+<p id="n670" class="stm mis"><a href="#n670">670</a></p>
+<p id="n671" class="stm mis"><a href="#n671">671</a></p>
+<p id="n672" class="stm mis"><a href="#n672">672</a></p>
+<p id="n673" class="stm mis"><a href="#n673">673</a></p>
+<p id="n674" class="stm mis"><a href="#n674">674</a></p>
 <p id="n675" class="pln"><a href="#n675">675</a></p>
 <p id="n676" class="stm run hide_run"><a href="#n676">676</a></p>
 <p id="n677" class="pln"><a href="#n677">677</a></p>
-<p id="n678" class="stm run hide_run"><a href="#n678">678</a></p>
-<p id="n679" class="stm run hide_run"><a href="#n679">679</a></p>
-<p id="n680" class="stm run hide_run"><a href="#n680">680</a></p>
-<p id="n681" class="stm run hide_run"><a href="#n681">681</a></p>
-<p id="n682" class="stm run hide_run"><a href="#n682">682</a></p>
+<p id="n678" class="stm mis"><a href="#n678">678</a></p>
+<p id="n679" class="stm mis"><a href="#n679">679</a></p>
+<p id="n680" class="stm mis"><a href="#n680">680</a></p>
+<p id="n681" class="stm mis"><a href="#n681">681</a></p>
+<p id="n682" class="stm mis"><a href="#n682">682</a></p>
 <p id="n683" class="pln"><a href="#n683">683</a></p>
 <p id="n684" class="stm run hide_run"><a href="#n684">684</a></p>
 <p id="n685" class="pln"><a href="#n685">685</a></p>
-<p id="n686" class="stm run hide_run"><a href="#n686">686</a></p>
-<p id="n687" class="stm run hide_run"><a href="#n687">687</a></p>
-<p id="n688" class="stm run hide_run"><a href="#n688">688</a></p>
-<p id="n689" class="stm run hide_run"><a href="#n689">689</a></p>
-<p id="n690" class="stm run hide_run"><a href="#n690">690</a></p>
+<p id="n686" class="stm mis"><a href="#n686">686</a></p>
+<p id="n687" class="stm mis"><a href="#n687">687</a></p>
+<p id="n688" class="stm mis"><a href="#n688">688</a></p>
+<p id="n689" class="stm mis"><a href="#n689">689</a></p>
+<p id="n690" class="stm mis"><a href="#n690">690</a></p>
 <p id="n691" class="pln"><a href="#n691">691</a></p>
 <p id="n692" class="stm run hide_run"><a href="#n692">692</a></p>
 <p id="n693" class="pln"><a href="#n693">693</a></p>
-<p id="n694" class="stm run hide_run"><a href="#n694">694</a></p>
-<p id="n695" class="stm run hide_run"><a href="#n695">695</a></p>
-<p id="n696" class="stm run hide_run"><a href="#n696">696</a></p>
-<p id="n697" class="stm run hide_run"><a href="#n697">697</a></p>
-<p id="n698" class="stm run hide_run"><a href="#n698">698</a></p>
+<p id="n694" class="stm mis"><a href="#n694">694</a></p>
+<p id="n695" class="stm mis"><a href="#n695">695</a></p>
+<p id="n696" class="stm mis"><a href="#n696">696</a></p>
+<p id="n697" class="stm mis"><a href="#n697">697</a></p>
+<p id="n698" class="stm mis"><a href="#n698">698</a></p>
 <p id="n699" class="pln"><a href="#n699">699</a></p>
 <p id="n700" class="stm run hide_run"><a href="#n700">700</a></p>
 <p id="n701" class="pln"><a href="#n701">701</a></p>
-<p id="n702" class="stm run hide_run"><a href="#n702">702</a></p>
-<p id="n703" class="stm run hide_run"><a href="#n703">703</a></p>
-<p id="n704" class="stm run hide_run"><a href="#n704">704</a></p>
-<p id="n705" class="stm run hide_run"><a href="#n705">705</a></p>
-<p id="n706" class="stm run hide_run"><a href="#n706">706</a></p>
+<p id="n702" class="stm mis"><a href="#n702">702</a></p>
+<p id="n703" class="stm mis"><a href="#n703">703</a></p>
+<p id="n704" class="stm mis"><a href="#n704">704</a></p>
+<p id="n705" class="stm mis"><a href="#n705">705</a></p>
+<p id="n706" class="stm mis"><a href="#n706">706</a></p>
 <p id="n707" class="pln"><a href="#n707">707</a></p>
 <p id="n708" class="stm run hide_run"><a href="#n708">708</a></p>
 <p id="n709" class="pln"><a href="#n709">709</a></p>
 <p id="n710" class="pln"><a href="#n710">710</a></p>
-<p id="n711" class="stm run hide_run"><a href="#n711">711</a></p>
-<p id="n712" class="stm run hide_run"><a href="#n712">712</a></p>
-<p id="n713" class="stm run hide_run"><a href="#n713">713</a></p>
-<p id="n714" class="stm run hide_run"><a href="#n714">714</a></p>
-<p id="n715" class="stm run hide_run"><a href="#n715">715</a></p>
-<p id="n716" class="stm run hide_run"><a href="#n716">716</a></p>
+<p id="n711" class="stm mis"><a href="#n711">711</a></p>
+<p id="n712" class="stm mis"><a href="#n712">712</a></p>
+<p id="n713" class="stm mis"><a href="#n713">713</a></p>
+<p id="n714" class="stm mis"><a href="#n714">714</a></p>
+<p id="n715" class="stm mis"><a href="#n715">715</a></p>
+<p id="n716" class="stm mis"><a href="#n716">716</a></p>
 <p id="n717" class="pln"><a href="#n717">717</a></p>
 <p id="n718" class="pln"><a href="#n718">718</a></p>
 <p id="n719" class="stm run hide_run"><a href="#n719">719</a></p>
@@ -793,92 +793,92 @@
 <p id="n722" class="pln"><a href="#n722">722</a></p>
 <p id="n723" class="pln"><a href="#n723">723</a></p>
 <p id="n724" class="pln"><a href="#n724">724</a></p>
-<p id="n725" class="stm run hide_run"><a href="#n725">725</a></p>
-<p id="n726" class="stm run hide_run"><a href="#n726">726</a></p>
-<p id="n727" class="stm run hide_run"><a href="#n727">727</a></p>
+<p id="n725" class="stm mis"><a href="#n725">725</a></p>
+<p id="n726" class="stm mis"><a href="#n726">726</a></p>
+<p id="n727" class="stm mis"><a href="#n727">727</a></p>
 <p id="n728" class="pln"><a href="#n728">728</a></p>
 <p id="n729" class="stm run hide_run"><a href="#n729">729</a></p>
 <p id="n730" class="pln"><a href="#n730">730</a></p>
-<p id="n731" class="stm run hide_run"><a href="#n731">731</a></p>
-<p id="n732" class="stm run hide_run"><a href="#n732">732</a></p>
-<p id="n733" class="stm run hide_run"><a href="#n733">733</a></p>
-<p id="n734" class="stm run hide_run"><a href="#n734">734</a></p>
-<p id="n735" class="stm run hide_run"><a href="#n735">735</a></p>
+<p id="n731" class="stm mis"><a href="#n731">731</a></p>
+<p id="n732" class="stm mis"><a href="#n732">732</a></p>
+<p id="n733" class="stm mis"><a href="#n733">733</a></p>
+<p id="n734" class="stm mis"><a href="#n734">734</a></p>
+<p id="n735" class="stm mis"><a href="#n735">735</a></p>
 <p id="n736" class="pln"><a href="#n736">736</a></p>
 <p id="n737" class="stm run hide_run"><a href="#n737">737</a></p>
-<p id="n738" class="stm run hide_run"><a href="#n738">738</a></p>
+<p id="n738" class="stm mis"><a href="#n738">738</a></p>
 <p id="n739" class="pln"><a href="#n739">739</a></p>
-<p id="n740" class="stm run hide_run"><a href="#n740">740</a></p>
+<p id="n740" class="stm mis"><a href="#n740">740</a></p>
 <p id="n741" class="pln"><a href="#n741">741</a></p>
 <p id="n742" class="stm run hide_run"><a href="#n742">742</a></p>
-<p id="n743" class="stm run hide_run"><a href="#n743">743</a></p>
-<p id="n744" class="stm run hide_run"><a href="#n744">744</a></p>
-<p id="n745" class="stm run hide_run"><a href="#n745">745</a></p>
+<p id="n743" class="stm mis"><a href="#n743">743</a></p>
+<p id="n744" class="stm mis"><a href="#n744">744</a></p>
+<p id="n745" class="stm mis"><a href="#n745">745</a></p>
 <p id="n746" class="pln"><a href="#n746">746</a></p>
 <p id="n747" class="stm run hide_run"><a href="#n747">747</a></p>
-<p id="n748" class="stm run hide_run"><a href="#n748">748</a></p>
-<p id="n749" class="stm run hide_run"><a href="#n749">749</a></p>
-<p id="n750" class="stm run hide_run"><a href="#n750">750</a></p>
-<p id="n751" class="stm run hide_run"><a href="#n751">751</a></p>
+<p id="n748" class="stm mis"><a href="#n748">748</a></p>
+<p id="n749" class="stm mis"><a href="#n749">749</a></p>
+<p id="n750" class="stm mis"><a href="#n750">750</a></p>
+<p id="n751" class="stm mis"><a href="#n751">751</a></p>
 <p id="n752" class="pln"><a href="#n752">752</a></p>
-<p id="n753" class="stm run hide_run"><a href="#n753">753</a></p>
-<p id="n754" class="stm run hide_run"><a href="#n754">754</a></p>
+<p id="n753" class="stm mis"><a href="#n753">753</a></p>
+<p id="n754" class="stm mis"><a href="#n754">754</a></p>
 <p id="n755" class="pln"><a href="#n755">755</a></p>
 <p id="n756" class="pln"><a href="#n756">756</a></p>
 <p id="n757" class="stm run hide_run"><a href="#n757">757</a></p>
 <p id="n758" class="pln"><a href="#n758">758</a></p>
 <p id="n759" class="stm run hide_run"><a href="#n759">759</a></p>
 <p id="n760" class="pln"><a href="#n760">760</a></p>
-<p id="n761" class="stm run hide_run"><a href="#n761">761</a></p>
-<p id="n762" class="stm run hide_run"><a href="#n762">762</a></p>
-<p id="n763" class="stm run hide_run"><a href="#n763">763</a></p>
-<p id="n764" class="stm run hide_run"><a href="#n764">764</a></p>
-<p id="n765" class="stm run hide_run"><a href="#n765">765</a></p>
-<p id="n766" class="stm run hide_run"><a href="#n766">766</a></p>
-<p id="n767" class="stm run hide_run"><a href="#n767">767</a></p>
+<p id="n761" class="stm mis"><a href="#n761">761</a></p>
+<p id="n762" class="stm mis"><a href="#n762">762</a></p>
+<p id="n763" class="stm mis"><a href="#n763">763</a></p>
+<p id="n764" class="stm mis"><a href="#n764">764</a></p>
+<p id="n765" class="stm mis"><a href="#n765">765</a></p>
+<p id="n766" class="stm mis"><a href="#n766">766</a></p>
+<p id="n767" class="stm mis"><a href="#n767">767</a></p>
 <p id="n768" class="pln"><a href="#n768">768</a></p>
 <p id="n769" class="stm run hide_run"><a href="#n769">769</a></p>
-<p id="n770" class="stm run hide_run"><a href="#n770">770</a></p>
+<p id="n770" class="stm mis"><a href="#n770">770</a></p>
 <p id="n771" class="pln"><a href="#n771">771</a></p>
 <p id="n772" class="pln"><a href="#n772">772</a></p>
 <p id="n773" class="pln"><a href="#n773">773</a></p>
 <p id="n774" class="pln"><a href="#n774">774</a></p>
 <p id="n775" class="pln"><a href="#n775">775</a></p>
-<p id="n776" class="stm run hide_run"><a href="#n776">776</a></p>
-<p id="n777" class="stm run hide_run"><a href="#n777">777</a></p>
-<p id="n778" class="stm run hide_run"><a href="#n778">778</a></p>
+<p id="n776" class="stm mis"><a href="#n776">776</a></p>
+<p id="n777" class="stm mis"><a href="#n777">777</a></p>
+<p id="n778" class="stm mis"><a href="#n778">778</a></p>
 <p id="n779" class="pln"><a href="#n779">779</a></p>
 <p id="n780" class="stm run hide_run"><a href="#n780">780</a></p>
-<p id="n781" class="stm run hide_run"><a href="#n781">781</a></p>
-<p id="n782" class="stm run hide_run"><a href="#n782">782</a></p>
-<p id="n783" class="stm run hide_run"><a href="#n783">783</a></p>
+<p id="n781" class="stm mis"><a href="#n781">781</a></p>
+<p id="n782" class="stm mis"><a href="#n782">782</a></p>
+<p id="n783" class="stm mis"><a href="#n783">783</a></p>
 <p id="n784" class="pln"><a href="#n784">784</a></p>
 <p id="n785" class="stm run hide_run"><a href="#n785">785</a></p>
-<p id="n786" class="stm run hide_run"><a href="#n786">786</a></p>
-<p id="n787" class="stm run hide_run"><a href="#n787">787</a></p>
-<p id="n788" class="stm run hide_run"><a href="#n788">788</a></p>
-<p id="n789" class="stm run hide_run"><a href="#n789">789</a></p>
+<p id="n786" class="stm mis"><a href="#n786">786</a></p>
+<p id="n787" class="stm mis"><a href="#n787">787</a></p>
+<p id="n788" class="stm mis"><a href="#n788">788</a></p>
+<p id="n789" class="stm mis"><a href="#n789">789</a></p>
 <p id="n790" class="pln"><a href="#n790">790</a></p>
 <p id="n791" class="stm run hide_run"><a href="#n791">791</a></p>
 <p id="n792" class="pln"><a href="#n792">792</a></p>
-<p id="n793" class="stm run hide_run"><a href="#n793">793</a></p>
-<p id="n794" class="stm run hide_run"><a href="#n794">794</a></p>
-<p id="n795" class="stm run hide_run"><a href="#n795">795</a></p>
-<p id="n796" class="stm run hide_run"><a href="#n796">796</a></p>
+<p id="n793" class="stm mis"><a href="#n793">793</a></p>
+<p id="n794" class="stm mis"><a href="#n794">794</a></p>
+<p id="n795" class="stm mis"><a href="#n795">795</a></p>
+<p id="n796" class="stm mis"><a href="#n796">796</a></p>
 <p id="n797" class="pln"><a href="#n797">797</a></p>
 <p id="n798" class="stm run hide_run"><a href="#n798">798</a></p>
-<p id="n799" class="stm run hide_run"><a href="#n799">799</a></p>
+<p id="n799" class="stm mis"><a href="#n799">799</a></p>
 <p id="n800" class="pln"><a href="#n800">800</a></p>
 <p id="n801" class="pln"><a href="#n801">801</a></p>
 <p id="n802" class="pln"><a href="#n802">802</a></p>
 <p id="n803" class="pln"><a href="#n803">803</a></p>
 <p id="n804" class="pln"><a href="#n804">804</a></p>
-<p id="n805" class="stm run hide_run"><a href="#n805">805</a></p>
-<p id="n806" class="stm run hide_run"><a href="#n806">806</a></p>
-<p id="n807" class="stm run hide_run"><a href="#n807">807</a></p>
+<p id="n805" class="stm mis"><a href="#n805">805</a></p>
+<p id="n806" class="stm mis"><a href="#n806">806</a></p>
+<p id="n807" class="stm mis"><a href="#n807">807</a></p>
 <p id="n808" class="pln"><a href="#n808">808</a></p>
 <p id="n809" class="stm run hide_run"><a href="#n809">809</a></p>
-<p id="n810" class="stm run hide_run"><a href="#n810">810</a></p>
+<p id="n810" class="stm mis"><a href="#n810">810</a></p>
 <p id="n811" class="pln"><a href="#n811">811</a></p>
 <p id="n812" class="pln"><a href="#n812">812</a></p>
 <p id="n813" class="pln"><a href="#n813">813</a></p>
@@ -901,30 +901,30 @@
 <p id="n830" class="pln"><a href="#n830">830</a></p>
 <p id="n831" class="pln"><a href="#n831">831</a></p>
 <p id="n832" class="pln"><a href="#n832">832</a></p>
-<p id="n833" class="stm run hide_run"><a href="#n833">833</a></p>
-<p id="n834" class="stm run hide_run"><a href="#n834">834</a></p>
-<p id="n835" class="stm run hide_run"><a href="#n835">835</a></p>
-<p id="n836" class="stm run hide_run"><a href="#n836">836</a></p>
-<p id="n837" class="stm run hide_run"><a href="#n837">837</a></p>
-<p id="n838" class="stm run hide_run"><a href="#n838">838</a></p>
+<p id="n833" class="stm mis"><a href="#n833">833</a></p>
+<p id="n834" class="stm mis"><a href="#n834">834</a></p>
+<p id="n835" class="stm mis"><a href="#n835">835</a></p>
+<p id="n836" class="stm mis"><a href="#n836">836</a></p>
+<p id="n837" class="stm mis"><a href="#n837">837</a></p>
+<p id="n838" class="stm mis"><a href="#n838">838</a></p>
 <p id="n839" class="pln"><a href="#n839">839</a></p>
 <p id="n840" class="stm run hide_run"><a href="#n840">840</a></p>
-<p id="n841" class="stm run hide_run"><a href="#n841">841</a></p>
-<p id="n842" class="stm run hide_run"><a href="#n842">842</a></p>
-<p id="n843" class="stm run hide_run"><a href="#n843">843</a></p>
-<p id="n844" class="stm run hide_run"><a href="#n844">844</a></p>
+<p id="n841" class="stm mis"><a href="#n841">841</a></p>
+<p id="n842" class="stm mis"><a href="#n842">842</a></p>
+<p id="n843" class="stm mis"><a href="#n843">843</a></p>
+<p id="n844" class="stm mis"><a href="#n844">844</a></p>
 <p id="n845" class="pln"><a href="#n845">845</a></p>
 <p id="n846" class="stm run hide_run"><a href="#n846">846</a></p>
-<p id="n847" class="stm run hide_run"><a href="#n847">847</a></p>
-<p id="n848" class="stm run hide_run"><a href="#n848">848</a></p>
-<p id="n849" class="stm run hide_run"><a href="#n849">849</a></p>
-<p id="n850" class="stm run hide_run"><a href="#n850">850</a></p>
+<p id="n847" class="stm mis"><a href="#n847">847</a></p>
+<p id="n848" class="stm mis"><a href="#n848">848</a></p>
+<p id="n849" class="stm mis"><a href="#n849">849</a></p>
+<p id="n850" class="stm mis"><a href="#n850">850</a></p>
 <p id="n851" class="pln"><a href="#n851">851</a></p>
 <p id="n852" class="pln"><a href="#n852">852</a></p>
 <p id="n853" class="stm run hide_run"><a href="#n853">853</a></p>
 <p id="n854" class="pln"><a href="#n854">854</a></p>
 <p id="n855" class="stm run hide_run"><a href="#n855">855</a></p>
-<p id="n856" class="stm run hide_run"><a href="#n856">856</a></p>
+<p id="n856" class="stm mis"><a href="#n856">856</a></p>
 <p id="n857" class="pln"><a href="#n857">857</a></p>
 <p id="n858" class="pln"><a href="#n858">858</a></p>
 <p id="n859" class="pln"><a href="#n859">859</a></p>
@@ -949,15 +949,15 @@
 <p id="n878" class="pln"><a href="#n878">878</a></p>
 <p id="n879" class="pln"><a href="#n879">879</a></p>
 <p id="n880" class="pln"><a href="#n880">880</a></p>
-<p id="n881" class="stm run hide_run"><a href="#n881">881</a></p>
-<p id="n882" class="stm run hide_run"><a href="#n882">882</a></p>
-<p id="n883" class="stm run hide_run"><a href="#n883">883</a></p>
-<p id="n884" class="stm run hide_run"><a href="#n884">884</a></p>
-<p id="n885" class="stm run hide_run"><a href="#n885">885</a></p>
+<p id="n881" class="stm mis"><a href="#n881">881</a></p>
+<p id="n882" class="stm mis"><a href="#n882">882</a></p>
+<p id="n883" class="stm mis"><a href="#n883">883</a></p>
+<p id="n884" class="stm mis"><a href="#n884">884</a></p>
+<p id="n885" class="stm mis"><a href="#n885">885</a></p>
 <p id="n886" class="pln"><a href="#n886">886</a></p>
 <p id="n887" class="stm run hide_run"><a href="#n887">887</a></p>
 <p id="n888" class="pln"><a href="#n888">888</a></p>
-<p id="n889" class="stm run hide_run"><a href="#n889">889</a></p>
+<p id="n889" class="stm mis"><a href="#n889">889</a></p>
 <p id="n890" class="pln"><a href="#n890">890</a></p>
 <p id="n891" class="pln"><a href="#n891">891</a></p>
 <p id="n892" class="pln"><a href="#n892">892</a></p>
@@ -982,12 +982,12 @@
 <p id="n911" class="pln"><a href="#n911">911</a></p>
 <p id="n912" class="pln"><a href="#n912">912</a></p>
 <p id="n913" class="pln"><a href="#n913">913</a></p>
-<p id="n914" class="stm run hide_run"><a href="#n914">914</a></p>
-<p id="n915" class="stm run hide_run"><a href="#n915">915</a></p>
-<p id="n916" class="stm run hide_run"><a href="#n916">916</a></p>
+<p id="n914" class="stm mis"><a href="#n914">914</a></p>
+<p id="n915" class="stm mis"><a href="#n915">915</a></p>
+<p id="n916" class="stm mis"><a href="#n916">916</a></p>
 <p id="n917" class="pln"><a href="#n917">917</a></p>
 <p id="n918" class="stm run hide_run"><a href="#n918">918</a></p>
-<p id="n919" class="stm run hide_run"><a href="#n919">919</a></p>
+<p id="n919" class="stm mis"><a href="#n919">919</a></p>
 <p id="n920" class="pln"><a href="#n920">920</a></p>
 <p id="n921" class="pln"><a href="#n921">921</a></p>
 <p id="n922" class="pln"><a href="#n922">922</a></p>
@@ -1026,15 +1026,15 @@
 <p id="n955" class="pln"><a href="#n955">955</a></p>
 <p id="n956" class="pln"><a href="#n956">956</a></p>
 <p id="n957" class="pln"><a href="#n957">957</a></p>
-<p id="n958" class="stm run hide_run"><a href="#n958">958</a></p>
-<p id="n959" class="stm run hide_run"><a href="#n959">959</a></p>
-<p id="n960" class="stm run hide_run"><a href="#n960">960</a></p>
-<p id="n961" class="stm run hide_run"><a href="#n961">961</a></p>
-<p id="n962" class="stm run hide_run"><a href="#n962">962</a></p>
-<p id="n963" class="stm run hide_run"><a href="#n963">963</a></p>
+<p id="n958" class="stm mis"><a href="#n958">958</a></p>
+<p id="n959" class="stm mis"><a href="#n959">959</a></p>
+<p id="n960" class="stm mis"><a href="#n960">960</a></p>
+<p id="n961" class="stm mis"><a href="#n961">961</a></p>
+<p id="n962" class="stm mis"><a href="#n962">962</a></p>
+<p id="n963" class="stm mis"><a href="#n963">963</a></p>
 <p id="n964" class="pln"><a href="#n964">964</a></p>
 <p id="n965" class="stm run hide_run"><a href="#n965">965</a></p>
-<p id="n966" class="stm run hide_run"><a href="#n966">966</a></p>
+<p id="n966" class="stm mis"><a href="#n966">966</a></p>
 <p id="n967" class="pln"><a href="#n967">967</a></p>
 <p id="n968" class="pln"><a href="#n968">968</a></p>
 <p id="n969" class="pln"><a href="#n969">969</a></p>
@@ -1077,15 +1077,15 @@
 <p id="n1006" class="pln"><a href="#n1006">1006</a></p>
 <p id="n1007" class="pln"><a href="#n1007">1007</a></p>
 <p id="n1008" class="pln"><a href="#n1008">1008</a></p>
-<p id="n1009" class="stm run hide_run"><a href="#n1009">1009</a></p>
-<p id="n1010" class="stm run hide_run"><a href="#n1010">1010</a></p>
-<p id="n1011" class="stm run hide_run"><a href="#n1011">1011</a></p>
-<p id="n1012" class="stm run hide_run"><a href="#n1012">1012</a></p>
-<p id="n1013" class="stm run hide_run"><a href="#n1013">1013</a></p>
-<p id="n1014" class="stm run hide_run"><a href="#n1014">1014</a></p>
+<p id="n1009" class="stm mis"><a href="#n1009">1009</a></p>
+<p id="n1010" class="stm mis"><a href="#n1010">1010</a></p>
+<p id="n1011" class="stm mis"><a href="#n1011">1011</a></p>
+<p id="n1012" class="stm mis"><a href="#n1012">1012</a></p>
+<p id="n1013" class="stm mis"><a href="#n1013">1013</a></p>
+<p id="n1014" class="stm mis"><a href="#n1014">1014</a></p>
 <p id="n1015" class="pln"><a href="#n1015">1015</a></p>
 <p id="n1016" class="stm run hide_run"><a href="#n1016">1016</a></p>
-<p id="n1017" class="stm run hide_run"><a href="#n1017">1017</a></p>
+<p id="n1017" class="stm mis"><a href="#n1017">1017</a></p>
 <p id="n1018" class="pln"><a href="#n1018">1018</a></p>
 <p id="n1019" class="pln"><a href="#n1019">1019</a></p>
 <p id="n1020" class="pln"><a href="#n1020">1020</a></p>
@@ -1121,13 +1121,13 @@
 <p id="n1050" class="pln"><a href="#n1050">1050</a></p>
 <p id="n1051" class="pln"><a href="#n1051">1051</a></p>
 <p id="n1052" class="pln"><a href="#n1052">1052</a></p>
-<p id="n1053" class="stm run hide_run"><a href="#n1053">1053</a></p>
-<p id="n1054" class="stm run hide_run"><a href="#n1054">1054</a></p>
-<p id="n1055" class="stm run hide_run"><a href="#n1055">1055</a></p>
-<p id="n1056" class="stm run hide_run"><a href="#n1056">1056</a></p>
+<p id="n1053" class="stm mis"><a href="#n1053">1053</a></p>
+<p id="n1054" class="stm mis"><a href="#n1054">1054</a></p>
+<p id="n1055" class="stm mis"><a href="#n1055">1055</a></p>
+<p id="n1056" class="stm mis"><a href="#n1056">1056</a></p>
 <p id="n1057" class="pln"><a href="#n1057">1057</a></p>
 <p id="n1058" class="stm run hide_run"><a href="#n1058">1058</a></p>
-<p id="n1059" class="stm run hide_run"><a href="#n1059">1059</a></p>
+<p id="n1059" class="stm mis"><a href="#n1059">1059</a></p>
 <p id="n1060" class="pln"><a href="#n1060">1060</a></p>
 <p id="n1061" class="pln"><a href="#n1061">1061</a></p>
 <p id="n1062" class="pln"><a href="#n1062">1062</a></p>
@@ -1143,18 +1143,18 @@
 <p id="n1072" class="pln"><a href="#n1072">1072</a></p>
 <p id="n1073" class="pln"><a href="#n1073">1073</a></p>
 <p id="n1074" class="pln"><a href="#n1074">1074</a></p>
-<p id="n1075" class="stm run hide_run"><a href="#n1075">1075</a></p>
-<p id="n1076" class="stm run hide_run"><a href="#n1076">1076</a></p>
-<p id="n1077" class="stm run hide_run"><a href="#n1077">1077</a></p>
+<p id="n1075" class="stm mis"><a href="#n1075">1075</a></p>
+<p id="n1076" class="stm mis"><a href="#n1076">1076</a></p>
+<p id="n1077" class="stm mis"><a href="#n1077">1077</a></p>
 <p id="n1078" class="pln"><a href="#n1078">1078</a></p>
 <p id="n1079" class="stm run hide_run"><a href="#n1079">1079</a></p>
-<p id="n1080" class="stm run hide_run"><a href="#n1080">1080</a></p>
+<p id="n1080" class="stm mis"><a href="#n1080">1080</a></p>
 <p id="n1081" class="pln"><a href="#n1081">1081</a></p>
-<p id="n1082" class="stm par run hide_run"><a href="#n1082">1082</a></p>
-<p id="n1083" class="stm run hide_run"><a href="#n1083">1083</a></p>
-<p id="n1084" class="stm run hide_run"><a href="#n1084">1084</a></p>
+<p id="n1082" class="stm mis"><a href="#n1082">1082</a></p>
+<p id="n1083" class="stm mis"><a href="#n1083">1083</a></p>
+<p id="n1084" class="stm mis"><a href="#n1084">1084</a></p>
 <p id="n1085" class="pln"><a href="#n1085">1085</a></p>
-<p id="n1086" class="stm run hide_run"><a href="#n1086">1086</a></p>
+<p id="n1086" class="stm mis"><a href="#n1086">1086</a></p>
 <p id="n1087" class="pln"><a href="#n1087">1087</a></p>
 <p id="n1088" class="pln"><a href="#n1088">1088</a></p>
 <p id="n1089" class="pln"><a href="#n1089">1089</a></p>
@@ -1192,14 +1192,14 @@
 <p id="n1121" class="pln"><a href="#n1121">1121</a></p>
 <p id="n1122" class="pln"><a href="#n1122">1122</a></p>
 <p id="n1123" class="pln"><a href="#n1123">1123</a></p>
-<p id="n1124" class="stm run hide_run"><a href="#n1124">1124</a></p>
-<p id="n1125" class="stm run hide_run"><a href="#n1125">1125</a></p>
-<p id="n1126" class="stm run hide_run"><a href="#n1126">1126</a></p>
-<p id="n1127" class="stm run hide_run"><a href="#n1127">1127</a></p>
-<p id="n1128" class="stm run hide_run"><a href="#n1128">1128</a></p>
+<p id="n1124" class="stm mis"><a href="#n1124">1124</a></p>
+<p id="n1125" class="stm mis"><a href="#n1125">1125</a></p>
+<p id="n1126" class="stm mis"><a href="#n1126">1126</a></p>
+<p id="n1127" class="stm mis"><a href="#n1127">1127</a></p>
+<p id="n1128" class="stm mis"><a href="#n1128">1128</a></p>
 <p id="n1129" class="pln"><a href="#n1129">1129</a></p>
 <p id="n1130" class="stm run hide_run"><a href="#n1130">1130</a></p>
-<p id="n1131" class="stm run hide_run"><a href="#n1131">1131</a></p>
+<p id="n1131" class="stm mis"><a href="#n1131">1131</a></p>
 <p id="n1132" class="pln"><a href="#n1132">1132</a></p>
 <p id="n1133" class="pln"><a href="#n1133">1133</a></p>
 <p id="n1134" class="pln"><a href="#n1134">1134</a></p>
@@ -1221,22 +1221,22 @@
 <p id="n1150" class="pln"><a href="#n1150">1150</a></p>
 <p id="n1151" class="pln"><a href="#n1151">1151</a></p>
 <p id="n1152" class="pln"><a href="#n1152">1152</a></p>
-<p id="n1153" class="stm run hide_run"><a href="#n1153">1153</a></p>
-<p id="n1154" class="stm run hide_run"><a href="#n1154">1154</a></p>
-<p id="n1155" class="stm run hide_run"><a href="#n1155">1155</a></p>
-<p id="n1156" class="stm run hide_run"><a href="#n1156">1156</a></p>
+<p id="n1153" class="stm mis"><a href="#n1153">1153</a></p>
+<p id="n1154" class="stm mis"><a href="#n1154">1154</a></p>
+<p id="n1155" class="stm mis"><a href="#n1155">1155</a></p>
+<p id="n1156" class="stm mis"><a href="#n1156">1156</a></p>
 <p id="n1157" class="pln"><a href="#n1157">1157</a></p>
 <p id="n1158" class="stm run hide_run"><a href="#n1158">1158</a></p>
-<p id="n1159" class="stm run hide_run"><a href="#n1159">1159</a></p>
-<p id="n1160" class="stm run hide_run"><a href="#n1160">1160</a></p>
+<p id="n1159" class="stm mis"><a href="#n1159">1159</a></p>
+<p id="n1160" class="stm mis"><a href="#n1160">1160</a></p>
 <p id="n1161" class="pln"><a href="#n1161">1161</a></p>
 <p id="n1162" class="stm run hide_run"><a href="#n1162">1162</a></p>
-<p id="n1163" class="stm run hide_run"><a href="#n1163">1163</a></p>
-<p id="n1164" class="stm run hide_run"><a href="#n1164">1164</a></p>
+<p id="n1163" class="stm mis"><a href="#n1163">1163</a></p>
+<p id="n1164" class="stm mis"><a href="#n1164">1164</a></p>
 <p id="n1165" class="pln"><a href="#n1165">1165</a></p>
 <p id="n1166" class="stm run hide_run"><a href="#n1166">1166</a></p>
-<p id="n1167" class="stm run hide_run"><a href="#n1167">1167</a></p>
-<p id="n1168" class="stm run hide_run"><a href="#n1168">1168</a></p>
+<p id="n1167" class="stm mis"><a href="#n1167">1167</a></p>
+<p id="n1168" class="stm mis"><a href="#n1168">1168</a></p>
 <p id="n1169" class="pln"><a href="#n1169">1169</a></p>
 <p id="n1170" class="pln"><a href="#n1170">1170</a></p>
 <p id="n1171" class="stm run hide_run"><a href="#n1171">1171</a></p>
@@ -1261,30 +1261,30 @@
 <p id="n1190" class="pln"><a href="#n1190">1190</a></p>
 <p id="n1191" class="pln"><a href="#n1191">1191</a></p>
 <p id="n1192" class="stm run hide_run"><a href="#n1192">1192</a></p>
-<p id="n1193" class="stm run hide_run"><a href="#n1193">1193</a></p>
-<p id="n1194" class="stm run hide_run"><a href="#n1194">1194</a></p>
-<p id="n1195" class="stm run hide_run"><a href="#n1195">1195</a></p>
+<p id="n1193" class="stm mis"><a href="#n1193">1193</a></p>
+<p id="n1194" class="stm mis"><a href="#n1194">1194</a></p>
+<p id="n1195" class="stm mis"><a href="#n1195">1195</a></p>
 <p id="n1196" class="pln"><a href="#n1196">1196</a></p>
 <p id="n1197" class="stm run hide_run"><a href="#n1197">1197</a></p>
-<p id="n1198" class="stm run hide_run"><a href="#n1198">1198</a></p>
-<p id="n1199" class="stm run hide_run"><a href="#n1199">1199</a></p>
-<p id="n1200" class="stm run hide_run"><a href="#n1200">1200</a></p>
+<p id="n1198" class="stm mis"><a href="#n1198">1198</a></p>
+<p id="n1199" class="stm mis"><a href="#n1199">1199</a></p>
+<p id="n1200" class="stm mis"><a href="#n1200">1200</a></p>
 <p id="n1201" class="pln"><a href="#n1201">1201</a></p>
 <p id="n1202" class="stm run hide_run"><a href="#n1202">1202</a></p>
-<p id="n1203" class="stm run hide_run"><a href="#n1203">1203</a></p>
-<p id="n1204" class="stm run hide_run"><a href="#n1204">1204</a></p>
-<p id="n1205" class="stm run hide_run"><a href="#n1205">1205</a></p>
+<p id="n1203" class="stm mis"><a href="#n1203">1203</a></p>
+<p id="n1204" class="stm mis"><a href="#n1204">1204</a></p>
+<p id="n1205" class="stm mis"><a href="#n1205">1205</a></p>
 <p id="n1206" class="pln"><a href="#n1206">1206</a></p>
 <p id="n1207" class="stm run hide_run"><a href="#n1207">1207</a></p>
-<p id="n1208" class="stm run hide_run"><a href="#n1208">1208</a></p>
-<p id="n1209" class="stm run hide_run"><a href="#n1209">1209</a></p>
-<p id="n1210" class="stm run hide_run"><a href="#n1210">1210</a></p>
+<p id="n1208" class="stm mis"><a href="#n1208">1208</a></p>
+<p id="n1209" class="stm mis"><a href="#n1209">1209</a></p>
+<p id="n1210" class="stm mis"><a href="#n1210">1210</a></p>
 <p id="n1211" class="pln"><a href="#n1211">1211</a></p>
 <p id="n1212" class="pln"><a href="#n1212">1212</a></p>
 <p id="n1213" class="stm run hide_run"><a href="#n1213">1213</a></p>
 <p id="n1214" class="pln"><a href="#n1214">1214</a></p>
 <p id="n1215" class="stm run hide_run"><a href="#n1215">1215</a></p>
-<p id="n1216" class="stm run hide_run"><a href="#n1216">1216</a></p>
+<p id="n1216" class="stm mis"><a href="#n1216">1216</a></p>
 <p id="n1217" class="pln"><a href="#n1217">1217</a></p>
 <p id="n1218" class="pln"><a href="#n1218">1218</a></p>
 <p id="n1219" class="pln"><a href="#n1219">1219</a></p>
@@ -1303,14 +1303,14 @@
 <p id="n1232" class="pln"><a href="#n1232">1232</a></p>
 <p id="n1233" class="pln"><a href="#n1233">1233</a></p>
 <p id="n1234" class="pln"><a href="#n1234">1234</a></p>
-<p id="n1235" class="stm run hide_run"><a href="#n1235">1235</a></p>
-<p id="n1236" class="stm run hide_run"><a href="#n1236">1236</a></p>
-<p id="n1237" class="stm run hide_run"><a href="#n1237">1237</a></p>
-<p id="n1238" class="stm run hide_run"><a href="#n1238">1238</a></p>
-<p id="n1239" class="stm run hide_run"><a href="#n1239">1239</a></p>
+<p id="n1235" class="stm mis"><a href="#n1235">1235</a></p>
+<p id="n1236" class="stm mis"><a href="#n1236">1236</a></p>
+<p id="n1237" class="stm mis"><a href="#n1237">1237</a></p>
+<p id="n1238" class="stm mis"><a href="#n1238">1238</a></p>
+<p id="n1239" class="stm mis"><a href="#n1239">1239</a></p>
 <p id="n1240" class="pln"><a href="#n1240">1240</a></p>
 <p id="n1241" class="stm run hide_run"><a href="#n1241">1241</a></p>
-<p id="n1242" class="stm run hide_run"><a href="#n1242">1242</a></p>
+<p id="n1242" class="stm mis"><a href="#n1242">1242</a></p>
 <p id="n1243" class="pln"><a href="#n1243">1243</a></p>
 <p id="n1244" class="pln"><a href="#n1244">1244</a></p>
 <p id="n1245" class="pln"><a href="#n1245">1245</a></p>
@@ -1329,11 +1329,11 @@
 <p id="n1258" class="pln"><a href="#n1258">1258</a></p>
 <p id="n1259" class="pln"><a href="#n1259">1259</a></p>
 <p id="n1260" class="pln"><a href="#n1260">1260</a></p>
-<p id="n1261" class="stm run hide_run"><a href="#n1261">1261</a></p>
-<p id="n1262" class="stm run hide_run"><a href="#n1262">1262</a></p>
-<p id="n1263" class="stm run hide_run"><a href="#n1263">1263</a></p>
-<p id="n1264" class="stm run hide_run"><a href="#n1264">1264</a></p>
-<p id="n1265" class="stm run hide_run"><a href="#n1265">1265</a></p>
+<p id="n1261" class="stm mis"><a href="#n1261">1261</a></p>
+<p id="n1262" class="stm mis"><a href="#n1262">1262</a></p>
+<p id="n1263" class="stm mis"><a href="#n1263">1263</a></p>
+<p id="n1264" class="stm mis"><a href="#n1264">1264</a></p>
+<p id="n1265" class="stm mis"><a href="#n1265">1265</a></p>
 <p id="n1266" class="pln"><a href="#n1266">1266</a></p>
 <p id="n1267" class="pln"><a href="#n1267">1267</a></p>
 <p id="n1268" class="stm run hide_run"><a href="#n1268">1268</a></p>
@@ -1343,18 +1343,18 @@
 <p id="n1272" class="pln"><a href="#n1272">1272</a></p>
 <p id="n1273" class="pln"><a href="#n1273">1273</a></p>
 <p id="n1274" class="stm run hide_run"><a href="#n1274">1274</a></p>
-<p id="n1275" class="stm run hide_run"><a href="#n1275">1275</a></p>
-<p id="n1276" class="stm run hide_run"><a href="#n1276">1276</a></p>
+<p id="n1275" class="stm mis"><a href="#n1275">1275</a></p>
+<p id="n1276" class="stm mis"><a href="#n1276">1276</a></p>
 <p id="n1277" class="pln"><a href="#n1277">1277</a></p>
 <p id="n1278" class="stm run hide_run"><a href="#n1278">1278</a></p>
-<p id="n1279" class="stm run hide_run"><a href="#n1279">1279</a></p>
+<p id="n1279" class="stm mis"><a href="#n1279">1279</a></p>
 <p id="n1280" class="pln"><a href="#n1280">1280</a></p>
 <p id="n1281" class="pln"><a href="#n1281">1281</a></p>
 <p id="n1282" class="pln"><a href="#n1282">1282</a></p>
 <p id="n1283" class="pln"><a href="#n1283">1283</a></p>
-<p id="n1284" class="stm run hide_run"><a href="#n1284">1284</a></p>
-<p id="n1285" class="stm run hide_run"><a href="#n1285">1285</a></p>
-<p id="n1286" class="stm run hide_run"><a href="#n1286">1286</a></p>
+<p id="n1284" class="stm mis"><a href="#n1284">1284</a></p>
+<p id="n1285" class="stm mis"><a href="#n1285">1285</a></p>
+<p id="n1286" class="stm mis"><a href="#n1286">1286</a></p>
 <p id="n1287" class="pln"><a href="#n1287">1287</a></p>
 <p id="n1288" class="pln"><a href="#n1288">1288</a></p>
 <p id="n1289" class="stm run hide_run"><a href="#n1289">1289</a></p>
@@ -1406,36 +1406,36 @@
 <p id="n1335" class="pln"><a href="#n1335">1335</a></p>
 <p id="n1336" class="stm run hide_run"><a href="#n1336">1336</a></p>
 <p id="n1337" class="pln"><a href="#n1337">1337</a></p>
-<p id="n1338" class="stm run hide_run"><a href="#n1338">1338</a></p>
-<p id="n1339" class="stm run hide_run"><a href="#n1339">1339</a></p>
-<p id="n1340" class="stm run hide_run"><a href="#n1340">1340</a></p>
+<p id="n1338" class="stm mis"><a href="#n1338">1338</a></p>
+<p id="n1339" class="stm mis"><a href="#n1339">1339</a></p>
+<p id="n1340" class="stm mis"><a href="#n1340">1340</a></p>
 <p id="n1341" class="pln"><a href="#n1341">1341</a></p>
 <p id="n1342" class="stm run hide_run"><a href="#n1342">1342</a></p>
 <p id="n1343" class="pln"><a href="#n1343">1343</a></p>
-<p id="n1344" class="stm run hide_run"><a href="#n1344">1344</a></p>
-<p id="n1345" class="stm run hide_run"><a href="#n1345">1345</a></p>
-<p id="n1346" class="stm run hide_run"><a href="#n1346">1346</a></p>
+<p id="n1344" class="stm mis"><a href="#n1344">1344</a></p>
+<p id="n1345" class="stm mis"><a href="#n1345">1345</a></p>
+<p id="n1346" class="stm mis"><a href="#n1346">1346</a></p>
 <p id="n1347" class="pln"><a href="#n1347">1347</a></p>
 <p id="n1348" class="stm run hide_run"><a href="#n1348">1348</a></p>
 <p id="n1349" class="pln"><a href="#n1349">1349</a></p>
-<p id="n1350" class="stm run hide_run"><a href="#n1350">1350</a></p>
-<p id="n1351" class="stm run hide_run"><a href="#n1351">1351</a></p>
-<p id="n1352" class="stm run hide_run"><a href="#n1352">1352</a></p>
+<p id="n1350" class="stm mis"><a href="#n1350">1350</a></p>
+<p id="n1351" class="stm mis"><a href="#n1351">1351</a></p>
+<p id="n1352" class="stm mis"><a href="#n1352">1352</a></p>
 <p id="n1353" class="pln"><a href="#n1353">1353</a></p>
 <p id="n1354" class="stm run hide_run"><a href="#n1354">1354</a></p>
 <p id="n1355" class="pln"><a href="#n1355">1355</a></p>
-<p id="n1356" class="stm run hide_run"><a href="#n1356">1356</a></p>
-<p id="n1357" class="stm run hide_run"><a href="#n1357">1357</a></p>
-<p id="n1358" class="stm run hide_run"><a href="#n1358">1358</a></p>
+<p id="n1356" class="stm mis"><a href="#n1356">1356</a></p>
+<p id="n1357" class="stm mis"><a href="#n1357">1357</a></p>
+<p id="n1358" class="stm mis"><a href="#n1358">1358</a></p>
 <p id="n1359" class="pln"><a href="#n1359">1359</a></p>
 <p id="n1360" class="stm run hide_run"><a href="#n1360">1360</a></p>
 <p id="n1361" class="pln"><a href="#n1361">1361</a></p>
-<p id="n1362" class="stm run hide_run"><a href="#n1362">1362</a></p>
-<p id="n1363" class="stm run hide_run"><a href="#n1363">1363</a></p>
-<p id="n1364" class="stm run hide_run"><a href="#n1364">1364</a></p>
+<p id="n1362" class="stm mis"><a href="#n1362">1362</a></p>
+<p id="n1363" class="stm mis"><a href="#n1363">1363</a></p>
+<p id="n1364" class="stm mis"><a href="#n1364">1364</a></p>
 <p id="n1365" class="pln"><a href="#n1365">1365</a></p>
 <p id="n1366" class="stm run hide_run"><a href="#n1366">1366</a></p>
-<p id="n1367" class="stm run hide_run"><a href="#n1367">1367</a></p>
+<p id="n1367" class="stm mis"><a href="#n1367">1367</a></p>
 <p id="n1368" class="pln"><a href="#n1368">1368</a></p>
 <p id="n1369" class="pln"><a href="#n1369">1369</a></p>
 <p id="n1370" class="pln"><a href="#n1370">1370</a></p>
@@ -1446,43 +1446,43 @@
 <p id="n1375" class="pln"><a href="#n1375">1375</a></p>
 <p id="n1376" class="pln"><a href="#n1376">1376</a></p>
 <p id="n1377" class="pln"><a href="#n1377">1377</a></p>
-<p id="n1378" class="stm run hide_run"><a href="#n1378">1378</a></p>
+<p id="n1378" class="stm mis"><a href="#n1378">1378</a></p>
 <p id="n1379" class="pln"><a href="#n1379">1379</a></p>
-<p id="n1380" class="stm run hide_run"><a href="#n1380">1380</a></p>
-<p id="n1381" class="stm run hide_run"><a href="#n1381">1381</a></p>
-<p id="n1382" class="stm run hide_run"><a href="#n1382">1382</a></p>
+<p id="n1380" class="stm mis"><a href="#n1380">1380</a></p>
+<p id="n1381" class="stm mis"><a href="#n1381">1381</a></p>
+<p id="n1382" class="stm mis"><a href="#n1382">1382</a></p>
 <p id="n1383" class="pln"><a href="#n1383">1383</a></p>
-<p id="n1384" class="stm run hide_run"><a href="#n1384">1384</a></p>
-<p id="n1385" class="stm run hide_run"><a href="#n1385">1385</a></p>
-<p id="n1386" class="stm run hide_run"><a href="#n1386">1386</a></p>
+<p id="n1384" class="stm mis"><a href="#n1384">1384</a></p>
+<p id="n1385" class="stm mis"><a href="#n1385">1385</a></p>
+<p id="n1386" class="stm mis"><a href="#n1386">1386</a></p>
 <p id="n1387" class="pln"><a href="#n1387">1387</a></p>
-<p id="n1388" class="stm run hide_run"><a href="#n1388">1388</a></p>
-<p id="n1389" class="stm run hide_run"><a href="#n1389">1389</a></p>
-<p id="n1390" class="stm run hide_run"><a href="#n1390">1390</a></p>
+<p id="n1388" class="stm mis"><a href="#n1388">1388</a></p>
+<p id="n1389" class="stm mis"><a href="#n1389">1389</a></p>
+<p id="n1390" class="stm mis"><a href="#n1390">1390</a></p>
 <p id="n1391" class="pln"><a href="#n1391">1391</a></p>
-<p id="n1392" class="stm run hide_run"><a href="#n1392">1392</a></p>
-<p id="n1393" class="stm run hide_run"><a href="#n1393">1393</a></p>
-<p id="n1394" class="stm run hide_run"><a href="#n1394">1394</a></p>
+<p id="n1392" class="stm mis"><a href="#n1392">1392</a></p>
+<p id="n1393" class="stm mis"><a href="#n1393">1393</a></p>
+<p id="n1394" class="stm mis"><a href="#n1394">1394</a></p>
 <p id="n1395" class="pln"><a href="#n1395">1395</a></p>
-<p id="n1396" class="stm run hide_run"><a href="#n1396">1396</a></p>
-<p id="n1397" class="stm run hide_run"><a href="#n1397">1397</a></p>
-<p id="n1398" class="stm run hide_run"><a href="#n1398">1398</a></p>
-<p id="n1399" class="stm run hide_run"><a href="#n1399">1399</a></p>
+<p id="n1396" class="stm mis"><a href="#n1396">1396</a></p>
+<p id="n1397" class="stm mis"><a href="#n1397">1397</a></p>
+<p id="n1398" class="stm mis"><a href="#n1398">1398</a></p>
+<p id="n1399" class="stm mis"><a href="#n1399">1399</a></p>
 <p id="n1400" class="pln"><a href="#n1400">1400</a></p>
-<p id="n1401" class="stm run hide_run"><a href="#n1401">1401</a></p>
-<p id="n1402" class="stm run hide_run"><a href="#n1402">1402</a></p>
-<p id="n1403" class="stm run hide_run"><a href="#n1403">1403</a></p>
-<p id="n1404" class="stm run hide_run"><a href="#n1404">1404</a></p>
+<p id="n1401" class="stm mis"><a href="#n1401">1401</a></p>
+<p id="n1402" class="stm mis"><a href="#n1402">1402</a></p>
+<p id="n1403" class="stm mis"><a href="#n1403">1403</a></p>
+<p id="n1404" class="stm mis"><a href="#n1404">1404</a></p>
 <p id="n1405" class="pln"><a href="#n1405">1405</a></p>
-<p id="n1406" class="stm run hide_run"><a href="#n1406">1406</a></p>
-<p id="n1407" class="stm run hide_run"><a href="#n1407">1407</a></p>
-<p id="n1408" class="stm run hide_run"><a href="#n1408">1408</a></p>
-<p id="n1409" class="stm run hide_run"><a href="#n1409">1409</a></p>
+<p id="n1406" class="stm mis"><a href="#n1406">1406</a></p>
+<p id="n1407" class="stm mis"><a href="#n1407">1407</a></p>
+<p id="n1408" class="stm mis"><a href="#n1408">1408</a></p>
+<p id="n1409" class="stm mis"><a href="#n1409">1409</a></p>
 <p id="n1410" class="pln"><a href="#n1410">1410</a></p>
 <p id="n1411" class="stm run hide_run"><a href="#n1411">1411</a></p>
 <p id="n1412" class="pln"><a href="#n1412">1412</a></p>
 <p id="n1413" class="pln"><a href="#n1413">1413</a></p>
-<p id="n1414" class="stm run hide_run"><a href="#n1414">1414</a></p>
+<p id="n1414" class="stm mis"><a href="#n1414">1414</a></p>
 <p id="n1415" class="pln"><a href="#n1415">1415</a></p>
 <p id="n1416" class="pln"><a href="#n1416">1416</a></p>
 <p id="n1417" class="pln"><a href="#n1417">1417</a></p>
@@ -1506,18 +1506,18 @@
 <p id="n1435" class="pln"><a href="#n1435">1435</a></p>
 <p id="n1436" class="pln"><a href="#n1436">1436</a></p>
 <p id="n1437" class="pln"><a href="#n1437">1437</a></p>
-<p id="n1438" class="stm run hide_run"><a href="#n1438">1438</a></p>
+<p id="n1438" class="stm mis"><a href="#n1438">1438</a></p>
 <p id="n1439" class="pln"><a href="#n1439">1439</a></p>
 <p id="n1440" class="pln"><a href="#n1440">1440</a></p>
-<p id="n1441" class="stm run hide_run"><a href="#n1441">1441</a></p>
-<p id="n1442" class="stm run hide_run"><a href="#n1442">1442</a></p>
+<p id="n1441" class="stm mis"><a href="#n1441">1441</a></p>
+<p id="n1442" class="stm mis"><a href="#n1442">1442</a></p>
 <p id="n1443" class="pln"><a href="#n1443">1443</a></p>
 <p id="n1444" class="pln"><a href="#n1444">1444</a></p>
 <p id="n1445" class="stm run hide_run"><a href="#n1445">1445</a></p>
 <p id="n1446" class="pln"><a href="#n1446">1446</a></p>
 <p id="n1447" class="stm run hide_run"><a href="#n1447">1447</a></p>
 <p id="n1448" class="pln"><a href="#n1448">1448</a></p>
-<p id="n1449" class="stm run hide_run"><a href="#n1449">1449</a></p>
+<p id="n1449" class="stm mis"><a href="#n1449">1449</a></p>
 <p id="n1450" class="pln"><a href="#n1450">1450</a></p>
 <p id="n1451" class="pln"><a href="#n1451">1451</a></p>
 <p id="n1452" class="pln"><a href="#n1452">1452</a></p>
@@ -1532,21 +1532,21 @@
 <p id="n1461" class="pln"><a href="#n1461">1461</a></p>
 <p id="n1462" class="pln"><a href="#n1462">1462</a></p>
 <p id="n1463" class="pln"><a href="#n1463">1463</a></p>
-<p id="n1464" class="stm run hide_run"><a href="#n1464">1464</a></p>
-<p id="n1465" class="stm run hide_run"><a href="#n1465">1465</a></p>
-<p id="n1466" class="stm run hide_run"><a href="#n1466">1466</a></p>
-<p id="n1467" class="stm run hide_run"><a href="#n1467">1467</a></p>
-<p id="n1468" class="stm run hide_run"><a href="#n1468">1468</a></p>
-<p id="n1469" class="stm run hide_run"><a href="#n1469">1469</a></p>
-<p id="n1470" class="stm run hide_run"><a href="#n1470">1470</a></p>
-<p id="n1471" class="stm run hide_run"><a href="#n1471">1471</a></p>
-<p id="n1472" class="stm run hide_run"><a href="#n1472">1472</a></p>
-<p id="n1473" class="stm run hide_run"><a href="#n1473">1473</a></p>
-<p id="n1474" class="stm run hide_run"><a href="#n1474">1474</a></p>
-<p id="n1475" class="stm run hide_run"><a href="#n1475">1475</a></p>
+<p id="n1464" class="stm mis"><a href="#n1464">1464</a></p>
+<p id="n1465" class="stm mis"><a href="#n1465">1465</a></p>
+<p id="n1466" class="stm mis"><a href="#n1466">1466</a></p>
+<p id="n1467" class="stm mis"><a href="#n1467">1467</a></p>
+<p id="n1468" class="stm mis"><a href="#n1468">1468</a></p>
+<p id="n1469" class="stm mis"><a href="#n1469">1469</a></p>
+<p id="n1470" class="stm mis"><a href="#n1470">1470</a></p>
+<p id="n1471" class="stm mis"><a href="#n1471">1471</a></p>
+<p id="n1472" class="stm mis"><a href="#n1472">1472</a></p>
+<p id="n1473" class="stm mis"><a href="#n1473">1473</a></p>
+<p id="n1474" class="stm mis"><a href="#n1474">1474</a></p>
+<p id="n1475" class="stm mis"><a href="#n1475">1475</a></p>
 <p id="n1476" class="pln"><a href="#n1476">1476</a></p>
 <p id="n1477" class="stm run hide_run"><a href="#n1477">1477</a></p>
-<p id="n1478" class="stm run hide_run"><a href="#n1478">1478</a></p>
+<p id="n1478" class="stm mis"><a href="#n1478">1478</a></p>
 <p id="n1479" class="pln"><a href="#n1479">1479</a></p>
 <p id="n1480" class="pln"><a href="#n1480">1480</a></p>
 <p id="n1481" class="pln"><a href="#n1481">1481</a></p>
@@ -1572,16 +1572,16 @@
 <p id="n1501" class="pln"><a href="#n1501">1501</a></p>
 <p id="n1502" class="pln"><a href="#n1502">1502</a></p>
 <p id="n1503" class="pln"><a href="#n1503">1503</a></p>
-<p id="n1504" class="stm run hide_run"><a href="#n1504">1504</a></p>
-<p id="n1505" class="stm run hide_run"><a href="#n1505">1505</a></p>
-<p id="n1506" class="stm run hide_run"><a href="#n1506">1506</a></p>
-<p id="n1507" class="stm run hide_run"><a href="#n1507">1507</a></p>
-<p id="n1508" class="stm run hide_run"><a href="#n1508">1508</a></p>
-<p id="n1509" class="stm run hide_run"><a href="#n1509">1509</a></p>
+<p id="n1504" class="stm mis"><a href="#n1504">1504</a></p>
+<p id="n1505" class="stm mis"><a href="#n1505">1505</a></p>
+<p id="n1506" class="stm mis"><a href="#n1506">1506</a></p>
+<p id="n1507" class="stm mis"><a href="#n1507">1507</a></p>
+<p id="n1508" class="stm mis"><a href="#n1508">1508</a></p>
+<p id="n1509" class="stm mis"><a href="#n1509">1509</a></p>
 <p id="n1510" class="pln"><a href="#n1510">1510</a></p>
 <p id="n1511" class="stm run hide_run"><a href="#n1511">1511</a></p>
 <p id="n1512" class="pln"><a href="#n1512">1512</a></p>
-<p id="n1513" class="stm run hide_run"><a href="#n1513">1513</a></p>
+<p id="n1513" class="stm mis"><a href="#n1513">1513</a></p>
 <p id="n1514" class="pln"><a href="#n1514">1514</a></p>
 <p id="n1515" class="pln"><a href="#n1515">1515</a></p>
 <p id="n1516" class="pln"><a href="#n1516">1516</a></p>
@@ -1626,15 +1626,15 @@
 <p id="n1555" class="pln"><a href="#n1555">1555</a></p>
 <p id="n1556" class="pln"><a href="#n1556">1556</a></p>
 <p id="n1557" class="pln"><a href="#n1557">1557</a></p>
-<p id="n1558" class="stm run hide_run"><a href="#n1558">1558</a></p>
-<p id="n1559" class="stm run hide_run"><a href="#n1559">1559</a></p>
-<p id="n1560" class="stm run hide_run"><a href="#n1560">1560</a></p>
-<p id="n1561" class="stm run hide_run"><a href="#n1561">1561</a></p>
-<p id="n1562" class="stm run hide_run"><a href="#n1562">1562</a></p>
-<p id="n1563" class="stm run hide_run"><a href="#n1563">1563</a></p>
+<p id="n1558" class="stm mis"><a href="#n1558">1558</a></p>
+<p id="n1559" class="stm mis"><a href="#n1559">1559</a></p>
+<p id="n1560" class="stm mis"><a href="#n1560">1560</a></p>
+<p id="n1561" class="stm mis"><a href="#n1561">1561</a></p>
+<p id="n1562" class="stm mis"><a href="#n1562">1562</a></p>
+<p id="n1563" class="stm mis"><a href="#n1563">1563</a></p>
 <p id="n1564" class="pln"><a href="#n1564">1564</a></p>
 <p id="n1565" class="stm run hide_run"><a href="#n1565">1565</a></p>
-<p id="n1566" class="stm run hide_run"><a href="#n1566">1566</a></p>
+<p id="n1566" class="stm mis"><a href="#n1566">1566</a></p>
 <p id="n1567" class="pln"><a href="#n1567">1567</a></p>
 <p id="n1568" class="pln"><a href="#n1568">1568</a></p>
 <p id="n1569" class="pln"><a href="#n1569">1569</a></p>
@@ -1662,35 +1662,35 @@
 <p id="n1591" class="pln"><a href="#n1591">1591</a></p>
 <p id="n1592" class="pln"><a href="#n1592">1592</a></p>
 <p id="n1593" class="pln"><a href="#n1593">1593</a></p>
-<p id="n1594" class="stm run hide_run"><a href="#n1594">1594</a></p>
+<p id="n1594" class="stm mis"><a href="#n1594">1594</a></p>
 <p id="n1595" class="pln"><a href="#n1595">1595</a></p>
-<p id="n1596" class="stm run hide_run"><a href="#n1596">1596</a></p>
-<p id="n1597" class="stm run hide_run"><a href="#n1597">1597</a></p>
-<p id="n1598" class="stm run hide_run"><a href="#n1598">1598</a></p>
+<p id="n1596" class="stm mis"><a href="#n1596">1596</a></p>
+<p id="n1597" class="stm mis"><a href="#n1597">1597</a></p>
+<p id="n1598" class="stm mis"><a href="#n1598">1598</a></p>
 <p id="n1599" class="pln"><a href="#n1599">1599</a></p>
-<p id="n1600" class="stm run hide_run"><a href="#n1600">1600</a></p>
-<p id="n1601" class="stm run hide_run"><a href="#n1601">1601</a></p>
-<p id="n1602" class="stm run hide_run"><a href="#n1602">1602</a></p>
+<p id="n1600" class="stm mis"><a href="#n1600">1600</a></p>
+<p id="n1601" class="stm mis"><a href="#n1601">1601</a></p>
+<p id="n1602" class="stm mis"><a href="#n1602">1602</a></p>
 <p id="n1603" class="pln"><a href="#n1603">1603</a></p>
-<p id="n1604" class="stm run hide_run"><a href="#n1604">1604</a></p>
-<p id="n1605" class="stm run hide_run"><a href="#n1605">1605</a></p>
+<p id="n1604" class="stm mis"><a href="#n1604">1604</a></p>
+<p id="n1605" class="stm mis"><a href="#n1605">1605</a></p>
 <p id="n1606" class="pln"><a href="#n1606">1606</a></p>
 <p id="n1607" class="stm run hide_run"><a href="#n1607">1607</a></p>
-<p id="n1608" class="stm run hide_run"><a href="#n1608">1608</a></p>
+<p id="n1608" class="stm mis"><a href="#n1608">1608</a></p>
 <p id="n1609" class="pln"><a href="#n1609">1609</a></p>
 <p id="n1610" class="pln"><a href="#n1610">1610</a></p>
 <p id="n1611" class="pln"><a href="#n1611">1611</a></p>
 <p id="n1612" class="pln"><a href="#n1612">1612</a></p>
 <p id="n1613" class="pln"><a href="#n1613">1613</a></p>
-<p id="n1614" class="stm run hide_run"><a href="#n1614">1614</a></p>
-<p id="n1615" class="stm run hide_run"><a href="#n1615">1615</a></p>
-<p id="n1616" class="stm run hide_run"><a href="#n1616">1616</a></p>
-<p id="n1617" class="stm run hide_run"><a href="#n1617">1617</a></p>
+<p id="n1614" class="stm mis"><a href="#n1614">1614</a></p>
+<p id="n1615" class="stm mis"><a href="#n1615">1615</a></p>
+<p id="n1616" class="stm mis"><a href="#n1616">1616</a></p>
+<p id="n1617" class="stm mis"><a href="#n1617">1617</a></p>
 <p id="n1618" class="pln"><a href="#n1618">1618</a></p>
 <p id="n1619" class="stm run hide_run"><a href="#n1619">1619</a></p>
 <p id="n1620" class="pln"><a href="#n1620">1620</a></p>
 <p id="n1621" class="pln"><a href="#n1621">1621</a></p>
-<p id="n1622" class="stm run hide_run"><a href="#n1622">1622</a></p>
+<p id="n1622" class="stm mis"><a href="#n1622">1622</a></p>
 <p id="n1623" class="pln"><a href="#n1623">1623</a></p>
 <p id="n1624" class="pln"><a href="#n1624">1624</a></p>
 <p id="n1625" class="pln"><a href="#n1625">1625</a></p>
@@ -1704,15 +1704,15 @@
 <p id="n1633" class="pln"><a href="#n1633">1633</a></p>
 <p id="n1634" class="pln"><a href="#n1634">1634</a></p>
 <p id="n1635" class="pln"><a href="#n1635">1635</a></p>
-<p id="n1636" class="stm run hide_run"><a href="#n1636">1636</a></p>
-<p id="n1637" class="stm run hide_run"><a href="#n1637">1637</a></p>
-<p id="n1638" class="stm run hide_run"><a href="#n1638">1638</a></p>
-<p id="n1639" class="stm run hide_run"><a href="#n1639">1639</a></p>
-<p id="n1640" class="stm run hide_run"><a href="#n1640">1640</a></p>
-<p id="n1641" class="stm run hide_run"><a href="#n1641">1641</a></p>
+<p id="n1636" class="stm mis"><a href="#n1636">1636</a></p>
+<p id="n1637" class="stm mis"><a href="#n1637">1637</a></p>
+<p id="n1638" class="stm mis"><a href="#n1638">1638</a></p>
+<p id="n1639" class="stm mis"><a href="#n1639">1639</a></p>
+<p id="n1640" class="stm mis"><a href="#n1640">1640</a></p>
+<p id="n1641" class="stm mis"><a href="#n1641">1641</a></p>
 <p id="n1642" class="pln"><a href="#n1642">1642</a></p>
 <p id="n1643" class="stm run hide_run"><a href="#n1643">1643</a></p>
-<p id="n1644" class="stm run hide_run"><a href="#n1644">1644</a></p>
+<p id="n1644" class="stm mis"><a href="#n1644">1644</a></p>
 <p id="n1645" class="pln"><a href="#n1645">1645</a></p>
 <p id="n1646" class="pln"><a href="#n1646">1646</a></p>
 <p id="n1647" class="pln"><a href="#n1647">1647</a></p>
@@ -1731,60 +1731,60 @@
 <p id="n1660" class="pln"><a href="#n1660">1660</a></p>
 <p id="n1661" class="pln"><a href="#n1661">1661</a></p>
 <p id="n1662" class="pln"><a href="#n1662">1662</a></p>
-<p id="n1663" class="stm run hide_run"><a href="#n1663">1663</a></p>
-<p id="n1664" class="stm run hide_run"><a href="#n1664">1664</a></p>
-<p id="n1665" class="stm run hide_run"><a href="#n1665">1665</a></p>
-<p id="n1666" class="stm run hide_run"><a href="#n1666">1666</a></p>
-<p id="n1667" class="stm run hide_run"><a href="#n1667">1667</a></p>
-<p id="n1668" class="stm run hide_run"><a href="#n1668">1668</a></p>
-<p id="n1669" class="stm run hide_run"><a href="#n1669">1669</a></p>
-<p id="n1670" class="stm run hide_run"><a href="#n1670">1670</a></p>
-<p id="n1671" class="stm run hide_run"><a href="#n1671">1671</a></p>
-<p id="n1672" class="stm run hide_run"><a href="#n1672">1672</a></p>
-<p id="n1673" class="stm run hide_run"><a href="#n1673">1673</a></p>
-<p id="n1674" class="stm run hide_run"><a href="#n1674">1674</a></p>
-<p id="n1675" class="stm run hide_run"><a href="#n1675">1675</a></p>
-<p id="n1676" class="stm run hide_run"><a href="#n1676">1676</a></p>
-<p id="n1677" class="stm run hide_run"><a href="#n1677">1677</a></p>
-<p id="n1678" class="stm run hide_run"><a href="#n1678">1678</a></p>
-<p id="n1679" class="stm run hide_run"><a href="#n1679">1679</a></p>
-<p id="n1680" class="stm run hide_run"><a href="#n1680">1680</a></p>
+<p id="n1663" class="stm mis"><a href="#n1663">1663</a></p>
+<p id="n1664" class="stm mis"><a href="#n1664">1664</a></p>
+<p id="n1665" class="stm mis"><a href="#n1665">1665</a></p>
+<p id="n1666" class="stm mis"><a href="#n1666">1666</a></p>
+<p id="n1667" class="stm mis"><a href="#n1667">1667</a></p>
+<p id="n1668" class="stm mis"><a href="#n1668">1668</a></p>
+<p id="n1669" class="stm mis"><a href="#n1669">1669</a></p>
+<p id="n1670" class="stm mis"><a href="#n1670">1670</a></p>
+<p id="n1671" class="stm mis"><a href="#n1671">1671</a></p>
+<p id="n1672" class="stm mis"><a href="#n1672">1672</a></p>
+<p id="n1673" class="stm mis"><a href="#n1673">1673</a></p>
+<p id="n1674" class="stm mis"><a href="#n1674">1674</a></p>
+<p id="n1675" class="stm mis"><a href="#n1675">1675</a></p>
+<p id="n1676" class="stm mis"><a href="#n1676">1676</a></p>
+<p id="n1677" class="stm mis"><a href="#n1677">1677</a></p>
+<p id="n1678" class="stm mis"><a href="#n1678">1678</a></p>
+<p id="n1679" class="stm mis"><a href="#n1679">1679</a></p>
+<p id="n1680" class="stm mis"><a href="#n1680">1680</a></p>
 <p id="n1681" class="pln"><a href="#n1681">1681</a></p>
 <p id="n1682" class="stm run hide_run"><a href="#n1682">1682</a></p>
-<p id="n1683" class="stm run hide_run"><a href="#n1683">1683</a></p>
+<p id="n1683" class="stm mis"><a href="#n1683">1683</a></p>
 <p id="n1684" class="pln"><a href="#n1684">1684</a></p>
 <p id="n1685" class="pln"><a href="#n1685">1685</a></p>
 <p id="n1686" class="pln"><a href="#n1686">1686</a></p>
 <p id="n1687" class="pln"><a href="#n1687">1687</a></p>
 <p id="n1688" class="pln"><a href="#n1688">1688</a></p>
 <p id="n1689" class="pln"><a href="#n1689">1689</a></p>
-<p id="n1690" class="stm run hide_run"><a href="#n1690">1690</a></p>
-<p id="n1691" class="stm run hide_run"><a href="#n1691">1691</a></p>
-<p id="n1692" class="stm run hide_run"><a href="#n1692">1692</a></p>
-<p id="n1693" class="stm run hide_run"><a href="#n1693">1693</a></p>
-<p id="n1694" class="stm run hide_run"><a href="#n1694">1694</a></p>
-<p id="n1695" class="stm run hide_run"><a href="#n1695">1695</a></p>
-<p id="n1696" class="stm run hide_run"><a href="#n1696">1696</a></p>
-<p id="n1697" class="stm run hide_run"><a href="#n1697">1697</a></p>
+<p id="n1690" class="stm mis"><a href="#n1690">1690</a></p>
+<p id="n1691" class="stm mis"><a href="#n1691">1691</a></p>
+<p id="n1692" class="stm mis"><a href="#n1692">1692</a></p>
+<p id="n1693" class="stm mis"><a href="#n1693">1693</a></p>
+<p id="n1694" class="stm mis"><a href="#n1694">1694</a></p>
+<p id="n1695" class="stm mis"><a href="#n1695">1695</a></p>
+<p id="n1696" class="stm mis"><a href="#n1696">1696</a></p>
+<p id="n1697" class="stm mis"><a href="#n1697">1697</a></p>
 <p id="n1698" class="pln"><a href="#n1698">1698</a></p>
 <p id="n1699" class="stm run hide_run"><a href="#n1699">1699</a></p>
-<p id="n1700" class="stm run hide_run"><a href="#n1700">1700</a></p>
-<p id="n1701" class="stm run hide_run"><a href="#n1701">1701</a></p>
-<p id="n1702" class="stm run hide_run"><a href="#n1702">1702</a></p>
-<p id="n1703" class="stm run hide_run"><a href="#n1703">1703</a></p>
-<p id="n1704" class="stm run hide_run"><a href="#n1704">1704</a></p>
+<p id="n1700" class="stm mis"><a href="#n1700">1700</a></p>
+<p id="n1701" class="stm mis"><a href="#n1701">1701</a></p>
+<p id="n1702" class="stm mis"><a href="#n1702">1702</a></p>
+<p id="n1703" class="stm mis"><a href="#n1703">1703</a></p>
+<p id="n1704" class="stm mis"><a href="#n1704">1704</a></p>
 <p id="n1705" class="pln"><a href="#n1705">1705</a></p>
-<p id="n1706" class="stm run hide_run"><a href="#n1706">1706</a></p>
-<p id="n1707" class="stm run hide_run"><a href="#n1707">1707</a></p>
-<p id="n1708" class="stm run hide_run"><a href="#n1708">1708</a></p>
-<p id="n1709" class="stm run hide_run"><a href="#n1709">1709</a></p>
-<p id="n1710" class="stm run hide_run"><a href="#n1710">1710</a></p>
-<p id="n1711" class="stm run hide_run"><a href="#n1711">1711</a></p>
-<p id="n1712" class="stm run hide_run"><a href="#n1712">1712</a></p>
+<p id="n1706" class="stm mis"><a href="#n1706">1706</a></p>
+<p id="n1707" class="stm mis"><a href="#n1707">1707</a></p>
+<p id="n1708" class="stm mis"><a href="#n1708">1708</a></p>
+<p id="n1709" class="stm mis"><a href="#n1709">1709</a></p>
+<p id="n1710" class="stm mis"><a href="#n1710">1710</a></p>
+<p id="n1711" class="stm mis"><a href="#n1711">1711</a></p>
+<p id="n1712" class="stm mis"><a href="#n1712">1712</a></p>
 <p id="n1713" class="pln"><a href="#n1713">1713</a></p>
 <p id="n1714" class="pln"><a href="#n1714">1714</a></p>
 <p id="n1715" class="stm run hide_run"><a href="#n1715">1715</a></p>
-<p id="n1716" class="stm run hide_run"><a href="#n1716">1716</a></p>
+<p id="n1716" class="stm mis"><a href="#n1716">1716</a></p>
 <p id="n1717" class="pln"><a href="#n1717">1717</a></p>
 <p id="n1718" class="pln"><a href="#n1718">1718</a></p>
 <p id="n1719" class="pln"><a href="#n1719">1719</a></p>
@@ -1806,12 +1806,12 @@
 <p id="n1735" class="pln"><a href="#n1735">1735</a></p>
 <p id="n1736" class="pln"><a href="#n1736">1736</a></p>
 <p id="n1737" class="pln"><a href="#n1737">1737</a></p>
-<p id="n1738" class="stm run hide_run"><a href="#n1738">1738</a></p>
-<p id="n1739" class="stm run hide_run"><a href="#n1739">1739</a></p>
-<p id="n1740" class="stm run hide_run"><a href="#n1740">1740</a></p>
+<p id="n1738" class="stm mis"><a href="#n1738">1738</a></p>
+<p id="n1739" class="stm mis"><a href="#n1739">1739</a></p>
+<p id="n1740" class="stm mis"><a href="#n1740">1740</a></p>
 <p id="n1741" class="pln"><a href="#n1741">1741</a></p>
 <p id="n1742" class="stm run hide_run"><a href="#n1742">1742</a></p>
-<p id="n1743" class="stm run hide_run"><a href="#n1743">1743</a></p>
+<p id="n1743" class="stm mis"><a href="#n1743">1743</a></p>
 <p id="n1744" class="pln"><a href="#n1744">1744</a></p>
 <p id="n1745" class="pln"><a href="#n1745">1745</a></p>
 <p id="n1746" class="pln"><a href="#n1746">1746</a></p>
@@ -1826,12 +1826,12 @@
 <p id="n1755" class="pln"><a href="#n1755">1755</a></p>
 <p id="n1756" class="pln"><a href="#n1756">1756</a></p>
 <p id="n1757" class="pln"><a href="#n1757">1757</a></p>
-<p id="n1758" class="stm run hide_run"><a href="#n1758">1758</a></p>
-<p id="n1759" class="stm run hide_run"><a href="#n1759">1759</a></p>
-<p id="n1760" class="stm run hide_run"><a href="#n1760">1760</a></p>
+<p id="n1758" class="stm mis"><a href="#n1758">1758</a></p>
+<p id="n1759" class="stm mis"><a href="#n1759">1759</a></p>
+<p id="n1760" class="stm mis"><a href="#n1760">1760</a></p>
 <p id="n1761" class="pln"><a href="#n1761">1761</a></p>
 <p id="n1762" class="stm run hide_run"><a href="#n1762">1762</a></p>
-<p id="n1763" class="stm run hide_run"><a href="#n1763">1763</a></p>
+<p id="n1763" class="stm mis"><a href="#n1763">1763</a></p>
 <p id="n1764" class="pln"><a href="#n1764">1764</a></p>
 <p id="n1765" class="pln"><a href="#n1765">1765</a></p>
 <p id="n1766" class="pln"><a href="#n1766">1766</a></p>
@@ -1844,9 +1844,9 @@
 <p id="n1773" class="pln"><a href="#n1773">1773</a></p>
 <p id="n1774" class="pln"><a href="#n1774">1774</a></p>
 <p id="n1775" class="pln"><a href="#n1775">1775</a></p>
-<p id="n1776" class="stm run hide_run"><a href="#n1776">1776</a></p>
-<p id="n1777" class="stm run hide_run"><a href="#n1777">1777</a></p>
-<p id="n1778" class="stm run hide_run"><a href="#n1778">1778</a></p>
+<p id="n1776" class="stm mis"><a href="#n1776">1776</a></p>
+<p id="n1777" class="stm mis"><a href="#n1777">1777</a></p>
+<p id="n1778" class="stm mis"><a href="#n1778">1778</a></p>
 <p id="n1779" class="pln"><a href="#n1779">1779</a></p>
 <p id="n1780" class="pln"><a href="#n1780">1780</a></p>
 <p id="n1781" class="stm run hide_run"><a href="#n1781">1781</a></p>
@@ -1882,41 +1882,41 @@
 <p id="n1811" class="exc"><a href="#n1811">1811</a></p>
 <p id="n1812" class="pln"><a href="#n1812">1812</a></p>
 <p id="n1813" class="stm run hide_run"><a href="#n1813">1813</a></p>
-<p id="n1814" class="stm run hide_run"><a href="#n1814">1814</a></p>
-<p id="n1815" class="stm run hide_run"><a href="#n1815">1815</a></p>
-<p id="n1816" class="stm run hide_run"><a href="#n1816">1816</a></p>
-<p id="n1817" class="stm run hide_run"><a href="#n1817">1817</a></p>
-<p id="n1818" class="stm run hide_run"><a href="#n1818">1818</a></p>
+<p id="n1814" class="stm mis"><a href="#n1814">1814</a></p>
+<p id="n1815" class="stm mis"><a href="#n1815">1815</a></p>
+<p id="n1816" class="stm mis"><a href="#n1816">1816</a></p>
+<p id="n1817" class="stm mis"><a href="#n1817">1817</a></p>
+<p id="n1818" class="stm mis"><a href="#n1818">1818</a></p>
 <p id="n1819" class="pln"><a href="#n1819">1819</a></p>
 <p id="n1820" class="stm run hide_run"><a href="#n1820">1820</a></p>
-<p id="n1821" class="stm run hide_run"><a href="#n1821">1821</a></p>
-<p id="n1822" class="stm run hide_run"><a href="#n1822">1822</a></p>
+<p id="n1821" class="stm mis"><a href="#n1821">1821</a></p>
+<p id="n1822" class="stm mis"><a href="#n1822">1822</a></p>
 <p id="n1823" class="pln"><a href="#n1823">1823</a></p>
 <p id="n1824" class="stm run hide_run"><a href="#n1824">1824</a></p>
-<p id="n1825" class="stm run hide_run"><a href="#n1825">1825</a></p>
-<p id="n1826" class="stm run hide_run"><a href="#n1826">1826</a></p>
-<p id="n1827" class="stm run hide_run"><a href="#n1827">1827</a></p>
+<p id="n1825" class="stm mis"><a href="#n1825">1825</a></p>
+<p id="n1826" class="stm mis"><a href="#n1826">1826</a></p>
+<p id="n1827" class="stm mis"><a href="#n1827">1827</a></p>
 <p id="n1828" class="pln"><a href="#n1828">1828</a></p>
 <p id="n1829" class="stm run hide_run"><a href="#n1829">1829</a></p>
-<p id="n1830" class="stm run hide_run"><a href="#n1830">1830</a></p>
-<p id="n1831" class="stm run hide_run"><a href="#n1831">1831</a></p>
-<p id="n1832" class="stm run hide_run"><a href="#n1832">1832</a></p>
+<p id="n1830" class="stm mis"><a href="#n1830">1830</a></p>
+<p id="n1831" class="stm mis"><a href="#n1831">1831</a></p>
+<p id="n1832" class="stm mis"><a href="#n1832">1832</a></p>
 <p id="n1833" class="pln"><a href="#n1833">1833</a></p>
 <p id="n1834" class="stm run hide_run"><a href="#n1834">1834</a></p>
-<p id="n1835" class="stm run hide_run"><a href="#n1835">1835</a></p>
-<p id="n1836" class="stm run hide_run"><a href="#n1836">1836</a></p>
-<p id="n1837" class="stm run hide_run"><a href="#n1837">1837</a></p>
+<p id="n1835" class="stm mis"><a href="#n1835">1835</a></p>
+<p id="n1836" class="stm mis"><a href="#n1836">1836</a></p>
+<p id="n1837" class="stm mis"><a href="#n1837">1837</a></p>
 <p id="n1838" class="pln"><a href="#n1838">1838</a></p>
 <p id="n1839" class="stm run hide_run"><a href="#n1839">1839</a></p>
-<p id="n1840" class="stm run hide_run"><a href="#n1840">1840</a></p>
-<p id="n1841" class="stm run hide_run"><a href="#n1841">1841</a></p>
-<p id="n1842" class="stm run hide_run"><a href="#n1842">1842</a></p>
+<p id="n1840" class="stm mis"><a href="#n1840">1840</a></p>
+<p id="n1841" class="stm mis"><a href="#n1841">1841</a></p>
+<p id="n1842" class="stm mis"><a href="#n1842">1842</a></p>
 <p id="n1843" class="pln"><a href="#n1843">1843</a></p>
 <p id="n1844" class="pln"><a href="#n1844">1844</a></p>
 <p id="n1845" class="stm run hide_run"><a href="#n1845">1845</a></p>
 <p id="n1846" class="pln"><a href="#n1846">1846</a></p>
 <p id="n1847" class="stm run hide_run"><a href="#n1847">1847</a></p>
-<p id="n1848" class="stm run hide_run"><a href="#n1848">1848</a></p>
+<p id="n1848" class="stm mis"><a href="#n1848">1848</a></p>
 <p id="n1849" class="pln"><a href="#n1849">1849</a></p>
 <p id="n1850" class="pln"><a href="#n1850">1850</a></p>
 <p id="n1851" class="pln"><a href="#n1851">1851</a></p>
@@ -1936,12 +1936,12 @@
 <p id="n1865" class="pln"><a href="#n1865">1865</a></p>
 <p id="n1866" class="pln"><a href="#n1866">1866</a></p>
 <p id="n1867" class="pln"><a href="#n1867">1867</a></p>
-<p id="n1868" class="stm run hide_run"><a href="#n1868">1868</a></p>
-<p id="n1869" class="stm run hide_run"><a href="#n1869">1869</a></p>
-<p id="n1870" class="stm run hide_run"><a href="#n1870">1870</a></p>
+<p id="n1868" class="stm mis"><a href="#n1868">1868</a></p>
+<p id="n1869" class="stm mis"><a href="#n1869">1869</a></p>
+<p id="n1870" class="stm mis"><a href="#n1870">1870</a></p>
 <p id="n1871" class="pln"><a href="#n1871">1871</a></p>
 <p id="n1872" class="stm run hide_run"><a href="#n1872">1872</a></p>
-<p id="n1873" class="stm run hide_run"><a href="#n1873">1873</a></p>
+<p id="n1873" class="stm mis"><a href="#n1873">1873</a></p>
 <p id="n1874" class="pln"><a href="#n1874">1874</a></p>
 <p id="n1875" class="pln"><a href="#n1875">1875</a></p>
 <p id="n1876" class="pln"><a href="#n1876">1876</a></p>
@@ -1965,12 +1965,12 @@
 <p id="n1894" class="pln"><a href="#n1894">1894</a></p>
 <p id="n1895" class="pln"><a href="#n1895">1895</a></p>
 <p id="n1896" class="pln"><a href="#n1896">1896</a></p>
-<p id="n1897" class="stm run hide_run"><a href="#n1897">1897</a></p>
-<p id="n1898" class="stm run hide_run"><a href="#n1898">1898</a></p>
-<p id="n1899" class="stm run hide_run"><a href="#n1899">1899</a></p>
+<p id="n1897" class="stm mis"><a href="#n1897">1897</a></p>
+<p id="n1898" class="stm mis"><a href="#n1898">1898</a></p>
+<p id="n1899" class="stm mis"><a href="#n1899">1899</a></p>
 <p id="n1900" class="pln"><a href="#n1900">1900</a></p>
 <p id="n1901" class="stm run hide_run"><a href="#n1901">1901</a></p>
-<p id="n1902" class="stm run hide_run"><a href="#n1902">1902</a></p>
+<p id="n1902" class="stm mis"><a href="#n1902">1902</a></p>
 <p id="n1903" class="pln"><a href="#n1903">1903</a></p>
 <p id="n1904" class="pln"><a href="#n1904">1904</a></p>
 <p id="n1905" class="pln"><a href="#n1905">1905</a></p>
@@ -1994,12 +1994,12 @@
 <p id="n1923" class="pln"><a href="#n1923">1923</a></p>
 <p id="n1924" class="pln"><a href="#n1924">1924</a></p>
 <p id="n1925" class="pln"><a href="#n1925">1925</a></p>
-<p id="n1926" class="stm run hide_run"><a href="#n1926">1926</a></p>
-<p id="n1927" class="stm run hide_run"><a href="#n1927">1927</a></p>
-<p id="n1928" class="stm run hide_run"><a href="#n1928">1928</a></p>
+<p id="n1926" class="stm mis"><a href="#n1926">1926</a></p>
+<p id="n1927" class="stm mis"><a href="#n1927">1927</a></p>
+<p id="n1928" class="stm mis"><a href="#n1928">1928</a></p>
 <p id="n1929" class="pln"><a href="#n1929">1929</a></p>
 <p id="n1930" class="stm run hide_run"><a href="#n1930">1930</a></p>
-<p id="n1931" class="stm run hide_run"><a href="#n1931">1931</a></p>
+<p id="n1931" class="stm mis"><a href="#n1931">1931</a></p>
 <p id="n1932" class="pln"><a href="#n1932">1932</a></p>
 <p id="n1933" class="pln"><a href="#n1933">1933</a></p>
 <p id="n1934" class="pln"><a href="#n1934">1934</a></p>
@@ -2072,37 +2072,37 @@
 <p id="n2001" class="pln"><a href="#n2001">2001</a></p>
 <p id="n2002" class="pln"><a href="#n2002">2002</a></p>
 <p id="n2003" class="pln"><a href="#n2003">2003</a></p>
-<p id="n2004" class="stm run hide_run"><a href="#n2004">2004</a></p>
-<p id="n2005" class="stm run hide_run"><a href="#n2005">2005</a></p>
+<p id="n2004" class="stm mis"><a href="#n2004">2004</a></p>
+<p id="n2005" class="stm mis"><a href="#n2005">2005</a></p>
 <p id="n2006" class="pln"><a href="#n2006">2006</a></p>
-<p id="n2007" class="stm run hide_run"><a href="#n2007">2007</a></p>
-<p id="n2008" class="stm run hide_run"><a href="#n2008">2008</a></p>
+<p id="n2007" class="stm mis"><a href="#n2007">2007</a></p>
+<p id="n2008" class="stm mis"><a href="#n2008">2008</a></p>
 <p id="n2009" class="pln"><a href="#n2009">2009</a></p>
-<p id="n2010" class="stm run hide_run"><a href="#n2010">2010</a></p>
-<p id="n2011" class="stm run hide_run"><a href="#n2011">2011</a></p>
+<p id="n2010" class="stm mis"><a href="#n2010">2010</a></p>
+<p id="n2011" class="stm mis"><a href="#n2011">2011</a></p>
 <p id="n2012" class="pln"><a href="#n2012">2012</a></p>
-<p id="n2013" class="stm run hide_run"><a href="#n2013">2013</a></p>
-<p id="n2014" class="stm run hide_run"><a href="#n2014">2014</a></p>
+<p id="n2013" class="stm mis"><a href="#n2013">2013</a></p>
+<p id="n2014" class="stm mis"><a href="#n2014">2014</a></p>
 <p id="n2015" class="pln"><a href="#n2015">2015</a></p>
-<p id="n2016" class="stm run hide_run"><a href="#n2016">2016</a></p>
-<p id="n2017" class="stm run hide_run"><a href="#n2017">2017</a></p>
+<p id="n2016" class="stm mis"><a href="#n2016">2016</a></p>
+<p id="n2017" class="stm mis"><a href="#n2017">2017</a></p>
 <p id="n2018" class="pln"><a href="#n2018">2018</a></p>
-<p id="n2019" class="stm run hide_run"><a href="#n2019">2019</a></p>
-<p id="n2020" class="stm run hide_run"><a href="#n2020">2020</a></p>
+<p id="n2019" class="stm mis"><a href="#n2019">2019</a></p>
+<p id="n2020" class="stm mis"><a href="#n2020">2020</a></p>
 <p id="n2021" class="pln"><a href="#n2021">2021</a></p>
-<p id="n2022" class="stm run hide_run"><a href="#n2022">2022</a></p>
+<p id="n2022" class="stm mis"><a href="#n2022">2022</a></p>
 <p id="n2023" class="pln"><a href="#n2023">2023</a></p>
 <p id="n2024" class="stm run hide_run"><a href="#n2024">2024</a></p>
-<p id="n2025" class="stm run hide_run"><a href="#n2025">2025</a></p>
-<p id="n2026" class="stm run hide_run"><a href="#n2026">2026</a></p>
-<p id="n2027" class="stm run hide_run"><a href="#n2027">2027</a></p>
-<p id="n2028" class="stm run hide_run"><a href="#n2028">2028</a></p>
+<p id="n2025" class="stm mis"><a href="#n2025">2025</a></p>
+<p id="n2026" class="stm mis"><a href="#n2026">2026</a></p>
+<p id="n2027" class="stm mis"><a href="#n2027">2027</a></p>
+<p id="n2028" class="stm mis"><a href="#n2028">2028</a></p>
 <p id="n2029" class="pln"><a href="#n2029">2029</a></p>
 <p id="n2030" class="pln"><a href="#n2030">2030</a></p>
 <p id="n2031" class="stm run hide_run"><a href="#n2031">2031</a></p>
 <p id="n2032" class="pln"><a href="#n2032">2032</a></p>
 <p id="n2033" class="stm run hide_run"><a href="#n2033">2033</a></p>
-<p id="n2034" class="stm run hide_run"><a href="#n2034">2034</a></p>
+<p id="n2034" class="stm mis"><a href="#n2034">2034</a></p>
 <p id="n2035" class="pln"><a href="#n2035">2035</a></p>
 <p id="n2036" class="pln"><a href="#n2036">2036</a></p>
 <p id="n2037" class="pln"><a href="#n2037">2037</a></p>
@@ -2119,17 +2119,17 @@
 <p id="n2048" class="pln"><a href="#n2048">2048</a></p>
 <p id="n2049" class="pln"><a href="#n2049">2049</a></p>
 <p id="n2050" class="pln"><a href="#n2050">2050</a></p>
-<p id="n2051" class="stm run hide_run"><a href="#n2051">2051</a></p>
-<p id="n2052" class="stm run hide_run"><a href="#n2052">2052</a></p>
+<p id="n2051" class="stm mis"><a href="#n2051">2051</a></p>
+<p id="n2052" class="stm mis"><a href="#n2052">2052</a></p>
 <p id="n2053" class="pln"><a href="#n2053">2053</a></p>
 <p id="n2054" class="pln"><a href="#n2054">2054</a></p>
 <p id="n2055" class="pln"><a href="#n2055">2055</a></p>
 <p id="n2056" class="pln"><a href="#n2056">2056</a></p>
-<p id="n2057" class="stm run hide_run"><a href="#n2057">2057</a></p>
+<p id="n2057" class="stm mis"><a href="#n2057">2057</a></p>
 <p id="n2058" class="pln"><a href="#n2058">2058</a></p>
 <p id="n2059" class="stm run hide_run"><a href="#n2059">2059</a></p>
 <p id="n2060" class="pln"><a href="#n2060">2060</a></p>
-<p id="n2061" class="stm run hide_run"><a href="#n2061">2061</a></p>
+<p id="n2061" class="stm mis"><a href="#n2061">2061</a></p>
 <p id="n2062" class="pln"><a href="#n2062">2062</a></p>
 <p id="n2063" class="pln"><a href="#n2063">2063</a></p>
 <p id="n2064" class="pln"><a href="#n2064">2064</a></p>
@@ -2146,16 +2146,16 @@
 <p id="n2075" class="pln"><a href="#n2075">2075</a></p>
 <p id="n2076" class="pln"><a href="#n2076">2076</a></p>
 <p id="n2077" class="pln"><a href="#n2077">2077</a></p>
-<p id="n2078" class="stm run hide_run"><a href="#n2078">2078</a></p>
-<p id="n2079" class="stm run hide_run"><a href="#n2079">2079</a></p>
+<p id="n2078" class="stm mis"><a href="#n2078">2078</a></p>
+<p id="n2079" class="stm mis"><a href="#n2079">2079</a></p>
 <p id="n2080" class="pln"><a href="#n2080">2080</a></p>
 <p id="n2081" class="pln"><a href="#n2081">2081</a></p>
 <p id="n2082" class="pln"><a href="#n2082">2082</a></p>
 <p id="n2083" class="pln"><a href="#n2083">2083</a></p>
-<p id="n2084" class="stm run hide_run"><a href="#n2084">2084</a></p>
+<p id="n2084" class="stm mis"><a href="#n2084">2084</a></p>
 <p id="n2085" class="pln"><a href="#n2085">2085</a></p>
 <p id="n2086" class="stm run hide_run"><a href="#n2086">2086</a></p>
-<p id="n2087" class="stm run hide_run"><a href="#n2087">2087</a></p>
+<p id="n2087" class="stm mis"><a href="#n2087">2087</a></p>
 <p id="n2088" class="pln"><a href="#n2088">2088</a></p>
 <p id="n2089" class="pln"><a href="#n2089">2089</a></p>
 <p id="n2090" class="pln"><a href="#n2090">2090</a></p>
@@ -2172,13 +2172,13 @@
 <p id="n2101" class="pln"><a href="#n2101">2101</a></p>
 <p id="n2102" class="pln"><a href="#n2102">2102</a></p>
 <p id="n2103" class="pln"><a href="#n2103">2103</a></p>
-<p id="n2104" class="stm run hide_run"><a href="#n2104">2104</a></p>
-<p id="n2105" class="stm run hide_run"><a href="#n2105">2105</a></p>
+<p id="n2104" class="stm mis"><a href="#n2104">2104</a></p>
+<p id="n2105" class="stm mis"><a href="#n2105">2105</a></p>
 <p id="n2106" class="pln"><a href="#n2106">2106</a></p>
 <p id="n2107" class="pln"><a href="#n2107">2107</a></p>
 <p id="n2108" class="pln"><a href="#n2108">2108</a></p>
 <p id="n2109" class="pln"><a href="#n2109">2109</a></p>
-<p id="n2110" class="stm run hide_run"><a href="#n2110">2110</a></p>
+<p id="n2110" class="stm mis"><a href="#n2110">2110</a></p>
 <p id="n2111" class="pln"><a href="#n2111">2111</a></p>
 <p id="n2112" class="pln"><a href="#n2112">2112</a></p>
 <p id="n2113" class="stm run hide_run"><a href="#n2113">2113</a></p>
@@ -2186,7 +2186,7 @@
 <p id="n2115" class="pln"><a href="#n2115">2115</a></p>
 <p id="n2116" class="stm run hide_run"><a href="#n2116">2116</a></p>
 <p id="n2117" class="pln"><a href="#n2117">2117</a></p>
-<p id="n2118" class="stm run hide_run"><a href="#n2118">2118</a></p>
+<p id="n2118" class="stm mis"><a href="#n2118">2118</a></p>
 <p id="n2119" class="pln"><a href="#n2119">2119</a></p>
 <p id="n2120" class="pln"><a href="#n2120">2120</a></p>
 <p id="n2121" class="pln"><a href="#n2121">2121</a></p>
@@ -2208,25 +2208,25 @@
 <p id="n2137" class="pln"><a href="#n2137">2137</a></p>
 <p id="n2138" class="pln"><a href="#n2138">2138</a></p>
 <p id="n2139" class="pln"><a href="#n2139">2139</a></p>
-<p id="n2140" class="stm run hide_run"><a href="#n2140">2140</a></p>
-<p id="n2141" class="stm run hide_run"><a href="#n2141">2141</a></p>
-<p id="n2142" class="stm run hide_run"><a href="#n2142">2142</a></p>
+<p id="n2140" class="stm mis"><a href="#n2140">2140</a></p>
+<p id="n2141" class="stm mis"><a href="#n2141">2141</a></p>
+<p id="n2142" class="stm mis"><a href="#n2142">2142</a></p>
 <p id="n2143" class="pln"><a href="#n2143">2143</a></p>
 <p id="n2144" class="stm run hide_run"><a href="#n2144">2144</a></p>
-<p id="n2145" class="stm run hide_run"><a href="#n2145">2145</a></p>
+<p id="n2145" class="stm mis"><a href="#n2145">2145</a></p>
 <p id="n2146" class="pln"><a href="#n2146">2146</a></p>
 <p id="n2147" class="pln"><a href="#n2147">2147</a></p>
 <p id="n2148" class="pln"><a href="#n2148">2148</a></p>
 <p id="n2149" class="pln"><a href="#n2149">2149</a></p>
 <p id="n2150" class="pln"><a href="#n2150">2150</a></p>
-<p id="n2151" class="stm run hide_run"><a href="#n2151">2151</a></p>
-<p id="n2152" class="stm run hide_run"><a href="#n2152">2152</a></p>
-<p id="n2153" class="stm run hide_run"><a href="#n2153">2153</a></p>
+<p id="n2151" class="stm mis"><a href="#n2151">2151</a></p>
+<p id="n2152" class="stm mis"><a href="#n2152">2152</a></p>
+<p id="n2153" class="stm mis"><a href="#n2153">2153</a></p>
 <p id="n2154" class="pln"><a href="#n2154">2154</a></p>
 <p id="n2155" class="stm run hide_run"><a href="#n2155">2155</a></p>
 <p id="n2156" class="pln"><a href="#n2156">2156</a></p>
 <p id="n2157" class="pln"><a href="#n2157">2157</a></p>
-<p id="n2158" class="stm run hide_run"><a href="#n2158">2158</a></p>
+<p id="n2158" class="stm mis"><a href="#n2158">2158</a></p>
 <p id="n2159" class="pln"><a href="#n2159">2159</a></p>
 <p id="n2160" class="pln"><a href="#n2160">2160</a></p>
 <p id="n2161" class="pln"><a href="#n2161">2161</a></p>
@@ -2244,19 +2244,19 @@
 <p id="n2173" class="pln"><a href="#n2173">2173</a></p>
 <p id="n2174" class="pln"><a href="#n2174">2174</a></p>
 <p id="n2175" class="pln"><a href="#n2175">2175</a></p>
-<p id="n2176" class="stm run hide_run"><a href="#n2176">2176</a></p>
-<p id="n2177" class="stm run hide_run"><a href="#n2177">2177</a></p>
-<p id="n2178" class="stm run hide_run"><a href="#n2178">2178</a></p>
-<p id="n2179" class="stm run hide_run"><a href="#n2179">2179</a></p>
-<p id="n2180" class="stm run hide_run"><a href="#n2180">2180</a></p>
-<p id="n2181" class="stm run hide_run"><a href="#n2181">2181</a></p>
+<p id="n2176" class="stm mis"><a href="#n2176">2176</a></p>
+<p id="n2177" class="stm mis"><a href="#n2177">2177</a></p>
+<p id="n2178" class="stm mis"><a href="#n2178">2178</a></p>
+<p id="n2179" class="stm mis"><a href="#n2179">2179</a></p>
+<p id="n2180" class="stm mis"><a href="#n2180">2180</a></p>
+<p id="n2181" class="stm mis"><a href="#n2181">2181</a></p>
 <p id="n2182" class="pln"><a href="#n2182">2182</a></p>
 <p id="n2183" class="pln"><a href="#n2183">2183</a></p>
 <p id="n2184" class="stm run hide_run"><a href="#n2184">2184</a></p>
 <p id="n2185" class="pln"><a href="#n2185">2185</a></p>
 <p id="n2186" class="stm run hide_run"><a href="#n2186">2186</a></p>
 <p id="n2187" class="pln"><a href="#n2187">2187</a></p>
-<p id="n2188" class="stm run hide_run"><a href="#n2188">2188</a></p>
+<p id="n2188" class="stm mis"><a href="#n2188">2188</a></p>
 <p id="n2189" class="pln"><a href="#n2189">2189</a></p>
 <p id="n2190" class="pln"><a href="#n2190">2190</a></p>
 <p id="n2191" class="pln"><a href="#n2191">2191</a></p>
@@ -2265,14 +2265,14 @@
 <p id="n2194" class="pln"><a href="#n2194">2194</a></p>
 <p id="n2195" class="pln"><a href="#n2195">2195</a></p>
 <p id="n2196" class="pln"><a href="#n2196">2196</a></p>
-<p id="n2197" class="stm run hide_run"><a href="#n2197">2197</a></p>
-<p id="n2198" class="stm run hide_run"><a href="#n2198">2198</a></p>
-<p id="n2199" class="stm run hide_run"><a href="#n2199">2199</a></p>
-<p id="n2200" class="stm run hide_run"><a href="#n2200">2200</a></p>
+<p id="n2197" class="stm mis"><a href="#n2197">2197</a></p>
+<p id="n2198" class="stm mis"><a href="#n2198">2198</a></p>
+<p id="n2199" class="stm mis"><a href="#n2199">2199</a></p>
+<p id="n2200" class="stm mis"><a href="#n2200">2200</a></p>
 <p id="n2201" class="pln"><a href="#n2201">2201</a></p>
 <p id="n2202" class="stm run hide_run"><a href="#n2202">2202</a></p>
 <p id="n2203" class="pln"><a href="#n2203">2203</a></p>
-<p id="n2204" class="stm run hide_run"><a href="#n2204">2204</a></p>
+<p id="n2204" class="stm mis"><a href="#n2204">2204</a></p>
 <p id="n2205" class="pln"><a href="#n2205">2205</a></p>
 <p id="n2206" class="pln"><a href="#n2206">2206</a></p>
 <p id="n2207" class="pln"><a href="#n2207">2207</a></p>
@@ -2281,12 +2281,12 @@
 <p id="n2210" class="pln"><a href="#n2210">2210</a></p>
 <p id="n2211" class="pln"><a href="#n2211">2211</a></p>
 <p id="n2212" class="pln"><a href="#n2212">2212</a></p>
-<p id="n2213" class="stm run hide_run"><a href="#n2213">2213</a></p>
-<p id="n2214" class="stm run hide_run"><a href="#n2214">2214</a></p>
-<p id="n2215" class="stm run hide_run"><a href="#n2215">2215</a></p>
-<p id="n2216" class="stm run hide_run"><a href="#n2216">2216</a></p>
-<p id="n2217" class="stm run hide_run"><a href="#n2217">2217</a></p>
-<p id="n2218" class="stm run hide_run"><a href="#n2218">2218</a></p>
+<p id="n2213" class="stm mis"><a href="#n2213">2213</a></p>
+<p id="n2214" class="stm mis"><a href="#n2214">2214</a></p>
+<p id="n2215" class="stm mis"><a href="#n2215">2215</a></p>
+<p id="n2216" class="stm mis"><a href="#n2216">2216</a></p>
+<p id="n2217" class="stm mis"><a href="#n2217">2217</a></p>
+<p id="n2218" class="stm mis"><a href="#n2218">2218</a></p>
 <p id="n2219" class="pln"><a href="#n2219">2219</a></p>
 <p id="n2220" class="pln"><a href="#n2220">2220</a></p>
 <p id="n2221" class="pln"><a href="#n2221">2221</a></p>
@@ -2725,46 +2725,46 @@
 <p id="t429" class="pln"><span class="str">&nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t430" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t431" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testEquality</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t432" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">o</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t433" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">p</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t434" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t435" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">o</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;-r&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t436" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertNotEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t437" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">p</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;-r&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t438" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t432" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">o</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t433" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">p</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t434" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t435" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">o</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;-r&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t436" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertNotEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t437" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">p</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;-r&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t438" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t439" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t440" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testCloning</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t441" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">o</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t442" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">o</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;fooey&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;booey&#39;</span><span class="op">,</span> <span class="str">&#39;-s&#39;</span><span class="op">,</span> <span class="str">&#39; /*x*/&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t443" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">p</span> <span class="op">=</span> <span class="nam">o</span><span class="op">.</span><span class="nam">clone</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t444" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t445" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">p</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;huey&#39;</span><span class="op">,</span> <span class="str">&#39;-D&#39;</span><span class="op">,</span> <span class="str">&#39;foo=quux&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t446" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertNotEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t447" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">q</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t448" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">q</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;fooey&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;booey&#39;</span><span class="op">,</span> <span class="str">&#39;-s&#39;</span><span class="op">,</span> <span class="str">&#39; /*x*/&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;huey&#39;</span><span class="op">,</span> <span class="str">&#39;-D&#39;</span><span class="op">,</span> <span class="str">&#39;foo=quux&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t449" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">p</span><span class="op">,</span> <span class="nam">q</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t441" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">o</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t442" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">o</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;fooey&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;booey&#39;</span><span class="op">,</span> <span class="str">&#39;-s&#39;</span><span class="op">,</span> <span class="str">&#39; /*x*/&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t443" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">p</span> <span class="op">=</span> <span class="nam">o</span><span class="op">.</span><span class="nam">clone</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t444" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t445" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">p</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;huey&#39;</span><span class="op">,</span> <span class="str">&#39;-D&#39;</span><span class="op">,</span> <span class="str">&#39;foo=quux&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t446" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertNotEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t447" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">q</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t448" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">q</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;fooey&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;booey&#39;</span><span class="op">,</span> <span class="str">&#39;-s&#39;</span><span class="op">,</span> <span class="str">&#39; /*x*/&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;huey&#39;</span><span class="op">,</span> <span class="str">&#39;-D&#39;</span><span class="op">,</span> <span class="str">&#39;foo=quux&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t449" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">p</span><span class="op">,</span> <span class="nam">q</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t450" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t451" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testCombiningFlags</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t452" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Single-character flags can be combined.</span><span class="strut">&nbsp;</span></p>
-<p id="t453" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">o</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t454" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">o</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;-e&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-z&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t455" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">p</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t456" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">p</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;-erz&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t457" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t453" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">o</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t454" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">o</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;-e&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-z&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t455" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">p</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t456" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">p</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;-erz&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t457" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t458" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t459" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testMarkers</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t460" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">o</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t461" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">o</span><span class="op">.</span><span class="nam">_parse_markers</span><span class="op">(</span><span class="str">&#39;a b c&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t462" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">&#39;a&#39;</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t463" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">&#39;b&#39;</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t464" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">&#39;c&#39;</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t460" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">o</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t461" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">o</span><span class="op">.</span><span class="nam">_parse_markers</span><span class="op">(</span><span class="str">&#39;a b c&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t462" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">&#39;a&#39;</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t463" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">&#39;b&#39;</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t464" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">&#39;c&#39;</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t465" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t466" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testMarkersSwitch</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t467" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">o</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t468" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">o</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;--markers&#39;</span><span class="op">,</span> <span class="str">&#39;a b c&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t469" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">&#39;a&#39;</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t470" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">&#39;b&#39;</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t471" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">&#39;c&#39;</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t467" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">o</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t468" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">o</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;--markers&#39;</span><span class="op">,</span> <span class="str">&#39;a b c&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t469" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">&#39;a&#39;</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t470" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">&#39;b&#39;</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t471" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">&#39;c&#39;</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t472" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t473" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t474" class="stm run hide_run"><span class="key">class</span> <span class="nam">FileStructureTests</span><span class="op">(</span><span class="nam">TestCase</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
@@ -2773,28 +2773,28 @@
 <p id="t477" class="pln"><span class="str">&nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t478" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t479" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">isBad</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">infile</span><span class="op">,</span> <span class="nam">msg</span><span class="op">=</span><span class="nam">None</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t480" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t481" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span> <span class="nam">re</span><span class="op">.</span><span class="nam">escape</span><span class="op">(</span><span class="nam">msg</span><span class="op">)</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t482" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">&#39;infile.txt&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t480" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t481" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span> <span class="nam">re</span><span class="op">.</span><span class="nam">escape</span><span class="op">(</span><span class="nam">msg</span><span class="op">)</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t482" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">&#39;infile.txt&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t483" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t484" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testBeginNoEnd</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t485" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
+<p id="t485" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t486" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; Fooey</span><span class="strut">&nbsp;</span></p>
 <p id="t487" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t488" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&#39;hello&#39;)</span><span class="strut">&nbsp;</span></p>
 <p id="t489" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t490" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">&quot;infile.txt(2): Cog block begun but never ended.&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t490" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">&quot;infile.txt(2): Cog block begun but never ended.&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t491" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t492" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testNoEoo</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t493" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
+<p id="t493" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t494" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; Fooey</span><span class="strut">&nbsp;</span></p>
 <p id="t495" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t496" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&#39;hello&#39;)</span><span class="strut">&nbsp;</span></p>
 <p id="t497" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t498" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t499" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">&quot;infile.txt(4): Missing &#39;[[[end]]]&#39; before end of file.&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t499" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">&quot;infile.txt(4): Missing &#39;[[[end]]]&#39; before end of file.&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t500" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t501" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile2</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
+<p id="t501" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile2</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t502" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; Fooey</span><span class="strut">&nbsp;</span></p>
 <p id="t503" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t504" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&#39;hello&#39;)</span><span class="strut">&nbsp;</span></p>
@@ -2803,47 +2803,47 @@
 <p id="t507" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&#39;goodbye&#39;)</span><span class="strut">&nbsp;</span></p>
 <p id="t508" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t509" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t510" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">&quot;infile.txt(5): Unexpected &#39;[[[cog&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t510" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">&quot;infile.txt(5): Unexpected &#39;[[[cog&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t511" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t512" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testStartWithEnd</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t513" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
+<p id="t513" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t514" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t515" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t516" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">&quot;infile.txt(1): Unexpected &#39;]]]&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t516" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">&quot;infile.txt(1): Unexpected &#39;]]]&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t517" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t518" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile2</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
+<p id="t518" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile2</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t519" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t520" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&#39;hello&#39;)</span><span class="strut">&nbsp;</span></p>
 <p id="t521" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t522" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[end]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t523" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t524" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t525" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">&quot;infile.txt(5): Unexpected &#39;]]]&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t525" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">&quot;infile.txt(5): Unexpected &#39;]]]&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t526" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t527" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testStartWithEoo</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t528" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
+<p id="t528" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t529" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[end]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t530" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t531" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">&quot;infile.txt(1): Unexpected &#39;[[[end]]]&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t531" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">&quot;infile.txt(1): Unexpected &#39;[[[end]]]&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t532" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t533" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile2</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
+<p id="t533" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile2</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t534" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t535" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&#39;hello&#39;)</span><span class="strut">&nbsp;</span></p>
 <p id="t536" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t537" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[end]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t538" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[end]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t539" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t540" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">&quot;infile.txt(5): Unexpected &#39;[[[end]]]&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t540" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">&quot;infile.txt(5): Unexpected &#39;[[[end]]]&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t541" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t542" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testNoEnd</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t543" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
+<p id="t543" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t544" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t545" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;hello&quot;)</span><span class="strut">&nbsp;</span></p>
 <p id="t546" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[end]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t547" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t548" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">&quot;infile.txt(3): Unexpected &#39;[[[end]]]&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t548" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">&quot;infile.txt(3): Unexpected &#39;[[[end]]]&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t549" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t550" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile2</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
+<p id="t550" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile2</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t551" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t552" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&#39;hello&#39;)</span><span class="strut">&nbsp;</span></p>
 <p id="t553" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #]]]</span><span class="strut">&nbsp;</span></p>
@@ -2852,19 +2852,19 @@
 <p id="t556" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;hello&quot;)</span><span class="strut">&nbsp;</span></p>
 <p id="t557" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[end]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t558" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t559" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">&quot;infile.txt(7): Unexpected &#39;[[[end]]]&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t559" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">&quot;infile.txt(7): Unexpected &#39;[[[end]]]&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t560" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t561" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testTwoBegins</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t562" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
+<p id="t562" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t563" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t564" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t565" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;hello&quot;)</span><span class="strut">&nbsp;</span></p>
 <p id="t566" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t567" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[end]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t568" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t569" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">&quot;infile.txt(2): Unexpected &#39;[[[cog&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t569" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">&quot;infile.txt(2): Unexpected &#39;[[[cog&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t570" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t571" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile2</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
+<p id="t571" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile2</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t572" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t573" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;hello&quot;)</span><span class="strut">&nbsp;</span></p>
 <p id="t574" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #]]]</span><span class="strut">&nbsp;</span></p>
@@ -2875,19 +2875,19 @@
 <p id="t579" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t580" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[end]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t581" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t582" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">&quot;infile.txt(6): Unexpected &#39;[[[cog&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t582" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">&quot;infile.txt(6): Unexpected &#39;[[[cog&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t583" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t584" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testTwoEnds</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t585" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
+<p id="t585" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t586" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t587" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;hello&quot;)</span><span class="strut">&nbsp;</span></p>
 <p id="t588" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t589" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t590" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[end]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t591" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t592" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">&quot;infile.txt(4): Unexpected &#39;]]]&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t592" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">&quot;infile.txt(4): Unexpected &#39;]]]&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t593" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t594" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile2</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
+<p id="t594" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile2</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t595" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t596" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;hello&quot;)</span><span class="strut">&nbsp;</span></p>
 <p id="t597" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #]]]</span><span class="strut">&nbsp;</span></p>
@@ -2898,7 +2898,7 @@
 <p id="t602" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t603" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[end]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t604" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t605" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">&quot;infile.txt(8): Unexpected &#39;]]]&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t605" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">&quot;infile.txt(8): Unexpected &#39;]]]&#39;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t606" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t607" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t608" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogErrorTests</span><span class="op">(</span><span class="nam">TestCase</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
@@ -2906,27 +2906,27 @@
 <p id="t610" class="pln"><span class="str">&nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t611" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t612" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testErrorMsg</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t613" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
+<p id="t613" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t614" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; [[[cog cog.error(&quot;This ain&#39;t right!&quot;)]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t615" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; [[[end]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t616" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t617" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t618" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t619" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogGeneratedError</span><span class="op">,</span> <span class="str">&quot;This ain&#39;t right!&quot;</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t620" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t618" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t619" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogGeneratedError</span><span class="op">,</span> <span class="str">&quot;This ain&#39;t right!&quot;</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t620" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t621" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t622" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testErrorNoMsg</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t623" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
+<p id="t623" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t624" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; [[[cog cog.error()]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t625" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; [[[end]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t626" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t627" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t628" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t629" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogGeneratedError</span><span class="op">,</span> <span class="str">&quot;Error raised by cog generator.&quot;</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t630" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t628" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t629" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogGeneratedError</span><span class="op">,</span> <span class="str">&quot;Error raised by cog generator.&quot;</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t630" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t631" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t632" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testNoErrorIfErrorNotCalled</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t633" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
+<p id="t633" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t634" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; --[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t635" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; --import cog</span><span class="strut">&nbsp;</span></p>
 <p id="t636" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; --for i in range(3):</span><span class="strut">&nbsp;</span></p>
@@ -2940,8 +2940,8 @@
 <p id="t644" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; --[[[end]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t645" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t646" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t647" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t648" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t647" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t648" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t649" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t650" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t651" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogGeneratorGetCodeTests</span><span class="op">(</span><span class="nam">TestCase</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
@@ -2953,63 +2953,63 @@
 <p id="t657" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&quot;&quot;&quot; All tests get a generator to use, and short same-length names for</span><span class="strut">&nbsp;</span></p>
 <p id="t658" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; the functions we&#39;re going to use.</span><span class="strut">&nbsp;</span></p>
 <p id="t659" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t660" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">gen</span> <span class="op">=</span> <span class="nam">CogGenerator</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t661" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">parseMarker</span><span class="strut">&nbsp;</span></p>
-<p id="t662" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">parseLine</span><span class="strut">&nbsp;</span></p>
+<p id="t660" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">gen</span> <span class="op">=</span> <span class="nam">CogGenerator</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t661" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">parseMarker</span><span class="strut">&nbsp;</span></p>
+<p id="t662" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">parseLine</span><span class="strut">&nbsp;</span></p>
 <p id="t663" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t664" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testEmpty</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t665" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// [[[cog&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t666" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// ]]]&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t667" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">&#39;&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t665" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// [[[cog&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t666" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// ]]]&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t667" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">&#39;&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t668" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t669" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testSimple</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t670" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// [[[cog&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t671" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;&nbsp; print &quot;hello&quot;&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t672" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;&nbsp; print &quot;bye&quot;&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t673" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// ]]]&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t674" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">&#39;print &quot;hello&quot;\nprint &quot;bye&quot;&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t670" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// [[[cog&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t671" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;&nbsp; print &quot;hello&quot;&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t672" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;&nbsp; print &quot;bye&quot;&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t673" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// ]]]&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t674" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">&#39;print &quot;hello&quot;\nprint &quot;bye&quot;&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t675" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t676" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testCompressed1</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t677" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># For a while, I supported compressed code blocks, but no longer.</span><span class="strut">&nbsp;</span></p>
-<p id="t678" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// [[[cog: print &quot;&quot;&quot;&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t679" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;// hello&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t680" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;// bye&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t681" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// &quot;&quot;&quot;)]]]&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t682" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">&#39;hello\nbye&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t678" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// [[[cog: print &quot;&quot;&quot;&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t679" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;// hello&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t680" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;// bye&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t681" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// &quot;&quot;&quot;)]]]&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t682" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">&#39;hello\nbye&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t683" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t684" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testCompressed2</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t685" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># For a while, I supported compressed code blocks, but no longer.</span><span class="strut">&nbsp;</span></p>
-<p id="t686" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// [[[cog: print &quot;&quot;&quot;&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t687" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;hello&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t688" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;bye&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t689" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// &quot;&quot;&quot;)]]]&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t690" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">&#39;hello\nbye&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t686" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// [[[cog: print &quot;&quot;&quot;&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t687" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;hello&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t688" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;bye&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t689" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// &quot;&quot;&quot;)]]]&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t690" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">&#39;hello\nbye&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t691" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t692" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testCompressed3</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t693" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># For a while, I supported compressed code blocks, but no longer.</span><span class="strut">&nbsp;</span></p>
-<p id="t694" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// [[[cog&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t695" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;print &quot;&quot;&quot;hello&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t696" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;bye&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t697" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// &quot;&quot;&quot;)]]]&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t698" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">&#39;print &quot;&quot;&quot;hello\nbye&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t694" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// [[[cog&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t695" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;print &quot;&quot;&quot;hello&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t696" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;bye&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t697" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// &quot;&quot;&quot;)]]]&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t698" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">&#39;print &quot;&quot;&quot;hello\nbye&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t699" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t700" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testCompressed4</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t701" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># For a while, I supported compressed code blocks, but no longer.</span><span class="strut">&nbsp;</span></p>
-<p id="t702" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// [[[cog: print &quot;&quot;&quot;&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t703" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;hello&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t704" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;bye&quot;&quot;&quot;)&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t705" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// ]]]&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t706" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">&#39;hello\nbye&quot;&quot;&quot;)&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t702" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// [[[cog: print &quot;&quot;&quot;&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t703" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;hello&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t704" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;bye&quot;&quot;&quot;)&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t705" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;// ]]]&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t706" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">&#39;hello\nbye&quot;&quot;&quot;)&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t707" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t708" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testNoCommonPrefixForMarkers</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t709" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># It&#39;s important to be able to use #if 0 to hide lines from a</span><span class="strut">&nbsp;</span></p>
 <p id="t710" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># C++ compiler.</span><span class="strut">&nbsp;</span></p>
-<p id="t711" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;#if 0 //[[[cog&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t712" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;\timport cog, sys&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t713" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t714" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;\tprint sys.argv&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t715" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;#endif //]]]&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t716" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">&#39;import cog, sys\n\nprint sys.argv&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t711" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;#if 0 //[[[cog&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t712" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;\timport cog, sys&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t713" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t714" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">&#39;\tprint sys.argv&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t715" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">&#39;#endif //]]]&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t716" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">&#39;import cog, sys\n\nprint sys.argv&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t717" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t718" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t719" class="stm run hide_run"><span class="key">class</span> <span class="nam">TestCaseWithTempDir</span><span class="op">(</span><span class="nam">TestCase</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
@@ -3018,92 +3018,92 @@
 <p id="t722" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&quot;&quot;&quot; Initialize the cog members for another run.</span><span class="strut">&nbsp;</span></p>
 <p id="t723" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t724" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Create a cog engine, and catch its output.</span><span class="strut">&nbsp;</span></p>
-<p id="t725" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span> <span class="op">=</span> <span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t726" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">output</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t727" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">setOutput</span><span class="op">(</span><span class="nam">stdout</span><span class="op">=</span><span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">,</span> <span class="nam">stderr</span><span class="op">=</span><span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t725" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span> <span class="op">=</span> <span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t726" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">output</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t727" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">setOutput</span><span class="op">(</span><span class="nam">stdout</span><span class="op">=</span><span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">,</span> <span class="nam">stderr</span><span class="op">=</span><span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t728" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t729" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">setUp</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t730" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Create a temporary directory.</span><span class="strut">&nbsp;</span></p>
-<p id="t731" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">tempfile</span><span class="op">.</span><span class="nam">gettempdir</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">&#39;testcog_tempdir_&#39;</span> <span class="op">+</span> <span class="nam">str</span><span class="op">(</span><span class="nam">random</span><span class="op">.</span><span class="nam">random</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="op">[</span><span class="num">2</span><span class="op">:</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t732" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">os</span><span class="op">.</span><span class="nam">mkdir</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t733" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">olddir</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">getcwd</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t734" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">os</span><span class="op">.</span><span class="nam">chdir</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t735" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t731" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">tempfile</span><span class="op">.</span><span class="nam">gettempdir</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">&#39;testcog_tempdir_&#39;</span> <span class="op">+</span> <span class="nam">str</span><span class="op">(</span><span class="nam">random</span><span class="op">.</span><span class="nam">random</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="op">[</span><span class="num">2</span><span class="op">:</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t732" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">os</span><span class="op">.</span><span class="nam">mkdir</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t733" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">olddir</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">getcwd</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t734" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">os</span><span class="op">.</span><span class="nam">chdir</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t735" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t736" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t737" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">tearDown</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t738" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">os</span><span class="op">.</span><span class="nam">chdir</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">olddir</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t738" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">os</span><span class="op">.</span><span class="nam">chdir</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">olddir</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t739" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Get rid of the temporary directory.</span><span class="strut">&nbsp;</span></p>
-<p id="t740" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">shutil</span><span class="op">.</span><span class="nam">rmtree</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t740" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">shutil</span><span class="op">.</span><span class="nam">rmtree</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t741" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t742" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">assertFilesSame</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sFName1</span><span class="op">,</span> <span class="nam">sFName2</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t743" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">text1</span> <span class="op">=</span> <span class="nam">open</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">sFName1</span><span class="op">)</span><span class="op">,</span> <span class="str">&#39;rb&#39;</span><span class="op">)</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t744" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">text2</span> <span class="op">=</span> <span class="nam">open</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">sFName2</span><span class="op">)</span><span class="op">,</span> <span class="str">&#39;rb&#39;</span><span class="op">)</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t745" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">text1</span><span class="op">,</span> <span class="nam">text2</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t743" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">text1</span> <span class="op">=</span> <span class="nam">open</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">sFName1</span><span class="op">)</span><span class="op">,</span> <span class="str">&#39;rb&#39;</span><span class="op">)</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t744" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">text2</span> <span class="op">=</span> <span class="nam">open</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">sFName2</span><span class="op">)</span><span class="op">,</span> <span class="str">&#39;rb&#39;</span><span class="op">)</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t745" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">text1</span><span class="op">,</span> <span class="nam">text2</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t746" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t747" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">assertFileContent</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sFName</span><span class="op">,</span> <span class="nam">sContent</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t748" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sAbsName</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">sFName</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t749" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">f</span> <span class="op">=</span> <span class="nam">open</span><span class="op">(</span><span class="nam">sAbsName</span><span class="op">,</span> <span class="str">&#39;rb&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t750" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t751" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sFileContent</span> <span class="op">=</span> <span class="nam">f</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t748" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sAbsName</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">sFName</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t749" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">f</span> <span class="op">=</span> <span class="nam">open</span><span class="op">(</span><span class="nam">sAbsName</span><span class="op">,</span> <span class="str">&#39;rb&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t750" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t751" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sFileContent</span> <span class="op">=</span> <span class="nam">f</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t752" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">finally</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t753" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">f</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t754" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">sFileContent</span><span class="op">,</span> <span class="nam">to_bytes</span><span class="op">(</span><span class="nam">sContent</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t753" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">f</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t754" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">sFileContent</span><span class="op">,</span> <span class="nam">to_bytes</span><span class="op">(</span><span class="nam">sContent</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t755" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t756" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t757" class="stm run hide_run"><span class="key">class</span> <span class="nam">ArgumentHandlingTests</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t758" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t759" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testArgumentFailure</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t760" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Return value 2 means usage problem.</span><span class="strut">&nbsp;</span></p>
-<p id="t761" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-j&#39;</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="num">2</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t762" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t763" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">&quot;option -j not recognized&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t764" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t765" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t766" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t767" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-j&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t761" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-j&#39;</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="num">2</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t762" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t763" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">&quot;option -j not recognized&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t764" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t765" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t766" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t767" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-j&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t768" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t769" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testNoDashOAndAtFile</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t770" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t770" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t771" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;cogfiles.txt&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t772" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; # Please run cog</span><span class="strut">&nbsp;</span></p>
 <p id="t773" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t774" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t775" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t776" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t777" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t778" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-o&#39;</span><span class="op">,</span> <span class="str">&#39;foo&#39;</span><span class="op">,</span> <span class="str">&#39;@cogfiles.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t776" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t777" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t778" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-o&#39;</span><span class="op">,</span> <span class="str">&#39;foo&#39;</span><span class="op">,</span> <span class="str">&#39;@cogfiles.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t779" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t780" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testDashV</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t781" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-v&#39;</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="num">0</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t782" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t783" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">&#39;Cog version %s\n&#39;</span> <span class="op">%</span> <span class="nam">__version__</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t781" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-v&#39;</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="num">0</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t782" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t783" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">&#39;Cog version %s\n&#39;</span> <span class="op">%</span> <span class="nam">__version__</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t784" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t785" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">producesHelp</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">args</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t786" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t787" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">argv</span> <span class="op">=</span> <span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">]</span> <span class="op">+</span> <span class="nam">args</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t788" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="nam">argv</span><span class="op">)</span><span class="op">,</span> <span class="num">0</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t789" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">usage</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t786" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t787" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">argv</span> <span class="op">=</span> <span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">]</span> <span class="op">+</span> <span class="nam">args</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t788" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="nam">argv</span><span class="op">)</span><span class="op">,</span> <span class="num">0</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t789" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">usage</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t790" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t791" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testDashH</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t792" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># -h or -? anywhere on the command line should just print help.</span><span class="strut">&nbsp;</span></p>
-<p id="t793" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">producesHelp</span><span class="op">(</span><span class="str">&quot;-h&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t794" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">producesHelp</span><span class="op">(</span><span class="str">&quot;-?&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t795" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">producesHelp</span><span class="op">(</span><span class="str">&quot;fooey.txt -h&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t796" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">producesHelp</span><span class="op">(</span><span class="str">&quot;-o -r @fooey.txt -? @booey.txt&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t793" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">producesHelp</span><span class="op">(</span><span class="str">&quot;-h&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t794" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">producesHelp</span><span class="op">(</span><span class="str">&quot;-?&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t795" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">producesHelp</span><span class="op">(</span><span class="str">&quot;fooey.txt -h&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t796" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">producesHelp</span><span class="op">(</span><span class="str">&quot;-o -r @fooey.txt -? @booey.txt&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t797" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t798" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testDashOAndDashR</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t799" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t799" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t800" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;cogfile.txt&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t801" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; # Please run cog</span><span class="strut">&nbsp;</span></p>
 <p id="t802" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t803" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t804" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t805" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t806" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t807" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-o&#39;</span><span class="op">,</span> <span class="str">&#39;foo&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;cogfile.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t805" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t806" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t807" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-o&#39;</span><span class="op">,</span> <span class="str">&#39;foo&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;cogfile.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t808" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t809" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testDashZ</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t810" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t810" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t811" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;test.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t812" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
 <p id="t813" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
@@ -3126,30 +3126,30 @@
 <p id="t830" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t831" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t832" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t833" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t834" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span> <span class="nam">re</span><span class="op">.</span><span class="nam">escape</span><span class="op">(</span><span class="str">&quot;test.cog(6): Missing &#39;[[[end]]]&#39; before end of file.&quot;</span><span class="op">)</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t835" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t836" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t837" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-z&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t838" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t833" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t834" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span> <span class="nam">re</span><span class="op">.</span><span class="nam">escape</span><span class="op">(</span><span class="str">&quot;test.cog(6): Missing &#39;[[[end]]]&#39; before end of file.&quot;</span><span class="op">)</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t835" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t836" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t837" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-z&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t838" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t839" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t840" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testBadDashD</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t841" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t842" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-Dfooey&#39;</span><span class="op">,</span> <span class="str">&#39;cog.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t843" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t844" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-D&#39;</span><span class="op">,</span> <span class="str">&#39;fooey&#39;</span><span class="op">,</span> <span class="str">&#39;cog.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t841" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t842" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-Dfooey&#39;</span><span class="op">,</span> <span class="str">&#39;cog.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t843" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t844" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-D&#39;</span><span class="op">,</span> <span class="str">&#39;fooey&#39;</span><span class="op">,</span> <span class="str">&#39;cog.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t845" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t846" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testBadMarkers</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t847" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t848" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;--markers=X&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t849" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t850" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;--markers=A B C D&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t847" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t848" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;--markers=X&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t849" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t850" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;--markers=A B C D&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t851" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t852" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t853" class="stm run hide_run"><span class="key">class</span> <span class="nam">TestFileHandling</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t854" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t855" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testSimple</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t856" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t856" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t857" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;test.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t858" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
 <p id="t859" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
@@ -3174,15 +3174,15 @@
 <p id="t878" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t879" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t880" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t881" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t882" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t883" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t884" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t885" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">&quot;(changed)&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t881" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t882" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t883" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t884" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t885" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">&quot;(changed)&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t886" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t887" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testOutputFile</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t888" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># -o sets the output file.</span><span class="strut">&nbsp;</span></p>
-<p id="t889" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t889" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t890" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;test.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t891" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
 <p id="t892" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
@@ -3207,12 +3207,12 @@
 <p id="t911" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t912" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t913" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t914" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t915" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-o&#39;</span><span class="op">,</span> <span class="str">&#39;test.cogged&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t916" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cogged&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t914" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t915" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-o&#39;</span><span class="op">,</span> <span class="str">&#39;test.cogged&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t916" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cogged&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t917" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t918" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testAtFile</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t919" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t919" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t920" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;one.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t921" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t922" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;hello world&quot;)</span><span class="strut">&nbsp;</span></p>
@@ -3251,15 +3251,15 @@
 <p id="t955" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t956" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t957" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t958" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t959" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;@cogfiles.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t960" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;one.cog&#39;</span><span class="op">,</span> <span class="str">&#39;one.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t961" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;two.cog&#39;</span><span class="op">,</span> <span class="str">&#39;two.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t962" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t963" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">&quot;(changed)&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t958" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t959" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;@cogfiles.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t960" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;one.cog&#39;</span><span class="op">,</span> <span class="str">&#39;one.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t961" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;two.cog&#39;</span><span class="op">,</span> <span class="str">&#39;two.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t962" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t963" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">&quot;(changed)&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t964" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t965" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testNestedAtFile</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t966" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t966" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t967" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;one.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t968" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t969" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;hello world&quot;)</span><span class="strut">&nbsp;</span></p>
@@ -3302,15 +3302,15 @@
 <p id="t1006" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t1007" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1008" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1009" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1010" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;@cogfiles.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1011" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;one.cog&#39;</span><span class="op">,</span> <span class="str">&#39;one.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1012" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;two.cog&#39;</span><span class="op">,</span> <span class="str">&#39;two.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1013" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1014" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">&quot;(changed)&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1009" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1010" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;@cogfiles.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1011" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;one.cog&#39;</span><span class="op">,</span> <span class="str">&#39;one.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1012" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;two.cog&#39;</span><span class="op">,</span> <span class="str">&#39;two.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1013" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1014" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">&quot;(changed)&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1015" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1016" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testAtFileWithArgs</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1017" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1017" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1018" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;both.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1019" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t1020" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;one: %s&quot; % (&#39;one&#39; in globals()))</span><span class="strut">&nbsp;</span></p>
@@ -3346,13 +3346,13 @@
 <p id="t1050" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t1051" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1052" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1053" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1054" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;@cogfiles.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1055" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;both.one&#39;</span><span class="op">,</span> <span class="str">&#39;one.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1056" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;both.two&#39;</span><span class="op">,</span> <span class="str">&#39;two.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1053" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1054" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;@cogfiles.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1055" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;both.one&#39;</span><span class="op">,</span> <span class="str">&#39;one.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1056" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;both.two&#39;</span><span class="op">,</span> <span class="str">&#39;two.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1057" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1058" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testAtFileWithBadArgCombo</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1059" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1059" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1060" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;both.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1061" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t1062" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;one: %s&quot; % (&#39;one&#39; in globals()))</span><span class="strut">&nbsp;</span></p>
@@ -3368,18 +3368,18 @@
 <p id="t1072" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t1073" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1074" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1075" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1076" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1077" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;@cogfiles.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1075" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1076" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t1077" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;@cogfiles.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1078" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1079" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testAtFileWithTrickyFilenames</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1080" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">def</span> <span class="nam">fix_backslashes</span><span class="op">(</span><span class="nam">files_txt</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t1080" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">def</span> <span class="nam">fix_backslashes</span><span class="op">(</span><span class="nam">files_txt</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t1081" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&quot;&quot;&quot;Make the contents of a files.txt sensitive to the platform.&quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t1082" class="stm par run hide_run"><span class="annotate" title="Line 1082 was executed, but never jumped to line 1084">1082&#x202F;&#x219B;&#x202F;1084 [?]</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">platform</span> <span class="op">!=</span> <span class="str">&quot;win32&quot;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1083" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">files_txt</span> <span class="op">=</span> <span class="nam">files_txt</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="str">&quot;\\&quot;</span><span class="op">,</span> <span class="str">&quot;/&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1084" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="nam">files_txt</span><span class="strut">&nbsp;</span></p>
+<p id="t1082" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">platform</span> <span class="op">!=</span> <span class="str">&quot;win32&quot;</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t1083" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">files_txt</span> <span class="op">=</span> <span class="nam">files_txt</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="str">&quot;\\&quot;</span><span class="op">,</span> <span class="str">&quot;/&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1084" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="nam">files_txt</span><span class="strut">&nbsp;</span></p>
 <p id="t1085" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1086" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1086" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1087" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;one 1.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1088" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog cog.outl(&quot;hello world&quot;) ]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t1089" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
@@ -3417,14 +3417,14 @@
 <p id="t1121" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1122" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1123" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1124" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1125" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-z&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;@cogfiles.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1126" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;one 1.cog&#39;</span><span class="op">,</span> <span class="str">&#39;one.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1127" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;subdir/subback.cog&#39;</span><span class="op">,</span> <span class="str">&#39;subback.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1128" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;subdir/subfwd.cog&#39;</span><span class="op">,</span> <span class="str">&#39;subfwd.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1124" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1125" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-z&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;@cogfiles.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1126" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;one 1.cog&#39;</span><span class="op">,</span> <span class="str">&#39;one.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1127" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;subdir/subback.cog&#39;</span><span class="op">,</span> <span class="str">&#39;subback.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1128" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;subdir/subfwd.cog&#39;</span><span class="op">,</span> <span class="str">&#39;subfwd.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1129" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1130" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">run_with_verbosity</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">verbosity</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1131" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1131" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1132" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;unchanged.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1133" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t1134" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;hello world&quot;)</span><span class="strut">&nbsp;</span></p>
@@ -3446,22 +3446,22 @@
 <p id="t1150" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t1151" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1152" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1153" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1154" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;--verbosity=&#39;</span><span class="op">+</span><span class="nam">verbosity</span><span class="op">,</span> <span class="str">&#39;@cogfiles.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1155" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1156" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="nam">output</span><span class="strut">&nbsp;</span></p>
+<p id="t1153" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1154" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;--verbosity=&#39;</span><span class="op">+</span><span class="nam">verbosity</span><span class="op">,</span> <span class="str">&#39;@cogfiles.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1155" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1156" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">return</span> <span class="nam">output</span><span class="strut">&nbsp;</span></p>
 <p id="t1157" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1158" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">test_verbosity0</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1159" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">run_with_verbosity</span><span class="op">(</span><span class="str">&quot;0&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1160" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">&quot;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1159" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">run_with_verbosity</span><span class="op">(</span><span class="str">&quot;0&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1160" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">&quot;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1161" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1162" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">test_verbosity1</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1163" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">run_with_verbosity</span><span class="op">(</span><span class="str">&quot;1&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1164" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">&quot;Cogging changed.cog&nbsp; (changed)\n&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1163" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">run_with_verbosity</span><span class="op">(</span><span class="str">&quot;1&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1164" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">&quot;Cogging changed.cog&nbsp; (changed)\n&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1165" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1166" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">test_verbosity2</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1167" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">run_with_verbosity</span><span class="op">(</span><span class="str">&quot;2&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1168" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">&quot;Cogging unchanged.cog\nCogging changed.cog&nbsp; (changed)\n&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1167" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">run_with_verbosity</span><span class="op">(</span><span class="str">&quot;2&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1168" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">&quot;Cogging unchanged.cog\nCogging changed.cog&nbsp; (changed)\n&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1169" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1170" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1171" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogTestLineEndings</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
@@ -3486,30 +3486,30 @@
 <p id="t1190" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&nbsp; <span class="str">&#39;&#39;</span><span class="op">]</span><span class="strut">&nbsp;</span></p>
 <p id="t1191" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1192" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testOutputNativeEol</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1193" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="op">{</span><span class="str">&#39;infile&#39;</span><span class="op">:</span> <span class="str">&#39;\n&#39;</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_in</span><span class="op">)</span><span class="op">}</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1194" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-o&#39;</span><span class="op">,</span> <span class="str">&#39;outfile&#39;</span><span class="op">,</span> <span class="str">&#39;infile&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1195" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFileContent</span><span class="op">(</span><span class="str">&#39;outfile&#39;</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">linesep</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_out</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1193" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="op">{</span><span class="str">&#39;infile&#39;</span><span class="op">:</span> <span class="str">&#39;\n&#39;</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_in</span><span class="op">)</span><span class="op">}</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1194" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-o&#39;</span><span class="op">,</span> <span class="str">&#39;outfile&#39;</span><span class="op">,</span> <span class="str">&#39;infile&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1195" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFileContent</span><span class="op">(</span><span class="str">&#39;outfile&#39;</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">linesep</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_out</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1196" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1197" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testOutputLfEol</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1198" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="op">{</span><span class="str">&#39;infile&#39;</span><span class="op">:</span> <span class="str">&#39;\n&#39;</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_in</span><span class="op">)</span><span class="op">}</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1199" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-U&#39;</span><span class="op">,</span> <span class="str">&#39;-o&#39;</span><span class="op">,</span> <span class="str">&#39;outfile&#39;</span><span class="op">,</span> <span class="str">&#39;infile&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1200" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFileContent</span><span class="op">(</span><span class="str">&#39;outfile&#39;</span><span class="op">,</span> <span class="str">&#39;\n&#39;</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_out</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1198" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="op">{</span><span class="str">&#39;infile&#39;</span><span class="op">:</span> <span class="str">&#39;\n&#39;</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_in</span><span class="op">)</span><span class="op">}</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1199" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-U&#39;</span><span class="op">,</span> <span class="str">&#39;-o&#39;</span><span class="op">,</span> <span class="str">&#39;outfile&#39;</span><span class="op">,</span> <span class="str">&#39;infile&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1200" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFileContent</span><span class="op">(</span><span class="str">&#39;outfile&#39;</span><span class="op">,</span> <span class="str">&#39;\n&#39;</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_out</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1201" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1202" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testReplaceNativeEol</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1203" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="op">{</span><span class="str">&#39;test.cog&#39;</span><span class="op">:</span> <span class="str">&#39;\n&#39;</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_in</span><span class="op">)</span><span class="op">}</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1204" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1205" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFileContent</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">linesep</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_out</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1203" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="op">{</span><span class="str">&#39;test.cog&#39;</span><span class="op">:</span> <span class="str">&#39;\n&#39;</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_in</span><span class="op">)</span><span class="op">}</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1204" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1205" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFileContent</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">linesep</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_out</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1206" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1207" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testReplaceLfEol</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1208" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="op">{</span><span class="str">&#39;test.cog&#39;</span><span class="op">:</span> <span class="str">&#39;\n&#39;</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_in</span><span class="op">)</span><span class="op">}</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1209" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-U&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1210" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFileContent</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;\n&#39;</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_out</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1208" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="op">{</span><span class="str">&#39;test.cog&#39;</span><span class="op">:</span> <span class="str">&#39;\n&#39;</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_in</span><span class="op">)</span><span class="op">}</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1209" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-U&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1210" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFileContent</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;\n&#39;</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_out</span><span class="op">)</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1211" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1212" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1213" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogTestCharacterEncoding</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t1214" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1215" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testSimple</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1216" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1216" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1217" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;test.cog&#39;</span><span class="op">:</span> <span class="nam">b</span><span class="op">(</span><span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1218" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
 <p id="t1219" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
@@ -3528,14 +3528,14 @@
 <p id="t1232" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">)</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t1233" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1234" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1235" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1236" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1237" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1238" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1239" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">&quot;(changed)&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1235" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1236" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1237" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1238" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1239" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">&quot;(changed)&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1240" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1241" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testFileEncodingOption</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1242" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1242" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1243" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;test.cog&#39;</span><span class="op">:</span> <span class="nam">b</span><span class="op">(</span><span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1244" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; // \xca\xee\xe4\xe8\xf0\xe2\xea\xe0 Windows</span><span class="strut">&nbsp;</span></p>
 <p id="t1245" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
@@ -3554,11 +3554,11 @@
 <p id="t1258" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">)</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t1259" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1260" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1261" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1262" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-n&#39;</span><span class="op">,</span> <span class="str">&#39;cp1251&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1263" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1264" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1265" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">&quot;(changed)&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1261" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1262" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-n&#39;</span><span class="op">,</span> <span class="str">&#39;cp1251&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1263" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1264" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1265" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">&quot;(changed)&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1266" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1267" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1268" class="stm run hide_run"><span class="key">class</span> <span class="nam">TestCaseWithImports</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
@@ -3568,18 +3568,18 @@
 <p id="t1272" class="pln"><span class="str">&nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t1273" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1274" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">setUp</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1275" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">TestCaseWithTempDir</span><span class="op">.</span><span class="nam">setUp</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1276" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">sysmodulekeys</span> <span class="op">=</span> <span class="nam">list</span><span class="op">(</span><span class="nam">sys</span><span class="op">.</span><span class="nam">modules</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1275" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">TestCaseWithTempDir</span><span class="op">.</span><span class="nam">setUp</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1276" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">sysmodulekeys</span> <span class="op">=</span> <span class="nam">list</span><span class="op">(</span><span class="nam">sys</span><span class="op">.</span><span class="nam">modules</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1277" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1278" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">tearDown</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1279" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">modstoscrub</span> <span class="op">=</span> <span class="op">[</span><span class="strut">&nbsp;</span></p>
+<p id="t1279" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">modstoscrub</span> <span class="op">=</span> <span class="op">[</span><span class="strut">&nbsp;</span></p>
 <p id="t1280" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">modname</span><span class="strut">&nbsp;</span></p>
 <p id="t1281" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">for</span> <span class="nam">modname</span> <span class="key">in</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">modules</span><span class="strut">&nbsp;</span></p>
 <p id="t1282" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> <span class="nam">modname</span> <span class="key">not</span> <span class="key">in</span> <span class="nam">self</span><span class="op">.</span><span class="nam">sysmodulekeys</span><span class="strut">&nbsp;</span></p>
 <p id="t1283" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">]</span><span class="strut">&nbsp;</span></p>
-<p id="t1284" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">for</span> <span class="nam">modname</span> <span class="key">in</span> <span class="nam">modstoscrub</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1285" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">del</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">modules</span><span class="op">[</span><span class="nam">modname</span><span class="op">]</span><span class="strut">&nbsp;</span></p>
-<p id="t1286" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">TestCaseWithTempDir</span><span class="op">.</span><span class="nam">tearDown</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1284" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">for</span> <span class="nam">modname</span> <span class="key">in</span> <span class="nam">modstoscrub</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t1285" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="key">del</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">modules</span><span class="op">[</span><span class="nam">modname</span><span class="op">]</span><span class="strut">&nbsp;</span></p>
+<p id="t1286" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">TestCaseWithTempDir</span><span class="op">.</span><span class="nam">tearDown</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1287" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1288" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1289" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogIncludeTests</span><span class="op">(</span><span class="nam">TestCaseWithImports</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
@@ -3631,36 +3631,36 @@
 <p id="t1335" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1336" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testNeedIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t1337" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Try it without the -I, to see that an ImportError happens.</span><span class="strut">&nbsp;</span></p>
-<p id="t1338" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">dincludes</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1339" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">ImportError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1340" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1338" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">dincludes</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1339" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">ImportError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t1340" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1341" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1342" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t1343" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Test that -I adds include directories properly.</span><span class="strut">&nbsp;</span></p>
-<p id="t1344" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">dincludes</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1345" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;include&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1346" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1344" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">dincludes</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1345" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;include&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1346" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1347" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1348" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testTwoIncludePaths</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t1349" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Test that two -I&#39;s add include directories properly.</span><span class="strut">&nbsp;</span></p>
-<p id="t1350" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">dincludes</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1351" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;include&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;inc2&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1352" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1350" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">dincludes</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1351" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;include&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;inc2&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1352" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1353" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1354" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testTwoIncludePaths2</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t1355" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Test that two -I&#39;s add include directories properly.</span><span class="strut">&nbsp;</span></p>
-<p id="t1356" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">dincludes</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1357" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;inc2&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;include&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1358" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test2.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1356" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">dincludes</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1357" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;inc2&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;include&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1358" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test2.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1359" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1360" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testUselessIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t1361" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Test that the search will continue past the first directory.</span><span class="strut">&nbsp;</span></p>
-<p id="t1362" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">dincludes</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1363" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;inc3&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;include&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1364" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1362" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">dincludes</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1363" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;inc3&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;include&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1364" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1365" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1366" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testSysPathIsUnchanged</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1367" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1367" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1368" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;bad.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1369" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog cog.error(&quot;Oh no!&quot;) ]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t1370" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[end]]]</span><span class="strut">&nbsp;</span></p>
@@ -3671,43 +3671,43 @@
 <p id="t1375" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t1376" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1377" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1378" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1378" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1379" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Is it unchanged just by creating a cog engine?</span><span class="strut">&nbsp;</span></p>
-<p id="t1380" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">oldsyspath</span> <span class="op">=</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">[</span><span class="op">:</span><span class="op">]</span><span class="strut">&nbsp;</span></p>
-<p id="t1381" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1382" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1380" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">oldsyspath</span> <span class="op">=</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">[</span><span class="op">:</span><span class="op">]</span><span class="strut">&nbsp;</span></p>
+<p id="t1381" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1382" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1383" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Is it unchanged for a successful run?</span><span class="strut">&nbsp;</span></p>
-<p id="t1384" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1385" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;good.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1386" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1384" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1385" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;good.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1386" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1387" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Is it unchanged for a successful run with includes?</span><span class="strut">&nbsp;</span></p>
-<p id="t1388" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1389" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;xyzzy&#39;</span><span class="op">,</span> <span class="str">&#39;good.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1390" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1388" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1389" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;xyzzy&#39;</span><span class="op">,</span> <span class="str">&#39;good.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1390" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1391" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Is it unchanged for a successful run with two includes?</span><span class="strut">&nbsp;</span></p>
-<p id="t1392" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1393" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;xyzzy&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;quux&#39;</span><span class="op">,</span> <span class="str">&#39;good.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1394" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1392" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1393" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;xyzzy&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;quux&#39;</span><span class="op">,</span> <span class="str">&#39;good.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1394" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1395" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Is it unchanged for a failed run?</span><span class="strut">&nbsp;</span></p>
-<p id="t1396" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1397" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1398" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;bad.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1399" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1396" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1397" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t1398" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;bad.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1399" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1400" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Is it unchanged for a failed run with includes?</span><span class="strut">&nbsp;</span></p>
-<p id="t1401" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1402" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1403" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;xyzzy&#39;</span><span class="op">,</span> <span class="str">&#39;bad.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1404" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1401" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1402" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t1403" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;xyzzy&#39;</span><span class="op">,</span> <span class="str">&#39;bad.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1404" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1405" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Is it unchanged for a failed run with two includes?</span><span class="strut">&nbsp;</span></p>
-<p id="t1406" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1407" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1408" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;xyzzy&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;quux&#39;</span><span class="op">,</span> <span class="str">&#39;bad.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1409" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1406" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1407" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t1408" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;xyzzy&#39;</span><span class="op">,</span> <span class="str">&#39;-I&#39;</span><span class="op">,</span> <span class="str">&#39;quux&#39;</span><span class="op">,</span> <span class="str">&#39;bad.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1409" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1410" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1411" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testSubDirectories</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t1412" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Test that relative paths on the command line work, with includes.</span><span class="strut">&nbsp;</span></p>
 <p id="t1413" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1414" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1414" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1415" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;code&#39;</span><span class="op">:</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1416" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;test.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1417" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
@@ -3731,18 +3731,18 @@
 <p id="t1435" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1436" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1437" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1438" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1438" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1439" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># We should be able to invoke cog without the -I switch, and it will</span><span class="strut">&nbsp;</span></p>
 <p id="t1440" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># auto-include the current directory</span><span class="strut">&nbsp;</span></p>
-<p id="t1441" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;code/test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1442" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;code/test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;code/test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1441" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;code/test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1442" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;code/test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;code/test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1443" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1444" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1445" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogTestsInFiles</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t1446" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1447" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testWarnIfNoCogCode</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t1448" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Test that the -e switch warns if there is no Cog code.</span><span class="strut">&nbsp;</span></p>
-<p id="t1449" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1449" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1450" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;with.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1451" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t1452" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;hello world&quot;)</span><span class="strut">&nbsp;</span></p>
@@ -3757,21 +3757,21 @@
 <p id="t1461" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t1462" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1463" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1464" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1465" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-e&#39;</span><span class="op">,</span> <span class="str">&#39;with.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1466" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1467" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertNotIn</span><span class="op">(</span><span class="str">&quot;Warning&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1468" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1469" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-e&#39;</span><span class="op">,</span> <span class="str">&#39;without.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1470" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1471" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">&quot;Warning: no cog code found in without.cog&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1472" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1473" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;without.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1474" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1475" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertNotIn</span><span class="op">(</span><span class="str">&quot;Warning&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1464" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1465" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-e&#39;</span><span class="op">,</span> <span class="str">&#39;with.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1466" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1467" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertNotIn</span><span class="op">(</span><span class="str">&quot;Warning&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1468" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1469" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-e&#39;</span><span class="op">,</span> <span class="str">&#39;without.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1470" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1471" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">&quot;Warning: no cog code found in without.cog&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1472" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1473" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;without.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1474" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1475" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertNotIn</span><span class="op">(</span><span class="str">&quot;Warning&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1476" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1477" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testFileNameProps</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1478" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1478" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1479" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;cog1.txt&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1480" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t1481" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;This is %s in, %s out&quot; % (cog.inFile, cog.outFile))</span><span class="strut">&nbsp;</span></p>
@@ -3797,16 +3797,16 @@
 <p id="t1501" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t1502" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1503" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1504" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1505" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1506" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;cog1.txt&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1507" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1508" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-o&#39;</span><span class="op">,</span> <span class="str">&#39;cog1out.txt&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1509" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;cog1out.txt&#39;</span><span class="op">,</span> <span class="str">&#39;cog1out.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1504" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1505" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1506" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;cog1.txt&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1507" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1508" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-o&#39;</span><span class="op">,</span> <span class="str">&#39;cog1out.txt&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1509" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;cog1out.txt&#39;</span><span class="op">,</span> <span class="str">&#39;cog1out.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1510" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1511" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testGlobalsDontCrossFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t1512" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Make sure that global values don&#39;t get shared between files.</span><span class="strut">&nbsp;</span></p>
-<p id="t1513" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1513" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1514" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;one.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1515" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog s = &quot;This was set in one.cog&quot; ]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t1516" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[end]]]</span><span class="strut">&nbsp;</span></p>
@@ -3851,15 +3851,15 @@
 <p id="t1555" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t1556" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1557" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1558" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1559" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;@cogfiles.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1560" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;one.cog&#39;</span><span class="op">,</span> <span class="str">&#39;one.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1561" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;two.cog&#39;</span><span class="op">,</span> <span class="str">&#39;two.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1562" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1563" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">&quot;(changed)&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1558" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1559" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;@cogfiles.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1560" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;one.cog&#39;</span><span class="op">,</span> <span class="str">&#39;one.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1561" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;two.cog&#39;</span><span class="op">,</span> <span class="str">&#39;two.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1562" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1563" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">&quot;(changed)&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1564" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1565" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testRemoveGeneratedOutput</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1566" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1566" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1567" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;cog1.txt&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1568" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t1569" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;This line was generated.&quot;)</span><span class="strut">&nbsp;</span></p>
@@ -3887,35 +3887,35 @@
 <p id="t1591" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t1592" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1593" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1594" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1594" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1595" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Remove generated output.</span><span class="strut">&nbsp;</span></p>
-<p id="t1596" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-x&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1597" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;cog1.txt&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1598" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1596" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-x&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1597" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;cog1.txt&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1598" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1599" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Regenerate the generated output.</span><span class="strut">&nbsp;</span></p>
-<p id="t1600" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1601" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;cog1.txt&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.out2&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1602" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1600" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1601" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;cog1.txt&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.out2&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1602" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1603" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Remove the generated output again.</span><span class="strut">&nbsp;</span></p>
-<p id="t1604" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-x&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1605" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;cog1.txt&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1604" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-x&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1605" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;cog1.txt&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1606" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1607" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testMsgCall</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1608" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
+<p id="t1608" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1609" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t1610" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.msg(&quot;Hello there!&quot;)</span><span class="strut">&nbsp;</span></p>
 <p id="t1611" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t1612" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; #[[[end]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t1613" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
-<p id="t1614" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1615" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1616" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1617" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">&quot;Message: Hello there!\n&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1614" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1615" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1616" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1617" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">&quot;Message: Hello there!\n&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1618" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1619" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testErrorMessageHasNoTraceback</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t1620" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Test that a Cog error is printed to stderr with no traceback.</span><span class="strut">&nbsp;</span></p>
 <p id="t1621" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1622" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1622" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1623" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;cog1.txt&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1624" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t1625" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;This line was newly&quot;)</span><span class="strut">&nbsp;</span></p>
@@ -3929,15 +3929,15 @@
 <p id="t1633" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t1634" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1635" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1636" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1637" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">stderr</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1638" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">setOutput</span><span class="op">(</span><span class="nam">stderr</span><span class="op">=</span><span class="nam">stderr</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1639" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-c&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&quot;cog1.txt&quot;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1640" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">&quot;Cogging cog1.txt\n&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1641" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">stderr</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">&quot;cog1.txt(9): Output has been edited! Delete old checksum to unprotect.\n&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1636" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1637" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">stderr</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1638" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">setOutput</span><span class="op">(</span><span class="nam">stderr</span><span class="op">=</span><span class="nam">stderr</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1639" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-c&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&quot;cog1.txt&quot;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1640" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">&quot;Cogging cog1.txt\n&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1641" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">stderr</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">&quot;cog1.txt(9): Output has been edited! Delete old checksum to unprotect.\n&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1642" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1643" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testDashD</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1644" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1644" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1645" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;test.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1646" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; --[[[cog cog.outl(&quot;Defined fooey as &quot; + fooey) ]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t1647" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; --[[[end]]]</span><span class="strut">&nbsp;</span></p>
@@ -3956,60 +3956,60 @@
 <p id="t1660" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t1661" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1662" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1663" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1664" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-D&#39;</span><span class="op">,</span> <span class="str">&#39;fooey=kablooey&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1665" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.kablooey&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1666" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1667" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-Dfooey=kablooey&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1668" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.kablooey&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1669" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1670" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-Dfooey=e=mc2&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1671" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.einstein&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1672" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1673" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-Dbar=quux&#39;</span><span class="op">,</span> <span class="str">&#39;-Dfooey=kablooey&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1674" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.kablooey&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1675" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1676" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-Dfooey=kablooey&#39;</span><span class="op">,</span> <span class="str">&#39;-Dbar=quux&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1677" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.kablooey&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1678" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1679" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-Dfooey=gooey&#39;</span><span class="op">,</span> <span class="str">&#39;-Dfooey=kablooey&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1680" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.kablooey&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1663" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1664" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-D&#39;</span><span class="op">,</span> <span class="str">&#39;fooey=kablooey&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1665" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.kablooey&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1666" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1667" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-Dfooey=kablooey&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1668" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.kablooey&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1669" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1670" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-Dfooey=e=mc2&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1671" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.einstein&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1672" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1673" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-Dbar=quux&#39;</span><span class="op">,</span> <span class="str">&#39;-Dfooey=kablooey&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1674" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.kablooey&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1675" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1676" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-Dfooey=kablooey&#39;</span><span class="op">,</span> <span class="str">&#39;-Dbar=quux&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1677" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.kablooey&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1678" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1679" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-Dfooey=gooey&#39;</span><span class="op">,</span> <span class="str">&#39;-Dfooey=kablooey&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1680" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.kablooey&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1681" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1682" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testOutputToStdout</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1683" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1683" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1684" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;test.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1685" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; --[[[cog cog.outl(&#39;Hey there!&#39;) ]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t1686" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; --[[[end]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t1687" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t1688" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1689" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1690" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1691" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">stderr</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1692" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">setOutput</span><span class="op">(</span><span class="nam">stderr</span><span class="op">=</span><span class="nam">stderr</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1693" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1694" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1695" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">outerr</span> <span class="op">=</span> <span class="nam">stderr</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1696" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">&quot;--[[[cog cog.outl(&#39;Hey there!&#39;) ]]]\nHey there!\n--[[[end]]]\n&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1697" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">outerr</span><span class="op">,</span> <span class="str">&quot;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1690" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1691" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">stderr</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1692" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">setOutput</span><span class="op">(</span><span class="nam">stderr</span><span class="op">=</span><span class="nam">stderr</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1693" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1694" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1695" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">outerr</span> <span class="op">=</span> <span class="nam">stderr</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1696" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">&quot;--[[[cog cog.outl(&#39;Hey there!&#39;) ]]]\nHey there!\n--[[[end]]]\n&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1697" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">outerr</span><span class="op">,</span> <span class="str">&quot;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1698" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1699" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testReadFromStdin</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1700" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">stdin</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="str">&quot;--[[[cog cog.outl(&#39;Wow&#39;) ]]]\n--[[[end]]]\n&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1701" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">def</span> <span class="nam">restore_stdin</span><span class="op">(</span><span class="nam">old_stdin</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1702" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sys</span><span class="op">.</span><span class="nam">stdin</span> <span class="op">=</span> <span class="nam">old_stdin</span><span class="strut">&nbsp;</span></p>
-<p id="t1703" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">addCleanup</span><span class="op">(</span><span class="nam">restore_stdin</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">stdin</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1704" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sys</span><span class="op">.</span><span class="nam">stdin</span> <span class="op">=</span> <span class="nam">stdin</span><span class="strut">&nbsp;</span></p>
+<p id="t1700" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">stdin</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="str">&quot;--[[[cog cog.outl(&#39;Wow&#39;) ]]]\n--[[[end]]]\n&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1701" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">def</span> <span class="nam">restore_stdin</span><span class="op">(</span><span class="nam">old_stdin</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t1702" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sys</span><span class="op">.</span><span class="nam">stdin</span> <span class="op">=</span> <span class="nam">old_stdin</span><span class="strut">&nbsp;</span></p>
+<p id="t1703" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">addCleanup</span><span class="op">(</span><span class="nam">restore_stdin</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">stdin</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1704" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">sys</span><span class="op">.</span><span class="nam">stdin</span> <span class="op">=</span> <span class="nam">stdin</span><span class="strut">&nbsp;</span></p>
 <p id="t1705" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1706" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">stderr</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1707" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">setOutput</span><span class="op">(</span><span class="nam">stderr</span><span class="op">=</span><span class="nam">stderr</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1708" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1709" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1710" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">outerr</span> <span class="op">=</span> <span class="nam">stderr</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1711" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">&quot;--[[[cog cog.outl(&#39;Wow&#39;) ]]]\nWow\n--[[[end]]]\n&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1712" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">outerr</span><span class="op">,</span> <span class="str">&quot;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1706" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">stderr</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1707" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">setOutput</span><span class="op">(</span><span class="nam">stderr</span><span class="op">=</span><span class="nam">stderr</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1708" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1709" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1710" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">outerr</span> <span class="op">=</span> <span class="nam">stderr</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1711" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">&quot;--[[[cog cog.outl(&#39;Wow&#39;) ]]]\nWow\n--[[[end]]]\n&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1712" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">outerr</span><span class="op">,</span> <span class="str">&quot;&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1713" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1714" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1715" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testSuffixOutputLines</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1716" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1716" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1717" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;test.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1718" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; Hey there.</span><span class="strut">&nbsp;</span></p>
 <p id="t1719" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; ;[[[cog cog.outl(&#39;a\\nb\\n&nbsp;&nbsp; \\nc&#39;) ]]]</span><span class="strut">&nbsp;</span></p>
@@ -4031,12 +4031,12 @@
 <p id="t1735" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t1736" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1737" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1738" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1739" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-s&#39;</span><span class="op">,</span> <span class="str">&#39; (foo)&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1740" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1738" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1739" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-s&#39;</span><span class="op">,</span> <span class="str">&#39; (foo)&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1740" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1741" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1742" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testEmptySuffix</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1743" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1743" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1744" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;test.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1745" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; ;[[[cog cog.outl(&#39;a\\nb\\nc&#39;) ]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t1746" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; ;[[[end]]]</span><span class="strut">&nbsp;</span></p>
@@ -4051,12 +4051,12 @@
 <p id="t1755" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t1756" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1757" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1758" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1759" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-s&#39;</span><span class="op">,</span> <span class="str">&#39;&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1760" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1758" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1759" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-s&#39;</span><span class="op">,</span> <span class="str">&#39;&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1760" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1761" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1762" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testHellishSuffix</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1763" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1763" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1764" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;test.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1765" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; ;[[[cog cog.outl(&#39;a\\n\\nb&#39;) ]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t1766" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
@@ -4069,9 +4069,9 @@
 <p id="t1773" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t1774" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1775" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1776" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1777" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-z&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-s&#39;</span><span class="op">,</span> <span class="str">r&#39; /\n*+([)]&gt;&lt;&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1778" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1776" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1777" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-z&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-s&#39;</span><span class="op">,</span> <span class="str">r&#39; /\n*+([)]&gt;&lt;&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1778" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1779" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1780" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1781" class="stm run hide_run"><span class="key">class</span> <span class="nam">WritabilityTests</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
@@ -4107,41 +4107,41 @@
 <p id="t1811" class="exc">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">cmd_w_asterisk</span> <span class="op">=</span> <span class="str">&#39;chmod +w *&#39;</span><span class="strut">&nbsp;</span></p>
 <p id="t1812" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1813" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">setUp</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1814" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">TestCaseWithTempDir</span><span class="op">.</span><span class="nam">setUp</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1815" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1816" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1817" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">os</span><span class="op">.</span><span class="nam">chmod</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">stat</span><span class="op">.</span><span class="nam">S_IREAD</span><span class="op">)</span>&nbsp;&nbsp; <span class="com"># Make the file readonly.</span><span class="strut">&nbsp;</span></p>
-<p id="t1818" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">assert</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1814" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">TestCaseWithTempDir</span><span class="op">.</span><span class="nam">setUp</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1815" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1816" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1817" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">os</span><span class="op">.</span><span class="nam">chmod</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">stat</span><span class="op">.</span><span class="nam">S_IREAD</span><span class="op">)</span>&nbsp;&nbsp; <span class="com"># Make the file readonly.</span><span class="strut">&nbsp;</span></p>
+<p id="t1818" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">assert</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1819" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1820" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">tearDown</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1821" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">os</span><span class="op">.</span><span class="nam">chmod</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">stat</span><span class="op">.</span><span class="nam">S_IWRITE</span><span class="op">)</span>&nbsp;&nbsp; <span class="com"># Make the file writable again.</span><span class="strut">&nbsp;</span></p>
-<p id="t1822" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">TestCaseWithTempDir</span><span class="op">.</span><span class="nam">tearDown</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1821" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">os</span><span class="op">.</span><span class="nam">chmod</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">stat</span><span class="op">.</span><span class="nam">S_IWRITE</span><span class="op">)</span>&nbsp;&nbsp; <span class="com"># Make the file writable again.</span><span class="strut">&nbsp;</span></p>
+<p id="t1822" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">TestCaseWithTempDir</span><span class="op">.</span><span class="nam">tearDown</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1823" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1824" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testReadonlyNoCommand</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1825" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span> <span class="str">&quot;Can&#39;t overwrite test.cog&quot;</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1826" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1827" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">assert</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1825" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span> <span class="str">&quot;Can&#39;t overwrite test.cog&quot;</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t1826" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1827" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">assert</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1828" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1829" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testReadonlyWithCommand</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1830" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-w&#39;</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">cmd_w_args</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1831" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1832" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">assert</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1830" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-w&#39;</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">cmd_w_args</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1831" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1832" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">assert</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1833" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1834" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testReadonlyWithCommandWithNoSlot</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1835" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-w&#39;</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">cmd_w_asterisk</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1836" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1837" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">assert</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1835" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-w&#39;</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">cmd_w_asterisk</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1836" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1837" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">assert</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1838" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1839" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testReadonlyWithIneffectualCommand</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1840" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span> <span class="str">&quot;Couldn&#39;t make test.cog writable&quot;</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1841" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-w&#39;</span><span class="op">,</span> <span class="str">&#39;echo %s&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1842" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">assert</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1840" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span> <span class="str">&quot;Couldn&#39;t make test.cog writable&quot;</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t1841" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-w&#39;</span><span class="op">,</span> <span class="str">&#39;echo %s&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1842" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">assert</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1843" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1844" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1845" class="stm run hide_run"><span class="key">class</span> <span class="nam">ChecksumTests</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t1846" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1847" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testCreateChecksumOutput</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1848" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1848" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1849" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;cog1.txt&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1850" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t1851" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;This line was generated.&quot;)</span><span class="strut">&nbsp;</span></p>
@@ -4161,12 +4161,12 @@
 <p id="t1865" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t1866" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1867" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1868" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1869" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-c&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1870" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;cog1.txt&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1868" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1869" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-c&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1870" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;cog1.txt&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1871" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1872" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testCheckChecksumOutput</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1873" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1873" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1874" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;cog1.txt&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1875" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t1876" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;This line was newly&quot;)</span><span class="strut">&nbsp;</span></p>
@@ -4190,12 +4190,12 @@
 <p id="t1894" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t1895" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1896" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1897" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1898" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-c&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1899" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;cog1.txt&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1897" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1898" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-c&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1899" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;cog1.txt&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1900" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1901" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testRemoveChecksumOutput</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1902" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1902" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1903" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;cog1.txt&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1904" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t1905" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;This line was newly&quot;)</span><span class="strut">&nbsp;</span></p>
@@ -4219,12 +4219,12 @@
 <p id="t1923" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t1924" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1925" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1926" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1927" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t1928" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;cog1.txt&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1926" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1927" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.txt&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1928" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;cog1.txt&#39;</span><span class="op">,</span> <span class="str">&#39;cog1.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t1929" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t1930" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testTamperedChecksumOutput</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t1931" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1931" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t1932" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;cog1.txt&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t1933" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t1934" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;This line was newly&quot;)</span><span class="strut">&nbsp;</span></p>
@@ -4297,37 +4297,37 @@
 <p id="t2001" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t2002" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t2003" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t2004" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2005" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2004" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2005" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t2006" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">r&quot;cog1.txt\(9\): Output has been edited! Delete old checksum to unprotect.&quot;</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t2007" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-c&#39;</span><span class="op">,</span> <span class="str">&quot;cog1.txt&quot;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2008" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2007" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-c&#39;</span><span class="op">,</span> <span class="str">&quot;cog1.txt&quot;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2008" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t2009" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">r&quot;cog2.txt\(9\): Output has been edited! Delete old checksum to unprotect.&quot;</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t2010" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-c&#39;</span><span class="op">,</span> <span class="str">&quot;cog2.txt&quot;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2011" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2010" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-c&#39;</span><span class="op">,</span> <span class="str">&quot;cog2.txt&quot;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2011" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t2012" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">r&quot;cog3.txt\(10\): Output has been edited! Delete old checksum to unprotect.&quot;</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t2013" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-c&#39;</span><span class="op">,</span> <span class="str">&quot;cog3.txt&quot;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2014" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2013" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-c&#39;</span><span class="op">,</span> <span class="str">&quot;cog3.txt&quot;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2014" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t2015" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">r&quot;cog4.txt\(9\): Output has been edited! Delete old checksum to unprotect.&quot;</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t2016" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-c&#39;</span><span class="op">,</span> <span class="str">&quot;cog4.txt&quot;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2017" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2016" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-c&#39;</span><span class="op">,</span> <span class="str">&quot;cog4.txt&quot;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2017" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t2018" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">r&quot;cog5.txt\(10\): Output has been edited! Delete old checksum to unprotect.&quot;</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t2019" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-c&#39;</span><span class="op">,</span> <span class="str">&quot;cog5.txt&quot;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2020" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2019" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-c&#39;</span><span class="op">,</span> <span class="str">&quot;cog5.txt&quot;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2020" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t2021" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">r&quot;cog6.txt\(6\): Output has been edited! Delete old checksum to unprotect.&quot;</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t2022" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-c&#39;</span><span class="op">,</span> <span class="str">&quot;cog6.txt&quot;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2022" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-c&#39;</span><span class="op">,</span> <span class="str">&quot;cog6.txt&quot;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t2023" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t2024" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testArgvIsntModified</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t2025" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">argv</span> <span class="op">=</span> <span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-v&#39;</span><span class="op">]</span><span class="strut">&nbsp;</span></p>
-<p id="t2026" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">orig_argv</span> <span class="op">=</span> <span class="nam">argv</span><span class="op">[</span><span class="op">:</span><span class="op">]</span><span class="strut">&nbsp;</span></p>
-<p id="t2027" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="nam">argv</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2028" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">argv</span><span class="op">,</span> <span class="nam">orig_argv</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2025" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">argv</span> <span class="op">=</span> <span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-v&#39;</span><span class="op">]</span><span class="strut">&nbsp;</span></p>
+<p id="t2026" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">orig_argv</span> <span class="op">=</span> <span class="nam">argv</span><span class="op">[</span><span class="op">:</span><span class="op">]</span><span class="strut">&nbsp;</span></p>
+<p id="t2027" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="nam">argv</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2028" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">argv</span><span class="op">,</span> <span class="nam">orig_argv</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t2029" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t2030" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t2031" class="stm run hide_run"><span class="key">class</span> <span class="nam">CustomMarkerTests</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t2032" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t2033" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testCustomerMarkers</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t2034" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t2034" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t2035" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;test.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t2036" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //{{</span><span class="strut">&nbsp;</span></p>
 <p id="t2037" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;void %s();&quot; % &quot;MyFunction&quot;)</span><span class="strut">&nbsp;</span></p>
@@ -4344,17 +4344,17 @@
 <p id="t2048" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t2049" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t2050" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t2051" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2052" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="strut">&nbsp;</span></p>
+<p id="t2051" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2052" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="strut">&nbsp;</span></p>
 <p id="t2053" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t2054" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;--markers={{ }} {{end}}&#39;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t2055" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;test.cog&#39;</span><span class="strut">&nbsp;</span></p>
 <p id="t2056" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2057" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2057" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t2058" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t2059" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testTrulyWackyMarkers</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t2060" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Make sure the markers are properly re-escaped.</span><span class="strut">&nbsp;</span></p>
-<p id="t2061" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t2061" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t2062" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;test.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t2063" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //**(</span><span class="strut">&nbsp;</span></p>
 <p id="t2064" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;void %s();&quot; % &quot;MyFunction&quot;)</span><span class="strut">&nbsp;</span></p>
@@ -4371,16 +4371,16 @@
 <p id="t2075" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t2076" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t2077" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t2078" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2079" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="strut">&nbsp;</span></p>
+<p id="t2078" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2079" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="strut">&nbsp;</span></p>
 <p id="t2080" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t2081" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;--markers=**( **) **(end)**&#39;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t2082" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;test.cog&#39;</span><span class="strut">&nbsp;</span></p>
 <p id="t2083" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2084" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2084" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t2085" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t2086" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testChangeJustOneMarker</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t2087" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t2087" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t2088" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;test.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t2089" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //**(</span><span class="strut">&nbsp;</span></p>
 <p id="t2090" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.outl(&quot;void %s();&quot; % &quot;MyFunction&quot;)</span><span class="strut">&nbsp;</span></p>
@@ -4397,13 +4397,13 @@
 <p id="t2101" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t2102" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t2103" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t2104" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2105" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="strut">&nbsp;</span></p>
+<p id="t2104" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2105" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="strut">&nbsp;</span></p>
 <p id="t2106" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t2107" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;--markers=**( ]]] [[[end]]]&#39;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t2108" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;test.cog&#39;</span><span class="strut">&nbsp;</span></p>
 <p id="t2109" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2110" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2110" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t2111" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t2112" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t2113" class="stm run hide_run"><span class="key">class</span> <span class="nam">BlakeTests</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
@@ -4411,7 +4411,7 @@
 <p id="t2115" class="pln">&nbsp; &nbsp; <span class="com"># Blake Winton&#39;s contributions.</span><span class="strut">&nbsp;</span></p>
 <p id="t2116" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testDeleteCode</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t2117" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># -o sets the output file.</span><span class="strut">&nbsp;</span></p>
-<p id="t2118" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t2118" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t2119" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;test.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t2120" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
 <p id="t2121" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
@@ -4433,25 +4433,25 @@
 <p id="t2137" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t2138" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t2139" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t2140" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2141" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-d&#39;</span><span class="op">,</span> <span class="str">&#39;-o&#39;</span><span class="op">,</span> <span class="str">&#39;test.cogged&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2142" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cogged&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2140" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2141" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-d&#39;</span><span class="op">,</span> <span class="str">&#39;-o&#39;</span><span class="op">,</span> <span class="str">&#39;test.cogged&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2142" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cogged&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t2143" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t2144" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testDeleteCodeWithDashRFails</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t2145" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t2145" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t2146" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;test.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t2147" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
 <p id="t2148" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="strut">&nbsp;</span></p>
 <p id="t2149" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t2150" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t2151" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2152" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t2153" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-d&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2151" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2152" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t2153" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;-d&#39;</span><span class="op">,</span> <span class="str">&#39;test.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t2154" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t2155" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testSettingGlobals</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t2156" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Blake Winton contributed a way to set the globals that will be used in</span><span class="strut">&nbsp;</span></p>
 <p id="t2157" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># processFile().</span><span class="strut">&nbsp;</span></p>
-<p id="t2158" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t2158" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t2159" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;test.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t2160" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
 <p id="t2161" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
@@ -4469,19 +4469,19 @@
 <p id="t2173" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t2174" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t2175" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t2176" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2177" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">globals</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t2178" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">globals</span><span class="op">[</span><span class="str">&#39;fnames&#39;</span><span class="op">]</span> <span class="op">=</span> <span class="op">[</span><span class="str">&#39;DoBlake&#39;</span><span class="op">,</span> <span class="str">&#39;DoWinton&#39;</span><span class="op">,</span> <span class="str">&#39;DoContribution&#39;</span><span class="op">]</span><span class="strut">&nbsp;</span></p>
-<p id="t2179" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bDeleteCode</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
-<p id="t2180" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">processFile</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.cogged&#39;</span><span class="op">,</span> <span class="nam">globals</span><span class="op">=</span><span class="nam">globals</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2181" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cogged&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2176" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2177" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">globals</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t2178" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">globals</span><span class="op">[</span><span class="str">&#39;fnames&#39;</span><span class="op">]</span> <span class="op">=</span> <span class="op">[</span><span class="str">&#39;DoBlake&#39;</span><span class="op">,</span> <span class="str">&#39;DoWinton&#39;</span><span class="op">,</span> <span class="str">&#39;DoContribution&#39;</span><span class="op">]</span><span class="strut">&nbsp;</span></p>
+<p id="t2179" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bDeleteCode</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
+<p id="t2180" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">processFile</span><span class="op">(</span><span class="str">&#39;test.cog&#39;</span><span class="op">,</span> <span class="str">&#39;test.cogged&#39;</span><span class="op">,</span> <span class="nam">globals</span><span class="op">=</span><span class="nam">globals</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2181" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">&#39;test.cogged&#39;</span><span class="op">,</span> <span class="str">&#39;test.out&#39;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t2182" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t2183" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t2184" class="stm run hide_run"><span class="key">class</span> <span class="nam">ErrorCallTests</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t2185" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t2186" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testErrorCallHasNoTraceback</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t2187" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Test that cog.error() doesn&#39;t show a traceback.</span><span class="strut">&nbsp;</span></p>
-<p id="t2188" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t2188" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t2189" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;error.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t2190" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t2191" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; cog.error(&quot;Something Bad!&quot;)</span><span class="strut">&nbsp;</span></p>
@@ -4490,14 +4490,14 @@
 <p id="t2194" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t2195" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t2196" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t2197" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2198" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;error.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2199" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2200" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">&quot;Cogging error.cog\nError: Something Bad!\n&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2197" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2198" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;error.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2199" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2200" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">&quot;Cogging error.cog\nError: Something Bad!\n&quot;</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t2201" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t2202" class="stm run hide_run">&nbsp; &nbsp; <span class="key">def</span> <span class="nam">testRealErrorHasTraceback</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
 <p id="t2203" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># Test that a genuine error does show a traceback.</span><span class="strut">&nbsp;</span></p>
-<p id="t2204" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t2204" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t2205" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="str">&#39;error.cog&#39;</span><span class="op">:</span> <span class="str">&quot;&quot;&quot;\</span><span class="strut">&nbsp;</span></p>
 <p id="t2206" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; //[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t2207" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; raise RuntimeError(&quot;Hey!&quot;)</span><span class="strut">&nbsp;</span></p>
@@ -4506,12 +4506,12 @@
 <p id="t2210" class="pln"><span class="str">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;&quot;&quot;</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t2211" class="pln">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t2212" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t2213" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2214" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;error.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2215" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2216" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">msg</span> <span class="op">=</span> <span class="str">&#39;Actual output:\n&#39;</span> <span class="op">+</span> <span class="nam">output</span><span class="strut">&nbsp;</span></p>
-<p id="t2217" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assert_</span><span class="op">(</span><span class="nam">output</span><span class="op">.</span><span class="nam">startswith</span><span class="op">(</span><span class="str">&quot;Cogging error.cog\nTraceback (most recent&quot;</span><span class="op">)</span><span class="op">,</span> <span class="nam">msg</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t2218" class="stm run hide_run">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">&quot;RuntimeError: Hey!&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2213" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2214" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="op">[</span><span class="str">&#39;argv0&#39;</span><span class="op">,</span> <span class="str">&#39;-r&#39;</span><span class="op">,</span> <span class="str">&#39;error.cog&#39;</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2215" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2216" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">msg</span> <span class="op">=</span> <span class="str">&#39;Actual output:\n&#39;</span> <span class="op">+</span> <span class="nam">output</span><span class="strut">&nbsp;</span></p>
+<p id="t2217" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assert_</span><span class="op">(</span><span class="nam">output</span><span class="op">.</span><span class="nam">startswith</span><span class="op">(</span><span class="str">&quot;Cogging error.cog\nTraceback (most recent&quot;</span><span class="op">)</span><span class="op">,</span> <span class="nam">msg</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2218" class="stm mis">&nbsp; &nbsp; &nbsp; &nbsp; <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">&quot;RuntimeError: Hey!&quot;</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t2219" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t2220" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t2221" class="pln"><span class="com"># Things not yet tested:</span><span class="strut">&nbsp;</span></p>
@@ -4525,8 +4525,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.2</a>,
-            created at 2015-11-04 05:20
+            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.3</a>,
+            created at 2015-11-24 07:02
         </p>
     </div>
 </div>
diff --git a/doc/sample_html/cogapp_test_makefiles_py.html b/doc/sample_html/cogapp_test_makefiles_py.html
index cb7c7c40..1fba8b01 100644
--- a/doc/sample_html/cogapp_test_makefiles_py.html
+++ b/doc/sample_html/cogapp_test_makefiles_py.html
@@ -265,8 +265,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.2</a>,
-            created at 2015-11-04 05:20
+            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.3</a>,
+            created at 2015-11-24 07:02
         </p>
     </div>
 </div>
diff --git a/doc/sample_html/cogapp_test_whiteutils_py.html b/doc/sample_html/cogapp_test_whiteutils_py.html
index bf75896a..0a0eb777 100644
--- a/doc/sample_html/cogapp_test_whiteutils_py.html
+++ b/doc/sample_html/cogapp_test_whiteutils_py.html
@@ -285,8 +285,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.2</a>,
-            created at 2015-11-04 05:20
+            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.3</a>,
+            created at 2015-11-24 07:02
         </p>
     </div>
 </div>
diff --git a/doc/sample_html/cogapp_whiteutils_py.html b/doc/sample_html/cogapp_whiteutils_py.html
index a939299d..eee9d628 100644
--- a/doc/sample_html/cogapp_whiteutils_py.html
+++ b/doc/sample_html/cogapp_whiteutils_py.html
@@ -223,8 +223,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.2</a>,
-            created at 2015-11-04 05:20
+            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.3</a>,
+            created at 2015-11-24 07:02
         </p>
     </div>
 </div>
diff --git a/doc/sample_html/index.html b/doc/sample_html/index.html
index 4f920b93..f2dd3a55 100644
--- a/doc/sample_html/index.html
+++ b/doc/sample_html/index.html
@@ -22,7 +22,7 @@
 <div id="header">
     <div class="content">
         <h1>Coverage report:
-            <span class="pc_cov">89.15%</span>
+            <span class="pc_cov">37.82%</span>
         </h1>
 
         <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" />
@@ -72,13 +72,13 @@
             <tr class="total">
                 <td class="name left">Total</td>
                 <td>1348</td>
-                <td>148</td>
+                <td>838</td>
                 <td>13</td>
                 
                 <td>228</td>
-                <td>11</td>
+                <td>30</td>
                 
-                <td class="right" data-ratio="1405 1576">89.15%</td>
+                <td class="right" data-ratio="596 1576">37.82%</td>
             </tr>
         </tfoot>
         <tbody>
@@ -122,37 +122,37 @@
             <tr class="file">
                 <td class="name left"><a href="cogapp_cogapp_py.html">cogapp/cogapp.py</a></td>
                 <td>423</td>
-                <td>3</td>
+                <td>194</td>
                 <td>4</td>
                 
                 <td>168</td>
-                <td>4</td>
+                <td>26</td>
                 
-                <td class="right" data-ratio="584 591">98.82%</td>
+                <td class="right" data-ratio="283 591">47.88%</td>
             </tr>
             
             <tr class="file">
                 <td class="name left"><a href="cogapp_makefiles_py.html">cogapp/makefiles.py</a></td>
                 <td>28</td>
-                <td>7</td>
+                <td>20</td>
                 <td>3</td>
                 
                 <td>14</td>
-                <td>2</td>
+                <td>0</td>
                 
-                <td class="right" data-ratio="27 42">64.29%</td>
+                <td class="right" data-ratio="8 42">19.05%</td>
             </tr>
             
             <tr class="file">
                 <td class="name left"><a href="cogapp_test_cogapp_py.html">cogapp/test_cogapp.py</a></td>
                 <td>704</td>
-                <td>0</td>
+                <td>486</td>
                 <td>6</td>
                 
                 <td>6</td>
-                <td>1</td>
+                <td>0</td>
                 
-                <td class="right" data-ratio="709 710">99.86%</td>
+                <td class="right" data-ratio="220 710">30.99%</td>
             </tr>
             
             <tr class="file">
@@ -202,8 +202,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.2</a>,
-            created at 2015-11-04 05:20
+            <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.3</a>,
+            created at 2015-11-24 07:02
         </p>
     </div>
 </div>
diff --git a/doc/sample_html/status.json b/doc/sample_html/status.json
index 614f7b11..3419a956 100644
--- a/doc/sample_html/status.json
+++ b/doc/sample_html/status.json
@@ -1 +1 @@
-{"files": {"cogapp_test_whiteutils_py": {"index": {"relative_filename": "cogapp/test_whiteutils.py", "html_filename": "cogapp_test_whiteutils_py.html", "nums": [1, 69, 0, 69, 0, 0, 0]}, "hash": "f7a3c04788858b652fcfb29825e1e8d4"}, "cogapp_test_makefiles_py": {"index": {"relative_filename": "cogapp/test_makefiles.py", "html_filename": "cogapp_test_makefiles_py.html", "nums": [1, 55, 0, 55, 6, 0, 6]}, "hash": "ff1f44c04d08ae202f5164e1ba75818e"}, "cogapp_cogapp_py": {"index": {"relative_filename": "cogapp/cogapp.py", "html_filename": "cogapp_cogapp_py.html", "nums": [1, 423, 4, 3, 168, 4, 4]}, "hash": "4c6c4b843da7cd91e690535daa5192c1"}, "cogapp___init___py": {"index": {"relative_filename": "cogapp/__init__.py", "html_filename": "cogapp___init___py.html", "nums": [1, 2, 0, 0, 0, 0, 0]}, "hash": "e8e5f4601febeb4f8cfaedc27cda7ff2"}, "cogapp_backward_py": {"index": {"relative_filename": "cogapp/backward.py", "html_filename": "cogapp_backward_py.html", "nums": [1, 19, 0, 8, 2, 1, 1]}, "hash": "02fc7e84b678eb8cd2df594ecd21792d"}, "cogapp_test_cogapp_py": {"index": {"relative_filename": "cogapp/test_cogapp.py", "html_filename": "cogapp_test_cogapp_py.html", "nums": [1, 704, 6, 0, 6, 1, 1]}, "hash": "8042afebdffb470d9119c676064ad32c"}, "cogapp_makefiles_py": {"index": {"relative_filename": "cogapp/makefiles.py", "html_filename": "cogapp_makefiles_py.html", "nums": [1, 28, 3, 7, 14, 2, 8]}, "hash": "4344b02848c1c9dd0a59c3196640dde0"}, "cogapp_whiteutils_py": {"index": {"relative_filename": "cogapp/whiteutils.py", "html_filename": "cogapp_whiteutils_py.html", "nums": [1, 45, 0, 3, 32, 3, 3]}, "hash": "b898c54cd626b6265d68d6e536ad78cf"}, "cogapp___main___py": {"index": {"relative_filename": "cogapp/__main__.py", "html_filename": "cogapp___main___py.html", "nums": [1, 3, 0, 3, 0, 0, 0]}, "hash": "c846304fff9f9b5f7510a86b60c3c3c6"}}, "version": "4.0.2", "settings": "7d07facd0b8027d5d394bf363d405670", "format": 1}
\ No newline at end of file
+{"files": {"cogapp_test_whiteutils_py": {"index": {"relative_filename": "cogapp/test_whiteutils.py", "html_filename": "cogapp_test_whiteutils_py.html", "nums": [1, 69, 0, 69, 0, 0, 0]}, "hash": "f7a3c04788858b652fcfb29825e1e8d4"}, "cogapp_test_makefiles_py": {"index": {"relative_filename": "cogapp/test_makefiles.py", "html_filename": "cogapp_test_makefiles_py.html", "nums": [1, 55, 0, 55, 6, 0, 6]}, "hash": "ff1f44c04d08ae202f5164e1ba75818e"}, "cogapp_cogapp_py": {"index": {"relative_filename": "cogapp/cogapp.py", "html_filename": "cogapp_cogapp_py.html", "nums": [1, 423, 4, 194, 168, 26, 114]}, "hash": "0cddc268270941a93a88a5a06a86629e"}, "cogapp___init___py": {"index": {"relative_filename": "cogapp/__init__.py", "html_filename": "cogapp___init___py.html", "nums": [1, 2, 0, 0, 0, 0, 0]}, "hash": "e8e5f4601febeb4f8cfaedc27cda7ff2"}, "cogapp_backward_py": {"index": {"relative_filename": "cogapp/backward.py", "html_filename": "cogapp_backward_py.html", "nums": [1, 19, 0, 8, 2, 1, 1]}, "hash": "02fc7e84b678eb8cd2df594ecd21792d"}, "cogapp_test_cogapp_py": {"index": {"relative_filename": "cogapp/test_cogapp.py", "html_filename": "cogapp_test_cogapp_py.html", "nums": [1, 704, 6, 486, 6, 0, 4]}, "hash": "8693bbecf0b8fc5ef9ad177e4d156edb"}, "cogapp_makefiles_py": {"index": {"relative_filename": "cogapp/makefiles.py", "html_filename": "cogapp_makefiles_py.html", "nums": [1, 28, 3, 20, 14, 0, 14]}, "hash": "a744227abe2381eefae57f20e5f3d79e"}, "cogapp_whiteutils_py": {"index": {"relative_filename": "cogapp/whiteutils.py", "html_filename": "cogapp_whiteutils_py.html", "nums": [1, 45, 0, 3, 32, 3, 3]}, "hash": "b898c54cd626b6265d68d6e536ad78cf"}, "cogapp___main___py": {"index": {"relative_filename": "cogapp/__main__.py", "html_filename": "cogapp___main___py.html", "nums": [1, 3, 0, 3, 0, 0, 0]}, "hash": "c846304fff9f9b5f7510a86b60c3c3c6"}}, "version": "4.0.3", "settings": "7d07facd0b8027d5d394bf363d405670", "format": 1}
\ No newline at end of file
-- 
cgit v1.2.1