diff --git a/modules/code-formatting.xml b/modules/code-formatting.xml
index bddae48..be1b3ab 100755
--- a/modules/code-formatting.xml
+++ b/modules/code-formatting.xml
@@ -6,13 +6,23 @@
 
 <stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
+
 	<!-- Inline code. -->
 	<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. -->
-		<common formats="/latex/xelatex/">\verb`<xsl:apply-templates />`</common>
-		<common formats="/html/xhtml/"><code><xsl:apply-templates /></code></common>
+		<!--
+			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.
+		-->
+		<common formats="/latex/xelatex/">
+			<xsl:text>\verb`</xsl:text>
+			<xsl:apply-templates />
+			<xsl:text>`</xsl:text>
+		</common>
+		<common formats="/html/xhtml/">
+			<code><xsl:apply-templates /></code>
+		</common>
 	</template>
 	
 	
@@ -28,7 +38,9 @@
 				<xsl:call-template name="newline-internal" />
 			</xsl:if>
 			<xsl:text>\begin{verbatim}</xsl:text>
+			<xsl:call-template name="newline-internal" />
 			<xsl:apply-templates />
+			<xsl:call-template name="newline-internal" />
 			<xsl:text>\end{verbatim}</xsl:text>
 			<xsl:call-template name="newline-internal" />
 			<xsl:if test="@allow-breaks = 'no'">
@@ -52,7 +64,9 @@
 		<common formats="/latex/xelatex/">
 			<xsl:call-template name="newline-internal" />
 			<xsl:text>\begin{verbatim}</xsl:text>
+			<xsl:call-template name="newline-internal" />
 			<xsl:apply-templates />
+			<xsl:call-template name="newline-internal" />
 			<xsl:text>\end{verbatim}</xsl:text>
 			<xsl:call-template name="newline-internal" />
 		</common>