diff --git a/format-master.xml b/format-master.xml
index d0b0726..5c0e36e 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -29,7 +29,7 @@
 			'no' => don't indent.
 			otherwise => apply standard paragraph formatting. [default]
 	-->
-	<template name="paragraph" match="paragraph">
+	<template name="paragraph" match="paragraph|para|p">
 		<latex><xsl:text>
 
 
@@ -40,9 +40,6 @@
 		<!-- 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. -->
 		<html><P><xsl:apply-templates/></P></html>
 	</template>
-	<alias source="para" target="paragraph"/>
-	<alias source="p" target="paragraph"/>
-	
 	
 	<!-- Special characters (should maybe all be named, in case they need to be called explicitly with xsl:call-template) -->
 	<!-- I'd like to use the Unicode names for these; will look them up some time! -->
@@ -51,17 +48,20 @@
 		<html><BR/></html>
 	</template>
 	
-	<template name="page-break" match="page-break">
+	<template name="page-break" match="page-break|new-page">
 		<latex>\newpage</latex>
 	</template>
-	<alias source="new-page" target="page-break"/>
+	
+	<template name="non-breaking-space" match="non-breaking-space|nbsp">
+		<latex>~</latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></html>
+	</template>
 
-	<template name="non-breaking-space" match="non-breaking-space">
+	<template name="non-breaking-space-math" match="non-breaking-space" mode="math">
 		<latex>~</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></html>
 	</template>	
-	<alias source="nbsp" target="non-breaking-space"/>
-
+	
 	<!--
 		Technically we don't need to disable output escaping for all of
 		these, but it's probably better to code them all consistently,
@@ -69,26 +69,21 @@
 		&#160; for a non-breaking space) and which ones don't (e.g.,
 		&amp;).
 	-->
-	<template name="ellipsis-sign" match="ellipsis-sign">
+	<template name="ellipsis-sign" match="ellipsis-sign|etc|ellipsis|dots">
 		<latex>{\ldots}</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#8230;</xsl:text></html>
 	</template>
-	<alias source="etc" target="ellipsis-sign"/>
-	<alias source="ellipsis" target="ellipsis-sign"/>
-	<alias source="dots" target="ellipsis-sign"/>
 
 	<!-- Misc typographic symbols -->
-	<template name="endash" match="endash">	
+	<template name="endash" match="endash|en-dash">	
 		<latex>--</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#8211;</xsl:text></html>
 	</template>
-	<alias source="en-dash" target="endash"/>
 
-	<template name="emdash" match="emdash">
+	<template name="emdash" match="emdash|em-dash">
 		<latex>---</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#8212;</xsl:text></html>
 	</template>
-	<alias source="em-dash" target="emdash"/>
 
 	<template name="apostrophe" match="apostrophe">
 		<latex>'</latex>
@@ -110,23 +105,20 @@
 		<html><xsl:text disable-output-escaping="yes">&amp;amp;</xsl:text></html>
 	</template>
 
-	<template name="trademark-sign" match="trademark-sign">
+	<template name="trademark-sign" match="trademark-sign|trademark|TM">
 		<latex>{\texttrademark}</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#8482;</xsl:text></html>
 	</template>
-	<alias source="trademark" target="trademark-sign"/>
-	<alias source="TM" target="trademark-sign"/>
 
 	<template name="copyright-sign" match="copyright-sign">
 		<latex>{\copyright}</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#169;</xsl:text></html>
 	</template>
 
-	<template name="degree-sign" match="degree-sign">
+	<template name="degree-sign" match="degree-sign|degrees">
 		<latex>\(^{\circ}\)</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#176;</xsl:text></html>
 	</template>
-	<alias source="degrees" target="degree-sign"/>
 
 	<template name="section-sign" match="section-sign">
 		<latex>{\S}</latex>
@@ -152,18 +144,16 @@
 		<html><xsl:text disable-output-escaping="yes">&amp;#960;</xsl:text></html>
 	</template>
 
-	<template name="LaTeX" match="LaTeX">
+	<template name="LaTeX" match="LaTeX|latex">
 		<latex>{\LaTeX}</latex>
 		<html>L<SUP>A</SUP>T<SUB>E</SUB>X</html>
 	</template>
-	<alias source="latex" target="LaTeX"/>
 
 	<!-- Note: no equivalent of \triangleright in HTML, use right arrow instead. -->
-	<template name="menu-separator" match="menu-separator">
+	<template name="menu-separator" match="menu-separator|menusep">
 		<latex>\(\triangleright\)</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#8594;</xsl:text></html>
 	</template>
-	<alias source="menusep" target="menu-separator"/>
 
 	<template name="menu-item" match="menu/item">
 		<latex>\menuitem{<xsl:apply-templates/>}</latex>
@@ -216,11 +206,10 @@
 		Text that shouldn't be broken across a line (i.e., LaTeX \mbox).
 		Only really relevant for LaTeX because we can't control this in HTML.
 	-->
-	<template name="no-break" match="no-break">
+	<template name="no-break" match="no-break|mbox">
 		<latex>\mbox{<xsl:apply-templates/>}</latex>
 		<html><xsl:apply-templates/></html>
 	</template>
-	<alias source="mbox" target="no-break"/>
 
 	<!-- We can decide later whether to use plain verbatim or listings. -->
 	<template name="code-block" match="code-block">
@@ -254,7 +243,7 @@
 			'yes' => single quotes ('').
 			otherwise => double quotes (""). [default]
 	-->
-	<template name="single-quote" match="quote[@single='yes']">
+	<template name="single-quote" match="quote[@single='yes']|q[@single='yes']">
 		<latex>`<xsl:apply-templates/>'</latex>
 		<html>
 			<xsl:text disable-output-escaping="yes">&amp;#8216;</xsl:text>
@@ -262,7 +251,7 @@
 			<xsl:text disable-output-escaping="yes">&amp;#8217;</xsl:text>
 		</html>
 	</template>
-	<template name="double-quote" match="quote">
+	<template name="double-quote" match="quote|qq">
 		<latex>``<xsl:apply-templates/>''</latex>
 		<html>
 			<xsl:text disable-output-escaping="yes">&amp;#8220;</xsl:text>
@@ -299,15 +288,13 @@
 			</xsl:choose>
 		</common>
 	</template>
-	<alias source="q" target="single-quote"/>
-	<alias source="qq" target="double-quote"/>
 
 
 	<!-- Environments (in the LaTeX terminology): enumerated, ordered, and numbered lists. -->
 
 	<!-- Unordered lists -->
 	
-	<template name="itemised-list" match="itemised-list">
+	<template name="itemised-list" match="itemised-list|itemize|unordered-list|bulleted-list|bullet-list|bullet-points|UL|ul">
 		<latex>
 			\begin{itemize}
 				<xsl:apply-templates/>
@@ -320,16 +307,10 @@
 		</html>
 	</template>
 	
-	<alias source="itemize" target="itemised-list"/>
-	<alias source="unordered-list" target="itemised-list"/>
-	<alias source="bulleted-list" target="itemised-list"/>
-	<alias source="bullet-list" target="itemised-list"/>
-	<alias source="bullet-points" target="itemised-list"/>
-
 
 	<!-- Ordered lists -->
 	
-	<template name="enumerated-list" match="enumerated-list">
+	<template name="enumerated-list" match="enumerated-list|enumerate|ordered-list|numbered-list|question-list|OL|ol">
 		<latex>
 			\begin{enumerate}
 				<xsl:apply-templates/>
@@ -341,15 +322,10 @@
 			</OL>
 		</html>
 	</template>
-
-	<alias source="enumerate" target="enumerated-list"/>
-	<alias source="ordered-list" target="enumerated-list"/>
-	<alias source="numbered-list" target="enumerated-list"/>
-	<alias source="question-list" target="enumerated-list"/>
 	
 	
 	<!-- Definition or description lists. -->
-	<template name="definition-list" match="definition-list">
+	<template name="definition-list" match="definition-list|description-list|DL|dl">
 		<latex>
 			\begin{description}
 				<xsl:apply-templates mode="definition-list"/>
@@ -373,7 +349,6 @@
 <!-- 			</TABLE> -->
 		</html>
 	</template>
-	<alias source="description-list" target="definition-list"/>
 
 
 	<!-- List elements -->
@@ -394,13 +369,13 @@
 	<template name="definition-item" match="item" mode="definition-list">
 		<latex>
 			<xsl:text>\item[</xsl:text>
-			<xsl:apply-templates select="keyword"/>
+			<xsl:apply-templates select="keyword|topic|DT|dt"/>
 			<xsl:text>] </xsl:text>
-			<xsl:apply-templates select="definition|description|discourse"/>
+			<xsl:apply-templates select="definition|description|discourse|DD|dd"/>
 		</latex>
 		<html>
-			<DT><P><xsl:apply-templates select="keyword"/></P></DT>
-			<DD><xsl:apply-templates select="definition|description|discourse"/></DD>
+			<DT><P><xsl:apply-templates select="keyword|topic|DT|dt"/></P></DT>
+			<DD><xsl:apply-templates select="definition|description|discourse|DD|dd"/></DD>
 <!-- 			<TR VALIGN="TOP"> -->
 <!-- 				<TD><P><xsl:apply-templates select="keyword"/></P></TD> -->
 <!-- 				<TD><xsl:apply-templates select="definition|description|discourse"/></TD> -->
@@ -408,18 +383,17 @@
 		</html>
 	</template>
 	
-	<template name="keyword" match="keyword">
+	<template name="keyword" match="keyword|topic|DT|dt">
 		<latex><xsl:apply-templates/></latex>
 		<html><STRONG><xsl:apply-templates/></STRONG></html>
 	</template>
 	
-	<alias source="topic" target="keyword"/>
 	
 	<!--
 		Need to provide some context here as, e.g., <description> is also
 		used within <image>.
 	-->
-	<template name="definition" match="item/definition|item/description|item/discourse">
+	<template name="definition" match="item/definition|item/description|item/discourse|item/DD|item/dd">
 		<latex><xsl:apply-templates/></latex>
 		<html>
 			<xsl:choose>
@@ -992,15 +966,12 @@
 	</template>
 	
 	<!-- A plain URL (i.e., not necessarily a hyperlink). -->
-	<template name="url" match="url">
+	<template name="url" match="url|uri|email|e-mail|email-address|e-mail-address">
 		<!-- Maybe we should be using the url package and \url{...}? -->
 		<latex>\texttt{<xsl:apply-templates/>}</latex>
 		<html><CODE><xsl:apply-templates/></CODE></html>
 	</template>
 	
-	<alias source="uri" target="url"/>
-	<alias source="email" target="url"/>
-	<alias source="email-address" target="url"/>
 
 
 	<!--
@@ -1347,8 +1318,7 @@
 			<xsl:text>\begin{eqnarray*}
 </xsl:text>
 			<xsl:apply-templates mode="math"/>
-			<xsl:text>
-\end{eqnarray*}</xsl:text>
+			<xsl:text>\end{eqnarray*}</xsl:text>
 		</latex>
 		<html>
 			<TABLE CLASS="equation" BORDER="0" ALIGN="CENTER"><xsl:apply-templates mode="math"/></TABLE>
@@ -1360,7 +1330,8 @@
 	<template match="equation-array/row" mode="math">
 		<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:text>
+\\
+</xsl:text>
 		</latex>
 		<html>
 			<TR><TD ALIGN="RIGHT"><xsl:apply-templates select="left"/></TD><TD ALIGN="CENTER"><xsl:apply-templates select="middle"/></TD><TD ALIGN="LEFT"><xsl:apply-templates select="right"/></TD></TR>
@@ -1369,12 +1340,17 @@
 	
 
 	<!-- Digit grouping separator character for large numbers.  SI conventions say this should be a space (but we could make it a comma if desired). -->
+	<template name="digit-group-separator" match="digit-group-separator|digitsep">
+		<common>
+			<xsl:call-template name="non-breaking-space"/>
+		</common>
+	</template>
+
 	<template name="digit-group-separator" match="digit-group-separator">
 		<common>
 			<xsl:call-template name="non-breaking-space"/>
 		</common>
 	</template>
-	<alias source="digitsep" target="digit-group-separator"/>
 	
 	<!-- Mathematical super- and subscript. -->
 	<template name="superscript-math" match="superscript" mode="math">
@@ -1438,16 +1414,14 @@
 		<common> = </common>
 	</template>
 
-	<template name="approximately-equals-operator-math" match="approximately-equals" mode="math">
+	<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">
+	<template name="approximately-equals-operator" match="approximately-equals|approximately-equal-to|approx">
 		<latex>{\approx}</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#8776;</xsl:text></html>
 	</template>
-	<alias source="approximately-equal-to" target="approximately-equals-operator"/>
-	<alias source="approx" target="approximately-equals-operator"/>
 	
 	<template name="degree-sign-math" match="degree-sign" mode="math">
 		<latex>^{\circ}</latex>
