diff --git a/format-master.xml b/format-master.xml
index 44b6f7a..f27a8b7 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -1023,14 +1023,20 @@
 	</template>
 
 	<template name="empty-hyperlink-url" match="hyperlink[@url and not(node())]">
-		<!-- Maybe we should be using the url package and \url{...}? -->
+		<!-- Note: not safe to use the url package here because \url{...} is fragile. -->
 		<latex>\href{<xsl:value-of select="@url"/>}{\texttt{<xsl:value-of select="@url"/>}}</latex>
 		<html><A HREF="{@url}"><CODE><xsl:value-of select="@url"/></CODE></A></html>
 	</template>
 	
 	<!-- A plain URL (i.e., not necessarily a hyperlink). -->
 	<template name="url" match="url|uri|email|e-mail|email-address|e-mail-address">
-		<!-- Maybe we should be using the url package and \url{...}? -->
+		<!--
+			Hmm, \url{...} appears to turn the URL into a non-functional
+			link in PDF output (probably an interaction with hyperref).
+			Not really what we want (as the link aspect is already dealt
+			with by the <hyperlink> templates), so we'll just use
+			\texttt{...}.
+		-->
 		<latex>\texttt{<xsl:apply-templates/>}</latex>
 		<html><CODE><xsl:apply-templates/></CODE></html>
 	</template>
