diff --git a/format-master.xml b/format-master.xml
index c766271..d891960 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -1400,8 +1400,12 @@
 		Note: this may produce an error if the file doesn't exist. The
 		XSLT processor should be able to continue from this, however.
 	-->
-	<template name="environment" match="environment[@file]">
-		<xsl:apply-templates select="document(@file)/environment/*"/>
+	<template name="environment" match="environment[not(@file)]">
+		<common><xsl:apply-templates/></common>
+	</template>
+
+	<template name="environment-file" match="environment[@file]">
+		<common><xsl:apply-templates select="document(@file)/environment/*"/></common>
 	</template>
 	
 	<!--
@@ -1413,7 +1417,7 @@
 		<latex>\usepackage<xsl:if test="@options">[<xsl:value-of select="@options"/>]</xsl:if>{<xsl:value-of select="."/>}</latex>
 	</template>
 		
-	<template name="latex-command" match="latex-packages/command">
+	<template name="latex-command" match="latex-commands/command">
 		<latex><xsl:value-of select="."/></latex>
 	</template>