diff --git a/format-master.xml b/format-master.xml
index 962995c..757d269 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -72,11 +72,6 @@
 		<html><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></html>
 	</template>
 
-	<template name="non-breaking-space-math" match="non-breaking-space|nbsp" mode="math">
-		<latex>~</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></html>
-	</template>	
-	
 	<!--
 		Technically we don't need to disable output escaping for all of
 		these, but it's probably better to code them all consistently,
@@ -99,6 +94,12 @@
 		<latex>---</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#8212;</xsl:text></html>
 	</template>
+	
+	<!-- Use this for literal underscores that appear outside code blocks. Such things cause LaTeX to wig out. -->
+	<template name="underscore" match="underscore">
+		<latex>\_</latex>
+		<html>_</html>
+	</template>
 
 	<template name="apostrophe" match="apostrophe">
 		<latex>'</latex>
@@ -131,7 +132,7 @@
 	</template>
 
 	<template name="degree-sign" match="degree-sign|degrees">
-		<latex>\(^{\circ}\)</latex>
+		<latex>\ensuremath{^{\circ}}</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#176;</xsl:text></html>
 	</template>
 
@@ -146,16 +147,9 @@
 	</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... -->
-	<!-- Can we use XSLT modes to deal with this? -->
-	<!-- Looks like a "yes": -->
-	<template name="pi-math" match="pi" mode="math">
-		<latex>{\pi}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#960;</xsl:text></html>
-	</template>
-
-	<!-- When not in math mode: -->
-	<template name="pi-normal" match="pi">
-		<latex>\(\pi\)</latex>
+	<!-- Use \ensuremath to resolve the problem. -->
+	<template name="pi" match="pi">
+		<latex>\ensuremath{\pi}</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#960;</xsl:text></html>
 	</template>
 
@@ -166,7 +160,7 @@
 
 	<!-- Note: no equivalent of \triangleright in HTML, use right arrow instead. -->
 	<template name="menu-separator" match="menu-separator|menusep|menu/separator">
-		<latex> \(\triangleright\) </latex>
+		<latex> \ensuremath{\triangleright} </latex>
 		<html><xsl:text disable-output-escaping="yes"> &amp;#8594; </xsl:text></html>
 	</template>
 
@@ -203,6 +197,7 @@
 	<template name="code" match="code">
 		<!-- <latex>\code{<xsl:apply-templates/>}</latex> -->
 		<!-- Using \verb is quite handy because things like underscores don't bother it.  However, it seems it can't be used inside hyperlinks.   Maybe create another template that just does a \texttt on the contents? -->
+		<!-- OK, but then we need an <underscore> element to stop them from freaking LaTeX out. -->
 		<latex>\verb+<xsl:apply-templates/>+</latex>
 		<html><CODE><xsl:apply-templates/></CODE></html>
 	</template>
@@ -214,12 +209,12 @@
 	
 	<!-- Non-maths super- and subscript. -->
 	<template name="superscript" match="superscript">
-		<latex>\(^{<xsl:apply-templates/>}\)</latex>
+		<latex>\ensuremath{^{\mathrm{<xsl:apply-templates/>}}}</latex>
 		<html><SUP><xsl:apply-templates/></SUP></html>
 	</template>
 	
 	<template name="subscript" match="subscript">
-		<latex>\(_{<xsl:apply-templates/>}\)</latex>
+		<latex>\ensuremath{_{\mathrm{<xsl:apply-templates/>}}}</latex>
 		<html><SUB><xsl:apply-templates/></SUB></html>
 	</template>
 	
@@ -1534,13 +1529,13 @@
 		<math> on its own is assumed to be displayed in its own paragraph.
 	-->
 	<template name="math-inline" match="paragraph//math|para//math|p//math">
-		<latex>\(<xsl:apply-templates mode="math"/>\)</latex>
-		<html><xsl:apply-templates mode="math"/></html>
+		<latex>\(<xsl:apply-templates/>\)</latex>
+		<html><xsl:apply-templates/></html>
 	</template>
 	
 	<template name="math-display" match="math">
-		<latex>\[<xsl:apply-templates mode="math"/>\]</latex>
-		<html><P ALIGN="center"><xsl:apply-templates mode="math"/></P></html>
+		<latex>\[<xsl:apply-templates/>\]</latex>
+		<html><P ALIGN="center"><xsl:apply-templates/></P></html>
 	</template>
 
 	
@@ -1550,19 +1545,19 @@
 		<latex>
 			<xsl:text>\begin{eqnarray*}
 </xsl:text>
-			<xsl:apply-templates mode="math"/>
+			<xsl:apply-templates/>
 			<xsl:text>\end{eqnarray*}</xsl:text>
 		</latex>
 		<html>
-			<TABLE CLASS="equation" BORDER="0" ALIGN="CENTER"><xsl:apply-templates mode="math"/></TABLE>
+			<TABLE CLASS="equation" BORDER="0" ALIGN="CENTER"><xsl:apply-templates/></TABLE>
 		</html>
 	</template>
 
 
 	<!-- Hmm, LaTeX uses "&" as separators: how do we know if there's another cell coming?  Ah, but the LaTeX eqnarray can have no more than three columns, so there's no need to generalise. -->
-	<template match="equation-array/row" mode="math">
+	<template match="equation-array/row">
 		<latex>
-			<xsl:apply-templates select="left" mode="math"/><xsl:text disable-output-escaping="yes">	&amp;	</xsl:text><xsl:apply-templates select="middle" mode="math"/><xsl:text disable-output-escaping="yes">	&amp;	</xsl:text><xsl:apply-templates select="right" mode="math"/><xsl:text>	\\
+			<xsl:apply-templates select="left"/><xsl:text disable-output-escaping="yes">	&amp;	</xsl:text><xsl:apply-templates select="middle"/><xsl:text disable-output-escaping="yes">	&amp;	</xsl:text><xsl:apply-templates select="right"/><xsl:text>	\\
 \\
 </xsl:text>
 		</latex>
@@ -1573,9 +1568,9 @@
 	
 
 	<!-- Roman (upright) text inside math environments.  \mathrm sounds like it's probably more correct, but doesn't retain spaces (which \textup does). -->
-	<template name="math-text" match="text" mode="math">
-		<latex>\textup{<xsl:apply-templates mode="math"/>}</latex>
-		<html><xsl:apply-templates mode="math"/></html>
+	<template name="math-text" match="text">
+		<latex>\textup{<xsl:apply-templates/>}</latex>
+		<html><xsl:apply-templates/></html>
 	</template>
 	
 	<!-- Digit grouping separator character for large numbers.  SI conventions say this should be a space (but we could make it a comma if desired). -->
@@ -1585,128 +1580,81 @@
 		</common>
 	</template>
 
-	<template name="digit-group-separator-math" match="digit-group-separator|digitsep" mode="math">
-		<common>
-			<xsl:call-template name="non-breaking-space"/>
-		</common>
-	</template>
-	
 	<!-- Mathematical super- and subscript. -->
-	<template name="superscript-math" match="superscript" mode="math">
-		<latex>^{<xsl:apply-templates mode="math"/>}</latex>
-		<html><SUP><xsl:apply-templates mode="math"/></SUP></html>
+	<template name="superscript-math" match="math//superscript">
+		<latex>\ensuremath{^{<xsl:apply-templates/>}}</latex>
+		<html><SUP><xsl:apply-templates/></SUP></html>
 	</template>
 	
-	<template name="subscript-math" match="subscript" mode="math">
-		<latex>_{<xsl:apply-templates mode="math"/>}</latex>
-		<html><SUB><xsl:apply-templates mode="math"/></SUB></html>
+	<template name="subscript-math" match="math//subscript">
+		<latex>\ensuremath{_{<xsl:apply-templates/>}}</latex>
+		<html><SUB><xsl:apply-templates/></SUB></html>
 	</template>
 	
 	<!--
 		Basic mathematical operators.
-
-		Unfortunately we need to define math and non-math mode
-		versions of each template even when they're identical,
-		because if we're in math mode, non-math mode templates
-		are ignored (as far as I can tell anyway). There's no
-		such thing as mode="*" :(
 		
+		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 need <left-parenthesis> and <right-parenthesis>?
 		Maybe we're getting a little carried away with these :)
 	-->
-	<template name="plus-operator-math" match="plus" mode="math">
-		<common>+</common>
-	</template>
 	<template name="plus-operator" match="plus">
 		<common>+</common>
 	</template>
 	
-	<template name="minus-operator-math" match="minus" mode="math">
-		<common>-</common>
-	</template>
 	<template name="minus-operator" match="minus">
-		<latex>\(-\)</latex>
+		<latex>\ensuremath{-}</latex>
 		<html>-</html>
 	</template>
 	
-	<template name="times-operator-math" match="times" mode="math">
-		<latex>\times</latex>
-		<html><xsl:text disable-output-escaping="yes"> &amp;#215; </xsl:text></html>
-	</template>
 	<template name="times-operator" match="times">
-		<latex>\(\times\)</latex>
+		<latex>\ensuremath{\times}</latex>
 		<html><xsl:text disable-output-escaping="yes"> &amp;#215; </xsl:text></html>
 	</template>
 	
-	<template name="divide-operator-math" match="divide" mode="math">
-		<common>/</common>
-	</template>
 	<template name="divide-operator" match="divide">
 		<common>/</common>
 	</template>
 	
-	<template name="equals-operator-math" match="equals" mode="math">
-		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
-		<common> = </common>
-	</template>
 	<template name="equals-operator" match="equals">
+		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
 		<common> = </common>
 	</template>
 
-	<template name="greater-than-operator-math" match="greater-than|gt" mode="math">
-		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
-		<latex> &gt; </latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#62;</xsl:text></html>
-	</template>
 	<template name="greater-than-operator" match="greater-than|gt">
-		<latex> &gt; </latex>
+		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
+		<latex> \ensuremath{&gt;} </latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#62;</xsl:text></html>
 	</template>
 
-	<template name="greater-equals-operator-math" match="greater-equals|ge" mode="math">
-		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
-		<latex> \geq </latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8805;</xsl:text></html>
-	</template>
 	<template name="greater-equals-operator" match="greater-equals|ge">
-		<latex> \geq </latex>
+		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
+		<latex> \ensuremath{\geq} </latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#8805;</xsl:text></html>
 	</template>
 
-	<template name="less-than-operator-math" match="less-than|lt" mode="math">
-		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
-		<latex> &lt; </latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#60;</xsl:text></html>
-	</template>
 	<template name="less-than-operator" match="less-than|lt">
-		<latex> &lt; </latex>
+		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
+		<latex> \ensuremath{&lt;} </latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#60;</xsl:text></html>
 	</template>
 
-	<template name="less-equals-operator-math" match="less-equals|le" mode="math">
-		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
-		<latex> \leq </latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8804;</xsl:text></html>
-	</template>
 	<template name="less-equals-operator" match="less-equals|le">
-		<latex> \leq </latex>
+		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
+		<latex> \ensuremath{\leq} </latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#8804;</xsl:text></html>
 	</template>
 
-	<template name="approximately-equals-operator-math" match="approximately-equals|approximately-equal-to|approx" mode="math">
-		<latex>{\approx}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8776;</xsl:text></html>
-	</template>
 	<template name="approximately-equals-operator" match="approximately-equals|approximately-equal-to|approx">
-		<latex>\(\approx\)</latex>
+		<latex>\ensuremath{\approx}</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#8776;</xsl:text></html>
 	</template>
 	
-	<template name="degree-sign-math" match="degree-sign" mode="math">
-		<latex>^{\circ}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#176;</xsl:text></html>
-	</template>
-
 	<!--
 		The equivalent of LaTeX's "log-like functions".
 		
@@ -1715,21 +1663,21 @@
 		nothing to stop you using any name you like, except that it'll
 		probably die horribly in LaTeX :) [required]
 	-->
-	<template name="log-like-function" match="function" mode="math">
+	<template name="log-like-function" match="function">
 		<latex>\<xsl:value-of select="@name"/></latex>
 		<html><xsl:value-of select="@name"/></html>
 	</template>
 	
 	<!-- Any mathematical variable names. -->
-	<template name="math-variable" match="variable" mode="math">
-		<latex><xsl:apply-templates mode="math"/></latex>
-		<html><I><xsl:apply-templates mode="math"/></I></html>
+	<template name="math-variable" match="variable">
+		<latex><xsl:apply-templates/></latex>
+		<html><I><xsl:apply-templates/></I></html>
 	</template>
 	
 	<!-- A displayed fraction. Is there a nicer way of doing this in HTML? -->
-	<template name="math-fraction" match="fraction" mode="math">
-		<latex>\frac{<xsl:apply-templates select="numerator" mode="math"/>}{<xsl:apply-templates select="denominator" mode="math"/>}</latex>
-		<html><xsl:apply-templates select="numerator" mode="math"/><BIG> / </BIG><xsl:apply-templates select="denominator" mode="math"/></html>
+	<template name="math-fraction" match="fraction">
+		<latex>\frac{<xsl:apply-templates select="numerator"/>}{<xsl:apply-templates select="denominator"/>}</latex>
+		<html><xsl:apply-templates select="numerator"/><BIG> / </BIG><xsl:apply-templates select="denominator"/></html>
 	</template>
 	
 	
