diff --git a/modules/basic-page-elements.xml b/modules/basic-page-elements.xml
index 9d23acd..2094758 100755
--- a/modules/basic-page-elements.xml
+++ b/modules/basic-page-elements.xml
@@ -27,11 +27,10 @@
 	<template name="paragraph" match="paragraph|para|p|P">
 		<common formats="/latex/xelatex/">
 			<!--
-				LaTeX delimits paragraphs with vertical whitespace, so we need to ensure plenty. A blank line before and after should be sufficient.
+				LaTeX delimits paragraphs with vertical whitespace, so we need to ensure plenty. A couple of blank lines before and after should be sufficient.
 			-->
-			<xsl:text>
-
-			</xsl:text>
+			<xsl:call-template name="newline-internal" />
+			<xsl:call-template name="newline-internal" />
 			<xsl:choose>
 				<xsl:when test="(@align = 'left') or (@align = 'right')">
 					<xsl:text>\begin{flush</xsl:text>
@@ -62,9 +61,8 @@
 					<xsl:text>\end{center}</xsl:text>
 				</xsl:when>
 			</xsl:choose>
-			<xsl:text>
-		
-			</xsl:text>
+			<xsl:call-template name="newline-internal" />
+			<xsl:call-template name="newline-internal" />
 		</common>
 		<!--
 			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 (not for XHTML, though!).
@@ -107,7 +105,7 @@
 	</template>
 
 	<!--
-		Whereas the "newline" template above is for line breaks intended to be displayed in the final document, this is for additional linebreaks in the generated LaTeX or HTML markup. This is used to avoid things like "\end{verbatim}\item" all on one line, not that this really matters in general, as the generated markup will be pretty messy anyway :).
+		Whereas the "newline" template above is for line breaks intended to be displayed in the final document, this is for additional linebreaks in the generated LaTeX or HTML markup. This is used to avoid things like "\end{verbatim}\item" all on one line, not that this really matters in general, as the generated markup will be pretty messy anyway, and TeX doesn't usually care :).
 		
 		This also makes any XSLT markup that generates internal newlines a lot tidier looking!
 	-->
@@ -148,7 +146,9 @@
 	<template name="page-break" match="page-break|new-page|newpage|pagebreak">
 		<common formats="/latex/xelatex/">
 			<xsl:if test="@print-caption = 'yes'">
-				<xsl:text>\begin{flushright}\emph{</xsl:text>
+				<xsl:text>\begin{flushright}</xsl:text>
+				<xsl:call-template name="newline-internal" />
+				<xsl:text>\emph{</xsl:text>
 				<xsl:choose>
 					<xsl:when test="@caption-text">
 						<xsl:value-of select="@caption-text" />
@@ -157,9 +157,13 @@
 						<xsl:text>continues over\ldots</xsl:text>
 					</xsl:otherwise>
 				</xsl:choose>
-				<xsl:text>}\end{flushright}</xsl:text>
+				<xsl:text>}</xsl:text>
+				<xsl:call-template name="newline-internal" />
+				<xsl:text>\end{flushright}</xsl:text>
+				<xsl:call-template name="newline-internal" />
 			</xsl:if>
 			<xsl:text>\newpage</xsl:text>
+			<xsl:call-template name="newline-internal" />
 		</common>
 	</template>
 	
@@ -206,6 +210,7 @@
 					</xsl:message>
 				</xsl:otherwise>
 			</xsl:choose>
+			<xsl:call-template name="newline-internal" />
 		</common>
 		<common formats="/html/xhtml/">
 			<!-- For the moment we'll just throw in a <br /> :). -->