diff --git a/format-master.xml b/format-master.xml
index e27df90..2ae7911 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -2,18 +2,38 @@
 <!-- This will mostly be a list of element names to match, along with the corresponding HTML and LaTeX handling XSLT code. -->
 <stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
+	<!--
+		Various "global" elements that are frequently used across all documents. Some are passed in as arguments to the stylesheet (e.g., paper number), while others are things that don't change that often, and are thus hard coded (e.g., Oracle version).
+		
+		The "strip" mode forms of the templates are for use in the context of an HTML <title> element (so the mode is only relevant to the HTML formats). Embedding HTML markup inside the <title> element causes the markup to appear verbatim in the window title, i.e., <title><em>foo</em> bar</title> will appear in the window title as "<em>foo</em> bar", not "foo bar". Putting the stylesheet into strip mode means that it will only output text nodes unless otherwise specified for a particular element. Generally the "strip" templates will simply call-template to the original, unless the original contains markup that needs to be eliminated (e.g., see OracleServer below).
+		
+		The downside of this approach, of course, is that you need "strip" mode templates for quite a lot of things, but that can't really be helped.
+	-->
+	
 	<template name="SubjectCode" match="SubjectCode">
 		<common>
 			<xsl:value-of select="$subject-code" />
 		</common>
 	</template>
 
+	<template name="SubjectCode-strip" match="SubjectCode" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="SubjectCode" />
+		</common>
+	</template>
+
 	<template name="PaperNumber" match="PaperNumber">
 		<common>
 			<xsl:value-of select="$paper-number" />
 		</common>
 	</template>
 
+	<template name="PaperNumber-strip" match="PaperNumber" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="PaperNumber" />
+		</common>
+	</template>
+
 	<template name="PaperCode" match="PaperCode">
 		<common>
 			<xsl:value-of select="$subject-code" />
@@ -22,6 +42,12 @@
 		</common>
 	</template>
 
+	<template name="PaperCode-strip" match="PaperCode" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="PaperCode" />
+		</common>
+	</template>
+	
 	<template name="PaperYear" match="PaperYear">
 		<common>
 			<!--
@@ -37,25 +63,55 @@
 		</common>
 	</template>
 
+	<template name="PaperYear-strip" match="PaperYear" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="PaperYear" />
+		</common>
+	</template>
+
 	<template name="PaperPeriod" match="PaperPeriod">
 		<common>
 			<xsl:value-of select="$paper-period" />
 		</common>
 	</template>
 
+	<template name="PaperPeriod-strip" match="PaperPeriod" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="PaperPeriod" />
+		</common>
+	</template>
+
 	<template name="OracleServer" match="OracleServer">
 		<common formats="/latex/xelatex/">Oracle11\textit{g}</common>
 		<common formats="/html/xhtml/">Oracle11<i>g</i></common>
 	</template>
 
+	<template name="OracleServer-strip" match="OracleServer" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:text>Oracle11g</xsl:text>
+		</common>
+	</template>
+
 	<template name="OracleServerRelease" match="OracleServerRelease">
 		<common>1</common>
 	</template>
 
+	<template name="OracleServerRelease-strip" match="OracleServerRelease" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="OracleServerRelease" />
+		</common>
+	</template>
+
 	<template name="OracleServerVersion" match="OracleServerVersion">
 		<common>11.1</common>
 	</template>
 
+	<template name="OracleServerVersion-strip" match="OracleServerVersion" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="OracleServerVersion" />
+		</common>
+	</template>
+
 	<template name="Blackboard" match="Blackboard">
 		<common>
 			<xsl:call-template name="hyperlink-internal">
@@ -65,18 +121,20 @@
 		</common>
 	</template>
 
+	<template name="Blackboard-strip" match="Blackboard" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:text>Blackboard</xsl:text>
+		</common>
+	</template>
+
 	<!--
 		Plain paragraph.
 		
-		@indent: Whether or not to indent this paragraph (probably only
-		relevant in LaTeX).
+		@indent: Whether or not to indent this paragraph (probably only relevant in LaTeX).
 			'no' => don't indent.
 			otherwise => apply standard paragraph formatting. [default]
 		
-		@align: How to align the paragraph. Note that these are
-		potentially distinct from the default action, e.g., specifying
-		align="left" will produce a flushleft environment in LaTeX,
-		which is not the same effect as not specifying an alignment.
+		@align: How to align the paragraph. Note that these are potentially distinct from the default action, e.g., specifying align="left" will produce a flushleft environment in LaTeX, which is not the same effect as not specifying an alignment.
 			'left' => left alignment
 			'center' => centered alignment
 			'right' => right alignment
@@ -115,11 +173,7 @@
 		<!-- HTML is weird about what things you cannot include inside paragraphs (e.g. lists of any kind).  However, the end P tag is optional, so one option might simply be not to output it. -->
 		<common formats="/html/xhtml/">
 			<!--
-				The HTMLStyle parameter is an Ugly Hack(tm) to ensure
-				that paragraphs are indented correctly inside definition
-				lists in HTML. I tried modes first, but they didn't work
-				correctly. Fortunately this only needs to be done with
-				paragraphs, so this will work fine.
+				The HTMLStyle parameter is an Ugly Hack(tm) to ensure that paragraphs are indented correctly inside definition lists in HTML. I tried modes first, but they didn't work correctly. Fortunately this only needs to be done with paragraphs, so this will work fine.
 			-->
 			<xsl:param name="HTMLStyle" />
 			<p>
@@ -146,7 +200,9 @@
 		<common formats="/html/xhtml/"><br /></common>
 	</template>
 
-	<!-- Whereas newline|line-break is for line breaks intended to be outputted in the final document, this is for additional linebreaks in the generated latex or HTML source (for stuff like avoiding "\end{verbatim}\item" all on one line). -->
+	<!--
+		Whereas newline|line-break is for line breaks intended to be output into the final document, this is for additional linebreaks in the generated latex or HTML source (for stuff like avoiding "\end{verbatim}\item" all on one line).
+	-->
 	<template name="newline-internal" match="newline-internal">
 		<common formats="/latex/xelatex/"><xsl:text>
 </xsl:text></common>
@@ -159,17 +215,9 @@
 	</template>
 	
 	<!--
-		Insert a space. Useful for the occasional case where two
-		elements occur next to each other with only a space separating
-		them (e.g., an <emph> immediately following a <quote>), and the
-		space gets gobbled by XSLT, producing leading to non-separated
-		words in the output. It doesn't seem very consistent as to when
-		it does and doesn't happen, unfortunately, but when it does
-		happen, inserting a <space /> will fix the problem.
-
-		This is analogous to putting a \ at the end of macros in LaTeX
-		to ensure that spaces after the macro aren't gobbled, and indeed,
-		this is what the LaTeX version of the markup produces.
+		Insert a space. Useful for the occasional case where two elements occur next to each other with only a space separating them (e.g., an <emph> immediately following a <quote>), and the space gets gobbled by XSLT, producing non-separated words in the output. It doesn't seem very consistent as to when it does and doesn't happen, unfortunately, but when it does happen, inserting a <space /> will fix the problem.
+		
+		This is analogous to putting a \ at the end of macros in LaTeX to ensure that spaces after the macro aren't gobbled, and indeed, this is what the LaTeX version of the markup produces.
 	-->
 	<template name="space" match="space">
 		<common formats="/latex/xelatex/"><xsl:text>\ </xsl:text></common>
@@ -177,6 +225,12 @@
 		<common formats="/html/xhtml/"><xsl:text> </xsl:text></common>
 	</template>
 
+	<template name="space-strip" match="space" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="space" />
+		</common>
+	</template>
+
 	<template name="non-breaking-space" match="non-breaking-space|nbsp|no-break-space">
 		<common formats="/latex/xelatex/">~</common>
 		<common formats="/html/xhtml/"><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></common>
@@ -211,21 +265,39 @@
 		<xhtml><xsl:text>…</xsl:text></xhtml>
 	</template>
 
+	<template name="ellipsis-sign-strip" match="ellipsis-sign|etc|ellipsis|dots|horizontal-ellipsis" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="ellipsis-sign" />
+		</common>
+	</template>
+
 	<!-- Misc typographic symbols -->
-	<template name="endash" match="endash|en-dash">	
+	<template name="endash" match="endash|en-dash|ndash|n-dash">	
 		<common formats="/latex/xelatex/">--</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;ndash;</xsl:text></html>
 		<!-- U+2013 EN DASH -->
 		<xhtml><xsl:text>–</xsl:text></xhtml>
 	</template>
 
-	<template name="emdash" match="emdash|em-dash">
+	<template name="endash-strip" match="endash|en-dash|ndash|n-dash" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="endash" />
+		</common>
+	</template>
+
+	<template name="emdash" match="emdash|em-dash|mdash|m-dash">
 		<common formats="/latex/xelatex/">---</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;mdash;</xsl:text></html>
 		<xhtml><xsl:text>—</xsl:text></xhtml>
 		<!-- U+2014 EM DASH -->
 	</template>
 	
+	<template name="emdash-strip" match="emdash|em-dash|mdash|m-dash" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="emdash" />
+		</common>
+	</template>
+
 	<!-- Use this for literal underscores that appear outside code blocks. Such things cause LaTeX to wig out. -->
 	<template name="underscore" match="underscore|low-line">
 		<common formats="/latex/xelatex/">\_</common>
@@ -233,12 +305,24 @@
 		<common formats="/html/xhtml/">_</common>
 	</template>
 
+	<template name="underscore-strip" match="underscore|low-line" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="underscore" />
+		</common>
+	</template>
+
 	<template name="backslash" match="backslash">
 		<common formats="/latex/xelatex/">\(\backslash\)</common>
 		<!-- U+005C REVERSE SOLIDUS -->
 		<common formats="/html/xhtml/">\</common>
 	</template>
 
+	<template name="backslash-strip" match="backslash" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="backslash" />
+		</common>
+	</template>
+
 	<template name="apostrophe" match="apostrophe|right-single-quotation-mark">
 		<common formats="/latex/xelatex/">'</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;rsquo;</xsl:text></html>
@@ -246,23 +330,47 @@
 		<xhtml><xsl:text>’</xsl:text></xhtml>
 	</template>
 
+	<template name="apostrophe-strip" match="apostrophe|right-single-quotation-mark" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="apostrophe" />
+		</common>
+	</template>
+
 	<template name="dollar" match="dollar|dollar-sign">
 		<common formats="/latex/xelatex/">{\$}</common>
 		<!-- U+0024 DOLLAR SIGN -->
 		<common formats="/html/xhtml/">$</common>
 	</template>
 
+	<template name="space-dollar" match="dollar|dollar-sign" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="dollar" />
+		</common>
+	</template>
+
 	<template name="percent-sign" match="percent-sign|percentage-sign|percent">
 		<common formats="/latex/xelatex/">{\%}</common>
 		<!-- U+0025 PERCENT SIGN -->
 		<common formats="/html/xhtml/">%</common>
 	</template>
 
+	<template name="percent-sign-strip" match="percent-sign|percentage-sign|percent" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="percent-sign" />
+		</common>
+	</template>
+
 	<template name="ampersand" match="ampersand">
 		<common formats="/latex/xelatex/">{\&amp;}</common>
 		<common formats="/html/xhtml/"><xsl:text disable-output-escaping="yes">&amp;amp;</xsl:text></common>
 	</template>
 
+	<template name="ampersand-strip" match="ampersand" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="ampersand" />
+		</common>
+	</template>
+
 	<template name="trademark-sign" match="trademark-sign|trademark|tm|trade-mark-sign">
 		<common formats="/latex/xelatex/">{\texttrademark}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;trade;</xsl:text></html>
@@ -270,6 +378,12 @@
 		<xhtml><xsl:text>™</xsl:text></xhtml>
 	</template>
 
+	<template name="trademark-sign-strip" match="trademark-sign|trademark|tm|trade-mark-sign" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="trademark-sign" />
+		</common>
+	</template>
+
 	<template name="copyright-sign" match="copyright-sign">
 		<common formats="/latex/xelatex/">{\copyright}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;copy;</xsl:text></html>
@@ -277,6 +391,12 @@
 		<xhtml><xsl:text>©</xsl:text></xhtml>
 	</template>
 
+	<template name="copyright-sign-strip" match="copyright-sign" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="copyright-sign" />
+		</common>
+	</template>
+
 	<template name="degree-sign" match="degree-sign|degrees">
 		<common formats="/latex/xelatex/">\ensuremath{^{\circ}}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;deg;</xsl:text></html>
@@ -284,6 +404,12 @@
 		<xhtml><xsl:text>°</xsl:text></xhtml>
 	</template>
 
+	<template name="degree-sign-strip" match="degree-sign|degrees" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="degree-sign" />
+		</common>
+	</template>
+
 	<template name="section-sign" match="section-sign">
 		<common formats="/latex/xelatex/">{\S}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;sect;</xsl:text></html>
@@ -291,12 +417,24 @@
 		<xhtml><xsl:text>§</xsl:text></xhtml>
 	</template>
 
+	<template name="section-sign-strip" match="section-sign" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="section-sign" />
+		</common>
+	</template>
+
 	<template name="sharp-sign" match="sharp|hash|number-sign">
 		<common formats="/latex/xelatex/">{\#}</common>
 		<!-- U+0023 NUMBER SIGN -->
 		<common formats="/html/xhtml/"><xsl:text>#</xsl:text></common>
 	</template>
 
+	<template name="sharp-sign-strip" match="sharp|hash|number-sign" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="sharp-sign" />
+		</common>
+	</template>
+
 	<template name="paragraph-sign" match="paragraph-sign|pilcrow|pilcrow-sign">
 		<common formats="/latex/xelatex/">{\P}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;para;</xsl:text></html>
@@ -304,18 +442,36 @@
 		<xhtml><xsl:text>¶</xsl:text></xhtml>
 	</template>
 
+	<template name="paragraph-sign-strip" match="paragraph-sign|pilcrow|pilcrow-sign" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="paragraph-sign" />
+		</common>
+	</template>
+
 	<template name="left-curly-bracket" match="left-curly-bracket|left-curly-brace|left-brace">
 		<common formats="/latex/xelatex/">\ensuremath{\{}</common>
 		<!-- U+007B LEFT CURLY BRACKET -->
 		<common formats="/html/xhtml/"><xsl:text>{</xsl:text></common>
 	</template>
 
+	<template name="left-curly-bracket-strip" match="left-curly-bracket|left-curly-brace|left-brace" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="left-curly-bracket" />
+		</common>
+	</template>
+
 	<template name="right-curly-bracket" match="right-curly-bracket|right-curly-brace|right-brace">
 		<common formats="/latex/xelatex/">\ensuremath{\}}</common>
 		<!-- U+007D LEFT CURLY BRACKET -->
 		<common formats="/html/xhtml/"><xsl:text>}</xsl:text></common>
 	</template>
 
+	<template name="right-curly-bracket-strip" match="right-curly-bracket|right-curly-brace|right-brace" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="right-curly-bracket" />
+		</common>
+	</template>
+
 	<!-- I think the pi symbol is only available in LaTeX in math mode, but if we're already in math mode, the extra $ signs will mess things up... -->
 	<!-- Use \ensuremath to resolve the problem. -->
 	<template name="epsilon" match="epsilon|greek-small-letter-epsilon">
@@ -324,24 +480,52 @@
 		<!-- U+03B5 GREEK SMALL LETTER EPSILON -->
 		<xhtml><span class="unicode"><xsl:text>ε</xsl:text></span></xhtml>
 	</template>
+
+	<template name="epsilon-strip" match="epsilon|greek-small-letter-epsilon" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="epsilon" />
+		</common>
+	</template>
+
 	<template name="pi" match="pi|greek-small-letter-pi">
 		<common formats="/latex/xelatex/">\ensuremath{\pi}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;pi;</xsl:text></html>
 		<!-- U+03C0 GREEK SMALL LETTER PI -->
 		<xhtml><span class="unicode"><xsl:text>π</xsl:text></span></xhtml>
 	</template>
+
+	<template name="pi-strip" match="pi|greek-small-letter-pi" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="pi" />
+		</common>
+	</template>
+
 	<template name="rho" match="rho|greek-small-letter-rho">
 		<common formats="/latex/xelatex/">\ensuremath{\rho}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;rho;</xsl:text></html>
 		<!-- U+03C1 GREEK SMALL LETTER RHO -->
 		<xhtml><span class="unicode"><xsl:text>ρ</xsl:text></span></xhtml>
 	</template>
+
+	<template name="rho-strip" match="rho|greek-small-letter-rho" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="rho" />
+		</common>
+	</template>
+
 	<template name="sigma" match="sigma|greek-small-letter-sigma">
 		<common formats="/latex/xelatex/">\ensuremath{\sigma}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;sigma;</xsl:text></html>
 		<!-- U+03C3 GREEK SMALL LETTER SIGMA -->
 		<xhtml><span class="unicode"><xsl:text>σ</xsl:text></span></xhtml>
 	</template>
+
+	<template name="sigma-strip" match="sigma|greek-small-letter-sigma" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="sigma" />
+		</common>
+	</template>
+
 	<template name="capital-phi" match="Phi|greek-capital-letter-phi">
 		<common formats="/latex/xelatex/">\ensuremath{\Phi}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Phi;</xsl:text></html>
@@ -349,6 +533,12 @@
 		<xhtml><span class="unicode"><xsl:text>Φ</xsl:text></span></xhtml>
 	</template>
 	
+	<template name="capital-phi-strip" match="Phi|greek-capital-letter-phi" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="capital-phi" />
+		</common>
+	</template>
+
 	<template name="empty-set-sign" match="empty-set-sign|empty-set|null">
 		<common formats="/latex/xelatex/">\ensuremath{\emptyset}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;empty;</xsl:text></html>
@@ -356,6 +546,12 @@
 		<xhtml><span class="unicode"><xsl:text>∅</xsl:text></span></xhtml>
 	</template>
 
+	<template name="empty-set-sign-strip" match="empty-set-sign|empty-set|null" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="empty-set-sign" />
+		</common>
+	</template>
+
 	<template name="element-sign" match="element-sign|element|element-of|is-element-of|is-an-element-of">
 		<common formats="/latex/xelatex/">\ensuremath{\in}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;isin;</xsl:text></html>
@@ -363,6 +559,12 @@
 		<xhtml><span class="unicode"><xsl:text>∈</xsl:text></span></xhtml>
 	</template>
 	
+	<template name="element-sign-strip" match="element-sign|element|element-of|is-element-of|is-an-element-of" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="element-sign" />
+		</common>
+	</template>
+
 	<template name="not-element-sign" match="not-element-sign|not-element|not-element-of|is-not-element-of|is-not-an-element-of|not-an-element-of">
 		<common formats="/latex/xelatex/">\ensuremath{\not\in}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;notin;</xsl:text></html>
@@ -370,6 +572,12 @@
 		<xhtml><span class="unicode"><xsl:text>∉</xsl:text></span></xhtml>
 	</template>
 	
+	<template name="not-element-sign-strip" match="not-element-sign|not-element|not-element-of|is-not-element-of|is-not-an-element-of|not-an-element-of" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="not-element-sign" />
+		</common>
+	</template>
+
 	<template name="subset-sign" match="subset-sign|subset|subset-of|is-subset-of|is-a-subset-of">
 		<common formats="/latex/xelatex/">\ensuremath{\subset}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;sub;</xsl:text></html>
@@ -377,6 +585,12 @@
 		<xhtml><span class="unicode"><xsl:text>⊂</xsl:text></span></xhtml>
 	</template>
 
+	<template name="subset-strip" match="subset-sign|subset|subset-of|is-subset-of|is-a-subset-of" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="subset-sign" />
+		</common>
+	</template>
+
 	<template name="superset-sign" match="superset-sign|superset|superset-of|is-superset-of|is-a-superset-of">
 		<common formats="/latex/xelatex/">\ensuremath{\supset}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;sup;</xsl:text></html>
@@ -384,6 +598,12 @@
 		<xhtml><span class="unicode"><xsl:text>⊃</xsl:text></span></xhtml>
 	</template>
 
+	<template name="superset-strip" match="superset-sign|superset|superset-of|is-superset-of|is-a-superset-of" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="superset-sign" />
+		</common>
+	</template>
+
 	<!--
 		Relational algebra operators. These are distinct from the basic Greek
 		characters, because they can have associated subscripts (i.e., they
@@ -689,6 +909,12 @@
 		<xhtml><span class="unicode"><xsl:text> ∩ </xsl:text></span></xhtml>
 	</template>
 
+	<template name="intersect-operator-strip" match="intersect-operator|intersect|intersection|cap" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="intersect-operator" />
+		</common>
+	</template>
+
 	<template name="union-operator" match="union-operator|union|cup">
 		<common formats="/latex/xelatex/">\ensuremath{\cup}</common>
 		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
@@ -697,6 +923,12 @@
 		<xhtml><span class="unicode"><xsl:text> ∪ </xsl:text></span></xhtml>
 	</template>
 
+	<template name="union-operator-strip" match="union-operator|union|cup" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="union-operator" />
+		</common>
+	</template>
+
 	<template name="logical-and-operator" match="logical-and-operator|logical-and|and|and-operator|hat|wedge">
 		<common formats="/latex/xelatex/">\ensuremath{\wedge}</common>
 		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
@@ -705,6 +937,12 @@
 		<xhtml><span class="unicode"><xsl:text> ∧ </xsl:text></span></xhtml>
 	</template>
 
+	<template name="logical-and-operator-strip" match="logical-and-operator|logical-and|and|and-operator|hat|wedge" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="logical-and-operator" />
+		</common>
+	</template>
+
 	<template name="logical-or-operator" match="logical-or-operator|logical-or|or|or-operator|vee">
 		<common formats="/latex/xelatex/">\ensuremath{\vee}</common>
 		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
@@ -713,6 +951,12 @@
 		<xhtml><span class="unicode"><xsl:text> ∨ </xsl:text></span></xhtml>
 	</template>
 
+	<template name="logical-or-operator-strip" match="logical-or-operator|logical-or|or|or-operator|vee" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="logical-or-operator" />
+		</common>
+	</template>
+
 	<template name="logical-not-operator" match="logical-not-operator|logical-negation-operator|logical-negation|logical-not|not|negation|neg|not-sign">
 		<common formats="/latex/xelatex/">\ensuremath{\neg}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;not;</xsl:text></html>
@@ -720,11 +964,21 @@
 		<xhtml><span class="unicode"><xsl:text>¬</xsl:text></span></xhtml>
 	</template>
 
+	<template name="logical-not-operator-strip" match="logical-not-operator|logical-negation-operator|logical-negation|logical-not|not|negation|neg|not-sign" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="logical-not-operator" />
+		</common>
+	</template>
+
 	<template name="LaTeX" match="LaTeX|latex">
 		<common formats="/latex/xelatex/">{\LaTeX}</common>
 		<common formats="/html/xhtml/">L<sup>A</sup>T<sub>E</sub>X</common>
 	</template>
 
+	<template name="LaTeX-strip" match="LaTeX|latex" mode="strip">
+		<common formats="/html/xhtml/">LaTeX</common>
+	</template>
+
 	<!-- Note: no equivalent of \triangleright in HTML, use right arrow instead. -->
 	<template name="menu-separator" match="menu-separator|menusep|menu/separator">
 		<common formats="/latex/xelatex/"> \ensuremath{\triangleright} </common>
@@ -734,6 +988,12 @@
 		<xhtml><span class="unicode"><xsl:text> ▹ </xsl:text></span></xhtml>
 	</template>
 
+	<template name="menu-separator-strip" match="menu-separator|menusep|menu/separator" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="menu-separator" />
+		</common>
+	</template>
+
 	<template name="menu-item" match="menu/item">
 		<common formats="/latex/xelatex/">\textbf{<xsl:apply-templates />}</common>
 		<common formats="/html/xhtml/"><b><xsl:apply-templates /></b></common>
@@ -769,13 +1029,13 @@
 		<html>
 			<xsl:choose>
 				<xsl:when test="@type = 'sad'">
-					<span class="unicode"><xsl:text>:(</xsl:text></span>
+					<xsl:text>:(</xsl:text>
 				</xsl:when>
 				<xsl:when test="@type = 'neutral' or @type = 'meh'">
 					<xsl:text>:|</xsl:text>
 				</xsl:when>
 				<xsl:otherwise>
-					<span class="unicode"><xsl:text>:)</xsl:text></span>
+					<xsl:text>:)</xsl:text>
 				</xsl:otherwise>
 			</xsl:choose>
 		</html>
@@ -797,6 +1057,12 @@
 		</xhtml>
 	</template>
 	
+	<template name="emoticon-strip" match="emoticon|smiley" mode="strip">
+		<common formats="/html/xhtml/">
+			<xsl:call-template name="emoticon" />
+		</common>
+	</template>
+
 	<!-- Special styles -->
 	<template name="emph" match="emph|em">
 		<common formats="/latex/xelatex/">\emph{<xsl:apply-templates />}</common>
@@ -1489,22 +1755,46 @@
 					<xsl:if test="$showanswers='yes'">Sample Solution for </xsl:if>
 				</xsl:when>
 			</xsl:choose>
+			<xsl:call-template name="PaperCode" />
+			<xsl:choose>
+				<xsl:when test="/document/@class = 'assignment'">
+					<xsl:text> Assignment </xsl:text>
+				</xsl:when>
+			</xsl:choose>
+			<xsl:value-of select="/document/@sequence-number" />
+			<xsl:text>: \\</xsl:text>
 			<xsl:apply-templates />
 			<xsl:text>}</xsl:text>
 		</common>
 		<!--
-			For HTML, strip out any formatting (e.g., emphasis), as this
-			is not interpreted within the <title> tag, resulting in raw
-			HTML markup in the window title. Ick. We do this by just
-			grabbing the values of all descendant text nodes.
+			For HTML, strip out any raw HTML formatting (e.g., emphasis), as this is not interpreted within the <title> tag, resulting in raw HTML markup in the window title. Ick. We do this by switching to "strip" mode.
 		-->
 		<common formats="/html/xhtml/">
+			<xsl:if test="$showanswers='yes'">
+				<xsl:choose>
+					<xsl:when test="( /document/@class = 'tutorial' ) or ( /document/@class = 'laboratory' )">
+						<xsl:text>Selected Answers for </xsl:text>
+					</xsl:when>
+					<xsl:when test="/document/@class = 'assignment'">
+						<xsl:text>Sample Solution for </xsl:text>
+					</xsl:when>
+				</xsl:choose>
+			</xsl:if>
+			<xsl:call-template name="PaperCode" />
 			<xsl:choose>
+				<xsl:when test="/document/@class = 'tutorial'">
+					<xsl:text> Tutorial </xsl:text>
+				</xsl:when>
+				<xsl:when test="/document/@class = 'laboratory'">
+					<xsl:text> Lab </xsl:text>
+				</xsl:when>
 				<xsl:when test="/document/@class = 'assignment'">
-					<xsl:if test="$showanswers='yes'">Sample Solution for </xsl:if>
+					<xsl:text> Assignment </xsl:text>
 				</xsl:when>
 			</xsl:choose>
-			<xsl:value-of select="." />
+			<xsl:value-of select="/document/@sequence-number" />
+			<xsl:text>: </xsl:text>
+			<xsl:apply-templates mode="strip" />
 		</common>
 	</template>
 
@@ -1519,42 +1809,67 @@
 	<template name="document-title" match="document/title">
 		<!-- Need to do something sensible for LaTeX here. -->
 		<common formats="/latex/xelatex/">
-			<!-- Under the LaTeX framework, the rest of the chapter title text is generated by LaTeX macros, so this is pretty simple. -->
-			<!-- I think this is broken? -->
+			<!--
+				Under the LaTeX framework, the rest of the chapter title text is generated by LaTeX macros, so this is pretty simple.
+				I think this is broken?
+				
+				In fact, I think that for LaTeX documents, this template isn't called at all?? Looking at xml2xslt.xsl, if the document's standalone, "preamble-title" is used, and otherwise, "chapter-title" is used.
+			-->
 			<xsl:if test="/document/@standalone = 'yes'"><xsl:apply-templates /></xsl:if>
 		</common>
 		<common formats="/html/xhtml/">
 			<h1>
+				<xsl:if test="$showanswers='yes'">
+					<xsl:choose>
+						<xsl:when test="( /document/@class = 'tutorial' ) or ( /document/@class = 'laboratory' )">
+							<xsl:text>Selected Answers for </xsl:text>
+						</xsl:when>
+						<xsl:when test="/document/@class = 'assignment'">
+							<xsl:text>Sample Solution for </xsl:text>
+						</xsl:when>
+					</xsl:choose>
+				</xsl:if>
+				<xsl:call-template name="PaperCode" />
 				<xsl:choose>
 					<xsl:when test="/document/@class = 'tutorial'">
-						<xsl:if test="$showanswers='yes'">Selected Answers for </xsl:if>
-						<xsl:call-template name="PaperCode" />
 						<xsl:text> Tutorial </xsl:text>
-						<xsl:value-of select="/document/@sequence-number" />
-						<xsl:text>: </xsl:text>
-						<br />
 					</xsl:when>
 					<xsl:when test="/document/@class = 'laboratory'">
-						<xsl:if test="$showanswers='yes'">Selected Answers for </xsl:if>
-						<xsl:call-template name="PaperCode" />
 						<xsl:text> Lab </xsl:text>
-						<xsl:value-of select="/document/@sequence-number" />
-						<xsl:text>: </xsl:text>
-						<br />
 					</xsl:when>
 					<xsl:when test="/document/@class = 'assignment'">
-						<xsl:if test="$showanswers='yes'">Sample Solution for </xsl:if>
+						<xsl:text> Assignment </xsl:text>
 					</xsl:when>
 				</xsl:choose>
+				<xsl:value-of select="/document/@sequence-number" />
+				<xsl:text>: </xsl:text>
 				<xsl:apply-templates />
 			</h1>
 		</common>
 	</template>
 
-	<!-- New template for tutorials and labs, which are essentially chapters when included in a course book, but are marked up as documents in themselves. -->
+	<!--
+		New template for tutorials and labs, which are essentially chapters when included in a course book, but are marked up as documents in themselves.
+	-->
 	<template name="chapter-title" match="document/title" mode="chapter">
+		<!--
+			TODO: For LaTeX, filling in the "INFO XXX Tutorial", etc., is currently done in the LaTeX layer in the infrastructure surrounding the \lab and \tutorial macros (i.e., it's magic). This derives from the historical origins of the handbook, and should be moved here for consistency. An initial attempt to just replace calls to \tutorial, etc., with \chapter didn't work properly, as these macros do other things as well, including internal munging of chapter handling. This Will Be Complicated :(.
+		-->
 		<common formats="/latex/xelatex/">
+			<xsl:choose>
+				<xsl:when test="/document/@class = 'tutorial'">
+					<xsl:text>\tutorial{</xsl:text>
+				</xsl:when>
+				<xsl:when test="/document/@class = 'laboratory'">
+					<xsl:text>\lab{</xsl:text>
+				</xsl:when>
+				<xsl:otherwise>
+					<!-- maybe we should assume that we're in a book documentclass and issue a \chapter here? -->
+					<xsl:text>\general{</xsl:text>
+				</xsl:otherwise>
+			</xsl:choose>
 			<xsl:apply-templates />
+			<xsl:text>}</xsl:text>
 		</common>
 		<common formats="/html/xhtml/">
 			<xsl:choose>