diff --git a/format-master.xml b/format-master.xml
index 69dbc80..5d86453 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -375,143 +375,12 @@
 	<!-- Greek characters. -->
 	<include href="modules/greek-characters.xml" />
 
-	<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>
-		<!-- U+2205 EMPTY SET -->
-		<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>
-		<!-- U+2208 ELEMENT OF -->
-		<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>
-		<!-- U+2209 NOT AN ELEMENT OF -->
-		<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>
-		<!-- U+2282 SUBSET OF -->
-		<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>
-		<!-- U+2283 SUPERSET OF -->
-		<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>
+	<!-- Mathematical operators and symbols. -->
+	<include href="modules/mathematical-symbols.xml" />
 
 	<!-- Relational algebra operators. -->
 	<include href="modules/relational-algebra.xml" />
 
-	<template name="intersect-operator" match="intersect-operator|intersect|intersection|cap">
-		<common formats="/latex/xelatex/">\ensuremath{\cap}</common>
-		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
-		<html><xsl:text disable-output-escaping="yes"> &amp;cap; </xsl:text></html>
-		<!-- U+2229 INTERSECTION -->
-		<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. -->
-		<html><xsl:text disable-output-escaping="yes"> &amp;cup; </xsl:text></html>
-		<!-- U+222A UNION -->
-		<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. -->
-		<html><xsl:text disable-output-escaping="yes"> &amp;and; </xsl:text></html>
-		<!-- U+2227 LOGICAL AND -->
-		<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. -->
-		<html><xsl:text disable-output-escaping="yes"> &amp;or; </xsl:text></html>
-		<!-- U+2228 LOGICAL OR -->
-		<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>
-		<!-- U+00AC NOT SIGN -->
-		<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>
@@ -3091,172 +2960,6 @@
 	</template>
 	
 	<!--
-		Basic mathematical operators.
-		
-		We get around the problem of math vs. non-math mode
-		operators in LaTeX by liberally sprinkling \ensuremath
-		around. If we're not in math mode, it enables it, and if
-		we're already in math mode, it ignores it. This means we
-		don't need identical templates for math and non-math modes. Yay!
-
-		Do we really need <left-parenthesis> and <right-parenthesis>?
-		Maybe we're getting a little carried away with these :).
-	-->
-	<template name="plus-operator" match="plus">
-		<common>+</common>
-	</template>
-	
-	<template name="minus-operator" match="minus|subtract|minus-sign">
-		<common formats="/latex/xelatex/">\ensuremath{-}</common>
-		<html><xsl:text disable-output-escaping="yes">&amp;minus;</xsl:text></html>
-		<!-- U+2212 MINUS SIGN -->
-		<xhtml><span class="unicode"><xsl:text>−</xsl:text></span></xhtml>
-	</template>
-	
-	<template name="times-operator" match="times|multiply|multiplication|multiplication-sign">
-		<common formats="/latex/xelatex/">\ensuremath{\times}</common>
-		<html><xsl:text disable-output-escaping="yes">&amp;times;</xsl:text></html>
-		<!-- U+00D7 MULTIPLICATION SIGN -->
-		<xhtml><span class="unicode"><xsl:text>×</xsl:text></span></xhtml>
-	</template>
-	
-	<template name="divide-operator" match="divide|division|division-slash">
-		<common formats="/latex/xelatex/">\ensuremath{/}</common>
-		<html><xsl:text>/</xsl:text></html>
-		<!-- U+2215 DIVISION SLASH -->
-		<xhtml><span class="unicode"><xsl:text>∕</xsl:text></span></xhtml>
-	</template>
-	
-	<template name="equals-operator" match="equals|eq|equals-sign|equality">
-		<common formats="/latex/xelatex/">\ensuremath{=}</common>
-		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
-		<!-- U+003D EQUALS SIGN -->
-		<common formats="/html/xhtml/"><xsl:text> = </xsl:text></common>
-	</template>
-
-	<template name="not-equals-operator" match="not-equals|ne|inequality|not-equal-to">
-		<common formats="/latex/xelatex/">\ensuremath{\neq}</common>
-		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
-		<html><xsl:text disable-output-escaping="yes"> &amp;ne; </xsl:text></html>
-		<!-- U+2260 NOT EQUAL TO -->
-		<xhtml><xsl:text> ≠ </xsl:text></xhtml>
-	</template>
-
-	<template name="greater-than-operator" match="greater-than|gt|greater-than-sign">
-		<common formats="/latex/xelatex/">\ensuremath{&gt;}</common>
-		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
-		<common formats="/html/xhtml/"><xsl:text disable-output-escaping="yes"> &amp;gt; </xsl:text></common>
-	</template>
-
-	<template name="greater-equals-operator" match="greater-equals|ge|greater-than-or-equal-to">
-		<common formats="/latex/xelatex/">\ensuremath{\geq}</common>
-		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
-		<html><xsl:text disable-output-escaping="yes"> &amp;ge; </xsl:text></html>
-		<!-- U+2265 GREATER-THAN OR EQUAL TO -->
-		<xhtml><xsl:text> ≥ </xsl:text></xhtml>
-	</template>
-
-	<template name="less-than-operator" match="less-than|lt|less-than-sign">
-		<common formats="/latex/xelatex/"> \ensuremath{&lt;} </common>
-		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
-		<common formats="/html/xhtml/"><xsl:text disable-output-escaping="yes"> &amp;lt; </xsl:text></common>
-	</template>
-
-	<template name="less-equals-operator" match="less-equals|le">
-		<common formats="/latex/xelatex/"> \ensuremath{\leq} </common>
-		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
-		<html><xsl:text disable-output-escaping="yes"> &amp;le; </xsl:text></html>
-		<!-- U+2264 LESS-THAN OR EQUAL TO -->
-		<xhtml><xsl:text> ≤ </xsl:text></xhtml>
-	</template>
-
-	<template name="approximately-equals-operator" match="approximately-equals|approximately-equal-to|approx">
-		<common formats="/latex/xelatex/">\ensuremath{\approx}</common>
-		<html><xsl:text disable-output-escaping="yes">&amp;asymp;</xsl:text></html>
-		<xhtml><xsl:text>≈</xsl:text></xhtml>
-	</template>
-	
-	<!--
-		Can't include the Unicode name in the match list, because the template
-		handles more than one style of arrow. The closest we can manage is
-		"rightwards-arrow".
-	-->
-	<template name="right-arrow" match="right-arrow|rightarrow|implies|rarr|rarrow|rightwards-arrow">
-		<common formats="/latex/xelatex/">
-			<xsl:text>\ensuremath{\</xsl:text>
-			<xsl:choose>
-				<xsl:when test="@weight='double'">R</xsl:when>
-				<xsl:otherwise>r</xsl:otherwise>
-			</xsl:choose>
-			<xsl:text>ightarrow}</xsl:text>
-		</common>
-		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
-		<html>
-			<xsl:choose>
-				<xsl:when test="@weight='double'">
-					<xsl:text disable-output-escaping="yes"> &amp;rArr; </xsl:text>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:text disable-output-escaping="yes"> &amp;rarr; </xsl:text>
-				</xsl:otherwise>
-			</xsl:choose>
-		</html>
-		<xhtml>
-			<xsl:choose>
-				<xsl:when test="@weight='double'">
-					<!-- U+21D2 RIGHTWARDS DOUBLE ARROW -->
-					<span class="unicode">
-						<xsl:text> ⇒ </xsl:text>
-					</span>
-				</xsl:when>
-				<xsl:otherwise>
-					<!-- U+2192 RIGHTWARDS ARROW -->
-					<xsl:text> → </xsl:text>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xhtml>
-	</template>
-	
-	<!--
-		Can't include the Unicode name in the match list, because the template
-		handles more than one style of arrow. The closest we can manage is
-		"leftwards-arrow".
-	-->
-	<template name="left-arrow" match="left-arrow|leftarrow|larr|larrow|leftwards-arrow">
-		<common formats="/latex/xelatex/">
-			<xsl:text>\ensuremath{\</xsl:text>
-			<xsl:choose>
-				<xsl:when test="@weight='double'">L</xsl:when>
-				<xsl:otherwise>l</xsl:otherwise>
-			</xsl:choose>
-			<xsl:text>eftarrow}</xsl:text>
-		</common>
-		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
-		<html>
-			<xsl:choose>
-				<xsl:when test="@weight='double'">
-					<xsl:text disable-output-escaping="yes"> &amp;lArr; </xsl:text>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:text disable-output-escaping="yes"> &amp;larr; </xsl:text>
-				</xsl:otherwise>
-			</xsl:choose>
-		</html>
-		<xhtml>
-			<xsl:choose>
-				<xsl:when test="@weight='double'">
-					<!-- U+21D0 LEFTWARDS DOUBLE ARROW -->
-					<xsl:text> ⇐ </xsl:text>
-				</xsl:when>
-				<xsl:otherwise>
-					<!-- U+2190 LEFTWARDS ARROW -->
-					<xsl:text> ← </xsl:text>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xhtml>
-	</template>
-	
-	<!--
 		The equivalent of LaTeX's "log-like functions".
 		
 		@name: The name of the function. We assume the names used by
