diff --git a/.travis.yml b/.travis.yml
index 8f517c89..d5ffa68a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,24 +2,12 @@ language: java
 script: gradle dist
 sudo: false
 install:
-  - echo sonatypeUsername=none >> gradle.properties
-  - echo sonatypePassword=none >> gradle.properties
-  - ".travis/setup-diff.sh"
-env:
-  global:
-  - secure: EEcwLo3rIHqaV46h/AOMGafxqaZcy4i9WA8RlFO53wj23QJGmeUdYa2ka4IC2c+J+iNFYu1+dRkR52G6S6tY3LnsDmZGHj9xT9n7tPr/h/OmMXhdtNy3Nl5AWQORMZhqGCXwMxRZUyhWp6CjtY1LeGaVenwf1A3PiLEQmEJw9nY=
-  - secure: ZxjZEeu4LhPI/e3MWpvngp34/POm2LLz3bpHn0+tgr7rfo8FLet2iVX0AfYPXKcPVTCeYjUn+Do2NQcWVgIhBxZAKDl/wzDzLiCdaxVepmYrf5hKuhbPJDKT6Pb3IfHnXOJAZRqMTr762x6lkJUUNIpuKLiKyA5lpDNK3HkFnug=
-  - secure: iQrTUqRtq/49XDY4c8S9AKG0ObO3Dy55NuwC7/iP9+KJw9DUz5tZtKKH08Kswfk0GZ9z1bkLbJ8hBf1Kr99hPAY4l+1b6zcshazZKRYdmFndrpnFSkOVXzy7erhR9bw4AFtGuK94jR4h9Bz1JYnpg+vMOmPNxMTixneiukCZHgM=
-  - secure: wANXSFrYfizk6WXC/niyZ+7aZT8YalRy7WNYcmcIfCLR02hzc6krbFGCs3VAAqgk1qTU6yriEMtSyr/lHEWeVYYTNg9yO55i4cVHI//qUvsBRmDkOBWAwaqq0GjOWG7zlUC3TUHXNnZRxe8B5yQE3Zj6xXfsF9agKIAMq7manGA=
-  - secure: fPB4s8zVRnYNSSqk0UjHovlWO2/b87he2LREHSev35ns8n1HjohqW2F0odxEFfJEyKcL+788o7nODt40zSthmJi51LOMFis4zHaf14bwZYxPL9EukhE5TtNjN5MCQWtsaFXRYHqYkFXNPZ5i5JPMiVQtYKG9b4Jte1b/GzaKGKQ=
-  - secure: ruqqXqeD1tqoHo9vHufLreesZTFGLAaveFJKx85Q7ils+4tckCmGqRHnMENf10o/wnbDsQ40BjPK8A6SHIPpV28Ad/ufvhbrvA+Mga8HOKDU51RWcStVlRnjqvLOppCy5qHpyFXu/HCLKNvwxKvlizdyQKF8cJZgxoTcDfuRQuk=
-  - secure: V9CuWIJ3CMWQkzT42DqDqTgq/e2kryClOMaEnPY8LWKqzfySuIS0Lh4hhmH4yzPJxUo9S9oN8sprQf64fmWlnDd5O4ei9T1PvhPRWYQxtR0ueT0GscMi098LoC2mWZB1nDGOzym8arCOK95wGBrkE9fAJZ6akDAEKGky6QQnutE=
-  - secure: VAuXuJ7kL4Qaq1OFi/G4iy1Zqpx1sWhXD+EFCyun2oz8BA/t7Yl7GYEvb6u/rfnXe5qrZd2zzE24BC2ni8f38Dr7m9s65uFLHWbVspl8tU+GnI3dXQS4YfFZaFbEXzWuOGsMgI0KtwGk4bEWjHGaHlsuM0ektPaUGAy5YDXP6Ds=
-  - secure: HMGLp7nNfozWD4iepBlHouuepYiZMYT/GCVJS835W969F7cXZdaA+zLhPi/j3syVYF3WeJqN9HLOw3ULPYGl9GCMP+QsCU7bcgchkOLoNpyideagloTx43r/8TYUIUuRzMCB4Vg9Leis+KsUDJlgiObZ35Kbp4n05BdOXXlTivs=
-  - secure: RkkuC+/yOzpkShr7Aj/IGZb2k8DVgBjvjuVlKQt5+PnfBHFOb3xUM67lxIZluxRIudpnHYiwWZfb1FNrDJ4pSQUb2Ev37hJDZZC06jhZR8uGrAve0Tfn9UPSdcYVz7nXGNe9jU4poRUreO7JShxWd0EMHl+MYf6InsR+8ZpqP64=
-  - secure: KTGOjTkS/dfI9hP9LeoP1fGHKcG43CL8e9ZXZYftST9hgYBJTXH58rZI6Z67/zuxygrk25tgOajuGnkVYL2ChelbQ9qlEb6TGuaZo4OOaoagiT5QGJN+5tucQwpYe39iTs9wcqtnBTyMxElxCEzY9lmHgldzccnU41oxHEAybS4=
-  - secure: X8TFKaiN2DfMvvtnIK+/1zpu9uvc40VwL4sCHduQHpRW5owjG9HX35oRa7Ot69/VFM4cO/DP+6fA0dei0OujEWqtCRn7vwMnEl7cviujs+6vYsG5RLkt6nupvUwPZNPmwZHKAChu7i9mmOnmfcRDLP3Zc6Kwijs0GwDGTEXAqsk=
-  - secure: T2nXGt7DPUomi2j6ctC51O8use8dXZXYrGq6yaNopSgGZOg1Qgm93oKkbKhgTzq/1/DH6tY3eOlYjx/0G+F9h1dG1i9ufjZC3dmi0xVQ5t441lqFzhBP2qOdCQ0U/BQGux10/TIPLiJ5rhARoqUUNCYxIFQ2F9EDM2bod65KA78=
-  - secure: L8BgolosqoP2Sp7oSaOh17MRtNo3s4WN2IV8000Ofk3BRX/fp1WFDtoxX3/2A2YKxq59rdD1OPQub01QzltR3vA/DP4s/9ITNJB/iSbDGPloVJz7EwuVRkm3nlgX8KroEIPepZc55AMfq0e61+JFu7hriyLS0IuO3fVe2j50eGo=
-after_success:
-- ".travis/publish-results.sh"
+- echo sonatypeUsername=none >> gradle.properties
+- echo sonatypePassword=none >> gradle.properties
+
+#after_success:
+#- ".travis/publish-results.sh"
+
+#deploy:
+ # api_key:
+#    secure: CJWhv76T55re6sEhYblukVcOKhr1nP9zZ6bAdvp3nbcjRNcBh5shMj/fq/JaqKos90cTDpTwBn3rnbAtrX24TLU0KX//CzRkzjmYsl3e71Rb5v9MDiOFdw/iZTNZXBRED7fZy6eGqTboWHN0BGAPHBrsypRo8zVdFTuYDMRgsi0=
diff --git a/build.gradle b/build.gradle
index 4c678119..877f9c86 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,24 +39,16 @@ repositories {
   maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
 }
 
-configurations.all {
-  resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-    if (details.requested.name == 'saxon' && details.requested.version == '8.7') {
-      details.useTarget "net.sf.saxon:Saxon-HE:" + saxonVersion
-    }
-  }
-}
-
 configurations {
   pluginApi
 }
 
 dependencies {
-  compile fileTree(dir: 'delta').include("*.jar")
+  compile fileTree(dir: 'lib').include("*.jar")
   compile (
     [group: 'net.sf.saxon', name: 'Saxon-HE', version: saxonVersion],
     [group: 'com.xmlcalabash', name: 'xmlcalabash', version: '1.1.8-96'],
-    [group: 'com.xmlcalabash', name: 'xmlcalabash1-deltaxml', version: '1.1.4'],
+    //[group: 'com.xmlcalabash', name: 'xmlcalabash1-deltaxml', version: '1.1.4'],
     [group: 'com.xmlcalabash', name: 'xmlcalabash1-print', version: '1.1.4'],
     [group: 'com.thaiopensource', name: 'jing', version: '20091111', transitive: false],
     [group: 'org.docbook', name: 'docbook-xsl-java-saxon', version: '1.2.1-95'],
@@ -122,8 +114,7 @@ task runtests(type: JavaExec) {
   FileCollection source = fileTree(dir: testsRoot + "/src/")
   FileCollection style  = fileTree(dir: "xslt/")
 
-  inputs.file style + source
-  //outputs.file result
+  inputs.files style + source
 
   main = 'com.xmlcalabash.drivers.Main'
   maxHeapSize = '1024m'
@@ -230,9 +221,9 @@ gentext.onlyIf {
 task makeFoParams(type: JavaExec) {
   classpath = configurations.runtime
 
-  inputs.file  fileTree(dir: "tools/").include("mkparam.xsl")
-  inputs.file  fileTree(dir: "xslt/params/")
-  inputs.file  fileTree(dir: "xslt/base/fo/").include("param.xml")
+  inputs.file  "tools/mkparam.xsl"
+  inputs.files fileTree(dir: "xslt/params/")
+  inputs.files fileTree(dir: "xslt/base/fo/").include("param.xml")
   outputs.file "xslt/base/fo/param.xsl"
 
   main = 'net.sf.saxon.Transform'
@@ -244,9 +235,9 @@ task makeFoParams(type: JavaExec) {
 task makeHtmlParams(type: JavaExec) {
   classpath = configurations.runtime
 
-  inputs.file  fileTree(dir: "tools/").include("mkparam.xsl")
-  inputs.file  fileTree(dir: "xslt/params/")
-  inputs.file  fileTree(dir: "xslt/base/html/").include("param.xml")
+  inputs.file "tools/mkparam.xsl"
+  inputs.files fileTree(dir: "xslt/params/")
+  inputs.files fileTree(dir: "xslt/base/html/").include("param.xml")
   outputs.file "xslt/base/html/param.xsl"
 
   main = 'net.sf.saxon.Transform'
@@ -405,16 +396,18 @@ task dist(dependsOn: [updateDist, zipJar], type: JavaExec) {
       )
 }
 
-task clean.doFirst {
-  delete "gentext/build/"
-  delete "src/main/resources/xslt"
-  delete "xslt/base/common/locales/"
-  delete "xslt/base/fo/param.xsl"
-  delete "xslt/base/html/param.xsl"
-  delete "build/"
-  delete "test/diff"
-  delete "test/actual"
-  delete "test/result"
+clean {
+  doFirst {
+    delete "gentext/build/"
+    delete "src/main/resources/xslt"
+    delete "xslt/base/common/locales/"
+    delete "xslt/base/fo/param.xsl"
+    delete "xslt/base/html/param.xsl"
+    delete "build/"
+    delete "test/diff"
+    delete "test/actual"
+    delete "test/result"
+  }
 }
 
 /*
diff --git a/gentext/src/en.xml b/gentext/src/en.xml
index 44013880..ba4921c0 100644
--- a/gentext/src/en.xml
+++ b/gentext/src/en.xml
@@ -505,6 +505,7 @@
 <template name="procedure"><Procedure/>&#160;%n, <startquote/>%t<endquote/></template>
 <template name="productionset"><ProductionSet/>&#160;%n, <startquote/>%t<endquote/></template>
 <template name="qandadiv"><Qandadiv/>&#160;%n, <startquote/>%t<endquote/></template>
+<template name="question"><Question/>&#160;%n</template>
 <template name="refsect1"><sectioncalled/> <startquote/>%t<endquote/></template>
 <template name="refsect2"><sectioncalled/> <startquote/>%t<endquote/></template>
 <template name="refsect3"><sectioncalled/> <startquote/>%t<endquote/></template>
diff --git a/gradle.properties b/gradle.properties
index 0d14f9d2..f53d6296 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.0.22
+version=2.1.0
 snapshot=
 builtBy=Norman Walsh
 baseline=0
diff --git a/tools/mkparam.xsl b/tools/mkparam.xsl
index 5fa79c59..eb0df521 100644
--- a/tools/mkparam.xsl
+++ b/tools/mkparam.xsl
@@ -16,6 +16,8 @@
     <xsl:namespace name="xsl" select="'http://www.w3.org/1999/XSL/Transform'"/>
     <xsl:namespace name="db" select="'http://docbook.org/ns/docbook'"/>
     <xsl:namespace name="f" select="'http://docbook.org/xslt/ns/extension'"/>
+    <xsl:namespace name="xs" select="'http://www.w3.org/2001/XMLSchema'"/>
+    <xsl:attribute name="exclude-result-prefixes" select="'db f xs'"/>
     <xsl:apply-templates select="//db:refentry">
       <xsl:sort select="@xml:id"/>
     </xsl:apply-templates>
diff --git a/xslt/base/common/common.xsl b/xslt/base/common/common.xsl
index bf3d8c1f..43b2a5f4 100644
--- a/xslt/base/common/common.xsl
+++ b/xslt/base/common/common.xsl
@@ -293,7 +293,7 @@ template.</para>
     <xsl:apply-templates select="($node/db:firstname|$node/db:givenname)[1]"/>
   </xsl:if>
 
-  <xsl:if test="$node/db:othername and $author.othername.in.middle != 0">
+  <xsl:if test="$node/db:othername and $author.othername.in.middle">
     <xsl:if test="$node/db:honorific or $node/db:firstname or $node/db:givenname">
       <xsl:text> </xsl:text>
     </xsl:if>
@@ -302,7 +302,7 @@ template.</para>
 
   <xsl:if test="$node/db:surname">
     <xsl:if test="$node/db:honorific or $node/db:firstname or $node/db:givenname
-                  or ($node/db:othername and $author.othername.in.middle != 0)">
+                  or ($node/db:othername and $author.othername.in.middle)">
       <xsl:text> </xsl:text>
     </xsl:if>
     <xsl:apply-templates select="$node/db:surname[1]"/>
@@ -542,7 +542,7 @@ year range is <quote>1991-1992</quote> but discretely it's
   -->
 
   <xsl:choose>
-    <xsl:when test="$print.ranges = 0 and exists($years)">
+    <xsl:when test="not($print.ranges) and exists($years)">
       <xsl:choose>
         <xsl:when test="count($years) = 1">
           <xsl:apply-templates select="$years[1]" mode="titlepage.mode"/>
diff --git a/xslt/base/common/dbfunctions.xsl b/xslt/base/common/dbfunctions.xsl
index fd1865c7..354aa205 100644
--- a/xslt/base/common/dbfunctions.xsl
+++ b/xslt/base/common/dbfunctions.xsl
@@ -149,7 +149,7 @@ context node.</para>
   <xsl:param name="node"/>
 
   <xsl:choose>
-    <xsl:when test="$bibliography.numbered != 0">
+    <xsl:when test="$bibliography.numbered">
       <xsl:apply-templates select="$node" mode="mp:biblioentry-label-count"/>
     </xsl:when>
     <xsl:when test="node-name($node/child::*[1]) = xs:QName('db:abbrev')">
@@ -1078,7 +1078,7 @@ node does not have an ID, the XSLT
     <xsl:when test="$node/@id">
       <xsl:value-of select="$node/@id"/>
     </xsl:when>
-    <xsl:when test="$persistent.generated.ids != 0">
+    <xsl:when test="$persistent.generated.ids">
       <xsl:variable name="xpid" select="f:xptr-id($node)"/>
       <xsl:choose>
 	<!-- FIXME: what if $node/key('id', $xpid)? I can't test that because
diff --git a/xslt/base/common/gentext.xsl b/xslt/base/common/gentext.xsl
index 254b2ffe..fbee701e 100644
--- a/xslt/base/common/gentext.xsl
+++ b/xslt/base/common/gentext.xsl
@@ -94,7 +94,7 @@ that should be used to generate its title.</para>
 
 <xsl:template match="db:procedure" mode="m:object-title-template">
   <xsl:choose>
-    <xsl:when test="$formal.procedures != 0 and title">
+    <xsl:when test="$formal.procedures and title">
       <xsl:call-template name="gentext-template">
         <xsl:with-param name="context" select="'title'"/>
 	<xsl:with-param name="name"
@@ -176,13 +176,13 @@ that should be used to generate a cross-reference to it.</para>
 
   <xsl:variable name="context">
     <xsl:choose>
-      <xsl:when test="$autonumber != 0 
-                      and $number-and-title-template != 0
-                      and $xref.with.number.and.title != 0">
+      <xsl:when test="$autonumber
+                      and $number-and-title-template
+                      and $xref.with.number.and.title">
          <xsl:value-of select="'xref-number-and-title'"/>
       </xsl:when>
-      <xsl:when test="$autonumber != 0 
-                      and $number-template != 0">
+      <xsl:when test="$autonumber
+                      and $number-template">
          <xsl:value-of select="'xref-number'"/>
       </xsl:when>
       <xsl:otherwise>
@@ -837,7 +837,7 @@ defaults to the language of the context node.</para>
 
   <xsl:variable name="pagetype">
     <xsl:choose>
-      <xsl:when test="$olink.insert.page.number = 0
+      <xsl:when test="not($olink.insert.page.number)
                       and local-name($referrer) = 'olink'">
         <!-- suppress page numbers -->
       </xsl:when>
@@ -865,7 +865,7 @@ defaults to the language of the context node.</para>
 
   <xsl:variable name="docnametype">
     <xsl:choose>
-      <xsl:when test="$olink.doctitle = 0
+      <xsl:when test="not($olink.doctitle)
                       and local-name($referrer) = 'olink'">
         <!-- suppress docname -->
       </xsl:when>
diff --git a/xslt/base/common/l10n.xsl b/xslt/base/common/l10n.xsl
index c35eb27c..4b4e2b26 100644
--- a/xslt/base/common/l10n.xsl
+++ b/xslt/base/common/l10n.xsl
@@ -104,7 +104,7 @@ target.</para>
         <xsl:value-of select="$l10n.gentext.language"/>
       </xsl:when>
 
-      <xsl:when test="$xref-context or $l10n.gentext.use.xref.language != 0">
+      <xsl:when test="$xref-context or $l10n.gentext.use.xref.language">
         <!-- can't do this one step: attributes are unordered! -->
         <xsl:variable name="lang-scope"
                       select="$target/ancestor-or-self::*
diff --git a/xslt/base/common/label-content.xsl b/xslt/base/common/label-content.xsl
index 640ec0a3..57d6334f 100644
--- a/xslt/base/common/label-content.xsl
+++ b/xslt/base/common/label-content.xsl
@@ -122,7 +122,7 @@ processed in this mode should generate their label.</para>
     </xsl:when>
 
     <xsl:when test="$label">
-      <xsl:if test="$component.label.includes.part.label != 0 and
+      <xsl:if test="$component.label.includes.part.label and
 		    ancestor::db:part">
 	<xsl:variable name="part.label">
           <xsl:apply-templates select="ancestor::db:part"
@@ -136,7 +136,7 @@ processed in this mode should generate their label.</para>
       </xsl:if>
 
       <xsl:choose>
-        <xsl:when test="$label.from.part != 0 and ancestor::db:part">
+        <xsl:when test="$label.from.part and ancestor::db:part">
 	  <xsl:number from="db:part" format="{$format}" level="any"/>
         </xsl:when>
 	<xsl:when test="ancestor::db:article">
@@ -210,7 +210,7 @@ processed in this mode should generate their label.</para>
       <xsl:apply-templates select=".." mode="m:intralabel-punctuation"/>
     </xsl:if>
 
-    <xsl:if test="$section.label.includes.component.label != 0
+    <xsl:if test="$section.label.includes.component.label
 		  and parent::* instance of element()
 		  and f:is-component(..)">
       <xsl:variable name="parent.label">
@@ -247,7 +247,7 @@ processed in this mode should generate their label.</para>
 
   <xsl:if test="@label or f:label-this-section(.)">
     <!-- if the parent is a component, maybe label that too -->
-    <xsl:if test="$section.label.includes.component.label != 0
+    <xsl:if test="$section.label.includes.component.label
 		  and f:is-component(..)">
       <xsl:variable name="parent.label">
 	<xsl:apply-templates select=".." mode="m:label-content"/>
@@ -408,7 +408,7 @@ processed in this mode should generate their label.</para>
       </xsl:if>
     </xsl:if>
 
-    <xsl:if test="$section.label.includes.component.label != 0
+    <xsl:if test="$section.label.includes.component.label
 		  and f:is-component(..)">
       <xsl:variable name="parent.label">
 	<xsl:apply-templates select=".." mode="m:label-content"/>
@@ -457,7 +457,7 @@ processed in this mode should generate their label.</para>
     </xsl:variable>
 
     <xsl:variable name="prefix">
-      <xsl:if test="$qanda.inherit.numeration != 0">
+      <xsl:if test="$qanda.inherit.numeration">
 	<xsl:if test="$lparent.prefix != ''">
 	  <xsl:copy-of select="$lparent.prefix"/>
 	  <xsl:apply-templates select="$lparent"
@@ -500,7 +500,7 @@ processed in this mode should generate their label.</para>
   </xsl:variable>
 
   <xsl:variable name="prefix">
-    <xsl:if test="$qanda.inherit.numeration != 0">
+    <xsl:if test="$qanda.inherit.numeration">
       <xsl:if test="$lparent.prefix != ''">
 	<xsl:copy-of select="$lparent.prefix"/>
 	<xsl:apply-templates select="$lparent" mode="m:intralabel-punctuation"/>
@@ -640,7 +640,7 @@ processed in this mode should generate their label.</para>
     <xsl:when test="@label">
       <xsl:value-of select="@label"/>
     </xsl:when>
-    <xsl:when test="self::db:procedure and $formal.procedures = 0">
+    <xsl:when test="self::db:procedure and not($formal.procedures)">
       <!-- No label -->
     </xsl:when>
     <xsl:otherwise>
diff --git a/xslt/base/common/olink.xsl b/xslt/base/common/olink.xsl
index 4786151e..7ee3a443 100644
--- a/xslt/base/common/olink.xsl
+++ b/xslt/base/common/olink.xsl
@@ -12,17 +12,17 @@
                 exclude-result-prefixes="db doc f fn m n t xlink xs"
                 version="2.0">
 
-<xsl:param name="olink.base.uri" select="''"/> 
+<xsl:param name="olink.base.uri" select="''"/>
 <xsl:param name="olink.debug" select="0"/>
 <xsl:param name="insert.olink.pdf.frag" select="0"/>
 <xsl:param name="prefer.internal.olink" select="0"/>
-<xsl:param name="olink.lang.fallback.sequence" select="''"/> 
+<xsl:param name="olink.lang.fallback.sequence" select="''"/>
 <xsl:param name="olink.fragid" select="'fragid='"/>
 <xsl:param name="olink.outline.ext" select="'.olink'"/>
 <xsl:param name="olink.pubid" select="'pubid='"/>
 <xsl:param name="olink.resolver" select="'/cgi-bin/olink'"/>
 <xsl:param name="olink.sysid" select="'sysid='"/>
-<xsl:param name="use.local.olink.style" select="0"/> 
+<xsl:param name="use.local.olink.style" select="0"/>
 <xsl:param name="target.database.document" select="''"/>
 <xsl:param name="targets.filename" select="'target.db'"/>
 <xsl:param name="current.docid" select="''"/>
@@ -40,10 +40,10 @@
   <xsl:param name="olink.lang" select="''"/>
 
   <!-- This selection can be customized if needed -->
-  <xsl:variable name="target.database.filename" 
+  <xsl:variable name="target.database.filename"
       select="$target.database.document"/>
 
-  <xsl:variable name="target.database" 
+  <xsl:variable name="target.database"
       select="document($target.database.filename,/)"/>
 
   <xsl:choose>
@@ -84,7 +84,7 @@
         <xsl:with-param name="olink.lang" select="$olink.lang"/>
       </xsl:call-template>
     </xsl:variable>
-  
+
     <!-- Recurse through the languages until you find a match -->
     <xsl:call-template name="t:select-olink-key-in-lang">
       <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/>
@@ -106,7 +106,7 @@
   <xsl:param name="target.database"/>
   <xsl:param name="fallback.index" select="1"/>
   <xsl:param name="olink.fallback.sequence" select="''"/>
-  
+
   <xsl:variable name="target.lang">
     <xsl:call-template name="t:select-target-lang">
       <xsl:with-param name="fallback.index" select="$fallback.index"/>
@@ -115,7 +115,7 @@
     </xsl:call-template>
   </xsl:variable>
 
-  <xsl:if test="$olink.debug != 0">
+  <xsl:if test="$olink.debug">
     <xsl:message><xsl:text>Olink debug: cases for targetdoc='</xsl:text>
       <xsl:value-of select="$targetdoc.att"/>
       <xsl:text>' and targetptr='</xsl:text>
@@ -134,18 +134,18 @@
     <xsl:if test="$targetdoc.att != '' and
                   $targetptr.att != ''">
       <xsl:for-each select="$target.database">
-        <xsl:variable name="key" 
-                      select="concat($targetdoc.att, '/', 
+        <xsl:variable name="key"
+                      select="concat($targetdoc.att, '/',
                                      $targetptr.att, '/',
                                      $target.lang)"/>
         <xsl:choose>
           <xsl:when test="key('targetptr-key', $key)/@href != ''">
             <xsl:value-of select="$key"/>
-            <xsl:if test="$olink.debug != 0">
+            <xsl:if test="$olink.debug">
               <xsl:message>Olink debug: CaseA matched.</xsl:message>
             </xsl:if>
           </xsl:when>
-          <xsl:when test="$olink.debug != 0">
+          <xsl:when test="$olink.debug">
             <xsl:message>Olink debug: CaseA NOT matched</xsl:message>
           </xsl:when>
         </xsl:choose>
@@ -157,25 +157,25 @@
     <!-- targetdoc.att = not blank
          targetptr.att = not blank
          prefer.internal.olink = not zero
-         current.docid = not blank 
+         current.docid = not blank
     -->
     <xsl:if test="$targetdoc.att != '' and
                   $targetptr.att != '' and
                   $current.docid != '' and
-                  $prefer.internal.olink != 0">
+                  $prefer.internal.olink">
       <xsl:for-each select="$target.database">
-        <xsl:variable name="key" 
-                      select="concat($current.docid, '/', 
+        <xsl:variable name="key"
+                      select="concat($current.docid, '/',
                                      $targetptr.att, '/',
                                      $target.lang)"/>
         <xsl:choose>
           <xsl:when test="key('targetptr-key', $key)/@href != ''">
             <xsl:value-of select="$key"/>
-            <xsl:if test="$olink.debug != 0">
+            <xsl:if test="$olink.debug">
               <xsl:message>Olink debug: CaseB matched.</xsl:message>
             </xsl:if>
           </xsl:when>
-          <xsl:when test="$olink.debug != 0">
+          <xsl:when test="$olink.debug">
             <xsl:message>Olink debug: CaseB NOT matched</xsl:message>
           </xsl:when>
         </xsl:choose>
@@ -186,25 +186,25 @@
   <xsl:variable name="CaseC">
     <!-- targetdoc.att = blank
          targetptr.att = not blank
-         current.docid = not blank 
+         current.docid = not blank
     -->
     <xsl:if test="string-length($targetdoc.att) = 0 and
                   $targetptr.att != '' and
                   $current.docid != ''">
       <!-- Must use a for-each to change context for keys to work -->
       <xsl:for-each select="$target.database">
-        <xsl:variable name="key" 
-                      select="concat($current.docid, '/', 
+        <xsl:variable name="key"
+                      select="concat($current.docid, '/',
                                      $targetptr.att, '/',
                                      $target.lang)"/>
         <xsl:choose>
           <xsl:when test="key('targetptr-key', $key)/@href != ''">
             <xsl:value-of select="$key"/>
-            <xsl:if test="$olink.debug != 0">
+            <xsl:if test="$olink.debug">
               <xsl:message>Olink debug: CaseC matched.</xsl:message>
             </xsl:if>
           </xsl:when>
-          <xsl:when test="$olink.debug != 0">
+          <xsl:when test="$olink.debug">
             <xsl:message>Olink debug: CaseC NOT matched.</xsl:message>
           </xsl:when>
         </xsl:choose>
@@ -215,7 +215,7 @@
   <xsl:variable name="CaseD">
     <!-- targetdoc.att = blank
          targetptr.att = not blank
-         current.docid = blank 
+         current.docid = blank
     -->
     <!-- This is possible if only one document in the database -->
     <xsl:if test="string-length($targetdoc.att) = 0 and
@@ -223,18 +223,18 @@
                   string-length($current.docid) = 0 and
                   count($target.database//document) = 1">
       <xsl:for-each select="$target.database">
-        <xsl:variable name="key" 
-                      select="concat(.//document/@targetdoc, '/', 
+        <xsl:variable name="key"
+                      select="concat(.//document/@targetdoc, '/',
                                      $targetptr.att, '/',
                                      $target.lang)"/>
         <xsl:choose>
           <xsl:when test="key('targetptr-key', $key)/@href != ''">
             <xsl:value-of select="$key"/>
-            <xsl:if test="$olink.debug != 0">
+            <xsl:if test="$olink.debug">
               <xsl:message>Olink debug: CaseD matched.</xsl:message>
             </xsl:if>
           </xsl:when>
-          <xsl:when test="$olink.debug != 0">
+          <xsl:when test="$olink.debug">
             <xsl:message>Olink debug: CaseD NOT matched</xsl:message>
           </xsl:when>
         </xsl:choose>
@@ -262,18 +262,18 @@
       </xsl:variable>
 
       <xsl:for-each select="$target.database">
-        <xsl:variable name="key" 
-                      select="concat($targetdoc.att, '/', 
+        <xsl:variable name="key"
+                      select="concat($targetdoc.att, '/',
                                      $rootid, '/',
                                      $target.lang)"/>
         <xsl:choose>
           <xsl:when test="key('targetptr-key', $key)/@href != ''">
             <xsl:value-of select="$key"/>
-            <xsl:if test="$olink.debug != 0">
+            <xsl:if test="$olink.debug">
               <xsl:message>Olink debug: CaseE matched.</xsl:message>
             </xsl:if>
           </xsl:when>
-          <xsl:when test="$olink.debug != 0">
+          <xsl:when test="$olink.debug">
             <xsl:message>Olink debug: CaseE NOT matched.</xsl:message>
           </xsl:when>
         </xsl:choose>
@@ -285,12 +285,12 @@
     <!-- targetdoc.att = not blank
          targetptr.att = blank
          prefer.internal.olink = not zero
-         current.docid = not blank 
+         current.docid = not blank
     -->
     <xsl:if test="$targetdoc.att != '' and
                   string-length($targetptr.att) = 0 and
                   $current.docid != '' and
-                  $prefer.internal.olink != 0">
+                  $prefer.internal.olink">
       <!-- Try the document's root element id -->
       <xsl:variable name="rootid">
         <xsl:choose>
@@ -304,18 +304,18 @@
       </xsl:variable>
 
       <xsl:for-each select="$target.database">
-        <xsl:variable name="key" 
-                      select="concat($current.docid, '/', 
+        <xsl:variable name="key"
+                      select="concat($current.docid, '/',
                                      $rootid, '/',
                                      $target.lang)"/>
         <xsl:choose>
           <xsl:when test="key('targetptr-key', $key)/@href != ''">
             <xsl:value-of select="$key"/>
-            <xsl:if test="$olink.debug != 0">
+            <xsl:if test="$olink.debug">
               <xsl:message>Olink debug: CaseF matched.</xsl:message>
             </xsl:if>
           </xsl:when>
-          <xsl:when test="$olink.debug != 0">
+          <xsl:when test="$olink.debug">
             <xsl:message>Olink debug: CaseF NOT matched.</xsl:message>
           </xsl:when>
         </xsl:choose>
@@ -328,7 +328,7 @@
     <xsl:choose>
       <xsl:when test="$CaseB != ''">
         <xsl:value-of select="$CaseB"/>
-        <xsl:if test="$olink.debug != 0">
+        <xsl:if test="$olink.debug">
           <xsl:message>
             <xsl:text>Olink debug: CaseB key is the final selection: </xsl:text>
             <xsl:value-of select="$CaseB"/>
@@ -337,7 +337,7 @@
       </xsl:when>
       <xsl:when test="$CaseA != ''">
         <xsl:value-of select="$CaseA"/>
-        <xsl:if test="$olink.debug != 0">
+        <xsl:if test="$olink.debug">
           <xsl:message>
             <xsl:text>Olink debug: CaseA key is the final selection: </xsl:text>
             <xsl:value-of select="$CaseA"/>
@@ -346,7 +346,7 @@
       </xsl:when>
       <xsl:when test="$CaseC != ''">
         <xsl:value-of select="$CaseC"/>
-        <xsl:if test="$olink.debug != 0">
+        <xsl:if test="$olink.debug">
           <xsl:message>
             <xsl:text>Olink debug: CaseC key is the final selection: </xsl:text>
             <xsl:value-of select="$CaseC"/>
@@ -355,7 +355,7 @@
       </xsl:when>
       <xsl:when test="$CaseD != ''">
         <xsl:value-of select="$CaseD"/>
-        <xsl:if test="$olink.debug != 0">
+        <xsl:if test="$olink.debug">
           <xsl:message>
             <xsl:text>Olink debug: CaseD key is the final selection: </xsl:text>
             <xsl:value-of select="$CaseD"/>
@@ -364,7 +364,7 @@
       </xsl:when>
       <xsl:when test="$CaseF != ''">
         <xsl:value-of select="$CaseF"/>
-        <xsl:if test="$olink.debug != 0">
+        <xsl:if test="$olink.debug">
           <xsl:message>
             <xsl:text>Olink debug: CaseF key is the final selection: </xsl:text>
             <xsl:value-of select="$CaseF"/>
@@ -373,7 +373,7 @@
       </xsl:when>
       <xsl:when test="$CaseE != ''">
         <xsl:value-of select="$CaseE"/>
-        <xsl:if test="$olink.debug != 0">
+        <xsl:if test="$olink.debug">
           <xsl:message>
             <xsl:text>Olink debug: CaseE key is the final selection: </xsl:text>
             <xsl:value-of select="$CaseE"/>
@@ -381,7 +381,7 @@
         </xsl:if>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:if test="$olink.debug != 0">
+        <xsl:if test="$olink.debug">
           <xsl:message>
             <xsl:text>Olink debug: No case matched for lang '</xsl:text>
             <xsl:value-of select="$target.lang"/>
@@ -396,7 +396,7 @@
     <xsl:when test="$selected.key != ''">
       <xsl:value-of select="$selected.key"/>
     </xsl:when>
-    <xsl:when test="string-length($selected.key) = 0 and 
+    <xsl:when test="string-length($selected.key) = 0 and
                     string-length($target.lang) = 0">
       <!-- No match on last try, and we are done -->
     </xsl:when>
@@ -420,9 +420,9 @@
   <xsl:param name="olink.fallback.sequence" select="''"/>
 
   <!-- recurse backwards to find the lang matching the index -->
-  <xsl:variable name="firstlang" 
+  <xsl:variable name="firstlang"
                 select="substring-before($olink.fallback.sequence, ' ')"/>
-  <xsl:variable name="rest" 
+  <xsl:variable name="rest"
                 select="substring-after($olink.fallback.sequence, ' ')"/>
   <xsl:choose>
     <xsl:when test="$fallback.index = 1">
@@ -444,7 +444,7 @@
   <xsl:param name="olink.lang" select="''"/>
 
   <!-- Prefer language of the olink element -->
-  <xsl:value-of select="concat(normalize-space(concat($olink.lang, ' ', 
+  <xsl:value-of select="concat(normalize-space(concat($olink.lang, ' ',
                         $olink.lang.fallback.sequence)), ' ')"/>
 </xsl:template>
 
@@ -459,11 +459,11 @@
         <xsl:value-of select="key('targetptr-key', $olink.key)/@href" />
       </xsl:for-each>
     </xsl:variable>
-  
+
     <xsl:variable name="targetdoc">
       <xsl:value-of select="substring-before($olink.key, '/')"/>
     </xsl:variable>
-  
+
     <!-- Does the target database use a sitemap? -->
     <xsl:variable name="use.sitemap">
       <xsl:choose>
@@ -471,7 +471,7 @@
         <xsl:otherwise>0</xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-  
+
     <!-- Get the baseuri for this targetptr -->
     <xsl:variable name="baseuri" >
       <xsl:choose>
@@ -491,7 +491,7 @@
                 <xsl:when test="$currentdoc.key != ''">
                   <xsl:for-each select="$target.database" >
                     <xsl:call-template name="t:targetpath" >
-                      <xsl:with-param name="dirnode" 
+                      <xsl:with-param name="dirnode"
                           select="key('targetdoc-key', $current.docid)/parent::dir"/>
                       <xsl:with-param name="targetdoc" select="$targetdoc"/>
                     </xsl:call-template>
@@ -513,7 +513,7 @@
                 <xsl:text>sitemap path without $current.docid parameter</xsl:text>
               </xsl:message>
             </xsl:otherwise>
-          </xsl:choose> 
+          </xsl:choose>
           <!-- In either case, add baseuri from its document entry-->
           <xsl:variable name="docbaseuri">
             <xsl:for-each select="$target.database" >
@@ -538,7 +538,7 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-  
+
     <!-- Form the href information -->
     <xsl:if test="$baseuri != ''">
       <xsl:value-of select="$baseuri"/>
@@ -591,7 +591,7 @@
       <xsl:variable name="lang">
         <xsl:variable name="candidate">
           <xsl:for-each select="$target.database" >
-            <xsl:value-of 
+            <xsl:value-of
                       select="key('targetptr-key', $olink.key)/@lang" />
           </xsl:for-each>
         </xsl:variable>
@@ -615,11 +615,11 @@
                         (contains($xrefstyle, 'nodocname') or
                         contains($xrefstyle, 'nopage')) and
                         not(contains($xrefstyle, 'title')) and
-                        not(contains($xrefstyle, 'label'))"> 
+                        not(contains($xrefstyle, 'label'))">
           <xsl:value-of select="$xref.text"/>
         </xsl:when>
         <xsl:when test="$xrefstyle != ''">
-          <xsl:if test="$olink.debug != 0">
+          <xsl:if test="$olink.debug">
             <xsl:message>
               <xsl:text>xrefstyle is '</xsl:text>
               <xsl:value-of select="$xrefstyle"/>
@@ -683,7 +683,7 @@
 
                 <xsl:variable name="xref-number-and-title-context">
                   <xsl:call-template name="gentext-template">
-                    <xsl:with-param name="context" 
+                    <xsl:with-param name="context"
                                     select="'xref-number-and-title'"/>
                     <xsl:with-param name="name" select="$target.elem"/>
                     <xsl:with-param name="lang" select="$lang"/>
@@ -692,7 +692,7 @@
 
                 <xsl:variable name="styled-xref-number-and-title-context">
                   <xsl:call-template name="gentext-template">
-                    <xsl:with-param name="context" 
+                    <xsl:with-param name="context"
                                     select="'xref-number-and-title'"/>
                     <xsl:with-param name="name" select="$target.elem"/>
                     <xsl:with-param name="lang" select="$lang"/>
@@ -701,14 +701,14 @@
                 </xsl:variable>
 
                 <xsl:choose>
-                  <xsl:when test="$xref-number-and-title-context != 
+                  <xsl:when test="$xref-number-and-title-context !=
                                  $styled-xref-number-and-title-context and
                                  $xref.number != '' and
-                                 $xref.with.number.and.title != 0">
-                    <xsl:value-of 
+                                 $xref.with.number.and.title">
+                    <xsl:value-of
                             select="$styled-xref-number-and-title-context"/>
                   </xsl:when>
-                  <xsl:when test="$xref-number-context != 
+                  <xsl:when test="$xref-number-context !=
                                  $styled-xref-number-context and
                                  $xref.number != ''">
                     <xsl:value-of select="$styled-xref-number-context"/>
@@ -718,8 +718,8 @@
                   </xsl:when>
                   <xsl:when test="$xref-number-and-title-context != '' and
                                  $xref.number != '' and
-                                 $xref.with.number.and.title != 0">
-                    <xsl:value-of 
+                                 $xref.with.number.and.title">
+                    <xsl:value-of
                             select="$xref-number-and-title-context"/>
                     <xsl:if test="$olink.debug">
                       <xsl:message>
@@ -786,7 +786,7 @@
             </xsl:choose>
           </xsl:variable>
 
-          <xsl:if test="$olink.debug != 0">
+          <xsl:if test="$olink.debug">
             <xsl:message>
               <xsl:text>Olink debug: xrefstyle template is '</xsl:text>
               <xsl:value-of select="$template"/>
@@ -803,19 +803,19 @@
             </xsl:with-param>
             <xsl:with-param name="label">
               <xsl:for-each select="$target.database" >
-                <xsl:value-of 
+                <xsl:value-of
                         select="key('targetptr-key', $olink.key)/@number" />
               </xsl:for-each>
             </xsl:with-param>
             <xsl:with-param name="pagenumber">
               <xsl:for-each select="$target.database" >
-                <xsl:value-of 
+                <xsl:value-of
                         select="key('targetptr-key', $olink.key)/@page" />
               </xsl:for-each>
             </xsl:with-param>
             <xsl:with-param name="docname">
               <xsl:for-each select="$target.database" >
-                <xsl:value-of 
+                <xsl:value-of
                        select="key('targetdoc-key', $targetdoc)/div[1]/ttl" />
               </xsl:for-each>
             </xsl:with-param>
@@ -841,7 +841,7 @@
             </xsl:with-param>
             <xsl:with-param name="label">
               <xsl:for-each select="$target.database" >
-                <xsl:value-of 
+                <xsl:value-of
                           select="key('targetptr-key', $olink.key)/@number" />
               </xsl:for-each>
             </xsl:with-param>
@@ -890,7 +890,7 @@
   <xsl:param name="dirnode" />
   <xsl:param name="targetdoc" select="''"/>
 
-<!-- 
+<!--
 <xsl:message>dirnode is <xsl:value-of select="$dirnode/@name"/></xsl:message>
 <xsl:message>targetdoc is <xsl:value-of select="$targetdoc"/></xsl:message>
 -->
@@ -950,20 +950,20 @@
       </xsl:call-template>
     </xsl:when>
     <xsl:when test="not(starts-with(normalize-space($xrefstyle),
-                        'select:') 
+                        'select:')
                 and (contains($xrefstyle, 'page')
                      or contains($xrefstyle, 'Page')))
-                and $current.docid != '' 
+                and $current.docid != ''
                 and $current.docid != $targetdoc
                 and olink.insert.page.number = 1 ">
-  
+
       <xsl:variable name="page-number">
         <xsl:for-each select="$target.database" >
-          <xsl:value-of 
+          <xsl:value-of
                  select="key('targetptr-key', $olink.key)/@page" />
         </xsl:for-each>
       </xsl:variable>
-  
+
       <xsl:if test="$page-number != ''">
         <xsl:call-template name="substitute-markup">
           <xsl:with-param name="template">
@@ -976,7 +976,7 @@
           <xsl:with-param name="pagenumber" select="$page-number"/>
         </xsl:call-template>
       </xsl:if>
-  
+
     </xsl:when>
   </xsl:choose>
 </xsl:template>
@@ -989,7 +989,7 @@
 
   <xsl:variable name="page">
     <xsl:for-each select="$target.database" >
-      <xsl:value-of 
+      <xsl:value-of
              select="key('targetptr-key', $olink.key)/@page" />
     </xsl:for-each>
   </xsl:variable>
@@ -999,29 +999,29 @@
   </xsl:variable>
 
   <xsl:variable name="targetptr">
-    <xsl:value-of 
+    <xsl:value-of
           select="substring-before(substring-after($olink.key, '/'), '/')"/>
   </xsl:variable>
 
   <!-- Don't add docname if pointing to root element -->
   <xsl:variable name="rootptr">
     <xsl:for-each select="$target.database" >
-      <xsl:value-of 
+      <xsl:value-of
              select="key('targetdoc-key', $targetdoc)/div[1]/@targetptr" />
     </xsl:for-each>
   </xsl:variable>
 
   <xsl:variable name="docname">
     <xsl:for-each select="$target.database" >
-      <xsl:value-of 
+      <xsl:value-of
              select="key('targetdoc-key', $targetdoc)/div[1]/ttl" />
     </xsl:for-each>
   </xsl:variable>
 
-  <xsl:if test="not(starts-with(normalize-space($xrefstyle), 'select:') 
+  <xsl:if test="not(starts-with(normalize-space($xrefstyle), 'select:')
               and (contains($xrefstyle, 'docname')))
-              and ($olink.doctitle = 1)
-              and $current.docid != '' 
+              and $olink.doctitle
+              and $current.docid != ''
               and $rootptr != $targetptr
               and $current.docid != $targetdoc
               and $docname != ''">
@@ -1049,7 +1049,7 @@
   <xsl:if test="not(starts-with(normalize-space($xrefstyle),'select:')
                 and (contains($xrefstyle, 'page')
                      or contains($xrefstyle, 'Page')))
-                and ( $insert.xref.page.number = 'yes' 
+                and ( $insert.xref.page.number = 'yes'
                    or $insert.xref.page.number = '1')
                 or local-name($target) = 'para'">
     <xsl:apply-templates select="$target" mode="page.citation">
@@ -1059,4 +1059,3 @@
 </xsl:template>
 
 </xsl:stylesheet>
-
diff --git a/xslt/base/common/table.xsl b/xslt/base/common/table.xsl
index 32014261..bd097f81 100644
--- a/xslt/base/common/table.xsl
+++ b/xslt/base/common/table.xsl
@@ -208,7 +208,7 @@ on the <parameter>pixels.per.inch</parameter> parameter.</para>
   <xsl:param name="abspixels" select="0"/>
 
   <xsl:variable name="specify-widths"
-                select="$default.table.column.widths != 0 or exists($colgroup/h:col/@width)"/>
+                select="$default.table.column.widths or exists($colgroup/h:col/@width)"/>
 
   <xsl:variable name="parsedcols" as="element()*">
     <xsl:for-each select="$colgroup/*">
diff --git a/xslt/base/fo/admonitions.xsl b/xslt/base/fo/admonitions.xsl
old mode 100755
new mode 100644
diff --git a/xslt/base/fo/biblio.xsl b/xslt/base/fo/biblio.xsl
old mode 100755
new mode 100644
diff --git a/xslt/base/fo/blocks.xsl b/xslt/base/fo/blocks.xsl
old mode 100755
new mode 100644
diff --git a/xslt/base/fo/final-pass.xsl b/xslt/base/fo/final-pass.xsl
old mode 100755
new mode 100644
diff --git a/xslt/base/fo/footnotes.xsl b/xslt/base/fo/footnotes.xsl
old mode 100755
new mode 100644
diff --git a/xslt/base/fo/formal.xsl b/xslt/base/fo/formal.xsl
old mode 100755
new mode 100644
diff --git a/xslt/base/fo/index.xsl b/xslt/base/fo/index.xsl
old mode 100755
new mode 100644
diff --git a/xslt/base/fo/info.xsl b/xslt/base/fo/info.xsl
old mode 100755
new mode 100644
diff --git a/xslt/base/fo/inlines.xsl b/xslt/base/fo/inlines.xsl
old mode 100755
new mode 100644
diff --git a/xslt/base/fo/sections.xsl b/xslt/base/fo/sections.xsl
old mode 100755
new mode 100644
diff --git a/xslt/base/fo/table.xsl b/xslt/base/fo/table.xsl
old mode 100755
new mode 100644
diff --git a/xslt/base/fo/xref.xsl b/xslt/base/fo/xref.xsl
old mode 100755
new mode 100644
diff --git a/xslt/base/html/admonitions.xsl b/xslt/base/html/admonitions.xsl
index 9219ca86..f7bcaae5 100644
--- a/xslt/base/html/admonitions.xsl
+++ b/xslt/base/html/admonitions.xsl
@@ -86,7 +86,7 @@ the graphical form.</para>
 	  </td>
 	  <td>
 	    <xsl:if test="db:info/db:title[not(@ghost:title)
-			                   or $admonition.default.titles != 0]">
+			                   or $admonition.default.titles]">
 	      <div class="admon-title-text">
 		<xsl:call-template name="t:titlepage"/>
 	      </div>
diff --git a/xslt/base/html/autoidx.xsl b/xslt/base/html/autoidx.xsl
index adfcddae..602257fc 100644
--- a/xslt/base/html/autoidx.xsl
+++ b/xslt/base/html/autoidx.xsl
@@ -74,13 +74,13 @@
   <xsl:param name="scope" select="(ancestor::db:book|/)[last()]"/>
 
   <xsl:variable name="role">
-    <xsl:if test="$index.on.role != 0">
+    <xsl:if test="$index.on.role">
       <xsl:value-of select="@role"/>
     </xsl:if>
   </xsl:variable>
 
   <xsl:variable name="type">
-    <xsl:if test="$index.on.type != 0">
+    <xsl:if test="$index.on.type">
       <xsl:value-of select="@type"/>
     </xsl:if>
   </xsl:variable>
diff --git a/xslt/base/html/autotoc.xsl b/xslt/base/html/autotoc.xsl
index 0038e044..25c89f4d 100644
--- a/xslt/base/html/autotoc.xsl
+++ b/xslt/base/html/autotoc.xsl
@@ -241,7 +241,7 @@ division (book, part, etc.).</para>
 			    |db:article
 			    |db:bibliography|db:glossary|db:index
 			    |db:refentry
-			    |db:bridgehead[$bridgehead.in.toc != 0]"/>
+			    |db:bridgehead[$bridgehead.in.toc]"/>
 
   </xsl:call-template>
 </xsl:template>
@@ -284,9 +284,9 @@ component (chapter, article, etc.).</para>
 			    |db:article|db:bibliography|db:glossary
 			    |db:appendix|db:index
 			    |db:bridgehead[not(@renderas)
-			                   and $bridgehead.in.toc != 0]
+			                   and $bridgehead.in.toc]
 			    |.//db:bridgehead[@renderas='sect1'
-			                      and $bridgehead.in.toc != 0]"/>
+			                      and $bridgehead.in.toc]"/>
   </xsl:call-template>
 </xsl:template>
 
@@ -348,7 +348,7 @@ section.</para>
                     select="db:section
 			    |db:sect1|db:sect2|db:sect3|db:sect4|db:sect5
 			    |db:refentry
-			    |db:bridgehead[$bridgehead.in.toc != 0]"/>
+			    |db:bridgehead[$bridgehead.in.toc]"/>
 
   </xsl:call-template>
 </xsl:template>
@@ -558,7 +558,7 @@ Lists of Titles for a qandaset.</para>
                                          |db:article
                                          |db:bibliography|db:glossary|db:index
                                          |db:refentry
-                                         |db:bridgehead[$bridgehead.in.toc != 0]"/>
+                                         |db:bridgehead[$bridgehead.in.toc]"/>
   </xsl:call-template>
 </xsl:template>
 
@@ -566,7 +566,7 @@ Lists of Titles for a qandaset.</para>
   <xsl:param name="toc-context" select="."/>
 
   <!-- If the setindex tag is not empty, it should be it in the TOC -->
-  <xsl:if test="* or $generate.index != 0">
+  <xsl:if test="* or $generate.index">
     <xsl:call-template name="tp:subtoc">
       <xsl:with-param name="toc-context" select="$toc-context"/>
     </xsl:call-template>
@@ -581,7 +581,7 @@ Lists of Titles for a qandaset.</para>
     <xsl:with-param name="nodes" select="db:appendix|db:chapter|db:article
                                          |db:index|db:glossary|db:bibliography
                                          |db:preface|db:reference|db:refentry
-                                         |db:bridgehead[$bridgehead.in.toc != 0]"/>
+                                         |db:bridgehead[$bridgehead.in.toc]"/>
   </xsl:call-template>
 </xsl:template>
 
@@ -592,7 +592,7 @@ Lists of Titles for a qandaset.</para>
     <xsl:with-param name="toc-context" select="$toc-context"/>
     <xsl:with-param name="nodes" select="db:section|db:sect1|db:simplesect|db:refentry
                                          |db:glossary|db:bibliography|db:index
-                                         |db:bridgehead[$bridgehead.in.toc != 0]"/>
+                                         |db:bridgehead[$bridgehead.in.toc]"/>
   </xsl:call-template>
 </xsl:template>
 
@@ -601,7 +601,7 @@ Lists of Titles for a qandaset.</para>
   <xsl:call-template name="tp:subtoc">
     <xsl:with-param name="toc-context" select="$toc-context"/>
     <xsl:with-param name="nodes" select="db:sect2
-                                         |db:bridgehead[$bridgehead.in.toc != 0]"/>
+                                         |db:bridgehead[$bridgehead.in.toc]"/>
   </xsl:call-template>
 </xsl:template>
 
@@ -611,7 +611,7 @@ Lists of Titles for a qandaset.</para>
   <xsl:call-template name="tp:subtoc">
     <xsl:with-param name="toc-context" select="$toc-context"/>
     <xsl:with-param name="nodes" select="db:sect3
-                                         |db:bridgehead[$bridgehead.in.toc != 0]"/>
+                                         |db:bridgehead[$bridgehead.in.toc]"/>
   </xsl:call-template>
 </xsl:template>
 
@@ -621,7 +621,7 @@ Lists of Titles for a qandaset.</para>
   <xsl:call-template name="tp:subtoc">
     <xsl:with-param name="toc-context" select="$toc-context"/>
     <xsl:with-param name="nodes" select="db:sect4
-                                         |db:bridgehead[$bridgehead.in.toc != 0]"/>
+                                         |db:bridgehead[$bridgehead.in.toc]"/>
   </xsl:call-template>
 </xsl:template>
 
@@ -631,7 +631,7 @@ Lists of Titles for a qandaset.</para>
   <xsl:call-template name="tp:subtoc">
     <xsl:with-param name="toc-context" select="$toc-context"/>
     <xsl:with-param name="nodes" select="db:sect5
-                                         |db:bridgehead[$bridgehead.in.toc != 0]"/>
+                                         |db:bridgehead[$bridgehead.in.toc]"/>
   </xsl:call-template>
 </xsl:template>
 
@@ -649,14 +649,14 @@ Lists of Titles for a qandaset.</para>
   <xsl:call-template name="tp:subtoc">
     <xsl:with-param name="toc-context" select="$toc-context"/>
     <xsl:with-param name="nodes" select="db:section
-                                         |db:bridgehead[$bridgehead.in.toc != 0]"/>
+                                         |db:bridgehead[$bridgehead.in.toc]"/>
   </xsl:call-template>
 </xsl:template>
 
 <xsl:template match="db:bridgehead" mode="mp:toc">
   <xsl:param name="toc-context" select="."/>
 
-  <xsl:if test="$bridgehead.in.toc != 0">
+  <xsl:if test="$bridgehead.in.toc">
     <xsl:call-template name="tp:subtoc">
       <xsl:with-param name="toc-context" select="$toc-context"/>
     </xsl:call-template>
@@ -675,7 +675,7 @@ Lists of Titles for a qandaset.</para>
   <xsl:param name="toc-context" select="."/>
 
   <!-- If the index tag is not empty, it should be it in the TOC -->
-  <xsl:if test="* or $generate.index != 0">
+  <xsl:if test="* or $generate.index">
     <xsl:call-template name="tp:subtoc">
       <xsl:with-param name="toc-context" select="$toc-context"/>
     </xsl:call-template>
@@ -708,7 +708,7 @@ Lists of Titles for a qandaset.</para>
       </a>
     </span>
     <span class='refpurpose'>
-      <xsl:if test="$annotate.toc != 0">
+      <xsl:if test="$annotate.toc">
         <xsl:text> - </xsl:text>
         <xsl:value-of select="db:refnamediv/db:refpurpose"/>
       </xsl:if>
diff --git a/xslt/base/html/blocks.xsl b/xslt/base/html/blocks.xsl
index d4d9cf3f..cad3207c 100644
--- a/xslt/base/html/blocks.xsl
+++ b/xslt/base/html/blocks.xsl
@@ -90,7 +90,7 @@
 <!-- ==================================================================== -->
 
 <xsl:template match="db:remark">
-  <xsl:if test="$show.comments != 0">
+  <xsl:if test="$show.comments">
     <div>
       <xsl:sequence select="f:html-attributes(.)"/>
       <xsl:apply-templates/>
diff --git a/xslt/base/html/callouts.xsl b/xslt/base/html/callouts.xsl
index ac24565d..32521bc5 100644
--- a/xslt/base/html/callouts.xsl
+++ b/xslt/base/html/callouts.xsl
@@ -189,7 +189,7 @@
 
 	<xsl:when test="$target/self::db:areaset">
           <xsl:choose>
-            <xsl:when test="$syntax-highlighter = '0'">
+            <xsl:when test="not($syntax-highlighter)">
 	      <xsl:call-template name="t:callout-bug">
 	        <xsl:with-param name="conum"
                                 select="tokenize($target//db:area[1]/@coords, '\s+')[1]"/>
@@ -214,7 +214,7 @@
 
 	<xsl:when test="$target/self::db:area"> <!-- not imageobjectco -->
           <xsl:choose>
-            <xsl:when test="$syntax-highlighter = '0'">
+            <xsl:when test="not($syntax-highlighter)">
 	      <xsl:call-template name="t:callout-bug">
 	        <xsl:with-param name="conum"
 			        select="tokenize($target/@coords,'\s+')[1]"/>
diff --git a/xslt/base/html/graphics.xsl b/xslt/base/html/graphics.xsl
index 05cf2a48..9ff607fb 100644
--- a/xslt/base/html/graphics.xsl
+++ b/xslt/base/html/graphics.xsl
@@ -207,7 +207,7 @@ vertical alignment.</para>
 
   <xsl:variable name="width-units">
     <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0"></xsl:when>
+      <xsl:when test="$ignore.image.scaling"></xsl:when>
       <xsl:when test="@width">
         <xsl:value-of select="f:length-units(@width)"/>
       </xsl:when>
@@ -219,7 +219,7 @@ vertical alignment.</para>
 
   <xsl:variable name="width">
     <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0"></xsl:when>
+      <xsl:when test="$ignore.image.scaling"></xsl:when>
       <xsl:when test="@width">
         <xsl:choose>
           <xsl:when test="$width-units = '%'">
@@ -238,7 +238,7 @@ vertical alignment.</para>
 
   <xsl:variable name="scalefit">
     <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0">0</xsl:when>
+      <xsl:when test="$ignore.image.scaling">0</xsl:when>
       <xsl:when test="@contentwidth or @contentdepth">0</xsl:when>
       <xsl:when test="@scale">0</xsl:when>
       <xsl:when test="@scalefit"><xsl:value-of select="@scalefit"/></xsl:when>
@@ -249,7 +249,7 @@ vertical alignment.</para>
 
   <xsl:variable name="scale">
     <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0">1.0</xsl:when>
+      <xsl:when test="$ignore.image.scaling">1.0</xsl:when>
       <xsl:when test="@scale">
         <xsl:value-of select="@scale div 100.0"/>
       </xsl:when>
@@ -293,7 +293,7 @@ vertical alignment.</para>
 
   <xsl:variable name="contentwidth">
     <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0"></xsl:when>
+      <xsl:when test="$ignore.image.scaling"></xsl:when>
       <xsl:when test="@contentwidth">
         <xsl:variable name="units">
           <xsl:value-of select="f:length-units(@contentwidth)"/>
@@ -330,7 +330,7 @@ vertical alignment.</para>
 
   <xsl:variable name="html.width">
     <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0"></xsl:when>
+      <xsl:when test="$ignore.image.scaling"></xsl:when>
       <xsl:when test="$width-units = '%'">
         <xsl:value-of select="$width"/>
       </xsl:when>
@@ -345,7 +345,7 @@ vertical alignment.</para>
 
   <xsl:variable name="contentdepth">
     <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0"></xsl:when>
+      <xsl:when test="$ignore.image.scaling"></xsl:when>
       <xsl:when test="@contentdepth">
         <xsl:variable name="units" select="f:length-units(@contentdepth)"/>
 
@@ -403,7 +403,7 @@ vertical alignment.</para>
 
   <xsl:variable name="html.depth">
     <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0"></xsl:when>
+      <xsl:when test="$ignore.image.scaling"></xsl:when>
       <xsl:when test="$depth-units = '%'">
         <xsl:value-of select="$depth"/>
       </xsl:when>
@@ -417,11 +417,15 @@ vertical alignment.</para>
     </xsl:choose>
   </xsl:variable>
 
-  <xsl:variable name="viewport">
+  <xsl:variable name="viewport" as="xs:boolean">
     <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0">0</xsl:when>
+      <xsl:when test="$ignore.image.scaling">
+        <xsl:sequence select="false()"/>
+      </xsl:when>
       <xsl:when test="ancestor::db:inlinemediaobject
-                      or ancestor::db:inlineequation">0</xsl:when>
+                      or ancestor::db:inlineequation">
+        <xsl:sequence select="false()"/>
+      </xsl:when>
       <xsl:otherwise>
         <xsl:value-of select="$make.graphic.viewport"/>
       </xsl:otherwise>
@@ -492,7 +496,7 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
           <xsl:if test="@align and @align != 'center'">
             <xsl:attribute name="align" select="@align"/>
           </xsl:if>
-          <xsl:if test="$use.embed.for.svg != 0">
+          <xsl:if test="$use.embed.for.svg">
             <embed src="{$href}" type="image/svg+xml">
               <xsl:call-template name="t:process-image-attributes">
                 <xsl:with-param name="alt" select="$alt"/>
@@ -590,7 +594,7 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
              'background-color')"/>
 
   <xsl:variable name="use.viewport"
-                select="$viewport != 0
+                select="$viewport
                         and ($html.width != ''
                              or ($html.depth != '' and $depth-units != '%')
                              or $bgcolor != ''
@@ -754,7 +758,7 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
   <xsl:param name="scalefit"/>
   <xsl:param name="scaled.contentdepth"/>
   <xsl:param name="scaled.contentwidth"/>
-  <xsl:param name="viewport"/>
+  <xsl:param name="viewport" as="xs:boolean"/>
 
   <xsl:choose>
     <xsl:when test="@contentwidth or @contentdepth">
@@ -779,11 +783,11 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
       </xsl:attribute>
     </xsl:when>
 
-    <xsl:when test="$scalefit != 0">
+    <xsl:when test="$scalefit">
       <xsl:choose>
         <xsl:when test="contains($html.width, '%')">
           <xsl:choose>
-            <xsl:when test="$viewport != 0">
+            <xsl:when test="$viewport">
               <!-- The *viewport* will be scaled, so use 100% here! -->
               <xsl:attribute name="width">
                 <xsl:value-of select="'100%'"/>
@@ -847,7 +851,7 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
     </xsl:attribute>
   </xsl:if>
 
-  <xsl:if test="@align and $viewport = 0">
+  <xsl:if test="@align and $viewport">
     <xsl:attribute name="align">
       <xsl:choose>
         <xsl:when test="@align = 'center'">middle</xsl:when>
@@ -882,7 +886,7 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
     <xsl:otherwise>
       <div>
         <xsl:sequence select="f:html-attributes(., f:node-id(.), local-name(.), (@role,$center), @h:*)"/>
-        <xsl:if test="$html.longdesc != 0 and $html.longdesc.link != 0">
+        <xsl:if test="$html.longdesc and $html.longdesc.link">
           <xsl:call-template name="t:longdesc-link">
             <xsl:with-param name="textobject"
                             select="db:textobject[not(db:phrase)][1]"/>
@@ -1074,7 +1078,7 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
 <xsl:function name="f:longdesc-uri" as="xs:string?">
   <xsl:param name="node" as="element()?"/>
 
-  <xsl:if test="exists($node) and $html.longdesc != 0
+  <xsl:if test="exists($node) and $html.longdesc
                 and $node/db:textobject[not(db:phrase)]">
     <xsl:variable name="image-id" select="f:node-id($node)"/>
     <xsl:variable name="dbhtml.dir" select="f:dbhtml-dir($node)"/>
@@ -1112,7 +1116,7 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
 
   <xsl:variable name="filename" select="f:longdesc-uri($firsttext)"/>
 
-  <xsl:if test="$html.longdesc != 0
+  <xsl:if test="$html.longdesc
                 and $mediaobject/db:textobject[not(db:phrase)]
                 and $filename != ''">
 
diff --git a/xslt/base/html/html.xsl b/xslt/base/html/html.xsl
index 877366cc..3cd768fa 100644
--- a/xslt/base/html/html.xsl
+++ b/xslt/base/html/html.xsl
@@ -166,7 +166,7 @@ and a CSS style is specified.</para>
 <xsl:template name="style">
   <xsl:param name="css"/>
 
-  <xsl:if test="$inline.style.attribute != 0 and $css">
+  <xsl:if test="$inline.style.attribute and $css">
     <xsl:attribute name="style">
       <xsl:value-of select="$css"/>
     </xsl:attribute>
@@ -204,7 +204,7 @@ and a CSS style is specified.</para>
             src="{concat($resource.root, 'js/nhrefs.js')}"/>
   </xsl:if>
 
-  <xsl:if test="$syntax-highlighter != '0'">
+  <xsl:if test="$syntax-highlighter">
     <script src="{concat($resource.root, 'js/prism.js')}"></script>
   </xsl:if>
 </xsl:template>
@@ -248,7 +248,7 @@ and a CSS style is specified.</para>
 
   <xsl:variable name="numbered" select="f:syntax-highlight($node)"/>
 
-  <xsl:if test="$syntax-highlighter != '0'">
+  <xsl:if test="$syntax-highlighter">
     <xsl:variable name="language" select="$node/@language/string()"/>
     <xsl:variable name="mapped-language"
                   select="($syntax.highlight.map[@key=$language]/@value/string(),
@@ -278,7 +278,7 @@ and a CSS style is specified.</para>
   </xsl:if>
 
   <xsl:choose>
-    <xsl:when test="$syntax-highlighter != '0'">
+    <xsl:when test="$syntax-highlighter">
       <link href="{concat($resource.root, 'css/prism.css')}" rel="stylesheet" 
             type="text/css"/>
       <link href="{concat($resource.root, 'css/db-prism.css')}" rel="stylesheet"
diff --git a/xslt/base/html/index.xsl b/xslt/base/html/index.xsl
index 06d13ed0..ecb9de1d 100644
--- a/xslt/base/html/index.xsl
+++ b/xslt/base/html/index.xsl
@@ -23,7 +23,7 @@
     <!-- An empty index element indicates that the index -->
     <!-- should be generated automatically -->
     <!-- when generate.index is not false -->
-    <xsl:if test="count(*)>0 or $generate.index != 0">
+    <xsl:if test="count(*) > 0 or $generate.index">
       <xsl:choose>
         <xsl:when test="not(db:indexentry) and not(db:indexdiv)">
           <xsl:call-template name="generate-index">
diff --git a/xslt/base/html/inlines.xsl b/xslt/base/html/inlines.xsl
index 9d38964a..858d9f30 100644
--- a/xslt/base/html/inlines.xsl
+++ b/xslt/base/html/inlines.xsl
@@ -667,7 +667,7 @@ and <tag>firstterm</tag> elements.</para>
     <xsl:sequence select="f:html-attributes(., @xml:id, local-name(.), $extra-class)"/>
 
     <xsl:choose>
-      <xsl:when test="($firstterm.only.link = 0 or $firstterm = 1) and @linkend">
+      <xsl:when test="(not($firstterm.only.link) or $firstterm = 1) and @linkend">
 	<xsl:variable name="target" select="key('id',@linkend)[1]"/>
 
 	<a href="{f:href(/,$target)}">
@@ -676,8 +676,8 @@ and <tag>firstterm</tag> elements.</para>
       </xsl:when>
 
       <xsl:when test="not(@linkend)
-		      and ($firstterm.only.link = 0 or $firstterm = 1)
-		      and $glossterm.auto.link != 0">
+		      and (not($firstterm.only.link) or $firstterm = 1)
+		      and $glossterm.auto.link">
 	<xsl:variable name="term">
 	  <xsl:choose>
 	    <xsl:when test="@baseform">
diff --git a/xslt/base/html/lists.xsl b/xslt/base/html/lists.xsl
index d187d1f5..8356229e 100644
--- a/xslt/base/html/lists.xsl
+++ b/xslt/base/html/lists.xsl
@@ -94,7 +94,7 @@
       <!-- If there's no inline style attribute, force the class -->
       <!-- to contain the numeration so that external CSS can work -->
       <!-- otherwise, leave the class whatever it was -->
-      <xsl:if test="$inline.style.attribute = 0">
+      <xsl:if test="not($inline.style.attribute)">
         <xsl:attribute name="class" select="$numeration"/>
       </xsl:if>
 
@@ -489,7 +489,7 @@
       <xsl:when test="$presentation = 'list'">
         <xsl:apply-templates/>
       </xsl:when>
-      <xsl:when test="$segmentedlist.as.table != 0">
+      <xsl:when test="$segmentedlist.as.table">
         <xsl:apply-templates select="." mode="m:seglist-table"/>
       </xsl:when>
       <xsl:otherwise>
diff --git a/xslt/base/html/refentry.xsl b/xslt/base/html/refentry.xsl
index dc52cee7..4a4fc778 100644
--- a/xslt/base/html/refentry.xsl
+++ b/xslt/base/html/refentry.xsl
@@ -14,7 +14,7 @@
   <article>
     <xsl:sequence select="f:html-attributes(., f:node-id(.))"/>
 
-    <xsl:if test="$refentry.separator != 0 and preceding-sibling::db:refentry">
+    <xsl:if test="$refentry.separator and preceding-sibling::db:refentry">
       <div class="refentry-separator">
 	<hr/>
       </div>
@@ -35,7 +35,7 @@
     <xsl:sequence select="f:html-attributes(.)"/>
 
     <xsl:choose>
-      <xsl:when test="$refentry.generate.name != 0">
+      <xsl:when test="$refentry.generate.name">
 	<h2>
           <xsl:call-template name="gentext">
             <xsl:with-param name="key" select="'RefName'"/>
@@ -43,7 +43,7 @@
         </h2>
       </xsl:when>
 
-      <xsl:when test="$refentry.generate.title != 0">
+      <xsl:when test="$refentry.generate.title">
 	<h2>
 	  <xsl:choose>
 	    <xsl:when test="../db:refmeta/db:refentrytitle">
diff --git a/xslt/base/html/table.xsl b/xslt/base/html/table.xsl
index 14774f16..b08cdbe9 100644
--- a/xslt/base/html/table.xsl
+++ b/xslt/base/html/table.xsl
@@ -64,7 +64,7 @@
 <xsl:template name="t:table-longdesc">
   <xsl:variable name="longdesc.uri" select="f:longdesc-uri(.)"/>
 
-  <xsl:if test="$html.longdesc != 0 and $html.longdesc.link != 0
+  <xsl:if test="$html.longdesc and $html.longdesc.link
                 and db:textobject[not(db:phrase)]">
     <xsl:call-template name="t:write-longdesc">
       <xsl:with-param name="mediaobject" select="."/>
diff --git a/xslt/base/html/verbatim.xsl b/xslt/base/html/verbatim.xsl
index 2889c892..6381d7f3 100644
--- a/xslt/base/html/verbatim.xsl
+++ b/xslt/base/html/verbatim.xsl
@@ -128,7 +128,7 @@
 
   <xsl:variable name="data-attr" as="attribute()*">
     <xsl:choose>
-      <xsl:when test="$syntax-highlighter = '0'">
+      <xsl:when test="not($syntax-highlighter)">
         <!-- nop -->
       </xsl:when>
       <xsl:when test="empty($lines)">
@@ -178,7 +178,7 @@
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="$syntax-highlighter = '0' and $numbered">
+    <xsl:when test="not($syntax-highlighter) and $numbered">
       <div class="numbered-verbatim">
         <table border="0">
           <tr>
@@ -200,7 +200,7 @@
         </table>
       </div>
     </xsl:when>
-    <xsl:when test="$syntax-highlighter = '0'"> <!-- and not($numbered) -->
+    <xsl:when test="not($syntax-highlighter)"> <!-- and not($numbered) -->
       <div class="unnumbered-verbatim">
         <xsl:sequence select="$pre"/>
       </div>
diff --git a/xslt/base/html/xref.xsl b/xslt/base/html/xref.xsl
index d1624345..fe847eb5 100644
--- a/xslt/base/html/xref.xsl
+++ b/xslt/base/html/xref.xsl
@@ -842,7 +842,7 @@ cross references to that element.</para>
 
   <!-- handles both biblioentry and bibliomixed -->
   <xsl:choose>
-    <xsl:when test="$bibliography.numbered != 0">
+    <xsl:when test="$bibliography.numbered">
       <xsl:choose>
 	<xsl:when test="$context/self::db:bibliography">
 	  <xsl:number from="db:bibliography"
diff --git a/xslt/params/admonition.default.titles.xml b/xslt/params/admonition.default.titles.xml
index 2563c214..c49cd65e 100644
--- a/xslt/params/admonition.default.titles.xml
+++ b/xslt/params/admonition.default.titles.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="admonition.default.titles">
 <refmeta>
 <refentrytitle>admonition.default.titles</refentrytitle>
@@ -14,14 +15,14 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='admonition.default.titles.frag'>
-<xsl:param name="admonition.default.titles" select="1"/>
+<xsl:param name="admonition.default.titles" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If true (non-zero), default titles (“Note”, “Warning”, etc.) are
-placed on admonitions that do not have explicit titles.</para>
+<para>If true, default titles (“Note”, “Warning”, etc.) are placed on
+admonitions that do not have explicit titles.</para>
 
 </refsect1>
 </refentry>
diff --git a/xslt/params/admonition.graphics.extension.xml b/xslt/params/admonition.graphics.extension.xml
index cf2d8953..5f69d959 100644
--- a/xslt/params/admonition.graphics.extension.xml
+++ b/xslt/params/admonition.graphics.extension.xml
@@ -3,6 +3,7 @@
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns="http://docbook.org/ns/docbook"
           xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0"
           xml:id="admonition.graphics.extension">
    <refmeta>
@@ -13,13 +14,15 @@
       <refname>admonition.graphics.extension</refname>
       <refpurpose>FIXME: TBA</refpurpose>
    </refnamediv>
-   <refsynopsisdiv>
-      <src:fragment xml:id="admonition.graphics.extension.frag">
-<xsl:param name="admonition.graphics.extension">.svg</xsl:param>
-      </src:fragment>
-   </refsynopsisdiv>
-   <refsect1>
-      <title>Description</title>
-      <para>FIXME: TBA</para>
-   </refsect1>
-</refentry>
\ No newline at end of file
+
+<refsynopsisdiv>
+  <src:fragment xml:id="admonition.graphics.extension.frag">
+    <xsl:param name="admonition.graphics.extension" as="xs:string" select="'.svg'"/>
+  </src:fragment>
+</refsynopsisdiv>
+
+<refsect1>
+  <title>Description</title>
+  <para>The filename extension of admonition graphics.</para>
+</refsect1>
+</refentry>
diff --git a/xslt/params/admonition.graphics.path.xml b/xslt/params/admonition.graphics.path.xml
index c21712da..a8459b28 100644
--- a/xslt/params/admonition.graphics.path.xml
+++ b/xslt/params/admonition.graphics.path.xml
@@ -3,6 +3,7 @@
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns="http://docbook.org/ns/docbook"
           xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0"
           xml:id="admonition.graphics.path">
    <refmeta>
@@ -13,13 +14,15 @@
       <refname>admonition.graphics.path</refname>
       <refpurpose>FIXME: TBA</refpurpose>
    </refnamediv>
-   <refsynopsisdiv>
-      <src:fragment xml:id="admonition.graphics.path.frag">
-<xsl:param name="admonition.graphics.path">FIXME:/images/</xsl:param>
-      </src:fragment>
-   </refsynopsisdiv>
+
+<refsynopsisdiv>
+  <src:fragment xml:id="admonition.graphics.path.frag">
+    <xsl:param name="admonition.graphics.path" as="xs:string" select="'FIXME:/images/'"/>
+  </src:fragment>
+</refsynopsisdiv>
+
    <refsect1>
       <title>Description</title>
       <para>FIXME: TBA</para>
    </refsect1>
-</refentry>
\ No newline at end of file
+</refentry>
diff --git a/xslt/params/admonition.graphics.xml b/xslt/params/admonition.graphics.xml
index 756cdf0e..b0583db4 100644
--- a/xslt/params/admonition.graphics.xml
+++ b/xslt/params/admonition.graphics.xml
@@ -3,6 +3,7 @@
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns="http://docbook.org/ns/docbook"
           xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0"
           xml:id="admonition.graphics">
    <refmeta>
@@ -15,11 +16,11 @@
    </refnamediv>
    <refsynopsisdiv>
       <src:fragment xml:id="admonition.graphics.frag">
-<xsl:param name="admonition.graphics" select="false()"/>
+<xsl:param name="admonition.graphics" as="xs:boolean" select="false()"/>
       </src:fragment>
    </refsynopsisdiv>
    <refsect1>
       <title>Description</title>
       <para>FIXME: TBA</para>
    </refsect1>
-</refentry>
\ No newline at end of file
+</refentry>
diff --git a/xslt/params/admonition.properties.xml b/xslt/params/admonition.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/admonition.textlabel.xml b/xslt/params/admonition.textlabel.xml
old mode 100755
new mode 100644
index dc247c43..47bfcc70
--- a/xslt/params/admonition.textlabel.xml
+++ b/xslt/params/admonition.textlabel.xml
@@ -3,6 +3,7 @@
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns="http://docbook.org/ns/docbook"
           xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0"
           xml:id="admonition.textlabel">
    <refmeta>
@@ -15,11 +16,11 @@
    </refnamediv>
    <refsynopsisdiv>
       <src:fragment xml:id="admonition.textlabel.frag">
-<xsl:param name="admonition.textlabel" select="true()"/>
+<xsl:param name="admonition.textlabel" as="xs:boolean" select="true()"/>
       </src:fragment>
    </refsynopsisdiv>
    <refsect1>
       <title>Description</title>
       <para>FIXME: TBA</para>
    </refsect1>
-</refentry>
\ No newline at end of file
+</refentry>
diff --git a/xslt/params/admonition.title.properties.xml b/xslt/params/admonition.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/alignment.xml b/xslt/params/alignment.xml
index be7602a9..5fbd4497 100644
--- a/xslt/params/alignment.xml
+++ b/xslt/params/alignment.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="alignment">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="alignment.frag">
-<xsl:param name="alignment" select="'justify'"/>
+<xsl:param name="alignment" as="xs:string" select="'justify'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/annotate.toc.xml b/xslt/params/annotate.toc.xml
index 0fc11ad4..7aceb68c 100644
--- a/xslt/params/annotate.toc.xml
+++ b/xslt/params/annotate.toc.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="annotate.toc">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ version="5.0" xml:id="annotate.toc">
 <refmeta>
 <refentrytitle>annotate.toc</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,15 +12,15 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="annotate.toc.frag">
-<xsl:param name="annotate.toc" select="1"/>
+<xsl:param name="annotate.toc" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
 <para>If true, TOCs will be annotated. At present, this just means
-that the <tag>RefPurpose</tag> of <sgmltag>RefEntry</sgmltag>
-TOC entries will be displayed.
+that the <tag>RefPurpose</tag> of <tag>refentry</tag> TOC entries will
+be displayed.
 </para>
 
 </refsect1>
diff --git a/xslt/params/annotation.graphic.close.xml b/xslt/params/annotation.graphic.close.xml
index 6e3feac0..97b43ae9 100644
--- a/xslt/params/annotation.graphic.close.xml
+++ b/xslt/params/annotation.graphic.close.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="annotation.graphic.close">
 <refmeta>
 <refentrytitle>annotation.graphic.close</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="annotation.graphic.close.frag">
-<xsl:param name="annotation.graphic.close"
+<xsl:param name="annotation.graphic.close" as="xs:string"
            select="concat($resource.root,'img/annot-close.png')"/>
 </src:fragment>
 </refsynopsisdiv>
diff --git a/xslt/params/annotation.graphic.open.xml b/xslt/params/annotation.graphic.open.xml
index 90731384..d035161a 100644
--- a/xslt/params/annotation.graphic.open.xml
+++ b/xslt/params/annotation.graphic.open.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="annotation.graphic.open">
 <refmeta>
 <refentrytitle>annotation.graphic.open</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="annotation.graphic.open.frag">
-<xsl:param name="annotation.graphic.open"
+<xsl:param name="annotation.graphic.open" as="xs:string"
            select="concat($resource.root, 'img/annot-open.png')"/>
 </src:fragment>
 </refsynopsisdiv>
diff --git a/xslt/params/annotation.title.properties.xml b/xslt/params/annotation.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/author.othername.in.middle.xml b/xslt/params/author.othername.in.middle.xml
index bfd2fa7b..5d29bad6 100644
--- a/xslt/params/author.othername.in.middle.xml
+++ b/xslt/params/author.othername.in.middle.xml
@@ -1,25 +1,27 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="author.othername.in.middle">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="author.othername.in.middle">
 <refmeta>
 <refentrytitle>author.othername.in.middle</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
 </refmeta>
 <refnamediv>
 <refname>author.othername.in.middle</refname>
-<refpurpose>Is <tag>othername</tag> in <sgmltag>author</sgmltag> a
+<refpurpose>Is <tag>othername</tag> in <tag>author</tag> a
 middle name?</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <src:fragment xml:id="author.othername.in.middle.frag">
-<xsl:param name="author.othername.in.middle" select="1"/>
+<xsl:param name="author.othername.in.middle" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If true (non-zero), the <tag>othername</tag> of an <sgmltag>author</sgmltag>
+<para>If true (non-zero), the <tag>othername</tag> of an <tag>author</tag>
 appears between the <tag>firstname</tag> and
-<tag>surname</tag>.  Otherwise, <sgmltag>othername</sgmltag>
+<tag>surname</tag>.  Otherwise, <tag>othername</tag>
 is suppressed.
 </para>
 
diff --git a/xslt/params/autotoc.label.separator.xml b/xslt/params/autotoc.label.separator.xml
index 1350b008..1105920e 100644
--- a/xslt/params/autotoc.label.separator.xml
+++ b/xslt/params/autotoc.label.separator.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="autotoc.label.separator">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="autotoc.label.separator">
 <refmeta>
 <refentrytitle>autotoc.label.separator</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="autotoc.label.separator.frag">
-<xsl:param name="autotoc.label.separator" select="'. '"/>
+<xsl:param name="autotoc.label.separator" as="xs:string" select="'. '"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/base.dir.xml b/xslt/params/base.dir.xml
index adfd63c4..58a6038a 100644
--- a/xslt/params/base.dir.xml
+++ b/xslt/params/base.dir.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="base.dir">
 <refmeta>
 <refentrytitle>base.dir</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='base.dir.frag'>
-<xsl:param name="base.dir" select="''"/>
+<xsl:param name="base.dir" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/biblioentry.item.separator.xml b/xslt/params/biblioentry.item.separator.xml
index b9802eec..87196099 100644
--- a/xslt/params/biblioentry.item.separator.xml
+++ b/xslt/params/biblioentry.item.separator.xml
@@ -3,6 +3,7 @@
           xmlns:xi="http://www.w3.org/2001/XInclude"
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0" xml:id="biblioentry.item.separator">
 <refmeta>
 <refentrytitle>biblioentry.item.separator</refentrytitle>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="biblioentry.item.separator.frag">
-<xsl:param name="biblioentry.item.separator">. </xsl:param>
+<xsl:param name="biblioentry.item.separator" as="xs:string" select="'. '"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/biblioentry.properties.xml b/xslt/params/biblioentry.properties.xml
index 9e88ddb5..a3a67f99 100644
--- a/xslt/params/biblioentry.properties.xml
+++ b/xslt/params/biblioentry.properties.xml
@@ -14,12 +14,14 @@
 </refnamediv>
 
 <refsynopsisdiv>
-<src:fragment xml:id="biblioentry.properties.frag"><xsl:attribute-set name="biblioentry.properties" use-attribute-sets="normal.para.spacing">
-  <xsl:attribute name="start-indent">0.5in</xsl:attribute>
-  <xsl:attribute name="text-indent">-0.5in</xsl:attribute>
-</xsl:attribute-set>
+<src:fragment xml:id="biblioentry.properties.frag">
+  <xsl:attribute-set name="biblioentry.properties" use-attribute-sets="normal.para.spacing">
+    <xsl:attribute name="start-indent">0.5in</xsl:attribute>
+    <xsl:attribute name="text-indent">-0.5in</xsl:attribute>
+  </xsl:attribute-set>
 </src:fragment>
 </refsynopsisdiv>
+
 <refsection><info><title>Description</title></info>
 <para>How do you want biblioentry styled? </para>
 <para>Set the font-size, weight, space-above and space-below, indents, etc. to the style required</para>
diff --git a/xslt/params/bibliography.collection.xml b/xslt/params/bibliography.collection.xml
index a33f0dea..8440bea2 100644
--- a/xslt/params/bibliography.collection.xml
+++ b/xslt/params/bibliography.collection.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="bibliography.collection">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="bibliography.collection">
 <refmeta>
 <refentrytitle>bibliography.collection</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -10,7 +12,8 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="bibliography.collection.frag">
-<xsl:param name="bibliography.collection" select="'http://docbook.sourceforge.net/release/bibliography/bibliography.xml'"/>
+<xsl:param name="bibliography.collection" as="xs:string"
+           select="'http://docbook.sourceforge.net/release/bibliography/bibliography.xml'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/bibliography.numbered.xml b/xslt/params/bibliography.numbered.xml
index 13075557..aadd6dca 100644
--- a/xslt/params/bibliography.numbered.xml
+++ b/xslt/params/bibliography.numbered.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="bibliography.numbered">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="bibliography.numbered">
 <refmeta>
 <refentrytitle>bibliography.numbered</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="bibliography.numbered.frag">
-<xsl:param name="bibliography.numbered" select="0"/>
+<xsl:param name="bibliography.numbered" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/bibliography.style.xml b/xslt/params/bibliography.style.xml
index fa445826..1c8086c8 100644
--- a/xslt/params/bibliography.style.xml
+++ b/xslt/params/bibliography.style.xml
@@ -3,6 +3,7 @@
           xmlns:xi="http://www.w3.org/2001/XInclude"
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0" xml:id="bibliography.style">
 <refmeta>
 <refentrytitle>bibliography.style</refentrytitle>
@@ -17,7 +18,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='bibliography.style.frag'>
-<xsl:param name="bibliography.style">normal</xsl:param>
+<xsl:param name="bibliography.style" as="xs:string" select="'normal'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/body.end.indent.xml b/xslt/params/body.end.indent.xml
index 8ae6094b..abbfeffb 100644
--- a/xslt/params/body.end.indent.xml
+++ b/xslt/params/body.end.indent.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="body.end.indent">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="body.end.indent.frag">
-<xsl:param name="body.end.indent" select="'0pt'"/>
+<xsl:param name="body.end.indent" as="xs:string" select="'0pt'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/body.font.family.xml b/xslt/params/body.font.family.xml
index f332ea2d..375e7887 100644
--- a/xslt/params/body.font.family.xml
+++ b/xslt/params/body.font.family.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="body.font.family">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="body.font.family.frag">
-<xsl:param name="body.font.family" select="'serif'"/>
+<xsl:param name="body.font.family" as="xs:string" select="'serif'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/body.font.master.xml b/xslt/params/body.font.master.xml
index 84c82a37..0cd027f6 100644
--- a/xslt/params/body.font.master.xml
+++ b/xslt/params/body.font.master.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="body.font.master">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="body.font.master.frag">
-<xsl:param name="body.font.master" select="10"/>
+<xsl:param name="body.font.master" as="xs:double" select="10.0"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/body.font.size.xml b/xslt/params/body.font.size.xml
index e0d5fc17..c3ff963e 100644
--- a/xslt/params/body.font.size.xml
+++ b/xslt/params/body.font.size.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="body.font.size">
 <refmeta>
@@ -15,10 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="body.font.size.frag">
-<xsl:param name="body.font.size">
-  <xsl:value-of select="$body.font.master"/>
-  <xsl:text>pt</xsl:text>
-</xsl:param>
+<xsl:param name="body.font.size" as="xs:string" select="concat(string($body.font.master), 'pt')"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/body.margin.bottom.xml b/xslt/params/body.margin.bottom.xml
index 13631d1d..59203664 100644
--- a/xslt/params/body.margin.bottom.xml
+++ b/xslt/params/body.margin.bottom.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="body.margin.bottom">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="body.margin.bottom.frag">
-<xsl:param name="body.margin.bottom" select="'0.5in'"/>
+<xsl:param name="body.margin.bottom" as="xs:string" select="'0.5in'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/body.margin.top.xml b/xslt/params/body.margin.top.xml
index 6c288298..ff826db3 100644
--- a/xslt/params/body.margin.top.xml
+++ b/xslt/params/body.margin.top.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="body.margin.top">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="body.margin.top.frag">
-<xsl:param name="body.margin.top" select="'0.5in'"/>
+<xsl:param name="body.margin.top" as="xs:string" select="'0.5in'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/body.start.indent.xml b/xslt/params/body.start.indent.xml
index a2e90fd3..8cab1786 100644
--- a/xslt/params/body.start.indent.xml
+++ b/xslt/params/body.start.indent.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="body.start.indent">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="body.start.indent.frag">
-<xsl:param name="body.start.indent" select="'0pt'"/>
+<xsl:param name="body.start.indent" as="xs:string" select="'0pt'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/bridgehead.in.toc.xml b/xslt/params/bridgehead.in.toc.xml
index 9f439cdb..20742506 100644
--- a/xslt/params/bridgehead.in.toc.xml
+++ b/xslt/params/bridgehead.in.toc.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="bridgehead.in.toc">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="bridgehead.in.toc">
 <refmeta>
 <refentrytitle>bridgehead.in.toc</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="bridgehead.in.toc.frag">
-<xsl:param name="bridgehead.in.toc" select="0"/>
+<xsl:param name="bridgehead.in.toc" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/callout.defaultcolumn.xml b/xslt/params/callout.defaultcolumn.xml
index 7a64cbbb..366861b8 100644
--- a/xslt/params/callout.defaultcolumn.xml
+++ b/xslt/params/callout.defaultcolumn.xml
@@ -2,6 +2,7 @@
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
           xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0" xml:id="callout.defaultcolumn">
 
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="callout.defaultcolumn.frag">
-<xsl:param name="callout.defaultcolumn" select="60"/>
+<xsl:param name="callout.defaultcolumn" as="xs:integer" select="60"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/callout.graphics.extension.xml b/xslt/params/callout.graphics.extension.xml
index 08109ce0..b14a5bb1 100644
--- a/xslt/params/callout.graphics.extension.xml
+++ b/xslt/params/callout.graphics.extension.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="callout.graphics.extension">
 <refmeta>
 <refentrytitle>callout.graphics.extension</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='callout.graphics.extension.frag'>
-<xsl:param name="callout.graphics.extension" select="'.png'"/>
+<xsl:param name="callout.graphics.extension" as="xs:string" select="'.png'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/callout.graphics.number.limit.xml b/xslt/params/callout.graphics.number.limit.xml
index 7ef1c8be..ce3223cc 100644
--- a/xslt/params/callout.graphics.number.limit.xml
+++ b/xslt/params/callout.graphics.number.limit.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="callout.graphics.number.limit">
 <refmeta>
 <refentrytitle>callout.graphics.number.limit</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='callout.graphics.number.limit.frag'>
-<xsl:param name="callout.graphics.number.limit" select="15"/>
+<xsl:param name="callout.graphics.number.limit" as="xs:integer" select="15"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/callout.graphics.path.xml b/xslt/params/callout.graphics.path.xml
index 3237138a..02936c55 100644
--- a/xslt/params/callout.graphics.path.xml
+++ b/xslt/params/callout.graphics.path.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="callout.graphics.path">
 <refmeta>
 <refentrytitle>callout.graphics.path</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='callout.graphics.path.frag'>
-<xsl:param name="callout.graphics.path"
+<xsl:param name="callout.graphics.path" as="xs:string"
 	   select="concat($resource.root, 'img/')"/>
 </src:fragment>
 </refsynopsisdiv>
diff --git a/xslt/params/callout.graphics.xml b/xslt/params/callout.graphics.xml
index 503e1b02..164e5158 100644
--- a/xslt/params/callout.graphics.xml
+++ b/xslt/params/callout.graphics.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="callout.graphics">
 <refmeta>
 <refentrytitle>callout.graphics</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='callout.graphics.frag'>
-<xsl:param name="callout.graphics" select="1"/>
+<xsl:param name="callout.graphics" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/callout.unicode.font.xml b/xslt/params/callout.unicode.font.xml
index 2b0ff48a..5c1dd3af 100644
--- a/xslt/params/callout.unicode.font.xml
+++ b/xslt/params/callout.unicode.font.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="callout.unicode.font">
 <refmeta>
 <refentrytitle>callout.unicode.font</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='callout.unicode.font.frag'>
-<xsl:param name="callout.unicode.font" select="'ZapfDingbats'"/>
+<xsl:param name="callout.unicode.font" as="xs:string" select="'ZapfDingbats'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/callout.unicode.number.limit.xml b/xslt/params/callout.unicode.number.limit.xml
index e2897186..6148d5a1 100644
--- a/xslt/params/callout.unicode.number.limit.xml
+++ b/xslt/params/callout.unicode.number.limit.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="callout.unicode.number.limit">
 <refmeta>
 <refentrytitle>callout.unicode.number.limit</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='callout.unicode.number.limit.frag'>
-<xsl:param name="callout.unicode.number.limit" select="'10'"/>
+<xsl:param name="callout.unicode.number.limit" as="xs:integer" select="10"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/callout.unicode.start.character.xml b/xslt/params/callout.unicode.start.character.xml
index 3fe67683..c29eb269 100644
--- a/xslt/params/callout.unicode.start.character.xml
+++ b/xslt/params/callout.unicode.start.character.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="callout.unicode.start.character">
 <refmeta>
 <refentrytitle>callout.unicode.start.character</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='callout.unicode.start.character.frag'>
-<xsl:param name="callout.unicode.start.character" select="10102"/>
+<xsl:param name="callout.unicode.start.character" as="xs:integer" select="10102"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/callout.unicode.xml b/xslt/params/callout.unicode.xml
index 7ab1dba2..cd7e8342 100644
--- a/xslt/params/callout.unicode.xml
+++ b/xslt/params/callout.unicode.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="callout.unicode">
 <refmeta>
 <refentrytitle>callout.unicode</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='callout.unicode.frag'>
-<xsl:param name="callout.unicode" select="0"/>
+<xsl:param name="callout.unicode" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/caption.properties.xml b/xslt/params/caption.properties.xml
old mode 100755
new mode 100644
index 7df0e563..45a86616
--- a/xslt/params/caption.properties.xml
+++ b/xslt/params/caption.properties.xml
@@ -13,13 +13,15 @@
       <refname>caption.properties</refname>
       <refpurpose>FIXME: TBA</refpurpose>
    </refnamediv>
-   <refsynopsisdiv>
-      <src:fragment xml:id="caption.properties.frag">
-         <xsl:attribute-set name="caption.properties"> </xsl:attribute-set>
-      </src:fragment>
-   </refsynopsisdiv>
+
+<refsynopsisdiv>
+  <src:fragment xml:id="caption.properties.frag">
+    <xsl:attribute-set name="caption.properties"/>
+  </src:fragment>
+</refsynopsisdiv>
+
    <refsect1>
       <title>Description</title>
       <para>FIXME: TBA</para>
    </refsect1>
-</refentry>
\ No newline at end of file
+</refentry>
diff --git a/xslt/params/cdn.jquery.xml b/xslt/params/cdn.jquery.xml
index 378ce64f..7666883c 100644
--- a/xslt/params/cdn.jquery.xml
+++ b/xslt/params/cdn.jquery.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="alignment">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="cdn.jquery.frag">
-<xsl:param name="cdn.jquery"
+<xsl:param name="cdn.jquery" as="xs:string"
            select="'http://code.jquery.com/jquery-1.6.4.min.js'"/>
 </src:fragment>
 </refsynopsisdiv>
diff --git a/xslt/params/cdn.jqueryui.css.xml b/xslt/params/cdn.jqueryui.css.xml
index 3fcae499..d3ae712a 100644
--- a/xslt/params/cdn.jqueryui.css.xml
+++ b/xslt/params/cdn.jqueryui.css.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="alignment">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="cdn.jqueryui.css.frag">
-<xsl:param name="cdn.jqueryui.css"
+<xsl:param name="cdn.jqueryui.css" as="xs:string"
            select="concat('http://ajax.googleapis.com/ajax/libs',
                           '/jqueryui/1.11.4/themes/', $jqueryui.theme,
                           '/jquery-ui.css')"/>
diff --git a/xslt/params/cdn.jqueryui.xml b/xslt/params/cdn.jqueryui.xml
index 833218e7..918e9261 100644
--- a/xslt/params/cdn.jqueryui.xml
+++ b/xslt/params/cdn.jqueryui.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="alignment">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="cdn.jqueryui.frag">
-<xsl:param name="cdn.jqueryui"
+<xsl:param name="cdn.jqueryui" as="xs:string"
            select="'http://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js'"/>
 </src:fragment>
 </refsynopsisdiv>
diff --git a/xslt/params/chunk.section.depth.xml b/xslt/params/chunk.section.depth.xml
index 61d859e1..eab19eff 100644
--- a/xslt/params/chunk.section.depth.xml
+++ b/xslt/params/chunk.section.depth.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="chunk.section.depth">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="chunk.section.depth">
 <refmeta>
 <refentrytitle>chunk.section.depth</refentrytitle>
 <refmiscinfo role="type">integer</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="chunk.section.depth.frag">
-<xsl:param name="chunk.section.depth">1</xsl:param>
+<xsl:param name="chunk.section.depth" as="xs:integer" select="1"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/column.count.back.xml b/xslt/params/column.count.back.xml
index 0b89f54e..a4ae3466 100644
--- a/xslt/params/column.count.back.xml
+++ b/xslt/params/column.count.back.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="column.count.back">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="column.count.back.frag">
-<xsl:param name="column.count.back" select="1"/>
+<xsl:param name="column.count.back" as="xs:integer" select="1"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/column.count.body.xml b/xslt/params/column.count.body.xml
index 48853c67..3ad0916f 100644
--- a/xslt/params/column.count.body.xml
+++ b/xslt/params/column.count.body.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="column.count.body">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="column.count.body.frag">
-<xsl:param name="column.count.body" select="1"/>
+<xsl:param name="column.count.body" as="xs:integer" select="1"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/column.count.front.xml b/xslt/params/column.count.front.xml
index 49d3bc7b..a9324d76 100644
--- a/xslt/params/column.count.front.xml
+++ b/xslt/params/column.count.front.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="column.count.front">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="column.count.front.frag">
-<xsl:param name="column.count.front" select="1"/>
+<xsl:param name="column.count.front" as="xs:integer" select="1"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/column.count.index.xml b/xslt/params/column.count.index.xml
index 72a9c05e..d5c59ec6 100644
--- a/xslt/params/column.count.index.xml
+++ b/xslt/params/column.count.index.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="column.count.index">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="column.count.index.frag">
-<xsl:param name="column.count.index" select="2"/>
+<xsl:param name="column.count.index" as="xs:integer" select="2"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/column.count.lot.xml b/xslt/params/column.count.lot.xml
index d08f8b3d..1a144d1f 100644
--- a/xslt/params/column.count.lot.xml
+++ b/xslt/params/column.count.lot.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="column.count.lot">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="column.count.lot.frag">
-<xsl:param name="column.count.lot" select="1"/>
+<xsl:param name="column.count.lot" as="xs:integer" select="1"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/column.count.titlepage.xml b/xslt/params/column.count.titlepage.xml
index 18fc77e7..6ccd7981 100644
--- a/xslt/params/column.count.titlepage.xml
+++ b/xslt/params/column.count.titlepage.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="column.count.titlepage">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="column.count.titlepage.frag">
-<xsl:param name="column.count.titlepage" select="1"/>
+<xsl:param name="column.count.titlepage" as="xs:integer" select="1"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/column.gap.back.xml b/xslt/params/column.gap.back.xml
index ff4a79dc..26125661 100644
--- a/xslt/params/column.gap.back.xml
+++ b/xslt/params/column.gap.back.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="column.gap.back">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="column.gap.back.frag">
-<xsl:param name="column.gap.back" select="'12pt'"/>
+<xsl:param name="column.gap.back" as="xs:string" select="'12pt'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/column.gap.body.xml b/xslt/params/column.gap.body.xml
index 5522671a..207afe9d 100644
--- a/xslt/params/column.gap.body.xml
+++ b/xslt/params/column.gap.body.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="column.gap.body">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="column.gap.body.frag">
-<xsl:param name="column.gap.body" select="'12pt'"/>
+<xsl:param name="column.gap.body" as="xs:string" select="'12pt'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/column.gap.front.xml b/xslt/params/column.gap.front.xml
index aea49f41..fbe9b53c 100644
--- a/xslt/params/column.gap.front.xml
+++ b/xslt/params/column.gap.front.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="column.gap.front">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="column.gap.front.frag">
-<xsl:param name="column.gap.front" select="'12pt'"/>
+<xsl:param name="column.gap.front" as="xs:string" select="'12pt'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/column.gap.index.xml b/xslt/params/column.gap.index.xml
index 1c1a2080..15223b09 100644
--- a/xslt/params/column.gap.index.xml
+++ b/xslt/params/column.gap.index.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="column.gap.index">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="column.gap.index.frag">
-<xsl:param name="column.gap.index" select="'12pt'"/>
+<xsl:param name="column.gap.index" as="xs:string" select="'12pt'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/column.gap.lot.xml b/xslt/params/column.gap.lot.xml
index 0ed013ab..3968d9a9 100644
--- a/xslt/params/column.gap.lot.xml
+++ b/xslt/params/column.gap.lot.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="column.gap.lot">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="column.gap.lot.frag">
-<xsl:param name="column.gap.lot" select="'12pt'"/>
+<xsl:param name="column.gap.lot" as="xs:string" select="'12pt'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/column.gap.titlepage.xml b/xslt/params/column.gap.titlepage.xml
index 740c9917..68827540 100644
--- a/xslt/params/column.gap.titlepage.xml
+++ b/xslt/params/column.gap.titlepage.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="column.gap.titlepage">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="column.gap.titlepage.frag">
-<xsl:param name="column.gap.titlepage" select="'12pt'"/>
+<xsl:param name="column.gap.titlepage" as="xs:string" select="'12pt'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/component.label.includes.part.label.xml b/xslt/params/component.label.includes.part.label.xml
index 9887695f..886201c9 100644
--- a/xslt/params/component.label.includes.part.label.xml
+++ b/xslt/params/component.label.includes.part.label.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="component.label.includes.part.label">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="component.label.includes.part.label">
 <refmeta>
 <refentrytitle>component.label.includes.part.label</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,13 +12,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="component.label.includes.part.label.frag">
-<xsl:param name="component.label.includes.part.label" select="0"/>
+<xsl:param name="component.label.includes.part.label" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If true (non-zero), number labels for chapters, appendices, and other component
+<para>If true, number labels for chapters, appendices, and other component
 elements are prefixed with the label of the
 part element that contains them.
 So you might see Chapter II.3 instead of Chapter 3.
diff --git a/xslt/params/component.subtitle.properties.xml b/xslt/params/component.subtitle.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/date-format.xml b/xslt/params/date-format.xml
index 0503a0df..9b620e5d 100644
--- a/xslt/params/date-format.xml
+++ b/xslt/params/date-format.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="date-format">
 <refmeta>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="date-format.frag">
-<xsl:param name="date-format" select="'[D01] [MNn,*-3] [Y0001]'"/>
+<xsl:param name="date-format" as="xs:string" select="'[D01] [MNn,*-3] [Y0001]'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/dateTime-format.xml b/xslt/params/dateTime-format.xml
index f2f45f7d..8203d64d 100644
--- a/xslt/params/dateTime-format.xml
+++ b/xslt/params/dateTime-format.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="dateTime-format">
 <refmeta>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="dateTime-format.frag">
-<xsl:param name="dateTime-format" select="'[D01] [MNn,*-3] [Y0001]'"/>
+<xsl:param name="dateTime-format" as="xs:string" select="'[D01] [MNn,*-3] [Y0001]'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/default.image.width.xml b/xslt/params/default.image.width.xml
index 93a0ab95..2f416e3a 100644
--- a/xslt/params/default.image.width.xml
+++ b/xslt/params/default.image.width.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="default.image.width">
 <refmeta>
 <refentrytitle>default.image.width</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='default.image.width.frag'>
-<xsl:param name="default.image.width" select="''"/>
+<xsl:param name="default.image.width" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/default.table.column.widths.xml b/xslt/params/default.table.column.widths.xml
index 8d145135..1b10d3f1 100644
--- a/xslt/params/default.table.column.widths.xml
+++ b/xslt/params/default.table.column.widths.xml
@@ -3,6 +3,7 @@
           xmlns:xi="http://www.w3.org/2001/XInclude"
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0" xml:id="default.table.column.widths">
 <refmeta>
 <refentrytitle>default.table.column.widths</refentrytitle>
@@ -14,11 +15,11 @@
 </refnamediv>
 <refsynopsisdiv>
 <src:fragment xml:id="default.table.column.widths.frag">
-<xsl:param name="default.table.column.widths" select="1"></xsl:param>
+<xsl:param name="default.table.column.widths" as="xs:boolean" select="true()"></xsl:param>
 </src:fragment>
 </refsynopsisdiv>
 <refsection><info><title>Description</title></info>
-<para>If non-zero, CALS tables will have a computed width for every column, even if
+<para>If true, CALS tables will have a computed width for every column, even if
 the table doesn't specify any widths. By default, CALS table columns are all of equal
 width in the absense of any width specification.</para>
 
diff --git a/xslt/params/default.table.width.xml b/xslt/params/default.table.width.xml
index 184ce52b..f01bb373 100644
--- a/xslt/params/default.table.width.xml
+++ b/xslt/params/default.table.width.xml
@@ -3,6 +3,7 @@
           xmlns:xi="http://www.w3.org/2001/XInclude"
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0" xml:id="default.table.width">
 <refmeta>
 <refentrytitle>default.table.width</refentrytitle>
@@ -14,11 +15,11 @@
 </refnamediv>
 <refsynopsisdiv>
 <src:fragment xml:id="default.table.width.frag">
-<xsl:param name="default.table.width"></xsl:param>
+<xsl:param name="default.table.width" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 <refsection><info><title>Description</title></info>
-<para>If non-zero, this value will be used for the
+<para>If not the empty string, this value will be used for the
 <literal>width</literal> attribute on <tag>table</tag>s that do not specify an
 alternate width (with the <tag class="xmlpi">dbhtml table-width</tag> or 
 <tag class="xmlpi">dbfo table-width</tag> processing instruction).</para>
diff --git a/xslt/params/dingbat.font.family.xml b/xslt/params/dingbat.font.family.xml
index f9719cf0..1b77fcf0 100644
--- a/xslt/params/dingbat.font.family.xml
+++ b/xslt/params/dingbat.font.family.xml
@@ -3,6 +3,7 @@
           xmlns:xi="http://www.w3.org/2001/XInclude"
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0" xml:id="dingbat.font.family">
 <refmeta>
 <refentrytitle>dingbat.font.family</refentrytitle>
@@ -19,7 +20,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="dingbat.font.family.frag">
-<xsl:param name="dingbat.font.family">serif</xsl:param>
+<xsl:param name="dingbat.font.family" as="xs:string" select="'serif'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/div.subtitle.properties.xml b/xslt/params/div.subtitle.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/div.title.properties.xml b/xslt/params/div.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/division.subtitle.properties.xml b/xslt/params/division.subtitle.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/division.title.properties.xml b/xslt/params/division.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/docbook-namespace.xml b/xslt/params/docbook-namespace.xml
index b60667e9..e7576ada 100644
--- a/xslt/params/docbook-namespace.xml
+++ b/xslt/params/docbook-namespace.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="docbook-namespace">
 <refmeta>
@@ -15,7 +16,8 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="docbook-namespace.frag">
-<xsl:param name="docbook-namespace" select="'http://docbook.org/ns/docbook'"/>
+<xsl:param name="docbook-namespace" as="xs:string"
+           select="'http://docbook.org/ns/docbook'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/docbook.css.inline.xml b/xslt/params/docbook.css.inline.xml
index ad0432b8..bcae886e 100644
--- a/xslt/params/docbook.css.inline.xml
+++ b/xslt/params/docbook.css.inline.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="docbook.css.inline">
 <refmeta>
@@ -15,13 +16,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="docbook.css.inline.frag">
-<xsl:param name="docbook.css.inline" select="0"/>
+<xsl:param name="docbook.css.inline" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If non-zero, then the CSS will be incorporated directly into
+<para>If true, then the CSS will be incorporated directly into
 the resulting HTML file, rather incorporating a link to it.
 </para>
 
diff --git a/xslt/params/docbook.css.xml b/xslt/params/docbook.css.xml
index 9cf4f1db..d8b61c40 100644
--- a/xslt/params/docbook.css.xml
+++ b/xslt/params/docbook.css.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="docbook.css">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="docbook.css.frag">
-<xsl:param name="docbook.css"
+<xsl:param name="docbook.css" as="xs:string"
 	   select="concat($resource.root, 'css/default.css')"/>
 </src:fragment>
 </refsynopsisdiv>
diff --git a/xslt/params/double.sided.xml b/xslt/params/double.sided.xml
index ffe7f8f3..83b39912 100644
--- a/xslt/params/double.sided.xml
+++ b/xslt/params/double.sided.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="double.sided">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="double.sided.frag">
-<xsl:param name="double.sided" select="0"/>
+<xsl:param name="double.sided" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/draft.mode.xml b/xslt/params/draft.mode.xml
index 29fb6229..939ba126 100644
--- a/xslt/params/draft.mode.xml
+++ b/xslt/params/draft.mode.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="draft.mode">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="draft.mode.frag">
-<xsl:param name="draft.mode" select="'maybe'"/>
+<xsl:param name="draft.mode" as="xs:string" select="'maybe'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/draft.watermark.image.xml b/xslt/params/draft.watermark.image.xml
index 264391cb..4e10dcb7 100644
--- a/xslt/params/draft.watermark.image.xml
+++ b/xslt/params/draft.watermark.image.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="draft.watermark.image">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="draft.watermark.image.frag">
-<xsl:param name="draft.watermark.image"
+<xsl:param name="draft.watermark.image" as="xs:string"
 	   select="concat($resource.root, 'img/draft.svg')"/>
 </src:fragment>
 </refsynopsisdiv>
diff --git a/xslt/params/endnotes.properties.xml b/xslt/params/endnotes.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/example.properties.xml b/xslt/params/example.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/figure.properties.xml b/xslt/params/figure.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/firstterm.only.link.xml b/xslt/params/firstterm.only.link.xml
index e1f53156..c8d0f169 100644
--- a/xslt/params/firstterm.only.link.xml
+++ b/xslt/params/firstterm.only.link.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="firstterm.only.link">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="firstterm.only.link">
 <refmeta>
 <refentrytitle>firstterm.only.link</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="firstterm.only.link.frag">
-<xsl:param name="firstterm.only.link" select="0"/>
+<xsl:param name="firstterm.only.link" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/fo.processor.xml b/xslt/params/fo.processor.xml
index bd9ba7f2..0bb1ca0f 100644
--- a/xslt/params/fo.processor.xml
+++ b/xslt/params/fo.processor.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="fo.processor">
 <refmeta>
 <refentrytitle>fo.processor</refentrytitle>
@@ -18,7 +19,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="fo.processor.frag">
-<xsl:param name="fo.processor" select="'xep'"/>
+<xsl:param name="fo.processor" as="xs:string" select="'xep'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/footer.column.widths.xml b/xslt/params/footer.column.widths.xml
index 2c31bd30..46167f38 100644
--- a/xslt/params/footer.column.widths.xml
+++ b/xslt/params/footer.column.widths.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="footer.column.widths">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="footer.column.widths.frag">
-<xsl:param name="footer.column.widths" select="'1 1 1'"/>
+<xsl:param name="footer.column.widths" as="xs:string" select="'1 1 1'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/footer.rule.xml b/xslt/params/footer.rule.xml
index 66299afc..1b5eec8a 100644
--- a/xslt/params/footer.rule.xml
+++ b/xslt/params/footer.rule.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="footer.rule">
 <refmeta>
@@ -15,13 +16,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="footer.rule.frag">
-<xsl:param name="footer.rule" select="1"/>
+<xsl:param name="footer.rule" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If non-zero, a rule will be drawn above the page footers.</para>
+<para>If true, a rule will be drawn above the page footers.</para>
 
 </refsect1>
 </refentry>
diff --git a/xslt/params/footers.on.blank.pages.xml b/xslt/params/footers.on.blank.pages.xml
index 13abce9e..1f474851 100644
--- a/xslt/params/footers.on.blank.pages.xml
+++ b/xslt/params/footers.on.blank.pages.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="footers.on.blank.pages">
 <refmeta>
@@ -15,13 +16,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="footers.on.blank.pages.frag">
-<xsl:param name="footers.on.blank.pages" select="1"/>
+<xsl:param name="footers.on.blank.pages" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If non-zero, footers will be placed on blank pages.</para>
+<para>If true, footers will be placed on blank pages.</para>
 
 </refsect1>
 </refentry>
diff --git a/xslt/params/footnote.font.size.xml b/xslt/params/footnote.font.size.xml
index 88d0c0b2..525ac93b 100644
--- a/xslt/params/footnote.font.size.xml
+++ b/xslt/params/footnote.font.size.xml
@@ -3,6 +3,7 @@
           xmlns:xi="http://www.w3.org/2001/XInclude"
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0" xml:id="footnote.font.size">
 <refmeta>
 <refentrytitle>footnote.font.size</refentrytitle>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="footnote.font.size.frag"><xsl:param name="footnote.font.size">
- <xsl:value-of select="$body.font.master * 0.8"/><xsl:text>pt</xsl:text>
+ <xsl:value-of as="xs:double" select="$body.font.master * 0.8"/><xsl:text>pt</xsl:text>
 </xsl:param></src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/footnote.mark.width.xml b/xslt/params/footnote.mark.width.xml
old mode 100755
new mode 100644
index 2c0aaee3..34cfde81
--- a/xslt/params/footnote.mark.width.xml
+++ b/xslt/params/footnote.mark.width.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <refentry xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns="http://docbook.org/ns/docbook"
           xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0"
           xml:id="footnote.mark.width">
    <refmeta>
@@ -13,13 +13,15 @@
       <refname>footnote.mark.width</refname>
       <refpurpose>FIXME: TBA</refpurpose>
    </refnamediv>
-   <refsynopsisdiv>
-      <src:fragment xml:id="footnote.mark.width.frag">
-<xsl:param name="footnote.mark.width">1em</xsl:param>
-      </src:fragment>
-   </refsynopsisdiv>
+
+<refsynopsisdiv>
+  <src:fragment xml:id="footnote.mark.width.frag">
+    <xsl:param name="footnote.mark.width" as="xs:string" select="'1em'"/>
+  </src:fragment>
+</refsynopsisdiv>
+
    <refsect1>
       <title>Description</title>
       <para>FIXME: TBA</para>
    </refsect1>
-</refentry>
\ No newline at end of file
+</refentry>
diff --git a/xslt/params/footnote.number.format.xml b/xslt/params/footnote.number.format.xml
index c156d29b..f8d2c989 100644
--- a/xslt/params/footnote.number.format.xml
+++ b/xslt/params/footnote.number.format.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="footnote.number.format">
 <refmeta>
 <refentrytitle>footnote.number.format</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='footnote.number.format.frag'>
-<xsl:param name="footnote.number.format" select="1"/>
+<xsl:param name="footnote.number.format" as="xs:string" select="'1'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/footnote.number.symbols.xml b/xslt/params/footnote.number.symbols.xml
index 211786bc..5c50d8ea 100644
--- a/xslt/params/footnote.number.symbols.xml
+++ b/xslt/params/footnote.number.symbols.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="footnote.number.symbols">
 <refmeta>
 <refentrytitle>footnote.number.symbols</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='footnote.number.symbols.frag'>
-<xsl:param name="footnote.number.symbols" select="''"/>
+<xsl:param name="footnote.number.symbols" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/footnotes.as.endnotes.xml b/xslt/params/footnotes.as.endnotes.xml
old mode 100755
new mode 100644
index faf4d740..3d12b0cf
--- a/xslt/params/footnotes.as.endnotes.xml
+++ b/xslt/params/footnotes.as.endnotes.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <refentry xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns="http://docbook.org/ns/docbook"
           xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0"
           xml:id="footnotes.as.endnotes">
    <refmeta>
@@ -15,11 +15,11 @@
    </refnamediv>
    <refsynopsisdiv>
       <src:fragment xml:id="footnotes.as.endnotes.frag">
-<xsl:param name="footnotes.as.endnotes" select="false()"/>
+<xsl:param name="footnotes.as.endnotes" as="xs:boolean" select="false()"/>
       </src:fragment>
    </refsynopsisdiv>
    <refsect1>
       <title>Description</title>
       <para>FIXME: TBA</para>
    </refsect1>
-</refentry>
\ No newline at end of file
+</refentry>
diff --git a/xslt/params/formal.procedures.xml b/xslt/params/formal.procedures.xml
index 34dfe4dd..572403a8 100644
--- a/xslt/params/formal.procedures.xml
+++ b/xslt/params/formal.procedures.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="formal.procedures">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="formal.procedures">
 <refmeta>
 <refentrytitle>formal.procedures</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="formal.procedures.frag">
-<xsl:param name="formal.procedures" select="1"/>
+<xsl:param name="formal.procedures" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/formal.title.properties.xml b/xslt/params/formal.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/gYear-format.xml b/xslt/params/gYear-format.xml
index 74903627..71c7e8ca 100644
--- a/xslt/params/gYear-format.xml
+++ b/xslt/params/gYear-format.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="gYear-format">
 <refmeta>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="gYear-format.frag">
-<xsl:param name="gYear-format" select="'[Y0001]'"/>
+<xsl:param name="gYear-format" as="xs:string" select="'[Y0001]'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/gYearMonth-format.xml b/xslt/params/gYearMonth-format.xml
index e9be74d6..1e3ee79f 100644
--- a/xslt/params/gYearMonth-format.xml
+++ b/xslt/params/gYearMonth-format.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="gYearMonth-format">
 <refmeta>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="gYearMonth-format.frag">
-<xsl:param name="gYearMonth-format" select="'[MNn,*-3] [Y0001]'"/>
+<xsl:param name="gYearMonth-format" as="xs:string" select="'[MNn,*-3] [Y0001]'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/generate.index.xml b/xslt/params/generate.index.xml
index 1a63912f..ae75d916 100644
--- a/xslt/params/generate.index.xml
+++ b/xslt/params/generate.index.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="generate.index">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="generate.index">
 <refmeta>
 <refentrytitle>generate.index</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="generate.index.frag">
-<xsl:param name="generate.index" select="1"/>
+<xsl:param name="generate.index" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/generate.meta.abstract.xml b/xslt/params/generate.meta.abstract.xml
index 3939d5d0..2db42ae2 100644
--- a/xslt/params/generate.meta.abstract.xml
+++ b/xslt/params/generate.meta.abstract.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="generate.meta.abstract">
 <refmeta>
@@ -15,13 +16,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="generate.meta.abstract.frag">
-<xsl:param name="generate.meta.abstract" select="0"/>
+<xsl:param name="generate.meta.abstract" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If true (non-0), and if the document has an associated <tag>abstract</tag>, then
+<para>If true, and if the document has an associated <tag>abstract</tag>, then
 the text content of that abstract will be used as a n HTML <tag>meta</tag> abstract.</para>
 
 </refsect1>
diff --git a/xslt/params/generate.meta.generator.xml b/xslt/params/generate.meta.generator.xml
index 331d677e..5b96523f 100644
--- a/xslt/params/generate.meta.generator.xml
+++ b/xslt/params/generate.meta.generator.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="generate.meta.generator">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="generate.meta.generator.frag">
-<xsl:param name="generate.meta.generator" select="1"/>
+<xsl:param name="generate.meta.generator" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/glossary.collection.xml b/xslt/params/glossary.collection.xml
index 5df78b6f..8766475a 100644
--- a/xslt/params/glossary.collection.xml
+++ b/xslt/params/glossary.collection.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="glossary.collection">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="glossary.collection">
 <refmeta>
 <refentrytitle>glossary.collection</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="glossary.collection.frag">
-<xsl:param name="glossary.collection" select="''"/>
+<xsl:param name="glossary.collection" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/glossentry.show.acronym.xml b/xslt/params/glossentry.show.acronym.xml
index 8b874038..c577f5db 100644
--- a/xslt/params/glossentry.show.acronym.xml
+++ b/xslt/params/glossentry.show.acronym.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="glossentry.show.acronym">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="glossentry.show.acronym">
 <refmeta>
 <refentrytitle>glossentry.show.acronym</refentrytitle>
 <refmiscinfo role="type">list</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="glossentry.show.acronym.frag">
-<xsl:param name="glossentry.show.acronym" select="'no'"/>
+<xsl:param name="glossentry.show.acronym" as="xs:string" select="'no'"/>
 </src:fragment>
 </refsynopsisdiv>
 
@@ -22,7 +24,7 @@ then they are shown as the primary text for the entry.</para>
 
 <note>
 <para>This setting controls both <tag>acronym</tag> and
-<tag>abbrev</tag> elements in the <sgmltag>glossentry</sgmltag>.</para>
+<tag>abbrev</tag> elements in the <tag>glossentry</tag>.</para>
 </note>
 
 </refsect1>
diff --git a/xslt/params/glossterm.auto.link.xml b/xslt/params/glossterm.auto.link.xml
index 102fb764..112035f2 100644
--- a/xslt/params/glossterm.auto.link.xml
+++ b/xslt/params/glossterm.auto.link.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="glossterm.auto.link">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="glossterm.auto.link">
 <refmeta>
 <refentrytitle>glossterm.auto.link</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,13 +12,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="glossterm.auto.link.frag">
-<xsl:param name="glossterm.auto.link" select="0"/>
+<xsl:param name="glossterm.auto.link" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If true, a link will be automatically created from glossterm 
+<para>If true, a link will be automatically created from glossterm
 to glossentry for that glossary term. This is usefull when your
 glossterm names are consistent and you don't want to add links
 manually.</para>
diff --git a/xslt/params/graphic.extensions.xml b/xslt/params/graphic.extensions.xml
index 6c507be3..707cd255 100644
--- a/xslt/params/graphic.extensions.xml
+++ b/xslt/params/graphic.extensions.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="graphic.extensions">
 <refmeta>
 <refentrytitle>graphic.extensions</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='graphic.extensions.frag'>
-<xsl:param name="graphic.extensions"
+<xsl:param name="graphic.extensions" as="xs:string*"
 	   select="('svg','png','jpg','jpeg','gif','bmp',
 		    'avi', 'mpg', 'mpeg', 'qt')"/>
 </src:fragment>
diff --git a/xslt/params/graphic.formats.xml b/xslt/params/graphic.formats.xml
index 17845de8..fe7b2fbb 100644
--- a/xslt/params/graphic.formats.xml
+++ b/xslt/params/graphic.formats.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="graphic.formats">
 <refmeta>
 <refentrytitle>graphic.formats</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='graphic.formats.frag'>
-<xsl:param name="graphic.formats"
+<xsl:param name="graphic.formats" as="xs:string*"
 	   select="('svg','png','jpg','jpeg','gif','gif87a','gif89a','bmp',
                     'linespecific')"/>
 </src:fragment>
diff --git a/xslt/params/graphical.admonition.properties.xml b/xslt/params/graphical.admonition.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/graphicsize.extension.xml b/xslt/params/graphicsize.extension.xml
index 1eb98c4e..af11ff94 100644
--- a/xslt/params/graphicsize.extension.xml
+++ b/xslt/params/graphicsize.extension.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="graphicsize.extension">
 <refmeta>
 <refentrytitle>graphicsize.extension</refentrytitle>
@@ -14,14 +15,14 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='graphicsize.extension.frag'>
-<xsl:param name="graphicsize.extension" select="1"/>
+<xsl:param name="graphicsize.extension" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If non-zero (and if <parameter>use.extensions</parameter> is
-non-zero and if you're using a processor that supports extension
+<para>If true (and if <parameter>use.extensions</parameter> is
+true and if you're using a processor that supports extension
 functions), the <function>getWidth</function> and
 <function>getDepth</function> functions will be used to extract image
 sizes from graphics.</para>
diff --git a/xslt/params/graphicsize.use.img.src.path.xml b/xslt/params/graphicsize.use.img.src.path.xml
index 3aa17cce..5e0f5628 100644
--- a/xslt/params/graphicsize.use.img.src.path.xml
+++ b/xslt/params/graphicsize.use.img.src.path.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="graphicsize.use.img.src.path">
 <refmeta>
 <refentrytitle>graphicsize.use.img.src.path</refentrytitle>
@@ -15,13 +16,13 @@ filenames passed to extension functions</refpurpose>
 
 <refsynopsisdiv>
 <src:fragment xml:id='graphicsize.use.img.src.path.frag'>
-<xsl:param name="graphicsize.use.img.src.path" select="0"/>
+<xsl:param name="graphicsize.use.img.src.path" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If non-zero <parameter>img.src.path</parameter> parameter will
+<para>If true <parameter>img.src.path</parameter> parameter will
 be appended before filenames passed to extension functions for
 measuring image dimensions.</para>
 
diff --git a/xslt/params/header.column.widths.xml b/xslt/params/header.column.widths.xml
index 40d46ee2..798d0baf 100644
--- a/xslt/params/header.column.widths.xml
+++ b/xslt/params/header.column.widths.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="header.column.widths">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="header.column.widths.frag">
-<xsl:param name="header.column.widths" select="'1 1 1'"/>
+<xsl:param name="header.column.widths" as="xs:string" select="'1 1 1'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/header.rule.xml b/xslt/params/header.rule.xml
index a0faf7e3..28e23b51 100644
--- a/xslt/params/header.rule.xml
+++ b/xslt/params/header.rule.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="header.rule">
 <refmeta>
@@ -15,13 +16,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="header.rule.frag">
-<xsl:param name="header.rule" select="1"/>
+<xsl:param name="header.rule" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If non-zero, a rule will be drawn below the page headers.</para>
+<para>If true, a rule will be drawn below the page headers.</para>
 
 </refsect1>
 </refentry>
diff --git a/xslt/params/headers.on.blank.pages.xml b/xslt/params/headers.on.blank.pages.xml
index 99071201..2fb327c5 100644
--- a/xslt/params/headers.on.blank.pages.xml
+++ b/xslt/params/headers.on.blank.pages.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="headers.on.blank.pages">
 <refmeta>
@@ -15,13 +16,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="headers.on.blank.pages.frag">
-<xsl:param name="headers.on.blank.pages" select="1"/>
+<xsl:param name="headers.on.blank.pages" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If non-zero, headers will be placed on blank pages.</para>
+<para>If true, headers will be placed on blank pages.</para>
 
 </refsect1>
 </refentry>
diff --git a/xslt/params/html.base.xml b/xslt/params/html.base.xml
index a1e2e3cb..c2ab58ac 100644
--- a/xslt/params/html.base.xml
+++ b/xslt/params/html.base.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="html.base">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="html.base.frag">
-<xsl:param name="html.base" select="''"/>
+<xsl:param name="html.base" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/html.ext.xml b/xslt/params/html.ext.xml
index 489a555c..de8738e5 100644
--- a/xslt/params/html.ext.xml
+++ b/xslt/params/html.ext.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="html.ext">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="html.ext">
 <refmeta>
 <refentrytitle>html.ext</refentrytitle>
 
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="html.ext.frag">
-<xsl:param name="html.ext" select="'.html'"/>
+<xsl:param name="html.ext" as="xs:string" select="'.html'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/html.longdesc.link.xml b/xslt/params/html.longdesc.link.xml
index 0b9dcbf9..6b647741 100644
--- a/xslt/params/html.longdesc.link.xml
+++ b/xslt/params/html.longdesc.link.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="html.longdesc.link">
 <refmeta>
 <refentrytitle>html.longdesc.link</refentrytitle>
@@ -13,14 +14,14 @@
 </refnamediv>
 
 <refsynopsisdiv>
-<src:fragment id='html.longdesc.link.frag'>
-<xsl:param name="html.longdesc.link" select="$html.longdesc"/>
+<src:fragment xml:id='html.longdesc.link.frag'>
+<xsl:param name="html.longdesc.link" as="xs:boolean" select="$html.longdesc"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If non-zero, links will be created to the
+<para>If true, links will be created to the
 HTML files created for the
 <tag class="attribute">longdesc</tag> attribute. It makes no
 sense to turn enable this option without also enabling the
diff --git a/xslt/params/html.longdesc.xml b/xslt/params/html.longdesc.xml
index 5dbdc0e5..d227082b 100644
--- a/xslt/params/html.longdesc.xml
+++ b/xslt/params/html.longdesc.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="html.longdesc">
 <refmeta>
 <refentrytitle>html.longdesc</refentrytitle>
@@ -14,13 +15,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='html.longdesc.frag'>
-<xsl:param name="html.longdesc" select="1"/>
+<xsl:param name="html.longdesc" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If non-zero, HTML files will be created for the
+<para>If true, HTML files will be created for the
 <tag class="attribute">longdesc</tag> attribute. These files
 are created from the <tag>textobject</tag>s in
 <tag>mediaobject</tag>s and
diff --git a/xslt/params/html.stylesheets.xml b/xslt/params/html.stylesheets.xml
index e49e7f41..7137592c 100644
--- a/xslt/params/html.stylesheets.xml
+++ b/xslt/params/html.stylesheets.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="html.stylesheets">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="html.stylesheets.frag">
-<xsl:param name="html.stylesheets" select="''"/>
+<xsl:param name="html.stylesheets" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/hyphenate.xml b/xslt/params/hyphenate.xml
index 55170610..73067690 100644
--- a/xslt/params/hyphenate.xml
+++ b/xslt/params/hyphenate.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="hyphenate">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="hyphenate.frag">
-<xsl:param name="hyphenate" select="'true'"/>
+<xsl:param name="hyphenate" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/ignore.image.scaling.xml b/xslt/params/ignore.image.scaling.xml
index ccb9faa7..eed22360 100644
--- a/xslt/params/ignore.image.scaling.xml
+++ b/xslt/params/ignore.image.scaling.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="ignore.image.scaling">
 <refmeta>
 <refentrytitle>ignore.image.scaling</refentrytitle>
@@ -14,13 +15,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='ignore.image.scaling.frag'>
-<xsl:param name="ignore.image.scaling" select="0"/>
+<xsl:param name="ignore.image.scaling" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If non-zero, the scaling attributes on graphics and media objects are
+<para>If true, the scaling attributes on graphics and media objects are
 ignored.</para>
 
 </refsect1>
diff --git a/xslt/params/imageobjectco.properties.xml b/xslt/params/imageobjectco.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/img.src.path.xml b/xslt/params/img.src.path.xml
index 1b89085c..1fef8bec 100644
--- a/xslt/params/img.src.path.xml
+++ b/xslt/params/img.src.path.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="img.src.path">
 <refmeta>
 <refentrytitle>img.src.path</refentrytitle>
@@ -14,14 +15,14 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='img.src.path.frag'>
-<xsl:param name="img.src.path"/>
+<xsl:param name="img.src.path" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
 <para>Add a path prefix to each HTML
-<tag class="element">img</tag> or FO 
+<tag class="element">img</tag> or FO
 <tag class="element">fo:external-graphics</tag> element's
 <tag class="attribute">src</tag> attribute.
 This path could relative to the directory where the HTML/FO
diff --git a/xslt/params/index.on.role.xml b/xslt/params/index.on.role.xml
index 33855a3b..ead62aa1 100644
--- a/xslt/params/index.on.role.xml
+++ b/xslt/params/index.on.role.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="index.on.role">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="index.on.role">
 <refmeta>
 <refentrytitle>index.on.role</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,19 +12,19 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="index.on.role.frag">
-<xsl:param name="index.on.role" select="0"/>
+<xsl:param name="index.on.role" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
 <para>
-If non-zero, 
+If true,
 then an <tag>index</tag> element that has a
 <tag>role</tag> attribute
 value will contain only those <tag>indexterm</tag>
 elements with a matching role value.
-If an <tag>index</tag> has no <sgmltag>role</sgmltag>
+If an <tag>index</tag> has no <tag>role</tag>
 attribute or it is blank, then the index will contain
 all <tag>indexterm</tag>s in the current scope.
 </para>
@@ -33,8 +35,8 @@ on selecting indexterms for an index.
 </para>
 
 <para>If you are using DocBook version 4.3 or later, you should
-use the <tag>type</tag> attribute instead of <sgmltag>role</sgmltag>
-on <tag>indexterm</tag> and <sgmltag>index</sgmltag>,
+use the <tag>type</tag> attribute instead of <tag>role</tag>
+on <tag>indexterm</tag> and <tag>index</tag>,
 and set the <parameter>index.on.type</parameter> to a nonzero
 value.
 </para>
diff --git a/xslt/params/index.on.type.xml b/xslt/params/index.on.type.xml
index 12f8beef..5e28339d 100644
--- a/xslt/params/index.on.type.xml
+++ b/xslt/params/index.on.type.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="index.on.type">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="index.on.type">
 <refmeta>
 <refentrytitle>index.on.type</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -11,19 +13,19 @@ attribute value</refpurpose>
 
 <refsynopsisdiv>
 <src:fragment xml:id="index.on.type.frag">
-<xsl:param name="index.on.type" select="0"/>
+<xsl:param name="index.on.type" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
 <para>
-If non-zero, 
+If true,
 then an <tag>index</tag> element that has a
 <tag>type</tag> attribute
 value will contain only those <tag>indexterm</tag>
 elements with a matching <tag>type</tag> attribute value.
-If an <tag>index</tag> has no <sgmltag>type</sgmltag>
+If an <tag>index</tag> has no <tag>type</tag>
 attribute or it is blank, then the index will contain
 all <tag>indexterm</tag>s in the current scope.
 </para>
diff --git a/xslt/params/index.prefer.titleabbrev.xml b/xslt/params/index.prefer.titleabbrev.xml
index 267c27fd..9eae5a01 100644
--- a/xslt/params/index.prefer.titleabbrev.xml
+++ b/xslt/params/index.prefer.titleabbrev.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="index.prefer.titleabbrev">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="index.prefer.titleabbrev">
 <refmeta>
 <refentrytitle>index.prefer.titleabbrev</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="index.prefer.titleabbrev.frag">
-<xsl:param name="index.prefer.titleabbrev" select="0"/>
+<xsl:param name="index.prefer.titleabbrev" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/informaltable.properties.xml b/xslt/params/informaltable.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/inherit.keywords.xml b/xslt/params/inherit.keywords.xml
index 75c78ff3..8f6e667b 100644
--- a/xslt/params/inherit.keywords.xml
+++ b/xslt/params/inherit.keywords.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="inherit.keywords">
 <refmeta>
@@ -15,14 +16,14 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="inherit.keywords.frag">
-<xsl:param name="inherit.keywords" select="0"/>
+<xsl:param name="inherit.keywords" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
 <para>When generating <tag>html</tag> <tag>meta</tag> keywords, should the keywords
-of ancestor elements be inherited? If true (non-0), for example, when generating keywords
+of ancestor elements be inherited? If true, for example, when generating keywords
 for a chapter, the keywords for the parent book will be included.</para>
 
 </refsect1>
diff --git a/xslt/params/inline.style.attribute.xml b/xslt/params/inline.style.attribute.xml
index 035cb5a9..a3860a1b 100644
--- a/xslt/params/inline.style.attribute.xml
+++ b/xslt/params/inline.style.attribute.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="inline.style.attribute">
 <refmeta>
@@ -15,13 +16,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="inline.style.attribute.frag">
-<xsl:param name="inline.style.attribute" select="1"/>
+<xsl:param name="inline.style.attribute" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If non-zero, then inline <tag class='attribute'>style</tag>
+<para>If true, then inline <tag class='attribute'>style</tag>
 attributes may be generated on some HTML elements.
 </para>
 
diff --git a/xslt/params/insert.link.page.number.xml b/xslt/params/insert.link.page.number.xml
index b26c0f6a..bcc3685f 100644
--- a/xslt/params/insert.link.page.number.xml
+++ b/xslt/params/insert.link.page.number.xml
@@ -3,6 +3,7 @@
           xmlns:xi="http://www.w3.org/2001/XInclude"
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0" xml:id="insert.link.page.number">
 <refmeta>
 <refentrytitle>insert.link.page.number</refentrytitle>
@@ -18,7 +19,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="insert.link.page.number.frag">
-<xsl:param name="insert.link.page.number">no</xsl:param>
+<xsl:param name="insert.link.page.number" as="xs:string" select="'no'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/insert.xref.page.number.xml b/xslt/params/insert.xref.page.number.xml
index 1904c085..eceb98b9 100644
--- a/xslt/params/insert.xref.page.number.xml
+++ b/xslt/params/insert.xref.page.number.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="insert.xref.page.number">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="insert.xref.page.number">
 <refmeta>
 <refentrytitle>insert.xref.page.number</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="insert.xref.page.number.frag">
-<xsl:param name="insert.xref.page.number">no</xsl:param>
+<xsl:param name="insert.xref.page.number" as="xs:string" select="'no'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/itemizedlist.label.width.xml b/xslt/params/itemizedlist.label.width.xml
index 1d2c88c8..6dda5a33 100644
--- a/xslt/params/itemizedlist.label.width.xml
+++ b/xslt/params/itemizedlist.label.width.xml
@@ -3,6 +3,7 @@
           xmlns:xi="http://www.w3.org/2001/XInclude"
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0" xml:id="itemizedlist.label.width">
 <refmeta>
 <refentrytitle>itemizedlist.label.width</refentrytitle>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
   <src:fragment xml:id="itemizedlist.label.width.frag">
-    <xsl:param name="itemizedlist.label.width">1.0em</xsl:param>
+    <xsl:param name="itemizedlist.label.width" as="xs:string" select="'1.0em'"/>
   </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/itemizedlist.numeration.symbols.xml b/xslt/params/itemizedlist.numeration.symbols.xml
index 3c303592..3320368b 100644
--- a/xslt/params/itemizedlist.numeration.symbols.xml
+++ b/xslt/params/itemizedlist.numeration.symbols.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="itemizedlist.numeration.symbols">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="itemizedlist.numeration.symbols.frag">
-<xsl:param name="itemizedlist.numeration.symbols"
+<xsl:param name="itemizedlist.numeration.symbols" as="xs:string*"
 	   select="('disc', 'round')"/>
 </src:fragment>
 </refsynopsisdiv>
diff --git a/xslt/params/jqueryui.theme.xml b/xslt/params/jqueryui.theme.xml
index df6590aa..1903890f 100644
--- a/xslt/params/jqueryui.theme.xml
+++ b/xslt/params/jqueryui.theme.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="alignment">
 <refmeta>
@@ -15,8 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="jqueryui.theme.frag">
-<xsl:param name="jqueryui.theme"
-           select="'start'"/>
+<xsl:param name="jqueryui.theme" as="xs:string" select="'start'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/keep.relative.image.uris.xml b/xslt/params/keep.relative.image.uris.xml
index e88ef708..f6af07c8 100644
--- a/xslt/params/keep.relative.image.uris.xml
+++ b/xslt/params/keep.relative.image.uris.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="keep.relative.image.uris">
 <refmeta>
@@ -14,15 +15,15 @@
 </refnamediv>
 
 <refsynopsisdiv>
-<src:fragment id='keep.relative.image.uris.frag'>
-<xsl:param condition="html" name="keep.relative.image.uris" select="1"/>
-<xsl:param condition="fo" name="keep.relative.image.uris" select="0"/>
+<src:fragment xml:id='keep.relative.image.uris.frag'>
+<xsl:param condition="html" name="keep.relative.image.uris" as="xs:boolean" select="true()"/>
+<xsl:param condition="fo" name="keep.relative.image.uris" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If non-zeor, relative URIs (in, for example fileref attributes) will
+<para>If true, relative URIs (in, for example fileref attributes) will
 be used in the generated output. Otherwise, the URIs will be made absolute
 with respect to the base URI.</para>
 
diff --git a/xslt/params/l10n.gentext.default.language.xml b/xslt/params/l10n.gentext.default.language.xml
index 3bd2a3a4..9ffeaf49 100644
--- a/xslt/params/l10n.gentext.default.language.xml
+++ b/xslt/params/l10n.gentext.default.language.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="l10n.gentext.default.language">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="l10n.gentext.default.language">
 <refmeta>
 <refentrytitle>l10n.gentext.default.language</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="l10n.gentext.default.language.frag">
-<xsl:param name="l10n.gentext.default.language" select="'en'"/>
+<xsl:param name="l10n.gentext.default.language" as="xs:string" select="'en'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/l10n.gentext.language.xml b/xslt/params/l10n.gentext.language.xml
index 4950c2fe..fbcd18cf 100644
--- a/xslt/params/l10n.gentext.language.xml
+++ b/xslt/params/l10n.gentext.language.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="l10n.gentext.language">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="l10n.gentext.language">
 <refmeta>
 <refentrytitle>l10n.gentext.language</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="l10n.gentext.language.frag">
-<xsl:param name="l10n.gentext.language" select="''"/>
+<xsl:param name="l10n.gentext.language" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/l10n.gentext.use.xref.language.xml b/xslt/params/l10n.gentext.use.xref.language.xml
index b17e0614..dcb55bf5 100644
--- a/xslt/params/l10n.gentext.use.xref.language.xml
+++ b/xslt/params/l10n.gentext.use.xref.language.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="l10n.gentext.use.xref.language">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="l10n.gentext.use.xref.language">
 <refmeta>
 <refentrytitle>l10n.gentext.use.xref.language</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,13 +12,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="l10n.gentext.use.xref.language.frag">
-<xsl:param name="l10n.gentext.use.xref.language" select="0"/>
+<xsl:param name="l10n.gentext.use.xref.language" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If non-zero, the language of the target will be used when
+<para>If true, the language of the target will be used when
 generating cross reference text. Usually, the <quote>current</quote>
 language is used when generating text (that is, the language of the
 element that contains the cross-reference element). But setting this parameter
diff --git a/xslt/params/l10n.locale.dir.xml b/xslt/params/l10n.locale.dir.xml
old mode 100755
new mode 100644
index b6d05d10..1dac8416
--- a/xslt/params/l10n.locale.dir.xml
+++ b/xslt/params/l10n.locale.dir.xml
@@ -2,11 +2,12 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="l10n.locale.dir">
 <refmeta>
 <refentrytitle>l10n.locale.dir</refentrytitle>
-<refmiscinfo role="type"></refmiscinfo>
+<refmiscinfo role="type">string</refmiscinfo>
 </refmeta>
 <refnamediv>
 <refname>l10n.locale.dir</refname>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="l10n.locale.dir.frag">
-<xsl:param name="l10n.locale.dir">locales/</xsl:param>
+<xsl:param name="l10n.locale.dir" as="xs:string" select="'locales/'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/label.from.part.xml b/xslt/params/label.from.part.xml
index 1bc1cc40..550140e1 100644
--- a/xslt/params/label.from.part.xml
+++ b/xslt/params/label.from.part.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="label.from.part">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="label.from.part">
 <refmeta>
 <refentrytitle>label.from.part</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,14 +12,14 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="label.from.part.frag">
-<xsl:param name="label.from.part" select="0"/>
+<xsl:param name="label.from.part" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
 <para>If <parameter>label.from.part</parameter> is non-zero, components
-(<tag>chapter</tag>s, <sgmltag>appendixe</sgmltag>s, etc.)
+(<tag>chapter</tag>s, <tag>appendixe</tag>s, etc.)
 will be numbered from 1 in each <tag>part</tag>. Otherwise,
 they will be numbered monotonically throughout each
 <tag>book</tag>.
diff --git a/xslt/params/line.height.xml b/xslt/params/line.height.xml
index 0aa5b5be..e5e477f9 100644
--- a/xslt/params/line.height.xml
+++ b/xslt/params/line.height.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="line.height">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="line.height.frag">
-<xsl:param name="line.height" select="'normal'"/>
+<xsl:param name="line.height" as="xs:string" select="'normal'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/link.madeby.uri.xml b/xslt/params/link.madeby.uri.xml
index 14e557da..9a49e0f8 100644
--- a/xslt/params/link.madeby.uri.xml
+++ b/xslt/params/link.madeby.uri.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="link.madeby.uri">
 <refmeta>
@@ -15,13 +16,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="link.madeby.uri.frag">
-<xsl:param name="link.madeby.uri" select="''"/>
+<xsl:param name="link.madeby.uri" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If <parameter>$link.madeby.uri</parameter> is not the empty string, each HTML file
+<para>If <parameter>link.madeby.uri</parameter> is not the empty string, each HTML file
 generated will include a <tag>link</tag> element with <code>rel="made"</code> pointing
 to this URI.</para>
 
diff --git a/xslt/params/list.title.properties.xml b/xslt/params/list.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/make.graphic.viewport.xml b/xslt/params/make.graphic.viewport.xml
index 1ff530a8..a2301348 100644
--- a/xslt/params/make.graphic.viewport.xml
+++ b/xslt/params/make.graphic.viewport.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="make.graphic.viewport">
 <refmeta>
 <refentrytitle>make.graphic.viewport</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='make.graphic.viewport.frag'>
-<xsl:param name="make.graphic.viewport" select="1"/>
+<xsl:param name="make.graphic.viewport" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/make.single.year.ranges.xml b/xslt/params/make.single.year.ranges.xml
index a7096ec4..ee2f4dbc 100644
--- a/xslt/params/make.single.year.ranges.xml
+++ b/xslt/params/make.single.year.ranges.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="make.single.year.ranges">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="make.single.year.ranges">
 <refmeta>
 <refentrytitle>make.single.year.ranges</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,13 +12,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="make.single.year.ranges.frag">
-<xsl:param name="make.single.year.ranges" select="0"/>
+<xsl:param name="make.single.year.ranges" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If non-zero, year ranges that span a single year will be printed
+<para>If true, year ranges that span a single year will be printed
 in range notation (1998-1999) instead of discrete notation
 (1998, 1999).</para>
 
diff --git a/xslt/params/make.year.ranges.xml b/xslt/params/make.year.ranges.xml
index 68658f7b..508acbe2 100644
--- a/xslt/params/make.year.ranges.xml
+++ b/xslt/params/make.year.ranges.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="make.year.ranges">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="make.year.ranges">
 <refmeta>
 <refentrytitle>make.year.ranges</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,13 +12,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="make.year.ranges.frag">
-<xsl:param name="make.year.ranges" select="0"/>
+<xsl:param name="make.year.ranges" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If non-zero, copyright years will be collated into ranges.</para>
+<para>If true, copyright years will be collated into ranges.</para>
 
 </refsect1>
 </refentry>
diff --git a/xslt/params/manual.toc.xml b/xslt/params/manual.toc.xml
index 8c21fd1a..98172ff3 100644
--- a/xslt/params/manual.toc.xml
+++ b/xslt/params/manual.toc.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="manual.toc">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="manual.toc">
 <refmeta>
 <refentrytitle>manual.toc</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="manual.toc.frag">
-<xsl:param name="manual.toc" select="''"/>
+<xsl:param name="manual.toc" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/mediaobject.properties.xml b/xslt/params/mediaobject.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/nominal.image.depth.xml b/xslt/params/nominal.image.depth.xml
index 23d673fb..a84f62fd 100644
--- a/xslt/params/nominal.image.depth.xml
+++ b/xslt/params/nominal.image.depth.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="nominal.image.depth">
 <refmeta>
 <refentrytitle>nominal.image.depth</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='nominal.image.depth.frag'>
-<xsl:param name="nominal.image.depth" select="4 * $pixels.per.inch"/>
+<xsl:param name="nominal.image.depth" as="xs:integer" select="4 * $pixels.per.inch"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/nominal.image.width.xml b/xslt/params/nominal.image.width.xml
index d0127812..7db51894 100644
--- a/xslt/params/nominal.image.width.xml
+++ b/xslt/params/nominal.image.width.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="nominal.image.width">
 <refmeta>
 <refentrytitle>nominal.image.width</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='nominal.image.width.frag'>
-<xsl:param name="nominal.image.width" select="6 * $pixels.per.inch"/>
+<xsl:param name="nominal.image.width" as="xs:integer" select="6 * $pixels.per.inch"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/nongraphical.admonition.properties.xml b/xslt/params/nongraphical.admonition.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/olink.doctitle.xml b/xslt/params/olink.doctitle.xml
index 3045124f..f91267d6 100644
--- a/xslt/params/olink.doctitle.xml
+++ b/xslt/params/olink.doctitle.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="olink.doctitle">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="olink.doctitle.frag">
-<xsl:param name="olink.doctitle" select="0"/>
+<xsl:param name="olink.doctitle" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/olink.insert.page.number.xml b/xslt/params/olink.insert.page.number.xml
index 047a12e5..e793d609 100644
--- a/xslt/params/olink.insert.page.number.xml
+++ b/xslt/params/olink.insert.page.number.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="olink.insert.page.number">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="olink.insert.page.number.frag">
-<xsl:param name="olink.insert.page.number" select="0"/>
+<xsl:param name="olink.insert.page.number" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/orderedlist.numeration.styles.xml b/xslt/params/orderedlist.numeration.styles.xml
index 6c409f3c..f3ec6000 100644
--- a/xslt/params/orderedlist.numeration.styles.xml
+++ b/xslt/params/orderedlist.numeration.styles.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="orderedlist.numeration.styles">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="orderedlist.numeration.styles.frag">
-<xsl:param name="orderedlist.numeration.styles"
+<xsl:param name="orderedlist.numeration.styles"  as="xs:string*"
 	   select="('arabic',
 		    'loweralpha', 'lowerroman',
                     'upperalpha', 'upperroman')"/>
diff --git a/xslt/params/page.height.xml b/xslt/params/page.height.xml
index 395d36cc..f90517c9 100644
--- a/xslt/params/page.height.xml
+++ b/xslt/params/page.height.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="page.height">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="page.height.frag">
-<xsl:param name="page.height">
+<xsl:param name="page.height" as="xs:string">
   <xsl:choose>
     <xsl:when test="$page.orientation = 'portrait'">
       <xsl:value-of select="$page.height.portrait"/>
diff --git a/xslt/params/page.margin.bottom.xml b/xslt/params/page.margin.bottom.xml
index 805b7c48..c777dbda 100644
--- a/xslt/params/page.margin.bottom.xml
+++ b/xslt/params/page.margin.bottom.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="page.margin.bottom">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="page.margin.bottom.frag">
-<xsl:param name="page.margin.bottom" select="'0.5in'"/>
+<xsl:param name="page.margin.bottom" as="xs:string" select="'0.5in'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/page.margin.inner.xml b/xslt/params/page.margin.inner.xml
index 80214ad3..e6302758 100644
--- a/xslt/params/page.margin.inner.xml
+++ b/xslt/params/page.margin.inner.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="page.margin.inner">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="page.margin.inner.frag">
-<xsl:param name="page.margin.inner">
+<xsl:param name="page.margin.inner" as="xs:string">
   <xsl:choose>
     <xsl:when test="$double.sided != 0">1.25in</xsl:when>
     <xsl:otherwise>1in</xsl:otherwise>
diff --git a/xslt/params/page.margin.outer.xml b/xslt/params/page.margin.outer.xml
index b61111ab..3a4df8bd 100644
--- a/xslt/params/page.margin.outer.xml
+++ b/xslt/params/page.margin.outer.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="page.margin.outer">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="page.margin.outer.frag">
-<xsl:param name="page.margin.outer">
+<xsl:param name="page.margin.outer" as="xs:string">
   <xsl:choose>
     <xsl:when test="$double.sided != 0">0.75in</xsl:when>
     <xsl:otherwise>1in</xsl:otherwise>
diff --git a/xslt/params/page.margin.top.xml b/xslt/params/page.margin.top.xml
index 5e3b5ed1..ce2b372a 100644
--- a/xslt/params/page.margin.top.xml
+++ b/xslt/params/page.margin.top.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="page.margin.top">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="page.margin.top.frag">
-<xsl:param name="page.margin.top" select="'0.5in'"/>
+<xsl:param name="page.margin.top" as="xs:string" select="'0.5in'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/page.orientation.xml b/xslt/params/page.orientation.xml
index e02a1e09..b9964e84 100644
--- a/xslt/params/page.orientation.xml
+++ b/xslt/params/page.orientation.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="page.orientation">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="page.orientation.frag">
-<xsl:param name="page.orientation" select="'portrait'"/>
+<xsl:param name="page.orientation" as="xs:string" select="'portrait'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/page.width.portrait.xml b/xslt/params/page.width.portrait.xml
index 63aaef0a..d3dc5a1a 100644
--- a/xslt/params/page.width.portrait.xml
+++ b/xslt/params/page.width.portrait.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="page.width.portrait">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="page.width.portrait.frag">
-<xsl:param name="page.width.portrait">
+<xsl:param name="page.width.portrait" as="xs:string">
   <xsl:choose>
     <xsl:when test="$paper.type = 'USletter'">8.5in</xsl:when>
     <xsl:when test="$paper.type = '4A0'">1682mm</xsl:when>
diff --git a/xslt/params/page.width.xml b/xslt/params/page.width.xml
index 7db0590a..6df26907 100644
--- a/xslt/params/page.width.xml
+++ b/xslt/params/page.width.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="page.width">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="page.width.frag">
-<xsl:param name="page.width">
+<xsl:param name="page.width" as="xs:string">
   <xsl:choose>
     <xsl:when test="$page.orientation = 'portrait'">
       <xsl:value-of select="$page.width.portrait"/>
diff --git a/xslt/params/paper.type.xml b/xslt/params/paper.type.xml
index 22e7c393..8ca52f4c 100644
--- a/xslt/params/paper.type.xml
+++ b/xslt/params/paper.type.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="paper.type">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="paper.type.frag">
-<xsl:param name="paper.type" select="'USletter'"/>
+<xsl:param name="paper.type" as="xs:string" select="'USletter'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/partintro.title.properties.xml b/xslt/params/partintro.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/persistent.generated.ids.xml b/xslt/params/persistent.generated.ids.xml
index 4a27cfb8..eb727ef1 100644
--- a/xslt/params/persistent.generated.ids.xml
+++ b/xslt/params/persistent.generated.ids.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="persistent.generated.ids">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="persistent.generated.ids.frag">
-<xsl:param name="persistent.generated.ids" select="1"/>
+<xsl:param name="persistent.generated.ids" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/pixels.per.inch.xml b/xslt/params/pixels.per.inch.xml
index 4591277e..bbbcdacd 100644
--- a/xslt/params/pixels.per.inch.xml
+++ b/xslt/params/pixels.per.inch.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="pixels.per.inch">
 <refmeta>
 <refentrytitle>pixels.per.inch</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='pixels.per.inch.frag'>
-<xsl:param name="pixels.per.inch" select="90"/>
+<xsl:param name="pixels.per.inch" as="xs:integer" select="90"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/points.per.em.xml b/xslt/params/points.per.em.xml
index 9450bb28..09c875b3 100644
--- a/xslt/params/points.per.em.xml
+++ b/xslt/params/points.per.em.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="points.per.em">
 <refmeta>
 <refentrytitle>points.per.em</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='points.per.em.frag'>
-<xsl:param name="points.per.em" select="10"/>
+<xsl:param name="points.per.em" as="xs:double" select="10"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/preprocess.xml b/xslt/params/preprocess.xml
old mode 100755
new mode 100644
index c9b601fa..4310ddf6
--- a/xslt/params/preprocess.xml
+++ b/xslt/params/preprocess.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="preprocess">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="preprocess">
 <refmeta>
 <refentrytitle>preprocess</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="preprocess.frag">
-<xsl:param name="preprocess" select="''"/>
+<xsl:param name="preprocess" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/procedure.label.width.xml b/xslt/params/procedure.label.width.xml
old mode 100755
new mode 100644
index ddc946a2..05071704
--- a/xslt/params/procedure.label.width.xml
+++ b/xslt/params/procedure.label.width.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <refentry xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns="http://docbook.org/ns/docbook"
           xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0"
           xml:id="procedure.label.width">
    <refmeta>
@@ -15,11 +15,11 @@
    </refnamediv>
    <refsynopsisdiv>
       <src:fragment xml:id="procedure.label.width.frag">
-<xsl:param name="procedure.label.width">2em</xsl:param>
+<xsl:param name="procedure.label.width" as="xs:string" select="'2em'"/>
       </src:fragment>
    </refsynopsisdiv>
    <refsect1>
       <title>Description</title>
       <para>FIXME: TBA</para>
    </refsect1>
-</refentry>
\ No newline at end of file
+</refentry>
diff --git a/xslt/params/procedure.step.numeration.styles.xml b/xslt/params/procedure.step.numeration.styles.xml
index bfe39909..30fe7f37 100644
--- a/xslt/params/procedure.step.numeration.styles.xml
+++ b/xslt/params/procedure.step.numeration.styles.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="procedure.step.numeration.styles">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="procedure.step.numeration.styles.frag">
-<xsl:param name="procedure.step.numeration.styles"
+<xsl:param name="procedure.step.numeration.styles" as="xs:string*"
 	   select="('arabic',
 		    'loweralpha', 'lowerroman',
                     'upperalpha', 'upperroman')"/>
diff --git a/xslt/params/procedure.title.properties.xml b/xslt/params/procedure.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/profile.arch.xml b/xslt/params/profile.arch.xml
index fbc91f7b..0d1c384d 100644
--- a/xslt/params/profile.arch.xml
+++ b/xslt/params/profile.arch.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="profile.arch">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="profile.arch">
 <refmeta>
 <refentrytitle>profile.arch</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -11,7 +13,7 @@ attribute</refpurpose>
 
 <refsynopsisdiv>
 <src:fragment xml:id="profile.arch.frag">
-<xsl:param name="profile.arch" select="''"/>
+<xsl:param name="profile.arch" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/profile.attribute.xml b/xslt/params/profile.attribute.xml
index ee2e94c2..721c80ad 100644
--- a/xslt/params/profile.attribute.xml
+++ b/xslt/params/profile.attribute.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="profile.attribute">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="profile.attribute">
 <refmeta>
 <refentrytitle>profile.attribute</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="profile.attribute.frag">
-<xsl:param name="profile.attribute" select="''"/>
+<xsl:param name="profile.attribute" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/profile.audience.xml b/xslt/params/profile.audience.xml
index 99eb8c8a..da6e24ac 100644
--- a/xslt/params/profile.audience.xml
+++ b/xslt/params/profile.audience.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="profile.audience">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="profile.audience">
 <refmeta>
 <refentrytitle>profile.audience</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -11,7 +13,7 @@ attribute</refpurpose>
 
 <refsynopsisdiv>
 <src:fragment xml:id="profile.audience.frag">
-<xsl:param name="profile.audience" select="''"/>
+<xsl:param name="profile.audience" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/profile.condition.xml b/xslt/params/profile.condition.xml
index 054831f8..6b4ced84 100644
--- a/xslt/params/profile.condition.xml
+++ b/xslt/params/profile.condition.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="profile.condition">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="profile.condition">
 <refmeta>
 <refentrytitle>profile.condition</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -11,7 +13,7 @@ attribute</refpurpose>
 
 <refsynopsisdiv>
 <src:fragment xml:id="profile.condition.frag">
-<xsl:param name="profile.condition" select="''"/>
+<xsl:param name="profile.condition" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/profile.conformance.xml b/xslt/params/profile.conformance.xml
index 63a9f0ae..8d9ff0d1 100644
--- a/xslt/params/profile.conformance.xml
+++ b/xslt/params/profile.conformance.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="profile.conformance">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="profile.conformance">
 <refmeta>
 <refentrytitle>profile.conformance</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -11,7 +13,7 @@ attribute</refpurpose>
 
 <refsynopsisdiv>
 <src:fragment xml:id="profile.conformance.frag">
-<xsl:param name="profile.conformance" select="''"/>
+<xsl:param name="profile.conformance" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/profile.lang.xml b/xslt/params/profile.lang.xml
index c323764b..25642c94 100644
--- a/xslt/params/profile.lang.xml
+++ b/xslt/params/profile.lang.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="profile.lang">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="profile.lang">
 <refmeta>
 <refentrytitle>profile.lang</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -11,7 +13,7 @@ attribute</refpurpose>
 
 <refsynopsisdiv>
 <src:fragment xml:id="profile.lang.frag">
-<xsl:param name="profile.lang" select="''"/>
+<xsl:param name="profile.lang" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/profile.os.xml b/xslt/params/profile.os.xml
index 0d7b3644..8e01fe9b 100644
--- a/xslt/params/profile.os.xml
+++ b/xslt/params/profile.os.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="profile.os">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="profile.os">
 <refmeta>
 <refentrytitle>profile.os</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -11,7 +13,7 @@ attribute</refpurpose>
 
 <refsynopsisdiv>
 <src:fragment xml:id="profile.os.frag">
-<xsl:param name="profile.os" select="''"/>
+<xsl:param name="profile.os" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/profile.outputformat.xml b/xslt/params/profile.outputformat.xml
index f03ac3c3..752ad80e 100644
--- a/xslt/params/profile.outputformat.xml
+++ b/xslt/params/profile.outputformat.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="profile.outputformat">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="profile.outputformat">
 <refmeta>
 <refentrytitle>profile.outputformat</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -11,7 +13,7 @@ attribute</refpurpose>
 
 <refsynopsisdiv>
 <src:fragment xml:id="profile.outputformat.frag">
-<xsl:param name="profile.outputformat" select="''"/>
+<xsl:param name="profile.outputformat" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/profile.revision.xml b/xslt/params/profile.revision.xml
index 6d97dedf..4a06f2b9 100644
--- a/xslt/params/profile.revision.xml
+++ b/xslt/params/profile.revision.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="profile.revision">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="profile.revision">
 <refmeta>
 <refentrytitle>profile.revision</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -11,7 +13,7 @@ attribute</refpurpose>
 
 <refsynopsisdiv>
 <src:fragment xml:id="profile.revision.frag">
-<xsl:param name="profile.revision" select="''"/>
+<xsl:param name="profile.revision" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/profile.revisionflag.xml b/xslt/params/profile.revisionflag.xml
index 3019364b..8dd96600 100644
--- a/xslt/params/profile.revisionflag.xml
+++ b/xslt/params/profile.revisionflag.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="profile.revisionflag">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="profile.revisionflag">
 <refmeta>
 <refentrytitle>profile.revisionflag</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -11,7 +13,7 @@ attribute</refpurpose>
 
 <refsynopsisdiv>
 <src:fragment xml:id="profile.revisionflag.frag">
-<xsl:param name="profile.revisionflag" select="''"/>
+<xsl:param name="profile.revisionflag" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/profile.role.xml b/xslt/params/profile.role.xml
index fc851065..20bc2cd5 100644
--- a/xslt/params/profile.role.xml
+++ b/xslt/params/profile.role.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="profile.role">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="profile.role">
 <refmeta>
 <refentrytitle>profile.role</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -11,7 +13,7 @@ attribute</refpurpose>
 
 <refsynopsisdiv>
 <src:fragment xml:id="profile.role.frag">
-<xsl:param name="profile.role" select="''"/>
+<xsl:param name="profile.role" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/profile.security.xml b/xslt/params/profile.security.xml
index 2f3bc0f1..4a25573d 100644
--- a/xslt/params/profile.security.xml
+++ b/xslt/params/profile.security.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="profile.security">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="profile.security">
 <refmeta>
 <refentrytitle>profile.security</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -11,7 +13,7 @@ attribute</refpurpose>
 
 <refsynopsisdiv>
 <src:fragment xml:id="profile.security.frag">
-<xsl:param name="profile.security" select="''"/>
+<xsl:param name="profile.security" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/profile.separator.xml b/xslt/params/profile.separator.xml
index bfbf53dc..648df836 100644
--- a/xslt/params/profile.separator.xml
+++ b/xslt/params/profile.separator.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="profile.separator">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="profile.separator">
 <refmeta>
 <refentrytitle>profile.separator</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="profile.separator.frag">
-<xsl:param name="profile.separator" select="';'"/>
+<xsl:param name="profile.separator" as="xs:string" select="';'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/profile.userlevel.xml b/xslt/params/profile.userlevel.xml
index 805cbf04..c1a4d331 100644
--- a/xslt/params/profile.userlevel.xml
+++ b/xslt/params/profile.userlevel.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="profile.userlevel">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="profile.userlevel">
 <refmeta>
 <refentrytitle>profile.userlevel</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -11,7 +13,7 @@ attribute</refpurpose>
 
 <refsynopsisdiv>
 <src:fragment xml:id="profile.userlevel.frag">
-<xsl:param name="profile.userlevel" select="''"/>
+<xsl:param name="profile.userlevel" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/profile.value.xml b/xslt/params/profile.value.xml
index 0597748a..f8a9c530 100644
--- a/xslt/params/profile.value.xml
+++ b/xslt/params/profile.value.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="profile.value">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="profile.value">
 <refmeta>
 <refentrytitle>profile.value</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="profile.value.frag">
-<xsl:param name="profile.value" select="''"/>
+<xsl:param name="profile.value" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/profile.vendor.xml b/xslt/params/profile.vendor.xml
index 4fa7f405..adad865a 100644
--- a/xslt/params/profile.vendor.xml
+++ b/xslt/params/profile.vendor.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="profile.vendor">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="profile.vendor">
 <refmeta>
 <refentrytitle>profile.vendor</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -11,7 +13,7 @@ attribute</refpurpose>
 
 <refsynopsisdiv>
 <src:fragment xml:id="profile.vendor.frag">
-<xsl:param name="profile.vendor" select="''"/>
+<xsl:param name="profile.vendor" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/profile.wordsize.xml b/xslt/params/profile.wordsize.xml
index 743f536b..bbdad684 100644
--- a/xslt/params/profile.wordsize.xml
+++ b/xslt/params/profile.wordsize.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="profile.wordsize">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="profile.wordsize">
 <refmeta>
 <refentrytitle>profile.wordsize</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -11,7 +13,7 @@ attribute</refpurpose>
 
 <refsynopsisdiv>
 <src:fragment xml:id="profile.wordsize.frag">
-<xsl:param name="profile.wordsize" select="''"/>
+<xsl:param name="profile.wordsize" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/punct.honorific.xml b/xslt/params/punct.honorific.xml
index 1b89a908..71e0bb14 100644
--- a/xslt/params/punct.honorific.xml
+++ b/xslt/params/punct.honorific.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="punct.honorific">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="punct.honorific">
 <refmeta>
 <refentrytitle>punct.honorific</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="punct.honorific.frag">
-<xsl:param name="punct.honorific" select="'.'"/>
+<xsl:param name="punct.honorific" as="xs:string" select="'.'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/qanda.defaultlabel.xml b/xslt/params/qanda.defaultlabel.xml
index f9e89df2..237b2c71 100644
--- a/xslt/params/qanda.defaultlabel.xml
+++ b/xslt/params/qanda.defaultlabel.xml
@@ -1,7 +1,9 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="qanda.defaultlabel">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="qanda.defaultlabel">
 <refmeta>
 <refentrytitle>qanda.defaultlabel</refentrytitle>
-<refmiscinfo role="type">boolean</refmiscinfo>
+<refmiscinfo role="type">string</refmiscinfo>
 </refmeta>
 <refnamediv>
 <refname>qanda.defaultlabel</refname>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="qanda.defaultlabel.frag">
-<xsl:param name="qanda.defaultlabel">number</xsl:param>
+<xsl:param name="qanda.defaultlabel" as="xs:string" select="'number'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/qanda.inherit.numeration.xml b/xslt/params/qanda.inherit.numeration.xml
index b0a9ebb1..5ba78a11 100644
--- a/xslt/params/qanda.inherit.numeration.xml
+++ b/xslt/params/qanda.inherit.numeration.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="qanda.inherit.numeration">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="qanda.inherit.numeration">
 <refmeta>
 <refentrytitle>qanda.inherit.numeration</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,13 +12,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="qanda.inherit.numeration.frag">
-<xsl:param name="qanda.inherit.numeration" select="1"/>
+<xsl:param name="qanda.inherit.numeration" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If true (non-zero), numbered QandADiv elements and Questions and Answers inherit
+<para>If true, numbered QandADiv elements and Questions and Answers inherit
 the numeration of the ancestors of the QandASet.
 </para>
 
diff --git a/xslt/params/qandaset.title.properties.xml b/xslt/params/qandaset.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/refentry.generate.name.xml b/xslt/params/refentry.generate.name.xml
index d300241e..e1d2d866 100644
--- a/xslt/params/refentry.generate.name.xml
+++ b/xslt/params/refentry.generate.name.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="refentry.generate.name">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="refentry.generate.name">
 <refmeta>
 <refentrytitle>refentry.generate.name</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,13 +12,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="refentry.generate.name.frag">
-<xsl:param name="refentry.generate.name" select="1"/>
+<xsl:param name="refentry.generate.name" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If true (non-zero), a "NAME" section title is output before the list
+<para>If true, a "NAME" section title is output before the list
 of 'RefName's. This parameter and
 <parameter>refentry.generate.title</parameter> are mutually
 exclusive. This means that if you change this parameter to zero, you
diff --git a/xslt/params/refentry.generate.title.xml b/xslt/params/refentry.generate.title.xml
index bab9a592..92f7b6b4 100644
--- a/xslt/params/refentry.generate.title.xml
+++ b/xslt/params/refentry.generate.title.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="refentry.generate.title">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="refentry.generate.title">
 <refmeta>
 <refentrytitle>refentry.generate.title</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,13 +12,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="refentry.generate.title.frag">
-<xsl:param name="refentry.generate.title" select="0"/>
+<xsl:param name="refentry.generate.title" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If true (non-zero), the reference page title or first name is
+<para>If true, the reference page title or first name is
 output before the list of 'RefName's. This parameter and
 <parameter>refentry.generate.name</parameter> are mutually exclusive.
 This means that if you change this parameter to 1, you
diff --git a/xslt/params/refentry.separator.xml b/xslt/params/refentry.separator.xml
index 7ebbdadc..01fbf253 100644
--- a/xslt/params/refentry.separator.xml
+++ b/xslt/params/refentry.separator.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="refentry.separator">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="refentry.separator">
 <refmeta>
 <refentrytitle>refentry.separator</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="refentry.separator.frag">
-<xsl:param name="refentry.separator" select="1"/>
+<xsl:param name="refentry.separator" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/refsection.level1.subtitle.properties.xml b/xslt/params/refsection.level1.subtitle.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/refsection.level1.title.properties.xml b/xslt/params/refsection.level1.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/refsection.level2.subtitle.properties.xml b/xslt/params/refsection.level2.subtitle.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/refsection.level2.title.properties.xml b/xslt/params/refsection.level2.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/refsection.level3.subtitle.properties.xml b/xslt/params/refsection.level3.subtitle.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/refsection.level3.title.properties.xml b/xslt/params/refsection.level3.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/refsection.subtitle.properties.xml b/xslt/params/refsection.subtitle.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/refsection.title.properties.xml b/xslt/params/refsection.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/region.after.extent.xml b/xslt/params/region.after.extent.xml
index e4605f6e..b9688e09 100644
--- a/xslt/params/region.after.extent.xml
+++ b/xslt/params/region.after.extent.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="region.after.extent">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="region.after.extent.frag">
-<xsl:param name="region.after.extent" select="'0.4in'"/>
+<xsl:param name="region.after.extent" as="xs:string" select="'0.4in'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/region.before.extent.xml b/xslt/params/region.before.extent.xml
index b880516d..42a4f230 100644
--- a/xslt/params/region.before.extent.xml
+++ b/xslt/params/region.before.extent.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="region.before.extent">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="region.before.extent.frag">
-<xsl:param name="region.before.extent" select="'0.4in'"/>
+<xsl:param name="region.before.extent" as="xs:string" select="'0.4in'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/resource.root.xml b/xslt/params/resource.root.xml
index b7d3e0f3..7393711d 100644
--- a/xslt/params/resource.root.xml
+++ b/xslt/params/resource.root.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="resource.root">
 <refmeta>
 <refentrytitle>resource.root</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='resource.root.frag'>
-<xsl:param name="resource.root"
+<xsl:param name="resource.root" as="xs:string"
 	   select="concat('https://cdn.docbook.org/release/',$VERSION,'/resources/')"/>
 </src:fragment>
 </refsynopsisdiv>
diff --git a/xslt/params/root.filename.xml b/xslt/params/root.filename.xml
index 4095774f..041ea817 100644
--- a/xslt/params/root.filename.xml
+++ b/xslt/params/root.filename.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="root.filename">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="root.filename">
 <refmeta>
 <refentrytitle>root.filename</refentrytitle>
 
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="root.filename.frag">
-<xsl:param name="root.filename" select="'index'"/>
+<xsl:param name="root.filename" as="xs:string" select="'index'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/rootid.xml b/xslt/params/rootid.xml
index efe014f9..292063c0 100644
--- a/xslt/params/rootid.xml
+++ b/xslt/params/rootid.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="rootid">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="rootid">
 <refmeta>
 <refentrytitle>rootid</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="rootid.frag">
-<xsl:param name="rootid"/>
+<xsl:param name="rootid" as="xs:string?" select="()"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/schemas.xml b/xslt/params/schemas.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/section.autolabel.max.depth.xml b/xslt/params/section.autolabel.max.depth.xml
index 3140dce4..3520f014 100644
--- a/xslt/params/section.autolabel.max.depth.xml
+++ b/xslt/params/section.autolabel.max.depth.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="section.autolabel.max.depth">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="section.autolabel.max.depth">
 <refmeta>
 <refentrytitle>section.autolabel.max.depth</refentrytitle>
 <refmiscinfo role="type">integer</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="section.autolabel.max.depth.frag">
-<xsl:param name="section.autolabel.max.depth" select="8"/>
+<xsl:param name="section.autolabel.max.depth" as="xs:integer" select="8"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/section.label.includes.component.label.xml b/xslt/params/section.label.includes.component.label.xml
index aa57b305..0cfd1fe1 100644
--- a/xslt/params/section.label.includes.component.label.xml
+++ b/xslt/params/section.label.includes.component.label.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="section.label.includes.component.label">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="section.label.includes.component.label">
 <refmeta>
 <refentrytitle>section.label.includes.component.label</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,13 +12,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="section.label.includes.component.label.frag">
-<xsl:param name="section.label.includes.component.label" select="0"/>
+<xsl:param name="section.label.includes.component.label" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If true (non-zero), section labels are prefixed with the label of the
+<para>If true, section labels are prefixed with the label of the
 component that contains them.
 </para>
 
diff --git a/xslt/params/section.level1.subtitle.properties.xml b/xslt/params/section.level1.subtitle.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/section.level1.title.properties.xml b/xslt/params/section.level1.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/section.level2.subtitle.properties.xml b/xslt/params/section.level2.subtitle.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/section.level2.title.properties.xml b/xslt/params/section.level2.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/section.level3.subtitle.properties.xml b/xslt/params/section.level3.subtitle.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/section.level3.title.properties.xml b/xslt/params/section.level3.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/section.level4.subtitle.properties.xml b/xslt/params/section.level4.subtitle.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/section.level4.title.properties.xml b/xslt/params/section.level4.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/section.level5.subtitle.properties.xml b/xslt/params/section.level5.subtitle.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/section.level5.title.properties.xml b/xslt/params/section.level5.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/section.level6.subtitle.properties.xml b/xslt/params/section.level6.subtitle.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/section.level6.title.properties.xml b/xslt/params/section.level6.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/section.subtitle.properties.xml b/xslt/params/section.subtitle.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/section.title.properties.xml b/xslt/params/section.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/segmentedlist.as.table.xml b/xslt/params/segmentedlist.as.table.xml
index aeef314b..8f85445c 100644
--- a/xslt/params/segmentedlist.as.table.xml
+++ b/xslt/params/segmentedlist.as.table.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="segmentedlist.as.table">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="segmentedlist.as.table">
 <refmeta>
 <refentrytitle>segmentedlist.as.table</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,13 +12,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="segmentedlist.as.table.frag">
-<xsl:param name="segmentedlist.as.table" select="0"/>
+<xsl:param name="segmentedlist.as.table" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If non-zero, <tag>segmentedlist</tag>s will be formatted as
+<para>If true, <tag>segmentedlist</tag>s will be formatted as
 tables.</para>
 
 </refsect1>
diff --git a/xslt/params/show.comments.xml b/xslt/params/show.comments.xml
index ce483779..1d1def0b 100644
--- a/xslt/params/show.comments.xml
+++ b/xslt/params/show.comments.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="show.comments">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="show.comments">
 <refmeta>
 <refentrytitle>show.comments</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,13 +12,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="show.comments.frag">
-<xsl:param name="show.comments">1</xsl:param>
+<xsl:param name="show.comments" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If true (non-zero), comments will be displayed, otherwise they are suppressed.
+<para>If true, comments will be displayed, otherwise they are suppressed.
 Comments here refers to the <tag>comment</tag> element,
 which will be renamed <tag>remark</tag> in DocBook V4.0,
 not XML comments (&lt;-- like this --&gt;) which are unavailable.
diff --git a/xslt/params/sidebar.title.properties.xml b/xslt/params/sidebar.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/step.title.properties.xml b/xslt/params/step.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/subtitle.properties.xml b/xslt/params/subtitle.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/symbol.font.family.xml b/xslt/params/symbol.font.family.xml
index af53064e..c03871dd 100644
--- a/xslt/params/symbol.font.family.xml
+++ b/xslt/params/symbol.font.family.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="symbol.font.family">
 <refmeta>
@@ -16,7 +17,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="symbol.font.family.frag">
-<xsl:param name="symbol.font.family" select="'Symbol,ZapfDingbats'"/>
+<xsl:param name="symbol.font.family" as="xs:string" select="'Symbol,ZapfDingbats'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/syntax-highlighter.xml b/xslt/params/syntax-highlighter.xml
index 978ae9e0..6f5bb608 100644
--- a/xslt/params/syntax-highlighter.xml
+++ b/xslt/params/syntax-highlighter.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="resource.root">
 <refmeta>
 <refentrytitle>syntax-highlighter</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='syntax-highlighter.frag'>
-<xsl:param name="syntax-highlighter" select="'1'"/>
+<xsl:param name="syntax-highlighter" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/table.cell.border.color.xml b/xslt/params/table.cell.border.color.xml
index 565bf241..05d03e1a 100644
--- a/xslt/params/table.cell.border.color.xml
+++ b/xslt/params/table.cell.border.color.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="table.cell.border.color">
 <refmeta>
 <refentrytitle>table.cell.border.color</refentrytitle>
@@ -14,8 +15,8 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='table.cell.border.color.frag'>
-<xsl:param condition="html" name="table.cell.border.color" select="''"/>
-<xsl:param condition="fo" name="table.cell.border.color" select="'black'"/>
+<xsl:param condition="html" name="table.cell.border.color" as="xs:string" select="''"/>
+<xsl:param condition="fo" name="table.cell.border.color" as="xs:string" select="'black'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/table.cell.border.style.xml b/xslt/params/table.cell.border.style.xml
index a9b5a722..3f249498 100644
--- a/xslt/params/table.cell.border.style.xml
+++ b/xslt/params/table.cell.border.style.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="table.cell.border.style">
 <refmeta>
 <refentrytitle>table.cell.border.style</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='table.cell.border.style.frag'>
-<xsl:param name="table.cell.border.style" select="'solid'"/>
+<xsl:param name="table.cell.border.style" as="xs:string" select="'solid'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/table.cell.border.thickness.xml b/xslt/params/table.cell.border.thickness.xml
index 73bc8109..8bac558f 100644
--- a/xslt/params/table.cell.border.thickness.xml
+++ b/xslt/params/table.cell.border.thickness.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="table.cell.border.thickness">
 <refmeta>
 <refentrytitle>table.cell.border.thickness</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='table.cell.border.thickness.frag'>
-<xsl:param name="table.cell.border.thickness" select="'1px'"/>
+<xsl:param name="table.cell.border.thickness" as="xs:string" select="'1px'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/table.footnote.number.format.xml b/xslt/params/table.footnote.number.format.xml
index 59c34534..ec87a2d8 100644
--- a/xslt/params/table.footnote.number.format.xml
+++ b/xslt/params/table.footnote.number.format.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="table.footnote.number.format">
 <refmeta>
 <refentrytitle>table.footnote.number.format</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='table.footnote.number.format.frag'>
-<xsl:param name="table.footnote.number.format" select="'a'"/>
+<xsl:param name="table.footnote.number.format" as="xs:string" select="'a'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/table.footnote.number.symbols.xml b/xslt/params/table.footnote.number.symbols.xml
index af726474..5166d2a3 100644
--- a/xslt/params/table.footnote.number.symbols.xml
+++ b/xslt/params/table.footnote.number.symbols.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="table.footnote.number.symbols">
 <refmeta>
 <refentrytitle>table.footnote.number.symbols</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='table.footnote.number.symbols.frag'>
-<xsl:param name="table.footnote.number.symbols" select="''"/>
+<xsl:param name="table.footnote.number.symbols" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/table.frame.default.xml b/xslt/params/table.frame.default.xml
index c83d5486..5bbc42a3 100644
--- a/xslt/params/table.frame.default.xml
+++ b/xslt/params/table.frame.default.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="table.frame.default">
 <refmeta>
 <refentrytitle>table.frame.default</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='table.frame.default.frag'>
-<xsl:param name="table.frame.default" select="'all'"/>
+<xsl:param name="table.frame.default" as="xs:string" select="'all'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/table.html.cellpadding.xml b/xslt/params/table.html.cellpadding.xml
index 5f10d6d8..04d692b1 100644
--- a/xslt/params/table.html.cellpadding.xml
+++ b/xslt/params/table.html.cellpadding.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="table.html.cellpadding">
 <refmeta>
 <refentrytitle>table.html.cellpadding</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='table.html.cellpadding.frag'>
-<xsl:param name="table.html.cellpadding" select="''"/>
+<xsl:param name="table.html.cellpadding" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/table.html.cellspacing.xml b/xslt/params/table.html.cellspacing.xml
index 7f9a0b7c..71ed82b4 100644
--- a/xslt/params/table.html.cellspacing.xml
+++ b/xslt/params/table.html.cellspacing.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="table.html.cellspacing">
 <refmeta>
 <refentrytitle>table.html.cellspacing</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='table.html.cellspacing.frag'>
-<xsl:param name="table.html.cellspacing" select="''"/>
+<xsl:param name="table.html.cellspacing" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/table.properties.xml b/xslt/params/table.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/table.width.default.xml b/xslt/params/table.width.default.xml
index 7a64c618..37324619 100644
--- a/xslt/params/table.width.default.xml
+++ b/xslt/params/table.width.default.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="table.width.default">
 <refmeta>
 <refentrytitle>table.width.default</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='table.width.default.frag'>
-<xsl:param name="table.width.default" select="''"/>
+<xsl:param name="table.width.default" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/table.width.nominal.xml b/xslt/params/table.width.nominal.xml
index 31010f0e..af990cc2 100644
--- a/xslt/params/table.width.nominal.xml
+++ b/xslt/params/table.width.nominal.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="table.width.nominal">
 <refmeta>
 <refentrytitle>table.width.nominal</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='table.width.nominal.frag'>
-<xsl:param name="table.width.nominal" select="'6in'"/>
+<xsl:param name="table.width.nominal" as="xs:string" select="'6in'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/taskpart.title.properties.xml b/xslt/params/taskpart.title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/template.xml b/xslt/params/template.xml
index 47dbbded..6511ec91 100644
--- a/xslt/params/template.xml
+++ b/xslt/params/template.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="[[TEMPLATE]]">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="[[TEMPLATE]].frag">
-<xsl:param name="[[TEMPLATE]]" select="1"/>
+<xsl:param name="[[TEMPLATE]]" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/textdata.default.encoding.xml b/xslt/params/textdata.default.encoding.xml
index 23ef73c9..01d5a02a 100644
--- a/xslt/params/textdata.default.encoding.xml
+++ b/xslt/params/textdata.default.encoding.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="textdata.default.encoding">
 <refmeta>
 <refentrytitle>textdata.default.encoding</refentrytitle>
@@ -15,7 +16,7 @@ using textdata element</refpurpose>
 
 <refsynopsisdiv>
 <src:fragment xml:id='textdata.default.encoding.frag'>
-<xsl:param name="textdata.default.encoding" select="''"/>
+<xsl:param name="textdata.default.encoding" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/title.font.family.xml b/xslt/params/title.font.family.xml
index 1e99dc86..e8d79379 100644
--- a/xslt/params/title.font.family.xml
+++ b/xslt/params/title.font.family.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="title.font.family">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="title.font.family.frag">
-<xsl:param name="title.font.family" select="'sans-serif'"/>
+<xsl:param name="title.font.family" as="xs:string" select="'sans-serif'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/title.margin.left.xml b/xslt/params/title.margin.left.xml
index 3c263b84..2456efc8 100644
--- a/xslt/params/title.margin.left.xml
+++ b/xslt/params/title.margin.left.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="title.margin.left">
 <refmeta>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="title.margin.left.frag">
-<xsl:param name="title.margin.left" select="'0pt'"/>
+<xsl:param name="title.margin.left" as="xs:string" select="'0pt'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/title.properties.xml b/xslt/params/title.properties.xml
old mode 100755
new mode 100644
diff --git a/xslt/params/titlepage.templates.xml b/xslt/params/titlepage.templates.xml
index ac94245d..01e62918 100644
--- a/xslt/params/titlepage.templates.xml
+++ b/xslt/params/titlepage.templates.xml
@@ -1,10 +1,10 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
-	   xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
-	   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	   xmlns:xlink="http://www.w3.org/1999/xlink"
-	   version="5.0"
-	   xml:id="titlepage.templates">
-
+	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
+	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	  version="5.0"
+	  xml:id="titlepage.templates">
 <refmeta>
 <refentrytitle>titlepage.templates</refentrytitle>
 <refmiscinfo role="type">uri</refmiscinfo>
@@ -16,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="titlepage.templates.frag">
-<xsl:param name="titlepage.templates" select="'titlepages.xml'"/>
+<xsl:param name="titlepage.templates" as="xs:string" select="'titlepages.xml'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/toc.list.type.xml b/xslt/params/toc.list.type.xml
index e3882e12..424eaf14 100644
--- a/xslt/params/toc.list.type.xml
+++ b/xslt/params/toc.list.type.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="toc.list.type">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="toc.list.type">
 <refmeta>
 <refentrytitle>toc.list.type</refentrytitle>
 <refmiscinfo role="type">list</refmiscinfo>
@@ -13,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="toc.list.type.frag">
-<xsl:param name="toc.list.type">dl</xsl:param>
+<xsl:param name="toc.list.type" as="xs:string" select="'dl'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/toc.max.depth.xml b/xslt/params/toc.max.depth.xml
index 95e265dc..8f588a18 100644
--- a/xslt/params/toc.max.depth.xml
+++ b/xslt/params/toc.max.depth.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="toc.max.depth">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="toc.max.depth">
 <refmeta>
 <refentrytitle>toc.max.depth</refentrytitle>
 <refmiscinfo role="type">integer</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="toc.max.depth.frag">
-<xsl:param name="toc.max.depth" select="8"/>
+<xsl:param name="toc.max.depth" as="xs:integer" select="8"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/toc.section.depth.xml b/xslt/params/toc.section.depth.xml
index 4c227466..65c1b196 100644
--- a/xslt/params/toc.section.depth.xml
+++ b/xslt/params/toc.section.depth.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="toc.section.depth">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="toc.section.depth">
 <refmeta>
 <refentrytitle>toc.section.depth</refentrytitle>
 <refmiscinfo role="type">integer</refmiscinfo>
@@ -11,7 +13,7 @@ in the TOC?</refpurpose>
 
 <refsynopsisdiv>
 <src:fragment xml:id="toc.section.depth.frag">
-<xsl:param name="toc.section.depth">2</xsl:param>
+<xsl:param name="toc.section.depth" as="xs:integer" select="2"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/ulink.footnotes.xml b/xslt/params/ulink.footnotes.xml
index f17c884a..a4b59de4 100644
--- a/xslt/params/ulink.footnotes.xml
+++ b/xslt/params/ulink.footnotes.xml
@@ -3,6 +3,7 @@
           xmlns:xi="http://www.w3.org/2001/XInclude"
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0" xml:id="ulink.footnotes">
 <refmeta>
 <refentrytitle>ulink.footnotes</refentrytitle>
@@ -15,13 +16,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="ulink.footnotes.frag">
-<xsl:param name="ulink.footnotes" select="0"/>
+<xsl:param name="ulink.footnotes" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsection><info><title>Description</title></info>
 
-<para>If non-zero, and if <parameter>ulink.show</parameter> also is non-zero,
+<para>If true, and if <parameter>ulink.show</parameter> also is non-zero,
 the URL of each <tag>ulink</tag> will appear as a footnote.</para>
 
 <note><para>DocBook 5 does not have an <tag>ulink</tag> element. When processing 
diff --git a/xslt/params/ulink.hyphenate.chars.xml b/xslt/params/ulink.hyphenate.chars.xml
index fb383692..dadce7e6 100644
--- a/xslt/params/ulink.hyphenate.chars.xml
+++ b/xslt/params/ulink.hyphenate.chars.xml
@@ -3,6 +3,7 @@
           xmlns:xi="http://www.w3.org/2001/XInclude"
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0" xml:id="ulink.hyphenate.chars">
 <refmeta>
 <refentrytitle>ulink.hyphenate.chars</refentrytitle>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="ulink.hyphenate.chars.frag">
-<xsl:param name="ulink.hyphenate.chars" select="'/'"/>
+<xsl:param name="ulink.hyphenate.chars" as="xs:string" select="'/'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/ulink.hyphenate.xml b/xslt/params/ulink.hyphenate.xml
index 0b7d4d1d..5f10d3b2 100644
--- a/xslt/params/ulink.hyphenate.xml
+++ b/xslt/params/ulink.hyphenate.xml
@@ -3,6 +3,7 @@
           xmlns:xi="http://www.w3.org/2001/XInclude"
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0" xml:id="ulink.hyphenate">
 <refmeta>
 <refentrytitle>ulink.hyphenate</refentrytitle>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="ulink.hyphenate.frag">
-<xsl:param name="ulink.hyphenate" select="''"/>
+<xsl:param name="ulink.hyphenate" as="xs:string" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/ulink.show.xml b/xslt/params/ulink.show.xml
index 6f90d580..8a597941 100644
--- a/xslt/params/ulink.show.xml
+++ b/xslt/params/ulink.show.xml
@@ -3,6 +3,7 @@
           xmlns:xi="http://www.w3.org/2001/XInclude"
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0" xml:id="ulink.show">
 <refmeta>
 <refentrytitle>ulink.show</refentrytitle>
@@ -15,13 +16,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="ulink.show.frag">
-<xsl:param name="ulink.show" select="1"/>
+<xsl:param name="ulink.show" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsection><info><title>Description</title></info>
 
-<para>If non-zero, the URL of each <tag>ulink</tag> will
+<para>If true, the URL of each <tag>ulink</tag> will
 appear after the text of the link. If the text of the link and the URL
 are identical, the URL is suppressed. </para>
 
diff --git a/xslt/params/unify.table.titles.xml b/xslt/params/unify.table.titles.xml
index 5a5f05d8..e2337f3c 100644
--- a/xslt/params/unify.table.titles.xml
+++ b/xslt/params/unify.table.titles.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="unify.table.titles">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="unify.table.titles">
 <refmeta>
 <refentrytitle>unify.table.titles</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="unify.table.titles.frag">
-<xsl:param name="unify.table.titles" select="'0'"/>
+<xsl:param name="unify.table.titles" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/use.embed.for.svg.xml b/xslt/params/use.embed.for.svg.xml
index f7c0874a..9f99ebf3 100644
--- a/xslt/params/use.embed.for.svg.xml
+++ b/xslt/params/use.embed.for.svg.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="use.embed.for.svg">
 <refmeta>
 <refentrytitle>use.embed.for.svg</refentrytitle>
@@ -14,13 +15,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='use.embed.for.svg.frag'>
-<xsl:param name="use.embed.for.svg" select="0"/>
+<xsl:param name="use.embed.for.svg" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If non-zero, an <tag>embed</tag> element will be created
+<para>If true, an <tag>embed</tag> element will be created
 for SVG figures. An <tag>object</tag> is
 <emphasis>always</emphasis> created, this parameter merely controls
 whether or not an additional <tag>embed</tag> is generated
diff --git a/xslt/params/use.extensions.xml b/xslt/params/use.extensions.xml
index 21364e4b..639b7b37 100644
--- a/xslt/params/use.extensions.xml
+++ b/xslt/params/use.extensions.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0" xml:id="use.extensions">
 <refmeta>
 <refentrytitle>use.extensions</refentrytitle>
@@ -14,13 +15,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id='use.extensions.frag'>
-<xsl:param name="use.extensions" select="'0'"/>
+<xsl:param name="use.extensions" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>If non-zero, extensions may be used. Each extension is
+<para>If true, extensions may be used. Each extension is
 further controlled by its own parameter. But if
 <parameter>use.extensions</parameter> is zero, no extensions will
 be used.
diff --git a/xslt/params/use.id.as.filename.xml b/xslt/params/use.id.as.filename.xml
index 5b4bad04..ae6b48eb 100644
--- a/xslt/params/use.id.as.filename.xml
+++ b/xslt/params/use.id.as.filename.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="use.id.as.filename">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="use.id.as.filename">
 <refmeta>
 <refentrytitle>use.id.as.filename</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,14 +12,14 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="use.id.as.filename.frag">
-<xsl:param name="use.id.as.filename" select="'0'"/>
+<xsl:param name="use.id.as.filename" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
 <para>If <parameter>use.id.as.filename</parameter>
-is non-zero, the filename of chunk elements that have IDs will be
+is true, the filename of chunk elements that have IDs will be
 derived from the ID value.
 </para>
 
diff --git a/xslt/params/use.role.as.xrefstyle.xml b/xslt/params/use.role.as.xrefstyle.xml
index 38509eb8..17b8b762 100644
--- a/xslt/params/use.role.as.xrefstyle.xml
+++ b/xslt/params/use.role.as.xrefstyle.xml
@@ -3,6 +3,7 @@
           xmlns:xi="http://www.w3.org/2001/XInclude"
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0" xml:id="use.role.as.xrefstyle">
 <refmeta>
 <refentrytitle>use.role.as.xrefstyle</refentrytitle>
@@ -16,13 +17,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="use.role.as.xrefstyle.frag">
-<xsl:param name="use.role.as.xrefstyle" select="1"/>
+<xsl:param name="use.role.as.xrefstyle" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsection><info><title>Description</title></info>
 
-<para>If non-zero, the <tag class="attribute">role</tag> attribute on
+<para>If true, the <tag class="attribute">role</tag> attribute on
 <tag>xref</tag> will be used to select the cross reference style.
 The <link xlink:href="http://www.oasis-open.org/docbook/">DocBook
 Technical Committee</link> recently added an
diff --git a/xslt/params/variablelist.as.blocks.xml b/xslt/params/variablelist.as.blocks.xml
index 71e1c98c..2a308536 100644
--- a/xslt/params/variablelist.as.blocks.xml
+++ b/xslt/params/variablelist.as.blocks.xml
@@ -3,6 +3,7 @@
           xmlns:xi="http://www.w3.org/2001/XInclude"
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0" xml:id="variablelist.as.blocks">
 <refmeta>
 <refentrytitle>variablelist.as.blocks</refentrytitle>
@@ -15,13 +16,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="variablelist.as.blocks.frag">
-<xsl:param name="variablelist.as.blocks" select="0"/>
+<xsl:param name="variablelist.as.blocks" as="xs:boolean" select="false()"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsection><info><title>Description</title></info>
 
-<para>If non-zero, <tag>variablelist</tag>s will be formatted as
+<para>If true, <tag>variablelist</tag>s will be formatted as
 blocks.</para>
 
 <para>If you have long terms, proper list markup in the FO case may produce
diff --git a/xslt/params/variablelist.max.termlength.xml b/xslt/params/variablelist.max.termlength.xml
index ff56a878..145908d7 100644
--- a/xslt/params/variablelist.max.termlength.xml
+++ b/xslt/params/variablelist.max.termlength.xml
@@ -3,6 +3,7 @@
           xmlns:xi="http://www.w3.org/2001/XInclude"
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0" xml:id="variablelist.max.termlength">
 <refmeta>
 <refentrytitle>variablelist.max.termlength</refentrytitle>
@@ -15,7 +16,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="variablelist.max.termlength.frag">
-<xsl:param name="variablelist.max.termlength">24</xsl:param>
+<xsl:param name="variablelist.max.termlength" as="xs:integer" select="24"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/variablelist.term.break.after.xml b/xslt/params/variablelist.term.break.after.xml
index 8472f5ec..3cb252d7 100644
--- a/xslt/params/variablelist.term.break.after.xml
+++ b/xslt/params/variablelist.term.break.after.xml
@@ -3,6 +3,7 @@
           xmlns:xi="http://www.w3.org/2001/XInclude"
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0" xml:id="variablelist.term.break.after">
 <refmeta>
 <refentrytitle>variablelist.term.break.after</refentrytitle>
@@ -16,18 +17,19 @@ multi-term <tag>varlistentry</tag>?</refpurpose>
 
 <refsynopsisdiv>
 <src:fragment xml:id="variablelist.term.break.after.frag">
-<xsl:param name="variablelist.term.break.after">0</xsl:param></src:fragment>
+<xsl:param name="variablelist.term.break.after" as="xs:boolean" select="false()"/>
+</src:fragment>
 </refsynopsisdiv>
 
 <refsection><info><title>Description</title></info>
 
-<para>Set a non-zero value for the
+<para>Set the
 <parameter>variablelist.term.break.after</parameter> parameter to
 generate a line break between <tag>term</tag>s in a
 multi-term <tag>varlistentry</tag>.</para>
 
 <note>
-<para>If you set a non-zero value for
+<para>If you set the
 <parameter>variablelist.term.break.after</parameter>, you may also
 want to set the value of the
 <parameter>variablelist.term.separator</parameter> parameter to an
diff --git a/xslt/params/variablelist.term.separator.xml b/xslt/params/variablelist.term.separator.xml
index f3df883b..67224f9c 100644
--- a/xslt/params/variablelist.term.separator.xml
+++ b/xslt/params/variablelist.term.separator.xml
@@ -3,6 +3,7 @@
           xmlns:xi="http://www.w3.org/2001/XInclude"
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0" xml:id="variablelist.term.separator">
 <refmeta>
 <refentrytitle>variablelist.term.separator</refentrytitle>
@@ -16,7 +17,8 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="variablelist.term.separator.frag">
-<xsl:param name="variablelist.term.separator">, </xsl:param></src:fragment>
+<xsl:param name="variablelist.term.separator" as="xs:string" select="', '"/>
+</src:fragment>
 </refsynopsisdiv>
 
 <refsection><info><title>Description</title></info>
diff --git a/xslt/params/verbatim.trim.blank.lines.xml b/xslt/params/verbatim.trim.blank.lines.xml
index aae38580..9b99bca4 100644
--- a/xslt/params/verbatim.trim.blank.lines.xml
+++ b/xslt/params/verbatim.trim.blank.lines.xml
@@ -2,6 +2,7 @@
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
           xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0" xml:id="verbatim.trim.blank.lines">
 <refmeta>
 <refentrytitle>verbatim.trim.blank.lines</refentrytitle>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="verbatim.trim.blank.lines.frag">
-<xsl:param name="verbatim.trim.blank.lines" select="1"/>
+<xsl:param name="verbatim.trim.blank.lines" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/verbosity.xml b/xslt/params/verbosity.xml
index 70f880b6..e5c46112 100644
--- a/xslt/params/verbosity.xml
+++ b/xslt/params/verbosity.xml
@@ -2,6 +2,7 @@
 	  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
 	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	  xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	  version="5.0"
 	  xml:id="verbosity">
 <refmeta>
@@ -14,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="verosity.frag">
-<xsl:param name="verbosity" select="0"/>
+<xsl:param name="verbosity" as="xs:integer" select="0"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xslt/params/writing.mode.xml b/xslt/params/writing.mode.xml
old mode 100755
new mode 100644
index b2012755..549ef391
--- a/xslt/params/writing.mode.xml
+++ b/xslt/params/writing.mode.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <refentry xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
           xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
           xmlns="http://docbook.org/ns/docbook"
           xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
           version="5.0"
           xml:id="writing.mode">
    <refmeta>
@@ -15,7 +15,7 @@
    </refnamediv>
    <refsynopsisdiv>
       <src:fragment xml:id="writing.mode.frag">
-<xsl:param name="writing.mode" select="f:gentext(/*[1], 'writing-mode')"
+<xsl:param name="writing.mode" as="xs:string" select="f:gentext(/*[1], 'writing-mode')"
                  xmlns:f="http://docbook.org/xslt/ns/extension"/>
       </src:fragment>
    </refsynopsisdiv>
@@ -23,4 +23,4 @@
       <title>Description</title>
       <para>FIXME: TBA</para>
    </refsect1>
-</refentry>
\ No newline at end of file
+</refentry>
diff --git a/xslt/params/xref.label-page.separator.xml b/xslt/params/xref.label-page.separator.xml
index d796d197..58dabb78 100644
--- a/xslt/params/xref.label-page.separator.xml
+++ b/xslt/params/xref.label-page.separator.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="xref.label-page.separator">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="xref.label-page.separator">
 <refmeta>
 <refentrytitle>xref.label-page.separator</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="xref.label-page.separator.frag">
-<xsl:param name="xref.label-page.separator"><xsl:text> </xsl:text></xsl:param>
+<xsl:param name="xref.label-page.separator" as="xs:string" select="' '"/>
 </src:fragment>
 </refsynopsisdiv>
 
@@ -19,15 +21,15 @@
 <para>
 This parameter allows you to control the punctuation of certain
 types of generated cross reference text.
-When cross reference text is generated for an 
-<tag class="element">xref</tag> or 
+When cross reference text is generated for an
+<tag class="element">xref</tag> or
 <tag class="element">olink</tag> element
 using an <tag class="attribute">xrefstyle</tag> attribute
 that makes use of the <literal>select:</literal> feature,
 and the selected components include both label and page
 but no title,
 then the value of this parameter is inserted between
-label and page number in the output.  
+label and page number in the output.
 If a title is included, then other separators are used.
 </para>
 
diff --git a/xslt/params/xref.label-title.separator.xml b/xslt/params/xref.label-title.separator.xml
index 5d7943d0..15e006bf 100644
--- a/xslt/params/xref.label-title.separator.xml
+++ b/xslt/params/xref.label-title.separator.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="xref.label-title.separator">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="xref.label-title.separator">
 <refmeta>
 <refentrytitle>xref.label-title.separator</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -10,7 +12,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="xref.label-title.separator.frag">
-<xsl:param name="xref.label-title.separator">: </xsl:param>
+<xsl:param name="xref.label-title.separator" as="xs:string" select="': '"/>
 </src:fragment>
 </refsynopsisdiv>
 
@@ -19,14 +21,14 @@
 <para>
 This parameter allows you to control the punctuation of certain
 types of generated cross reference text.
-When cross reference text is generated for an 
-<tag class="element">xref</tag> or 
+When cross reference text is generated for an
+<tag class="element">xref</tag> or
 <tag class="element">olink</tag> element
 using an <tag class="attribute">xrefstyle</tag> attribute
 that makes use of the <literal>select:</literal> feature,
 and the selected components include both label and title,
 then the value of this parameter is inserted between
-label and title in the output.  
+label and title in the output.
 </para>
 
 </refsect1>
diff --git a/xslt/params/xref.title-page.separator.xml b/xslt/params/xref.title-page.separator.xml
index 78476036..1243dcf1 100644
--- a/xslt/params/xref.title-page.separator.xml
+++ b/xslt/params/xref.title-page.separator.xml
@@ -1,4 +1,6 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="xref.title-page.separator">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="xref.title-page.separator">
 <refmeta>
 <refentrytitle>xref.title-page.separator</refentrytitle>
 <refmiscinfo role="type">string</refmiscinfo>
@@ -10,14 +12,13 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="xref.title-page.separator.frag">
-<xsl:param name="xref.title-page.separator"><xsl:text> </xsl:text></xsl:param>
+<xsl:param name="xref.title-page.separator" as="xs:string" select="' '"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>
-This parameter allows you to control the punctuation of certain
+<para>This parameter allows you to control the punctuation of certain
 types of generated cross reference text.
 When cross reference text is generated for an 
 <tag class="element">xref</tag> or 
diff --git a/xslt/params/xref.with.number.and.title.xml b/xslt/params/xref.with.number.and.title.xml
index a57152dc..e11e571c 100644
--- a/xslt/params/xref.with.number.and.title.xml
+++ b/xslt/params/xref.with.number.and.title.xml
@@ -1,4 +1,9 @@
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="xref.with.number.and.title">
+<refentry xmlns="http://docbook.org/ns/docbook"
+          xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
+          xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          version="5.0" xml:id="xref.with.number.and.title">
 <refmeta>
 <refentrytitle>xref.with.number.and.title</refentrytitle>
 <refmiscinfo role="type">boolean</refmiscinfo>
@@ -10,7 +15,7 @@
 
 <refsynopsisdiv>
 <src:fragment xml:id="xref.with.number.and.title.frag">
-<xsl:param name="xref.with.number.and.title" select="1"/>
+<xsl:param name="xref.with.number.and.title" as="xs:boolean" select="true()"/>
 </src:fragment>
 </refsynopsisdiv>