diff --git a/format-master.xml b/format-master.xml
index 38aa9e1..7723aa7 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -157,58 +157,8 @@
 	
 	
 	<!-- Footnotes. -->
-	<template name="footnote" match="footnote">
-		<common formats="/latex/xelatex/">\footnote{<xsl:apply-templates />}</common>
-		<common formats="/html/xhtml/">
-			<a>
-				<xsl:attribute name="name">
-					<xsl:text>footnote-</xsl:text>
-					<xsl:number level="any" count="footnote" />
-					<xsl:text>-source</xsl:text>
-				</xsl:attribute>
-				<xsl:attribute name="href">
-					<xsl:text>#footnote-</xsl:text>
-					<xsl:number level="any" count="footnote" />
-					<xsl:text>-target</xsl:text>
-				</xsl:attribute>
-				<xsl:text>[</xsl:text>
-				<xsl:number level="any" count="footnote" />
-				<xsl:text>]</xsl:text>
-			</a>
-		</common>
-	</template>
-
-	<!-- This is only required for HTML, as LaTeX does it all for you. -->
-	<template name="footnote-list" match="footnote" mode="list">
-		<common formats="/html/xhtml/">
-			<p>
-				<a>
-					<xsl:attribute name="name">
-						<xsl:text>footnote-</xsl:text>
-						<xsl:number level="any" count="footnote" />
-						<xsl:text>-target</xsl:text>
-					</xsl:attribute>
-					<sup>
-						<xsl:text>[</xsl:text>
-						<xsl:number level="any" count="footnote" />
-						<xsl:text>]</xsl:text>
-					</sup>
-				</a>
-				<xsl:text> </xsl:text>
-				<xsl:apply-templates />
-				<xsl:text> </xsl:text>
-				<!-- Provide a back link to the original footnote marker. -->
-				<a>
-					<xsl:attribute name="href">
-						<xsl:text>#footnote-</xsl:text>
-						<xsl:number level="any" count="footnote" />
-						<xsl:text>-source</xsl:text>
-					</xsl:attribute>
-					<xsl:text>[Back]</xsl:text>
-				</a>
-			</p>
-		</common>
-	</template>
+	<include href="modules/footnotes.xml" />
+	
 
 	
 	<!-- Document preamble stuff: title, author, date. -->
@@ -420,45 +370,8 @@
 	
 	
 	
-	<!--
-		Anything inside an <omit> is also ignored completely.
-	-->
-	<template name="omit" match="omit" />
-
-	
-	<!--
-		Comments are not quite ignored completely, as they're carried through to the output document (kind of: "It is an error if instantiating the content of xsl:comment creates nodes other than text nodes.")
-	-->
-	<template name="comment" match="comment">
-		<common formats="/latex/xelatex/">
-			<xsl:text>
-\begin{comment}</xsl:text>
-				<xsl:apply-templates />
-				<xsl:text>\end{comment}
-</xsl:text>
-		</common>
-		<common formats="/html/xhtml/">
-			<xsl:comment>
-				<xsl:apply-templates />
-			</xsl:comment>
-		</common>
-	</template>
-	
-	
-	<!--
-		Meta-element for items that are not yet completed.
-	-->
-	<template name="todo" match="todo|to-do|incomplete|check">
-		<common formats="/latex/xelatex/">
-			<xsl:text>\fbox{\textbf{!!</xsl:text>
-			<xsl:apply-templates />
-			<xsl:text>!!}}</xsl:text>
-		</common>
-		<common formats="/html/xhtml/">
-			<strong style="border: 1px solid black;">!!<xsl:apply-templates />!!</strong>
-		</common>
-	</template>
-	
+	<!-- Meta-elements. -->
+	<include href="modules/meta-elements.xml" />
 	
 	<!-- Tabular structures (LaTeX {tabular}, HTML <table>). -->
 	<include href="modules/tabular.xml" />
@@ -475,384 +388,27 @@
 	<!-- Images. -->
 	<include href="modules/images.xml" />
 	
+	<!-- Include other documents. -->
+	<include href="modules/inclusions.xml" />
 	
-	<!--
-		Include another XML/HTML/LaTeX document into the current one. If
-		you don't specify @type, it assumes the type of document that
-		you're currently generating (HTML or LaTeX).
+	<!-- LaTeX-specific stuff. -->
+	<include href="modules/latex.xml" />
+	
+	<!-- Embedding raw LaTeX or HTML code. -->
+	<include href="modules/native-code.xml" />
+	
+	<!-- Conditional processing depending on the format. -->
+	<include href="modules/conditional-processing.xml" />
 		
-		LaTeX documents are simply included using \input{...}.
-
-		HTML documents are a little trickier, as there's no equivalent
-		of \input{} in HTML, plus the XSLT processor always seems to
-		generate a DOCTYPE when producing HTML, whether you want it or
-		not, which means that you can only really include entire HTML
-		documents, rather than HTML fragments (maybe you can turn this
-		off?). The workaround currently is to embed the HTML document
-		inside an <object>.
-
-		A similar argument applies for plain text documents (such as
-		code listings) that we want to include, but are externally
-		generated and so can't just be embedded in the source XML.
-
-		@type: The type of the document to be included. [optional] Valid
-		values are:
-			"xml"
-			"html" [default for HTML]
-			"latex" [default for LaTeX]
-			"plain" (as in text/plain)
-		
-		@basename: Name of file to include (including suffix!).
-		[required]
-		
-		@location: Path to file to include. Note that this gets a /
-		appended to it. However, this shouldn't make any difference in
-		normal usage. [optional]
-	-->
-	<template name="include-document" match="include-document">
-		<common>
-			<!--
-				Work out the full path specification for the file
-				to be included = base-path + location + basename.
-			-->
-			<xsl:variable name="file">
-				<xsl:value-of select="$base-path" />
-				<xsl:text>/</xsl:text>			
-				<xsl:if test="@location">
-					<xsl:value-of select="@location" />
-					<xsl:text>/</xsl:text>
-				</xsl:if>
-				<xsl:value-of select="@basename" />
-			</xsl:variable>
-		</common>
-		<common formats="/html/xhtml/">
-			<div>
-				<xsl:attribute name="align">
-					<xsl:choose>
-						<xsl:when test="@align"><xsl:value-of select="@align" /></xsl:when>
-						<xsl:otherwise>left</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-				
-				<object data="{$file}">
-					<!-- Output text/html or text/plain as appropriate. -->
-					<xsl:attribute name="type">
-						<xsl:text>text/</xsl:text>
-						<xsl:choose>
-							<xsl:when test="@type"><xsl:value-of select="@type" /></xsl:when>
-							<xsl:otherwise><xsl:text>html</xsl:text></xsl:otherwise>
-						</xsl:choose>
-					</xsl:attribute>
-					<xsl:attribute name="width">
-						<xsl:choose>
-							<xsl:when test="@width"><xsl:value-of select="@width" /></xsl:when>
-							<xsl:otherwise><xsl:text>100%</xsl:text></xsl:otherwise>
-						</xsl:choose>
-					</xsl:attribute>
-					<xsl:attribute name="height">
-						<xsl:choose>
-							<xsl:when test="@height"><xsl:value-of select="@height" /></xsl:when>
-							<xsl:otherwise><xsl:text>100%</xsl:text></xsl:otherwise>
-						</xsl:choose>
-					</xsl:attribute>
-				</object>
-			</div>
-		</common>
-		<common formats="/latex/xelatex/">
-			<xsl:text>\</xsl:text>
-			<!--
-				Note that input text files are currently verbatim'd in
-				LaTeX. We may want to change this in future?
-			-->
-			<xsl:if test="@type = 'plain'">
-				<xsl:text>verbatim</xsl:text>
-			</xsl:if>
-			<xsl:text>input{</xsl:text>
-			<xsl:value-of select="$file" />
-			<xsl:text>}</xsl:text>
-		</common>
-	</template>
+	<!-- Mathematics. -->
+	<include href="modules/maths.xml" />
 	
-	<!--
-		Note that including XML documents is currently problematic,
-		as the document() function expects a valid XML document. 
-		Including XML fragments is impossible. XInclude will fix this,
-		once it is widely supported (not yet). Best to avoid this
-		completely for now.
-	-->
-	<template name="include-xml" match="include-document[@type='xml']">
-		<common>
-			<xsl:variable name="file">
-				<xsl:value-of select="$base-path" />
-				<xsl:text>/</xsl:text>
-				<xsl:if test="@location">
-					<xsl:value-of select="@location" />
-					<xsl:text>/</xsl:text>
-				</xsl:if>
-				<xsl:value-of select="@basename" />
-			</xsl:variable>
-			<xsl:apply-templates select="document($file,/)" />
-		</common>
-	</template>
-	
-
-	<!--
-		Environment setup. This enables you to define environment settings
-		(e.g., required LaTeX packages, etc.). We normally explicitly call
-		the sub-elements within this, so this template is empty to prevent
-		unwanted stuff accidentally being included in the output.
-	-->
-	<template name="environment" match="environment" />
-
-	<!--
-		Load a LaTeX package.
-		
-		@options: Any arguments to the package. [optional]
-	-->
-	<template name="latex-package" match="latex-packages/package">
-		<common formats="/latex/xelatex/">\usepackage<xsl:if test="@options">[<xsl:value-of select="@options" />]</xsl:if>{<xsl:value-of select="." />}</common>
-	</template>
-		
-	<!--
-		Execute a preamble LaTeX command. Use to set up things like
-		counters, fonts, hyperref options, etc.
-	-->
-	<template name="latex-command" match="latex-commands/command">
-		<common formats="/latex/xelatex/"><xsl:value-of select="." /></common>
-	</template>
-	
-	
-	<!--
-		LaTeX hyphenation. A space-delimited list of hyphenated words.
-	-->
-	<template name="latex-hyphenation" match="latex-commands/hyphenation">
-		<common formats="/latex/xelatex/">\hyphenation{<xsl:value-of select="." />}</common>
-	</template>
-	
-
-	<!--
-		Hmm, the following may be more complex than I thought...
-		External environment files sort of stuff it up. Perhaps
-		LaTeX document class stuff should be in attributes of the
-		document element?
-	-->
-	<!--
-		Specify LaTeX document class and options. The master stylesheet
-		specifies \documentclass[a4paper,12pt]{article}. Anything you
-		specify here will override that completely, so be sure to set
-		a4paper and 12pt if that's what you want.
-		
-		@options: The required document class options. [optional]
-	-->
-	<template name="latex-documentclass" match="latex-documentclass|documentclass">
-		<common formats="/latex/xelatex/">\documentclass[<xsl:value-of select="@options" />]{<xsl:value-of select="." />}</common>
-	</template>
-	<template name="latex-documentclass-options" match="latex-documentclass[@options]|documentclass[@options]">
-		<common formats="/latex/xelatex/">\documentclass[<xsl:value-of select="@options" />]{<xsl:value-of select="." />}</common>
-	</template>
-	
-	<!--
-		Specify additional LaTeX document class options (i.e., in
-		addition to the defaults). These should be a comma-separated
-		list of the required options. These will be appended to the
-		standard defaults (a4paper, 12pt).
-	-->
-	<template name="latex-document-options" match="latex-document-options">
-		<common formats="/latex/xelatex/"><xsl:apply-templates /></common>
-	</template>
-	
-	
-	<!--
-		Sometimes we might need to embed raw code to handle something tricky.
-	-->
-	<template name="raw-latex" match="raw-code[@format = 'latex']|raw-latex">
-		<common formats="/latex/xelatex/"><xsl:apply-templates /></common>
-	</template>
-		
-	<!--
-		This can be a tricky if the document being processed declares any
-		namespaces, as they generally end up attached to the first element
-		of the raw HTML. I haven't discovered a workaround yet :(.
-	-->
-	<template name="raw-html" match="raw-code[@format = 'html']|raw-html">
-		<common formats="/html/xhtml/"><xsl:copy-of select="*" /></common>
-	</template>
-		
-	<!--
-		Conditional processing depending on the format. It may appear redundant to have two templates, but this is the only way to ensure that the LaTeX template is empty in the HTML style sheet, and vice versa.
-		
-		Note the assumption that all LaTeX format names include the string 'latex' and all HTML format names include the string 'html'.
-		
-		@format: the format under which this XML is to be processed. [required]
-	-->
-	<template name="process-when-latex" match="process-when[ contains( @format, 'latex' ) ]">
-		<common formats="/latex/xelatex/"><xsl:apply-templates /></common>
-	</template>
-	
-	<template name="process-when-html" match="process-when[ contains( @format, 'html' ) ]">
-		<common formats="/html/xhtml/"><xsl:apply-templates /></common>
-	</template>
-	
-	
-	<!--
-		Basic maths stuff. Anything more complicated is... complicated.
-		We should probably be using MathML, but we still have to mangle
-		it into HTML regardless.
-		
-		@style: How to format the maths expression. Valid values are:
-			'inline' [default] display expression inline
-			'display' display expression in its own paragraph
-	-->
-	<template name="math-inline" match="math|math[@style='inline']">
-		<common formats="/latex/xelatex/">\(<xsl:apply-templates />\)</common>
-		<common formats="/html/xhtml/"><xsl:apply-templates /></common>
-	</template>
-	
-	<template name="math-display" match="math[@style='display']">
-		<common formats="/latex/xelatex/">\[<xsl:apply-templates />\]</common>
-		<common formats="/html/xhtml/"><p style="text-align: center;"><xsl:apply-templates /></p></common>
-	</template>
-
-	
-	<!-- Equation arrays -->
-	
-	<template name="equation-array" match="equation-array">
-		<common formats="/latex/xelatex/">
-			<xsl:text>\begin{eqnarray*}
-</xsl:text>
-			<xsl:apply-templates />
-			<xsl:text>\end{eqnarray*}</xsl:text>
-		</common>
-		<common formats="/html/xhtml/">
-			<table class="equation" border="0" style="margin-left: auto; margin-right: auto;"><xsl:apply-templates /></table>
-		</common>
-	</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">
-		<common formats="/latex/xelatex/">
-			<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>
-		</common>
-		<common formats="/html/xhtml/">
-			<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>
-		</common>
-	</template>
-	
-
-	<!-- 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">
-		<common formats="/latex/xelatex/">\textup{<xsl:apply-templates />}</common>
-		<common formats="/html/xhtml/"><xsl:apply-templates /></common>
-	</template>
-	
-	<!--
-		Calligraphic letters (upper case only for LaTeX).
-	-->
-	<template name="calligraphic-text" match="calligraphic|cursive">
-		<common formats="/latex/xelatex/">\ensuremath{\mathcal{<xsl:apply-templates />}}</common>
-		<common formats="/html/xhtml/"><font face="cursive"><xsl:apply-templates /></font></common>
-	</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). -->
-	<template name="digit-group-separator" match="digit-group-separator|digitsep">
-		<common><xsl:call-template name="thin-space" /></common>
-	</template>
-
-	<!-- Mathematical super- and subscript. -->
-	<template name="superscript-math" match="math//superscript">
-		<common formats="/latex/xelatex/">\ensuremath{^{<xsl:apply-templates />}}</common>
-		<common formats="/html/xhtml/"><sup><xsl:apply-templates /></sup></common>
-	</template>
-	
-	<template name="subscript-math" match="math//subscript">
-		<common formats="/latex/xelatex/">\ensuremath{_{<xsl:apply-templates />}}</common>
-		<common formats="/html/xhtml/"><sub><xsl:apply-templates /></sub></common>
-	</template>
-	
-	<!--
-		The equivalent of LaTeX's "log-like functions".
-		
-		@name: The name of the function. We assume the names used by
-		LaTeX here, as they work out correct anyway. There's actually
-		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">
-		<common formats="/latex/xelatex/">\ensuremath{\<xsl:value-of select="@name" />}</common>
-		<common formats="/html/xhtml/"><xsl:value-of select="@name" /></common>
-	</template>
-	
-	<!-- Any mathematical variable names. -->
-	<template name="math-variable" match="variable|var">
-		<common formats="/latex/xelatex/">\ensuremath{\mathit{<xsl:apply-templates />}}</common>
-		<common formats="/html/xhtml/"><i><xsl:apply-templates /></i></common>
-	</template>
-	
-	<!-- A displayed fraction. Is there a nicer way of doing this in HTML? -->
-	<template name="math-fraction" match="fraction">
-		<common formats="/latex/xelatex/">\ensuremath{\frac{<xsl:apply-templates select="numerator" />}{<xsl:apply-templates select="denominator" />}}</common>
-		<html>
-			<sup><xsl:apply-templates select="numerator" /></sup>
-			<xsl:text disable-output-escaping="yes">&amp;frasl;</xsl:text>
-			<sub><xsl:apply-templates select="denominator" /></sub>
-		</html>
-		<xhtml>
-			<sup><xsl:apply-templates select="numerator" /></sup>
-			<span class="unicode">
-				<!-- U+2044 FRACTION SLASH -->
-				<xsl:text>⁄</xsl:text>
-			</span>
-			<sub><xsl:apply-templates select="denominator" /></sub>
-		</xhtml>
-	</template>
-	
-	
-	<!--
-		Format a University paper code. These normally appear in the form
-		"SPOD 123", i.e., a space between the subject code and the paper
-		number.
-	-->
-	<template name="paper" match="paper">
-		<common>
-			<xsl:apply-templates select="subject-code" />
-			<xsl:text> </xsl:text>
-			<xsl:apply-templates select="paper-number" />
-		</common>
-	</template>
-	
-	<template name="subject-code" match="paper/subject-code">
-		<common><xsl:apply-templates /></common>
-	</template>
-		
-	<template name="paper-number" match="paper/paper-number">
-		<common><xsl:apply-templates /></common>
-	</template>
-	
+	<!-- Otago-specific items. -->
+	<include href="modules/otago-specific.xml" />
 	
 	<!-- Multi-column page layouts. -->
 	<include href="modules/multi-column.xml" />
 	
-	
-	<!--
-		Center stuff on the page.
-	-->
-	<template name="center" match="center|centering|centre|centring">
-		<common formats="/latex/xelatex/">
-			\begin{center}
-				<xsl:apply-templates />
-			\end{center}
-		</common>
-		<common formats="/html/xhtml/">
-			<div style="text-align: center;">
-				<xsl:apply-templates />
-			</div>
-		</common>
-	</template>
-	
-	
 	<!-- Bibliographies and reference lists. -->
 	<include href="modules/bibliography.xml" />