diff --git a/csl/aag.csl b/csl/aag.csl
index c35c19206..472d87de4 100644
--- a/csl/aag.csl
+++ b/csl/aag.csl
@@ -79,7 +79,7 @@
           </date>
         </if>
         <else>
-          <text value="n.d."/>
+	  <text term="no date"/>
         </else>
       </choose>
     </group>
diff --git a/csl/ama.csl b/csl/ama.csl
index d078f3228..5b760f6bd 100644
--- a/csl/ama.csl
+++ b/csl/ama.csl
@@ -20,6 +20,9 @@
       <label form="short" prefix=", " text-case="lowercase" suffix="."/>
     </names>
   </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first"/>
+  </macro>
   <macro name="author">
     <group suffix=".">
       <names variable="author">
@@ -28,7 +31,7 @@
 	<label form="short" prefix=" " suffix="" text-case="lowercase"/>
 	<substitute>
 	  <names variable="editor"/>
-	  <text value="Anon"/>
+	  <text macro="anon"/>
 	</substitute>
       </names>
     </group>
@@ -39,7 +42,7 @@
       <substitute>
 	<names variable="editor"/>
 	<names variable="translator"/>
-	<text value="Anon"/>
+	<text macro="anon"/>
       </substitute>
     </names>
   </macro>
@@ -82,7 +85,7 @@
 	  </date>
 	</if>
 	<else>
-	  <text value="n.d."/>
+	  <text term="no date"/>
 	</else>
       </choose>
     </group>
diff --git a/csl/apsa.csl b/csl/apsa.csl
index ba01e063b..5069b3aa9 100644
--- a/csl/apsa.csl
+++ b/csl/apsa.csl
@@ -20,9 +20,6 @@
       <label form="short" prefix=", " text-case="lowercase" suffix="."/>
     </names>
   </macro>
-  <macro name="anon">
-    <text value="Anon"/>
-  </macro>
   <macro name="author">
     <names variable="author">
       <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". "
@@ -83,7 +80,7 @@
 	  </date>
 	</if>
 	<else>
-	  <text value="n.d."/>
+	  <text term="no date"/>
 	</else>
       </choose>
     </group>
diff --git a/csl/art-history.csl b/csl/art-history.csl
index dd3cba8ad..b2b462ca8 100644
--- a/csl/art-history.csl
+++ b/csl/art-history.csl
@@ -46,9 +46,9 @@
     </date>
   </macro>
   <macro name="volumes">
-    <group>
+    <group delimiter=" ">
       <text variable="number-of-volumes"/>
-      <text value=" vols."/>
+      <text term="volume" form="short" plural="true"/>
     </group>
   </macro>
   <macro name="pageno">
diff --git a/csl/asa.csl b/csl/asa.csl
index 4828c9ef2..4c16e7802 100644
--- a/csl/asa.csl
+++ b/csl/asa.csl
@@ -27,7 +27,7 @@
     </names>
   </macro>
   <macro name="anon">
-    <text value="Anon"/>
+    <text term="anonymous" form="short" text-case="capitalize-first"/>
   </macro>
   <macro name="author">
     <names variable="author">
diff --git a/csl/chicago-author-date.csl b/csl/chicago-author-date.csl
index 0fe65a92c..92b3b95f7 100644
--- a/csl/chicago-author-date.csl
+++ b/csl/chicago-author-date.csl
@@ -26,7 +26,7 @@
     </names>
   </macro>
   <macro name="anon">
-    <text value="Anon"/>
+    <text term="anonymous" form="short" text-case="capitalize-first"/>
   </macro>
   <macro name="author">
     <names variable="author">
diff --git a/csl/cse.csl b/csl/cse.csl
index 593ad3ace..42060b71f 100644
--- a/csl/cse.csl
+++ b/csl/cse.csl
@@ -20,6 +20,9 @@
       <label form="long" prefix=", " text-case="lowercase" suffix="."/>
     </names>
   </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first"/>
+  </macro>
   <macro name="author">
     <group suffix=".">
       <names variable="author">
@@ -28,7 +31,7 @@
 	<label form="short" prefix=" " suffix="" text-case="lowercase"/>
 	<substitute>
 	  <names variable="editor"/>
-	  <text value="Anon"/>
+	  <text macro="anon"/>
 	</substitute>
       </names>
     </group>
@@ -39,7 +42,7 @@
       <substitute>
 	<names variable="editor"/>
 	<names variable="translator"/>
-	<text value="Anon"/>
+	<text macro="anon"/>
       </substitute>
     </names>
   </macro>
diff --git a/csl/harvard1.csl b/csl/harvard1.csl
index 2e244a4d4..2ac30ed9f 100644
--- a/csl/harvard1.csl
+++ b/csl/harvard1.csl
@@ -20,7 +20,7 @@
     </names>
   </macro>
   <macro name="anon">
-    <text value="Anon"/>
+    <text term="anonymous" form="short" text-case="capitalize-first"/>
   </macro>
   <macro name="author">
     <names variable="author">
@@ -81,7 +81,7 @@
 	</date>
       </if>
       <else>
-	<text value="n.d."/>
+	  <text term="no date"/>
       </else>
     </choose>
   </macro>
diff --git a/csl/harvard2.csl b/csl/harvard2.csl
index ebd856d65..728fb9f4a 100644
--- a/csl/harvard2.csl
+++ b/csl/harvard2.csl
@@ -19,6 +19,9 @@
       <label form="short" prefix=", " text-case="lowercase" suffix="."/>
     </names>
   </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first"/>
+  </macro>
   <macro name="author">
     <names variable="author">
       <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with="."
@@ -26,7 +29,7 @@
       <label form="short" prefix=" (" suffix=")." text-case="lowercase"/>
       <substitute>
 	<names variable="editor"/>
-	<text value="Anon"/>
+	<text macro="anon"/>
       </substitute>
     </names>
   </macro>
@@ -36,7 +39,7 @@
       <substitute>
 	<names variable="editor"/>
 	<names variable="translator"/>
-	<text value="Anon"/>
+	<text macro="anon"/>
       </substitute>
     </names>
   </macro>
@@ -79,7 +82,7 @@
 	  </date>
 	</if>
 	<else>
-	  <text value="n.d."/>
+	  <text term="no date"/>
 	</else>
       </choose>
     </group>
diff --git a/csl/harvard3.csl b/csl/harvard3.csl
index bc72708f3..21a2f6bf1 100644
--- a/csl/harvard3.csl
+++ b/csl/harvard3.csl
@@ -20,7 +20,7 @@
     </names>
   </macro>
   <macro name="anon">
-    <text value="Anon"/>
+    <text term="anonymous" form="short" text-case="capitalize-first"/>
   </macro>
   <macro name="author">
     <names variable="author">
@@ -85,7 +85,7 @@
 	</date>
       </if>
       <else>
-	<text value="n.d."/>
+	  <text term="no date"/>
       </else>
     </choose>
   </macro>
diff --git a/csl/history-theory.csl b/csl/history-theory.csl
index ca62512f8..676c9a48a 100644
--- a/csl/history-theory.csl
+++ b/csl/history-theory.csl
@@ -54,9 +54,9 @@
     </date>
   </macro>
   <macro name="volumes">
-    <group>
+    <group delimiter=" ">
       <text variable="number-of-volumes"/>
-      <text value=" vols."/>
+      <text term="volume" form="short" plural="true"/>
     </group>
   </macro>
   <macro name="pageno">
diff --git a/csl/iso690-author-date.csl b/csl/iso690-author-date.csl
index 66e97129b..20eeab2ee 100644
--- a/csl/iso690-author-date.csl
+++ b/csl/iso690-author-date.csl
@@ -26,7 +26,7 @@
     </names>
   </macro>
   <macro name="anon">
-    <text value="Anon"/>
+    <text term="anonymous" form="short" text-case="capitalize-first"/>
   </macro>
   <macro name="author">
     <names variable="author">
diff --git a/csl/ou-harvard.csl b/csl/ou-harvard.csl
index 9f52dd541..47a71354c 100644
--- a/csl/ou-harvard.csl
+++ b/csl/ou-harvard.csl
@@ -20,7 +20,7 @@
     </names>
   </macro>
   <macro name="anon">
-    <text value="Anon"/>
+    <text term="anonymous" form="short" text-case="capitalize-first"/>
   </macro>
   <macro name="author">
     <names variable="author">
@@ -83,7 +83,7 @@
 	</date>
       </if>
       <else>
-	<text value="n.d."/>
+	<text term="no date"/>
       </else>
     </choose>
   </macro>
diff --git a/csl/oxford-art.csl b/csl/oxford-art.csl
index 4caf8a216..f4b7ac4fe 100644
--- a/csl/oxford-art.csl
+++ b/csl/oxford-art.csl
@@ -74,9 +74,9 @@
     </date>
   </macro>
   <macro name="volumes">
-    <group>
+    <group delimiter=" ">
       <text variable="number-of-volumes"/>
-      <text value=" vols"/>
+      <text term="volume" form="short" plural="true"/>
     </group>
   </macro>
   <macro name="pageno">