diff --git a/src/current/include/preproc/package.xsl b/src/current/include/preproc/package.xsl
index 0db12f5d..fe701d67 100644
--- a/src/current/include/preproc/package.xsl
+++ b/src/current/include/preproc/package.xsl
@@ -259,7 +259,7 @@
 
 
 <!-- skip things that cannot contain template applications -->
-<xsl:template match="lv:template|lv:const|lv:typedef"
+<xsl:template match="lv:template|lv:const|lv:typedef|lv:param-copy"
               mode="preproc:tpl-check" priority="9">
 </xsl:template>
 
diff --git a/src/current/include/preproc/template.xsl b/src/current/include/preproc/template.xsl
index 6c5c9ac9..bdb54ae6 100644
--- a/src/current/include/preproc/template.xsl
+++ b/src/current/include/preproc/template.xsl
@@ -584,6 +584,27 @@
 </xsl:template>
 
 
+<!--
+  Halt expansion at this point and remove the barrier for future expansions
+-->
+<xsl:template match="lv:expand-barrier" mode="preproc:apply-template" priority="5">
+  <xsl:sequence select="node()" />
+</xsl:template>
+
+
+<!--
+  Leave immediate children alone but continue expanding grandchildren
+-->
+<xsl:template match="lv:skip-child-expansion" mode="preproc:apply-template" priority="5">
+  <xsl:for-each select="element()">
+    <xsl:copy>
+      <xsl:copy-of select="@*" />
+      <xsl:apply-templates mode="preproc:apply-template" />
+    </xsl:copy>
+  </xsl:for-each>
+</xsl:template>
+
+
 <!--
   Preprocesses template nodes