diff --git a/modules/code-formatting.xml b/modules/code-formatting.xml
index 922ede3..6eabb77 100755
--- a/modules/code-formatting.xml
+++ b/modules/code-formatting.xml
@@ -15,9 +15,7 @@
 	<!-- Inline code. -->
 	<template name="code" match="code">
 		<!--
-			Inline code (using listings in LaTeX). In LaTeX we use `` as delimiters, as these seem the most unlikely to appear inside the inline code (unless we're doing shell script or similar).
-		
-			TODO (2012-02-22): Is there some way to get the template to figure out itself what delimiters to use for LaTeX, based on the content of the element? I'm thinking a list of possible delimiters, scan through it and use the first one that doesn't appear in the content. (What to do if you run out of delimiters?)
+			Inline code. LaTeX uses listings to display this; delimiters for \lstinline are chosen automatically, depending on the contents.
 		-->
 		<common formats="/latex/xelatex/">
 			<xsl:text>\lstinline</xsl:text>
@@ -29,18 +27,10 @@
 			<!--
 				We could just call choose-delimiter twice, but this avoids any possibility of weird corner cases where the second call returns a different delimiter from the first call. It's also slightly more efficient to only call the function once.
 			-->
-<!-- 
 			<xsl:variable name="code-delimiter" select="infosci:choose-delimiter( node() )" />
- -->
-			<xsl:text>`</xsl:text>
-<!-- 
  			<xsl:value-of select="$code-delimiter" />
- -->
 			<xsl:apply-templates />
-<!-- 
  			<xsl:value-of select="$code-delimiter" />
- -->
-			<xsl:text>`</xsl:text>
 		</common>
 		<common formats="/html/xhtml/">
 			<code><xsl:apply-templates /></code>
@@ -48,40 +38,40 @@
 	</template>
 	
 	
-<!-- 
+	<!--
+		Choose a valid delimiter for a LaTeX inline verbatim macro (e.g., \verb or \lstinline). "Valid" means that the delimiter can't occur in the source text. The function thus scans through a list of possible delimiters and looking for those that don't occur in the source text. It actually finds /all/ valid delimiters for the source text because of the effective parallel execution of for-each on sequences, but it only returns the first one found. If no valid delimiter can be found, the function raises an error and terminates the transformation.
+		
+		$source-text: The source text to be wrapped inside a \verb macro.
+	-->
 	<function name="infosci:choose-delimiter" as="xs:string">
-		<common formats="/html/xhtml/">
+		<common formats="/latex/xelatex/">
 			<xsl:param name="source-text" />
-			<xsl:variable name="possible-delimiters">
-				<xsl:sequence select="(	'`', '~', '!', '@', '#', '$', '%', '^',
-										'&', '(', ')', '-', '_', '=', '+', '[',
-										']', '{', '}', '|', ';', ':', '?' )" />
+			
+			<xsl:variable name="valid-delimiters">
+				<!--
+					The LaTeX documentation says that you can use any character as a delimiter except * (because there is a \verb* form). To keep things simple, we've restricted the possible delimiters to punctuation that can be easily expressed in XML.
+				-->
+				<xsl:for-each select="
+					'`', '~', '!', '@', '#', '$', '%', '^', '(', ')', '-', '_',
+					'=', '+', '[', ']', '{', '}', '\', '|', ';', ':', ',', '.',
+					'/', '?'">
+					<xsl:if test="not( contains( $source-text, . ) )">
+						<xsl:value-of select = "." />
+					</xsl:if>
+				</xsl:for-each>
 			</xsl:variable>
 			
-			<xsl:for-each select="$possible-delimiters">
-				<xsl:if test=>
-			</xsl:for-each>
+			<!-- $valid-delimiters will be empty if none were found. -->
+			<xsl:if test="string-length( $valid-delimiters ) = 0">
+				<xsl:message terminate="yes">
+					<xsl:text>ERROR: unable to determine a valid delimiter to use in \verb or \lstinline for the source text: </xsl:text>
+					<xsl:value-of select="$source-text" />
+				</xsl:message>
+			</xsl:if>
 			
-			<xsl:variable name="sign" select="
-				if ( matches( $unformatted-value, '^[-+]' ) )
-				then replace( $unformatted-value, '^([-+]).*', '$1' )
-				else ''" />
-			<xsl:variable name="left" select="
-				if ( matches( $unformatted-value, '^[-+]?\d+' ) )
-				then replace( $unformatted-value, '^[-+]?(\d+).*', '$1' )
-				else '0'" />
-			<xsl:variable name="right" select="
-				if ( matches ( $unformatted-value, '^[-+]?\d*\.\d+' ) )
-				then replace ( $unformatted-value, '^[-+]?\d*\.(\d+)', '$1' )
-				else ''" />
-			<xsl:sequence select="
-				concat(	$sign,
-						if ( string-length ( $left ) > 4 ) then infosci:separate-thousands( $left, 'l' ) else $left,
-						if ( $right != '' ) then '.' else '',
-						if ( string-length ( $right ) > 4 ) then infosci:separate-thousands( $right, 'r' ) else $right )" />
+			<xsl:sequence select="substring( $valid-delimiters, 1, 1 )" />
 		</common>
 	</function>
- -->
 	
 	
 	<!--
@@ -127,15 +117,17 @@
 	
 	
 	<!--
-		Inline verbatim text (as opposed to inline code, i.e., \verb in LaTeX). In LaTeX we use `` as delimiters, as these seem the most unlikely to appear inside the verbatim text.
-		
-		TODO (2012-02-22): Is there some way to get the template to figure out itself what delimiters to use for LaTeX, based on the content of the element? I'm thinking a list of possible delimiters, scan through it and use the first one that doesn't appear in the content. (What to do if you run out of delimiters?)
+		Inline verbatim text (as opposed to inline code). In LaTeX this equates to \verb; delimiters for this are chosen automatically, depending on the contents.
 	-->
 	<template name="inline-verbatim" match="inline-verbatim|verb">
 		<common formats="/latex/xelatex/">
-			<xsl:text>\verb`</xsl:text>
+			<!--
+				We could just call choose-delimiter twice, but this avoids any possibility of weird corner cases where the second call returns a different delimiter from the first call. It's also slightly more efficient to only call the function once.
+			-->
+			<xsl:variable name="verb-delimiter" select="infosci:choose-delimiter( node() )" />
+ 			<xsl:value-of select="$verb-delimiter" />
 			<xsl:apply-templates />
-			<xsl:text>`</xsl:text>
+ 			<xsl:value-of select="$verb-delimiter" />
 		</common>
 		<common formats="/html/xhtml/">
 			<code><xsl:apply-templates /></code>
@@ -144,7 +136,7 @@
 	
 	
 	<!--
-		This is for stuff that should unequivocally be treated verbatim (e.g., problem code). I'm pretty sure that previously this was distinguished from "code-block" because it (code-block) used to use listings instead of verbatim.  Now that they're both using verbatim there is probably no need for them both (but we might switch back to using listings for code-block).
+		This is for stuff that should unequivocally be treated verbatim (e.g., problem code).
 	-->
 	<template name="verbatim" match="verbatim|block-verbatim">
 		<common formats="/latex/xelatex/">