From fb1416837b64ada04a7e07ca4c9c041a1aeeface Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <gerwitm@lovullo.com>
Date: Wed, 18 Mar 2015 11:31:47 -0400
Subject: [PATCH] Package namespace/imports/decl cleanup

---
 core/base.xml               | 140 ++++++-------
 core/cond.xml               | 123 ++++++-----
 core/datetime.xml           |  57 +++---
 core/map.xml                | 109 +++++-----
 core/numeric.xml            |  24 +--
 core/numeric/boolean.xml    |  20 +-
 core/numeric/common.xml     |  85 ++++----
 core/numeric/convert.xml    |   8 +-
 core/numeric/minmax.xml     | 199 +++++++++---------
 core/numeric/round.xml      | 104 +++++-----
 core/tdat.xml               |  37 ++--
 core/test/spec.xml          |   4 +-
 core/vector.xml             |  29 ++-
 core/vector/arithmetic.xml  | 137 ++++++-------
 core/vector/cmatch.xml      | 167 ++++++++-------
 core/vector/common.xml      |  73 ++++---
 core/vector/convert.xml     |  16 +-
 core/vector/count.xml       |  27 +--
 core/vector/interpolate.xml | 107 +++++-----
 core/vector/list.xml        |  93 ++++-----
 core/vector/matrix.xml      |  55 +++--
 core/vector/table.xml       | 393 ++++++++++++++++++------------------
 22 files changed, 948 insertions(+), 1059 deletions(-)

diff --git a/core/base.xml b/core/base.xml
index dcbc034a..a6c362ee 100644
--- a/core/base.xml
+++ b/core/base.xml
@@ -1,123 +1,117 @@
-<?xml-stylesheet type="text/xsl" href="summary.xsl"?>
-<lv:package
-  xmlns:lv="http://www.lovullo.com/rater"
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../rater.xsd"
-
   core="true"
-
-  name="core/base"
   desc="Base features">
 
 
   <!-- magic variable that will contain the result of a classification (this
        definition exists to simplify validations (its symbol is Xi because it
        looks like a sideways array) -->
-  <lv:const name="_CMATCH_" type="boolean" desc="Set indicating indexes of classification matches" sym="\Xi">
-    <lv:item value="0" desc="Dummy value; this set is populated upon entering each rate block" />
-  </lv:const>
+  <const name="_CMATCH_" type="boolean" desc="Set indicating indexes of classification matches" sym="\Xi">
+    <item value="0" desc="Dummy value; this set is populated upon entering each rate block" />
+  </const>
 
-  <lv:const name="NEGATE" value="-1" type="float" desc="Negate a value" sym="-" />
+  <const name="NEGATE" value="-1" type="float" desc="Negate a value" sym="-" />
 
   <!-- useful where constants are required -->
-  <lv:const name="ZERO" value="0.00" type="float" desc="Zero value" />
+  <const name="ZERO" value="0.00" type="float" desc="Zero value" />
 
   <!-- the runtime is responsible for automatically populating these fields with meaningful values -->
-  <lv:const name="__DATE_YEAR__" value="0" type="integer" desc="Current year" sym="\widehat{D^\gamma}" magic="true" />
+  <const name="__DATE_YEAR__" value="0" type="integer" desc="Current year" sym="\widehat{D^\gamma}" magic="true" />
 
 
-  <lv:typedef name="integer" desc="Any value in the set of integers" sym="\mathbb{I}">
-    <lv:base-type />
-  </lv:typedef>
+  <typedef name="integer" desc="Any value in the set of integers" sym="\mathbb{I}">
+    <base-type />
+  </typedef>
 
   <!-- real number -->
-  <lv:typedef name="float" desc="Any real number (represented as a float)" sym="\mathbb{R}">
-    <lv:base-type />
-  </lv:typedef>
+  <typedef name="float" desc="Any real number (represented as a float)" sym="\mathbb{R}">
+    <base-type />
+  </typedef>
 
-  <lv:typedef name="boolean" desc="Boolean values">
-    <lv:enum type="integer">
-      <lv:item name="TRUE" value="1" desc="True" />
-      <lv:item name="FALSE" value="0" desc="False" />
-    </lv:enum>
-  </lv:typedef>
+  <typedef name="boolean" desc="Boolean values">
+    <enum type="integer">
+      <item name="TRUE" value="1" desc="True" />
+      <item name="FALSE" value="0" desc="False" />
+    </enum>
+  </typedef>
 
   <!-- does not have much practical use outside of the core -->
-  <lv:typedef name="empty" desc="Empty set" sym="\emptyset">
-    <lv:base-type />
-  </lv:typedef>
+  <typedef name="empty" desc="Empty set" sym="\emptyset">
+    <base-type />
+  </typedef>
 
 
   <!--
     Useful in certain circumstances. Don't judge.
   -->
-  <lv:classify as="always" keep="true" yields="alwaysTrue" desc="Always true" />
+  <classify as="always" keep="true" yields="alwaysTrue" desc="Always true" />
 
 
-  <lv:template name="_todo_" desc="A simple TODO :)">
-    <lv:param name="@desc@" desc="TODO desc">
-      <lv:text>TODO</lv:text>
-    </lv:param>
+  <template name="_todo_" desc="A simple TODO :)">
+    <param name="@desc@" desc="TODO desc">
+      <text>TODO</text>
+    </param>
 
-    <lv:param name="@hide@" desc="Whether to hide content by stripping
+    <param name="@hide@" desc="Whether to hide content by stripping
                                   it entriely from the output" />
 
-    <lv:unless name="@hide@">
+    <unless name="@hide@">
       <c:const value="0" type="integer" desc="@desc@" />
-    </lv:unless>
-  </lv:template>
+    </unless>
+  </template>
 
 
-  <lv:template name="_ignore_" desc="Simply removes all child nodes (as if it was commented out)">
-    <lv:param name="@values@" desc="Nodes to comment out" />
-    <lv:param name="@desc@" desc="Description" />
+  <template name="_ignore_" desc="Simply removes all child nodes (as if it was commented out)">
+    <param name="@values@" desc="Nodes to comment out" />
+    <param name="@desc@" desc="Description" />
 
     <!-- nothing -->
-  </lv:template>
+  </template>
 
 
-  <lv:template name="_fail-on-empty_" desc="Fail on rate lookup failure">
-    <lv:param name="@values@" desc="Optional conditions to include in match" />
-    <lv:param name="@name@" desc="Data to check (scalar, vector or otherwise)" />
-    <lv:param name="@when@" desc="Conditional check (optional)" />
-    <lv:param name="@class@" desc="Conditional class check" />
+  <template name="_fail-on-empty_" desc="Fail on rate lookup failure">
+    <param name="@values@" desc="Optional conditions to include in match" />
+    <param name="@name@" desc="Data to check (scalar, vector or otherwise)" />
+    <param name="@when@" desc="Conditional check (optional)" />
+    <param name="@class@" desc="Conditional class check" />
 
-    <lv:param name="@as@" desc="Classifier name">
-      <lv:text>-err-empty-</lv:text>
-      <lv:param-value name="@name@" lower="true" />
-    </lv:param>
+    <param name="@as@" desc="Classifier name">
+      <text>-err-empty-</text>
+      <param-value name="@name@" lower="true" />
+    </param>
 
-    <lv:param name="@desc@" desc="Description">
-      <lv:param-value name="@name@" />
-      <lv:text> is empty</lv:text>
-    </lv:param>
+    <param name="@desc@" desc="Description">
+      <param-value name="@name@" />
+      <text> is empty</text>
+    </param>
 
-    <lv:param name="@classyields@" desc="Classification yield to match on">
-      <lv:param-class-to-yields name="@class@" />
-    </lv:param>
+    <param name="@classyields@" desc="Classification yield to match on">
+      <param-class-to-yields name="@class@" />
+    </param>
 
     <!-- default to external to ensure that calculations do not wind up in the
          classifier -->
-    <lv:param name="@external@" desc="External classification">
-      <lv:text>true</lv:text>
-    </lv:param>
+    <param name="@external@" desc="External classification">
+      <text>true</text>
+    </param>
 
 
-    <lv:classify as="@as@" desc="@desc@" external="@external@" terminate="true">
+    <classify as="@as@" desc="@desc@" external="@external@" terminate="true">
       <!-- include any option conditions -->
-      <lv:param-copy name="@values@" />
+      <param-copy name="@values@" />
 
-      <lv:if name="@when@">
-        <lv:match on="@when@" value="TRUE" />
-      </lv:if>
+      <if name="@when@">
+        <match on="@when@" value="TRUE" />
+      </if>
 
-      <lv:if name="@class@">
-        <lv:match on="@classyields@" value="TRUE" />
-      </lv:if>
+      <if name="@class@">
+        <match on="@classyields@" value="TRUE" />
+      </if>
 
-      <lv:match on="@name@" value="ZERO" />
-    </lv:classify>
-  </lv:template>
-</lv:package>
+      <match on="@name@" value="ZERO" />
+    </classify>
+  </template>
+</package>
 
diff --git a/core/cond.xml b/core/cond.xml
index ca6a588a..c6933d63 100644
--- a/core/cond.xml
+++ b/core/cond.xml
@@ -1,22 +1,16 @@
-<?xml-stylesheet type="text/xsl" href="summary.xsl"?>
-<lv:package
-  xmlns:lv="http://www.lovullo.com/rater"
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../rater.xsd"
-
   core="true"
-
-  name="core/cond"
   desc="Generic conditionals">
 
-  <lv:import package="base" />
+  <import package="base" />
 
 
   <!-- TODO: use reduce once we have support for function passing -->
-  <lv:function name="or" desc="Return value A if non-zero, otherwise B">
-    <lv:param name="or_a" type="float" desc="Value to return if non-zero" />
-    <lv:param name="or_b" type="float" desc="Value to return if A is zero" />
+  <function name="or" desc="Return value A if non-zero, otherwise B">
+    <param name="or_a" type="float" desc="Value to return if non-zero" />
+    <param name="or_b" type="float" desc="Value to return if A is zero" />
 
     <c:cases>
       <!-- return B if A is zero -->
@@ -35,23 +29,23 @@
         <c:value-of name="or_a" />
       </c:otherwise>
     </c:cases>
-  </lv:function>
+  </function>
 
 
-  <lv:template name="_cond_" desc="Conditional shorthand">
-    <lv:param name="@name@" desc="Value to check" />
-    <lv:param name="@index@" desc="Index of boolean value" />
-    <lv:param name="@value@" desc="Constant value" />
-    <lv:param name="@type@" desc="Value type" />
+  <template name="_cond_" desc="Conditional shorthand">
+    <param name="@name@" desc="Value to check" />
+    <param name="@index@" desc="Index of boolean value" />
+    <param name="@value@" desc="Constant value" />
+    <param name="@type@" desc="Value type" />
 
-    <lv:param name="@cond@" desc="Value to compare against (default boolean true)">
-      <lv:text>TRUE</lv:text>
-    </lv:param>
+    <param name="@cond@" desc="Value to compare against (default boolean true)">
+      <text>TRUE</text>
+    </param>
 
-    <lv:param name="@desc@" desc="Value description">
-      <lv:text>Value when </lv:text>
-      <lv:param-value name="@name@" />
-    </lv:param>
+    <param name="@desc@" desc="Value description">
+      <text>Value when </text>
+      <param-value name="@name@" />
+    </param>
 
     <c:const value="@value@" type="@type@" desc="@desc@">
       <!-- TODO: non-index option -->
@@ -61,50 +55,50 @@
         </c:eq>
       </c:when>
     </c:const>
-  </lv:template>
+  </template>
 
 
-  <lv:template name="_yield-unless_" desc="Yield a value unless another value is set">
-    <lv:param name="@name@" desc="Overriding value" />
-    <lv:param name="@index@" desc="Index" />
-    <lv:param name="@values@" desc="Value to use otherwise" />
+  <template name="_yield-unless_" desc="Yield a value unless another value is set">
+    <param name="@name@" desc="Overriding value" />
+    <param name="@index@" desc="Index" />
+    <param name="@values@" desc="Value to use otherwise" />
 
     <c:cases>
       <c:case>
-        <lv:if name="@index@">
+        <if name="@index@">
           <c:when name="@name@" index="@index@">
             <c:gt>
               <c:const value="0" type="integer" desc="Use override if greater than 0" />
             </c:gt>
           </c:when>
-        </lv:if>
-        <lv:unless name="@index@">
+        </if>
+        <unless name="@index@">
           <c:when name="@name@">
             <c:gt>
               <c:const value="0" type="integer" desc="Use override if greater than 0" />
             </c:gt>
           </c:when>
-        </lv:unless>
+        </unless>
 
-        <lv:if name="@index@">
+        <if name="@index@">
           <c:value-of name="@name@" index="@index@" />
-        </lv:if>
-        <lv:unless name="@index@">
+        </if>
+        <unless name="@index@">
           <c:value-of name="@name@" />
-        </lv:unless>
+        </unless>
       </c:case>
 
       <c:otherwise>
-        <lv:param-copy name="@values@" />
+        <param-copy name="@values@" />
       </c:otherwise>
     </c:cases>
-  </lv:template>
+  </template>
 
 
-  <lv:template name="_default_" desc="Set a default value if a value is not set">
-    <lv:param name="@name@" desc="Param name" />
-    <lv:param name="@index@" desc="Index" />
-    <lv:param name="@default@" desc="Default value to use if empty" />
+  <template name="_default_" desc="Set a default value if a value is not set">
+    <param name="@name@" desc="Param name" />
+    <param name="@index@" desc="Index" />
+    <param name="@default@" desc="Default value to use if empty" />
 
     <c:cases>
       <c:case>
@@ -121,36 +115,37 @@
         <c:value-of name="@name@" index="@index@" />
       </c:otherwise>
     </c:cases>
-  </lv:template>
+  </template>
 
 
 
-  <lv:template name="_cond-value-each_" desc="Conditional value">
-    <lv:param name="@class@"     desc="Class match" />
-    <lv:param name="@generates@" desc="Variable to generate into" />
-    <lv:param name="@value@"     desc="Value to yield (use either this or const)" />
-    <lv:param name="@const@"     desc="Constant to yield (use either this or value)" />
-    <lv:param name="@count@"     desc="Optional number of times to apply const/value (as a variable)" />
+  <template name="_cond-value-each_" desc="Conditional value">
+    <param name="@class@"     desc="Class match" />
+    <param name="@generates@" desc="Variable to generate into" />
+    <param name="@value@"     desc="Value to yield (use either this or const)" />
+    <param name="@const@"     desc="Constant to yield (use either this or value)" />
+    <param name="@count@"     desc="Optional number of times to apply const/value (as a variable)" />
 
-    <lv:param name="@desc@" desc="Optional constant description">
-      <lv:text>Constant value</lv:text>
-    </lv:param>
+    <param name="@desc@" desc="Optional constant description">
+      <text>Constant value</text>
+    </param>
 
     <!-- simply returns a constant value for the class match -->
-    <lv:rate-each class="@class@" accumulate="none" generates="@generates@" index="k">
+    <rate-each class="@class@" accumulate="none" generates="@generates@" index="k">
       <c:product>
-        <lv:if name="@value@">
+        <if name="@value@">
           <c:value-of name="@value@" />
-        </lv:if>
-        <lv:unless name="@value@">
+        </if>
+        <unless name="@value@">
           <c:const value="@const@" type="float" desc="@desc@" />
-        </lv:unless>
+        </unless>
 
         <!-- if this is not provided, then the c:product will be optimized away -->
-        <lv:if name="@count@">
+        <if name="@count@">
           <c:value-of name="@count@" index="k" />
-        </lv:if>
+        </if>
       </c:product>
-    </lv:rate-each>
-  </lv:template>
-</lv:package>
+    </rate-each>
+  </template>
+</package>
+
diff --git a/core/datetime.xml b/core/datetime.xml
index abeb49b8..045e742c 100644
--- a/core/datetime.xml
+++ b/core/datetime.xml
@@ -1,16 +1,10 @@
-<?xml-stylesheet type="text/xsl" href="summary.xsl"?>
-<lv:package
-  xmlns:lv="http://www.lovullo.com/rater"
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../rater.xsd"
-
   core="true"
-
-  name="core/datetime"
   desc="Date and time">
 
-  <lv:import package="base" />
+  <import package="base" />
 
 
   <!--
@@ -19,23 +13,23 @@
     Note that a positive number will be returned if the given date is in the past,
     negative if in the future.
   -->
-  <lv:template name="_ageYears_" desc="Age in years of the given date relative to the current">
-    <lv:param name="@generates@" desc="Generator variable, per index" />
-    <lv:param name="@yearset@"   desc="Set of years to iterate on" />
-    <lv:param name="@sym@"       desc="Generator symbol" />
-    <lv:param name="@when@"      desc="Only when this boolean value is true" />
-    <lv:param name="@default@"   desc="Default age when yearset values are empty" />
+  <template name="_ageYears_" desc="Age in years of the given date relative to the current">
+    <param name="@generates@" desc="Generator variable, per index" />
+    <param name="@yearset@"   desc="Set of years to iterate on" />
+    <param name="@sym@"       desc="Generator symbol" />
+    <param name="@when@"      desc="Only when this boolean value is true" />
+    <param name="@default@"   desc="Default age when yearset values are empty" />
 
-    <lv:param name="@yields@" desc="Variable to yield into">
-      <lv:text>_</lv:text>
-      <lv:param-value name="@generates@" />
-    </lv:param>
+    <param name="@yields@" desc="Variable to yield into">
+      <text>_</text>
+      <param-value name="@generates@" />
+    </param>
 
 
-    <lv:rate yields="@yields@">
+    <rate yields="@yields@">
       <c:sum of="@yearset@" index="k" generates="@generates@" desc="Relative age" sym="@sym@">
         <c:cases>
-          <lv:if name="@when@">
+          <if name="@when@">
             <c:case>
               <c:when name="@when@" index="k">
                 <c:eq>
@@ -44,14 +38,14 @@
               </c:when>
 
               <!-- return a default, or 0 if no default is provided -->
-              <lv:if name="@default@">
+              <if name="@default@">
                 <c:value-of name="@default@" index="k" />
-              </lv:if>
-              <lv:unless name="@default@">
+              </if>
+              <unless name="@default@">
                 <c:const value="0" type="integer" desc="Condition not met, but no default" />
-              </lv:unless>
+              </unless>
             </c:case>
-          </lv:if>
+          </if>
 
           <!-- if no @when@, then we'll always do this -->
           <c:otherwise>
@@ -74,15 +68,16 @@
               </c:case>
 
               <!-- we don't have a value; just use the default age we were given -->
-              <lv:if name="@default@">
+              <if name="@default@">
                 <c:otherwise>
                   <c:value-of name="@default@" index="k" />
                 </c:otherwise>
-              </lv:if>
+              </if>
             </c:cases>
           </c:otherwise>
         </c:cases>
       </c:sum>
-    </lv:rate>
-  </lv:template>
-</lv:package>
+    </rate>
+  </template>
+</package>
+
diff --git a/core/map.xml b/core/map.xml
index b7366272..3e96971d 100644
--- a/core/map.xml
+++ b/core/map.xml
@@ -1,113 +1,108 @@
-<?xml-stylesheet type="text/xsl" href="summary.xsl"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   Brings c:case statements to life
 
   The problem with cases is that they are so verbose for simple cases. This
   makes simple cases simple.
 -->
-<lv:package
-  xmlns:lv="http://www.lovullo.com/rater"
+<package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
   xmlns:t="http://www.lovullo.com/rater/apply-template"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../rater.xsd"
-
   core="true"
-
-  name="map"
   desc="Mapping templates/functions">
 
 
-  <lv:template name="_map-set_" desc="Map a set of values">
-    <lv:param name="@name@" desc="Param name" />
-    <lv:param name="@index@" desc="Index" />
-    <lv:param name="@values@" desc="Criteria (map nodes)" />
-    <lv:param name="@label@" desc="Case statement label">
+  <template name="_map-set_" desc="Map a set of values">
+    <param name="@name@" desc="Param name" />
+    <param name="@index@" desc="Index" />
+    <param name="@values@" desc="Criteria (map nodes)" />
+    <param name="@label@" desc="Case statement label">
       <!-- default empty -->
-      <lv:text></lv:text>
-    </lv:param>
+      <text></text>
+    </param>
 
-    <lv:param name="@default@" desc="Default value" />
+    <param name="@default@" desc="Default value" />
 
     <c:cases label="@label@">
-      <lv:param-copy name="@values@">
-        <lv:param-meta name="map_param" value="@name@" />
-        <lv:param-meta name="map_index" value="@index@" />
-      </lv:param-copy>
+      <param-copy name="@values@">
+        <param-meta name="map_param" value="@name@" />
+        <param-meta name="map_index" value="@index@" />
+      </param-copy>
 
       <!-- TODO: allow setting default via @default or t:default or something
            (or both) -->
-      <lv:if name="@default@">
+      <if name="@default@">
         <c:otherwise>
           <c:const value="@default@" type="integer" desc="No mapping" />
         </c:otherwise>
-      </lv:if>
+      </if>
     </c:cases>
-  </lv:template>
+  </template>
 
 
-  <lv:template name="_map_" desc="Map criteria">
-    <lv:param name="@from@" desc="Value to map from" />
-    <lv:param name="@value@" desc="Constant to map to" />
-    <lv:param name="@to@" desc="Named value (use instead of @value@)" />
+  <template name="_map_" desc="Map criteria">
+    <param name="@from@" desc="Value to map from" />
+    <param name="@value@" desc="Constant to map to" />
+    <param name="@to@" desc="Named value (use instead of @value@)" />
 
-    <lv:param name="@type@" desc="Constant value type">
-      <lv:text>float</lv:text>
-    </lv:param>
+    <param name="@type@" desc="Constant value type">
+      <text>float</text>
+    </param>
 
-    <lv:param name="@desc@" desc="Map description">
-      <lv:text>Destination mapping</lv:text>
-    </lv:param>
+    <param name="@desc@" desc="Map description">
+      <text>Destination mapping</text>
+    </param>
 
     <!-- set by parent map-set -->
-    <lv:param name="@name@" desc="Param name">
-      <lv:param-inherit meta="map_param" />
-    </lv:param>
-    <lv:param name="@index@" desc="Index">
-      <lv:param-inherit meta="map_index" />
-    </lv:param>
+    <param name="@name@" desc="Param name">
+      <param-inherit meta="map_param" />
+    </param>
+    <param name="@index@" desc="Index">
+      <param-inherit meta="map_index" />
+    </param>
 
     <c:case>
       <!-- index provided -->
-      <lv:if name="@index@">
+      <if name="@index@">
         <c:when name="@name@" index="@index@">
           <c:eq>
             <c:value-of name="@from@" />
           </c:eq>
         </c:when>
-      </lv:if>
+      </if>
       <!-- no index provided -->
-      <lv:unless name="@index@">
+      <unless name="@index@">
         <c:when name="@name@">
           <c:eq>
             <c:value-of name="@from@" />
           </c:eq>
         </c:when>
-      </lv:unless>
+      </unless>
 
-      <lv:if name="@value@">
+      <if name="@value@">
         <c:const value="@value@" type="@type@" desc="@desc@" />
-      </lv:if>
-      <lv:unless name="@value@">
+      </if>
+      <unless name="@value@">
         <!-- TODO: index support -->
         <c:value-of name="@to@" />
-      </lv:unless>
+      </unless>
     </c:case>
-  </lv:template>
+  </template>
 
 
-  <lv:template name="_map-else_" desc="Non-matching map criteria">
-    <lv:param name="@value@" desc="Constant to map to" />
-    <lv:param name="@to@" desc="Named value (use instead of @value@)" />
+  <template name="_map-else_" desc="Non-matching map criteria">
+    <param name="@value@" desc="Constant to map to" />
+    <param name="@to@" desc="Named value (use instead of @value@)" />
 
     <c:otherwise>
-      <lv:if name="@value@">
+      <if name="@value@">
         <c:const value="@value@" type="float" desc="@desc@" />
-      </lv:if>
-      <lv:unless name="@value@">
+      </if>
+      <unless name="@value@">
         <!-- TODO: index support -->
         <c:value-of name="@to@" />
-      </lv:unless>
+      </unless>
     </c:otherwise>
-  </lv:template>
-</lv:package>
+  </template>
+</package>
+
diff --git a/core/numeric.xml b/core/numeric.xml
index 7dfc1d95..ea2273b2 100644
--- a/core/numeric.xml
+++ b/core/numeric.xml
@@ -1,21 +1,15 @@
-<?xml-stylesheet type="text/xsl" href="summary.xsl"?>
-<lv:package
-  xmlns:lv="http://www.lovullo.com/rater"
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../rater.xsd"
-
   core="true"
-
-  name="core/numeric"
   desc="Numeric computations">
 
-
   <!-- we are a meta-package -->
-  <lv:import package="numeric/boolean" export="true" />
-  <lv:import package="numeric/convert" export="true" />
-  <lv:import package="numeric/minmax"  export="true" />
-  <lv:import package="numeric/round"   export="true" />
+  <import package="numeric/boolean" export="true" />
+  <import package="numeric/convert" export="true" />
+  <import package="numeric/minmax"  export="true" />
+  <import package="numeric/round"   export="true" />
+
+  <import package="numeric/common" export="true" />
+</package>
 
-  <lv:import package="numeric/common" export="true" />
-</lv:package>
diff --git a/core/numeric/boolean.xml b/core/numeric/boolean.xml
index b61dd75f..7ebaf0e5 100644
--- a/core/numeric/boolean.xml
+++ b/core/numeric/boolean.xml
@@ -1,20 +1,14 @@
-<?xml-stylesheet type="text/xsl" href="summary.xsl"?>
-<lv:package
-  xmlns:lv="http://www.lovullo.com/rater"
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../../rater.xsd"
-
   core="true"
-
-  name="core/numeric/boolean"
   desc="Numeric computations dealing with boolean algebra">
 
-  <lv:import package="../base" />
+  <import package="../base" />
 
 
-  <lv:function name="not" desc="Negates a boolean value" sym="\lnot">
-    <lv:param name="not_value" type="boolean" desc="Boolean value to negate" />
+  <function name="not" desc="Negates a boolean value" sym="\lnot">
+    <param name="not_value" type="boolean" desc="Boolean value to negate" />
 
     <c:const value="1" type="boolean" desc="Value of 1 if given value is zero">
       <c:when name="not_value">
@@ -23,5 +17,5 @@
         </c:eq>
       </c:when>
     </c:const>
-  </lv:function>
-</lv:package>
+  </function>
+</package>
diff --git a/core/numeric/common.xml b/core/numeric/common.xml
index d31849fc..5b40cf57 100644
--- a/core/numeric/common.xml
+++ b/core/numeric/common.xml
@@ -1,83 +1,77 @@
-<?xml-stylesheet type="text/xsl" href="summary.xsl"?>
-<lv:package
-  xmlns:lv="http://www.lovullo.com/rater"
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
   xmlns:t="http://www.lovullo.com/rater/apply-template"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../../rater.xsd"
-
   core="true"
-
-  name="core/numeric/common"
   desc="General numeric opreations">
 
-  <lv:import package="../base" />
+  <import package="../base" />
 
 
-  <lv:template name="_inc_" desc="Increment value [by 1]">
-    <lv:param name="@values@" desc="Value to increment (nodes)" />
+  <template name="_inc_" desc="Increment value [by 1]">
+    <param name="@values@" desc="Value to increment (nodes)" />
 
-    <lv:param name="@value@" desc="Value to decrement by (default 1)">
-      <lv:text>1</lv:text>
-    </lv:param>
+    <param name="@value@" desc="Value to decrement by (default 1)">
+      <text>1</text>
+    </param>
 
     <c:sum>
-      <lv:param-copy name="@values@" />
+      <param-copy name="@values@" />
       <c:const value="@value@" type="integer" desc="Increment by 1" />
     </c:sum>
-  </lv:template>
+  </template>
 
 
 
-  <lv:template name="_dec_" desc="Decrement value [by 1]">
-    <lv:param name="@values@" desc="Value to decrement (nodes)" />
+  <template name="_dec_" desc="Decrement value [by 1]">
+    <param name="@values@" desc="Value to decrement (nodes)" />
 
-    <lv:param name="@value@" desc="Value to decrement by (default 1)">
-      <lv:text>1</lv:text>
-    </lv:param>
+    <param name="@value@" desc="Value to decrement by (default 1)">
+      <text>1</text>
+    </param>
 
 
     <c:sum>
-      <lv:param-copy name="@values@" />
+      <param-copy name="@values@" />
 
       <c:product>
         <c:value-of name="NEGATE" />
         <c:const value="@value@" type="integer" desc="Decrement by 1" />
       </c:product>
     </c:sum>
-  </lv:template>
+  </template>
 
 
 
-  <lv:template name="_negate_" desc="Negate a value">
-    <lv:param name="@values@" desc="Value to decrement (nodes)" />
-    <lv:param name="@label@" desc="Application label">
+  <template name="_negate_" desc="Negate a value">
+    <param name="@values@" desc="Value to decrement (nodes)" />
+    <param name="@label@" desc="Application label">
       <!-- default empty -->
-      <lv:text></lv:text>
-    </lv:param>
+      <text></text>
+    </param>
 
     <c:product label="@label@">
       <c:value-of name="NEGATE" />
-      <lv:param-copy name="@values@" />
+      <param-copy name="@values@" />
     </c:product>
-  </lv:template>
+  </template>
 
 
 
-  <lv:template name="_percent-of_" desc="Take percentage of a value">
-    <lv:param name="@value@" desc="Value to take percentage of" />
-    <lv:param name="@index@" desc="Index" />
-    <lv:param name="@percent@" desc="Percent (as a whole number)" />
+  <template name="_percent-of_" desc="Take percentage of a value">
+    <param name="@value@" desc="Value to take percentage of" />
+    <param name="@index@" desc="Index" />
+    <param name="@percent@" desc="Percent (as a whole number)" />
 
-    <lv:param name="@desc@" desc="Optional description">
-      <lv:text>Percent to reduce</lv:text>
-    </lv:param>
+    <param name="@desc@" desc="Optional description">
+      <text>Percent to reduce</text>
+    </param>
 
     <c:product>
       <c:value-of name="@value@" index="@index@" />
       <t:ptor value="@percent@" desc="@desc@" />
     </c:product>
-  </lv:template>
+  </template>
 
 
 
@@ -85,11 +79,11 @@
     Calculates a value based on the given multiplier if the given value falls
     within the given range
   -->
-  <lv:function name="rangeadd" desc="Add a value multiplier for a given range">
-    <lv:param name="low"  type="float" desc="Lower bound, inclusive" />
-    <lv:param name="high" type="float" desc="Upper bound, inclusive" />
-    <lv:param name="val"  type="float" desc="Value to compare" />
-    <lv:param name="mult" type="float" desc="Range multiplier" />
+  <function name="rangeadd" desc="Add a value multiplier for a given range">
+    <param name="low"  type="float" desc="Lower bound, inclusive" />
+    <param name="high" type="float" desc="Upper bound, inclusive" />
+    <param name="val"  type="float" desc="Value to compare" />
+    <param name="mult" type="float" desc="Range multiplier" />
 
     <c:product>
       <c:when name="val">
@@ -114,5 +108,6 @@
         </c:product>
       </c:sum>
     </c:product>
-  </lv:function>
-</lv:package>
+  </function>
+</package>
+
diff --git a/core/numeric/convert.xml b/core/numeric/convert.xml
index 7c548893..1519b2fd 100644
--- a/core/numeric/convert.xml
+++ b/core/numeric/convert.xml
@@ -1,13 +1,8 @@
-<?xml-stylesheet type="text/xsl" href="summary.xsl"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
   xmlns:t="http://www.lovullo.com/rater/apply-template"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../../rater.xsd"
-
   core="true"
-
-  name="core/numeric/convert"
   desc="Converts scalars to another type">
 
   <import package="../base" />
@@ -383,3 +378,4 @@
     </c:case>
   </template>
 </package>
+
diff --git a/core/numeric/minmax.xml b/core/numeric/minmax.xml
index fa1e420d..f55f3103 100644
--- a/core/numeric/minmax.xml
+++ b/core/numeric/minmax.xml
@@ -1,22 +1,16 @@
-<?xml-stylesheet type="text/xsl" href="summary.xsl"?>
-<lv:package
-  xmlns:lv="http://www.lovullo.com/rater"
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
   xmlns:t="http://www.lovullo.com/rater/apply-template"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../../rater.xsd"
-
   core="true"
-
-  name="core/numeric/minmax"
   desc="Numeric computations dealing with minimums and maximums">
 
-  <lv:import package="../base" />
+  <import package="../base" />
 
 
-  <lv:function name="max" desc="Return the greater value">
-    <lv:param name="max1" type="float" desc="First value to compare" />
-    <lv:param name="max2" type="float" desc="Second value to compare" />
+  <function name="max" desc="Return the greater value">
+    <param name="max1" type="float" desc="First value to compare" />
+    <param name="max2" type="float" desc="Second value to compare" />
 
     <c:cases>
       <c:case>
@@ -33,12 +27,12 @@
         <c:value-of name="max2" />
       </c:otherwise>
     </c:cases>
-  </lv:function>
+  </function>
 
 
-  <lv:function name="min" desc="Return the lesser value">
-    <lv:param name="min1" type="float" desc="First value to compare" />
-    <lv:param name="min2" type="float" desc="Second value to compare" />
+  <function name="min" desc="Return the lesser value">
+    <param name="min1" type="float" desc="First value to compare" />
+    <param name="min2" type="float" desc="Second value to compare" />
 
     <c:cases>
       <c:case>
@@ -55,15 +49,15 @@
         <c:value-of name="min2" />
       </c:otherwise>
     </c:cases>
-  </lv:function>
+  </function>
 
 
-  <lv:template name="_min-zero_" desc="Does not allow a value below 0 to be yielded">
-    <lv:param name="@values@" desc="Calculation to apply restriction to" />
-    <lv:param name="@label@" desc="Application label">
+  <template name="_min-zero_" desc="Does not allow a value below 0 to be yielded">
+    <param name="@values@" desc="Calculation to apply restriction to" />
+    <param name="@label@" desc="Application label">
       <!-- default empty -->
-      <lv:text></lv:text>
-    </lv:param>
+      <text></text>
+    </param>
 
     <c:apply name="max" label="@label@">
       <c:arg name="max1">
@@ -71,26 +65,26 @@
       </c:arg>
 
       <c:arg name="max2">
-        <lv:param-copy name="@values@" />
+        <param-copy name="@values@" />
       </c:arg>
     </c:apply>
-  </lv:template>
+  </template>
 
 
   <!-- trivial, but cuts turns a verbose rate-each and function application
        into potentially a one-line template application -->
-  <lv:template name="_quickMaxEach_" desc="Quick max application">
-    <lv:param name="@class@" desc="Class to match on" />
-    <lv:param name="@generates@" desc="Value to generate into" />
-    <lv:param name="@a@" desc="Value a" />
-    <lv:param name="@b@" desc="Value b" />
+  <template name="_quickMaxEach_" desc="Quick max application">
+    <param name="@class@" desc="Class to match on" />
+    <param name="@generates@" desc="Value to generate into" />
+    <param name="@a@" desc="Value a" />
+    <param name="@b@" desc="Value b" />
 
-    <lv:param name="@yields@" desc="Yield variable">
-      <lv:text>_</lv:text>
-      <lv:param-value name="@generates@" />
-    </lv:param>
+    <param name="@yields@" desc="Yield variable">
+      <text>_</text>
+      <param-value name="@generates@" />
+    </param>
 
-    <lv:rate-each class="@class@" accumulate="none" yields="@yields@" generates="@generates@" index="k">
+    <rate-each class="@class@" accumulate="none" yields="@yields@" generates="@generates@" index="k">
       <c:apply name="max">
         <c:arg name="max1">
           <c:value-of name="@a@" index="k" />
@@ -99,54 +93,54 @@
           <c:value-of name="@b@" index="k" />
         </c:arg>
       </c:apply>
-    </lv:rate-each>
-  </lv:template>
+    </rate-each>
+  </template>
 
 
-  <lv:template name="_cap_"
+  <template name="_cap_"
                desc="Cap a value at a given maximum">
-    <lv:param name="@values@" desc="Value expression" />
-    <lv:param name="@name@"   desc="Value to cap at" />
+    <param name="@values@" desc="Value expression" />
+    <param name="@name@"   desc="Value to cap at" />
 
-    <lv:param name="@index@" desc="Index of value to cap at">
-      <lv:text></lv:text>
-    </lv:param>
+    <param name="@index@" desc="Index of value to cap at">
+      <text></text>
+    </param>
 
-    <lv:param name="@value@"
+    <param name="@value@"
               desc="Constant value to cap at (deprecated)" />
 
-    <lv:param name="@desc@" desc="Value description">
-      <lv:text>Maximum value</lv:text>
-    </lv:param>
+    <param name="@desc@" desc="Value description">
+      <text>Maximum value</text>
+    </param>
 
     <c:apply name="min">
       <c:arg name="min1">
         <!-- deprecated -->
-        <lv:if name="@value@">
+        <if name="@value@">
           <c:const value="@value@" type="float" desc="@desc@" />
-        </lv:if>
-        <lv:unless name="@value@">
+        </if>
+        <unless name="@value@">
           <c:value-of name="@name@"
                       index="@index@"
                       type="float"
                       label="@desc@" />
-        </lv:unless>
+        </unless>
       </c:arg>
 
       <c:arg name="min2">
-        <lv:param-copy name="@values@" />
+        <param-copy name="@values@" />
       </c:arg>
     </c:apply>
-  </lv:template>
+  </template>
 
 
 
   <!-- useful in products -->
-  <lv:template name="_min-value-of_" desc="Return a value or a minimum">
-    <lv:param name="@name@"  desc="Name of value" />
-    <lv:param name="@index@" desc="Value index" />
-    <lv:param name="@label@" desc="Optional label" />
-    <lv:param name="@min@"   desc="Minimum value" />
+  <template name="_min-value-of_" desc="Return a value or a minimum">
+    <param name="@name@"  desc="Name of value" />
+    <param name="@index@" desc="Value index" />
+    <param name="@label@" desc="Optional label" />
+    <param name="@min@"   desc="Minimum value" />
 
     <c:apply name="max" label="{@label@}, minimum of 1">
       <c:arg name="max1">
@@ -157,14 +151,14 @@
         <c:value-of name="@name@" index="@index@" label="@label@" />
       </c:arg>
     </c:apply>
-  </lv:template>
+  </template>
 
 
 
-  <lv:template name="_between_" desc="Assert that a value is within the given range, inclusive">
-    <lv:param name="@min@" desc="Minimum value, inclusive" />
-    <lv:param name="@max@" desc="Maximum value, inclusive" />
-    <lv:param name="@desc@" desc="Description" />
+  <template name="_between_" desc="Assert that a value is within the given range, inclusive">
+    <param name="@min@" desc="Minimum value, inclusive" />
+    <param name="@max@" desc="Maximum value, inclusive" />
+    <param name="@desc@" desc="Description" />
 
     <c:gte>
       <c:const value="@min@" type="float" desc="{@desc@}; minimum" />
@@ -172,7 +166,7 @@
     <c:lte>
       <c:const value="@max@" type="float" desc="{@desc@}; maximum" />
     </c:lte>
-  </lv:template>
+  </template>
 
 
 
@@ -181,29 +175,29 @@
 
     TODO: max is incomplete (should have all the options of min)
    -->
-  <lv:template name="_bump_" desc="Bump a value if it does not reach a minimum">
+  <template name="_bump_" desc="Bump a value if it does not reach a minimum">
     <!-- if a minimum percentage -->
-    <lv:param name="@percent@"   desc="Percent, as a whole value" />
-    <lv:param name="@value@"     desc="Value to take percentage of, or take whole value of if no percent" />
-    <lv:param name="@vindex@"    desc="Optional index for base" />
-    <lv:param name="@name@"      desc="Provided value" />
-    <lv:param name="@generates@" desc="Variable to generate into" />
-    <lv:param name="@when@"      desc="Conditional bump" />
-    <lv:param name="@class@"     desc="Class to match on" />
-    <lv:param name="@keep@"      desc="Value of keep flag" />
+    <param name="@percent@"   desc="Percent, as a whole value" />
+    <param name="@value@"     desc="Value to take percentage of, or take whole value of if no percent" />
+    <param name="@vindex@"    desc="Optional index for base" />
+    <param name="@name@"      desc="Provided value" />
+    <param name="@generates@" desc="Variable to generate into" />
+    <param name="@when@"      desc="Conditional bump" />
+    <param name="@class@"     desc="Class to match on" />
+    <param name="@keep@"      desc="Value of keep flag" />
 
     <!-- alternative to @name@ -->
-    <lv:param name="@const@" desc="Constant value, instead of named" />
+    <param name="@const@" desc="Constant value, instead of named" />
 
     <!-- max values for bumping down -->
-    <lv:param name="@maxpercent@" desc="Maximum percent" />
+    <param name="@maxpercent@" desc="Maximum percent" />
 
 
-    <lv:rate yields="_{@generates@}" keep="@keep@">
+    <rate yields="_{@generates@}" keep="@keep@">
       <c:sum of="@name@" index="k" generates="@generates@" desc="Bumped value">
         <c:cases>
           <!-- if a condition was provided, check it first -->
-          <lv:if name="@when@">
+          <if name="@when@">
             <c:case>
               <c:when name="@when@" index="k">
                 <c:eq>
@@ -214,10 +208,10 @@
               <!-- just return the value provided -->
               <c:value-of name="@name@" index="k" />
             </c:case>
-          </lv:if>
+          </if>
 
           <!-- if a condition was provided, check it first -->
-          <lv:if name="@class@">
+          <if name="@class@">
             <c:case>
               <c:when name="@class@" index="k">
                 <c:eq>
@@ -228,7 +222,7 @@
               <!-- just return the value provided -->
               <c:const value="0" type="float" desc="Zero value" />
             </c:case>
-          </lv:if>
+          </if>
 
           <!-- condition was not provided or did not match (we check for the
                negative of the condition above so that this template will still
@@ -238,37 +232,37 @@
             <c:let>
               <c:values>
                 <c:value name="min" type="float" desc="Minimum">
-                  <lv:unless name="@const@">
+                  <unless name="@const@">
                     <!-- this will produce a percentage of the provided value, unless no
                          percent was given, in which case the entire value will be used
                          -->
                     <c:product>
                       <!-- if a percent was provided, then take a certain percentage of the value -->
-                      <lv:if name="@percent@">
+                      <if name="@percent@">
                         <!-- given index or default index? -->
-                        <lv:if name="@vindex@">
+                        <if name="@vindex@">
                           <c:value-of name="@value@" index="@vindex@" />
-                        </lv:if>
-                        <lv:unless name="@vindex@">
+                        </if>
+                        <unless name="@vindex@">
                           <c:value-of name="@value@" index="k" />
-                        </lv:unless>
+                        </unless>
 
                         <c:quotient label="Percent as real number">
                           <c:const value="@percent@" type="integer" desc="Whole percent" />
                           <c:const value="100" type="integer" desc="Divisor to convert percent to real number" />
                         </c:quotient>
-                      </lv:if>
+                      </if>
 
                       <!-- otherwise, use the given value -->
-                      <lv:unless name="@percent@">
+                      <unless name="@percent@">
                         <c:value-of name="@name@" index="k" />
-                      </lv:unless>
+                      </unless>
                     </c:product>
-                  </lv:unless>
+                  </unless>
 
-                  <lv:if name="@const@">
+                  <if name="@const@">
                     <c:const value="@const@" type="float" desc="Constant minimum value" />
-                  </lv:if>
+                  </if>
                 </c:value>
               </c:values>
 
@@ -281,16 +275,16 @@
                     </t:maxreduce>
                   </c:value>
 
-                  <lv:if name="@maxpercent@">
+                  <if name="@maxpercent@">
                     <c:value name="max" type="float" desc="Maximum">
                       <c:product>
                         <!-- given index or default index? -->
-                        <lv:if name="@vindex@">
+                        <if name="@vindex@">
                           <c:value-of name="@value@" index="@vindex@" />
-                        </lv:if>
-                        <lv:unless name="@vindex@">
+                        </if>
+                        <unless name="@vindex@">
                           <c:value-of name="@value@" index="k" />
-                        </lv:unless>
+                        </unless>
 
                         <c:quotient label="Max percent as real number">
                           <c:const value="@maxpercent@" type="integer" desc="Whole max percent" />
@@ -298,13 +292,13 @@
                         </c:quotient>
                       </c:product>
                     </c:value>
-                  </lv:if>
+                  </if>
                 </c:values>
 
                 <c:cases>
                   <!-- if a max percent was provided, then check to ensure it
                        was not exceeded -->
-                  <lv:if name="@maxpercent@">
+                  <if name="@maxpercent@">
                     <c:case>
                       <c:when name="@name@" index="k">
                         <c:gt>
@@ -314,7 +308,7 @@
 
                       <c:value-of name="max" />
                     </c:case>
-                  </lv:if>
+                  </if>
 
                   <!-- if no max, just yield the bumped value according to the minimum -->
                   <c:otherwise>
@@ -326,6 +320,7 @@
           </c:otherwise>
         </c:cases>
       </c:sum>
-    </lv:rate>
-  </lv:template>
-</lv:package>
+    </rate>
+  </template>
+</package>
+
diff --git a/core/numeric/round.xml b/core/numeric/round.xml
index d41f76aa..d55c4528 100644
--- a/core/numeric/round.xml
+++ b/core/numeric/round.xml
@@ -1,30 +1,24 @@
-<?xml-stylesheet type="text/xsl" href="summary.xsl"?>
-<lv:package
-  xmlns:lv="http://www.lovullo.com/rater"
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
   xmlns:t="http://www.lovullo.com/rater/apply-template"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../../rater.xsd"
-
   core="true"
-
-  name="core/numeric/round"
   desc="Numeric computations dealing with rounding">
 
-  <lv:import package="../base" />
+  <import package="../base" />
 
 
   <!-- template version of round function, supporting arbitrary nodes -->
-  <lv:template name="_round_" desc="Round to the nearest integer">
-    <lv:param name="@values@" desc="Calculation to round (single node)" />
-    <lv:param name="@precision@" desc="Level of precision after decimal point">
-      <lv:text>0</lv:text>
-    </lv:param>
+  <template name="_round_" desc="Round to the nearest integer">
+    <param name="@values@" desc="Calculation to round (single node)" />
+    <param name="@precision@" desc="Level of precision after decimal point">
+      <text>0</text>
+    </param>
 
     <c:apply name="round_real" label="Rounded value">
       <c:arg name="round_real_val">
         <c:sum>
-          <lv:param-copy name="@values@" />
+          <param-copy name="@values@" />
         </c:sum>
       </c:arg>
 
@@ -35,7 +29,7 @@
         </c:expt>
       </c:arg>
     </c:apply>
-  </lv:template>
+  </template>
 
 
   <!--
@@ -57,38 +51,38 @@
     with @exp@, in which case the step will apply to @name@ after its value
     has been exponentiated.
   -->
-  <lv:template name="_let-round_"
+  <template name="_let-round_"
                desc="Produce floor and ceiling values">
-    <lv:param name="@values@"
+    <param name="@values@"
               desc="Calculation subject to let expression" />
 
-    <lv:param name="@name@"
+    <param name="@name@"
               desc="Value to round" />
 
-    <lv:param name="@index@"
+    <param name="@index@"
               desc="Optional value index">
-      <lv:text></lv:text>
-    </lv:param>
+      <text></text>
+    </param>
 
-    <lv:param name="@high@"
+    <param name="@high@"
               desc="Name to yield ceil'd value into" />
 
-    <lv:param name="@low@"
+    <param name="@low@"
               desc="Name to yield floor'd value into" />
 
-    <lv:param name="@nearest@"
+    <param name="@nearest@"
               desc="Name to yield nearest integer to value into" />
 
 
-    <lv:param name="@exp@"
+    <param name="@exp@"
               desc="Offset digits before rounding">
-      <lv:text>#0</lv:text>
-    </lv:param>
+      <text>#0</text>
+    </param>
 
-    <lv:param name="@step@"
+    <param name="@step@"
               desc="Arbitrary step">
-      <lv:text>#1</lv:text>
-    </lv:param>
+      <text>#1</text>
+    </param>
 
 
 
@@ -123,7 +117,7 @@
 
         <c:let>
           <c:values>
-            <lv:if name="@high@">
+            <if name="@high@">
               <c:value name="@high@" type="float"
                        desc="Ceiling of adjusted {@name@}">
                 <c:product>
@@ -134,9 +128,9 @@
                   <c:value-of name="__div" />
                 </c:product>
               </c:value>
-            </lv:if>
+            </if>
 
-            <lv:if name="@low@">
+            <if name="@low@">
               <c:value name="@low@" type="float"
                        desc="floor of adjusted {@name@}">
                 <c:product>
@@ -147,9 +141,9 @@
                   <c:value-of name="__div" />
                 </c:product>
               </c:value>
-            </lv:if>
+            </if>
 
-            <lv:if name="@nearest@">
+            <if name="@nearest@">
               <c:value name="@nearest@" type="float"
                        desc="nearest integer to adjusted {@name@}">
                 <c:product>
@@ -160,21 +154,21 @@
                   <c:value-of name="__div" />
                 </c:product>
               </c:value>
-            </lv:if>
+            </if>
           </c:values>
 
           <!-- body subject to let expression -->
-          <lv:param-copy name="@values@" />
+          <param-copy name="@values@" />
         </c:let>
       </c:let>
     </c:let>
-  </lv:template>
+  </template>
 
 
   <!-- ceil if > 0.5, otherwise floor; round() in most languages -->
   <!-- TODO: support left and right delimiters; do \floor \ceil -->
-  <lv:function name="round" desc="Round to the nearest integer">
-    <lv:param name="roundval" type="float" desc="Value to round to nearest integer" />
+  <function name="round" desc="Round to the nearest integer">
+    <param name="roundval" type="float" desc="Value to round to nearest integer" />
 
     <!-- By raising by 0.5 and taking the floor() of the resulting value, we
          can produce values consistent with common round() implementations. It
@@ -187,12 +181,12 @@
         <c:const value="0.5" type="float" desc="Raises value in a manner that it can be properly rounded by a floor" />
       </c:sum>
     </c:floor>
-  </lv:function>
+  </function>
 
 
-  <lv:function name="round_real" desc="Round to the nearest 1/n">
-    <lv:param name="round_real_val" type="float"   desc="Value to round" />
-    <lv:param name="round_real_n"   type="integer" desc="Round to 1/n" />
+  <function name="round_real" desc="Round to the nearest 1/n">
+    <param name="round_real_val" type="float"   desc="Value to round" />
+    <param name="round_real_n"   type="integer" desc="Round to 1/n" />
 
     <!-- we can achieve this by multiplying by N, rounding, and then dividing
          by the same N -->
@@ -208,12 +202,12 @@
 
       <c:value-of name="round_real_n" />
     </c:quotient>
-  </lv:function>
+  </function>
 
 
   <!-- this is simply a shorthand for round_real -->
-  <lv:function name="round_cents" desc="Round to the nearest penny">
-    <lv:param name="round_cents_val" type="float" desc="Monetary value" />
+  <function name="round_cents" desc="Round to the nearest penny">
+    <param name="round_cents_val" type="float" desc="Monetary value" />
 
     <c:apply name="round_real">
       <c:arg name="round_real_n">
@@ -224,17 +218,17 @@
         <c:value-of name="round_cents_val" />
       </c:arg>
     </c:apply>
-  </lv:function>
+  </function>
 
 
-  <lv:template name="_ceil-n_" desc="Ceiling on the last n digits">
-    <lv:param name="@values@" desc="Calculation to use (single node)" />
-    <lv:param name="@digits@" desc="Level of precision after decimal point" />
+  <template name="_ceil-n_" desc="Ceiling on the last n digits">
+    <param name="@values@" desc="Calculation to use (single node)" />
+    <param name="@digits@" desc="Level of precision after decimal point" />
 
     <c:product>
       <c:ceil>
         <c:quotient>
-          <lv:param-copy name="@values@" />
+          <param-copy name="@values@" />
           <c:expt>
             <c:const value="10" type="integer" desc="Decimal base" />
             <c:const value="@digits@" type="integer" desc="Number of digits" />
@@ -247,6 +241,6 @@
         <c:const value="@digits@" type="integer" desc="Number of digits" />
       </c:expt>
     </c:product>
-  </lv:template>
+  </template>
+</package>
 
-</lv:package>
diff --git a/core/tdat.xml b/core/tdat.xml
index 0aa07e32..ed3d33b5 100644
--- a/core/tdat.xml
+++ b/core/tdat.xml
@@ -1,31 +1,26 @@
-<?xml-stylesheet type="text/xsl" href="summary.xsl"?>
-<lv:package
-  xmlns:lv="http://www.lovullo.com/rater"
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../rater.xsd"
-
   core="true"
-
-  name="core/tdat"
   desc="Territory data support (used in conjunction with tdat script)">
 
-  <lv:import package="base" export="true" />
+  <import package="base" export="true" />
 
 
-  <lv:template name="_terr-code_" desc="Defines a territory code for a given classification">
-    <lv:param name="@class@"     desc="Classification" />
-    <lv:param name="@code@"      desc="Territory code" />
-    <lv:param name="@generates@" desc="Generator" />
+  <template name="_terr-code_" desc="Defines a territory code for a given classification">
+    <param name="@class@"     desc="Classification" />
+    <param name="@code@"      desc="Territory code" />
+    <param name="@generates@" desc="Generator" />
 
-    <lv:param name="@yields@" desc="Yield var">
-      <lv:text>_</lv:text>
-      <lv:param-value name="@generates@" />
-    </lv:param>
+    <param name="@yields@" desc="Yield var">
+      <text>_</text>
+      <param-value name="@generates@" />
+    </param>
 
 
-    <lv:rate-each class="@class@" accumulate="none" yields="@yields@" generates="@generates@" index="k">
+    <rate-each class="@class@" accumulate="none" yields="@yields@" generates="@generates@" index="k">
       <c:const value="@code@" type="integer" desc="Territory code" />
-    </lv:rate-each>
-  </lv:template>
-</lv:package>
+    </rate-each>
+  </template>
+</package>
+
diff --git a/core/test/spec.xml b/core/test/spec.xml
index 14c9385f..993fd094 100644
--- a/core/test/spec.xml
+++ b/core/test/spec.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   BDD specification framework
 
@@ -39,7 +39,7 @@
   name="core/test/spec"
   desc="Behavior-driven development specification system">
 
-  <import package="../../core" />
+  <import package="../base" />
 
 
   <!--
diff --git a/core/vector.xml b/core/vector.xml
index 0ef98c5c..b595e0d1 100644
--- a/core/vector.xml
+++ b/core/vector.xml
@@ -1,24 +1,19 @@
-<?xml-stylesheet type="text/xsl" href="summary.xsl"?>
-<lv:package
-  xmlns:lv="http://www.lovullo.com/rater"
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../rater.xsd"
-
   core="true"
-
-  name="core/vector"
   desc="Vector operations">
 
 
   <!-- we are a meta-package -->
-  <lv:import package="vector/arithmetic" export="true" />
-  <lv:import package="vector/cmatch"     export="true" />
-  <lv:import package="vector/convert"    export="true" />
-  <lv:import package="vector/count"      export="true" />
-  <lv:import package="vector/list"       export="true" />
-  <lv:import package="vector/matrix"     export="true" />
-  <lv:import package="vector/table"      export="true" />
+  <import package="vector/arithmetic" export="true" />
+  <import package="vector/cmatch"     export="true" />
+  <import package="vector/convert"    export="true" />
+  <import package="vector/count"      export="true" />
+  <import package="vector/list"       export="true" />
+  <import package="vector/matrix"     export="true" />
+  <import package="vector/table"      export="true" />
+
+  <import package="vector/common" export="true" />
+</package>
 
-  <lv:import package="vector/common" export="true" />
-</lv:package>
diff --git a/core/vector/arithmetic.xml b/core/vector/arithmetic.xml
index bab4a606..b2c5152d 100644
--- a/core/vector/arithmetic.xml
+++ b/core/vector/arithmetic.xml
@@ -1,87 +1,81 @@
-<?xml-stylesheet type="text/xsl" href="summary.xsl"?>
-<lv:package
-  xmlns:lv="http://www.lovullo.com/rater"
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
   xmlns:t="http://www.lovullo.com/rater/apply-template"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../../rater.xsd"
-
   core="true"
-
-  name="core/vector/arithmetic"
   desc="Vector arithmetic">
 
-  <lv:import package="../base" />
-  <lv:import package="../numeric/common" />
-  <lv:import package="../numeric/minmax" />
+  <import package="../base" />
+  <import package="../numeric/common" />
+  <import package="../numeric/minmax" />
 
 
 
   <!-- for the time being, the vectors must be of the same length, or the first
        vector must be the longer (otherwise the values will not properly add)
        -->
-  <lv:template name="_vadd_" desc="Produce a vector resulting from the addition of two vectors">
-    <lv:param name="@a@" desc="First vector to add" />
-    <lv:param name="@b@" desc="Second vector to add" />
-    <lv:param name="@into@" desc="Variable to yield vector into" />
+  <template name="_vadd_" desc="Produce a vector resulting from the addition of two vectors">
+    <param name="@a@" desc="First vector to add" />
+    <param name="@b@" desc="Second vector to add" />
+    <param name="@into@" desc="Variable to yield vector into" />
 
-    <lv:param name="@yields@" desc="Value to yield (useless)">
-      <lv:text>__</lv:text>
-      <lv:param-value name="@into@" />
-    </lv:param>
+    <param name="@yields@" desc="Value to yield (useless)">
+      <text>__</text>
+      <param-value name="@into@" />
+    </param>
 
-    <lv:param name="@gendesc@" desc="Generator description (for @into@)">
-      <lv:text>Sum of vectors </lv:text>
-      <lv:param-value name="@a@" />
-      <lv:text> and </lv:text>
-      <lv:param-value name="@b@" />
-    </lv:param>
+    <param name="@gendesc@" desc="Generator description (for @into@)">
+      <text>Sum of vectors </text>
+      <param-value name="@a@" />
+      <text> and </text>
+      <param-value name="@b@" />
+    </param>
 
-    <lv:param name="@sym@" desc="Generator symbol">
+    <param name="@sym@" desc="Generator symbol">
       <!-- empty by default -->
-      <lv:text></lv:text>
-    </lv:param>
+      <text></text>
+    </param>
 
-    <lv:rate accumulate="none" yields="@yields@">
+    <rate accumulate="none" yields="@yields@">
       <c:sum of="@a@" index="k" generates="@into@" desc="@gendesc@" sym="@sym@">
         <c:value-of name="@a@" index="k" />
         <c:value-of name="@b@" index="k" />
       </c:sum>
-    </lv:rate>
-  </lv:template>
+    </rate>
+  </template>
 
 
   <!-- the template version of the function -->
-  <lv:template name="_maxreduce_" desc="Reduce a set to its maximum">
-    <lv:param name="@values@" desc="Values to reduce" />
-    <lv:param name="@isvector@" desc="Set to 'true' if the nodes should not be wrapped in c:set" />
-    <lv:param name="@label@" desc="Application label">
+  <template name="_maxreduce_" desc="Reduce a set to its maximum">
+    <param name="@values@" desc="Values to reduce" />
+    <param name="@isvector@" desc="Set to 'true' if the nodes should not be wrapped in c:set" />
+    <param name="@label@" desc="Application label">
       <!-- default empty -->
-      <lv:text></lv:text>
-    </lv:param>
+      <text></text>
+    </param>
 
     <c:apply name="maxreduce" label="@label@">
       <c:arg name="maxreduce_set">
         <!-- if we were not provided with a vector (default), create one out of
              the given nodes -->
-        <lv:unless name="@isvector@" eq="true">
+        <unless name="@isvector@" eq="true">
           <c:set>
-            <lv:param-copy name="@values@" />
+            <param-copy name="@values@" />
           </c:set>
-        </lv:unless>
+        </unless>
 
         <!-- if they told us that they have provided a vector, then do not
              create one -->
-        <lv:if name="@isvector@" eq="true">
-          <lv:param-copy name="@values@" />
-        </lv:if>
+        <if name="@isvector@" eq="true">
+          <param-copy name="@values@" />
+        </if>
       </c:arg>
     </c:apply>
-  </lv:template>
+  </template>
 
 
-  <lv:function name="maxreduce" desc="Reduce a set to its maximum">
-    <lv:param name="maxreduce_set" type="float" set="vector" desc="Set to find max of" />
+  <function name="maxreduce" desc="Reduce a set to its maximum">
+    <param name="maxreduce_set" type="float" set="vector" desc="Set to find max of" />
 
     <c:let>
       <c:values>
@@ -123,7 +117,7 @@
         </c:otherwise>
       </c:cases>
     </c:let>
-  </lv:function>
+  </function>
 
 
   <!--
@@ -142,9 +136,9 @@
     TODO: If we can support variable applications, then this simply be a
     generic reduce function that accepts max/min/etc.
   -->
-  <lv:function name="_maxreduce" desc="Recursively reduce a set to its maximum (called by maxreduce)">
-    <lv:param name="_maxreduce_set" type="float" set="vector" desc="Set to find max of" />
-    <lv:param name="_maxreduce_i"   type="integer" desc="Index" />
+  <function name="_maxreduce" desc="Recursively reduce a set to its maximum (called by maxreduce)">
+    <param name="_maxreduce_set" type="float" set="vector" desc="Set to find max of" />
+    <param name="_maxreduce_i"   type="integer" desc="Index" />
 
     <c:cases>
       <!-- base case: if we're on the last index, do not recurse -->
@@ -194,39 +188,40 @@
         </c:apply>
       </c:otherwise>
     </c:cases>
-  </lv:function>
+  </function>
 
 
   <!-- simplifies retrieving the max of a set of values -->
-  <lv:template name="_maxOfEach_" desc="Take the max of the given set of values">
-    <lv:param name="@class@" desc="Class to match on" />
-    <lv:param name="@values@" desc="Individual values without lv:set" />
-    <lv:param name="@generates@" desc="Value to generate into" />
-    <lv:param name="@index@" desc="Index to use for rate-each" />
+  <template name="_maxOfEach_" desc="Take the max of the given set of values">
+    <param name="@class@" desc="Class to match on" />
+    <param name="@values@" desc="Individual values without set" />
+    <param name="@generates@" desc="Value to generate into" />
+    <param name="@index@" desc="Index to use for rate-each" />
 
-    <lv:param name="@yields@" desc="Yield variable">
-      <lv:text>_</lv:text>
-      <lv:param-value name="@generates@" />
-    </lv:param>
+    <param name="@yields@" desc="Yield variable">
+      <text>_</text>
+      <param-value name="@generates@" />
+    </param>
 
-    <lv:rate-each class="@class@" accumulate="none" yields="@yields@" generates="@generates@" index="@index@">
+    <rate-each class="@class@" accumulate="none" yields="@yields@" generates="@generates@" index="@index@">
       <c:apply name="maxreduce">
         <c:arg name="maxreduce_set">
           <c:set>
-            <lv:param-copy name="@values@" />
+            <param-copy name="@values@" />
           </c:set>
         </c:arg>
       </c:apply>
-    </lv:rate-each>
-  </lv:template>
+    </rate-each>
+  </template>
 
 
-  <lv:template name="_vsum_" desc="Yield sum of all elements of a vector as a scalar">
-    <lv:param name="@of@"     desc="Vector to sum" />
-    <lv:param name="@yields@" desc="Name of scalar to yield" />
+  <template name="_vsum_" desc="Yield sum of all elements of a vector as a scalar">
+    <param name="@of@"     desc="Vector to sum" />
+    <param name="@yields@" desc="Name of scalar to yield" />
 
-    <lv:rate yields="@yields@">
+    <rate yields="@yields@">
       <c:sum of="@of@" />
-    </lv:rate>
-  </lv:template>
-</lv:package>
+    </rate>
+  </template>
+</package>
+
diff --git a/core/vector/cmatch.xml b/core/vector/cmatch.xml
index 589ec1ea..abd123d5 100644
--- a/core/vector/cmatch.xml
+++ b/core/vector/cmatch.xml
@@ -1,17 +1,11 @@
-<?xml-stylesheet type="text/xsl" href="summary.xsl"?>
-<lv:package
-  xmlns:lv="http://www.lovullo.com/rater"
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../../rater.xsd"
-
   core="true"
-
-  name="core/vector/cmatch"
   desc="Vector operations on classification matches">
 
-  <lv:import package="../base" />
-  <lv:import package="arithmetic" export="true" />
+  <import package="../base" />
+  <import package="arithmetic" export="true" />
 
 
   <!--
@@ -35,125 +29,126 @@
     This is an excellent example of building a feature atop of the DSL without
     having to add a new language feature.
   -->
-  <lv:template name="_cmatch-to-vector_" desc="Vectorizes a classification match">
-    <lv:param name="@class@" desc="Classification match string" />
-    <lv:param name="@generates@" desc="Variable to yield generates (will yield a vector)" />
-    <lv:param name="@keep@" desc="Rate block @keep">
-      <lv:text></lv:text>
-    </lv:param>
+  <template name="_cmatch-to-vector_" desc="Vectorizes a classification match">
+    <param name="@class@" desc="Classification match string" />
+    <param name="@generates@" desc="Variable to yield generates (will yield a vector)" />
+    <param name="@keep@" desc="Rate block @keep">
+      <text></text>
+    </param>
 
-    <lv:param name="@yields@" desc="Dummy variable to yield generates (useless, but required)">
-      <lv:text>__</lv:text>
-      <lv:param-value name="@generates@" />
-    </lv:param>
+    <param name="@yields@" desc="Dummy variable to yield generates (useless, but required)">
+      <text>__</text>
+      <param-value name="@generates@" />
+    </param>
 
-    <lv:param name="@gendesc@" desc="Generator description">
-      <lv:text>Vector containing boolean </lv:text>
-      <lv:param-value name="@class@" />
-      <lv:text> classification matches</lv:text>
-    </lv:param>
+    <param name="@gendesc@" desc="Generator description">
+      <text>Vector containing boolean </text>
+      <param-value name="@class@" />
+      <text> classification matches</text>
+    </param>
 
-    <lv:param name="@sym@" desc="Generator symbol (corresponds to @generates@)">
+    <param name="@sym@" desc="Generator symbol (corresponds to @generates@)">
       <!-- defaults to nothing -->
-      <lv:text></lv:text>
-    </lv:param>
+      <text></text>
+    </param>
 
     <!-- this conversion is as simple as using a generator to yield the value
          of _CMATCH_ for each index -->
-    <lv:rate class="@class@" accumulate="none" yields="@yields@" always="true" keep="@keep@">
+    <rate class="@class@" accumulate="none" yields="@yields@" always="true" keep="@keep@">
       <c:sum of="_CMATCH_" index="k" generates="@generates@" desc="@gendesc@" sym="@sym@">
         <c:value-of name="_CMATCH_" index="k" />
       </c:sum>
-    </lv:rate>
-  </lv:template>
+    </rate>
+  </template>
 
 
-  <lv:template name="_cmatch-to-scalar_" desc="Reduces a classification match into a scalar">
-    <lv:param name="@class@" desc="Classification match string" />
-    <lv:param name="@yields@" desc="Variable to yield into" />
-    <lv:param name="@sym@" desc="Yield symbol (defaults to nothing)">
+  <template name="_cmatch-to-scalar_" desc="Reduces a classification match into a scalar">
+    <param name="@class@" desc="Classification match string" />
+    <param name="@yields@" desc="Variable to yield into" />
+    <param name="@sym@" desc="Yield symbol (defaults to nothing)">
       <!-- defaults to nothing -->
-      <lv:text></lv:text>
-    </lv:param>
+      <text></text>
+    </param>
 
-    <lv:param name="@keep@" desc="Rate block @keep">
-      <lv:text></lv:text>
-    </lv:param>
+    <param name="@keep@" desc="Rate block @keep">
+      <text></text>
+    </param>
 
 
-    <lv:rate class="@class@" accumulate="none" yields="@yields@" sym="@sym@" keep="@keep@">
+    <rate class="@class@" accumulate="none" yields="@yields@" sym="@sym@" keep="@keep@">
       <!-- if any single one matches, then we want to yield a 1 -->
       <c:apply name="maxreduce" maxreduce_set="_CMATCH_" />
-    </lv:rate>
-  </lv:template>
+    </rate>
+  </template>
 
 
 
   <!--
     Counts one for each classification vector match
   -->
-  <lv:template name="_cmatch-count_" desc="Counts the number of classification matches of a vector">
-    <lv:param name="@class@" desc="Classification match" />
-    <lv:param name="@yields@" desc="Value to yield" />
+  <template name="_cmatch-count_" desc="Counts the number of classification matches of a vector">
+    <param name="@class@" desc="Classification match" />
+    <param name="@yields@" desc="Value to yield" />
 
     <!-- nothing by default -->
-    <lv:param name="@no@" desc="Non-match">
-      <lv:text></lv:text>
-    </lv:param>
+    <param name="@no@" desc="Non-match">
+      <text></text>
+    </param>
 
 
-    <lv:rate class="@class@" no="@no@" yields="@yields@">
+    <rate class="@class@" no="@no@" yields="@yields@">
       <c:sum of="_CMATCH_" />
-    </lv:rate>
-  </lv:template>
+    </rate>
+  </template>
 
 
   <!-- because verbose repition is an evil -->
-  <lv:inline-template>
-    <lv:for-each>
-      <lv:set cmp="eq" />
-      <lv:set cmp="ne" />
-      <lv:set cmp="gt" />
-      <lv:set cmp="gte" />
-      <lv:set cmp="lt" />
-      <lv:set cmp="lte" />
-    </lv:for-each>
+  <inline-template>
+    <for-each>
+      <set cmp="eq" />
+      <set cmp="ne" />
+      <set cmp="gt" />
+      <set cmp="gte" />
+      <set cmp="lt" />
+      <set cmp="lte" />
+    </for-each>
 
 
-    <lv:template name="_match-{@cmp@}_" desc="Match value {@cmp@}">
-      <lv:param name="@on@" desc="Value to assert" />
+    <template name="_match-{@cmp@}_" desc="Match value {@cmp@}">
+      <param name="@on@" desc="Value to assert" />
 
       <!-- pick one -->
-      <lv:param name="@const@" desc="Match against constant value" />
-      <lv:param name="@value@" desc="Match against variable" />
+      <param name="@const@" desc="Match against constant value" />
+      <param name="@value@" desc="Match against variable" />
 
-      <lv:match on="@on@">
-        <lv:dyn-node name="c:{@cmp@}">
-          <lv:if name="@const@">
+      <match on="@on@">
+        <dyn-node name="c:{@cmp@}">
+          <if name="@const@">
             <c:const value="@const@" type="float" desc="Comparison" />
-          </lv:if>
+          </if>
 
-          <lv:unless name="@const@">
+          <unless name="@const@">
             <c:value-of name="@value@" />
-          </lv:unless>
-        </lv:dyn-node>
-      </lv:match>
-    </lv:template>
-  </lv:inline-template>
+          </unless>
+        </dyn-node>
+      </match>
+    </template>
+  </inline-template>
 
 
-  <lv:template name="_match-class_"
+  <template name="_match-class_"
                desc="Match on a class name (rather than @yields)">
-    <lv:param name="@name@" desc="Classification name" />
+    <param name="@name@" desc="Classification name" />
 
-    <lv:param name="@__yields@" desc="Classification yield to match on">
-      <lv:param-class-to-yields name="@name@" />
-    </lv:param>
+    <param name="@__yields@" desc="Classification yield to match on">
+      <param-class-to-yields name="@name@" />
+    </param>
 
-    <lv:param name="@value@" desc="Value to match on">
-      <lv:text></lv:text>
-    </lv:param>
+    <param name="@value@" desc="Value to match on">
+      <text></text>
+    </param>
+
+    <match on="@__yields@" value="@value@" />
+  </template>
+</package>
 
-    <lv:match on="@__yields@" value="@value@" />
-  </lv:template>
-</lv:package>
diff --git a/core/vector/common.xml b/core/vector/common.xml
index dbadb810..82ef4996 100644
--- a/core/vector/common.xml
+++ b/core/vector/common.xml
@@ -1,38 +1,32 @@
-<?xml-stylesheet type="text/xsl" href="summary.xsl"?>
-<lv:package
-  xmlns:lv="http://www.lovullo.com/rater"
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
   xmlns:t="http://www.lovullo.com/rater/apply-template"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../../rater.xsd"
-
   core="true"
-
-  name="core/vector/common"
   desc="General vector operations">
 
-  <lv:import package="../base" />
-  <lv:import package="../numeric/common" />
+  <import package="../base" />
+  <import package="../numeric/common" />
 
 
   <!-- useful because you can pass a conditional expression as an argument and
        select the index of the result -->
-  <lv:function name="vival" desc="Select index value from some vector">
-    <lv:param name="vector" type="float" set="vector" desc="Vector" />
-    <lv:param name="index" type="integer" desc="Index" />
+  <function name="vival" desc="Select index value from some vector">
+    <param name="vector" type="float" set="vector" desc="Vector" />
+    <param name="index" type="integer" desc="Index" />
 
     <c:value-of name="vector">
       <c:index>
         <c:value-of name="index" />
       </c:index>
     </c:value-of>
-  </lv:function>
+  </function>
 
 
-  <lv:function name="mival" desc="Select index value from some matrix">
-    <lv:param name="matrix" type="float" set="matrix" desc="Matrix" />
-    <lv:param name="row" type="integer" desc="Row index" />
-    <lv:param name="col" type="integer" desc="Column index" />
+  <function name="mival" desc="Select index value from some matrix">
+    <param name="matrix" type="float" set="matrix" desc="Matrix" />
+    <param name="row" type="integer" desc="Row index" />
+    <param name="col" type="integer" desc="Column index" />
 
     <c:value-of name="matrix">
       <c:index>
@@ -42,13 +36,13 @@
         <c:value-of name="col" />
       </c:index>
     </c:value-of>
-  </lv:function>
+  </function>
 
 
-  <lv:template name="_map-value_" desc="Map from a value to another using a vector map">
-    <lv:param name="@from@" desc="Name of value to map" />
-    <lv:param name="@index@" desc="Index" />
-    <lv:param name="@using@" desc="Vector to use for mapping" />
+  <template name="_map-value_" desc="Map from a value to another using a vector map">
+    <param name="@from@" desc="Name of value to map" />
+    <param name="@index@" desc="Index" />
+    <param name="@using@" desc="Vector to use for mapping" />
 
     <c:apply name="vival">
       <c:arg name="vector">
@@ -59,7 +53,7 @@
         <c:value-of name="@from@" index="@index@" />
       </c:arg>
     </c:apply>
-  </lv:template>
+  </template>
 
 
 
@@ -70,13 +64,13 @@
     will be used to map a value to an index within the matrix for either a row
     or column.
   -->
-  <lv:function name="mlookup" desc="Matrix value lookup based on two index maps">
-    <lv:param name="matrix" type="float"   set="matrix" desc="Rate matrix indexed by CT and PC" />
-    <lv:param name="rmap"   type="integer" set="vector" desc="Row index map" />
-    <lv:param name="cmap"   type="integer" set="vector" desc="Column index map" />
+  <function name="mlookup" desc="Matrix value lookup based on two index maps">
+    <param name="matrix" type="float"   set="matrix" desc="Rate matrix indexed by CT and PC" />
+    <param name="rmap"   type="integer" set="vector" desc="Row index map" />
+    <param name="cmap"   type="integer" set="vector" desc="Column index map" />
 
-    <lv:param name="rval" type="integer" desc="Row value (to be fed to map for index lookup)" />
-    <lv:param name="cval" type="integer" desc="Column value (to be fed to map for index lookup)" />
+    <param name="rval" type="integer" desc="Row value (to be fed to map for index lookup)" />
+    <param name="cval" type="integer" desc="Column value (to be fed to map for index lookup)" />
 
     <c:value-of name="matrix">
       <!-- row -->
@@ -97,13 +91,13 @@
         </c:value-of>
       </c:index>
     </c:value-of>
-  </lv:function>
+  </function>
 
 
-  <lv:function name="first_index" desc="Determine the matching index of a vector; -1 if no match">
-    <lv:param name="vector" type="float"   set="vector" desc="Source vector to search" />
-    <lv:param name="value"  type="integer"              desc="Value to match" />
-    <lv:param name="offset" type="integer"              desc="Vector offset" />
+  <function name="first_index" desc="Determine the matching index of a vector; -1 if no match">
+    <param name="vector" type="float"   set="vector" desc="Source vector to search" />
+    <param name="value"  type="integer"              desc="Value to match" />
+    <param name="offset" type="integer"              desc="Vector offset" />
 
     <c:let>
       <c:values>
@@ -151,12 +145,13 @@
         </c:otherwise>
       </c:cases>
     </c:let>
-  </lv:function>
+  </function>
 
 
   <!-- generates a variable that can be recognized as an empty set (useful for
        defaults to params that require sets) -->
-  <lv:rate-each class="always" yields="__empty" generates="__emptySet" index="k">
+  <rate-each class="always" yields="__empty" generates="__emptySet" index="k">
     <c:const value="0" type="integer" desc="Nothing" />
-  </lv:rate-each>
-</lv:package>
+  </rate-each>
+</package>
+
diff --git a/core/vector/convert.xml b/core/vector/convert.xml
index e5844258..7e26be7a 100644
--- a/core/vector/convert.xml
+++ b/core/vector/convert.xml
@@ -1,16 +1,8 @@
-<?xml-stylesheet type="text/xsl" href="summary.xsl"?>
-<lv:package
-  xmlns:lv="http://www.lovullo.com/rater"
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../../rater.xsd"
-
   core="true"
-
-  name="core/vector/convert"
   desc="Convert vectors into other types">
 
-  <lv:import package="../base" />
-
-
-</lv:package>
+  <import package="../base" />
+</package>
diff --git a/core/vector/count.xml b/core/vector/count.xml
index fdd333c0..59debaad 100644
--- a/core/vector/count.xml
+++ b/core/vector/count.xml
@@ -1,31 +1,25 @@
-<?xml-stylesheet type="text/xsl" href="summary.xsl"?>
-<lv:package
-  xmlns:lv="http://www.lovullo.com/rater"
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../../rater.xsd"
-
   core="true"
-
-  name="core/vector/count"
   desc="Vector element counting">
 
-  <lv:import package="../base" />
+  <import package="../base" />
 
 
   <!-- TODO: deprecate in favor of the new c:length-of -->
-  <lv:function name="length" desc="Counts the number of items in a vector (regardless of value)">
-    <lv:param name="count_set" type="integer" set="vector" desc="Vector to count" />
+  <function name="length" desc="Counts the number of items in a vector (regardless of value)">
+    <param name="count_set" type="integer" set="vector" desc="Vector to count" />
 
     <c:sum of="count_set" index="k">
       <c:const value="1" type="integer" desc="Add 1 for each value in the set" />
     </c:sum>
-  </lv:function>
+  </function>
 
 
   <!-- similar to a logical "exists" -->
-  <lv:function name="hasany" desc="Returns 1 or 0 based on whether any values in a boolean vector are set" sym="\exists">
-    <lv:param name="any_set" type="boolean" set="vector" desc="Boolean set to check" />
+  <function name="hasany" desc="Returns 1 or 0 based on whether any values in a boolean vector are set" sym="\exists">
+    <param name="any_set" type="boolean" set="vector" desc="Boolean set to check" />
 
     <c:ceil>
       <c:quotient label="Create a fraction > 0 if any value in the given set is 1">
@@ -43,5 +37,6 @@
         </c:sum>
       </c:quotient>
     </c:ceil>
-  </lv:function>
-</lv:package>
+  </function>
+</package>
+
diff --git a/core/vector/interpolate.xml b/core/vector/interpolate.xml
index c281e028..0238a342 100644
--- a/core/vector/interpolate.xml
+++ b/core/vector/interpolate.xml
@@ -1,32 +1,26 @@
-<?xml-stylesheet type="text/xsl" href="summary.xsl"?>
-<lv:package
-  xmlns:lv="http://www.lovullo.com/rater"
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
   xmlns:t="http://www.lovullo.com/rater/apply-template"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../../rater.xsd"
-
   core="true"
-
-  name="core/vector/interp"
   desc="Interpolation">
 
-  <lv:import package="../base" />
-  <lv:import package="../numeric/common" />
+  <import package="../base" />
+  <import package="../numeric/common" />
 
 
-  <lv:template name="_interpolate_" desc="Interpolate the first two values in a vector">
-    <lv:param name="@values@" desc="Set" />
-    <lv:param name="@low@" desc="Lower value" />
-    <lv:param name="@high@" desc="Upper value" />
-    <lv:param name="@actual@" desc="Actual value" />
+  <template name="_interpolate_" desc="Interpolate the first two values in a vector">
+    <param name="@values@" desc="Set" />
+    <param name="@low@" desc="Lower value" />
+    <param name="@high@" desc="Upper value" />
+    <param name="@actual@" desc="Actual value" />
 
 
     <c:let>
       <c:values>
         <!-- allows us to reference the set values -->
         <c:value name="orig_set" type="float" set="vector" desc="The given set">
-          <lv:param-copy name="@values@" />
+          <param-copy name="@values@" />
         </c:value>
       </c:values>
 
@@ -118,7 +112,7 @@
         </c:cases>
       </c:let>
     </c:let>
-  </lv:template>
+  </template>
 
 
   <!--
@@ -129,31 +123,31 @@
     results in a great deal of boilerplate code. This makes you not want to
     kill yourself. At least not because of this interpolation query
   -->
-  <lv:template name="_interpolate-query-field_"
+  <template name="_interpolate-query-field_"
                desc="Interpolate table data">
-    <lv:param name="@table@"  desc="Table to query" />
-    <lv:param name="@field@"  desc="Table field to query" />
-    <lv:param name="@key@"    desc="Predicate subject column" />
-    <lv:param name="@step@"   desc="Key step" />
-    <lv:param name="@values@" desc="Query predicates" />
+    <param name="@table@"  desc="Table to query" />
+    <param name="@field@"  desc="Table field to query" />
+    <param name="@key@"    desc="Predicate subject column" />
+    <param name="@step@"   desc="Key step" />
+    <param name="@values@" desc="Query predicates" />
 
-    <lv:param name="@actual@"
+    <param name="@actual@"
               desc="Actual value" />
 
-    <lv:param name="@index@" desc="Actual value index">
-      <lv:text></lv:text>
-    </lv:param>
+    <param name="@index@" desc="Actual value index">
+      <text></text>
+    </param>
 
-    <lv:param name="@table_max@"
+    <param name="@table_max@"
               desc="Maximum value in table (should be a multiple of @step)" />
 
     <!-- TODO: accept a function to calculate factor -->
-    <lv:param name="@step_factor@"
+    <param name="@step_factor@"
               desc="Factor to use per step after maximum to infer value" />
-    <lv:param name="@step_factor_index@"
+    <param name="@step_factor_index@"
               desc="Index of step factor value">
-      <lv:text></lv:text>
-    </lv:param>
+      <text></text>
+    </param>
 
 
     <c:let>
@@ -163,16 +157,16 @@
         <c:value name="lookup" type="float"
                  desc="Value to retrieve and interpolate">
           <!-- maximum provided -->
-          <lv:if name="@table_max@">
+          <if name="@table_max@">
             <t:cap name="@table_max@">
               <c:value-of name="@actual@" />
             </t:cap>
-          </lv:if>
+          </if>
 
           <!-- no maximum -->
-          <lv:unless name="@table_max@">
+          <unless name="@table_max@">
             <c:value-of name="@actual@" index="@index@" />
-          </lv:unless>
+          </unless>
         </c:value>
       </c:values>
 
@@ -195,13 +189,13 @@
                 <c:value-of name="high" />
               </t:when>
 
-              <lv:param-copy name="@values@" />
+              <param-copy name="@values@" />
             </t:query-field>
           </t:interpolate>
         </t:let-round>
 
         <!-- step factor -->
-        <lv:if name="@step_factor@">
+        <if name="@step_factor@">
           <c:let>
             <c:values>
               <!-- additional value (of key) that needs to be infered -->
@@ -226,10 +220,10 @@
               </c:quotient>
             </c:product>
           </c:let>
-        </lv:if>
+        </if>
       </c:sum>
     </c:let>
-  </lv:template>
+  </template>
 
 
   <!--
@@ -262,10 +256,10 @@
 
       7.5 / 5 = 1.5, Q.E.D.
   -->
-  <lv:function name="vecpos" desc="Calculate the position of a value within a vector of a given step">
-    <lv:param name="step"  type="float" desc="Step between each of the values" />
-    <lv:param name="skip"  type="float" desc="Amount skipped before first element of vector" />
-    <lv:param name="value" type="float" desc="Arbitrary value" />
+  <function name="vecpos" desc="Calculate the position of a value within a vector of a given step">
+    <param name="step"  type="float" desc="Step between each of the values" />
+    <param name="skip"  type="float" desc="Amount skipped before first element of vector" />
+    <param name="value" type="float" desc="Arbitrary value" />
 
     <c:quotient>
       <c:sum>
@@ -277,7 +271,7 @@
 
       <c:value-of name="step" />
     </c:quotient>
-  </lv:function>
+  </function>
 
 
   <!--
@@ -295,11 +289,11 @@
     step and skip amounts, since they were only needed to determine the value's
     position.
   -->
-  <lv:function name="vecstep" desc="Calculate a value that falls between a vector of values at a given step">
-    <lv:param name="set"   type="float" set="vector" desc="Vector of values" />
-    <lv:param name="step"  type="float"              desc="Step between each of the values" />
-    <lv:param name="skip"  type="float"              desc="Amount skipped before first element of vector" />
-    <lv:param name="value" type="float"              desc="Arbitrary value" />
+  <function name="vecstep" desc="Calculate a value that falls between a vector of values at a given step">
+    <param name="set"   type="float" set="vector" desc="Vector of values" />
+    <param name="step"  type="float"              desc="Step between each of the values" />
+    <param name="skip"  type="float"              desc="Amount skipped before first element of vector" />
+    <param name="value" type="float"              desc="Arbitrary value" />
 
     <!-- call the function that will do the actual work -->
     <c:apply name="vecstepi" set="set">
@@ -311,7 +305,7 @@
         <c:apply name="vecpos" step="step" skip="skip" value="value" />
       </c:arg>
     </c:apply>
-  </lv:function>
+  </function>
 
 
   <!--
@@ -339,9 +333,9 @@
         position from the position itself: 2.5 - 2 = 0.5.
       - So, we have: 5 + ( 15-10 * 2.5-2 ) = 5 + ( 5 * 0.5 ) = 5 + 2.5 = 7.5.
   -->
-  <lv:function name="vecstepi" desc="Calculate a value that falls between a vector of values at an arbitrary index">
-    <lv:param name="set"  type="float" set="vector" desc="Vector of values" />
-    <lv:param name="pos"  type="float"              desc="Position of value within the vector (may be between values)" />
+  <function name="vecstepi" desc="Calculate a value that falls between a vector of values at an arbitrary index">
+    <param name="set"  type="float" set="vector" desc="Vector of values" />
+    <param name="pos"  type="float"              desc="Position of value within the vector (may be between values)" />
 
     <c:sum>
       <!-- add the closest lower value... -->
@@ -385,5 +379,6 @@
         </c:sum>
       </c:product>
     </c:sum>
-  </lv:function>
-</lv:package>
+  </function>
+</package>
+
diff --git a/core/vector/list.xml b/core/vector/list.xml
index 2d3d2f80..d51f4017 100644
--- a/core/vector/list.xml
+++ b/core/vector/list.xml
@@ -1,17 +1,11 @@
-<?xml-stylesheet type="text/xsl" href="summary.xsl"?>
-<lv:package
-  xmlns:lv="http://www.lovullo.com/rater"
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
   xmlns:t="http://www.lovullo.com/rater/apply-template"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../../rater.xsd"
-
   core="true"
-
-  name="core/vector/list"
   desc="Treating vectors as lists">
 
-  <lv:import package="../base" />
+  <import package="../base" />
 
 
 
@@ -21,23 +15,23 @@
 
     This template recurses and, as such, should only be used within functions.
   -->
-  <lv:template name="_cons-until-empty_" desc="Generate empty base case for functions that recurse on cdrs of sets">
-    <lv:param name="@values@" desc="Body" />
+  <template name="_cons-until-empty_" desc="Generate empty base case for functions that recurse on cdrs of sets">
+    <param name="@values@" desc="Body" />
 
-    <lv:param name="@set@" desc="Set to operate on" />
-    <lv:param name="@car@" desc="Variable in which to store car of the set">
-      <lv:text>__car</lv:text>
-    </lv:param>
-    <lv:param name="@cdr@" desc="Variable in which to store the cdr of the set">
-      <lv:text>__cdr</lv:text>
-    </lv:param>
+    <param name="@set@" desc="Set to operate on" />
+    <param name="@car@" desc="Variable in which to store car of the set">
+      <text>__car</text>
+    </param>
+    <param name="@cdr@" desc="Variable in which to store the cdr of the set">
+      <text>__cdr</text>
+    </param>
 
-    <lv:param name="@base@" desc="Base set to return (otherwise an empty set)" />
-    <lv:param name="@glance@" desc="Glance at (but do nothing with) this value; recurse without action" />
+    <param name="@base@" desc="Base set to return (otherwise an empty set)" />
+    <param name="@glance@" desc="Glance at (but do nothing with) this value; recurse without action" />
 
     <!-- intended for use by merge-until-empty to reduce duplicate code; not to
          be set via direct template applications -->
-    <lv:param name="@merge@" desc="Perform merge instead of cons; system-use only" />
+    <param name="@merge@" desc="Perform merge instead of cons; system-use only" />
 
 
     <c:let>
@@ -61,13 +55,13 @@
           </c:when>
 
           <!-- if a base set was provided, return that; otherwise, return an empty set -->
-          <lv:if name="@base@">
+          <if name="@base@">
             <c:value-of name="@base@" />
-          </lv:if>
-          <lv:unless name="@base@">
+          </if>
+          <unless name="@base@">
             <!-- return an empty set -->
             <c:set />
-          </lv:unless>
+          </unless>
         </c:case>
 
         <c:otherwise>
@@ -91,7 +85,7 @@
             <c:cases>
               <!-- if we have a glancing value, then immediately recurse
                    without processing if we have a match -->
-              <lv:if name="@glance@">
+              <if name="@glance@">
                 <c:case>
                   <c:when name="@car@">
                     <c:eq>
@@ -105,17 +99,17 @@
                     </c:arg>
                   </c:recurse>
                 </c:case>
-              </lv:if>
+              </if>
 
               <!-- otherwise, process as normal -->
               <c:otherwise>
-                <lv:unless name="@merge@">
+                <unless name="@merge@">
                   <!-- here's our recursive operation: cons the result of processing
                        this car with the result of recursively processing the cdr
                        (note that c:recurse will recurse on the function that applied
                        this template, _not_ on the template itself)-->
                   <c:cons>
-                    <lv:param-copy name="@values@" />
+                    <param-copy name="@values@" />
 
                     <c:recurse>
                       <c:arg name="@set@">
@@ -123,9 +117,9 @@
                       </c:arg>
                     </c:recurse>
                   </c:cons>
-                </lv:unless>
+                </unless>
 
-                <lv:if name="@merge@">
+                <if name="@merge@">
                   <!-- the order is different from the cons above to maintain
                        consistency in the returned set -->
                   <c:apply name="vmerge">
@@ -138,17 +132,17 @@
                     </c:arg>
 
                     <c:arg name="onto">
-                      <lv:param-copy name="@values@" />
+                      <param-copy name="@values@" />
                     </c:arg>
                   </c:apply>
-                </lv:if>
+                </if>
               </c:otherwise>
             </c:cases>
           </c:let>
         </c:otherwise>
       </c:cases>
     </c:let>
-  </lv:template>
+  </template>
 
 
 
@@ -157,31 +151,31 @@
 
     This template recurses and, as such, should only be used within functions.
   -->
-  <lv:template name="_merge-until-empty_" desc="Generate empty base case for functions that recursively merge on cdrs of sets">
-    <lv:param name="@values@" desc="Body" />
+  <template name="_merge-until-empty_" desc="Generate empty base case for functions that recursively merge on cdrs of sets">
+    <param name="@values@" desc="Body" />
 
-    <lv:param name="@set@" desc="Set to operate on" />
-    <lv:param name="@car@" desc="Variable in which to store car of the set" />
-    <lv:param name="@cdr@" desc="Variable in which to store the cdr of the set">
-      <lv:text>__cdr</lv:text>
-    </lv:param>
+    <param name="@set@" desc="Set to operate on" />
+    <param name="@car@" desc="Variable in which to store car of the set" />
+    <param name="@cdr@" desc="Variable in which to store the cdr of the set">
+      <text>__cdr</text>
+    </param>
 
-    <lv:param name="@glance@" desc="Glance at (but do nothing with) this value; recurse without action" />
+    <param name="@glance@" desc="Glance at (but do nothing with) this value; recurse without action" />
 
     <!-- to reduce duplicate template code, we simply set a merge flag on cons-until-empty -->
     <t:cons-until-empty set="@set@" car="@car@" cdr="@cdr@" glance="@glance@" merge="true">
-      <lv:param-copy name="@values@" />
+      <param-copy name="@values@" />
     </t:cons-until-empty>
-  </lv:template>
+  </template>
 
 
 
   <!--
     Merges two vectors
   -->
-  <lv:function name="vmerge" desc="Merge two vectors (does not remove duplicates)">
-    <lv:param name="vector" type="float" set="vector" desc="Vector to merge" />
-    <lv:param name="onto"   type="float" set="vector" desc="Vector to append to" />
+  <function name="vmerge" desc="Merge two vectors (does not remove duplicates)">
+    <param name="vector" type="float" set="vector" desc="Vector to merge" />
+    <param name="onto"   type="float" set="vector" desc="Vector to append to" />
 
     <!-- the template handles much of this for us: just keep cons'ing the car
          until we have nothing more to cons, then that gets cons'd onto the
@@ -189,5 +183,6 @@
     <t:cons-until-empty set="vector" car="car" base="onto">
       <c:value-of name="car" />
     </t:cons-until-empty>
-  </lv:function>
-</lv:package>
+  </function>
+</package>
+
diff --git a/core/vector/matrix.xml b/core/vector/matrix.xml
index 1640a923..c58d2218 100644
--- a/core/vector/matrix.xml
+++ b/core/vector/matrix.xml
@@ -1,18 +1,12 @@
-<?xml-stylesheet type="text/xsl" href="summary.xsl"?>
-<lv:package
-  xmlns:lv="http://www.lovullo.com/rater"
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
   xmlns:t="http://www.lovullo.com/rater/apply-template"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../../rater.xsd"
-
   core="true"
-
-  name="core/vector/matrix"
   desc="Matrix (vector of vectors) arithmetic">
 
-  <lv:import package="../base" />
-  <lv:import package="list" />
+  <import package="../base" />
+  <import package="list" />
 
 
   <!--
@@ -52,36 +46,36 @@
     above is true, the result is achieved in a slightly different manner.)
   -->
   <!-- TODO: more generic name and documentation; we are in the core, after all -->
-  <lv:template name="_rate-vector_" desc="Matches against a matrix of classes and a matrix of rates and returns a vector representing the rates per location">
-    <lv:param name="@line@" desc="Line code classification string" />
-    <lv:param name="@class_set@" desc="Matrix containing line classification matches" />
-    <lv:param name="@into@" desc="Variable to which the vector will be assigned" />
+  <template name="_rate-vector_" desc="Matches against a matrix of classes and a matrix of rates and returns a vector representing the rates per location">
+    <param name="@line@" desc="Line code classification string" />
+    <param name="@class_set@" desc="Matrix containing line classification matches" />
+    <param name="@into@" desc="Variable to which the vector will be assigned" />
 
     <!-- this would be the sum of all the rates, which really is useless, but the XML requires it -->
-    <lv:param name="@yields@" desc="Variable to yield to (useless, but required)">
-      <lv:text>__</lv:text>
-      <lv:param-value name="@into@" />
-    </lv:param>
+    <param name="@yields@" desc="Variable to yield to (useless, but required)">
+      <text>__</text>
+      <param-value name="@into@" />
+    </param>
 
-    <lv:param name="@rate_matrix@" desc="Matrix containing the rates for the given line">
-      <lv:text>rate_</lv:text>
-      <lv:param-value name="@line@" />
-    </lv:param>
+    <param name="@rate_matrix@" desc="Matrix containing the rates for the given line">
+      <text>rate_</text>
+      <param-value name="@line@" />
+    </param>
 
-    <lv:rate-each class="@line@" accumulate="none" yields="@yields@" generates="@into@" index="k">
+    <rate-each class="@line@" accumulate="none" yields="@yields@" generates="@into@" index="k">
       <!-- take the dot product of the two vectors (each part of a larger matrix)
            to get the rate for the associated class code -->
       <c:product dot="true" label="Dot product between the class and rate vectors for each location will yield the respective rate per location">
         <c:value-of name="@class_set@" index="k" />
         <c:value-of name="@rate_matrix@" index="k" />
       </c:product>
-    </lv:rate-each>
-  </lv:template>
+    </rate-each>
+  </template>
 
 
-  <lv:function name="mcol" desc="Retrieve a matrix column as a vector">
-    <lv:param name="matrix" type="float"   set="matrix" desc="Matrix" />
-    <lv:param name="col"    type="integer"              desc="Column index (0-indexed)" />
+  <function name="mcol" desc="Retrieve a matrix column as a vector">
+    <param name="matrix" type="float"   set="matrix" desc="Matrix" />
+    <param name="col"    type="integer"              desc="Column index (0-indexed)" />
 
     <!-- generate a vector containing only the requested column from each row -->
     <t:cons-until-empty set="matrix" car="row">
@@ -91,5 +85,6 @@
         </c:index>
       </c:value-of>
     </t:cons-until-empty>
-  </lv:function>
-</lv:package>
+  </function>
+</package>
+
diff --git a/core/vector/table.xml b/core/vector/table.xml
index c485e757..4322cbd5 100644
--- a/core/vector/table.xml
+++ b/core/vector/table.xml
@@ -1,28 +1,22 @@
-<?xml-stylesheet type="text/xsl" href="summary.xsl"?>
-<lv:package
-  xmlns:lv="http://www.lovullo.com/rater"
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
   xmlns:t="http://www.lovullo.com/rater/apply-template"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../../rater.xsd"
-
   core="true"
-
-  name="core/vector/table"
   desc="Functions for performing table lookups">
 
-  <lv:import package="../base" />
-  <lv:import package="../numeric/common" />
-  <lv:import package="list" />
+  <import package="../base" />
+  <import package="../numeric/common" />
+  <import package="list" />
 
   <!-- since templates are inlined, we need to make these symbols available to
        avoid terrible confusion -->
-  <lv:import package="common" export="true" />
-  <lv:import package="matrix" export="true" />
+  <import package="common" export="true" />
+  <import package="matrix" export="true" />
 
 
-  <lv:const name="TABLE_WHEN_MASK_VALUE" type="float" value="-0.0001" desc="Used to mask when conditions" />
-  <lv:const name="MFILTER_BISECT_GAP_MAX" type="integer" value="10" desc="Quit bisect if size is less than or equal to this value" />
+  <const name="TABLE_WHEN_MASK_VALUE" type="float" value="-0.0001" desc="Used to mask when conditions" />
+  <const name="MFILTER_BISECT_GAP_MAX" type="integer" value="10" desc="Quit bisect if size is less than or equal to this value" />
 
 
   <!--
@@ -34,27 +28,27 @@
       - _table_column_+ - Column definitions
       - _table_rows_    - Begin table data definition
   -->
-  <lv:template name="_create-table_"
+  <template name="_create-table_"
                desc="Create an arbitrary table for querying">
-    <lv:param name="@name@"   desc="Table name" />
-    <lv:param name="@values@" desc="Table definition" />
+    <param name="@name@"   desc="Table name" />
+    <param name="@values@" desc="Table definition" />
 
-    <lv:param name="@desc@" desc="Table description">
-      <lv:text></lv:text>
-    </lv:param>
+    <param name="@desc@" desc="Table description">
+      <text></text>
+    </param>
 
-    <lv:param name="@__tid@"
+    <param name="@__tid@"
               desc="Internal table identifier">
-      <lv:param-value name="@name@" upper="true" snake="true" />
-    </lv:param>
+      <param-value name="@name@" upper="true" snake="true" />
+    </param>
 
 
-    <lv:param-copy name="@values@">
-      <lv:param-meta name="create-table-id" value="@__tid@" />
-      <lv:param-meta name="create-table-name" value="@name@" />
-      <lv:param-meta name="create-table-desc" value="@desc@" />
-    </lv:param-copy>
-  </lv:template>
+    <param-copy name="@values@">
+      <param-meta name="create-table-id" value="@__tid@" />
+      <param-meta name="create-table-name" value="@name@" />
+      <param-meta name="create-table-desc" value="@desc@" />
+    </param-copy>
+  </template>
 
 
   <!--
@@ -68,52 +62,52 @@
     If a table is especially large, the first column should be treated
     as the index and always be sequenced.
   -->
-  <lv:template name="_table-column_"
+  <template name="_table-column_"
                desc="Declare name for table column">
-    <lv:param name="@name@"  desc="Column name" />
-    <lv:param name="@index@" desc="Column index (0-indexed)" />
+    <param name="@name@"  desc="Column name" />
+    <param name="@index@" desc="Column index (0-indexed)" />
 
-    <lv:param name="@desc@" desc="Column description">
-      <lv:param-value name="@name@" />
-    </lv:param>
+    <param name="@desc@" desc="Column description">
+      <param-value name="@name@" />
+    </param>
 
     <!-- use carefully; leave alone unless data is definately sorted,
          or query results may be incorrect -->
-    <lv:param name="@seq@" desc="Column is sorted (sequential)">
-      <lv:text></lv:text>
-    </lv:param>
+    <param name="@seq@" desc="Column is sorted (sequential)">
+      <text></text>
+    </param>
 
-    <lv:param name="@__tid@"
+    <param name="@__tid@"
               desc="Internal table identifier">
-      <lv:param-inherit meta="create-table-id" />
-    </lv:param>
+      <param-inherit meta="create-table-id" />
+    </param>
 
     <!-- FIXME: this doesn't contain @__tid@ because of a bug in the
          preprocessor; this is fixed in the new DSL -->
-    <lv:param name="@__constname@"
+    <param name="@__constname@"
               desc="Name of internal constant used for column lookup">
-      <lv:text>RATE_TABLE_</lv:text>
-      <lv:param-value name="@name@" upper="true" snake="true" />
-    </lv:param>
+      <text>RATE_TABLE_</text>
+      <param-value name="@name@" upper="true" snake="true" />
+    </param>
 
 
     <!-- column index identifier -->
-    <lv:const name="{@__tid@}_{@__constname@}"
+    <const name="{@__tid@}_{@__constname@}"
               value="@index@" type="integer"
               desc="@desc@" />
 
     <!-- column sequential flag to permit query optimizations -->
-    <lv:if name="@seq@" eq="true">
-      <lv:const name="{@__tid@}_{@__constname@}_IS_SEQ"
+    <if name="@seq@" eq="true">
+      <const name="{@__tid@}_{@__constname@}_IS_SEQ"
                 value="1" type="integer"
                 desc="{@name@} is sequenced" />
-    </lv:if>
-    <lv:unless name="@seq@" eq="true">
-      <lv:const name="{@__tid@}_{@__constname@}_IS_SEQ"
+    </if>
+    <unless name="@seq@" eq="true">
+      <const name="{@__tid@}_{@__constname@}_IS_SEQ"
                 value="0" type="integer"
                 desc="{@name@} is unordered" />
-    </lv:unless>
-  </lv:template>
+    </unless>
+  </template>
 
 
   <!--
@@ -125,30 +119,30 @@
     Permitted children:
       - _table-row_* - Table row definitions
   -->
-  <lv:template name="_table-rows_"
+  <template name="_table-rows_"
                desc="Begin table data definition">
-    <lv:param name="@values@" desc="Row definitions" />
+    <param name="@values@" desc="Row definitions" />
 
-    <lv:param name="@__tid@"
+    <param name="@__tid@"
               desc="Table identifier">
-      <lv:param-inherit meta="create-table-id" />
-    </lv:param>
-    <lv:param name="@__tname@"
+      <param-inherit meta="create-table-id" />
+    </param>
+    <param name="@__tname@"
               desc="Table name as provided by caller">
-      <lv:param-inherit meta="create-table-name" />
-    </lv:param>
-    <lv:param name="@__desc@"
+      <param-inherit meta="create-table-name" />
+    </param>
+    <param name="@__desc@"
               desc="Table description">
-      <lv:param-inherit meta="create-table-desc" />
-    </lv:param>
+      <param-inherit meta="create-table-desc" />
+    </param>
 
 
-    <lv:const name="{@__tid@}_RATE_TABLE"
+    <const name="{@__tid@}_RATE_TABLE"
               type="float"
               desc="{@__tname@} table; {@__desc@}">
-      <lv:param-copy name="@values@" />
-    </lv:const>
-  </lv:template>
+      <param-copy name="@values@" />
+    </const>
+  </template>
 
 
   <!--
@@ -163,15 +157,15 @@
     Permitted children:
       _table-value_+ - Row column value
   -->
-  <lv:template name="_table-row_"
+  <template name="_table-row_"
                desc="Define a constant table row (ordered)">
-    <lv:param name="@values@" desc="Column values" />
+    <param name="@values@" desc="Column values" />
 
 
-    <lv:set desc="Row">
-      <lv:param-copy name="@values@" />
-    </lv:set>
-  </lv:template>
+    <set desc="Row">
+      <param-copy name="@values@" />
+    </set>
+  </template>
 
 
   <!--
@@ -180,31 +174,31 @@
     Column value order should match the defined column order. All
     values must be constants.
   -->
-  <lv:template name="_table-value_"
+  <template name="_table-value_"
                desc="Table column value for row (ordered)">
-    <lv:param name="@const@" desc="Constant column value" />
+    <param name="@const@" desc="Constant column value" />
 
 
-    <lv:item value="@const@" desc="Column value" />
-  </lv:template>
+    <item value="@const@" desc="Column value" />
+  </template>
 
 
-  <lv:template name="_query-first-field_" desc="Return the requested field from the first row returned by a query">
-    <lv:param name="@table@" desc="Table (matrix) to query" />
-    <lv:param name="@values@" desc="Query parameters" />
+  <template name="_query-first-field_" desc="Return the requested field from the first row returned by a query">
+    <param name="@table@" desc="Table (matrix) to query" />
+    <param name="@values@" desc="Query parameters" />
 
     <!-- use either field or name[+index] -->
-    <lv:param name="@field@" desc="Column to select (variable/constant); do not use with @name@" />
-    <lv:param name="@name@" desc="Name of field to query (variable/constant); overrides @field@" />
-    <lv:param name="@index@" desc="Optional index for field name lookup (using @name@)" />
+    <param name="@field@" desc="Column to select (variable/constant); do not use with @name@" />
+    <param name="@name@" desc="Name of field to query (variable/constant); overrides @field@" />
+    <param name="@index@" desc="Optional index for field name lookup (using @name@)" />
 
 
     <c:car label="First row of query result">
       <t:query-field table="@table@" field="@field@" name="@name@" index="@index@">
-        <lv:param-copy name="@values@" />
+        <param-copy name="@values@" />
       </t:query-field>
     </c:car>
-  </lv:template>
+  </template>
 
 
   <!--
@@ -240,59 +234,59 @@
     predicate to query the first field to quickly reduce the size of the set
     for the next predicate.
   -->
-  <lv:template name="_query-field_" desc="Return the requested field from rows returned by a query">
-    <lv:param name="@table@" desc="Table (matrix) to query" />
-    <lv:param name="@values@" desc="Query parameters" />
+  <template name="_query-field_" desc="Return the requested field from rows returned by a query">
+    <param name="@table@" desc="Table (matrix) to query" />
+    <param name="@values@" desc="Query parameters" />
 
     <!-- use one or the other -->
-    <lv:param name="@field@" desc="Column to select (variable/constant); do not use with @name@" />
+    <param name="@field@" desc="Column to select (variable/constant); do not use with @name@" />
 
-    <lv:param name="@index@" desc="Optional index for field name lookup (using @name@)" />
+    <param name="@index@" desc="Optional index for field name lookup (using @name@)" />
     <!-- by default, if @field@ is provided instead of @name@, the field
          constant will be generated (same concept as the 'when' template) -->
-    <lv:param name="@name@" desc="Name of field to query (variable/constant); overrides @field@">
+    <param name="@name@" desc="Name of field to query (variable/constant); overrides @field@">
       <!-- convert @table@ to uppercase and snake case (replace - with _) -->
-      <lv:param-value name="@table@" upper="true" snake="true" />
-      <lv:text>_RATE_TABLE_</lv:text>
-      <lv:param-value name="@field@" upper="true" snake="true" />
-    </lv:param>
+      <param-value name="@table@" upper="true" snake="true" />
+      <text>_RATE_TABLE_</text>
+      <param-value name="@field@" upper="true" snake="true" />
+    </param>
 
 
     <c:apply name="mcol" label="Query result">
       <!-- the matrix (vector of rows) returned by the query -->
       <c:arg name="matrix">
         <t:query-row table="@table@">
-          <lv:param-copy name="@values@" />
+          <param-copy name="@values@" />
         </t:query-row>
       </c:arg>
 
       <!-- the field (column) to retrieve; 0-based index -->
       <c:arg name="col">
         <!-- no index lookup needed -->
-        <lv:unless name="@index@">
+        <unless name="@index@">
           <c:value-of name="@name@" />
-        </lv:unless>
+        </unless>
 
         <!-- index lookup required -->
-        <lv:if name="@index@">
+        <if name="@index@">
           <c:value-of name="@name@" index="@index@" />
-        </lv:if>
+        </if>
       </c:arg>
     </c:apply>
-  </lv:template>
+  </template>
 
 
-  <lv:template name="_query-row_" desc="Query a table (matrix) for a row (vector) of values">
-    <lv:param name="@table@" desc="Table (matrix)" />
-    <lv:param name="@values@" desc="Query parameters" />
+  <template name="_query-row_" desc="Query a table (matrix) for a row (vector) of values">
+    <param name="@table@" desc="Table (matrix)" />
+    <param name="@values@" desc="Query parameters" />
 
     <!-- this defaults to a table name constant as generated from the csv2xml
          script; either this or @table@ should be used -->
-    <lv:param name="@matrix@" desc="Matrix to look up from">
+    <param name="@matrix@" desc="Matrix to look up from">
       <!-- convert @table@ to uppercase and snake case (replace - with _) -->
-      <lv:param-value name="@table@" upper="true" snake="true" />
-      <lv:text>_RATE_TABLE</lv:text>
-    </lv:param>
+      <param-value name="@table@" upper="true" snake="true" />
+      <text>_RATE_TABLE</text>
+    </param>
 
     <c:apply name="_mquery">
       <c:arg name="matrix">
@@ -301,9 +295,9 @@
 
       <c:arg name="criteria">
         <c:set>
-          <lv:param-copy name="@values@">
-            <lv:param-meta name="table_basename" value="@matrix@" />
-          </lv:param-copy>
+          <param-copy name="@values@">
+            <param-meta name="table_basename" value="@matrix@" />
+          </param-copy>
         </c:set>
       </c:arg>
 
@@ -313,71 +307,71 @@
         <t:dec>
           <c:length-of>
             <c:set>
-              <lv:param-copy name="@values@">
-                <lv:param-meta name="table_basename" value="@matrix@" />
-              </lv:param-copy>
+              <param-copy name="@values@">
+                <param-meta name="table_basename" value="@matrix@" />
+              </param-copy>
             </c:set>
           </c:length-of>
         </t:dec>
       </c:arg>
     </c:apply>
-  </lv:template>
+  </template>
 
 
-  <lv:template name="_when_" desc="Create field predicate for query definition">
-    <lv:param name="@id@" desc="Field index" />
-    <lv:param name="@values@" desc="Field value (provide only one node)" />
-    <lv:param name="@sequential@" desc="Is data sequential?" />
+  <template name="_when_" desc="Create field predicate for query definition">
+    <param name="@id@" desc="Field index" />
+    <param name="@values@" desc="Field value (provide only one node)" />
+    <param name="@sequential@" desc="Is data sequential?" />
 
     <!-- @name@ may be provided directly, or @field@ may be used when the
          basename is available (set by a query template), giving the illusion of
          querying the table columns by name directly (magic!); pure syntatic
          sugary goodness -->
-    <lv:param name="@field@" desc="Field name (to be used with base)" />
-    <lv:param name="@name@" desc="Field name (as a variable/constant)">
-      <lv:param-inherit meta="table_basename" />
-      <lv:text>_</lv:text>
-      <lv:param-value name="@field@" upper="true" snake="true" />
-    </lv:param>
+    <param name="@field@" desc="Field name (to be used with base)" />
+    <param name="@name@" desc="Field name (as a variable/constant)">
+      <param-inherit meta="table_basename" />
+      <text>_</text>
+      <param-value name="@field@" upper="true" snake="true" />
+    </param>
 
-    <lv:param name="@seqvar@" desc="Var/constant containing whether field is sequential">
-      <lv:param-inherit meta="table_basename" />
-      <lv:text>_</lv:text>
-      <lv:param-value name="@field@" upper="true" snake="true" />
-      <lv:text>_IS_SEQ</lv:text>
-    </lv:param>
+    <param name="@seqvar@" desc="Var/constant containing whether field is sequential">
+      <param-inherit meta="table_basename" />
+      <text>_</text>
+      <param-value name="@field@" upper="true" snake="true" />
+      <text>_IS_SEQ</text>
+    </param>
 
     <c:set label="Conditional for {@field@}">
       <!-- the first element will represent the column (field) index -->
-      <lv:unless name="@name@">
+      <unless name="@name@">
         <c:const value="@id@" type="integer" desc="Field index" />
-      </lv:unless>
-      <lv:if name="@name@">
+      </unless>
+      <if name="@name@">
         <c:value-of name="@name@" />
-      </lv:if>
+      </if>
 
       <!-- the second element will represent the expected value(s) -->
       <c:set>
-        <lv:param-copy name="@values@" />
+        <param-copy name="@values@" />
       </c:set>
 
       <!-- the final element will represent whether or not this field is sequential -->
-      <lv:if name="@sequential@">
+      <if name="@sequential@">
         <c:const value="@sequential@" type="boolean" desc="Whether data is sequential" />
-      </lv:if>
-      <lv:unless name="@sequential@">
+      </if>
+      <unless name="@sequential@">
         <!-- if a field name was given, we can get the sequential information
              that was already generated for us -->
-        <lv:if name="@field@">
+        <if name="@field@">
           <c:value-of name="@seqvar@" />
-        </lv:if>
+        </if>
         <!-- otherwise, default to non-sequential -->
-        <lv:unless name="@field@">
+        <unless name="@field@">
           <c:value-of name="FALSE" />
-        </lv:unless>
-      </lv:unless>
+        </unless>
+      </unless>
     </c:set>
-  </lv:template>
+  </template>
 
 
 
@@ -389,11 +383,11 @@
 
 
   <!-- this function is intended to be called by the _query_ template, not directly -->
-  <lv:function name="_mquery" desc="Query for vectors using a set of column criteria">
-    <lv:param name="matrix" type="float" set="matrix" desc="Matrix to query" />
-    <lv:param name="criteria" type="float" set="matrix" desc="Query criteria" />
+  <function name="_mquery" desc="Query for vectors using a set of column criteria">
+    <param name="matrix" type="float" set="matrix" desc="Matrix to query" />
+    <param name="criteria" type="float" set="matrix" desc="Query criteria" />
 
-    <lv:param name="i" type="integer" desc="Current criteria index" />
+    <param name="i" type="integer" desc="Current criteria index" />
 
     <c:cases>
       <c:case>
@@ -469,7 +463,7 @@
         </c:apply>
       </c:otherwise>
     </c:cases>
-  </lv:function>
+  </function>
 
 
   <!--
@@ -488,12 +482,12 @@
     the gap and make this a general-purpose function if need be. Technically,
     the gap is useless and saves lg(g) steps, which may be very small.)
   -->
-  <lv:function name="bisect" desc="Bisect a matrix toward the requested column value">
-    <lv:param name="matrix" type="float" set="matrix" desc="Matrix to bisect" />
-    <lv:param name="col" type="integer" desc="Column index to filter on" />
-    <lv:param name="val" type="float" desc="Column value to filter on" />
-    <lv:param name="start" type="integer" desc="Start index" />
-    <lv:param name="end" type="integer" desc="Start end" />
+  <function name="bisect" desc="Bisect a matrix toward the requested column value">
+    <param name="matrix" type="float" set="matrix" desc="Matrix to bisect" />
+    <param name="col" type="integer" desc="Column index to filter on" />
+    <param name="val" type="float" desc="Column value to filter on" />
+    <param name="start" type="integer" desc="Start index" />
+    <param name="end" type="integer" desc="Start end" />
 
     <c:let>
       <c:values>
@@ -607,13 +601,13 @@
         </c:otherwise>
       </c:cases>
     </c:let>
-  </lv:function>
+  </function>
 
 
-  <lv:function name="foremost" desc="Search backwards for the first occurrance in a sorted list">
-    <lv:param name="matrix" type="float" set="matrix" desc="Matrix to bisect" />
-    <lv:param name="col" type="integer" desc="Column index to search on" />
-    <lv:param name="i" type="integer" desc="Current index" />
+  <function name="foremost" desc="Search backwards for the first occurrance in a sorted list">
+    <param name="matrix" type="float" set="matrix" desc="Matrix to bisect" />
+    <param name="col" type="integer" desc="Column index to search on" />
+    <param name="i" type="integer" desc="Current index" />
 
     <c:let>
       <c:values>
@@ -687,35 +681,35 @@
         </c:otherwise>
       </c:cases>
     </c:let>
-  </lv:function>
+  </function>
 
 
-  <lv:template name="_mask-unless_" desc="Mask a value unless the condition is truthful">
-    <lv:param name="@values@" desc="Body" />
-    <lv:param name="@name@" desc="Scalar to check" />
-    <lv:param name="@index@" desc="Optional index" />
-    <lv:param name="@desc@" desc="Optional description" />
+  <template name="_mask-unless_" desc="Mask a value unless the condition is truthful">
+    <param name="@values@" desc="Body" />
+    <param name="@name@" desc="Scalar to check" />
+    <param name="@index@" desc="Optional index" />
+    <param name="@desc@" desc="Optional description" />
 
     <c:cases>
       <!-- if masked -->
       <c:case>
         <!-- no index provided -->
-        <lv:unless name="@index@">
+        <unless name="@index@">
           <c:when name="@name@">
             <c:eq>
               <c:value-of name="FALSE" />
             </c:eq>
           </c:when>
-        </lv:unless>
+        </unless>
 
         <!-- index provided -->
-        <lv:if name="@index@">
+        <if name="@index@">
           <c:when name="@name@" index="@index@">
             <c:eq>
               <c:value-of name="FALSE" />
             </c:eq>
           </c:when>
-        </lv:if>
+        </if>
 
         <!-- TODO: configurable mask via meta and/or param -->
         <c:value-of name="TABLE_WHEN_MASK_VALUE" />
@@ -723,17 +717,17 @@
 
       <!-- if not masked -->
       <c:otherwise>
-        <lv:param-copy name="@values@" />
+        <param-copy name="@values@" />
       </c:otherwise>
     </c:cases>
-  </lv:template>
+  </template>
 
 
-  <lv:function name="mfilter" desc="Filter matrix rows by column value">
-    <lv:param name="matrix" type="float" set="matrix" desc="Matrix to filter" />
-    <lv:param name="col"    type="integer" desc="Column index to filter on" />
-    <lv:param name="vals"   type="float" desc="Column value to filter on" />
-    <lv:param name="seq"    type="boolean" desc="Is data sequential?" />
+  <function name="mfilter" desc="Filter matrix rows by column value">
+    <param name="matrix" type="float" set="matrix" desc="Matrix to filter" />
+    <param name="col"    type="integer" desc="Column index to filter on" />
+    <param name="vals"   type="float" desc="Column value to filter on" />
+    <param name="seq"    type="boolean" desc="Is data sequential?" />
 
     <!-- merge the result of each condition in vals into a single set, which
          has the effect of supporting multiple conditions on a single column of
@@ -786,16 +780,16 @@
         </c:arg>
       </c:apply>
     </t:merge-until-empty>
-  </lv:function>
+  </function>
 
 
-  <lv:function name="range" desc="Filter matrix rows by column value within a certain range of indexes (inclusive)">
-    <lv:param name="matrix" type="float" set="matrix" desc="Matrix to filter" />
-    <lv:param name="col" type="integer" desc="Column index to filter on" />
-    <lv:param name="val" type="float" desc="Column value to filter on" />
-    <lv:param name="start" type="integer" desc="Starting index (inclusive)" />
-    <lv:param name="end" type="integer" desc="Ending index (inclusive)" />
-    <lv:param name="seq" type="boolean" desc="Is data sequential?" />
+  <function name="range" desc="Filter matrix rows by column value within a certain range of indexes (inclusive)">
+    <param name="matrix" type="float" set="matrix" desc="Matrix to filter" />
+    <param name="col" type="integer" desc="Column index to filter on" />
+    <param name="val" type="float" desc="Column value to filter on" />
+    <param name="start" type="integer" desc="Starting index (inclusive)" />
+    <param name="end" type="integer" desc="Ending index (inclusive)" />
+    <param name="seq" type="boolean" desc="Is data sequential?" />
 
     <c:let>
       <c:values>
@@ -882,18 +876,18 @@
         </c:cases>
       </c:let>
     </c:let>
-  </lv:function>
+  </function>
 
 
-  <lv:function name="_mfilter" desc="mfilter helper">
-    <lv:param name="matrix" type="float" set="matrix" desc="Matrix to filter" />
-    <lv:param name="col" type="integer" desc="Column index to filter on" />
-    <lv:param name="val" type="float" desc="Column value to filter on" />
-    <lv:param name="start" type="integer" desc="Starting index (aka current index)" />
-    <lv:param name="end" type="integer" desc="Ending index" />
-    <lv:param name="seq" type="integer" desc="Is data sequential?" />
+  <function name="_mfilter" desc="mfilter helper">
+    <param name="matrix" type="float" set="matrix" desc="Matrix to filter" />
+    <param name="col" type="integer" desc="Column index to filter on" />
+    <param name="val" type="float" desc="Column value to filter on" />
+    <param name="start" type="integer" desc="Starting index (aka current index)" />
+    <param name="end" type="integer" desc="Ending index" />
+    <param name="seq" type="integer" desc="Is data sequential?" />
 
-    <lv:param name="cur" type="float" desc="Current value" />
+    <param name="cur" type="float" desc="Current value" />
 
     <c:cases>
       <c:case>
@@ -932,5 +926,6 @@
         </c:apply>
       </c:otherwise>
     </c:cases>
-  </lv:function>
-</lv:package>
+  </function>
+</package>
+