diff --git a/academy-of-management-review.csl b/academy-of-management-review.csl
index c197ff0522..1feb153727 100644
--- a/academy-of-management-review.csl
+++ b/academy-of-management-review.csl
@@ -85,7 +85,7 @@
       <if variable="URL">
         <text variable="URL"/>
         <group prefix=", ">
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="month" suffix=" "/>
             <date-part name="day" suffix=", "/>
             <date-part name="year"/>
@@ -98,7 +98,7 @@
     <choose>
       <if type="report thesis" match="any">
         <text variable="title" font-style="italic" font-weight="bold"/>
-        <group prefix=". " suffix="">
+        <group prefix=". ">
           <text variable="genre"/>
           <text variable="number" prefix=" No. "/>
         </group>
diff --git a/acm-sig-proceedings-long-author-list.csl b/acm-sig-proceedings-long-author-list.csl
index 222957e9d0..afe0b36bc0 100644
--- a/acm-sig-proceedings-long-author-list.csl
+++ b/acm-sig-proceedings-long-author-list.csl
@@ -101,7 +101,7 @@
         <else-if type="patent">
           <group delimiter=". ">
             <text variable="title"/>
-            <text variable="number" prefix=""/>
+            <text variable="number"/>
             <date variable="issued">
               <date-part name="month" form="short" suffix=". " strip-periods="true"/>
               <date-part name="day" suffix=", "/>
diff --git a/acm-sig-proceedings.csl b/acm-sig-proceedings.csl
index 9be4f35b9c..b8928dcb25 100644
--- a/acm-sig-proceedings.csl
+++ b/acm-sig-proceedings.csl
@@ -101,7 +101,7 @@
         <else-if type="patent">
           <group delimiter=". ">
             <text variable="title"/>
-            <text variable="number" prefix=""/>
+            <text variable="number"/>
             <date variable="issued">
               <date-part name="month" form="short" suffix=". " strip-periods="true"/>
               <date-part name="day" suffix=", "/>
diff --git a/acta-naturae.csl b/acta-naturae.csl
index 870745e750..d59a4fa29a 100644
--- a/acta-naturae.csl
+++ b/acta-naturae.csl
@@ -47,7 +47,7 @@
     </group>
   </macro>
   <macro name="access">
-    <group prefix="" suffix="">
+    <group>
       <text variable="URL"/>
     </group>
   </macro>
diff --git a/acta-neurochirurgica.csl b/acta-neurochirurgica.csl
index 2505432159..8dd279b154 100644
--- a/acta-neurochirurgica.csl
+++ b/acta-neurochirurgica.csl
@@ -143,7 +143,7 @@
           </group>
         </else-if>
         <else-if type="webpage">
-          <group delimiter="">
+          <group>
             <text prefix="In: " variable="container-title" suffix=". " form="short"/>
             <text variable="URL" suffix=". "/>
             <date variable="accessed">
@@ -160,7 +160,7 @@
           </group>
         </else-if>
         <else>
-          <group delimiter="">
+          <group>
             <text variable="container-title" form="short" suffix=" "/>
             <text variable="volume" suffix=":"/>
             <text variable="page" suffix="."/>
diff --git a/acta-ophthalmologica.csl b/acta-ophthalmologica.csl
index f04b41b304..1e7f83c1fe 100644
--- a/acta-ophthalmologica.csl
+++ b/acta-ophthalmologica.csl
@@ -44,7 +44,7 @@
       <if type="chapter paper-conference" match="none">
         <names variable="translator" delimiter=", " prefix=" (" suffix=")">
           <name delimiter="" and="symbol" delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
-          <label form="short" prefix=", " text-case="capitalize-first" suffix=""/>
+          <label form="short" prefix=", " text-case="capitalize-first"/>
           <substitute>
             <names variable="editor"/>
           </substitute>
@@ -400,7 +400,7 @@
     </sort>
     <layout>
       <group suffix=".">
-        <group delimiter="">
+        <group>
           <text macro="author"/>
           <text macro="issued"/>
         </group>
diff --git a/acta-palaeontologica-polonica.csl b/acta-palaeontologica-polonica.csl
index 38a77ca518..973658397e 100644
--- a/acta-palaeontologica-polonica.csl
+++ b/acta-palaeontologica-polonica.csl
@@ -198,7 +198,7 @@
             </group>
           </else-if>
           <else-if type="webpage" match="any">
-            <group delimiter="">
+            <group>
               <text variable="title" font-style="italic" suffix=". "/>
               <text variable="container-title" form="long" suffix=". "/>
               <text variable="URL" prefix="Downloaded from " suffix=" "/>
diff --git a/acta-pharmaceutica.csl b/acta-pharmaceutica.csl
index 92e9377886..04ebb84233 100644
--- a/acta-pharmaceutica.csl
+++ b/acta-pharmaceutica.csl
@@ -38,7 +38,7 @@
       <if type="chapter paper-conference" match="none">
         <names variable="translator" delimiter=", " prefix=" (" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="capitalize-first" suffix=""/>
+          <label form="short" prefix=", " text-case="capitalize-first"/>
           <substitute>
             <names variable="editor"/>
           </substitute>
diff --git a/acta-polytechnica.csl b/acta-polytechnica.csl
index 7d2f4e2e85..95c117938a 100644
--- a/acta-polytechnica.csl
+++ b/acta-polytechnica.csl
@@ -50,7 +50,7 @@
     <choose>
       <if variable="issued">
         <date variable="issued">
-          <date-part name="year" form="long" suffix=""/>
+          <date-part name="year" form="long"/>
         </date>
       </if>
       <else>
diff --git a/acta-universitatis-agriculturae-sueciae.csl b/acta-universitatis-agriculturae-sueciae.csl
index 07df3818c9..703cee2047 100644
--- a/acta-universitatis-agriculturae-sueciae.csl
+++ b/acta-universitatis-agriculturae-sueciae.csl
@@ -148,7 +148,7 @@
         </group>
       </if>
       <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
-        <group prefix=" " suffix="" delimiter=", ">
+        <group prefix=" " delimiter=", ">
           <text macro="edition"/>
           <group>
             <label variable="page" form="short" suffix=" "/>
diff --git a/administrative-science-quarterly.csl b/administrative-science-quarterly.csl
index 9d521c73f3..57b010a782 100644
--- a/administrative-science-quarterly.csl
+++ b/administrative-science-quarterly.csl
@@ -44,7 +44,7 @@
       <if type="chapter paper-conference" match="none">
         <names variable="translator" delimiter=", " prefix=" (" suffix=")">
           <name and="text" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " suffix=""/>
+          <label form="short" prefix=", "/>
           <substitute>
             <names variable="editor"/>
           </substitute>
diff --git a/aids.csl b/aids.csl
index bf0ba030e3..677e3152a2 100644
--- a/aids.csl
+++ b/aids.csl
@@ -59,7 +59,7 @@
             <text variable="URL"/>
             <group prefix=" (" suffix=")." delimiter=" ">
               <text term="accessed" text-case="lowercase"/>
-              <date variable="accessed" suffix="">
+              <date variable="accessed">
                 <date-part name="day" prefix=" "/>
                 <date-part name="month" prefix=" " form="short" strip-periods="true"/>
                 <date-part name="year"/>
diff --git a/allergy.csl b/allergy.csl
index 2b145435b5..129221c371 100644
--- a/allergy.csl
+++ b/allergy.csl
@@ -55,7 +55,7 @@
             <text variable="URL"/>
             <group prefix=" (" suffix=")." delimiter=" ">
               <text term="accessed" text-case="lowercase"/>
-              <date variable="accessed" suffix="">
+              <date variable="accessed">
                 <date-part name="day" prefix=" "/>
                 <date-part name="month" prefix=" " form="short" strip-periods="true"/>
                 <date-part name="year"/>
diff --git a/alternatives-to-animal-experimentation.csl b/alternatives-to-animal-experimentation.csl
index 46ee82fe39..091051596b 100644
--- a/alternatives-to-animal-experimentation.csl
+++ b/alternatives-to-animal-experimentation.csl
@@ -178,7 +178,7 @@
             <group prefix=" ">
               <text variable="volume" suffix=": "/>
             </group>
-            <group prefix="">
+            <group>
               <label variable="locator" suffix="." form="short" strip-periods="true"/>
               <text variable="page"/>
             </group>
diff --git a/american-anthropological-association.csl b/american-anthropological-association.csl
index 313fc012dc..6a188447b1 100644
--- a/american-anthropological-association.csl
+++ b/american-anthropological-association.csl
@@ -54,7 +54,7 @@
             <label form="short" prefix=", "/>
           </names>
         </group>
-        <!-- <group prefix="" delimiter=", ">
+        <!-- <group delimiter=", ">
 	     <names variable="editor translator" delimiter=", ">
 	     <name and="text" delimiter=", "/>
 	     <label form="short" prefix=", "/>
diff --git a/american-heart-association.csl b/american-heart-association.csl
index b8c73cfc12..964bd01993 100644
--- a/american-heart-association.csl
+++ b/american-heart-association.csl
@@ -30,7 +30,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
diff --git a/american-journal-of-archaeology.csl b/american-journal-of-archaeology.csl
index 6803e3a386..24727083e9 100644
--- a/american-journal-of-archaeology.csl
+++ b/american-journal-of-archaeology.csl
@@ -53,7 +53,7 @@
         <group prefix="," delimiter=", ">
           <choose>
             <if variable="author">
-              <text value="edited by" prefix=" " suffix=""/>
+              <text value="edited by" prefix=" "/>
               <names variable="editor">
                 <name and="text" delimiter=", "/>
               </names>
@@ -170,7 +170,7 @@
         <text variable="title" font-style="italic"/>
       </else-if>
       <else>
-        <text variable="title" prefix="" suffix=". " quotes="true"/>
+        <text variable="title" suffix=". " quotes="true"/>
       </else>
     </choose>
   </macro>
@@ -201,7 +201,7 @@
         <group prefix=". " delimiter=". ">
           <group>
             <text term="volume" form="short" text-case="capitalize-first"/>
-            <text variable="volume" font-style="italic" form="short" prefix=" " suffix=""/>
+            <text variable="volume" font-style="italic" form="short" prefix=" "/>
           </group>
           <group>
             <number variable="number-of-volumes" form="numeric"/>
@@ -334,7 +334,7 @@
       <key variable="issued"/>
       <key macro="contributors-short"/>
     </sort>
-    <layout prefix="" suffix="" delimiter="; ">
+    <layout delimiter="; ">
       <group delimiter=", ">
         <group delimiter=" ">
           <text macro="contributors-short"/>
diff --git a/american-journal-of-botany.csl b/american-journal-of-botany.csl
index 04f2f2d33e..aa239441f2 100644
--- a/american-journal-of-botany.csl
+++ b/american-journal-of-botany.csl
@@ -178,7 +178,7 @@
             <group prefix=" ">
               <text variable="volume" suffix=": "/>
             </group>
-            <group prefix="">
+            <group>
               <text variable="page"/>
             </group>
           </group>
diff --git a/american-journal-of-medical-genetics.csl b/american-journal-of-medical-genetics.csl
index c79a6b9302..b8d2f22988 100644
--- a/american-journal-of-medical-genetics.csl
+++ b/american-journal-of-medical-genetics.csl
@@ -78,7 +78,7 @@
     </choose>
   </macro>
   <macro name="publisher">
-    <group prefix="" delimiter=": " suffix="">
+    <group delimiter=": ">
       <text variable="publisher-place"/>
       <text variable="publisher"/>
     </group>
@@ -96,7 +96,7 @@
         </group>
       </if>
       <else>
-        <text variable="edition" suffix=""/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
diff --git a/american-journal-of-orthodontics-and-dentofacial-orthopedics.csl b/american-journal-of-orthodontics-and-dentofacial-orthopedics.csl
index e53f5ac1ba..c2cff58976 100644
--- a/american-journal-of-orthodontics-and-dentofacial-orthopedics.csl
+++ b/american-journal-of-orthodontics-and-dentofacial-orthopedics.csl
@@ -31,7 +31,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
diff --git a/american-journal-of-physical-anthropology.csl b/american-journal-of-physical-anthropology.csl
index 9003a5de8b..893b1cee08 100644
--- a/american-journal-of-physical-anthropology.csl
+++ b/american-journal-of-physical-anthropology.csl
@@ -34,7 +34,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" and="text" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -136,7 +136,7 @@
       <key macro="year-issued"/>
     </sort>
     <layout>
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <date variable="issued" prefix=" " suffix=".">
         <date-part name="year"/>
       </date>
diff --git a/american-meteorological-society.csl b/american-meteorological-society.csl
index a2b7f09c74..0e980b3c3b 100644
--- a/american-meteorological-society.csl
+++ b/american-meteorological-society.csl
@@ -193,16 +193,16 @@
             <group delimiter=", ">
               <group delimiter=", ">
                 <text variable="container-title" font-style="italic"/>
-                <text macro="editor" prefix="" suffix=""/>
+                <text macro="editor"/>
               </group>
               <group delimiter=" ">
                 <text variable="volume" prefix="Vol. " suffix=" of"/>
                 <text variable="collection-title" font-style="italic"/>
                 <text macro="series-editor"/>
               </group>
-              <text variable="event" prefix=""/>
-              <text variable="publisher-place" prefix=""/>
-              <text variable="publisher" prefix=""/>
+              <text variable="event"/>
+              <text variable="publisher-place"/>
+              <text variable="publisher"/>
               <text variable="page"/>
             </group>
           </group>
@@ -213,7 +213,7 @@
             <group delimiter=", ">
               <group delimiter=", ">
                 <text variable="container-title" font-style="italic"/>
-                <text macro="editor" prefix="" suffix=""/>
+                <text macro="editor"/>
               </group>
               <group delimiter=" ">
                 <text variable="volume" prefix="Vol. " suffix=" of"/>
diff --git a/american-physiological-society.csl b/american-physiological-society.csl
index 6ba80bd77d..c607dd11b2 100644
--- a/american-physiological-society.csl
+++ b/american-physiological-society.csl
@@ -48,7 +48,7 @@
   <macro name="publisher">
     <choose>
       <if variable="URL">
-        <text variable="publisher" suffix=""/>
+        <text variable="publisher"/>
       </if>
       <else>
         <text variable="publisher-place" suffix=": "/>
@@ -63,12 +63,12 @@
         <choose>
           <if type="article-journal">
             <date variable="issued">
-              <date-part name="year" suffix=""/>
+              <date-part name="year"/>
             </date>
           </if>
           <else>
             <date variable="issued">
-              <date-part name="year" suffix=""/>
+              <date-part name="year"/>
             </date>
           </else>
         </choose>
@@ -90,8 +90,8 @@
                 <text variable="URL"/>
               </group>
               <group prefix="[" suffix="]" delimiter=" ">
-                <date variable="accessed" suffix="">
-                  <date-part name="day" prefix=""/>
+                <date variable="accessed">
+                  <date-part name="day"/>
                   <date-part name="month" prefix=" " suffix=". " form="short" strip-periods="true"/>
                   <date-part name="year"/>
                 </date>
@@ -175,7 +175,7 @@
           <group delimiter=". ">
             <group>
               <text term="in" suffix=": " text-case="capitalize-first"/>
-              <text variable="container-title" suffix="" font-style="italic"/>
+              <text variable="container-title" font-style="italic"/>
               <text macro="editor" prefix=", "/>
             </group>
             <text variable="event"/>
@@ -188,7 +188,7 @@
             <if variable="issue volume" match="any">
               <text variable="container-title" suffix=" " form="short" font-style="italic"/>
               <text variable="volume"/>
-              <text variable="page" prefix=": " suffix=""/>
+              <text variable="page" prefix=": "/>
               <text macro="date" prefix=", " suffix="."/>
             </if>
             <else>
@@ -198,7 +198,7 @@
                   <group prefix="(" suffix=").">
                     <date variable="issued">
                       <date-part name="month" prefix=" " suffix=" "/>
-                      <date-part name="day" prefix="" suffix=", "/>
+                      <date-part name="day" suffix=", "/>
                       <date-part name="year"/>
                     </date>
                   </group>
diff --git a/american-society-of-mechanical-engineers.csl b/american-society-of-mechanical-engineers.csl
index a7e4a4eb39..174807e357 100644
--- a/american-society-of-mechanical-engineers.csl
+++ b/american-society-of-mechanical-engineers.csl
@@ -120,7 +120,7 @@
           <group delimiter=", ">
             <text macro="title"/>
             <text variable="container-title" form="short"/>
-            <group delimiter="">
+            <group>
               <text variable="volume" font-weight="bold"/>
               <text variable="issue" prefix="(" suffix=")"/>
             </group>
diff --git a/animal-behaviour.csl b/animal-behaviour.csl
index 84922790f2..9d02f8e6e2 100644
--- a/animal-behaviour.csl
+++ b/animal-behaviour.csl
@@ -87,7 +87,7 @@
   <macro name="issued">
     <choose>
       <if variable="issued">
-        <group prefix="" suffix=". ">
+        <group suffix=". ">
           <date variable="issued">
             <date-part name="year"/>
           </date>
diff --git a/annalen-des-naturhistorischen-museums-in-wien.csl b/annalen-des-naturhistorischen-museums-in-wien.csl
index 99a98d5393..223a0e9f7c 100644
--- a/annalen-des-naturhistorischen-museums-in-wien.csl
+++ b/annalen-des-naturhistorischen-museums-in-wien.csl
@@ -127,7 +127,7 @@
         </group>
       </if>
       <else>
-        <text prefix="" term="no date" suffix=""/>
+        <text term="no date"/>
       </else>
     </choose>
   </macro>
@@ -195,7 +195,7 @@
         <text variable="page" prefix=": "/>
       </if>
       <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
-        <group delimiter="">
+        <group>
           <text term="in" suffix=": " text-case="capitalize-first"/>
           <text macro="container-contributors" prefix=" " suffix=": "/>
           <text macro="container-title" suffix="."/>
@@ -232,7 +232,7 @@
       <key variable="issued"/>
     </sort>
     <layout suffix=".">
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <text macro="issued" prefix=" (" suffix="): "/>
       <text macro="title" suffix=". &#8211; "/>
       <group delimiter=". " suffix=". ">
diff --git a/annales.csl b/annales.csl
index 0840658a64..9053d1816f 100644
--- a/annales.csl
+++ b/annales.csl
@@ -76,7 +76,7 @@
         </group>
       </else-if>
       <else-if type="thesis" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
           <text variable="genre" suffix=", " prefix=" "/>
           <text variable="publisher"/>
@@ -89,7 +89,7 @@
         </group>
       </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" quotes="true" suffix=","/>
           <text value="in" font-style="italic" suffix=" " prefix=" "/>
           <text macro="editor" suffix=", "/>
@@ -97,7 +97,7 @@
         </group>
       </else-if>
       <else-if type="webpage" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" font-style="italic" suffix=", "/>
           <text variable="URL" text-decoration="underline"/>
         </group>
@@ -184,7 +184,7 @@
       <else-if type="webpage" match="any">
         <group delimiter=" " font-style="normal">
           <text value="consulté le" suffix=" " prefix=" "/>
-          <date variable="accessed" form="text" suffix="">
+          <date variable="accessed" form="text">
             <date-part name="day"/>
             <date-part name="month"/>
             <date-part name="year"/>
@@ -209,7 +209,7 @@
         </choose>
       </if>
       <else-if type="article-journal article-magazine" match="any">
-        <group delimiter="" font-style="normal">
+        <group font-style="normal">
           <choose>
             <if variable="issued">
               <date variable="issued">
@@ -264,7 +264,7 @@
     </choose>
   </macro>
   <citation>
-    <layout prefix="" suffix="." delimiter="&#160;; ">
+    <layout suffix="." delimiter="&#160;; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
@@ -309,7 +309,7 @@
       <key macro="author" names-min="3" names-use-first="3"/>
       <key variable="issued" sort="descending"/>
     </sort>
-    <layout prefix="" suffix=".">
+    <layout suffix=".">
       <group delimiter=", ">
         <text macro="author"/>
         <text macro="title"/>
diff --git a/annals-of-botany.csl b/annals-of-botany.csl
index bb7d7abe25..b0724c363b 100644
--- a/annals-of-botany.csl
+++ b/annals-of-botany.csl
@@ -105,7 +105,7 @@
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" "/>
           <group prefix=".">
-            <group prefix="" suffix="">
+            <group>
               <group suffix=".">
                 <names variable="editor translator">
                   <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always" prefix=" In: " suffix=","/>
diff --git a/annals-of-neurology.csl b/annals-of-neurology.csl
index eda28f3da1..a8224b5648 100644
--- a/annals-of-neurology.csl
+++ b/annals-of-neurology.csl
@@ -53,12 +53,12 @@
         <choose>
           <if type="article-journal">
             <date variable="issued">
-              <date-part name="year" suffix=""/>
+              <date-part name="year"/>
             </date>
           </if>
           <else>
             <date variable="issued">
-              <date-part name="year" suffix=""/>
+              <date-part name="year"/>
             </date>
           </else>
         </choose>
diff --git a/annals-of-the-association-of-american-geographers.csl b/annals-of-the-association-of-american-geographers.csl
index 3dddfac8bf..a24a848456 100644
--- a/annals-of-the-association-of-american-geographers.csl
+++ b/annals-of-the-association-of-american-geographers.csl
@@ -18,7 +18,7 @@
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="editor">
-    <names variable="editor" prefix="" suffix="" delimiter=", ">
+    <names variable="editor" delimiter=", ">
       <label form="short" suffix=". " strip-periods="true"/>
       <name and="text" initialize-with=". " delimiter=", "/>
     </names>
diff --git a/antarctic-science.csl b/antarctic-science.csl
index 7e70fc6d5b..7c4ad28a52 100644
--- a/antarctic-science.csl
+++ b/antarctic-science.csl
@@ -224,7 +224,7 @@
       <key variable="title"/>
     </sort>
     <layout>
-      <group delimiter="" suffix=".">
+      <group suffix=".">
         <group delimiter=". ">
           <text macro="author"/>
           <text macro="year"/>
diff --git a/apa-5th-edition.csl b/apa-5th-edition.csl
index 3c05d8fa5e..f4e3e662e5 100644
--- a/apa-5th-edition.csl
+++ b/apa-5th-edition.csl
@@ -49,7 +49,7 @@
       <if type="chapter paper-conference" match="none">
         <names variable="translator" delimiter=", " prefix=" (" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="capitalize-first" suffix=""/>
+          <label form="short" prefix=", " text-case="capitalize-first"/>
           <substitute>
             <names variable="editor"/>
           </substitute>
diff --git a/apa-annotated-bibliography.csl b/apa-annotated-bibliography.csl
index 749bd4638b..98c6e2b14d 100644
--- a/apa-annotated-bibliography.csl
+++ b/apa-annotated-bibliography.csl
@@ -59,7 +59,7 @@
       <if type="article-journal chapter paper-conference" match="none">
         <names variable="translator editor" delimiter=", " prefix=" (" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="title" suffix=""/>
+          <label form="short" prefix=", " text-case="title"/>
         </names>
       </if>
     </choose>
diff --git a/apa-cv.csl b/apa-cv.csl
index 0a0c8be065..36500bfe41 100644
--- a/apa-cv.csl
+++ b/apa-cv.csl
@@ -58,7 +58,7 @@
       <if type="article-journal chapter paper-conference" match="none">
         <names variable="translator editor" delimiter=", " prefix=" (" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="title" suffix=""/>
+          <label form="short" prefix=", " text-case="title"/>
         </names>
       </if>
     </choose>
diff --git a/apa-no-doi-no-issue.csl b/apa-no-doi-no-issue.csl
index 78e4661319..e6eba27b73 100644
--- a/apa-no-doi-no-issue.csl
+++ b/apa-no-doi-no-issue.csl
@@ -58,7 +58,7 @@
       <if type="article-journal chapter paper-conference" match="none">
         <names variable="translator editor" delimiter=", " prefix=" (" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="title" suffix=""/>
+          <label form="short" prefix=", " text-case="title"/>
         </names>
       </if>
     </choose>
diff --git a/apa-tr.csl b/apa-tr.csl
index 325940879d..5fdd17e9b2 100644
--- a/apa-tr.csl
+++ b/apa-tr.csl
@@ -91,7 +91,7 @@
       <if type="article-journal chapter paper-conference" match="none">
         <names variable="translator" delimiter=", " prefix=" (" suffix=")">
           <name and="text" initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
-          <label form="short" prefix=", " text-case="capitalize-first" suffix=""/>
+          <label form="short" prefix=", " text-case="capitalize-first"/>
           <substitute>
             <names variable="editor"/>
           </substitute>
diff --git a/apa.csl b/apa.csl
index adb5735216..f293ac34d2 100644
--- a/apa.csl
+++ b/apa.csl
@@ -58,7 +58,7 @@
       <if type="article-journal chapter paper-conference" match="none">
         <names variable="translator editor" delimiter=", " prefix=" (" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="title" suffix=""/>
+          <label form="short" prefix=", " text-case="title"/>
         </names>
       </if>
     </choose>
diff --git a/applied-spectroscopy.csl b/applied-spectroscopy.csl
index c4ad7052ae..60d9c6a1ef 100644
--- a/applied-spectroscopy.csl
+++ b/applied-spectroscopy.csl
@@ -180,7 +180,7 @@
         <else>
           <group delimiter=" ">
             <text variable="container-title" form="short"/>
-            <group delimiter="">
+            <group>
               <text variable="volume" font-weight="bold" suffix=", "/>
               <text variable="issue" suffix=", "/>
               <text variable="page" suffix=" "/>
diff --git a/aquatic-conservation.csl b/aquatic-conservation.csl
index 1603005555..c9c84acd0e 100644
--- a/aquatic-conservation.csl
+++ b/aquatic-conservation.csl
@@ -117,7 +117,7 @@
     </sort>
     <layout>
       <text macro="author" suffix=". "/>
-      <date variable="issued" prefix="" suffix=".">
+      <date variable="issued" suffix=".">
         <date-part name="year"/>
       </date>
       <choose>
@@ -131,14 +131,14 @@
         <else-if type="report" match="any">
           <text macro="title" prefix=" "/>
           <group prefix=".">
-            <group prefix="" suffix="">
+            <group>
               <group suffix=".">
                 <text variable="genre" prefix=" "/>
                 <text variable="number" prefix=" No. "/>
               </group>
               <group suffix=".">
                 <text variable="publisher" prefix=" "/>
-                <text variable="publisher-place" prefix=", " suffix=""/>
+                <text variable="publisher-place" prefix=", "/>
               </group>
             </group>
           </group>
@@ -146,7 +146,7 @@
         <else-if type="thesis" match="any">
           <text macro="title" prefix=" "/>
           <group prefix=".">
-            <group prefix=" " suffix="">
+            <group prefix=" ">
               <group suffix="." delimiter=", ">
                 <text variable="genre"/>
                 <text variable="publisher"/>
@@ -158,9 +158,9 @@
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" "/>
           <group prefix=".">
-            <group prefix="" suffix="">
+            <group>
               <group suffix=".">
-                <text variable="container-title" font-style="italic" prefix=" In " suffix=""/>
+                <text variable="container-title" font-style="italic" prefix=" In "/>
                 <names variable="editor">
                   <name et-al-min="8" et-al-use-first="3" name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always" prefix=", "/>
                   <label form="short" strip-periods="true" prefix=" (" suffix=")."/>
diff --git a/archives-of-physical-medicine-and-rehabilitation.csl b/archives-of-physical-medicine-and-rehabilitation.csl
index 4ce77223b6..a9dabb2983 100644
--- a/archives-of-physical-medicine-and-rehabilitation.csl
+++ b/archives-of-physical-medicine-and-rehabilitation.csl
@@ -53,7 +53,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/arthritis-and-rheumatism.csl b/arthritis-and-rheumatism.csl
index 4eebd8936f..85864e532c 100644
--- a/arthritis-and-rheumatism.csl
+++ b/arthritis-and-rheumatism.csl
@@ -31,7 +31,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
diff --git a/arzneimitteltherapie.csl b/arzneimitteltherapie.csl
index b27a9365d7..4de2fd2b51 100644
--- a/arzneimitteltherapie.csl
+++ b/arzneimitteltherapie.csl
@@ -59,7 +59,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/asa-cssa-sssa.csl b/asa-cssa-sssa.csl
index c70b38e2a3..be2389b9c4 100644
--- a/asa-cssa-sssa.csl
+++ b/asa-cssa-sssa.csl
@@ -133,7 +133,7 @@
             <text macro="title" prefix=" "/>
             <text macro="editor-translator" prefix=" "/>
           </group>
-          <text macro="edition" prefix=" " suffix=""/>
+          <text macro="edition" prefix=" "/>
           <text prefix=" " suffix="." macro="publisher"/>
         </if>
         <else-if type="chapter paper-conference" match="any">
@@ -146,7 +146,7 @@
               <label form="short" prefix=" (" suffix=".)," strip-periods="true"/>
             </names>
             <text variable="container-title" prefix=" " suffix="."/>
-            <text macro="edition" prefix=" " suffix=""/>
+            <text macro="edition" prefix=" "/>
             <text variable="collection-title" prefix=" " suffix="."/>
             <group suffix=".">
               <text macro="publisher" prefix=" " suffix="."/>
@@ -159,7 +159,7 @@
             <text macro="editor-translator" prefix=" "/>
           </group>
           <group prefix=" " suffix=".">
-            <text variable="container-title" form="short" suffix=""/>
+            <text variable="container-title" form="short"/>
             <group prefix=" ">
               <text variable="volume"/>
               <text variable="issue" prefix="(" suffix=")"/>
diff --git a/associacao-brasileira-de-normas-tecnicas-ipea.csl b/associacao-brasileira-de-normas-tecnicas-ipea.csl
index f3b19de5b9..9e87334cb7 100644
--- a/associacao-brasileira-de-normas-tecnicas-ipea.csl
+++ b/associacao-brasileira-de-normas-tecnicas-ipea.csl
@@ -306,7 +306,7 @@ a ulitiliza em italico-->
     <choose>
       <!--Se for projeto de lei mostrara o dia, mes "forma curta", ano, secao "Sec." e pagina "p."-->
       <if type="bill">
-        <group prefix=". " suffix="" delimiter=", ">
+        <group prefix=". " delimiter=", ">
           <date variable="issued">
             <date-part name="day"/>
             <date-part prefix=" " name="month" form="short"/>
@@ -321,7 +321,7 @@ a ulitiliza em italico-->
         <group delimiter=", ">
           <group delimiter=", ">
             <text variable="volume" prefix="v. "/>
-            <text variable="issue" prefix="n. " suffix=""/>
+            <text variable="issue" prefix="n. "/>
           </group>
           <text variable="page" prefix="p. "/>
         </group>
@@ -529,7 +529,7 @@ a ulitiliza em italico-->
             <text macro="secondary-contributors"/>
             <text macro="container-title"/>
             <!--Titulo da publicacao-->
-            <text variable="collection-title" prefix=": " suffix=""/>
+            <text variable="collection-title" prefix=": "/>
             <text macro="locators"/>
             <!--Dados complementares "pagina, volume"-->
             <text macro="event"/>
diff --git a/associacao-brasileira-de-normas-tecnicas-ufmg-face-full.csl b/associacao-brasileira-de-normas-tecnicas-ufmg-face-full.csl
index c866679e1a..9ce1cb6273 100644
--- a/associacao-brasileira-de-normas-tecnicas-ufmg-face-full.csl
+++ b/associacao-brasileira-de-normas-tecnicas-ufmg-face-full.csl
@@ -316,7 +316,7 @@
   <macro name="locators">
     <choose>
       <if type="bill">
-        <group prefix=", " suffix="" delimiter=", ">
+        <group prefix=", " delimiter=", ">
           <date variable="issued">
             <date-part name="day"/>
             <date-part prefix=" " name="month" form="short"/>
@@ -330,7 +330,7 @@
         <group delimiter=", ">
           <group delimiter=", ">
             <text variable="volume" prefix="v. "/>
-            <text variable="issue" prefix="n. " suffix=""/>
+            <text variable="issue" prefix="n. "/>
           </group>
           <text variable="page" prefix="p. "/>
         </group>
diff --git a/associacao-brasileira-de-normas-tecnicas-ufmg-face-initials.csl b/associacao-brasileira-de-normas-tecnicas-ufmg-face-initials.csl
index c8876c851a..c75022d786 100644
--- a/associacao-brasileira-de-normas-tecnicas-ufmg-face-initials.csl
+++ b/associacao-brasileira-de-normas-tecnicas-ufmg-face-initials.csl
@@ -315,7 +315,7 @@
   <macro name="locators">
     <choose>
       <if type="bill">
-        <group prefix=", " suffix="" delimiter=", ">
+        <group prefix=", " delimiter=", ">
           <date variable="issued">
             <date-part name="day"/>
             <date-part prefix=" " name="month" form="short"/>
@@ -329,7 +329,7 @@
         <group delimiter=", ">
           <group delimiter=", ">
             <text variable="volume" prefix="v. "/>
-            <text variable="issue" prefix="n. " suffix=""/>
+            <text variable="issue" prefix="n. "/>
           </group>
           <text variable="page" prefix="p. "/>
         </group>
diff --git a/associacao-brasileira-de-normas-tecnicas-ufpr.csl b/associacao-brasileira-de-normas-tecnicas-ufpr.csl
index a50f6bb706..7989114c6f 100644
--- a/associacao-brasileira-de-normas-tecnicas-ufpr.csl
+++ b/associacao-brasileira-de-normas-tecnicas-ufpr.csl
@@ -158,13 +158,13 @@
         <group prefix=", " delimiter=", ">
           <group>
             <text variable="volume" prefix="v. "/>
-            <text variable="issue" prefix=", n. " suffix=""/>
+            <text variable="issue" prefix=", n. "/>
           </group>
           <text variable="page" prefix="p. "/>
         </group>
       </if>
       <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
-        <group prefix=". " suffix="" delimiter=", ">
+        <group prefix=". " delimiter=", ">
           <text macro="edition"/>
           <group>
             <text variable="volume" prefix="v. "/>
@@ -187,7 +187,7 @@
       <key macro="author"/>
       <key variable="issued"/>
     </sort>
-    <layout prefix="" suffix=")" delimiter=" e ">
+    <layout suffix=")" delimiter=" e ">
       <group>
         <text suffix=" (" macro="author-short"/>
         <text macro="issued-year"/>
diff --git a/associacao-brasileira-de-normas-tecnicas.csl b/associacao-brasileira-de-normas-tecnicas.csl
index 39d7e5f13c..83e9426bef 100644
--- a/associacao-brasileira-de-normas-tecnicas.csl
+++ b/associacao-brasileira-de-normas-tecnicas.csl
@@ -304,7 +304,7 @@ em caixa alta. Utiliza-se antes do nome da conferencia a expressao "In". Segundo
     <choose>
       <!--Se for projeto de lei mostrara o dia, mes "forma curta", ano, secao "Sec." e pagina "p."-->
       <if type="bill">
-        <group prefix=". " suffix="" delimiter=", ">
+        <group prefix=". " delimiter=", ">
           <date variable="issued">
             <date-part name="day"/>
             <date-part prefix=" " name="month" form="short"/>
@@ -319,7 +319,7 @@ em caixa alta. Utiliza-se antes do nome da conferencia a expressao "In". Segundo
         <group delimiter=", ">
           <group delimiter=", ">
             <text variable="volume" prefix="v. "/>
-            <text variable="issue" prefix="n. " suffix=""/>
+            <text variable="issue" prefix="n. "/>
           </group>
           <text variable="page" prefix="p. "/>
         </group>
@@ -546,7 +546,7 @@ em caixa alta. Utiliza-se antes do nome da conferencia a expressao "In". Segundo
             <text macro="secondary-contributors"/>
             <text macro="container-title"/>
             <!--Titulo da publicacao-->
-            <text variable="collection-title" prefix=": " suffix=""/>
+            <text variable="collection-title" prefix=": "/>
             <text macro="locators"/>
             <!--Dados complementares "pagina, volume"-->
             <text macro="event"/>
diff --git a/associacao-nacional-de-pesquisa-e-ensino-em-transportes.csl b/associacao-nacional-de-pesquisa-e-ensino-em-transportes.csl
index 5602179c17..2ccc0c34a0 100644
--- a/associacao-nacional-de-pesquisa-e-ensino-em-transportes.csl
+++ b/associacao-nacional-de-pesquisa-e-ensino-em-transportes.csl
@@ -65,7 +65,7 @@
       <if type="article-journal chapter paper-conference" match="none">
         <names variable="translator editor" delimiter=", " prefix=" (" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="title" suffix=""/>
+          <label form="short" prefix=", " text-case="title"/>
         </names>
       </if>
     </choose>
diff --git a/ausonius-editions.csl b/ausonius-editions.csl
index bf4917024a..aa96fd6f38 100644
--- a/ausonius-editions.csl
+++ b/ausonius-editions.csl
@@ -132,7 +132,7 @@
         </group>
       </if>
       <else>
-        <text variable="edition" suffix=""/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
diff --git a/australian-historical-studies.csl b/australian-historical-studies.csl
index c2e4c052de..724f23c800 100644
--- a/australian-historical-studies.csl
+++ b/australian-historical-studies.csl
@@ -348,7 +348,7 @@
     </group>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" et-al-subsequent-min="4" et-al-subsequent-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/australian-journal-of-earth-sciences.csl b/australian-journal-of-earth-sciences.csl
index 1afec1303f..1056497db9 100644
--- a/australian-journal-of-earth-sciences.csl
+++ b/australian-journal-of-earth-sciences.csl
@@ -66,7 +66,7 @@
     <layout suffix=".">
       <group delimiter=" ">
         <text macro="author" font-variant="small-caps"/>
-        <text macro="issued" prefix="" suffix="."/>
+        <text macro="issued" suffix="."/>
         <choose>
           <if type="article article-magazine article-newspaper article-journal review" match="any">
             <text variable="title" suffix="."/>
diff --git a/austrian-legal.csl b/austrian-legal.csl
index cd12c67ad6..2d991a8191 100644
--- a/austrian-legal.csl
+++ b/austrian-legal.csl
@@ -79,23 +79,23 @@
     <text value=" (Hrsg)" font-style="normal"/>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true" givenname-disambiguation-rule="all-names-with-initials" disambiguate-add-givenname="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <!-- CASE -->
         <if type="legal_case">
           <choose>
             <if variable="authority issued number" match="all">
-              <text variable="authority" prefix="" suffix=" "/>
-              <date variable="issued" prefix="" suffix=" ">
-                <date-part name="day" form="numeric-leading-zeros" prefix="" suffix="."/>
-                <date-part name="month" form="numeric-leading-zeros" prefix="" suffix="."/>
-                <date-part name="year" form="long" prefix="" suffix=","/>
+              <text variable="authority" suffix=" "/>
+              <date variable="issued" suffix=" ">
+                <date-part name="day" form="numeric-leading-zeros" suffix="."/>
+                <date-part name="month" form="numeric-leading-zeros" suffix="."/>
+                <date-part name="year" form="long" suffix=","/>
               </date>
-              <text variable="number" prefix="" suffix=""/>
+              <text variable="number"/>
             </if>
             <else>
               <!-- fallback: since RIS format does not have a court (authority) variable -->
-              <text variable="title" prefix="" suffix=""/>
+              <text variable="title"/>
             </else>
           </choose>
         </if>
@@ -132,8 +132,8 @@
           <choose>
             <if variable="page issued" match="all">
               <text variable="container-title" suffix=" "/>
-              <date variable="issued" prefix="" suffix=", ">
-                <date-part name="year" form="long" prefix="" suffix=""/>
+              <date variable="issued" suffix=", ">
+                <date-part name="year" form="long"/>
               </date>
               <text variable="page"/>
               <text variable="locator" prefix=" (" suffix=")"/>
@@ -173,12 +173,12 @@
             <if variable="collection-title">
               <text variable="collection-title" prefix=" (" suffix=" "/>
               <date variable="issued" suffix=")">
-                <date-part name="year" form="long" prefix="" suffix=""/>
+                <date-part name="year" form="long"/>
               </date>
             </if>
             <else>
               <date variable="issued" prefix=" (" suffix=")">
-                <date-part name="year" form="long" prefix="" suffix=""/>
+                <date-part name="year" form="long"/>
               </date>
             </else>
           </choose>
@@ -230,12 +230,12 @@
                     <if variable="collection-title">
                       <text variable="collection-title" prefix=" (" suffix=" "/>
                       <date variable="issued" suffix=") ">
-                        <date-part name="year" form="long" prefix="" suffix=""/>
+                        <date-part name="year" form="long"/>
                       </date>
                     </if>
                     <else>
                       <date variable="issued" prefix=" (" suffix=") ">
-                        <date-part name="year" form="long" prefix="" suffix=""/>
+                        <date-part name="year" form="long"/>
                       </date>
                     </else>
                   </choose>
@@ -284,12 +284,12 @@
                     <if variable="collection-title">
                       <text variable="collection-title" prefix=" (" suffix=" "/>
                       <date variable="issued" suffix=") ">
-                        <date-part name="year" form="long" prefix="" suffix=""/>
+                        <date-part name="year" form="long"/>
                       </date>
                     </if>
                     <else>
                       <date variable="issued" prefix=" (" suffix=") ">
-                        <date-part name="year" form="long" prefix="" suffix=""/>
+                        <date-part name="year" form="long"/>
                       </date>
                     </else>
                   </choose>
@@ -317,7 +317,7 @@
               <text variable="genre" prefix=". "/>
               <text variable="publisher" prefix=", "/>
               <date variable="issued" prefix=" (" suffix=")">
-                <date-part name="year" form="long" prefix="" suffix=""/>
+                <date-part name="year" form="long"/>
               </date>
             </if>
           </choose>
@@ -340,7 +340,7 @@
               <text variable="container-title" prefix=", "/>
             </if>
           </choose>
-          <date variable="issued" prefix=", " suffix="" form="numeric"/>
+          <date variable="issued" prefix=", " form="numeric"/>
           <text variable="locator" prefix=" " suffix=". "/>
         </else>
       </choose>
@@ -358,17 +358,17 @@
         <if type="legal_case">
           <choose>
             <if variable="authority issued number" match="all">
-              <text variable="authority" prefix="" suffix=" "/>
-              <date variable="issued" prefix="" suffix=" ">
-                <date-part name="day" form="numeric-leading-zeros" prefix="" suffix="."/>
-                <date-part name="month" form="numeric-leading-zeros" prefix="" suffix="."/>
-                <date-part name="year" form="long" prefix="" suffix=","/>
+              <text variable="authority" suffix=" "/>
+              <date variable="issued" suffix=" ">
+                <date-part name="day" form="numeric-leading-zeros" suffix="."/>
+                <date-part name="month" form="numeric-leading-zeros" suffix="."/>
+                <date-part name="year" form="long" suffix=","/>
               </date>
-              <text variable="number" prefix="" suffix=""/>
+              <text variable="number"/>
             </if>
             <else>
               <!-- fallback: since RIS format does not have a court (authority) variable -->
-              <text variable="title" prefix="" suffix=""/>
+              <text variable="title"/>
             </else>
           </choose>
         </if>
@@ -383,13 +383,13 @@
           <choose>
             <if variable="page issued" match="all">
               <text variable="container-title" suffix=" "/>
-              <date variable="issued" prefix="" suffix=", ">
-                <date-part name="year" form="long" prefix="" suffix=""/>
+              <date variable="issued" suffix=", ">
+                <date-part name="year" form="long"/>
               </date>
-              <text variable="page" prefix="" suffix=""/>
+              <text variable="page"/>
             </if>
             <else>
-              <text variable="container-title" prefix="" suffix=" "/>
+              <text variable="container-title" suffix=" "/>
               <!-- if no page info is available, assume container-title (publication) holds article number citation -->
             </else>
           </choose>
@@ -438,12 +438,12 @@
           <choose>
             <if variable="publisher publisher-place" match="any">
               <date variable="issued" prefix=" ">
-                <date-part name="year" form="long" prefix="" suffix=""/>
+                <date-part name="year" form="long"/>
               </date>
             </if>
             <else>
               <date variable="issued" prefix=" (" suffix=")">
-                <date-part name="year" form="long" prefix="" suffix=""/>
+                <date-part name="year" form="long"/>
               </date>
             </else>
           </choose>
@@ -492,12 +492,12 @@
           <choose>
             <if variable="publisher publisher-place" match="any">
               <date variable="issued" prefix=" ">
-                <date-part name="year" form="long" prefix="" suffix=""/>
+                <date-part name="year" form="long"/>
               </date>
             </if>
             <else>
               <date variable="issued" prefix=" (" suffix=")">
-                <date-part name="year" form="long" prefix="" suffix=""/>
+                <date-part name="year" form="long"/>
               </date>
             </else>
           </choose>
@@ -510,7 +510,7 @@
           <text variable="genre" prefix=" "/>
           <text variable="publisher" prefix=", "/>
           <date variable="issued" prefix=" (" suffix=")">
-            <date-part name="year" form="long" prefix="" suffix=""/>
+            <date-part name="year" form="long"/>
           </date>
         </else-if>
         <!-- WEBPAGE -->
@@ -536,7 +536,7 @@
               <text variable="container-title" prefix=", "/>
             </if>
           </choose>
-          <date variable="issued" prefix=", " suffix="" form="numeric"/>
+          <date variable="issued" prefix=", " form="numeric"/>
         </else>
       </choose>
     </layout>
diff --git a/avian-diseases.csl b/avian-diseases.csl
index 96e4e4c38c..ee7b33bf44 100644
--- a/avian-diseases.csl
+++ b/avian-diseases.csl
@@ -71,7 +71,7 @@
               <text macro="edition" prefix=" "/>
               <text macro="editor" prefix=" (" suffix=")"/>
             </group>
-            <text prefix=" " suffix="" macro="publisher"/>
+            <text prefix=" " macro="publisher"/>
           </if>
           <else-if type="chapter paper-conference" match="any">
             <group delimiter=". ">
diff --git a/avian-pathology.csl b/avian-pathology.csl
index 1f143f9123..e28d950e38 100644
--- a/avian-pathology.csl
+++ b/avian-pathology.csl
@@ -44,7 +44,7 @@
       <if type="chapter paper-conference" match="none">
         <names variable="translator" delimiter=", " prefix=" (" suffix=")">
           <name and="symbol" initialize-with="." delimiter=", " delimiter-precedes-last="never"/>
-          <label form="short" prefix=", " text-case="capitalize-first" suffix=""/>
+          <label form="short" prefix=", " text-case="capitalize-first"/>
           <substitute>
             <names variable="editor"/>
           </substitute>
diff --git a/basic-and-applied-ecology.csl b/basic-and-applied-ecology.csl
index 57e3ccb094..c913c6b550 100644
--- a/basic-and-applied-ecology.csl
+++ b/basic-and-applied-ecology.csl
@@ -126,7 +126,7 @@
               <name and="symbol" sort-separator=", " initialize-with=". "/>
               <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first" strip-periods="true"/>
             </names>
-            <text variable="container-title" font-style="italic" prefix=" " suffix=""/>
+            <text variable="container-title" font-style="italic" prefix=" "/>
             <group prefix=" (" suffix=").">
               <label variable="page" form="short" suffix=". " strip-periods="true"/>
               <text variable="page"/>
diff --git a/bibtex.csl b/bibtex.csl
index 6d1139168a..9e314c3fd4 100644
--- a/bibtex.csl
+++ b/bibtex.csl
@@ -142,7 +142,7 @@
       <key variable="issued"/>
     </sort>
     <layout>
-      <text macro="zotero2bibtexType" prefix=" @" suffix=""/>
+      <text macro="zotero2bibtexType" prefix=" @"/>
       <group prefix="{" suffix="}" delimiter=", ">
         <text macro="citeKey"/>
         <text variable="publisher-place" prefix=" place={" suffix="}"/>
diff --git a/bioelectromagnetics.csl b/bioelectromagnetics.csl
index 7f40b71247..4af229d5ae 100644
--- a/bioelectromagnetics.csl
+++ b/bioelectromagnetics.csl
@@ -54,7 +54,7 @@
     <choose>
       <if type="chapter paper-conference" match="any">
         <text macro="container-prefix"/>
-        <group prefix="" delimiter=" ">
+        <group delimiter=" ">
           <choose>
             <if variable="author">
               <names variable="editor">
@@ -353,7 +353,7 @@
     </sort>
     <layout suffix=".">
       <text macro="author" suffix=". "/>
-      <text macro="date" prefix="" suffix=". "/>
+      <text macro="date" suffix=". "/>
       <text macro="title"/>
       <text macro="description"/>
       <text macro="secondary-contributors" prefix=". "/>
diff --git a/bioessays.csl b/bioessays.csl
index 3d15ff7e47..100804dfff 100644
--- a/bioessays.csl
+++ b/bioessays.csl
@@ -24,7 +24,7 @@
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
-    <names variable="author" suffix="">
+    <names variable="author">
       <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " font-weight="bold" delimiter-precedes-last="always"/>
       <et-al font-weight="normal"/>
     </names>
diff --git a/biological-journal-of-the-linnean-society.csl b/biological-journal-of-the-linnean-society.csl
index ae28627ced..c4fa6c44cf 100644
--- a/biological-journal-of-the-linnean-society.csl
+++ b/biological-journal-of-the-linnean-society.csl
@@ -109,7 +109,7 @@
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" "/>
           <group prefix=".">
-            <group prefix="" suffix="">
+            <group>
               <group suffix=".">
                 <names variable="editor translator">
                   <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always" prefix=" In: " suffix=","/>
diff --git a/biological-psychiatry.csl b/biological-psychiatry.csl
index 28819a4f5a..ef0de4e890 100644
--- a/biological-psychiatry.csl
+++ b/biological-psychiatry.csl
@@ -243,7 +243,7 @@
     </sort>
     <layout suffix=".">
       <text variable="citation-number" suffix=". "/>
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <text macro="issued" suffix=": "/>
       <group delimiter=". ">
         <text macro="title"/>
diff --git a/biological-reviews.csl b/biological-reviews.csl
index 2b0878a7f7..d8c6dae80f 100644
--- a/biological-reviews.csl
+++ b/biological-reviews.csl
@@ -121,7 +121,7 @@
         </group>
       </if>
       <else>
-        <text prefix="" term="no date" suffix=""/>
+        <text term="no date"/>
       </else>
     </choose>
   </macro>
@@ -160,7 +160,7 @@
         <text variable="page" prefix=", "/>
       </if>
       <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
-        <group prefix=". " delimiter="">
+        <group prefix=". ">
           <text term="in" suffix=" " text-case="capitalize-first"/>
           <text variable="container-title" font-style="italic"/>
           <text macro="container-contributors" prefix=" (" suffix="),"/>
@@ -195,7 +195,7 @@
       <key variable="issued"/>
     </sort>
     <layout suffix=".">
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <text macro="issued" prefix=" (" suffix=") "/>
       <text macro="title"/>
       <text macro="locators"/>
diff --git a/biomed-central.csl b/biomed-central.csl
index 3285d68da1..8a60aa3f3c 100644
--- a/biomed-central.csl
+++ b/biomed-central.csl
@@ -57,10 +57,10 @@
   <macro name="title">
     <choose>
       <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <text variable="title" font-style="italic" suffix="" text-case="title"/>
+        <text variable="title" font-style="italic" text-case="title"/>
       </if>
       <else>
-        <text variable="title" suffix="" font-weight="bold"/>
+        <text variable="title" font-weight="bold"/>
       </else>
     </choose>
   </macro>
diff --git a/bioorganic-and-medicinal-chemistry-letters.csl b/bioorganic-and-medicinal-chemistry-letters.csl
index 9659fc5430..ac41e798ac 100644
--- a/bioorganic-and-medicinal-chemistry-letters.csl
+++ b/bioorganic-and-medicinal-chemistry-letters.csl
@@ -92,7 +92,7 @@
   </citation>
   <bibliography second-field-align="margin" entry-spacing="0">
     <layout suffix=".">
-      <text variable="citation-number" prefix="" suffix=". "/>
+      <text variable="citation-number" suffix=". "/>
       <text macro="author" suffix=" "/>
       <choose>
         <if type="article-magazine">
diff --git a/biophysical-journal.csl b/biophysical-journal.csl
index 9daadf5e7a..ea23458daf 100644
--- a/biophysical-journal.csl
+++ b/biophysical-journal.csl
@@ -36,17 +36,17 @@
   <macro name="editor">
     <names variable="editor" suffix=". ">
       <name sort-separator=" " initialize-with="" name-as-sort-order="first" delimiter=", " delimiter-precedes-last="always"/>
-      <label form="long" prefix=", " suffix=""/>
+      <label form="long" prefix=", "/>
     </names>
   </macro>
   <macro name="date">
-    <date variable="issued" prefix="" suffix=". ">
-      <date-part name="year" suffix=""/>
+    <date variable="issued" suffix=". ">
+      <date-part name="year"/>
     </date>
   </macro>
   <macro name="publisher">
     <text variable="publisher-place" suffix=": "/>
-    <text variable="publisher" suffix=""/>
+    <text variable="publisher"/>
   </macro>
   <macro name="access">
     <group>
@@ -56,7 +56,7 @@
       </group>
       <group prefix=" ">
         <text term="accessed" text-case="capitalize-first"/>
-        <date variable="accessed" prefix=" " suffix="">
+        <date variable="accessed" prefix=" ">
           <date-part name="day" prefix=" "/>
           <date-part name="month" prefix=" " form="long"/>
           <date-part name="year" prefix=" "/>
@@ -98,7 +98,7 @@
       <text macro="title" suffix=". "/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <text macro="edition" prefix=" " suffix=""/>
+          <text macro="edition" prefix=" "/>
           <text macro="publisher" prefix=" "/>
         </if>
         <else-if type="chapter paper-conference" match="any">
diff --git a/biotechnology-and-bioengineering.csl b/biotechnology-and-bioengineering.csl
index a3ce02d5f7..7d803b7064 100644
--- a/biotechnology-and-bioengineering.csl
+++ b/biotechnology-and-bioengineering.csl
@@ -54,7 +54,7 @@
     <choose>
       <if type="chapter paper-conference" match="any">
         <text macro="container-prefix"/>
-        <group prefix="" delimiter=" ">
+        <group delimiter=" ">
           <choose>
             <if variable="author">
               <names variable="editor">
diff --git a/biotropica.csl b/biotropica.csl
index 4a9aa8f0f3..589223218a 100644
--- a/biotropica.csl
+++ b/biotropica.csl
@@ -176,7 +176,7 @@
             <group prefix=" ">
               <text variable="volume" suffix=": "/>
             </group>
-            <group prefix="">
+            <group>
               <label variable="locator" suffix="." form="short" strip-periods="true"/>
               <text variable="page"/>
             </group>
diff --git a/bluebook-inline.csl b/bluebook-inline.csl
index cafcefdfe8..c24f1045cf 100644
--- a/bluebook-inline.csl
+++ b/bluebook-inline.csl
@@ -178,7 +178,7 @@
   <macro name="container">
     <choose>
       <if type="chapter paper-conference" match="any">
-        <group delimiter="">
+        <group>
           <text term="in" text-case="lowercase" font-style="italic" prefix=" "/>
           <text variable="container-title" font-variant="small-caps" prefix=" "/>
         </group>
diff --git a/bluebook-law-review.csl b/bluebook-law-review.csl
index bbfe498f0c..ff2a4302e9 100644
--- a/bluebook-law-review.csl
+++ b/bluebook-law-review.csl
@@ -69,7 +69,7 @@
   </macro>
   <!-- sets up basics of dealing with editors and translators. Will generally only show up in book citations, as called in XXXX, below -->
   <macro name="editor-translator">
-    <names variable="editor translator" prefix="" suffix=" " delimiter=", ">
+    <names variable="editor translator" suffix=" " delimiter=", ">
       <name and="symbol" delimiter=", "/>
       <label form="short" prefix=" " suffix=".," strip-periods="true"/>
     </names>
@@ -114,7 +114,7 @@
     <choose>
       <if type="article-journal" match="any">
         <text variable="title" suffix=", " font-style="italic"/>
-        <text variable="volume" suffix=""/>
+        <text variable="volume"/>
         <text macro="container"/>
         <text variable="page" prefix=" "/>
         <text variable="locator" prefix=", "/>
@@ -122,7 +122,7 @@
       </if>
       <else-if type="legal_case">
         <text variable="title" suffix=", " font-variant="normal"/>
-        <text variable="volume" suffix=""/>
+        <text variable="volume"/>
         <text macro="container"/>
         <text variable="page" prefix=" "/>
         <text variable="locator" prefix=", "/>
@@ -133,7 +133,7 @@
         <text variable="volume" suffix=" "/>
         <text macro="container" suffix=", "/>
         <text macro="issuance"/>
-        <group delimiter="">
+        <group>
           <text value="at" prefix=", "/>
           <text variable="page" prefix=" "/>
         </group>
@@ -159,7 +159,7 @@
   <macro name="issuance">
     <choose>
       <if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
-        <group prefix="" suffix="">
+        <group>
           <choose>
             <if type="article-newspaper thesis" match="any">
               <group suffix=", ">
@@ -177,7 +177,7 @@
       </if>
       <else>
         <!-- removed an extra space in the prefix here NS 20110511 -->
-        <group prefix="" suffix="" delimiter=" ">
+        <group delimiter=" ">
           <text macro="editor-translator"/>
           <text variable="edition" suffix=" ed."/>
           <!-- replaced a text element with a missing variable reference -->
@@ -190,7 +190,7 @@
   </macro>
   <!-- sets up citing to specific page numbers for id and supra cites -->
   <macro name="at_page">
-    <group delimiter="">
+    <group>
       <text value="at" prefix=" "/>
       <text variable="locator" prefix=" "/>
     </group>
@@ -199,7 +199,7 @@
   <macro name="container">
     <choose>
       <if type="chapter paper-conference" match="any">
-        <group delimiter="">
+        <group>
           <text term="in" text-case="lowercase" font-style="italic" prefix=" "/>
           <text variable="container-title" font-variant="small-caps" prefix=" "/>
         </group>
diff --git a/bluebook2.csl b/bluebook2.csl
index 4302cd4002..4ee4099136 100644
--- a/bluebook2.csl
+++ b/bluebook2.csl
@@ -178,7 +178,7 @@
   <macro name="container">
     <choose>
       <if type="chapter paper-conference" match="any">
-        <group delimiter="">
+        <group>
           <text term="in" text-case="lowercase" font-style="italic" prefix=" "/>
           <text variable="container-title" font-variant="small-caps" prefix=" "/>
         </group>
diff --git a/bmc-bioinformatics.csl b/bmc-bioinformatics.csl
index 44a24bd6db..4f3cf14026 100644
--- a/bmc-bioinformatics.csl
+++ b/bmc-bioinformatics.csl
@@ -21,7 +21,7 @@
     </names>
   </macro>
   <macro name="editor">
-    <names variable="editor" suffix="">
+    <names variable="editor">
       <label form="verb" suffix=" "/>
       <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
     </names>
@@ -36,10 +36,10 @@
   <macro name="title">
     <choose>
       <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <text variable="title" font-weight="normal" font-style="italic" suffix=""/>
+        <text variable="title" font-weight="normal" font-style="italic"/>
       </if>
       <else>
-        <text variable="title" suffix="" font-weight="bold"/>
+        <text variable="title" font-weight="bold"/>
       </else>
     </choose>
   </macro>
diff --git a/bmj.csl b/bmj.csl
index e22a8964ae..3367eb8419 100644
--- a/bmj.csl
+++ b/bmj.csl
@@ -57,7 +57,7 @@
         <text variable="URL"/>
         <group prefix=" (" suffix=")." delimiter=" ">
           <text term="accessed" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="day" prefix=" "/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="year"/>
diff --git a/body-and-society.csl b/body-and-society.csl
index 7af9022792..878da1a026 100644
--- a/body-and-society.csl
+++ b/body-and-society.csl
@@ -222,7 +222,7 @@
   <macro name="locators">
     <choose>
       <if type="article-journal article-magazine article-newspaper" match="any">
-        <group delimiter="">
+        <group>
           <group font-style="normal">
             <text variable="volume" form="long" font-style="normal" prefix=" "/>
             <text variable="issue" form="long" prefix=" (" suffix=")"/>
@@ -274,7 +274,7 @@
         <text macro="issued" suffix=" "/>
         <group delimiter=" ">
           <text macro="title"/>
-          <group delimiter="">
+          <group>
             <text macro="container-contributors"/>
             <text macro="secondary-contributors"/>
             <group delimiter=", ">
diff --git a/brain.csl b/brain.csl
index 58eebf411a..d8775f542f 100644
--- a/brain.csl
+++ b/brain.csl
@@ -74,7 +74,7 @@
         <group delimiter=" ">
           <group prefix="[" suffix="]" delimiter=" ">
             <text term="cited" text-case="lowercase"/>
-            <date variable="accessed" suffix="">
+            <date variable="accessed">
               <date-part name="year"/>
               <date-part name="month" prefix=" " form="short" strip-periods="true"/>
               <date-part name="day" prefix=" "/>
diff --git a/brazilian-journal-of-botany.csl b/brazilian-journal-of-botany.csl
index 1230769af9..0a842f24c3 100644
--- a/brazilian-journal-of-botany.csl
+++ b/brazilian-journal-of-botany.csl
@@ -139,7 +139,7 @@
   <macro name="locators">
     <choose>
       <if type="bill legislation" match="any">
-        <group prefix=". " suffix="" delimiter=", ">
+        <group prefix=". " delimiter=", ">
           <date variable="issued">
             <date-part name="day"/>
             <date-part prefix=" " name="month" form="short"/>
diff --git a/british-ecological-society.csl b/british-ecological-society.csl
index 84ca91d375..043ed454c1 100644
--- a/british-ecological-society.csl
+++ b/british-ecological-society.csl
@@ -128,8 +128,8 @@
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" "/>
           <group prefix=".">
-            <group prefix="" suffix="">
-              <text variable="container-title" font-style="italic" prefix=" " suffix=""/>
+            <group>
+              <text variable="container-title" font-style="italic" prefix=" "/>
               <text variable="collection-title" prefix=" " suffix="."/>
               <group suffix=".">
                 <text macro="edition" prefix=", "/>
diff --git a/british-journal-of-anaesthesia.csl b/british-journal-of-anaesthesia.csl
index 7ca04977f2..e9e5a95ffb 100644
--- a/british-journal-of-anaesthesia.csl
+++ b/british-journal-of-anaesthesia.csl
@@ -85,7 +85,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/british-journal-of-haematology.csl b/british-journal-of-haematology.csl
index bb11f4e30c..447455185c 100644
--- a/british-journal-of-haematology.csl
+++ b/british-journal-of-haematology.csl
@@ -75,7 +75,7 @@
     <text variable="title"/>
   </macro>
   <macro name="publisher">
-    <group prefix="" delimiter=": " suffix="">
+    <group delimiter=": ">
       <text variable="publisher-place"/>
       <text variable="publisher"/>
     </group>
@@ -119,7 +119,7 @@
       </date>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group delimiter=" " prefix="">
+          <group delimiter=" ">
             <text macro="title"/>
             <text macro="edition"/>
             <text macro="editor"/>
@@ -127,7 +127,7 @@
           </group>
         </if>
         <else-if type="chapter paper-conference" match="any">
-          <group delimiter=" " prefix="">
+          <group delimiter=" ">
             <text macro="title" suffix="."/>
             <text term="in" text-case="capitalize-first"/>
             <text variable="container-title" font-style="italic"/>
diff --git a/british-journal-of-industrial-relations.csl b/british-journal-of-industrial-relations.csl
index 47f8f4fb84..b1c3d05b21 100644
--- a/british-journal-of-industrial-relations.csl
+++ b/british-journal-of-industrial-relations.csl
@@ -136,7 +136,7 @@
       <if type="article-newspaper motion_picture paper-conference broadcast" match="any">
         <date variable="issued">
           <date-part name="day" suffix=" "/>
-          <date-part name="month" suffix=""/>
+          <date-part name="month"/>
         </date>
       </if>
     </choose>
@@ -181,7 +181,7 @@
       </choose>
       <choose>
         <if type="bill legislation" match="any">
-          <group prefix="" delimiter=". " suffix=".">
+          <group delimiter=". " suffix=".">
             <group font-style="italic" delimiter=". ">
               <group delimiter=": ">
                 <choose>
@@ -218,7 +218,7 @@
         </else-if>
         <else-if type="webpage">
           <group prefix=" " delimiter=". " suffix=".">
-            <text macro="title" suffix=""/>
+            <text macro="title"/>
             <text macro="edition"/>
           </group>
           <group prefix=" " delimiter=". " suffix=".">
diff --git a/bulletin-de-la-societe-prehistorique-francaise.csl b/bulletin-de-la-societe-prehistorique-francaise.csl
index e7a121b796..bf3fd673a4 100644
--- a/bulletin-de-la-societe-prehistorique-francaise.csl
+++ b/bulletin-de-la-societe-prehistorique-francaise.csl
@@ -147,7 +147,7 @@
     </sort>
     <layout suffix=" ">
       <group delimiter=" ">
-        <text macro="author" suffix=""/>
+        <text macro="author"/>
         <text macro="year-date" prefix="(" suffix=")&#160;‒"/>
       </group>
       <choose>
@@ -165,7 +165,7 @@
             <text variable="collection-title" prefix="("/>
             <text variable="collection-number" suffix=")"/>
             <date variable="issued">
-              <date-part name="year" prefix=""/>
+              <date-part name="year"/>
             </date>
           </group>
           <group>
diff --git a/bulletin-of-marine-science.csl b/bulletin-of-marine-science.csl
index 7671d1d8bb..5263c5c57b 100644
--- a/bulletin-of-marine-science.csl
+++ b/bulletin-of-marine-science.csl
@@ -18,7 +18,7 @@
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
-    <names variable="author" prefix="" suffix=". ">
+    <names variable="author" suffix=". ">
       <name delimiter=", " name-as-sort-order="all" sort-separator=" " form="long" initialize-with=""/>
     </names>
   </macro>
@@ -28,12 +28,12 @@
     </names>
   </macro>
   <macro name="year">
-    <date variable="issued" prefix="" suffix=". ">
+    <date variable="issued" suffix=". ">
       <date-part name="year"/>
     </date>
   </macro>
   <macro name="title">
-    <text variable="title" prefix="" suffix=". "/>
+    <text variable="title" suffix=". "/>
   </macro>
   <citation disambiguate-add-year-suffix="true" collapse="year" et-al-min="3" et-al-use-first="1">
     <sort>
@@ -41,12 +41,12 @@
       <key variable="issued" sort="ascending"/>
     </sort>
     <layout delimiter=", " prefix="(" suffix=")">
-      <group delimiter=" " prefix="" suffix="">
-        <names variable="author" prefix="" suffix="">
+      <group delimiter=" ">
+        <names variable="author">
           <name and="text" delimiter=" " name-as-sort-order="all" sort-separator=", " form="short"/>
         </names>
-        <date variable="issued" prefix="" suffix="">
-          <date-part name="year" form="long" prefix="" suffix=""/>
+        <date variable="issued">
+          <date-part name="year" form="long"/>
         </date>
       </group>
     </layout>
@@ -62,20 +62,20 @@
       <choose>
         <if type="book">
           <text macro="title"/>
-          <text variable="publisher-place" prefix="" suffix=": "/>
-          <text variable="publisher" prefix="" suffix="."/>
+          <text variable="publisher-place" suffix=": "/>
+          <text variable="publisher" suffix="."/>
         </if>
         <else-if type="chapter">
           <text macro="title"/>
           <text macro="editor"/>
-          <text variable="container-title" prefix="" suffix=" "/>
-          <text variable="publisher-place" prefix="" suffix=": "/>
-          <text variable="publisher" prefix="" suffix=". "/>
+          <text variable="container-title" suffix=" "/>
+          <text variable="publisher-place" suffix=": "/>
+          <text variable="publisher" suffix=". "/>
           <text variable="page" prefix="p. " suffix=". "/>
         </else-if>
         <else-if type="thesis">
           <text macro="title"/>
-          <text variable="publisher" prefix="" suffix=". "/>
+          <text variable="publisher" suffix=". "/>
           <text variable="page" prefix="p." suffix="."/>
         </else-if>
         <else-if type="paper-conference">
@@ -84,14 +84,14 @@
           <text variable="page" prefix="p. " suffix="."/>
         </else-if>
         <else-if type="webpage">
-          <text variable="URL" prefix="[Internet]. Available from: " suffix=""/>
+          <text variable="URL" prefix="[Internet]. Available from: "/>
         </else-if>
         <else>
-          <group delimiter="" prefix="" suffix=". ">
+          <group suffix=". ">
             <text macro="title"/>
-            <text variable="container-title" prefix="" suffix=" " form="long"/>
-            <text variable="volume" prefix="" suffix=": "/>
-            <text variable="page" prefix="" suffix="."/>
+            <text variable="container-title" suffix=" " form="long"/>
+            <text variable="volume" suffix=": "/>
+            <text variable="page" suffix="."/>
           </group>
         </else>
       </choose>
diff --git a/catholic-biblical-association.csl b/catholic-biblical-association.csl
index dcf5c0a16d..d0c2387ee1 100644
--- a/catholic-biblical-association.csl
+++ b/catholic-biblical-association.csl
@@ -408,7 +408,7 @@
     </group>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
-    <layout prefix="" suffix="" delimiter="; ">
+    <layout delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/cell-research.csl b/cell-research.csl
index c7a0ccd246..1c060e9690 100644
--- a/cell-research.csl
+++ b/cell-research.csl
@@ -30,7 +30,7 @@
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
         <et-al font-style="italic"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
diff --git a/cellular-and-molecular-bioengineering.csl b/cellular-and-molecular-bioengineering.csl
index da23aa89ab..a18ec136e4 100644
--- a/cellular-and-molecular-bioengineering.csl
+++ b/cellular-and-molecular-bioengineering.csl
@@ -83,7 +83,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/cerebral-cortex.csl b/cerebral-cortex.csl
index a436a68a93..4a6c743a1a 100644
--- a/cerebral-cortex.csl
+++ b/cerebral-cortex.csl
@@ -178,13 +178,13 @@
         </group>
       </if>
       <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <group delimiter=", " prefix="">
+        <group delimiter=", ">
           <text macro="event"/>
           <text macro="publisher"/>
         </group>
       </else-if>
       <else-if type="chapter paper-conference" match="any">
-        <group delimiter=". " prefix="">
+        <group delimiter=". ">
           <text macro="event"/>
           <text macro="publisher"/>
           <group>
diff --git a/chest.csl b/chest.csl
index 41dcc99199..2ccd953420 100644
--- a/chest.csl
+++ b/chest.csl
@@ -58,7 +58,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/chicago-library-list.csl b/chicago-library-list.csl
index 7edf22d39b..b61c7b8dcc 100644
--- a/chicago-library-list.csl
+++ b/chicago-library-list.csl
@@ -944,7 +944,7 @@
     </choose>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/chicago-note-biblio-no-ibid.csl b/chicago-note-biblio-no-ibid.csl
index 620d53cbc1..3f72981c3a 100644
--- a/chicago-note-biblio-no-ibid.csl
+++ b/chicago-note-biblio-no-ibid.csl
@@ -942,7 +942,7 @@
     </choose>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <group delimiter=", ">
         <text macro="contributors-short"/>
         <group delimiter=" ">
diff --git a/circulation.csl b/circulation.csl
index bf98ec8590..de73257702 100644
--- a/circulation.csl
+++ b/circulation.csl
@@ -63,7 +63,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/clinical-infectious-diseases.csl b/clinical-infectious-diseases.csl
index 4b8f1cbed3..a03bbc3a66 100644
--- a/clinical-infectious-diseases.csl
+++ b/clinical-infectious-diseases.csl
@@ -58,7 +58,7 @@
       <if variable="URL">
         <group delimiter=" ">
           <text term="accessed" text-case="capitalize-first"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="day" suffix=" "/>
             <date-part name="month" suffix=" "/>
             <date-part name="year"/>
diff --git a/clinical-microbiology-and-infection.csl b/clinical-microbiology-and-infection.csl
index 33cbe009ab..5e08d19d9c 100644
--- a/clinical-microbiology-and-infection.csl
+++ b/clinical-microbiology-and-infection.csl
@@ -44,9 +44,9 @@
     </date>
   </macro>
   <macro name="journal">
-    <group suffix="" delimiter=" ">
+    <group delimiter=" ">
       <text variable="container-title" form="short" strip-periods="true"/>
-      <text macro="year" prefix="" suffix=";"/>
+      <text macro="year" suffix=";"/>
       <text variable="volume"/>
     </group>
   </macro>
@@ -117,13 +117,13 @@
           <text macro="editor" suffix=" "/>
           <text variable="container-title" suffix=". "/>
           <text macro="edition" suffix=" "/>
-          <group suffix="." delimiter="">
+          <group suffix=".">
             <text macro="book-publisher"/>
             <text variable="page" prefix=": "/>
           </group>
         </else-if>
         <else-if type="article-journal">
-          <group suffix="." delimiter="">
+          <group suffix=".">
             <text macro="journal"/>
             <text variable="page" prefix=": "/>
           </group>
diff --git a/clinical-neurophysiology.csl b/clinical-neurophysiology.csl
index 15d90d2818..4b9a9f6df2 100644
--- a/clinical-neurophysiology.csl
+++ b/clinical-neurophysiology.csl
@@ -112,7 +112,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/clinical-orthopaedics-and-related-research.csl b/clinical-orthopaedics-and-related-research.csl
index 1abf244737..3c80ada659 100644
--- a/clinical-orthopaedics-and-related-research.csl
+++ b/clinical-orthopaedics-and-related-research.csl
@@ -30,7 +30,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
diff --git a/clio-medica.csl b/clio-medica.csl
index bbfc082dc9..949d495f6a 100644
--- a/clio-medica.csl
+++ b/clio-medica.csl
@@ -920,7 +920,7 @@
     <text variable="genre"/>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/comision-economica-para-america-latina-y-el-caribe.csl b/comision-economica-para-america-latina-y-el-caribe.csl
index a8a58fc998..ccbaa274f0 100644
--- a/comision-economica-para-america-latina-y-el-caribe.csl
+++ b/comision-economica-para-america-latina-y-el-caribe.csl
@@ -396,7 +396,7 @@
               <text macro="locators"/>
               <text macro="onusig"/>
               <text macro="publisher" prefix=", "/>
-              <date variable="issued" prefix=", " suffix="">
+              <date variable="issued" prefix=", ">
                 <date-part name="day" suffix=" de "/>
                 <date-part name="month" text-case="lowercase"/>
               </date>
diff --git a/coral-reefs.csl b/coral-reefs.csl
index 0744880b56..5b831b9909 100644
--- a/coral-reefs.csl
+++ b/coral-reefs.csl
@@ -18,7 +18,7 @@
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
-    <names variable="author" prefix="" suffix=" ">
+    <names variable="author" suffix=" ">
       <name delimiter=", " name-as-sort-order="all" sort-separator=" " form="long" initialize-with=""/>
     </names>
   </macro>
@@ -33,7 +33,7 @@
     </date>
   </macro>
   <macro name="title">
-    <text variable="title" prefix="" suffix=". "/>
+    <text variable="title" suffix=". "/>
   </macro>
   <citation disambiguate-add-year-suffix="true" collapse="year" et-al-min="3" et-al-use-first="1">
     <sort>
@@ -41,12 +41,12 @@
       <key variable="issued" sort="ascending"/>
     </sort>
     <layout delimiter="; " prefix="(" suffix=")">
-      <group delimiter=" " prefix="" suffix="">
-        <names variable="author" prefix="" suffix="">
+      <group delimiter=" ">
+        <names variable="author">
           <name and="text" delimiter=" " name-as-sort-order="all" sort-separator=", " form="short"/>
         </names>
-        <date variable="issued" prefix="" suffix="">
-          <date-part name="year" form="long" prefix="" suffix=""/>
+        <date variable="issued">
+          <date-part name="year" form="long"/>
         </date>
       </group>
     </layout>
@@ -62,34 +62,34 @@
       <text macro="title"/>
       <choose>
         <if type="thesis">
-          <text variable="genre" prefix="" suffix=", "/>
-          <text variable="publisher" prefix="" suffix=", "/>
-          <text variable="page" prefix=" p " suffix=""/>
+          <text variable="genre" suffix=", "/>
+          <text variable="publisher" suffix=", "/>
+          <text variable="page" prefix=" p "/>
         </if>
         <else-if type="book">
-          <text variable="publisher" prefix="" suffix=", "/>
-          <text variable="publisher-place" prefix="" suffix=" "/>
+          <text variable="publisher" suffix=", "/>
+          <text variable="publisher-place" suffix=" "/>
         </else-if>
         <else-if type="paper-conference">
           <text variable="event" prefix=" " suffix=" "/>
-          <text variable="volume" prefix="" suffix=":"/>
-          <text variable="page" prefix="" suffix=""/>
+          <text variable="volume" suffix=":"/>
+          <text variable="page"/>
         </else-if>
         <else-if type="chapter">
           <text macro="editor"/>
           <text variable="container-title" prefix=" " suffix=". "/>
-          <text variable="publisher" prefix="" suffix=", "/>
-          <text variable="publisher-place" prefix="" suffix=", "/>
+          <text variable="publisher" suffix=", "/>
+          <text variable="publisher-place" suffix=", "/>
           <text variable="page" prefix="pp " suffix=" "/>
         </else-if>
         <else-if type="webpage">
-          <text variable="URL" prefix="" suffix=" "/>
+          <text variable="URL" suffix=" "/>
         </else-if>
         <else>
-          <group delimiter="" prefix="" suffix=" ">
-            <text variable="container-title" prefix="" suffix=" " form="short"/>
-            <text variable="volume" prefix="" suffix=":"/>
-            <text variable="page" prefix="" suffix=""/>
+          <group suffix=" ">
+            <text variable="container-title" suffix=" " form="short"/>
+            <text variable="volume" suffix=":"/>
+            <text variable="page"/>
           </group>
         </else>
       </choose>
diff --git a/council-of-science-editors-author-date.csl b/council-of-science-editors-author-date.csl
index 8caeb75152..b53a8a6c56 100644
--- a/council-of-science-editors-author-date.csl
+++ b/council-of-science-editors-author-date.csl
@@ -33,7 +33,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -137,7 +137,7 @@
     </sort>
     <layout>
       <group suffix="." delimiter=". ">
-        <text macro="author" suffix=""/>
+        <text macro="author"/>
         <text macro="year-date"/>
         <text macro="title"/>
       </group>
@@ -148,7 +148,7 @@
               <text macro="edition"/>
               <text macro="editor" prefix="(" suffix=")"/>
             </group>
-            <text prefix=" " suffix="" macro="publisher"/>
+            <text prefix=" " macro="publisher"/>
           </if>
           <else-if type="chapter paper-conference" match="any">
             <group prefix=" " delimiter=" ">
@@ -167,7 +167,7 @@
           <else>
             <text macro="editor" suffix="."/>
             <group prefix=" " suffix=".">
-              <text macro="journal" suffix=""/>
+              <text macro="journal"/>
               <text variable="volume" prefix=" "/>
               <text variable="page" prefix=":"/>
             </group>
diff --git a/council-of-science-editors.csl b/council-of-science-editors.csl
index 4a7a9a06e9..25f805d9d6 100644
--- a/council-of-science-editors.csl
+++ b/council-of-science-editors.csl
@@ -30,7 +30,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -124,8 +124,8 @@
   </citation>
   <bibliography hanging-indent="false" et-al-min="11" et-al-use-first="10">
     <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
-      <text macro="author" suffix=""/>
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
           <group prefix=" " suffix="." delimiter=" ">
@@ -133,7 +133,7 @@
             <text macro="edition"/>
             <text macro="editor" prefix="(" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
           <group suffix="." prefix="; " delimiter=" ">
             <date variable="issued">
               <date-part name="year"/>
diff --git a/critical-care-medicine.csl b/critical-care-medicine.csl
index 40b471008e..bc2ac8a797 100644
--- a/critical-care-medicine.csl
+++ b/critical-care-medicine.csl
@@ -37,7 +37,7 @@
     <group delimiter=" ">
       <group prefix="[" suffix="]" delimiter=" ">
         <text term="cited" text-case="lowercase"/>
-        <date variable="accessed" suffix="">
+        <date variable="accessed">
           <date-part name="year"/>
           <date-part name="month" prefix=" " form="short" strip-periods="true"/>
           <date-part name="day" prefix=" "/>
diff --git a/current-opinion.csl b/current-opinion.csl
index 9679914e9c..5eddcbae68 100644
--- a/current-opinion.csl
+++ b/current-opinion.csl
@@ -45,12 +45,12 @@
         <choose>
           <if type="article-journal">
             <date variable="issued">
-              <date-part name="year" suffix=""/>
+              <date-part name="year"/>
             </date>
           </if>
           <else>
             <date variable="issued">
-              <date-part name="year" suffix=""/>
+              <date-part name="year"/>
             </date>
           </else>
         </choose>
diff --git a/cytometry.csl b/cytometry.csl
index 559debb2a5..b3d4562fd1 100644
--- a/cytometry.csl
+++ b/cytometry.csl
@@ -31,7 +31,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -120,8 +120,8 @@
   </citation>
   <bibliography hanging-indent="false" et-al-min="99" et-al-use-first="98">
     <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
-      <text macro="author" suffix=""/>
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group suffix=".">
@@ -129,7 +129,7 @@
             <text macro="edition" prefix=" "/>
             <text macro="editor" prefix=" (" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
           <group prefix="; " suffix=".">
             <date variable="issued">
               <date-part name="year"/>
diff --git a/de-buck.csl b/de-buck.csl
index 9b8f3e7ed2..96b26791f7 100644
--- a/de-buck.csl
+++ b/de-buck.csl
@@ -371,7 +371,7 @@
     </choose>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/decision-sciences.csl b/decision-sciences.csl
index 13f2105916..4c84f1d66f 100644
--- a/decision-sciences.csl
+++ b/decision-sciences.csl
@@ -249,7 +249,7 @@
       <if type="article-journal chapter paper-conference" match="none">
         <names variable="translator editor" delimiter=", " prefix=" (" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="title" suffix=""/>
+          <label form="short" prefix=", " text-case="title"/>
         </names>
       </if>
     </choose>
diff --git a/digestive-and-liver-disease.csl b/digestive-and-liver-disease.csl
index 4961ab3986..412224f67a 100644
--- a/digestive-and-liver-disease.csl
+++ b/digestive-and-liver-disease.csl
@@ -69,7 +69,7 @@
       <if variable="URL">
         <group delimiter=" " prefix="[" suffix="] ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/din-1505-2-alphanumeric.csl b/din-1505-2-alphanumeric.csl
index 7c79b0396f..16be00b944 100644
--- a/din-1505-2-alphanumeric.csl
+++ b/din-1505-2-alphanumeric.csl
@@ -292,7 +292,7 @@
       <choose>
         <!-- Tabelle 1 aus litverz.ps -->
         <if type="bill book broadcast graphic legal_case legislation manuscript map motion_picture report song" match="any">
-          <text prefix=" " macro="title" suffix=""/>
+          <text prefix=" " macro="title"/>
           <text prefix=", " variable="collection-title" font-style="italic"/>
           <!--Reihe-->
           <text prefix=" (" macro="genre" suffix=")"/>
@@ -337,7 +337,7 @@
         <!-- Tabelle 5 aus litverz.ps - Hochschulschriften
           (Diplomarbeiten, Dissertationen, Master-A., unverö. Studienarbeiten -->
         <else-if type="thesis" match="any">
-          <text prefix=" " macro="title" font-style="italic" suffix=""/>
+          <text prefix=" " macro="title" font-style="italic"/>
           <text prefix=". " macro="edition"/>
           <text prefix=". " variable="publisher-place"/>
           <text prefix=", " variable="publisher" form="long"/>
diff --git a/din-1505-2-numeric-alphabetical.csl b/din-1505-2-numeric-alphabetical.csl
index f45fb2f193..f3fe66646f 100644
--- a/din-1505-2-numeric-alphabetical.csl
+++ b/din-1505-2-numeric-alphabetical.csl
@@ -299,7 +299,7 @@
       <choose>
         <!-- Tabelle 1 aus litverz.ps -->
         <if type="bill book broadcast graphic legal_case legislation manuscript map motion_picture report song" match="any">
-          <text prefix=" " macro="title" suffix=""/>
+          <text prefix=" " macro="title"/>
           <text prefix=", " variable="collection-title" font-style="italic"/>
           <!--Reihe-->
           <text prefix=" (" macro="genre" suffix=")"/>
@@ -344,7 +344,7 @@
         <!-- Tabelle 5 aus litverz.ps - Hochschulschriften
           (Diplomarbeiten, Dissertationen, Master-A., unverö. Studienarbeiten -->
         <else-if type="thesis" match="any">
-          <text prefix=" " macro="title" font-style="italic" suffix=""/>
+          <text prefix=" " macro="title" font-style="italic"/>
           <text prefix=". " macro="edition"/>
           <text prefix=". " variable="publisher-place"/>
           <text prefix=", " variable="publisher" form="long"/>
diff --git a/din-1505-2-numeric.csl b/din-1505-2-numeric.csl
index a10e57bccd..b679293435 100644
--- a/din-1505-2-numeric.csl
+++ b/din-1505-2-numeric.csl
@@ -285,7 +285,7 @@
       <choose>
         <!-- Tabelle 1 aus litverz.ps -->
         <if type="bill book broadcast graphic legal_case legislation manuscript map motion_picture report song" match="any">
-          <text prefix=" " macro="title" suffix=""/>
+          <text prefix=" " macro="title"/>
           <text prefix=", " variable="collection-title" font-style="italic"/>
           <!--Reihe-->
           <text prefix=" (" macro="genre" suffix=")"/>
@@ -330,7 +330,7 @@
         <!-- Tabelle 5 aus litverz.ps - Hochschulschriften
           (Diplomarbeiten, Dissertationen, Master-A., unverö. Studienarbeiten -->
         <else-if type="thesis" match="any">
-          <text prefix=" " macro="title" font-style="italic" suffix=""/>
+          <text prefix=" " macro="title" font-style="italic"/>
           <text prefix=". " macro="edition"/>
           <text prefix=". " variable="publisher-place"/>
           <text prefix=", " variable="publisher" form="long"/>
diff --git a/din-1505-2.csl b/din-1505-2.csl
index b69489dc4e..085a18160d 100644
--- a/din-1505-2.csl
+++ b/din-1505-2.csl
@@ -302,7 +302,7 @@
       <choose>
         <!-- Tabelle 1 aus litverz.ps -->
         <if type="bill book broadcast graphic legal_case legislation manuscript map motion_picture report song" match="any">
-          <text prefix=" " macro="title" suffix=""/>
+          <text prefix=" " macro="title"/>
           <text prefix=", " variable="collection-title" font-style="italic"/>
           <!--Reihe-->
           <text prefix=" (" macro="genre" suffix=")"/>
@@ -347,7 +347,7 @@
         <!-- Tabelle 5 aus litverz.ps - Hochschulschriften
           (Diplomarbeiten, Dissertationen, Master-A., unverö. Studienarbeiten -->
         <else-if type="thesis" match="any">
-          <text prefix=" " macro="title" font-style="italic" suffix=""/>
+          <text prefix=" " macro="title" font-style="italic"/>
           <text prefix=". " macro="edition"/>
           <text prefix=". " variable="publisher-place"/>
           <text prefix=", " variable="publisher" form="long"/>
diff --git a/disability-and-rehabilitation.csl b/disability-and-rehabilitation.csl
index e76fc1cd6c..af2d201b63 100644
--- a/disability-and-rehabilitation.csl
+++ b/disability-and-rehabilitation.csl
@@ -30,7 +30,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -113,8 +113,8 @@
   </citation>
   <bibliography et-al-min="11" et-al-use-first="10" second-field-align="margin">
     <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
-      <text macro="author" suffix=""/>
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group prefix=" " suffix="." delimiter=" ">
@@ -122,7 +122,7 @@
             <text macro="edition"/>
             <text macro="editor" prefix="(" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
           <group suffix="." prefix="; " delimiter=" ">
             <date variable="issued">
               <date-part name="year"/>
diff --git a/drugs-of-today.csl b/drugs-of-today.csl
index 86baaecefb..33769cf169 100644
--- a/drugs-of-today.csl
+++ b/drugs-of-today.csl
@@ -85,7 +85,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/earth-surface-processes-and-landforms.csl b/earth-surface-processes-and-landforms.csl
index 1835d299d5..7dbc21544a 100644
--- a/earth-surface-processes-and-landforms.csl
+++ b/earth-surface-processes-and-landforms.csl
@@ -151,11 +151,11 @@
     <layout>
       <group delimiter=". " suffix=".">
         <text macro="author"/>
-        <text macro="year-date" prefix="" suffix=""/>
+        <text macro="year-date"/>
       </group>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group delimiter=". " prefix=" " suffix="">
+          <group delimiter=". " prefix=" ">
             <text macro="title" suffix=" "/>
             <text macro="edition"/>
             <text macro="editor"/>
@@ -164,7 +164,7 @@
           </group>
         </if>
         <else-if type="paper-conference">
-          <group delimiter=". " prefix=" " suffix="">
+          <group delimiter=". " prefix=" ">
             <text macro="title"/>
             <text variable="event" prefix="presented at the "/>
             <text variable="event-place"/>
@@ -176,7 +176,7 @@
           </group>
         </else-if>
         <else-if type="chapter paper-conference" match="any">
-          <group delimiter=" " prefix=" " suffix="">
+          <group delimiter=" " prefix=" ">
             <text macro="title" suffix="."/>
             <text macro="container" suffix="."/>
             <text macro="publisher" suffix=";"/>
@@ -184,7 +184,7 @@
           </group>
         </else-if>
         <else-if type="thesis">
-          <group delimiter=", " prefix=" " suffix="">
+          <group delimiter=", " prefix=" ">
             <text macro="title"/>
             <text variable="genre"/>
             <text variable="page" suffix=" pp."/>
@@ -196,11 +196,11 @@
           </group>
         </else-if>
         <else>
-          <group delimiter=". " suffix="" prefix=" ">
+          <group delimiter=". " prefix=" ">
             <text macro="title"/>
             <text macro="editor"/>
           </group>
-          <group prefix=". " suffix="">
+          <group prefix=". ">
             <text variable="container-title"/>
             <group prefix=" " delimiter=" ">
               <group>
diff --git a/economic-commission-for-latin-america-and-the-caribbean.csl b/economic-commission-for-latin-america-and-the-caribbean.csl
index 53f958f900..d982e33cf8 100644
--- a/economic-commission-for-latin-america-and-the-caribbean.csl
+++ b/economic-commission-for-latin-america-and-the-caribbean.csl
@@ -361,7 +361,7 @@
               <text macro="locators"/>
               <text macro="onusig"/>
               <text macro="publisher" prefix=", "/>
-              <date variable="issued" prefix=", " suffix="">
+              <date variable="issued" prefix=", ">
                 <date-part name="month"/>
                 <date-part name="day" prefix=" "/>
               </date>
diff --git a/el-profesional-de-la-informacion.csl b/el-profesional-de-la-informacion.csl
index f18b16bb3e..e9a00f60bb 100644
--- a/el-profesional-de-la-informacion.csl
+++ b/el-profesional-de-la-informacion.csl
@@ -70,7 +70,7 @@
     </sort>
     <layout>
       <group suffix=".">
-        <group delimiter="" suffix=", ">
+        <group suffix=", ">
           <text macro="author" suffix=". "/>
           <!-- text macro="issued" prefix="(" suffix=")"/ -->
           <text macro="title"/>
diff --git a/embo-reports.csl b/embo-reports.csl
index 47cf31808c..36a39655aa 100644
--- a/embo-reports.csl
+++ b/embo-reports.csl
@@ -75,7 +75,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/emerald-harvard.csl b/emerald-harvard.csl
index 68091dacb0..7a2b9015e8 100644
--- a/emerald-harvard.csl
+++ b/emerald-harvard.csl
@@ -169,7 +169,7 @@
             <text variable="event"/>
           </if>
           <else>
-            <group delimiter="">
+            <group>
               <text variable="genre" text-case="capitalize-first"/>
               <text term="presented at"/>
               <text variable="event"/>
@@ -190,7 +190,7 @@
             <if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
               <date variable="issued">
                 <date-part prefix="," name="month"/>
-                <date-part prefix="" name="day"/>
+                <date-part name="day"/>
               </date>
             </if>
           </choose>
@@ -216,7 +216,7 @@
   <macro name="edition">
     <choose>
       <if is-numeric="edition">
-        <group delimiter="">
+        <group>
           <number variable="edition" form="ordinal"/>
           <text term="edition" form="short"/>
         </group>
@@ -241,7 +241,7 @@
         </group>
       </if>
       <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
-        <group prefix="" suffix="" delimiter=", ">
+        <group delimiter=", ">
           <text macro="edition"/>
           <group>
             <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=". " strip-periods="true"/>
diff --git a/emu-austral-ornithology.csl b/emu-austral-ornithology.csl
index 297f5dc344..66f27e2e23 100644
--- a/emu-austral-ornithology.csl
+++ b/emu-austral-ornithology.csl
@@ -19,7 +19,7 @@
   </info>
   <macro name="editor">
     <names variable="editor" delimiter=", ">
-      <label form="short" prefix="" text-case="sentence" suffix=" " strip-periods="true"/>
+      <label form="short" text-case="sentence" suffix=" " strip-periods="true"/>
       <name and="text" initialize-with=". " delimiter=", "/>
     </names>
   </macro>
diff --git a/entomologia-experimentalis-et-applicata.csl b/entomologia-experimentalis-et-applicata.csl
index 5992cebac9..6a2315ee2b 100644
--- a/entomologia-experimentalis-et-applicata.csl
+++ b/entomologia-experimentalis-et-applicata.csl
@@ -112,7 +112,7 @@
       <key variable="issued"/>
     </sort>
     <layout>
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <date variable="issued" prefix=" (" suffix=")">
         <date-part name="year"/>
       </date>
@@ -132,11 +132,11 @@
               <label form="short" strip-periods="true"/>
               <name and="symbol" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="never"/>
             </names>
-            <text macro="edition" prefix=" " suffix=""/>
+            <text macro="edition" prefix=" "/>
             <text variable="collection-title" prefix=" " suffix="."/>
             <group suffix=".">
               <text macro="publisher" prefix=" " suffix=","/>
-              <group prefix=" " suffix="">
+              <group prefix=" ">
                 <label variable="page" form="short" suffix=" " strip-periods="true"/>
                 <text variable="page"/>
               </group>
diff --git a/environmental-conservation.csl b/environmental-conservation.csl
index 8c8319715a..c7876c5090 100644
--- a/environmental-conservation.csl
+++ b/environmental-conservation.csl
@@ -69,7 +69,7 @@
     </choose>
   </macro>
   <macro name="publisher">
-    <group prefix="" delimiter=": " suffix="">
+    <group delimiter=": ">
       <text variable="publisher-place"/>
       <text variable="publisher"/>
     </group>
@@ -106,7 +106,7 @@
       <key macro="author"/>
       <key variable="issued"/>
     </sort>
-    <layout suffix="">
+    <layout>
       <text macro="author"/>
       <date variable="issued" prefix=" (" suffix=")">
         <date-part name="year"/>
diff --git a/environmental-health-perspectives.csl b/environmental-health-perspectives.csl
index adb30bec27..195a6cc9c0 100644
--- a/environmental-health-perspectives.csl
+++ b/environmental-health-perspectives.csl
@@ -191,11 +191,11 @@
         <else>
           <choose>
             <if variable="DOI">
-              <group suffix="">
+              <group>
                 <text macro="title" prefix=" " suffix="."/>
                 <text macro="editor" prefix=" "/>
               </group>
-              <group prefix=" " suffix="" delimiter=" ">
+              <group prefix=" " delimiter=" ">
                 <text variable="container-title" form="short"/>
                 <group delimiter=":">
                   <text variable="volume"/>
diff --git a/equine-veterinary-education.csl b/equine-veterinary-education.csl
index 16b6bc4596..67f9dbefa4 100644
--- a/equine-veterinary-education.csl
+++ b/equine-veterinary-education.csl
@@ -153,13 +153,13 @@
         </else-if>
         <else>
           <text variable="container-title" suffix=" " form="long" font-style="italic"/>
-          <group delimiter=", " suffix="">
+          <group delimiter=", ">
             <text variable="volume" font-weight="bold"/>
             <text variable="page"/>
           </group>
         </else>
       </choose>
-      <text prefix=" " macro="access" suffix=""/>
+      <text prefix=" " macro="access"/>
     </layout>
   </bibliography>
 </style>
diff --git a/ethnobiology-and-conservation.csl b/ethnobiology-and-conservation.csl
index 5dbf96d968..2433fa823e 100644
--- a/ethnobiology-and-conservation.csl
+++ b/ethnobiology-and-conservation.csl
@@ -19,7 +19,7 @@
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
-    <names variable="author" prefix="" suffix=" ">
+    <names variable="author" suffix=" ">
       <name delimiter=", " name-as-sort-order="all" sort-separator=" " form="long" initialize-with=""/>
     </names>
   </macro>
@@ -35,7 +35,7 @@
     </date>
   </macro>
   <macro name="title">
-    <text variable="title" prefix="" suffix=". "/>
+    <text variable="title" suffix=". "/>
   </macro>
   <citation disambiguate-add-year-suffix="true" collapse="year" et-al-min="3" et-al-use-first="1">
     <sort>
@@ -43,12 +43,12 @@
       <key macro="year"/>
     </sort>
     <layout delimiter="; " prefix="(" suffix=")">
-      <group delimiter=" " prefix="" suffix="">
-        <names variable="author" prefix="" suffix="">
+      <group delimiter=" ">
+        <names variable="author">
           <name and="text" delimiter=" " name-as-sort-order="all" sort-separator=", " form="short"/>
         </names>
-        <date variable="issued" prefix="" suffix="">
-          <date-part name="year" form="long" prefix="" suffix=""/>
+        <date variable="issued">
+          <date-part name="year" form="long"/>
         </date>
       </group>
     </layout>
@@ -65,26 +65,26 @@
       <text macro="title" font-weight="bold"/>
       <choose>
         <if type="thesis">
-          <text variable="genre" prefix="" suffix=", "/>
-          <text variable="publisher" prefix="" suffix=", "/>
+          <text variable="genre" suffix=", "/>
+          <text variable="publisher" suffix=", "/>
           <text variable="publisher-place"/>
         </if>
         <else-if type="book">
           <text variable="edition" suffix=" ed. "/>
-          <text variable="publisher" prefix="" suffix=", "/>
-          <text variable="publisher-place" prefix="" suffix=" "/>
+          <text variable="publisher" suffix=", "/>
+          <text variable="publisher-place" suffix=" "/>
         </else-if>
         <else-if type="paper-conference">
           <text variable="event" prefix=" " suffix=" "/>
-          <text variable="volume" prefix="" suffix=":"/>
-          <text variable="page" prefix="" suffix=""/>
+          <text variable="volume" suffix=":"/>
+          <text variable="page"/>
         </else-if>
         <else-if type="chapter">
           <text macro="editor"/>
           <text variable="container-title" prefix=" " suffix=". "/>
           <text variable="edition" suffix=" ed. "/>
-          <text variable="publisher" prefix="" suffix=", "/>
-          <text variable="publisher-place" prefix="" suffix=", "/>
+          <text variable="publisher" suffix=", "/>
+          <text variable="publisher-place" suffix=", "/>
           <label strip-periods="false" suffix=" " variable="page" form="symbol"/>
           <text variable="page" suffix=" "/>
         </else-if>
@@ -104,10 +104,10 @@
           <text variable="DOI" prefix="doi: "/>
         </else-if>
         <else>
-          <group delimiter="" prefix="" suffix=" ">
-            <text variable="container-title" prefix="" suffix=" " form="short"/>
-            <text variable="volume" prefix="" suffix=":"/>
-            <text variable="page" prefix="" suffix=""/>
+          <group suffix=" ">
+            <text variable="container-title" suffix=" " form="short"/>
+            <text variable="volume" suffix=":"/>
+            <text variable="page"/>
           </group>
         </else>
       </choose>
diff --git a/european-journal-of-clinical-microbiology-and-infectious-diseases.csl b/european-journal-of-clinical-microbiology-and-infectious-diseases.csl
index 50261cee8e..0e7ae33890 100644
--- a/european-journal-of-clinical-microbiology-and-infectious-diseases.csl
+++ b/european-journal-of-clinical-microbiology-and-infectious-diseases.csl
@@ -54,7 +54,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="day" prefix=" "/>
           </date>
diff --git a/european-journal-of-emergency-medicine.csl b/european-journal-of-emergency-medicine.csl
index 409118b8b5..d7c46312df 100644
--- a/european-journal-of-emergency-medicine.csl
+++ b/european-journal-of-emergency-medicine.csl
@@ -53,7 +53,7 @@
             <text variable="URL"/>
             <group prefix=" (" suffix=")." delimiter=" ">
               <text term="accessed" text-case="lowercase"/>
-              <date variable="accessed" suffix="">
+              <date variable="accessed">
                 <date-part name="day" prefix=" "/>
                 <date-part name="month" prefix=" " form="short" strip-periods="true"/>
                 <date-part name="year"/>
diff --git a/european-journal-of-immunology.csl b/european-journal-of-immunology.csl
index 72db480894..564e4f0936 100644
--- a/european-journal-of-immunology.csl
+++ b/european-journal-of-immunology.csl
@@ -31,7 +31,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always" font-weight="bold"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <et-al font-style="italic"/>
         <substitute>
           <names variable="editor"/>
@@ -109,7 +109,7 @@
   </citation>
   <bibliography hanging-indent="false" et-al-min="8" et-al-use-first="7">
     <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
+      <text variable="citation-number" suffix=". "/>
       <text macro="author"/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
@@ -118,7 +118,7 @@
             <text macro="edition" prefix=" "/>
             <text macro="editor" prefix=" (" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
           <group suffix="." prefix="; ">
             <date variable="issued">
               <date-part name="year"/>
diff --git a/european-journal-of-information-systems.csl b/european-journal-of-information-systems.csl
index 79cfb33a72..b61f227992 100644
--- a/european-journal-of-information-systems.csl
+++ b/european-journal-of-information-systems.csl
@@ -63,7 +63,7 @@
     <choose>
       <if variable="URL">
         <text value="Available at: "/>
-        <text variable="URL" prefix="" suffix=""/>
+        <text variable="URL"/>
         <group prefix=" (" suffix=")">
           <text value="accessed "/>
           <date variable="accessed">
diff --git a/european-journal-of-neuroscience.csl b/european-journal-of-neuroscience.csl
index fc9d33f310..c7dd2dee3f 100644
--- a/european-journal-of-neuroscience.csl
+++ b/european-journal-of-neuroscience.csl
@@ -215,7 +215,7 @@
     </sort>
     <layout>
       <group suffix=".">
-        <text macro="author" suffix=""/>
+        <text macro="author"/>
         <text macro="issued" prefix=" (" suffix=") "/>
         <group>
           <text macro="title"/>
diff --git a/european-journal-of-ophthalmology.csl b/european-journal-of-ophthalmology.csl
index 7f0f7f1bb0..c369742474 100644
--- a/european-journal-of-ophthalmology.csl
+++ b/european-journal-of-ophthalmology.csl
@@ -66,7 +66,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/european-journal-of-radiology.csl b/european-journal-of-radiology.csl
index 677d6536cc..5d3b0dc831 100644
--- a/european-journal-of-radiology.csl
+++ b/european-journal-of-radiology.csl
@@ -34,7 +34,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -128,7 +128,7 @@
   <bibliography hanging-indent="false" et-al-min="6" et-al-use-first="3">
     <layout suffix=".">
       <text variable="citation-number" prefix="[" suffix="] "/>
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <choose>
         <if type="bill book graphic legal_case motion_picture report song" match="any">
           <group>
@@ -136,7 +136,7 @@
             <text macro="edition" prefix=" "/>
             <text macro="editor" prefix=" (" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
           <group prefix="; ">
             <date variable="issued">
               <date-part name="year"/>
diff --git a/european-journal-of-soil-science.csl b/european-journal-of-soil-science.csl
index a61a357174..86728ce1af 100644
--- a/european-journal-of-soil-science.csl
+++ b/european-journal-of-soil-science.csl
@@ -131,7 +131,7 @@
             <text macro="title" prefix=" "/>
             <text macro="editor-translator" prefix=" "/>
           </group>
-          <text macro="edition" prefix=" " suffix=""/>
+          <text macro="edition" prefix=" "/>
           <text prefix=" " suffix="." macro="publisher"/>
         </if>
         <else-if type="chapter paper-conference" match="any">
@@ -144,7 +144,7 @@
               <label form="short" prefix=" (" suffix=".)," strip-periods="true"/>
             </names>
             <text variable="container-title" prefix=" " suffix="."/>
-            <text macro="edition" prefix=" " suffix=""/>
+            <text macro="edition" prefix=" "/>
             <text variable="collection-title" prefix=" " suffix="."/>
             <group suffix=".">
               <text macro="publisher" prefix=" " suffix="."/>
@@ -157,7 +157,7 @@
             <text macro="editor-translator" prefix=" "/>
           </group>
           <group prefix=" " suffix=".">
-            <text variable="container-title" font-style="italic" suffix=""/>
+            <text variable="container-title" font-style="italic"/>
             <group prefix=" ">
               <text variable="volume" font-weight="bold"/>
             </group>
diff --git a/european-respiratory-journal.csl b/european-respiratory-journal.csl
index 5272457e3f..9299cd2aa6 100644
--- a/european-respiratory-journal.csl
+++ b/european-respiratory-journal.csl
@@ -76,7 +76,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/european-retail-research.csl b/european-retail-research.csl
index 53fad44e5f..98d4a0a26b 100644
--- a/european-retail-research.csl
+++ b/european-retail-research.csl
@@ -151,7 +151,7 @@
           </group>
         </else-if>
         <else-if type="webpage">
-          <group delimiter="">
+          <group>
             <text prefix="In: " variable="container-title" suffix=". " form="short"/>
             <text variable="URL" prefix=", " suffix=", "/>
             <date variable="accessed">
@@ -170,7 +170,7 @@
           </group>
         </else-if>
         <else>
-          <group delimiter="">
+          <group>
             <text variable="container-title" form="short" suffix=" "/>
             <text variable="volume" suffix=":"/>
             <text variable="page" suffix="."/>
diff --git a/european-society-of-cardiology.csl b/european-society-of-cardiology.csl
index d1f2afe456..35f3f5beb6 100644
--- a/european-society-of-cardiology.csl
+++ b/european-society-of-cardiology.csl
@@ -74,7 +74,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/european-union-interinstitutional-style-guide.csl b/european-union-interinstitutional-style-guide.csl
index d01d7ab3a8..cf366945c8 100644
--- a/european-union-interinstitutional-style-guide.csl
+++ b/european-union-interinstitutional-style-guide.csl
@@ -502,7 +502,7 @@
     </group>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/evolutionary-anthropology.csl b/evolutionary-anthropology.csl
index b1da8e1dbc..82240a19aa 100644
--- a/evolutionary-anthropology.csl
+++ b/evolutionary-anthropology.csl
@@ -76,7 +76,7 @@
   <macro name="container-title">
     <choose>
       <if type="article-journal" match="any">
-        <group suffix="" delimiter=" ">
+        <group delimiter=" ">
           <text variable="container-title" form="short" strip-periods="true"/>
         </group>
         <text macro="edition" prefix=" "/>
@@ -133,7 +133,7 @@
   <macro name="date">
     <choose>
       <if type="article-journal article-magazine article-newspaper" match="any">
-        <group suffix="" delimiter=" ">
+        <group delimiter=" ">
           <date variable="issued" delimiter=" ">
             <date-part name="year"/>
           </date>
@@ -194,7 +194,7 @@
     <sort>
       <key variable="citation-number"/>
     </sort>
-    <layout vertical-align="sup" prefix="" suffix="" delimiter=",">
+    <layout vertical-align="sup" delimiter=",">
       <text variable="citation-number"/>
     </layout>
   </citation>
diff --git a/eye.csl b/eye.csl
index 04f50b95ad..a2d092f0ca 100644
--- a/eye.csl
+++ b/eye.csl
@@ -33,7 +33,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -117,8 +117,8 @@
   </citation>
   <bibliography hanging-indent="false" et-al-min="7" et-al-use-first="6">
     <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
-      <text macro="author" suffix=""/>
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group suffix="." delimiter=",">
@@ -126,7 +126,7 @@
             <text macro="edition" prefix=" "/>
             <text macro="editor" prefix=" (" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
           <group suffix="." prefix="; ">
             <date variable="issued">
               <date-part name="year"/>
diff --git a/fachhochschule-vorarlberg.csl b/fachhochschule-vorarlberg.csl
index 4c703799cf..83667f1eb7 100644
--- a/fachhochschule-vorarlberg.csl
+++ b/fachhochschule-vorarlberg.csl
@@ -48,7 +48,7 @@
   </macro>
   <macro name="editor">
     <names variable="editor" delimiter="; ">
-      <name name-as-sort-order="all" sort-separator=", " delimiter="; " delimiter-precedes-last="always" form="long" suffix=""/>
+      <name name-as-sort-order="all" sort-separator=", " delimiter="; " delimiter-precedes-last="always" form="long"/>
       <label form="short" prefix=" (" suffix=".):&#160;" strip-periods="true"/>
     </names>
   </macro>
@@ -159,18 +159,18 @@
   <macro name="locator">
     <choose>
       <if type="article-journal">
-        <text variable="volume" prefix="" suffix="&#160;"/>
+        <text variable="volume" suffix="&#160;"/>
         <date variable="issued">
           <date-part name="year" prefix="(" suffix=")"/>
         </date>
-        <text variable="issue" prefix=",&#160;" suffix=""/>
+        <text variable="issue" prefix=",&#160;"/>
       </if>
       <else-if type="article-newspaper">
         <text variable="volume" prefix=",&#160;" suffix="&#160;"/>
         <!-- <date variable="issued">
                     <date-part name="year" prefix="(" suffix=")"/>
                   </date> -->
-        <text variable="issue" prefix=",&#160;" suffix=""/>
+        <text variable="issue" prefix=",&#160;"/>
       </else-if>
     </choose>
   </macro>
diff --git a/fertility-and-sterility.csl b/fertility-and-sterility.csl
index 4358eaba08..4671dfb741 100644
--- a/fertility-and-sterility.csl
+++ b/fertility-and-sterility.csl
@@ -55,7 +55,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/first-monday.csl b/first-monday.csl
index 45bc291863..ce69b61ac8 100644
--- a/first-monday.csl
+++ b/first-monday.csl
@@ -46,7 +46,7 @@
   <macro name="access">
     <choose>
       <if variable="URL">
-        <group delimiter="" prefix=", ">
+        <group prefix=", ">
           <choose>
             <if variable="page">
               <text value=" and"/>
@@ -54,7 +54,7 @@
           </choose>
           <text value=" at "/>
           <text variable="URL"/>
-          <group prefix=", " suffix="">
+          <group prefix=", ">
             <text term="accessed" suffix=": "/>
             <date variable="accessed">
               <date-part name="day" suffix=" "/>
@@ -134,15 +134,15 @@
         <choose>
           <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
             <group prefix=" " delimiter=" ">
-              <text macro="title" suffix=""/>
+              <text macro="title"/>
               <text variable="genre" suffix=","/>
               <text macro="edition"/>
-              <text macro="editor" suffix=""/>
+              <text macro="editor"/>
             </group>
-            <text prefix=", " suffix="" macro="publisher"/>
+            <text prefix=", " macro="publisher"/>
           </if>
           <else-if type="chapter paper-conference" match="any">
-            <group suffix="">
+            <group>
               <text macro="title" quotes="true"/>
             </group>
             <group prefix=", " delimiter=" ">
@@ -150,7 +150,7 @@
               <text macro="editor" suffix="."/>
               <text variable="container-title" font-style="italic" suffix=","/>
               <text variable="collection-title" suffix=","/>
-              <group suffix="">
+              <group>
                 <text macro="publisher"/>
                 <group prefix=",">
                   <text variable="page" prefix=" pp. "/>
@@ -159,23 +159,23 @@
             </group>
           </else-if>
           <else>
-            <group prefix=" " delimiter=" " suffix="">
+            <group prefix=" " delimiter=" ">
               <group suffix=",">
                 <text macro="title" quotes="true"/>
               </group>
               <text macro="editor"/>
             </group>
-            <group prefix=" " suffix="">
+            <group prefix=" ">
               <text variable="container-title" font-style="italic"/>
               <group prefix=", volume ">
                 <text variable="volume"/>
-                <text variable="issue" prefix=", number" suffix=""/>
+                <text variable="issue" prefix=", number"/>
               </group>
               <text variable="page" prefix=", pp. "/>
             </group>
           </else>
         </choose>
-        <text prefix="" macro="access" suffix=""/>
+        <text macro="access"/>
       </group>
     </layout>
   </bibliography>
diff --git a/foerster-geisteswissenschaft.csl b/foerster-geisteswissenschaft.csl
index 5c717958a3..8204b49e2c 100644
--- a/foerster-geisteswissenschaft.csl
+++ b/foerster-geisteswissenschaft.csl
@@ -497,7 +497,7 @@ a) mit Name "collection-editor" (in jedem Fall)
           <if variable="author" match="all">
             <names variable="editor translator" delimiter=", ">
               <!-- Bezeichnung in Kurzform ("hg. v.", "übers. v."). -->
-              <label form="verb-short" prefix="" text-case="lowercase" suffix=". " strip-periods="false"/>
+              <label form="verb-short" text-case="lowercase" suffix=". " strip-periods="false"/>
               <!-- Mehrere Herausgeber und/oder Übersetzer durch Komma getrennt,
 	  der letztgenannte durch "und" abgetrennt. -->
               <name and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never">
@@ -575,7 +575,7 @@ a) mit Name "collection-editor" (in jedem Fall)
           <if variable="container-author" match="all">
             <names variable="editor">
               <!-- Bezeichnung in Kurzform ("hg. v."). -->
-              <label form="verb-short" prefix="" text-case="lowercase" suffix=". " strip-periods="false"/>
+              <label form="verb-short" text-case="lowercase" suffix=". " strip-periods="false"/>
               <!-- Mehrere Herausgeber durch Komma getrennt, der letztgenannte
 	       durch "und" abgetrennt. -->
               <name and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never">
@@ -626,7 +626,7 @@ a) mit Name "collection-editor" (in jedem Fall)
           <!-- wird ggf. der Band ausgegeben. -->
           <choose>
             <if variable="volume">
-              <group delimiter="">
+              <group>
                 <text term="volume" form="short" suffix=".&#160;" strip-periods="true"/>
                 <number variable="volume"/>
               </group>
diff --git a/free-radical-biology-and-medicine.csl b/free-radical-biology-and-medicine.csl
index d113a4c22c..65ae6faf4f 100644
--- a/free-radical-biology-and-medicine.csl
+++ b/free-radical-biology-and-medicine.csl
@@ -83,7 +83,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/free-radical-research.csl b/free-radical-research.csl
index 73b549e1c8..e6884f295a 100644
--- a/free-radical-research.csl
+++ b/free-radical-research.csl
@@ -32,7 +32,7 @@
   <macro name="editor">
     <names variable="editor">
       <name delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
-      <label form="long" prefix=", " suffix=""/>
+      <label form="long" prefix=", "/>
     </names>
   </macro>
   <macro name="year-date">
diff --git a/french-politics.csl b/french-politics.csl
index 67abe6a7b8..669a336d8b 100644
--- a/french-politics.csl
+++ b/french-politics.csl
@@ -45,7 +45,7 @@
       <if type="chapter paper-conference" match="none">
         <names variable="translator editor" delimiter=", " prefix=" (" suffix=")">
           <name and="text" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="title" suffix=""/>
+          <label form="short" prefix=", " text-case="title"/>
         </names>
       </if>
     </choose>
@@ -290,12 +290,12 @@
   <macro name="locators">
     <choose>
       <if type="article-journal article-magazine" match="any">
-        <group prefix=" " delimiter="">
+        <group prefix=" ">
           <group>
             <text variable="volume"/>
             <text variable="issue" prefix="(" suffix=")"/>
           </group>
-          <text variable="page" prefix=": " suffix=""/>
+          <text variable="page" prefix=": "/>
         </group>
       </if>
       <else-if type="article-newspaper">
diff --git a/french1.csl b/french1.csl
index b0588c745a..0a1dbd1d3b 100644
--- a/french1.csl
+++ b/french1.csl
@@ -89,7 +89,7 @@
       <if variable="URL">
         <group prefix="(" suffix=")" delimiter=" ">
           <text value="consulté le"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="day" suffix=" "/>
             <date-part name="month" suffix=" "/>
             <date-part name="year"/>
@@ -99,7 +99,7 @@
       <else-if variable="DOI">
         <group prefix="(" suffix=")" delimiter=" ">
           <text value="consulté le" suffix=" "/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="day" suffix=" "/>
             <date-part name="month" suffix=" "/>
             <date-part name="year"/>
@@ -187,12 +187,12 @@
       <choose>
         <if type="thesis">
           <text variable="genre" suffix=". "/>
-          <text macro="publisher" prefix=""/>
+          <text macro="publisher"/>
           <text variable="number-of-pages" suffix=" p."/>
         </if>
         <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <text macro="edition"/>
-          <text macro="publisher" prefix=""/>
+          <text macro="publisher"/>
           <text variable="number-of-pages" suffix=" p."/>
           <text macro="collection"/>
         </else-if>
@@ -211,7 +211,7 @@
             <text macro="journal-title"/>
             <text variable="event" suffix=". " font-style="italic"/>
           </group>
-          <text macro="publisher" prefix=""/>
+          <text macro="publisher"/>
           <text variable="page" prefix=" p. " suffix="."/>
         </else-if>
         <else>
@@ -220,7 +220,7 @@
             <date variable="issued" suffix=".">
               <date-part name="day" suffix=" "/>
               <date-part name="month" suffix=" "/>
-              <date-part name="year" suffix=""/>
+              <date-part name="year"/>
             </date>
           </group>
           <group suffix=". ">
diff --git a/french2.csl b/french2.csl
index 072edf3822..0e9b99bc3c 100644
--- a/french2.csl
+++ b/french2.csl
@@ -89,7 +89,7 @@
       <if variable="URL">
         <group prefix="(" suffix=")" delimiter=" ">
           <text value="consulté le"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="day" suffix=" "/>
             <date-part name="month" suffix=" "/>
             <date-part name="year"/>
@@ -99,7 +99,7 @@
       <else-if variable="DOI">
         <group prefix="(" suffix=")" delimiter=" ">
           <text value="consulté le"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="day" suffix=" "/>
             <date-part name="month" suffix=" "/>
             <date-part name="year"/>
@@ -187,12 +187,12 @@
       <choose>
         <if type="thesis">
           <text variable="genre" suffix=". "/>
-          <text macro="publisher" prefix=""/>
+          <text macro="publisher"/>
           <text variable="number-of-pages" suffix=" p."/>
         </if>
         <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <text macro="edition"/>
-          <text macro="publisher" prefix=""/>
+          <text macro="publisher"/>
           <text variable="number-of-pages" suffix=" p."/>
           <text macro="collection"/>
         </else-if>
@@ -211,7 +211,7 @@
             <text macro="journal-title"/>
             <text variable="event" suffix=". " font-style="italic"/>
           </group>
-          <text macro="publisher" prefix=""/>
+          <text macro="publisher"/>
           <text variable="page" prefix=" p. " suffix="."/>
         </else-if>
         <else>
@@ -220,7 +220,7 @@
             <date variable="issued" suffix=".">
               <date-part name="day" suffix=" "/>
               <date-part name="month" suffix=" "/>
-              <date-part name="year" suffix=""/>
+              <date-part name="year"/>
             </date>
           </group>
           <group suffix=". ">
diff --git a/french3.csl b/french3.csl
index 240ae08479..d479758ee3 100644
--- a/french3.csl
+++ b/french3.csl
@@ -106,7 +106,7 @@
       <if variable="URL">
         <group prefix="(" suffix=")" delimiter=" ">
           <text value="consulté le"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="day" suffix=" "/>
             <date-part name="month" suffix=" "/>
             <date-part name="year"/>
@@ -116,7 +116,7 @@
       <else-if variable="DOI">
         <group prefix="(" suffix=")" delimiter=" ">
           <text value="consulté le"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="day" suffix=" "/>
             <date-part name="month" suffix=" "/>
             <date-part name="year"/>
@@ -211,7 +211,7 @@
         </if>
         <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <text macro="edition"/>
-          <text macro="publisher" prefix=""/>
+          <text macro="publisher"/>
           <text variable="number-of-pages" suffix=" p."/>
           <text macro="collection"/>
         </else-if>
@@ -239,7 +239,7 @@
             <date variable="issued" suffix=".">
               <date-part name="day" suffix=" "/>
               <date-part name="month" suffix=" "/>
-              <date-part name="year" suffix=""/>
+              <date-part name="year"/>
             </date>
           </group>
           <group suffix=". ">
diff --git a/french4.csl b/french4.csl
index b3dbedb7b9..9791099d1e 100644
--- a/french4.csl
+++ b/french4.csl
@@ -94,7 +94,7 @@
       <if variable="URL">
         <group prefix="(" suffix=")" delimiter=" ">
           <text value="consulté le"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="day" suffix=" "/>
             <date-part name="month" suffix=" "/>
             <date-part name="year"/>
@@ -104,7 +104,7 @@
       <else-if variable="DOI">
         <group prefix="(" suffix=")" delimiter=" ">
           <text value="consulté le"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="day" suffix=" "/>
             <date-part name="month" suffix=" "/>
             <date-part name="year"/>
@@ -211,7 +211,7 @@
         </if>
         <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <text macro="edition"/>
-          <text macro="publisher" prefix=""/>
+          <text macro="publisher"/>
           <text variable="number-of-pages" suffix=" p."/>
           <text macro="collection"/>
         </else-if>
@@ -239,7 +239,7 @@
             <date variable="issued" suffix=".">
               <date-part name="day" suffix=" "/>
               <date-part name="month" suffix=" "/>
-              <date-part name="year" suffix=""/>
+              <date-part name="year"/>
             </date>
           </group>
           <group suffix=". ">
diff --git a/frontiers.csl b/frontiers.csl
index ba137b63b9..9baf7f3265 100644
--- a/frontiers.csl
+++ b/frontiers.csl
@@ -127,7 +127,7 @@
         </if>
         <else-if type="chapter paper-conference" match="any">
           <group delimiter=" " prefix=" ">
-            <text macro="title" suffix=""/>
+            <text macro="title"/>
             <text term="in"/>
             <text variable="container-title" font-style="italic"/>
             <text variable="collection-title" suffix="."/>
diff --git a/future-science-group.csl b/future-science-group.csl
index 786a1e7fbc..658565ae1c 100644
--- a/future-science-group.csl
+++ b/future-science-group.csl
@@ -55,7 +55,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/gallia.csl b/gallia.csl
index 57480418a5..2af32aba44 100644
--- a/gallia.csl
+++ b/gallia.csl
@@ -128,7 +128,7 @@
         </group>
       </if>
       <else>
-        <text variable="edition" suffix=""/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
diff --git a/gastroenterology.csl b/gastroenterology.csl
index 2c519ddef5..d44c85b0f2 100644
--- a/gastroenterology.csl
+++ b/gastroenterology.csl
@@ -30,7 +30,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -121,8 +121,8 @@
   </citation>
   <bibliography et-al-min="4" et-al-use-first="3" second-field-align="flush">
     <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
-      <text macro="author" suffix=""/>
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group suffix=".">
@@ -130,7 +130,7 @@
             <text macro="edition" prefix=" "/>
             <text macro="editor" prefix=" (" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
           <group suffix="." prefix="; ">
             <date variable="issued">
               <date-part name="year"/>
diff --git a/geistes-und-kulturwissenschaften-teilmann.csl b/geistes-und-kulturwissenschaften-teilmann.csl
index f824b8ba16..f2c3349ba6 100644
--- a/geistes-und-kulturwissenschaften-teilmann.csl
+++ b/geistes-und-kulturwissenschaften-teilmann.csl
@@ -231,7 +231,7 @@ a) mit Name "collection-editor" (in jedem Fall)
       <if variable="author" type="book" match="all">
         <names variable="editor translator" delimiter=", ">
           <!-- Bezeichnung in Kurzform ("hg. v.", "übers. v."). -->
-          <label prefix="" form="verb-short" text-case="lowercase" suffix=" "/>
+          <label form="verb-short" text-case="lowercase" suffix=" "/>
           <!-- Mehrere Herausgeber und/oder Übersetzer durch Komma getrennt,
 	     der letztgenannte durch "und" abgetrennt. -->
           <name and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
@@ -296,7 +296,7 @@ a) mit Name "collection-editor" (in jedem Fall)
       <if variable="container-author" type="chapter" match="all">
         <names variable="editor">
           <!-- Bezeichnung in Kurzform ("hg. v."). -->
-          <label prefix="" form="verb-short" text-case="lowercase" suffix=" "/>
+          <label form="verb-short" text-case="lowercase" suffix=" "/>
           <!-- Mehrere Herausgeber durch Komma getrennt, der letztgenannte
 	     durch "und" abgetrennt. -->
           <name and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
@@ -487,7 +487,7 @@ a) mit Name "collection-editor" (in jedem Fall)
           </if>
           <!-- wenn nur Ausgabe vorhanden ist: -->
           <else>
-            <number prefix="" variable="issue" suffix=""/>
+            <number variable="issue"/>
           </else>
         </choose>
         <!-- Jahr -->
diff --git a/geneses.csl b/geneses.csl
index 0d387bb41d..a719046d53 100644
--- a/geneses.csl
+++ b/geneses.csl
@@ -95,7 +95,7 @@
         </group>
       </else-if>
       <else-if type="thesis" match="any">
-        <group delimiter="">
+        <group>
           <group suffix=",">
             <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
           </group>
@@ -110,7 +110,7 @@
         </group>
       </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter="">
+        <group>
           <group suffix=",">
             <text variable="title" text-case="capitalize-first" quotes="true"/>
           </group>
@@ -120,7 +120,7 @@
         </group>
       </else-if>
       <else-if type="webpage" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" font-style="italic" suffix=", "/>
           <text variable="URL" text-decoration="underline"/>
         </group>
@@ -176,7 +176,7 @@
       <else-if type="webpage" match="any">
         <group delimiter=" " font-style="normal">
           <text value="consulté le" suffix=" " prefix=" "/>
-          <date variable="accessed" form="text" suffix="">
+          <date variable="accessed" form="text">
             <date-part name="day"/>
             <date-part name="month"/>
             <date-part name="year"/>
@@ -261,7 +261,7 @@
       <key macro="author" names-min="3" names-use-first="3"/>
       <key variable="issued" sort="descending"/>
     </sort>
-    <layout prefix="" suffix=".">
+    <layout suffix=".">
       <group delimiter=". ">
         <text macro="author"/>
         <text macro="year-cite" suffix=". "/>
diff --git a/genetics.csl b/genetics.csl
index c31c658e3b..7ae7e0b558 100644
--- a/genetics.csl
+++ b/genetics.csl
@@ -98,7 +98,7 @@
     </sort>
     <layout>
       <text macro="author" suffix=","/>
-      <date variable="issued" prefix=" " suffix="">
+      <date variable="issued" prefix=" ">
         <date-part name="year"/>
       </date>
       <choose>
@@ -112,7 +112,7 @@
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" "/>
           <group prefix=".">
-            <group prefix=" In:" suffix="">
+            <group prefix=" In:">
               <names variable="editor translator">
                 <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always" prefix=" "/>
                 <et-al font-style="italic"/>
diff --git a/geoarchaeology.csl b/geoarchaeology.csl
index 4d932a0fa4..bc2ae3b053 100644
--- a/geoarchaeology.csl
+++ b/geoarchaeology.csl
@@ -44,7 +44,7 @@
       <if type="chapter paper-conference" match="none">
         <names variable="translator editor" delimiter=", " prefix=" (" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="title" suffix=""/>
+          <label form="short" prefix=", " text-case="title"/>
         </names>
       </if>
     </choose>
diff --git a/geopolitics.csl b/geopolitics.csl
index c7b8f3ddf7..d6e8f32481 100644
--- a/geopolitics.csl
+++ b/geopolitics.csl
@@ -552,7 +552,7 @@
     </group>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" et-al-subsequent-min="4" et-al-subsequent-use-first="1" disambiguate-add-names="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="subsequent">
           <group delimiter=", ">
diff --git a/georg-august-universitat-gottingen-institut-fur-ethnologie-und-ethnologische-sammlung.csl b/georg-august-universitat-gottingen-institut-fur-ethnologie-und-ethnologische-sammlung.csl
index 81248dbdc7..9e9be9634e 100644
--- a/georg-august-universitat-gottingen-institut-fur-ethnologie-und-ethnologische-sammlung.csl
+++ b/georg-august-universitat-gottingen-institut-fur-ethnologie-und-ethnologische-sammlung.csl
@@ -80,7 +80,7 @@
   <macro name="publisher">
     <choose>
       <if type="motion_picture">
-        <group prefix="" delimiter=": " suffix=".">
+        <group delimiter=": " suffix=".">
           <text variable="publisher-place"/>
           <text variable="publisher"/>
         </group>
@@ -89,7 +89,7 @@
         </group>
       </if>
       <else>
-        <group prefix="" delimiter=": ">
+        <group delimiter=": ">
           <text variable="publisher-place"/>
           <text variable="publisher"/>
         </group>
@@ -213,7 +213,7 @@
           </group>
           <group prefix=" " suffix="." delimiter=" ">
             <text variable="container-title" text-case="title" font-style="italic"/>
-            <group delimiter="">
+            <group>
               <text variable="volume"/>
               <text variable="issue" prefix="(" suffix=")"/>
               <text variable="page" prefix=":"/>
diff --git a/global-change-biology.csl b/global-change-biology.csl
index 5e80ea3988..511d6af0b1 100644
--- a/global-change-biology.csl
+++ b/global-change-biology.csl
@@ -115,7 +115,7 @@
         <text macro="issued" prefix="(" suffix=")"/>
         <choose>
           <if type="bill book graphic legal_case motion_picture report song thesis" match="any">
-            <group suffix="." delimiter="">
+            <group suffix=".">
               <text macro="title" font-style="italic"/>
               <text macro="book-details"/>
             </group>
@@ -135,7 +135,7 @@
           <else-if type="chapter paper-conference" match="any">
             <group delimiter=". ">
               <text macro="title"/>
-              <group delimiter="">
+              <group>
                 <text variable="container-title" font-style="italic" prefix=" In: "/>
                 <text macro="book-details"/>
                 <group delimiter=" " prefix=", ">
diff --git a/gost-r-7-0-5-2008.csl b/gost-r-7-0-5-2008.csl
index 42c493bcdb..edc586905e 100644
--- a/gost-r-7-0-5-2008.csl
+++ b/gost-r-7-0-5-2008.csl
@@ -65,7 +65,7 @@
     <text variable="title"/>
   </macro>
   <macro name="publisher">
-    <group prefix="" delimiter="">
+    <group>
       <text variable="publisher-place"/>
       <text value=": "/>
       <text variable="publisher"/>
@@ -135,13 +135,13 @@
       <text macro="author" suffix=". "/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group delimiter=". " prefix="">
+          <group delimiter=". ">
             <group delimiter=" ">
               <text macro="title"/>
               <text macro="editor"/>
             </group>
             <text macro="publisher"/>
-            <text variable="number-of-pages" prefix="" suffix=" с."/>
+            <text variable="number-of-pages" suffix=" с."/>
           </group>
         </if>
         <else-if type="chapter paper-conference" match="any">
@@ -157,11 +157,11 @@
           </group>
         </else-if>
         <else-if type="webpage">
-          <text macro="title" prefix=" " suffix=""/>
+          <text macro="title" prefix=" "/>
           <text prefix=" " macro="access"/>
         </else-if>
         <else-if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
-          <text macro="title" prefix=" " suffix=""/>
+          <text macro="title" prefix=" "/>
           <group delimiter=". " prefix=" " suffix=".">
             <group prefix="// " delimiter=". ">
               <text variable="container-title" form="short"/>
@@ -173,7 +173,7 @@
           </group>
         </else-if>
         <else>
-          <text macro="title" prefix=" " suffix=""/>
+          <text macro="title" prefix=" "/>
           <group delimiter=". " prefix=" " suffix=".">
             <group prefix="// " delimiter=". ">
               <text variable="container-title" form="short"/>
diff --git a/hand.csl b/hand.csl
index d17aed0112..6a8fdb9557 100644
--- a/hand.csl
+++ b/hand.csl
@@ -85,7 +85,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/harvard-cardiff-university.csl b/harvard-cardiff-university.csl
index 2fb1d20b32..0094ad90bc 100644
--- a/harvard-cardiff-university.csl
+++ b/harvard-cardiff-university.csl
@@ -50,7 +50,7 @@
     <choose>
       <if variable="URL">
         <text value="Available at: "/>
-        <text variable="URL" prefix="" suffix=""/>
+        <text variable="URL"/>
         <group prefix=" [" suffix="]">
           <text value="Accessed:" text-case="capitalize-first" suffix=" "/>
           <date variable="accessed">
diff --git a/harvard-durham-university-business-school.csl b/harvard-durham-university-business-school.csl
index dc14351003..1565804df9 100644
--- a/harvard-durham-university-business-school.csl
+++ b/harvard-durham-university-business-school.csl
@@ -109,7 +109,7 @@
         </group>
       </if>
       <else>
-        <text variable="edition" suffix=""/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
@@ -130,7 +130,7 @@
       <if type="article-newspaper paper-conference broadcast" match="any">
         <date variable="issued">
           <date-part name="day" suffix=" "/>
-          <date-part name="month" suffix=""/>
+          <date-part name="month"/>
         </date>
       </if>
     </choose>
@@ -197,8 +197,8 @@
               <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
             </if>
           </choose>
-          <text macro="online" prefix=" " suffix=""/>
-          <group prefix=" " suffix="." delimiter="">
+          <text macro="online" prefix=" "/>
+          <group prefix=" " suffix=".">
             <text variable="volume"/>
             <group delimiter=", ">
               <text variable="issue" prefix=" (" suffix=")"/>
diff --git a/harvard-european-archaeology.csl b/harvard-european-archaeology.csl
index 016be09386..947bff11ef 100644
--- a/harvard-european-archaeology.csl
+++ b/harvard-european-archaeology.csl
@@ -160,7 +160,7 @@
               <text variable="collection-title"/>
             </group>
             <text macro="pages" suffix="."/>
-            <text macro="publisher" prefix=""/>
+            <text macro="publisher"/>
           </group>
         </else-if>
         <else-if type="thesis">
diff --git a/harvard-gesellschaft-fur-bildung-und-forschung-in-europa.csl b/harvard-gesellschaft-fur-bildung-und-forschung-in-europa.csl
index 2c532ec339..3219a2a11a 100644
--- a/harvard-gesellschaft-fur-bildung-und-forschung-in-europa.csl
+++ b/harvard-gesellschaft-fur-bildung-und-forschung-in-europa.csl
@@ -176,7 +176,7 @@
   <citation et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true">
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
-        <group delimiter="">
+        <group>
           <text macro="author-short" suffix=" "/>
           <text macro="year-date"/>
           <text variable="locator" prefix=":"/>
@@ -202,7 +202,7 @@
       <choose>
         <!--  BUCH O.Ä. -->
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group prefix=" " delimiter=" " suffix="">
+          <group prefix=" " delimiter=" ">
             <text macro="title"/>
             <text variable="volume" prefix="Bd. " suffix=", "/>
             <text variable="issue" suffix=", "/>
diff --git a/harvard-imperial-college-london.csl b/harvard-imperial-college-london.csl
index e8c5917cdf..e7d8b8bf26 100644
--- a/harvard-imperial-college-london.csl
+++ b/harvard-imperial-college-london.csl
@@ -108,7 +108,7 @@
         </group>
       </if>
       <else>
-        <text variable="edition" suffix=""/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
@@ -129,7 +129,7 @@
       <if type="article-newspaper paper-conference broadcast" match="any">
         <date variable="issued">
           <date-part name="day" suffix=" "/>
-          <date-part name="month" suffix=""/>
+          <date-part name="month"/>
         </date>
       </if>
     </choose>
@@ -196,8 +196,8 @@
               <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
             </if>
           </choose>
-          <text macro="online" prefix=" " suffix=""/>
-          <group prefix=" " suffix="." delimiter="">
+          <text macro="online" prefix=" "/>
+          <group prefix=" " suffix=".">
             <text variable="volume"/>
             <group delimiter=", ">
               <text variable="issue" prefix=" (" suffix=")"/>
diff --git a/harvard-institut-fur-praxisforschung-de.csl b/harvard-institut-fur-praxisforschung-de.csl
index 9fb904e1db..84d0fe51a3 100644
--- a/harvard-institut-fur-praxisforschung-de.csl
+++ b/harvard-institut-fur-praxisforschung-de.csl
@@ -195,7 +195,7 @@
       <key variable="issued"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter="">
+      <group>
         <text macro="author-short" suffix=" "/>
         <text macro="year-date"/>
         <text macro="locator-citation" prefix=": "/>
diff --git a/harvard-kings-college-london.csl b/harvard-kings-college-london.csl
index 27ea026bf7..95c79668c9 100644
--- a/harvard-kings-college-london.csl
+++ b/harvard-kings-college-london.csl
@@ -69,7 +69,7 @@
   <macro name="_access">
     <group>
       <text value="Available from: "/>
-      <text variable="DOI" prefix="doi:" suffix=""/>
+      <text variable="DOI" prefix="doi:"/>
       <group prefix=" [" suffix="]">
         <text term="accessed" text-case="capitalize-first" suffix=": "/>
         <date variable="accessed">
@@ -135,11 +135,11 @@
       <if is-numeric="edition">
         <group delimiter=" ">
           <number variable="edition" form="ordinal"/>
-          <text term="edition" form="long" suffix="" text-case="lowercase" strip-periods="true"/>
+          <text term="edition" form="long" text-case="lowercase" strip-periods="true"/>
         </group>
       </if>
       <else>
-        <text variable="edition" suffix=""/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
@@ -163,7 +163,7 @@
       <if type="article-newspaper paper-conference broadcast" match="any">
         <date variable="issued">
           <date-part name="day" suffix=" "/>
-          <date-part name="month" suffix=""/>
+          <date-part name="month"/>
         </date>
       </if>
     </choose>
@@ -220,7 +220,7 @@
           </group>
         </if>
         <else-if type="webpage">
-          <group prefix=" " delimiter=". " suffix="">
+          <group prefix=" " delimiter=". ">
             <text macro="title"/>
             <text macro="edition"/>
             <text macro="online"/>
@@ -246,14 +246,14 @@
               <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
             </if>
           </choose>
-          <text macro="online" prefix=" " suffix=""/>
-          <group prefix=" " suffix="." delimiter="">
-            <group prefix="">
+          <text macro="online" prefix=" "/>
+          <group prefix=" " suffix=".">
+            <group>
               <text variable="volume"/>
               <text variable="issue" prefix=" (" suffix="), "/>
               <text macro="issued"/>
             </group>
-            <group prefix="">
+            <group>
               <text macro="pages"/>
             </group>
           </group>
@@ -277,14 +277,14 @@
           <text macro="title" prefix=" '" suffix="', "/>
           <group prefix=" " delimiter=" ">
             <text term="in" text-case="lowercase"/>
-            <text macro="editor" suffix=""/>
+            <text macro="editor"/>
             <text variable="container-title" font-style="italic" suffix="."/>
             <text variable="collection-title" suffix="."/>
-            <text macro="edition" prefix=" " suffix=""/>
-            <text macro="online" suffix="." prefix=""/>
+            <text macro="edition" prefix=" "/>
+            <text macro="online" suffix="."/>
             <text macro="issued"/>
-            <text macro="publisher" prefix="" suffix="."/>
-            <label variable="page" form="short" suffix=""/>
+            <text macro="publisher" suffix="."/>
+            <label variable="page" form="short"/>
             <text macro="pages" suffix="."/>
           </group>
         </else-if>
@@ -293,7 +293,7 @@
             <text macro="title" prefix=" "/>
             <text macro="editor" prefix=" "/>
           </group>
-          <text variable="container-title" prefix=" " suffix=""/>
+          <text variable="container-title" prefix=" "/>
           <text macro="access" prefix=" " suffix=". "/>
           <group prefix=" " suffix=".">
             <group prefix=" ">
diff --git a/harvard-oxford-brookes-university.csl b/harvard-oxford-brookes-university.csl
index 723dfcedb4..41c0717829 100644
--- a/harvard-oxford-brookes-university.csl
+++ b/harvard-oxford-brookes-university.csl
@@ -53,7 +53,7 @@
     <choose>
       <if variable="URL">
         <text value="Available at: "/>
-        <text variable="URL" prefix="" suffix=""/>
+        <text variable="URL"/>
         <group prefix=" (" suffix=")">
           <text value="accessed "/>
           <date variable="accessed">
diff --git a/harvard-staffordshire-university.csl b/harvard-staffordshire-university.csl
index 42463d1494..d16cdecfbb 100644
--- a/harvard-staffordshire-university.csl
+++ b/harvard-staffordshire-university.csl
@@ -23,7 +23,7 @@
   </macro>
   <macro name="cite-editor">
     <names variable="editor" delimiter=", ">
-      <label form="short" prefix="" suffix=". " strip-periods="true"/>
+      <label form="short" suffix=". " strip-periods="true"/>
       <name and="symbol" initialize-with=". " delimiter=", "/>
     </names>
   </macro>
@@ -65,7 +65,7 @@
   <macro name="access">
     <group>
       <text value="Available from: "/>
-      <text variable="URL" prefix="" suffix="."/>
+      <text variable="URL" suffix="."/>
       <group prefix=" [" suffix="]">
         <text term="accessed" text-case="capitalize-first" suffix=": "/>
         <date variable="accessed">
@@ -145,7 +145,7 @@
       <if type="article-newspaper motion_picture paper-conference broadcast" match="any">
         <date variable="issued">
           <date-part name="day" suffix=" "/>
-          <date-part name="month" suffix=""/>
+          <date-part name="month"/>
         </date>
       </if>
     </choose>
@@ -199,7 +199,7 @@
       </choose>
       <choose>
         <if type="bill legislation" match="any">
-          <group prefix="" delimiter=". " suffix=".">
+          <group delimiter=". " suffix=".">
             <group font-style="italic" delimiter=". ">
               <group delimiter=": ">
                 <choose>
@@ -238,7 +238,7 @@
         </else-if>
         <else-if type="webpage">
           <group prefix=" " delimiter=". " suffix=".">
-            <text macro="title" suffix=""/>
+            <text macro="title"/>
             <text macro="edition"/>
             <text macro="online"/>
           </group>
@@ -275,12 +275,12 @@
           </choose>
           <text macro="online" prefix=" " suffix="."/>
           <group prefix=" " suffix="." delimiter=". ">
-            <group prefix="">
+            <group>
               <text variable="volume"/>
               <text variable="issue" prefix=" (" suffix=")"/>
               <text macro="issued"/>
             </group>
-            <group prefix="">
+            <group>
               <label variable="locator" suffix="." form="short" strip-periods="true"/>
               <text macro="pages"/>
             </group>
@@ -307,10 +307,10 @@
             <text macro="editor" suffix="."/>
             <text variable="container-title" font-style="italic" suffix="."/>
             <text variable="collection-title" suffix="."/>
-            <text macro="online" suffix="." prefix=""/>
+            <text macro="online" suffix="."/>
             <group suffix="." delimiter=", ">
               <text macro="issued"/>
-              <text macro="publisher" prefix=""/>
+              <text macro="publisher"/>
               <text macro="pages"/>
             </group>
           </group>
diff --git a/harvard-the-university-of-melbourne.csl b/harvard-the-university-of-melbourne.csl
index 1370fad7fa..a339265a41 100644
--- a/harvard-the-university-of-melbourne.csl
+++ b/harvard-the-university-of-melbourne.csl
@@ -102,7 +102,7 @@
             <date-part name="day" suffix=", "/>
             <date-part name="year"/>
           </date>
-          <group delimiter="">
+          <group>
             <text term="from"/>
             <text variable="URL" prefix=" &lt;" suffix="&gt;"/>
           </group>
@@ -186,7 +186,7 @@
             <text macro="edition"/>
             <text macro="editor"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
         </if>
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" "/>
@@ -195,7 +195,7 @@
             <text macro="editor" prefix=" " suffix=", "/>
             <text variable="container-title" font-style="italic" prefix=" " suffix=","/>
             <text variable="collection-title" prefix=" " suffix=","/>
-            <group suffix="" delimiter=", ">
+            <group delimiter=", ">
               <text macro="publisher" prefix=" "/>
               <text macro="pages"/>
             </group>
@@ -206,7 +206,7 @@
             <text macro="title" prefix=" "/>
             <text macro="editor" prefix=" "/>
           </group>
-          <group prefix=" " suffix="">
+          <group prefix=" ">
             <text variable="container-title" font-style="italic"/>
             <group prefix=", " delimiter=", ">
               <text variable="volume" prefix="vol. "/>
diff --git a/harvard-university-of-birmingham.csl b/harvard-university-of-birmingham.csl
index 74c35f6d00..262acf66f9 100644
--- a/harvard-university-of-birmingham.csl
+++ b/harvard-university-of-birmingham.csl
@@ -389,7 +389,7 @@
             </else-if>
             <else-if type="bill book graphic legal_case report" match="any">
               <group delimiter=". ">
-                <group prefix=" " delimiter="">
+                <group prefix=" ">
                   <text macro="title"/>
                   <group delimiter=" " prefix=". ">
                     <text variable="collection-title"/>
@@ -413,7 +413,7 @@
                 <group prefix=" " delimiter=" ">
                   <text term="in" text-case="capitalize-first" suffix=" " text-decoration="underline"/>
                   <text macro="bookauthor"/>
-                  <group delimiter="" prefix=" " suffix=".">
+                  <group prefix=" " suffix=".">
                     <text variable="container-title" font-weight="bold"/>
                     <group delimiter=" " prefix=". ">
                       <text variable="collection-title"/>
diff --git a/harvard-university-of-gloucestershire.csl b/harvard-university-of-gloucestershire.csl
index 7bc3fe2f08..5fa02c43bb 100644
--- a/harvard-university-of-gloucestershire.csl
+++ b/harvard-university-of-gloucestershire.csl
@@ -87,7 +87,7 @@
         <text variable="URL" prefix="&lt;" suffix="&gt; "/>
       </group>
       <text term="accessed" text-case="capitalize-first" prefix="[" suffix=": "/>
-      <date variable="accessed" suffix="">
+      <date variable="accessed">
         <date-part name="day" suffix=" "/>
         <date-part name="month" suffix=" "/>
         <date-part name="year" suffix="]"/>
diff --git a/harvard-university-of-leeds.csl b/harvard-university-of-leeds.csl
index 442e6ccb84..82cfbaefd6 100644
--- a/harvard-university-of-leeds.csl
+++ b/harvard-university-of-leeds.csl
@@ -17,7 +17,7 @@
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="editor">
-    <names variable="editor" prefix="" suffix="" delimiter=", ">
+    <names variable="editor" delimiter=", ">
       <name and="symbol" initialize-with=". " delimiter=", "/>
       <label form="short" prefix=", "/>
     </names>
@@ -126,7 +126,7 @@
       <key variable="title"/>
     </sort>
     <layout>
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <date variable="issued" prefix=" " suffix=".">
         <date-part name="year"/>
       </date>
diff --git a/harvard-university-of-sunderland.csl b/harvard-university-of-sunderland.csl
index 685c247506..19c9746c0b 100644
--- a/harvard-university-of-sunderland.csl
+++ b/harvard-university-of-sunderland.csl
@@ -60,7 +60,7 @@
       <if variable="URL">
         <group>
           <text value="Available from: "/>
-          <text variable="URL" prefix="" suffix="."/>
+          <text variable="URL" suffix="."/>
           <group prefix=" [" suffix="]">
             <text term="accessed" text-case="capitalize-first" suffix=": "/>
             <date variable="accessed">
@@ -142,7 +142,7 @@
       <if type="article-newspaper motion_picture paper-conference broadcast" match="any">
         <date variable="issued">
           <date-part name="day" suffix=" "/>
-          <date-part name="month" suffix=""/>
+          <date-part name="month"/>
         </date>
       </if>
     </choose>
@@ -185,7 +185,7 @@
       </choose>
       <choose>
         <if type="bill legislation" match="any">
-          <group prefix="" delimiter=". " suffix=".">
+          <group delimiter=". " suffix=".">
             <group font-style="italic" delimiter=". ">
               <group delimiter=": ">
                 <choose>
@@ -224,7 +224,7 @@
         </else-if>
         <else-if type="webpage">
           <group prefix=" " delimiter=". " suffix=".">
-            <text macro="title" suffix=""/>
+            <text macro="title"/>
             <text macro="edition"/>
             <text macro="online"/>
           </group>
@@ -261,12 +261,12 @@
           </choose>
           <text macro="online" prefix=" " suffix="."/>
           <group prefix=" " suffix="." delimiter=". ">
-            <group prefix="">
+            <group>
               <text variable="volume"/>
               <text variable="issue" prefix=" (" suffix=")"/>
               <text macro="issued"/>
             </group>
-            <group prefix="">
+            <group>
               <label variable="locator" suffix="." form="short" strip-periods="true"/>
               <text macro="pages"/>
             </group>
@@ -293,10 +293,10 @@
             <text macro="editor" suffix="."/>
             <text variable="container-title" font-style="italic" suffix="."/>
             <text variable="collection-title" suffix="."/>
-            <text macro="online" suffix="." prefix=""/>
+            <text macro="online" suffix="."/>
             <group suffix="." delimiter=", ">
               <text macro="issued"/>
-              <text macro="publisher" prefix=""/>
+              <text macro="publisher"/>
               <text macro="pages"/>
             </group>
           </group>
diff --git a/harvard-university-of-the-west-of-england.csl b/harvard-university-of-the-west-of-england.csl
index 2f56fb52d3..5b1c82a8c1 100644
--- a/harvard-university-of-the-west-of-england.csl
+++ b/harvard-university-of-the-west-of-england.csl
@@ -107,11 +107,11 @@
       <if is-numeric="edition">
         <group delimiter=" ">
           <number variable="edition" form="ordinal"/>
-          <text term="edition" form="long" suffix="" text-case="lowercase" strip-periods="true"/>
+          <text term="edition" form="long" text-case="lowercase" strip-periods="true"/>
         </group>
       </if>
       <else>
-        <text variable="edition" suffix=""/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
@@ -136,7 +136,7 @@
       <if type="article-newspaper paper-conference broadcast" match="any">
         <date variable="issued">
           <date-part name="day" suffix=" "/>
-          <date-part name="month" suffix=""/>
+          <date-part name="month"/>
         </date>
       </if>
     </choose>
@@ -195,13 +195,13 @@
               <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
             </if>
           </choose>
-          <group prefix=" " suffix="." delimiter="">
-            <group prefix="">
+          <group prefix=" " suffix=".">
+            <group>
               <text variable="volume"/>
               <text variable="issue" prefix=" (" suffix="), "/>
               <text macro="issued"/>
             </group>
-            <group prefix="">
+            <group>
               <text macro="pages"/>
             </group>
           </group>
@@ -228,10 +228,10 @@
             <text variable="container-title" font-style="italic" suffix="."/>
             <text variable="collection-title" suffix="."/>
             <text macro="edition" prefix=" " suffix="."/>
-            <text macro="online" suffix="." prefix=""/>
+            <text macro="online" suffix="."/>
             <text macro="issued"/>
-            <text macro="publisher" prefix="" suffix="."/>
-            <label variable="page" form="short" suffix=""/>
+            <text macro="publisher" suffix="."/>
+            <label variable="page" form="short"/>
             <text macro="pages" suffix="."/>
           </group>
         </else-if>
diff --git a/harvard-university-of-west-london.csl b/harvard-university-of-west-london.csl
index b4f2ec3a26..4de1d62488 100644
--- a/harvard-university-of-west-london.csl
+++ b/harvard-university-of-west-london.csl
@@ -73,11 +73,11 @@
       <if is-numeric="edition">
         <group delimiter=" ">
           <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short" suffix="" text-case="lowercase" strip-periods="true"/>
+          <text term="edition" form="short" text-case="lowercase" strip-periods="true"/>
         </group>
       </if>
       <else>
-        <text variable="edition" suffix=""/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
@@ -95,7 +95,7 @@
   </macro>
   <macro name="access">
     <group delimiter=" ">
-      <text variable="archive" prefix="" suffix="" font-style="italic"/>
+      <text variable="archive" font-style="italic"/>
       <text macro="location" prefix="[Online]. Available at: "/>
       <group prefix="[" suffix="]">
         <text term="accessed" text-case="capitalize-first" suffix=": "/>
@@ -110,10 +110,10 @@
   <macro name="location">
     <choose>
       <if variable="DOI">
-        <text variable="DOI" prefix="doi:" suffix=""/>
+        <text variable="DOI" prefix="doi:"/>
       </if>
       <else-if variable="URL">
-        <text variable="URL" prefix="" suffix=""/>
+        <text variable="URL"/>
       </else-if>
     </choose>
   </macro>
@@ -150,7 +150,7 @@
   </macro>
   <macro name="pages">
     <group>
-      <!--<label variable="page" form="short" suffix=""/>-->
+      <!--<label variable="page" form="short"/>-->
       <text variable="page" form="short" prefix="p."/>
     </group>
   </macro>
diff --git a/heart-rhythm.csl b/heart-rhythm.csl
index e8fde3ff4a..ad555b8fff 100644
--- a/heart-rhythm.csl
+++ b/heart-rhythm.csl
@@ -270,7 +270,7 @@
         <text macro="editor"/>
         <text macro="container-title"/>
         <text macro="publisher"/>
-        <group delimiter="" suffix="">
+        <group>
           <text macro="date"/>
           <text macro="journal-location"/>
           <text macro="pages"/>
diff --git a/hepatology.csl b/hepatology.csl
index 796d44d4bd..91057832e9 100644
--- a/hepatology.csl
+++ b/hepatology.csl
@@ -63,7 +63,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
@@ -152,7 +152,7 @@
             <text macro="accessed-date" prefix=" "/>
           </group>
           <group suffix=". ">
-            <text variable="volume" prefix="" suffix=""/>
+            <text variable="volume"/>
             <text variable="page" prefix=":"/>
           </group>
         </else>
diff --git a/heredity.csl b/heredity.csl
index 2b93695201..bcfcc3377a 100644
--- a/heredity.csl
+++ b/heredity.csl
@@ -81,7 +81,7 @@
         </group>
       </if>
       <else>
-        <text variable="edition" suffix=""/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
@@ -132,7 +132,7 @@
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" "/>
           <group prefix=".">
-            <group prefix=" In:" suffix="">
+            <group prefix=" In:">
               <names variable="editor translator">
                 <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always" prefix=" "/>
                 <label form="short" prefix=" (" suffix=") " strip-periods="true"/>
diff --git a/histoire-at-politique.csl b/histoire-at-politique.csl
index 3705851168..188f155717 100644
--- a/histoire-at-politique.csl
+++ b/histoire-at-politique.csl
@@ -92,7 +92,7 @@
         </group>
       </else-if>
       <else-if type="thesis" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" font-style="italic" suffix=","/>
           <text variable="genre" suffix=", " prefix=" "/>
           <text variable="publisher"/>
@@ -105,7 +105,7 @@
         </group>
       </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter="">
+        <group>
           <group suffix=",">
             <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
           </group>
@@ -115,7 +115,7 @@
         </group>
       </else-if>
       <else-if type="webpage" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" font-style="italic" suffix=", "/>
           <text variable="URL" text-decoration="underline"/>
         </group>
@@ -210,7 +210,7 @@
       <else-if type="webpage" match="any">
         <group delimiter=" " font-style="normal">
           <text value="consulté le" suffix=" " prefix=" "/>
-          <date variable="accessed" form="text" suffix="">
+          <date variable="accessed" form="text">
             <date-part name="day"/>
             <date-part name="month"/>
             <date-part name="year"/>
@@ -284,7 +284,7 @@
       <else-if type="webpage" match="any">
         <group delimiter=" " font-style="normal">
           <text value="consulté le" suffix=" " prefix=" "/>
-          <date variable="accessed" form="text" suffix="">
+          <date variable="accessed" form="text">
             <date-part name="day"/>
             <date-part name="month"/>
             <date-part name="year"/>
@@ -309,7 +309,7 @@
         </choose>
       </if>
       <else-if type="article-journal article-magazine" match="any">
-        <group delimiter="" font-style="normal">
+        <group font-style="normal">
           <choose>
             <if variable="issued">
               <text macro="volume" prefix=" " suffix=", "/>
@@ -367,7 +367,7 @@
     </choose>
   </macro>
   <citation>
-    <layout prefix="" suffix="." delimiter="&#160;; ">
+    <layout suffix="." delimiter="&#160;; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
@@ -413,7 +413,7 @@
       <key macro="author" names-min="3" names-use-first="3"/>
       <key variable="issued" sort="descending"/>
     </sort>
-    <layout prefix="" suffix=".">
+    <layout suffix=".">
       <group delimiter=", ">
         <text macro="author-bib"/>
         <text macro="title"/>
diff --git a/histoire-et-mesure.csl b/histoire-et-mesure.csl
index a257ba8130..7a47b0e04c 100644
--- a/histoire-et-mesure.csl
+++ b/histoire-et-mesure.csl
@@ -95,7 +95,7 @@
         </group>
       </else-if>
       <else-if type="thesis" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" font-style="italic" suffix=", "/>
           <text variable="genre" suffix=", " prefix=" "/>
           <text variable="publisher"/>
@@ -108,7 +108,7 @@
         </group>
       </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter="">
+        <group>
           <group suffix=",">
             <text variable="title" text-case="capitalize-first" quotes="true"/>
           </group>
@@ -118,7 +118,7 @@
         </group>
       </else-if>
       <else-if type="webpage" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" font-style="italic" suffix=", "/>
           <text variable="URL" text-decoration="underline"/>
         </group>
@@ -169,7 +169,7 @@
           <group>
             <text term="volume" form="short" suffix="."/>
             <text variable="number-of-volumes" prefix=". " suffix="/"/>
-            <text variable="volume" suffix=""/>
+            <text variable="volume"/>
           </group>
           <group>
             <text variable="locator" prefix=", p.&#160;"/>
@@ -201,7 +201,7 @@
       <else-if type="webpage" match="any">
         <group delimiter=" " font-style="normal">
           <text value="consulté le" suffix=" " prefix=" "/>
-          <date variable="accessed" form="text" suffix="">
+          <date variable="accessed" form="text">
             <date-part name="day"/>
             <date-part name="month"/>
             <date-part name="year"/>
@@ -266,7 +266,7 @@
       <else-if type="webpage" match="any">
         <group delimiter=" " font-style="normal">
           <text value="consulté le" suffix=" " prefix=" "/>
-          <date variable="accessed" form="text" suffix="">
+          <date variable="accessed" form="text">
             <date-part name="day"/>
             <date-part name="month"/>
             <date-part name="year"/>
@@ -291,7 +291,7 @@
         </choose>
       </if>
       <else-if type="article-journal article-magazine" match="any">
-        <group delimiter="" font-style="normal">
+        <group font-style="normal">
           <choose>
             <if variable="issued">
               <date variable="issued">
@@ -331,7 +331,7 @@
     </choose>
   </macro>
   <citation>
-    <layout prefix="" suffix="." delimiter="&#160;; ">
+    <layout suffix="." delimiter="&#160;; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
@@ -371,7 +371,7 @@
       <key macro="author-bib" names-min="3" names-use-first="3"/>
       <key variable="issued" sort="descending"/>
     </sort>
-    <layout prefix="" suffix=".">
+    <layout suffix=".">
       <group delimiter=", ">
         <text macro="author-bib"/>
         <text macro="title"/>
diff --git a/hochschule-fur-wirtschaft-und-recht-berlin.csl b/hochschule-fur-wirtschaft-und-recht-berlin.csl
index b3c16ac266..f7d9144b18 100644
--- a/hochschule-fur-wirtschaft-und-recht-berlin.csl
+++ b/hochschule-fur-wirtschaft-und-recht-berlin.csl
@@ -62,7 +62,7 @@
   <macro name="editor">
     <names variable="editor translator">
       <name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
-      <label form="short" prefix=" " suffix="" strip-periods="true"/>
+      <label form="short" prefix=" " strip-periods="true"/>
     </names>
   </macro>
   <macro name="accessed">
@@ -133,7 +133,7 @@
                   <group>
                     <text term="volume" form="short" text-case="lowercase" suffix=". " strip-periods="true"/>
                     <number variable="volume" form="numeric"/>
-                    <label variable="locator" form="short" prefix=", " suffix=""/>
+                    <label variable="locator" form="short" prefix=", "/>
                   </group>
                 </if>
                 <else>
diff --git a/hong-kong-journal-of-radiology.csl b/hong-kong-journal-of-radiology.csl
index 20cb2574f0..1a8a0762d9 100644
--- a/hong-kong-journal-of-radiology.csl
+++ b/hong-kong-journal-of-radiology.csl
@@ -63,7 +63,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
@@ -120,7 +120,7 @@
     <sort>
       <key variable="citation-number"/>
     </sort>
-    <layout prefix="" suffix="" delimiter="," vertical-align="sup">
+    <layout delimiter="," vertical-align="sup">
       <text variable="citation-number"/>
     </layout>
   </citation>
diff --git a/hydrological-sciences-journal.csl b/hydrological-sciences-journal.csl
index b9fc5ae0fa..d9edf4148c 100644
--- a/hydrological-sciences-journal.csl
+++ b/hydrological-sciences-journal.csl
@@ -21,7 +21,7 @@
       <if type="chapter paper-conference" match="any">
         <names variable="editor" delimiter=", " prefix="(" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
-          <label form="short" prefix=", " suffix=""/>
+          <label form="short" prefix=", "/>
           <substitute>
             <names variable="translator"/>
           </substitute>
@@ -34,7 +34,7 @@
       <if type="chapter paper-conference" match="none">
         <names variable="translator" delimiter=", " prefix=" (" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
-          <label form="short" prefix=", " text-case="capitalize-first" suffix=""/>
+          <label form="short" prefix=", " text-case="capitalize-first"/>
           <substitute>
             <names variable="editor"/>
           </substitute>
@@ -271,7 +271,7 @@
         </group>
       </if>
       <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
-        <group prefix=", " suffix="" delimiter=", ">
+        <group prefix=", " delimiter=", ">
           <text macro="edition"/>
           <group>
             <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=". " strip-periods="true"/>
diff --git a/hypotheses-in-the-life-sciences.csl b/hypotheses-in-the-life-sciences.csl
index 807a350193..d8e5b22db4 100644
--- a/hypotheses-in-the-life-sciences.csl
+++ b/hypotheses-in-the-life-sciences.csl
@@ -69,7 +69,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/ices-journal-of-marine-science.csl b/ices-journal-of-marine-science.csl
index 4a8da91f59..937a073278 100644
--- a/ices-journal-of-marine-science.csl
+++ b/ices-journal-of-marine-science.csl
@@ -47,7 +47,7 @@
       <choose>
         <if variable="number-of-pages">
           <text variable="number-of-pages"/>
-          <text term="page" form="short" plural="true" suffix="" text-case="lowercase"/>
+          <text term="page" form="short" plural="true" text-case="lowercase"/>
         </if>
       </choose>
     </group>
diff --git a/iica-catie.csl b/iica-catie.csl
index b9b27b7d80..8d2e13cd17 100644
--- a/iica-catie.csl
+++ b/iica-catie.csl
@@ -87,7 +87,7 @@
   <macro name="locators">
     <choose>
       <if type="article-journal article-magazine article-newspaper" match="any">
-        <group prefix="" delimiter=", ">
+        <group delimiter=", ">
           <group>
             <choose>
               <if variable="volume">
@@ -103,10 +103,10 @@
       </if>
       <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
         <text macro="edition" suffix=" "/>
-        <group prefix="" suffix="." delimiter=", ">
+        <group suffix="." delimiter=", ">
           <choose>
             <if variable="publisher-place">
-              <text macro="publisher-place" suffix=""/>
+              <text macro="publisher-place"/>
             </if>
             <else>
               <text value="s.l."/>
@@ -114,7 +114,7 @@
           </choose>
           <choose>
             <if variable="publisher">
-              <text macro="publisher" suffix=""/>
+              <text macro="publisher"/>
             </if>
             <else>
               <text value="s.e."/>
@@ -126,7 +126,7 @@
                 <text macro="volume" prefix="v."/>
               </if>
               <else>
-                <text variable="number-of-volumes" prefix="" suffix=" v."/>
+                <text variable="number-of-volumes" suffix=" v."/>
               </else>
             </choose>
           </group>
@@ -136,7 +136,7 @@
                 <text variable="page" prefix="p." suffix=". "/>
               </if>
               <else>
-                <text variable="number-of-pages" prefix="" suffix=" p."/>
+                <text variable="number-of-pages" suffix=" p."/>
               </else>
             </choose>
           </group>
@@ -276,35 +276,35 @@
     <layout>
       <choose>
         <if type="bill book" match="any">
-          <text macro="author-short" prefix="" suffix=". "/>
-          <text macro="year-date" prefix="" suffix=". "/>
+          <text macro="author-short" suffix=". "/>
+          <text macro="year-date" suffix=". "/>
           <text macro="title" prefix=" " suffix=". "/>
           <text macro="translator" suffix=". "/>
           <text macro="editor" suffix=". "/>
           <text macro="locators"/>
         </if>
         <else-if type="chapter">
-          <text macro="author-short" prefix="" suffix=". "/>
-          <text macro="year-date" prefix="" suffix=". "/>
-          <text macro="title" prefix="" suffix=". "/>
+          <text macro="author-short" suffix=". "/>
+          <text macro="year-date" suffix=". "/>
+          <text macro="title" suffix=". "/>
           <text macro="container-author" prefix="In " suffix=". "/>
           <text macro="container-title" prefix=" " suffix=". "/>
           <text macro="translator" suffix=". "/>
           <text macro="locators"/>
         </else-if>
         <else-if type="thesis">
-          <text macro="author-short" prefix="" suffix=". "/>
-          <text macro="year-date" prefix="" suffix=". "/>
+          <text macro="author-short" suffix=". "/>
+          <text macro="year-date" suffix=". "/>
           <text macro="title" suffix=". "/>
           <text variable="genre" prefix=" " suffix=". "/>
           <text variable="page" prefix="Págs. " suffix=". "/>
-          <text macro="publisher-place" prefix="" suffix=", "/>
+          <text macro="publisher-place" suffix=", "/>
           <text macro="publisher" suffix=". "/>
           <text macro="number-of-pages" suffix=" p."/>
         </else-if>
         <else-if type="article-newspaper">
           <text macro="author-short" suffix=". "/>
-          <text macro="year-date" prefix="" suffix=". "/>
+          <text macro="year-date" suffix=". "/>
           <text macro="title" suffix=". "/>
           <group suffix=". ">
             <group delimiter=", ">
@@ -347,7 +347,7 @@
               </group>
               <text macro="year-date" suffix=". "/>
               <text macro="author-short" prefix="Ed. " suffix=". "/>
-              <text macro="publisher-place" prefix="" suffix=", "/>
+              <text macro="publisher-place" suffix=", "/>
               <text macro="publisher" suffix=". "/>
               <group delimiter=", " suffix=". ">
                 <text macro="volume" prefix="v."/>
@@ -357,12 +357,12 @@
           </choose>
         </else-if>
         <else-if type="article">
-          <text macro="author-short" prefix="" suffix=". "/>
-          <text macro="year-date" prefix="" suffix=". "/>
-          <group prefix=" " delimiter="" suffix=". ">
+          <text macro="author-short" suffix=". "/>
+          <text macro="year-date" suffix=". "/>
+          <group prefix=" " suffix=". ">
             <text macro="title"/>
           </group>
-          <group prefix=" " delimiter="" suffix=".">
+          <group prefix=" " suffix=".">
             <text variable="container-title" suffix=" "/>
             <text macro="collection-title" prefix=" (Serie " suffix=") "/>
             <text macro="volume"/>
@@ -374,11 +374,11 @@
         <else-if type="article-journal article-magazine" match="any">
           <text macro="author-short" suffix=". "/>
           <text macro="year-date" suffix=". "/>
-          <group prefix=" " delimiter="" suffix=". ">
+          <group prefix=" " suffix=". ">
             <text macro="title"/>
             <text variable="note" prefix=" (En " suffix=")" text-case="lowercase"/>
           </group>
-          <group prefix=" " delimiter="" suffix=".">
+          <group prefix=" " suffix=".">
             <text variable="container-title" suffix=" "/>
             <text macro="collection-title" prefix=" (Serie " suffix=") "/>
             <choose>
@@ -419,7 +419,7 @@
           </group>
           <text macro="editor" suffix=". "/>
           <text macro="edition" suffix=". "/>
-          <text variable="publisher-place" prefix="" suffix=", "/>
+          <text variable="publisher-place" suffix=", "/>
           <text macro="publisher" suffix=". "/>
           <text variable="medium" suffix=". " text-case="capitalize-first"/>
           <text macro="collection-title" prefix=" (" suffix=")."/>
diff --git a/immunological-reviews.csl b/immunological-reviews.csl
index dea2a481cb..87d540fd1c 100644
--- a/immunological-reviews.csl
+++ b/immunological-reviews.csl
@@ -32,45 +32,45 @@
     <layout>
       <choose>
         <if type="book">
-          <names variable="author" prefix="" suffix=". ">
+          <names variable="author" suffix=". ">
             <name et-al-min="7" et-al-use-first="1" delimiter=", " name-as-sort-order="all" sort-separator=", " form="long" initialize-with=""/>
           </names>
-          <text variable="title" prefix="" suffix=". "/>
-          <text variable="edition" prefix="" suffix="ed. "/>
-          <text variable="event-place" prefix="" suffix=": "/>
-          <text variable="publisher" prefix="" suffix=", "/>
-          <date variable="issued" prefix="" suffix=". ">
-            <date-part name="year" form="long" prefix="" suffix=""/>
+          <text variable="title" suffix=". "/>
+          <text variable="edition" suffix="ed. "/>
+          <text variable="event-place" suffix=": "/>
+          <text variable="publisher" suffix=", "/>
+          <date variable="issued" suffix=". ">
+            <date-part name="year" form="long"/>
           </date>
         </if>
         <else-if type="article-journal">
-          <text variable="citation-number" prefix="" suffix=".          "/>
-          <names variable="author" prefix="" suffix=". ">
+          <text variable="citation-number" suffix=".          "/>
+          <names variable="author" suffix=". ">
             <name et-al-min="7" et-al-use-first="7" delimiter=", " name-as-sort-order="all" sort-separator=", " form="long" initialize-with=""/>
           </names>
-          <text variable="title" prefix="" suffix=". "/>
-          <text variable="container-title" prefix="" form="short" suffix=" "/>
-          <date variable="issued" prefix="" suffix="; ">
-            <date-part name="year" form="long" prefix="" suffix=""/>
+          <text variable="title" suffix=". "/>
+          <text variable="container-title" form="short" suffix=" "/>
+          <date variable="issued" suffix="; ">
+            <date-part name="year" form="long"/>
           </date>
-          <text variable="volume" prefix="" suffix=": " font-weight="bold"/>
-          <text variable="page" prefix="" suffix=". "/>
+          <text variable="volume" suffix=": " font-weight="bold"/>
+          <text variable="page" suffix=". "/>
         </else-if>
         <else>
-          <names variable="author" prefix="" suffix=" ">
+          <names variable="author" suffix=" ">
             <name and="symbol" delimiter=", " name-as-sort-order="all" sort-separator=", " form="long" initialize-with="."/>
           </names>
           <date variable="issued" prefix="(" suffix="). ">
-            <date-part name="year" form="long" prefix="" suffix=""/>
+            <date-part name="year" form="long"/>
           </date>
-          <text variable="title" prefix="" suffix=". "/>
-          <group delimiter=", " prefix="" suffix=". ">
-            <text variable="container-title" prefix="" suffix="" font-style="italic"/>
-            <group delimiter="" prefix="" suffix="">
-              <text variable="volume" prefix="" suffix=""/>
+          <text variable="title" suffix=". "/>
+          <group delimiter=", " suffix=". ">
+            <text variable="container-title" font-style="italic"/>
+            <group>
+              <text variable="volume"/>
               <text variable="issue" prefix="(" suffix=") "/>
             </group>
-            <text variable="page" prefix="" suffix=""/>
+            <text variable="page"/>
           </group>
         </else>
       </choose>
diff --git a/inflammatory-bowel-diseases.csl b/inflammatory-bowel-diseases.csl
index 774ef23042..9268f83917 100644
--- a/inflammatory-bowel-diseases.csl
+++ b/inflammatory-bowel-diseases.csl
@@ -30,7 +30,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -121,8 +121,8 @@
   </citation>
   <bibliography et-al-min="4" et-al-use-first="3" second-field-align="flush">
     <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
-      <text macro="author" suffix=""/>
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group suffix=".">
@@ -130,7 +130,7 @@
             <text macro="edition" prefix=" "/>
             <text macro="editor" prefix=" (" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
           <group suffix="." prefix="; ">
             <date variable="issued">
               <date-part name="year"/>
diff --git a/infoclio-de.csl b/infoclio-de.csl
index 09619ba2ff..82c15a45e4 100644
--- a/infoclio-de.csl
+++ b/infoclio-de.csl
@@ -331,7 +331,7 @@
   </macro>
   <citation name-form="long" and="text" sort-separator=", " name-as-sort-order="all" delimiter-precedes-last="never" et-al-min="4" et-al-use-first="3">
     <!-- the attributes on citation are inheritable name options -->
-    <layout prefix="" suffix="." delimiter="&#160;; ">
+    <layout suffix="." delimiter="&#160;; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/infoclio-fr-nocaps.csl b/infoclio-fr-nocaps.csl
index da5767a88e..c49d718c81 100644
--- a/infoclio-fr-nocaps.csl
+++ b/infoclio-fr-nocaps.csl
@@ -365,7 +365,7 @@
   </macro>
   <citation name-form="long" and="text" sort-separator=", " name-as-sort-order="all" delimiter-precedes-last="never" et-al-min="4">
     <!-- the attributes on citation are inheritable name options -->
-    <layout prefix="" suffix="." delimiter="&#160;; ">
+    <layout suffix="." delimiter="&#160;; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/infoclio-fr-smallcaps.csl b/infoclio-fr-smallcaps.csl
index 0cfaf6f7a9..7296695226 100644
--- a/infoclio-fr-smallcaps.csl
+++ b/infoclio-fr-smallcaps.csl
@@ -372,7 +372,7 @@
   </macro>
   <citation name-form="long" and="text" sort-separator=", " name-as-sort-order="all" delimiter-precedes-last="never" et-al-min="4">
     <!-- the attributes on citation are inheritable name options -->
-    <layout prefix="" suffix="." delimiter="&#160;; ">
+    <layout suffix="." delimiter="&#160;; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/information-systems-research.csl b/information-systems-research.csl
index bd9fbdaedb..4ba26058ed 100644
--- a/information-systems-research.csl
+++ b/information-systems-research.csl
@@ -238,7 +238,7 @@
   <macro name="locators">
     <choose>
       <if type="article-journal article-magazine article-newspaper" match="any">
-        <group delimiter="" prefix=" ">
+        <group prefix=" ">
           <text variable="volume" form="long" font-weight="bold"/>
           <text variable="issue" form="long" prefix="(" suffix=")"/>
         </group>
diff --git a/institute-of-physics-harvard.csl b/institute-of-physics-harvard.csl
index 7d931b55fc..798b49359e 100644
--- a/institute-of-physics-harvard.csl
+++ b/institute-of-physics-harvard.csl
@@ -97,11 +97,11 @@
       <if is-numeric="edition">
         <group delimiter=" ">
           <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short" suffix="" strip-periods="true"/>
+          <text term="edition" form="short" strip-periods="true"/>
         </group>
       </if>
       <else>
-        <text variable="edition" suffix=""/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
diff --git a/institute-of-physics-numeric.csl b/institute-of-physics-numeric.csl
index a0dde9bcf7..ab87ff02a6 100644
--- a/institute-of-physics-numeric.csl
+++ b/institute-of-physics-numeric.csl
@@ -100,11 +100,11 @@
       <if is-numeric="edition">
         <group delimiter=" ">
           <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short" suffix="" strip-periods="true"/>
+          <text term="edition" form="short" strip-periods="true"/>
         </group>
       </if>
       <else>
-        <text variable="edition" suffix=""/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
diff --git a/inter-research-science-center.csl b/inter-research-science-center.csl
index aa29edaf87..0388b5c04d 100644
--- a/inter-research-science-center.csl
+++ b/inter-research-science-center.csl
@@ -94,7 +94,7 @@
       <key variable="issued"/>
     </sort>
     <layout>
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <date variable="issued" prefix=" (" suffix=")">
         <date-part name="year"/>
       </date>
diff --git a/inter-ro.csl b/inter-ro.csl
index e762b6fe20..5db0555792 100644
--- a/inter-ro.csl
+++ b/inter-ro.csl
@@ -187,7 +187,7 @@
     </group>
   </macro>
   <citation et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="false" disambiguate-add-names="true" disambiguate-add-givenname="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/international-journal-of-cancer.csl b/international-journal-of-cancer.csl
index 75a330387b..739093cc42 100644
--- a/international-journal-of-cancer.csl
+++ b/international-journal-of-cancer.csl
@@ -64,7 +64,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
@@ -143,7 +143,7 @@
             <text variable="container-title"/>
           </group>
           <text macro="publisher" prefix=" "/>
-          <text variable="page" prefix="" suffix="."/>
+          <text variable="page" suffix="."/>
         </else-if>
         <else>
           <text macro="journal-title" font-style="italic"/>
diff --git a/international-journal-of-epidemiology.csl b/international-journal-of-epidemiology.csl
index 431e8d77c1..df7988a272 100644
--- a/international-journal-of-epidemiology.csl
+++ b/international-journal-of-epidemiology.csl
@@ -83,7 +83,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/international-journal-of-exercise-science.csl b/international-journal-of-exercise-science.csl
index 859df6a070..afcc45bd59 100644
--- a/international-journal-of-exercise-science.csl
+++ b/international-journal-of-exercise-science.csl
@@ -35,7 +35,7 @@
   <macro name="editor">
     <names variable="editor" suffix=". ">
       <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " suffix=""/>
+      <label form="short" prefix=", "/>
     </names>
   </macro>
   <macro name="publisher">
@@ -66,7 +66,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/international-journal-of-lexicography.csl b/international-journal-of-lexicography.csl
index c11f1d0d64..6ca1c74e1f 100644
--- a/international-journal-of-lexicography.csl
+++ b/international-journal-of-lexicography.csl
@@ -68,7 +68,7 @@
     <choose>
       <if type="chapter paper-conference" match="any">
         <text term="in" text-case="capitalize-first" suffix=" "/>
-        <group prefix="" delimiter=", ">
+        <group delimiter=", ">
           <choose>
             <if variable="author">
               <names variable="editor">
diff --git a/international-journal-of-occupational-medicine-and-environmental-health.csl b/international-journal-of-occupational-medicine-and-environmental-health.csl
index e91a72cdc5..008da31e29 100644
--- a/international-journal-of-occupational-medicine-and-environmental-health.csl
+++ b/international-journal-of-occupational-medicine-and-environmental-health.csl
@@ -82,7 +82,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
@@ -94,7 +94,7 @@
   <macro name="container-title">
     <choose>
       <if type="article-journal article-magazine  paper-conference article-newspaper" match="any">
-        <group suffix="" delimiter=" ">
+        <group delimiter=" ">
           <text variable="container-title" form="short"/>
           <choose>
             <if variable="URL">
diff --git a/international-journal-of-radiation-oncology-biology-physics.csl b/international-journal-of-radiation-oncology-biology-physics.csl
index 7633732d2e..04c2fea29d 100644
--- a/international-journal-of-radiation-oncology-biology-physics.csl
+++ b/international-journal-of-radiation-oncology-biology-physics.csl
@@ -41,7 +41,7 @@
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
         <et-al font-style="italic"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -106,8 +106,8 @@
   </citation>
   <bibliography hanging-indent="false" et-al-min="4" et-al-use-first="3">
     <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
-      <text macro="author" suffix=""/>
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group suffix=".">
@@ -115,7 +115,7 @@
             <text macro="edition" prefix=" "/>
             <text macro="editor" prefix=" (" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
           <group suffix="." prefix="; ">
             <date variable="issued">
               <date-part name="year"/>
diff --git a/international-journal-of-wildland-fire.csl b/international-journal-of-wildland-fire.csl
index 5ea662e78e..ef13228911 100644
--- a/international-journal-of-wildland-fire.csl
+++ b/international-journal-of-wildland-fire.csl
@@ -142,7 +142,7 @@
       <key variable="issued"/>
     </sort>
     <layout>
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <date variable="issued" prefix=" (" suffix=")">
         <date-part name="year"/>
       </date>
diff --git a/international-labour-organization.csl b/international-labour-organization.csl
index 1e9d7ca0bc..8603d1557f 100644
--- a/international-labour-organization.csl
+++ b/international-labour-organization.csl
@@ -55,7 +55,7 @@
     <choose>
       <if variable="URL">
         <text value="Available at: "/>
-        <text variable="URL" prefix="" suffix=""/>
+        <text variable="URL"/>
         <group prefix=" [" suffix="]">
           <text value="Accessed:" text-case="capitalize-first" suffix=" "/>
           <date variable="accessed">
diff --git a/international-microbiology.csl b/international-microbiology.csl
index 1a0e4cc9ab..9558573ad8 100644
--- a/international-microbiology.csl
+++ b/international-microbiology.csl
@@ -135,7 +135,7 @@
           </group>
         </else-if>
         <else-if type="webpage">
-          <group delimiter="">
+          <group>
             <text prefix="In: " variable="container-title" suffix=". " form="short"/>
             <text variable="URL" suffix=". "/>
             <date variable="accessed">
@@ -152,7 +152,7 @@
           </group>
         </else-if>
         <else>
-          <group delimiter="">
+          <group>
             <text variable="container-title" form="short" suffix=" "/>
             <text variable="volume" suffix=":"/>
             <text variable="page" suffix="."/>
diff --git a/international-organization.csl b/international-organization.csl
index 3cd5158305..a0d18afb1d 100644
--- a/international-organization.csl
+++ b/international-organization.csl
@@ -412,7 +412,7 @@
     </group>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true" disambiguate-add-year-suffix="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
@@ -424,7 +424,7 @@
           <text term="ibid"/>
         </else-if>
         <else>
-          <group delimiter="">
+          <group>
             <text macro="contributors-short"/>
             <date variable="issued" prefix=" ">
               <date-part name="year"/>
diff --git a/investigative-radiology.csl b/investigative-radiology.csl
index b3e7f324f5..5e1c8413a4 100644
--- a/investigative-radiology.csl
+++ b/investigative-radiology.csl
@@ -31,7 +31,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
diff --git a/invisu.csl b/invisu.csl
index e3382a7497..4b7bf9cc10 100644
--- a/invisu.csl
+++ b/invisu.csl
@@ -126,7 +126,7 @@
         </group>
       </else-if>
       <else-if type="manuscript" match="any">
-        <group delimiter="">
+        <group>
           <group suffix=",">
             <text variable="title" text-case="capitalize-first" font-style="italic"/>
           </group>
@@ -134,7 +134,7 @@
         </group>
       </else-if>
       <else-if type="entry-dictionary entry-encyclopedia paper-conference chapter" match="any">
-        <group delimiter="">
+        <group>
           <group suffix=",">
             <text variable="title" text-case="capitalize-first" quotes="true"/>
           </group>
@@ -185,7 +185,7 @@
         </choose>
       </if>
       <else-if type="article-journal article-magazine" match="any">
-        <group delimiter="" font-style="normal">
+        <group font-style="normal">
           <choose>
             <if variable="issued">
               <text macro="volume" prefix=", "/>
@@ -415,7 +415,7 @@
       </else-if>
       <else-if type="graphic personal_communication interview article-journal article-magazine" match="any"/>
       <else-if type="article-newspaper speech paper-conference" match="any">
-        <group delimiter="" font-style="normal">
+        <group font-style="normal">
           <text macro="newspaper-edition"/>
           <text macro="date"/>
         </group>
@@ -463,7 +463,7 @@
         </group>
       </else-if>
       <else-if type="article-newspaper speech paper-conference" match="any">
-        <group delimiter="" font-style="normal">
+        <group font-style="normal">
           <group delimiter="&#160;" prefix=", ">
             <label variable="page" form="short"/>
             <text variable="page"/>
@@ -551,7 +551,7 @@
     </group>
     <group delimiter=" " font-style="normal">
       <text value="Consulté le" suffix=" " prefix=". "/>
-      <date variable="accessed" form="text" suffix="">
+      <date variable="accessed" form="text">
         <date-part name="day"/>
         <date-part name="month"/>
         <date-part name="year"/>
@@ -559,7 +559,7 @@
     </group>
   </macro>
   <citation et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1">
-    <layout prefix="" suffix="." delimiter="&#160;; ">
+    <layout suffix="." delimiter="&#160;; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
@@ -606,7 +606,7 @@
       <key macro="author"/>
       <key variable="issued" sort="descending"/>
     </sort>
-    <layout prefix="" suffix=".">
+    <layout suffix=".">
       <text macro="author-bib"/>
       <text macro="title"/>
       <text macro="translator"/>
diff --git a/iso690-author-date-cs.csl b/iso690-author-date-cs.csl
index c2b91bf7bc..40fcef409f 100644
--- a/iso690-author-date-cs.csl
+++ b/iso690-author-date-cs.csl
@@ -177,7 +177,7 @@
           </if>
         </choose>
         <date variable="issued">
-          <date-part name="year" form="long" suffix=""/>
+          <date-part name="year" form="long"/>
         </date>
       </if>
       <else>
diff --git a/iso690-author-date-en.csl b/iso690-author-date-en.csl
index 92db69b713..419f196523 100644
--- a/iso690-author-date-en.csl
+++ b/iso690-author-date-en.csl
@@ -112,7 +112,7 @@
     <choose>
       <if variable="issued">
         <date variable="issued">
-          <date-part name="year" form="long" suffix=""/>
+          <date-part name="year" form="long"/>
         </date>
       </if>
       <else>
diff --git a/iso690-author-date-fr-no-abstract.csl b/iso690-author-date-fr-no-abstract.csl
index 7d3b212b7c..1491bc4bdb 100644
--- a/iso690-author-date-fr-no-abstract.csl
+++ b/iso690-author-date-fr-no-abstract.csl
@@ -124,7 +124,7 @@
     <choose>
       <if variable="issued">
         <date variable="issued">
-          <date-part name="year" form="long" suffix=""/>
+          <date-part name="year" form="long"/>
         </date>
       </if>
       <else>
diff --git a/iso690-author-date-fr.csl b/iso690-author-date-fr.csl
index 9ca30c87d9..de91fe249c 100644
--- a/iso690-author-date-fr.csl
+++ b/iso690-author-date-fr.csl
@@ -69,7 +69,7 @@
     <choose>
       <if variable="issued">
         <date variable="issued">
-          <date-part name="year" form="long" suffix=""/>
+          <date-part name="year" form="long"/>
         </date>
       </if>
       <else>
diff --git a/iso690-note-cs.csl b/iso690-note-cs.csl
index 8def019c60..9abd25bbbc 100644
--- a/iso690-note-cs.csl
+++ b/iso690-note-cs.csl
@@ -169,7 +169,7 @@
           </if>
         </choose>
         <date variable="issued">
-          <date-part name="year" form="long" suffix=""/>
+          <date-part name="year" form="long"/>
         </date>
       </if>
       <else>
diff --git a/iso690-numeric-brackets-cs.csl b/iso690-numeric-brackets-cs.csl
index 2edb784922..e9cda7ca15 100644
--- a/iso690-numeric-brackets-cs.csl
+++ b/iso690-numeric-brackets-cs.csl
@@ -154,7 +154,7 @@
           </if>
         </choose>
         <date variable="issued">
-          <date-part name="year" form="long" suffix=""/>
+          <date-part name="year" form="long"/>
         </date>
       </if>
       <else>
diff --git a/iso690-numeric-cs.csl b/iso690-numeric-cs.csl
index e5baed5655..832826ed21 100644
--- a/iso690-numeric-cs.csl
+++ b/iso690-numeric-cs.csl
@@ -154,7 +154,7 @@
           </if>
         </choose>
         <date variable="issued">
-          <date-part name="year" form="long" suffix=""/>
+          <date-part name="year" form="long"/>
         </date>
       </if>
       <else>
diff --git a/iso690-numeric-en.csl b/iso690-numeric-en.csl
index dfa303d806..fbb2aff6af 100644
--- a/iso690-numeric-en.csl
+++ b/iso690-numeric-en.csl
@@ -105,7 +105,7 @@
     <choose>
       <if variable="issued">
         <date variable="issued">
-          <date-part name="year" form="long" suffix=""/>
+          <date-part name="year" form="long"/>
         </date>
       </if>
       <else>
diff --git a/iso690-numeric-fr.csl b/iso690-numeric-fr.csl
index 660a14d106..81788afe2e 100644
--- a/iso690-numeric-fr.csl
+++ b/iso690-numeric-fr.csl
@@ -105,7 +105,7 @@
     <choose>
       <if variable="issued">
         <date variable="issued">
-          <date-part name="year" form="long" suffix=""/>
+          <date-part name="year" form="long"/>
         </date>
       </if>
       <else>
diff --git a/iso690-numeric-lt.csl b/iso690-numeric-lt.csl
index 1f971b1111..6e51b969c4 100644
--- a/iso690-numeric-lt.csl
+++ b/iso690-numeric-lt.csl
@@ -217,7 +217,7 @@
     </sort>
     <layout suffix=".">
       <text variable="citation-number" suffix=".  "/>
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <choose>
         <if type="book">
           <group delimiter=" ">
diff --git a/iso690-numeric-sk.csl b/iso690-numeric-sk.csl
index 835b3d699f..a69a668263 100644
--- a/iso690-numeric-sk.csl
+++ b/iso690-numeric-sk.csl
@@ -234,7 +234,7 @@
     </sort>
     <layout suffix=".">
       <text variable="citation-number" prefix="[" suffix="]   "/>
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <choose>
         <if type="book">
           <group delimiter=" ">
diff --git a/javnost-the-public.csl b/javnost-the-public.csl
index ed05294378..3e69fb36b7 100644
--- a/javnost-the-public.csl
+++ b/javnost-the-public.csl
@@ -149,7 +149,7 @@
             <text variable="collection-title" suffix=","/>
             <text variable="page" suffix="."/>
             <group suffix="." delimiter=", ">
-              <text macro="publisher" prefix=""/>
+              <text macro="publisher"/>
             </group>
           </group>
         </else-if>
diff --git a/journal-of-antimicrobial-chemotherapy.csl b/journal-of-antimicrobial-chemotherapy.csl
index 58e92cd128..40ec29930f 100644
--- a/journal-of-antimicrobial-chemotherapy.csl
+++ b/journal-of-antimicrobial-chemotherapy.csl
@@ -30,7 +30,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <et-al font-style="italic"/>
         <substitute>
           <names variable="editor"/>
@@ -124,8 +124,8 @@
   </citation>
   <bibliography hanging-indent="false" et-al-min="7" et-al-use-first="3">
     <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
-      <text macro="author" suffix=""/>
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
       <choose>
         <if type="bill book graphic legal_case motion_picture report song" match="any">
           <group suffix=".">
@@ -133,7 +133,7 @@
             <text macro="edition" prefix=" "/>
             <text macro="editor" prefix=" (" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
           <group suffix="." prefix="; ">
             <date variable="issued">
               <date-part name="year"/>
diff --git a/journal-of-applied-animal-science.csl b/journal-of-applied-animal-science.csl
index 57ce010883..46b6494dc5 100644
--- a/journal-of-applied-animal-science.csl
+++ b/journal-of-applied-animal-science.csl
@@ -116,7 +116,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
@@ -195,7 +195,7 @@
         </date>
       </if>
       <else>
-        <date variable="accessed" suffix="">
+        <date variable="accessed">
           <date-part name="year"/>
         </date>
       </else>
diff --git a/journal-of-applied-ecology.csl b/journal-of-applied-ecology.csl
index 528f8e35db..873e8e95b9 100644
--- a/journal-of-applied-ecology.csl
+++ b/journal-of-applied-ecology.csl
@@ -124,8 +124,8 @@
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" "/>
           <group prefix=".">
-            <group prefix="" suffix="">
-              <text variable="container-title" font-style="italic" prefix=" " suffix=""/>
+            <group>
+              <text variable="container-title" font-style="italic" prefix=" "/>
               <text variable="collection-title" prefix=" " suffix="."/>
               <group suffix=".">
                 <text macro="edition" prefix=", "/>
diff --git a/journal-of-atrial-fibrillation.csl b/journal-of-atrial-fibrillation.csl
index 758a4cc021..3985189c95 100644
--- a/journal-of-atrial-fibrillation.csl
+++ b/journal-of-atrial-fibrillation.csl
@@ -32,78 +32,78 @@
     <layout>
       <choose>
         <if type="article-journal">
-          <text variable="citation-number" prefix="" suffix=". "/>
-          <names variable="author" prefix="" suffix=". ">
+          <text variable="citation-number" suffix=". "/>
+          <names variable="author" suffix=". ">
             <name delimiter=", " name-as-sort-order="all" sort-separator=" " form="long" initialize-with=""/>
           </names>
-          <text variable="title" prefix="" suffix=". "/>
+          <text variable="title" suffix=". "/>
           <text variable="container-title" form="short" suffix=" "/>
-          <date variable="issued" prefix="" suffix="; ">
-            <date-part name="year" form="long" prefix="" suffix=""/>
+          <date variable="issued" suffix="; ">
+            <date-part name="year" form="long"/>
           </date>
-          <text variable="volume" prefix="" suffix=": "/>
-          <text variable="page" prefix="" suffix=". "/>
+          <text variable="volume" suffix=": "/>
+          <text variable="page" suffix=". "/>
         </if>
         <else-if type="book">
-          <text variable="citation-number" prefix="" suffix=". "/>
-          <names variable="author" prefix="" suffix=". ">
+          <text variable="citation-number" suffix=". "/>
+          <names variable="author" suffix=". ">
             <name delimiter=", " name-as-sort-order="all" sort-separator=" " form="long" initialize-with=""/>
           </names>
-          <text variable="title" prefix="" suffix=". "/>
-          <text variable="edition" prefix="" suffix="., "/>
-          <text variable="publisher-place" prefix="" suffix=", "/>
-          <text variable="publisher" prefix="" suffix=". ">
+          <text variable="title" suffix=". "/>
+          <text variable="edition" suffix="., "/>
+          <text variable="publisher-place" suffix=", "/>
+          <text variable="publisher" suffix=". ">
           </text>
-          <date variable="issued" prefix="" suffix="; ">
-            <date-part name="year" form="long" prefix="" suffix=""/>
+          <date variable="issued" suffix="; ">
+            <date-part name="year" form="long"/>
           </date>
-          <text variable="page" prefix="" suffix=". "/>
+          <text variable="page" suffix=". "/>
         </else-if>
         <else-if type="chapter">
-          <text variable="citation-number" prefix="" suffix=". "/>
-          <names variable="author" prefix="" suffix=". ">
+          <text variable="citation-number" suffix=". "/>
+          <names variable="author" suffix=". ">
             <name delimiter=", " name-as-sort-order="all" sort-separator=" " form="long" initialize-with=""/>
           </names>
-          <text variable="title" prefix="" suffix=". "/>
-          <text value="In:" prefix="" suffix=" "/>
-          <names variable="editor" prefix="" suffix=", ">
+          <text variable="title" suffix=". "/>
+          <text value="In:" suffix=" "/>
+          <names variable="editor" suffix=", ">
             <name delimiter="," form="long" initialize-with=""/>
           </names>
-          <text value="eds" prefix="" suffix=". "/>
-          <text variable="collection-title" prefix="" suffix=". "/>
-          <text variable="edition" prefix="" suffix="., "/>
-          <text variable="publisher-place" prefix="" suffix=", "/>
-          <text variable="publisher" prefix="" suffix=". ">
+          <text value="eds" suffix=". "/>
+          <text variable="collection-title" suffix=". "/>
+          <text variable="edition" suffix="., "/>
+          <text variable="publisher-place" suffix=", "/>
+          <text variable="publisher" suffix=". ">
           </text>
-          <date variable="issued" prefix="" suffix="; ">
-            <date-part name="year" form="long" prefix="" suffix=""/>
+          <date variable="issued" suffix="; ">
+            <date-part name="year" form="long"/>
           </date>
-          <text variable="page" prefix="" suffix=". "/>
+          <text variable="page" suffix=". "/>
         </else-if>
         <else-if type="webpage">
-          <text variable="citation-number" prefix="" suffix=". "/>
-          <names variable="author" prefix="" suffix=". ">
+          <text variable="citation-number" suffix=". "/>
+          <names variable="author" suffix=". ">
             <name delimiter=", " name-as-sort-order="all" sort-separator=" " form="long" initialize-with=""/>
           </names>
-          <text variable="title" prefix="" suffix=". "/>
-          <text variable="URL" prefix="" suffix=" "/>
+          <text variable="title" suffix=". "/>
+          <text variable="URL" suffix=" "/>
           <date variable="accessed" prefix="(accessed " suffix="). ">
-            <date-part name="year" form="long" prefix="" suffix=""/>
-            <date-part name="month" form="long" prefix="" suffix=""/>
+            <date-part name="year" form="long"/>
+            <date-part name="month" form="long"/>
           </date>
         </else-if>
         <else>
-          <text variable="citation-number" prefix="" suffix=". "/>
-          <names variable="author" prefix="" suffix=". ">
+          <text variable="citation-number" suffix=". "/>
+          <names variable="author" suffix=". ">
             <name delimiter=", " name-as-sort-order="all" sort-separator=" " form="long" initialize-with=""/>
           </names>
-          <text variable="title" prefix="" suffix=". "/>
-          <text variable="container-title" prefix="" suffix=" "/>
-          <date variable="issued" prefix="" suffix="; ">
-            <date-part name="year" form="long" prefix="" suffix=""/>
+          <text variable="title" suffix=". "/>
+          <text variable="container-title" suffix=" "/>
+          <date variable="issued" suffix="; ">
+            <date-part name="year" form="long"/>
           </date>
-          <text variable="volume" prefix="" suffix=": "/>
-          <text variable="page" prefix="" suffix=". "/>
+          <text variable="volume" suffix=": "/>
+          <text variable="page" suffix=". "/>
         </else>
       </choose>
     </layout>
diff --git a/journal-of-biogeography.csl b/journal-of-biogeography.csl
index 0853387d90..d17655b88d 100644
--- a/journal-of-biogeography.csl
+++ b/journal-of-biogeography.csl
@@ -19,7 +19,7 @@
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
-    <names variable="author" prefix="" suffix=" ">
+    <names variable="author" suffix=" ">
       <name delimiter=", " and="symbol" name-as-sort-order="all" sort-separator=" " form="long" initialize-with="."/>
     </names>
   </macro>
@@ -34,7 +34,7 @@
     </date>
   </macro>
   <macro name="title">
-    <text variable="title" prefix="" suffix=". "/>
+    <text variable="title" suffix=". "/>
   </macro>
   <citation disambiguate-add-year-suffix="true" collapse="year" et-al-min="3" et-al-use-first="1">
     <sort>
@@ -42,12 +42,12 @@
       <key variable="issued" sort="ascending"/>
     </sort>
     <layout delimiter="; " prefix="(" suffix=")">
-      <group delimiter=" " prefix="" suffix="">
-        <names variable="author" prefix="" suffix=", ">
+      <group delimiter=" ">
+        <names variable="author" suffix=", ">
           <name and="symbol" delimiter=" " name-as-sort-order="all" sort-separator=", " form="short"/>
         </names>
-        <date variable="issued" prefix="" suffix="">
-          <date-part name="year" form="long" prefix="" suffix=""/>
+        <date variable="issued">
+          <date-part name="year" form="long"/>
         </date>
       </group>
     </layout>
@@ -63,37 +63,37 @@
       <choose>
         <if type="thesis">
           <text macro="title" font-style="italic"/>
-          <text variable="publisher" prefix="" suffix=", "/>
-          <text variable="publisher-place" prefix="" suffix=". "/>
+          <text variable="publisher" suffix=", "/>
+          <text variable="publisher-place" suffix=". "/>
         </if>
         <else-if type="book">
           <text macro="title" font-style="italic"/>
-          <text variable="publisher" prefix="" suffix=", "/>
-          <text variable="publisher-place" prefix="" suffix=". "/>
+          <text variable="publisher" suffix=", "/>
+          <text variable="publisher-place" suffix=". "/>
         </else-if>
         <else-if type="chapter">
           <text macro="title"/>
-          <text variable="container-title" font-style="italic" prefix="" suffix=" "/>
+          <text variable="container-title" font-style="italic" suffix=" "/>
           <text macro="editor"/>
           <text variable="page" prefix="pp. " suffix=". "/>
-          <text variable="publisher" prefix="" suffix=", "/>
-          <text variable="publisher-place" prefix="" suffix=". "/>
+          <text variable="publisher" suffix=", "/>
+          <text variable="publisher-place" suffix=". "/>
         </else-if>
         <else-if type="paper-conference">
           <text macro="title"/>
           <text variable="event" prefix=" " suffix=", " font-style="italic"/>
-          <text variable="volume" prefix="" suffix=", "/>
-          <text variable="page" prefix="" suffix="."/>
+          <text variable="volume" suffix=", "/>
+          <text variable="page" suffix="."/>
         </else-if>
         <else-if type="webpage">
           <text variable="URL" prefix="Available at: " suffix=". "/>
         </else-if>
         <else>
-          <group delimiter="" prefix="" suffix=". ">
+          <group suffix=". ">
             <text macro="title"/>
-            <text variable="container-title" font-style="italic" prefix="" suffix=", " form="long"/>
-            <text variable="volume" font-weight="bold" prefix="" suffix=", "/>
-            <text variable="page" prefix="" suffix="."/>
+            <text variable="container-title" font-style="italic" suffix=", " form="long"/>
+            <text variable="volume" font-weight="bold" suffix=", "/>
+            <text variable="page" suffix="."/>
           </group>
         </else>
       </choose>
diff --git a/journal-of-chemical-ecology.csl b/journal-of-chemical-ecology.csl
index 1c1e7eed97..28c1b1857b 100644
--- a/journal-of-chemical-ecology.csl
+++ b/journal-of-chemical-ecology.csl
@@ -150,7 +150,7 @@
             <text term="edition" form="long" prefix=" "/>
           </if>
           <else>
-            <text variable="edition" prefix=", " suffix=""/>
+            <text variable="edition" prefix=", "/>
           </else>
         </choose>
       </if>
diff --git a/journal-of-chemistry-and-chemical-engineering.csl b/journal-of-chemistry-and-chemical-engineering.csl
index 2a009fa40b..82f53cbc60 100644
--- a/journal-of-chemistry-and-chemical-engineering.csl
+++ b/journal-of-chemistry-and-chemical-engineering.csl
@@ -33,7 +33,7 @@
           </names>
           <text variable="title" text-case="capitalize-first" suffix=". "/>
           <text variable="container-title" font-style="italic" suffix=" "/>
-          <date variable="issued" prefix="" suffix=", ">
+          <date variable="issued" suffix=", ">
             <date-part name="year" font-weight="bold" suffix=", "/>
           </date>
           <text variable="volume" suffix=",  "/>
@@ -44,7 +44,7 @@
             <name delimiter="; " and="text" initialize-with=". " name-as-sort-order="all"/>
           </names>
           <text variable="title" suffix=". "/>
-          <group prefix="" suffix=" ">
+          <group suffix=" ">
             <text variable="publisher" suffix=": "/>
             <text variable="publisher-place"/>
           </group>
@@ -90,7 +90,7 @@
           </group>
           <group>
             <text variable="event" form="long" font-style="normal" prefix="Proceedings of the " suffix=", "/>
-            <text variable="event-place" prefix="" suffix=",  "/>
+            <text variable="event-place" suffix=",  "/>
             <date variable="event-date" suffix="; ">
               <date-part name="month" form="short"/>
               <date-part name="day" suffix=", "/>
@@ -102,13 +102,13 @@
           </names>
           <group>
             <text variable="publisher" suffix=": "/>
-            <text variable="publisher-place" prefix="" suffix=", "/>
+            <text variable="publisher-place" suffix=", "/>
             <date date-parts="year" form="text" variable="issued" suffix="."/>
           </group>
         </else-if>
         <else-if type="webpage">
           <text variable="title" suffix=". "/>
-          <text variable="URL" prefix="" suffix=" "/>
+          <text variable="URL" suffix=" "/>
           <date variable="accessed" prefix="(accessed " suffix=").">
             <date-part name="month" form="short" suffix=" "/>
             <date-part name="day" suffix=", "/>
@@ -116,7 +116,7 @@
           </date>
         </else-if>
         <else-if type="thesis">
-          <names variable="author" prefix="" suffix=" ">
+          <names variable="author" suffix=" ">
             <name delimiter="," and="text" initialize-with=". " name-as-sort-order="all"/>
           </names>
           <text variable="title" text-case="title" suffix=". Ph.D. Thesis, "/>
@@ -130,17 +130,17 @@
           <names variable="author" delimiter="; " suffix=" ">
             <name and="text" initialize-with="." name-as-sort-order="all"/>
           </names>
-          <text variable="title" prefix="" suffix=". "/>
-          <group delimiter=", " prefix="" suffix=". ">
+          <text variable="title" suffix=". "/>
+          <group delimiter=", " suffix=". ">
             <text variable="container-title" font-style="italic" suffix=". "/>
-            <group delimiter="" prefix="" suffix="">
-              <text variable="volume" prefix="" suffix=""/>
+            <group>
+              <text variable="volume"/>
               <text variable="issue" prefix="(" suffix=") "/>
             </group>
-            <text variable="page" prefix="" suffix=""/>
+            <text variable="page"/>
           </group>
           <date variable="issued" prefix="(" suffix="). ">
-            <date-part name="year" form="long" prefix="" suffix=""/>
+            <date-part name="year" form="long"/>
           </date>
         </else>
       </choose>
diff --git a/journal-of-clinical-oncology.csl b/journal-of-clinical-oncology.csl
index 1e67f6a152..2731245d8f 100644
--- a/journal-of-clinical-oncology.csl
+++ b/journal-of-clinical-oncology.csl
@@ -51,7 +51,7 @@
         <group delimiter=" ">
           <group prefix="[" suffix="]" delimiter=" ">
             <text term="cited" text-case="lowercase"/>
-            <date variable="accessed" suffix="">
+            <date variable="accessed">
               <date-part name="year"/>
               <date-part name="month" prefix=" " form="short" strip-periods="true"/>
               <date-part name="day" prefix=" "/>
diff --git a/journal-of-combinatorics.csl b/journal-of-combinatorics.csl
index 4953bd753d..7d413a46a7 100644
--- a/journal-of-combinatorics.csl
+++ b/journal-of-combinatorics.csl
@@ -52,11 +52,11 @@
       <if is-numeric="edition">
         <group delimiter=" ">
           <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short" suffix="" strip-periods="true"/>
+          <text term="edition" form="short" strip-periods="true"/>
         </group>
       </if>
       <else>
-        <text variable="edition" suffix=""/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
diff --git a/journal-of-dental-research.csl b/journal-of-dental-research.csl
index ad5893f445..5285b1a8c4 100644
--- a/journal-of-dental-research.csl
+++ b/journal-of-dental-research.csl
@@ -138,7 +138,7 @@
       <key variable="title"/>
     </sort>
     <layout>
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <date variable="issued" prefix=" " suffix=".">
         <date-part name="year" prefix="(" suffix=")"/>
       </date>
@@ -192,7 +192,7 @@
           </group>
         </else>
       </choose>
-      <text prefix=" " macro="access" suffix=""/>
+      <text prefix=" " macro="access"/>
     </layout>
   </bibliography>
 </style>
diff --git a/journal-of-experimental-botany.csl b/journal-of-experimental-botany.csl
index 671a44c0a1..75f90b797c 100644
--- a/journal-of-experimental-botany.csl
+++ b/journal-of-experimental-botany.csl
@@ -79,7 +79,7 @@
         <text macro="author-short"/>
         <group>
           <date variable="issued" font-style="normal">
-            <date-part name="year" font-style="normal" suffix=""/>
+            <date-part name="year" font-style="normal"/>
           </date>
           <text variable="year-suffix" font-style="italic"/>
         </group>
@@ -114,7 +114,7 @@
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" "/>
           <group prefix=".">
-            <group prefix="" suffix="">
+            <group>
               <group suffix=".">
                 <names variable="editor translator">
                   <name prefix=" In: " suffix="," delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
diff --git a/journal-of-field-ornithology.csl b/journal-of-field-ornithology.csl
index b89a9de64a..b487f3837e 100644
--- a/journal-of-field-ornithology.csl
+++ b/journal-of-field-ornithology.csl
@@ -105,7 +105,7 @@
         </group>
       </if>
       <else>
-        <text prefix="" term="no date" suffix=""/>
+        <text term="no date"/>
       </else>
     </choose>
   </macro>
@@ -144,7 +144,7 @@
         <text variable="page" prefix=": "/>
       </if>
       <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
-        <group prefix=". " delimiter="">
+        <group prefix=". ">
           <text term="in" suffix=" " text-case="capitalize-first"/>
           <text variable="container-title"/>
           <text macro="container-contributors" prefix=" (" suffix="),"/>
diff --git a/journal-of-forensic-sciences.csl b/journal-of-forensic-sciences.csl
index d8b3ef8c60..0a9779b1d2 100644
--- a/journal-of-forensic-sciences.csl
+++ b/journal-of-forensic-sciences.csl
@@ -53,7 +53,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
@@ -131,7 +131,7 @@
             <text variable="container-title"/>
           </group>
           <text macro="publisher" prefix=" "/>
-          <text variable="page" prefix="" suffix="."/>
+          <text variable="page" suffix="."/>
         </else-if>
         <else>
           <text macro="journal-title"/>
diff --git a/journal-of-hearing-science.csl b/journal-of-hearing-science.csl
index 3fe505c34c..b51ff11bd3 100644
--- a/journal-of-hearing-science.csl
+++ b/journal-of-hearing-science.csl
@@ -78,7 +78,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/journal-of-hepatology.csl b/journal-of-hepatology.csl
index 936abfb24f..b2f118fbf1 100644
--- a/journal-of-hepatology.csl
+++ b/journal-of-hepatology.csl
@@ -64,7 +64,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
@@ -153,7 +153,7 @@
             <text macro="accessed-date" prefix=" "/>
           </group>
           <group suffix=". ">
-            <text variable="volume" prefix="" suffix=""/>
+            <text variable="volume"/>
             <text variable="page" prefix=":"/>
           </group>
         </else>
diff --git a/journal-of-hypertension.csl b/journal-of-hypertension.csl
index 03e03437a6..8df36c380f 100644
--- a/journal-of-hypertension.csl
+++ b/journal-of-hypertension.csl
@@ -61,7 +61,7 @@
             <text variable="URL"/>
             <group prefix=" (" suffix=")." delimiter=" ">
               <text term="accessed" text-case="lowercase"/>
-              <date variable="accessed" suffix="">
+              <date variable="accessed">
                 <date-part name="day" prefix=" "/>
                 <date-part name="month" prefix=" " form="short" strip-periods="true"/>
                 <date-part name="year"/>
diff --git a/journal-of-information-technology.csl b/journal-of-information-technology.csl
index 3ed26a691f..86f0e9cc37 100644
--- a/journal-of-information-technology.csl
+++ b/journal-of-information-technology.csl
@@ -33,7 +33,7 @@
       <if type="article-journal chapter paper-conference" match="none">
         <names variable="translator editor" delimiter=", " prefix=" (" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="title" suffix=""/>
+          <label form="short" prefix=", " text-case="title"/>
         </names>
       </if>
     </choose>
@@ -272,7 +272,7 @@
   <macro name="locators">
     <choose>
       <if type="article-journal article-magazine" match="any">
-        <group prefix=" " delimiter="">
+        <group prefix=" ">
           <group>
             <text variable="volume"/>
             <text variable="issue" prefix="(" suffix=")"/>
diff --git a/journal-of-mammalogy.csl b/journal-of-mammalogy.csl
index 9fa9be6b35..e71292e74e 100644
--- a/journal-of-mammalogy.csl
+++ b/journal-of-mammalogy.csl
@@ -105,7 +105,7 @@
         </group>
       </if>
       <else>
-        <text prefix="" term="no date" suffix=""/>
+        <text term="no date"/>
       </else>
     </choose>
   </macro>
diff --git a/journal-of-management.csl b/journal-of-management.csl
index 36f0a8e80e..3d3b20590c 100644
--- a/journal-of-management.csl
+++ b/journal-of-management.csl
@@ -45,7 +45,7 @@
       <if type="chapter paper-conference" match="none">
         <names variable="translator" delimiter=", " prefix=" (" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="capitalize-first" suffix=""/>
+          <label form="short" prefix=", " text-case="capitalize-first"/>
           <substitute>
             <names variable="editor"/>
           </substitute>
diff --git a/journal-of-medical-genetics.csl b/journal-of-medical-genetics.csl
index 45303bd10c..1c791a29de 100644
--- a/journal-of-medical-genetics.csl
+++ b/journal-of-medical-genetics.csl
@@ -54,7 +54,7 @@
             <text variable="URL"/>
             <group prefix=" (" suffix=")." delimiter=" ">
               <text term="accessed" text-case="lowercase"/>
-              <date variable="accessed" suffix="">
+              <date variable="accessed">
                 <date-part name="day" prefix=" "/>
                 <date-part name="month" prefix=" " form="short" strip-periods="true"/>
                 <date-part name="year"/>
diff --git a/journal-of-medical-internet-research.csl b/journal-of-medical-internet-research.csl
index 6309312bf6..0be6f3fe7b 100644
--- a/journal-of-medical-internet-research.csl
+++ b/journal-of-medical-internet-research.csl
@@ -83,7 +83,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
@@ -95,7 +95,7 @@
   <macro name="container-title">
     <choose>
       <if type="article-journal article-magazine chapter paper-conference article-newspaper" match="any">
-        <group suffix="" delimiter=" ">
+        <group delimiter=" ">
           <text variable="container-title" form="short"/>
           <choose>
             <if variable="URL">
diff --git a/journal-of-morphology.csl b/journal-of-morphology.csl
index c7123ef34e..8284e48c32 100644
--- a/journal-of-morphology.csl
+++ b/journal-of-morphology.csl
@@ -179,13 +179,13 @@
         </group>
       </if>
       <else-if type="book" match="any">
-        <group delimiter=", " prefix="">
+        <group delimiter=", ">
           <text macro="publisher"/>
           <text variable="page"/>
         </group>
       </else-if>
       <else-if type="chapter paper-conference" match="any">
-        <group delimiter=". " prefix="">
+        <group delimiter=". ">
           <text macro="event"/>
           <text macro="publisher"/>
           <group>
diff --git a/journal-of-neurophysiology.csl b/journal-of-neurophysiology.csl
index 504e7fd9a8..7536050fe8 100644
--- a/journal-of-neurophysiology.csl
+++ b/journal-of-neurophysiology.csl
@@ -56,7 +56,7 @@
   <macro name="publisher">
     <choose>
       <if variable="URL">
-        <text variable="publisher" suffix=""/>
+        <text variable="publisher"/>
       </if>
       <else>
         <text variable="publisher-place" suffix=": "/>
@@ -89,8 +89,8 @@
                 <text variable="URL"/>
               </group>
               <group prefix="[" suffix="]" delimiter=" ">
-                <date variable="accessed" suffix="">
-                  <date-part name="day" prefix=""/>
+                <date variable="accessed">
+                  <date-part name="day"/>
                   <date-part name="month" prefix=" " suffix=". " form="short" strip-periods="true"/>
                   <date-part name="year"/>
                 </date>
@@ -182,7 +182,7 @@
           <group delimiter=". ">
             <group>
               <text term="in" suffix=": " text-case="capitalize-first"/>
-              <text variable="container-title" suffix="" font-style="italic"/>
+              <text variable="container-title" font-style="italic"/>
               <text macro="editor" prefix=", "/>
             </group>
             <text variable="event"/>
@@ -195,7 +195,7 @@
             <if variable="issue volume" match="any">
               <text variable="container-title" suffix=" " form="short" font-style="italic"/>
               <text variable="volume"/>
-              <text variable="page" prefix=": " suffix=""/>
+              <text variable="page" prefix=": "/>
               <text macro="date" prefix=", " suffix="."/>
             </if>
             <else>
@@ -205,7 +205,7 @@
                   <group prefix="(" suffix=").">
                     <date variable="issued">
                       <date-part name="month" prefix=" " suffix=" "/>
-                      <date-part name="day" prefix="" suffix=", "/>
+                      <date-part name="day" suffix=", "/>
                       <date-part name="year"/>
                     </date>
                   </group>
diff --git a/journal-of-neurosurgery.csl b/journal-of-neurosurgery.csl
index 6b4871f6c9..dab499ec79 100644
--- a/journal-of-neurosurgery.csl
+++ b/journal-of-neurosurgery.csl
@@ -48,7 +48,7 @@
       <if variable="URL">
         <text value="Available:" suffix=" "/>
         <text variable="URL" suffix="."/>
-        <group prefix=" " suffix="">
+        <group prefix=" ">
           <text term="accessed" text-case="capitalize-first" suffix=" "/>
           <date variable="accessed">
             <date-part name="day" suffix=" "/>
diff --git a/journal-of-neurotrauma.csl b/journal-of-neurotrauma.csl
index af6cdf57d3..40445d1a88 100644
--- a/journal-of-neurotrauma.csl
+++ b/journal-of-neurotrauma.csl
@@ -65,7 +65,7 @@
     <choose>
       <if variable="issued">
         <date variable="issued">
-          <date-part name="year" suffix=""/>
+          <date-part name="year"/>
         </date>
       </if>
       <else>
diff --git a/journal-of-oral-and-maxillofacial-surgery.csl b/journal-of-oral-and-maxillofacial-surgery.csl
index fdd63e38a4..45d07f5ae1 100644
--- a/journal-of-oral-and-maxillofacial-surgery.csl
+++ b/journal-of-oral-and-maxillofacial-surgery.csl
@@ -31,7 +31,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
diff --git a/journal-of-orthopaedic-research.csl b/journal-of-orthopaedic-research.csl
index 4417639ae5..346f2fac0e 100644
--- a/journal-of-orthopaedic-research.csl
+++ b/journal-of-orthopaedic-research.csl
@@ -58,7 +58,7 @@
     <choose>
       <if variable="issued">
         <date variable="issued">
-          <date-part name="year" suffix=""/>
+          <date-part name="year"/>
         </date>
       </if>
       <else>
diff --git a/journal-of-orthopaedic-trauma.csl b/journal-of-orthopaedic-trauma.csl
index f458ef4e1b..09922dfef6 100644
--- a/journal-of-orthopaedic-trauma.csl
+++ b/journal-of-orthopaedic-trauma.csl
@@ -59,7 +59,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/journal-of-paleontology.csl b/journal-of-paleontology.csl
index 087208ab0a..d8acc0ca6a 100644
--- a/journal-of-paleontology.csl
+++ b/journal-of-paleontology.csl
@@ -194,7 +194,7 @@
           <else-if type="webpage" match="any">
             <group delimiter=". ">
               <text variable="title"/>
-              <text variable="container-title" form="short" suffix=""/>
+              <text variable="container-title" form="short"/>
               <text variable="URL" prefix="Available at "/>
               <date variable="accessed" prefix="Accessed ">
                 <date-part name="month" suffix=" "/>
diff --git a/journal-of-perinatal-medicine.csl b/journal-of-perinatal-medicine.csl
index 39dfc5466a..41ec8bd37f 100644
--- a/journal-of-perinatal-medicine.csl
+++ b/journal-of-perinatal-medicine.csl
@@ -28,16 +28,16 @@
     </names>
   </macro>
   <macro name="editor">
-    <names variable="editor" suffix="">
+    <names variable="editor">
       <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
       <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
     </names>
   </macro>
   <macro name="publisher">
     <group delimiter=", ">
-      <text variable="publisher-place" suffix=""/>
+      <text variable="publisher-place"/>
       <text variable="publisher"/>
-      <group suffix="">
+      <group>
         <date variable="issued">
           <date-part name="year"/>
         </date>
@@ -65,7 +65,7 @@
       <else-if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
@@ -133,11 +133,11 @@
     <layout>
       <text variable="citation-number" suffix=". "/>
       <text macro="author"/>
-      <text macro="title" suffix=""/>
+      <text macro="title"/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group prefix=". " delimiter=" " suffix=".">
-            <text macro="edition" prefix="" suffix=" "/>
+            <text macro="edition" suffix=" "/>
             <text macro="publisher" prefix=" "/>
           </group>
         </if>
@@ -149,7 +149,7 @@
             <text macro="edition" prefix=", "/>
           </group>
           <group delimiter=", " suffix=".">
-            <text macro="publisher" prefix=""/>
+            <text macro="publisher"/>
             <group delimiter=" ">
               <label variable="page" form="short" strip-periods="true"/>
               <text variable="page"/>
diff --git a/journal-of-pollination-ecology.csl b/journal-of-pollination-ecology.csl
index ec248df65a..79b3dd793b 100644
--- a/journal-of-pollination-ecology.csl
+++ b/journal-of-pollination-ecology.csl
@@ -70,7 +70,7 @@
       <if variable="URL">
         <text variable="URL"/>
         <group prefix=" (" suffix=").">
-          <text term="accessed" text-case="lowercase" prefix="" suffix=" "/>
+          <text term="accessed" text-case="lowercase" suffix=" "/>
           <date variable="accessed">
             <date-part name="day" suffix=" "/>
             <date-part name="month" suffix=" "/>
@@ -103,7 +103,7 @@
       <key variable="issued"/>
     </sort>
     <layout>
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <date variable="issued" prefix=" (" suffix=")">
         <date-part name="year"/>
       </date>
diff --git a/journal-of-psychiatric-and-mental-health-nursing.csl b/journal-of-psychiatric-and-mental-health-nursing.csl
index 1bc028c878..123edc454f 100644
--- a/journal-of-psychiatric-and-mental-health-nursing.csl
+++ b/journal-of-psychiatric-and-mental-health-nursing.csl
@@ -300,7 +300,7 @@
         </group>
       </else-if>
       <else-if type="book graphic motion_picture report song chapter paper-conference" match="any">
-        <group prefix=", " suffix="" delimiter=", ">
+        <group prefix=", " delimiter=", ">
           <text macro="edition"/>
           <group>
             <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
diff --git a/journal-of-psychiatry-and-neuroscience.csl b/journal-of-psychiatry-and-neuroscience.csl
index a7729bf6ca..c264869358 100644
--- a/journal-of-psychiatry-and-neuroscience.csl
+++ b/journal-of-psychiatry-and-neuroscience.csl
@@ -84,7 +84,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/journal-of-shoulder-and-elbow-surgery.csl b/journal-of-shoulder-and-elbow-surgery.csl
index 40fed74c0f..27f65d0466 100644
--- a/journal-of-shoulder-and-elbow-surgery.csl
+++ b/journal-of-shoulder-and-elbow-surgery.csl
@@ -59,7 +59,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/journal-of-social-archaeology.csl b/journal-of-social-archaeology.csl
index f9bedf3ba5..9755971e17 100644
--- a/journal-of-social-archaeology.csl
+++ b/journal-of-social-archaeology.csl
@@ -210,7 +210,7 @@
             <group prefix=" ">
               <text variable="volume"/>
             </group>
-            <group prefix="">
+            <group>
               <label variable="locator" suffix="." form="short" strip-periods="true"/>
               <text variable="page" prefix=": "/>
             </group>
diff --git a/journal-of-the-academy-of-nutrition-and-dietetics.csl b/journal-of-the-academy-of-nutrition-and-dietetics.csl
index 230071b0d5..f62a3c132d 100644
--- a/journal-of-the-academy-of-nutrition-and-dietetics.csl
+++ b/journal-of-the-academy-of-nutrition-and-dietetics.csl
@@ -30,7 +30,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -117,8 +117,8 @@
   </citation>
   <bibliography hanging-indent="false">
     <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
-      <text macro="author" suffix=""/>
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group suffix=".">
@@ -126,7 +126,7 @@
             <text macro="edition" prefix=" "/>
             <text macro="editor" prefix=" (" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
           <group suffix="." prefix="; ">
             <date variable="issued">
               <date-part name="year"/>
diff --git a/journal-of-the-american-association-of-laboratory-animal-science.csl b/journal-of-the-american-association-of-laboratory-animal-science.csl
index e7739d3d56..ba9eb2ce48 100644
--- a/journal-of-the-american-association-of-laboratory-animal-science.csl
+++ b/journal-of-the-american-association-of-laboratory-animal-science.csl
@@ -31,7 +31,7 @@
     <group suffix="." font-weight="bold">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -130,8 +130,8 @@
       <key macro="issued-short"/>
     </sort>
     <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
-      <text macro="author" suffix=""/>
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
           <group prefix=" " suffix="." delimiter=" ">
@@ -139,7 +139,7 @@
             <text macro="edition"/>
             <text macro="editor" prefix="(" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
           <group suffix="." prefix="; " delimiter=" ">
             <date variable="issued">
               <date-part name="year"/>
diff --git a/journal-of-the-american-college-of-cardiology.csl b/journal-of-the-american-college-of-cardiology.csl
index ccaa69d1c6..65eb27016e 100644
--- a/journal-of-the-american-college-of-cardiology.csl
+++ b/journal-of-the-american-college-of-cardiology.csl
@@ -35,7 +35,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -58,7 +58,7 @@
       <if variable="URL">
         <text value="Available at:" suffix=" "/>
         <text variable="URL" suffix="."/>
-        <group prefix=" " suffix="">
+        <group prefix=" ">
           <text term="accessed" text-case="capitalize-first" suffix=" "/>
           <date variable="accessed">
             <date-part name="month" suffix=" "/>
@@ -122,8 +122,8 @@
   </citation>
   <bibliography hanging-indent="false" et-al-min="7" et-al-use-first="3">
     <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
-      <text macro="author" suffix=""/>
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group suffix=".">
@@ -131,7 +131,7 @@
             <text macro="edition" prefix=" "/>
             <text macro="editor" prefix=" (" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
           <group suffix="." prefix="; ">
             <date variable="issued">
               <date-part name="year"/>
@@ -165,7 +165,7 @@
             <text macro="editor" prefix=" "/>
           </group>
           <group prefix=" " suffix=".">
-            <text variable="container-title" form="short" suffix=""/>
+            <text variable="container-title" form="short"/>
             <group delimiter=";" prefix=" ">
               <date variable="issued">
                 <date-part name="year"/>
diff --git a/journal-of-the-american-society-of-nephrology.csl b/journal-of-the-american-society-of-nephrology.csl
index 058da3e50b..af3127e009 100644
--- a/journal-of-the-american-society-of-nephrology.csl
+++ b/journal-of-the-american-society-of-nephrology.csl
@@ -58,7 +58,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
@@ -143,7 +143,7 @@
               <label variable="page" form="short" strip-periods="true"/>
               <text variable="page"/>
             </group>
-            <group delimiter="">
+            <group>
               <date variable="issued">
                 <date-part name="year"/>
               </date>
diff --git a/journal-of-the-american-water-resources-association.csl b/journal-of-the-american-water-resources-association.csl
index 6e414c5722..d32ee2f774 100644
--- a/journal-of-the-american-water-resources-association.csl
+++ b/journal-of-the-american-water-resources-association.csl
@@ -115,7 +115,7 @@
             <text macro="title" prefix=" "/>
             <text macro="editor-translator" prefix=" "/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
         </if>
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" "/>
@@ -126,10 +126,10 @@
                 <text variable="container-title" prefix=" " text-case="title"/>
                 <text variable="collection-title"/>
               </group>
-              <group suffix="">
+              <group>
                 <text macro="publisher" prefix=" "/>
                 <label variable="page" form="short" prefix=", " suffix=". " strip-periods="true"/>
-                <text variable="page" suffix=""/>
+                <text variable="page"/>
               </group>
             </group>
           </group>
diff --git a/journal-of-the-electrochemical-society.csl b/journal-of-the-electrochemical-society.csl
index e6284c5697..55a2e14277 100644
--- a/journal-of-the-electrochemical-society.csl
+++ b/journal-of-the-electrochemical-society.csl
@@ -22,7 +22,7 @@
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="editor">
-    <names variable="editor" prefix="" suffix="" delimiter=", ">
+    <names variable="editor" delimiter=", ">
       <name initialize-with=". " delimiter=", " and="text"/>
       <label form="long" prefix=", " text-case="capitalize-first"/>
     </names>
@@ -102,7 +102,7 @@
             <text macro="title" prefix=" "/>
             <text macro="editor" prefix=" "/>
           </group>
-          <group prefix=", " suffix="" delimiter=", ">
+          <group prefix=", " delimiter=", ">
             <text macro="edition"/>
             <text variable="number-of-pages" prefix="p. "/>
             <text macro="publisher"/>
diff --git a/journal-of-the-royal-anthropological-institute.csl b/journal-of-the-royal-anthropological-institute.csl
index 64434ace21..d71620a531 100644
--- a/journal-of-the-royal-anthropological-institute.csl
+++ b/journal-of-the-royal-anthropological-institute.csl
@@ -183,7 +183,7 @@
   <macro name="locators">
     <group prefix=". " delimiter=" ">
       <text variable="container-title" font-style="italic"/>
-      <group delimiter=", " suffix="">
+      <group delimiter=", ">
         <text variable="volume" font-weight="bold"/>
         <text variable="page"/>
       </group>
diff --git a/journal-of-thrombosis-and-haemostasis.csl b/journal-of-thrombosis-and-haemostasis.csl
index b494c26866..0253c25f15 100644
--- a/journal-of-thrombosis-and-haemostasis.csl
+++ b/journal-of-thrombosis-and-haemostasis.csl
@@ -83,7 +83,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/journal-of-vertebrate-paleontology.csl b/journal-of-vertebrate-paleontology.csl
index 722477537a..fccc46501b 100644
--- a/journal-of-vertebrate-paleontology.csl
+++ b/journal-of-vertebrate-paleontology.csl
@@ -161,7 +161,7 @@
           <else-if type="webpage" match="any">
             <group delimiter=". ">
               <text variable="title"/>
-              <text variable="container-title" form="short" suffix=""/>
+              <text variable="container-title" form="short"/>
               <text variable="URL" prefix="Available at "/>
               <date variable="accessed" prefix="Accessed ">
                 <date-part name="month" suffix=" "/>
@@ -173,7 +173,7 @@
           </else-if>
           <else>
             <text variable="title" suffix=". "/>
-            <text variable="container-title" form="long" text-case="title" suffix=""/>
+            <text variable="container-title" form="long" text-case="title"/>
             <group delimiter=":">
               <text variable="volume" prefix=" "/>
               <text variable="page"/>
diff --git a/journalistica.csl b/journalistica.csl
index 6ca556cd83..7cf15232c5 100644
--- a/journalistica.csl
+++ b/journalistica.csl
@@ -179,13 +179,13 @@
     </sort>
     <layout suffix=".">
       <group delimiter=" ">
-        <text macro="author" suffix=""/>
+        <text macro="author"/>
       </group>
       <choose>
         <if type="article-newspaper article-magazine" match="any">
           <group delimiter=" ">
             <text macro="year-date" prefix=" (" suffix=")."/>
-            <text macro="title" prefix="" suffix=","/>
+            <text macro="title" suffix=","/>
           </group>
           <group prefix=" " delimiter=", ">
             <text variable="container-title" font-style="italic"/>
@@ -197,7 +197,7 @@
         <else-if type="article-journal">
           <group delimiter=" ">
             <text macro="year-date" prefix=" (" suffix=")."/>
-            <text macro="title" prefix="" suffix=","/>
+            <text macro="title" suffix=","/>
           </group>
           <group prefix=" " delimiter=" ">
             <text variable="container-title" suffix="," font-style="italic"/>
@@ -228,7 +228,7 @@
         <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group delimiter=" ">
             <text macro="year-date" prefix=" (" suffix=")."/>
-            <text macro="title" prefix="" suffix="," font-style="italic"/>
+            <text macro="title" suffix="," font-style="italic"/>
             <text macro="edition"/>
             <text macro="editor" suffix="."/>
             <text macro="publisher"/>
@@ -237,7 +237,7 @@
         <else-if type="chapter paper-conference" match="any">
           <group delimiter=" ">
             <text macro="year-date" prefix=" (" suffix=")."/>
-            <text macro="title" prefix="" suffix=","/>
+            <text macro="title" suffix=","/>
             <group delimiter=", " suffix=",">
               <group delimiter=" ">
                 <text macro="pages"/>
diff --git a/juristische-zitierweise.csl b/juristische-zitierweise.csl
index 85c43cac15..edd6c70754 100644
--- a/juristische-zitierweise.csl
+++ b/juristische-zitierweise.csl
@@ -20,14 +20,14 @@
     <layout>
       <choose>
         <if type="article-journal">
-          <names variable="author" prefix="" font-style="italic">
+          <names variable="author" font-style="italic">
             <name delimiter="/" name-as-sort-order="all" sort-separator=", " form="short"/>
           </names>
           <text variable="container-title" prefix=", " suffix=" " form="short"/>
-          <date variable="issued" prefix="" suffix=", ">
-            <date-part name="year" form="long" prefix="" suffix=""/>
-            <date-part name="month" form="numeric" prefix="" suffix=""/>
-            <date-part name="day" form="ordinal" prefix="" suffix=""/>
+          <date variable="issued" suffix=", ">
+            <date-part name="year" form="long"/>
+            <date-part name="month" form="numeric"/>
+            <date-part name="day" form="ordinal"/>
           </date>
           <text variable="locator" suffix="."/>
         </if>
@@ -39,7 +39,7 @@
           <text variable="locator" prefix="S. " suffix=". "/>
         </else-if>
         <else-if type="chapter">
-          <names variable="author" prefix="" suffix=" " font-style="italic">
+          <names variable="author" suffix=" " font-style="italic">
             <name delimiter="; " name-as-sort-order="all" sort-separator=", " form="short"/>
           </names>
           <names variable="editor" prefix=", in: " suffix=" ">
@@ -49,13 +49,13 @@
           <text variable="locator" prefix="S." suffix=". "/>
         </else-if>
         <else-if type="entry-encyclopedia">
-          <text value="Bearbeiter," prefix="" suffix=" " font-style="italic"/>
-          <text value="in: " prefix="" suffix=""/>
-          <text variable="title" prefix="" suffix=", " form="short"/>
+          <text value="Bearbeiter," suffix=" " font-style="italic"/>
+          <text value="in: "/>
+          <text variable="title" suffix=", " form="short"/>
           <text variable="locator" suffix=". "/>
         </else-if>
         <else>
-          <names variable="author" prefix="" font-style="italic">
+          <names variable="author" font-style="italic">
             <name delimiter="; " name-as-sort-order="all" sort-separator=", " form="short"/>
           </names>
           <text variable="title" prefix=", " suffix=",  "/>
@@ -68,69 +68,69 @@
     <layout>
       <choose>
         <if type="article-journal">
-          <names variable="author" prefix="" suffix=" " font-style="italic">
+          <names variable="author" suffix=" " font-style="italic">
             <name delimiter="/ " name-as-sort-order="all" sort-separator=", " form="long"/>
           </names>
           <text variable="title" prefix=", " suffix=", "/>
-          <text variable="container-title" prefix="" suffix=" "/>
-          <date variable="issued" prefix="" suffix=", ">
-            <date-part name="year" form="long" prefix="" suffix=""/>
-            <date-part name="month" form="numeric" prefix="" suffix=""/>
-            <date-part name="day" form="ordinal" prefix="" suffix=""/>
+          <text variable="container-title" suffix=" "/>
+          <date variable="issued" suffix=", ">
+            <date-part name="year" form="long"/>
+            <date-part name="month" form="numeric"/>
+            <date-part name="day" form="ordinal"/>
           </date>
           <text variable="page" suffix="."/>
         </if>
         <else-if type="book">
-          <names variable="author" prefix="" font-style="italic">
+          <names variable="author" font-style="italic">
             <name delimiter="/" name-as-sort-order="all" sort-separator=", " form="long"/>
           </names>
           <text variable="title" prefix=", " suffix=", "/>
-          <text variable="edition" prefix="" suffix=" "/>
-          <text variable="publisher-place" prefix="" suffix=" "/>
-          <date variable="issued" prefix="" suffix=". ">
-            <date-part name="year" form="long" prefix="" suffix=""/>
+          <text variable="edition" suffix=" "/>
+          <text variable="publisher-place" suffix=" "/>
+          <date variable="issued" suffix=". ">
+            <date-part name="year" form="long"/>
           </date>
         </else-if>
         <else-if type="chapter">
-          <names variable="editor" prefix="" suffix=" " font-style="italic">
+          <names variable="editor" suffix=" " font-style="italic">
             <name delimiter="/" name-as-sort-order="all" sort-separator=", " form="long"/>
           </names>
-          <text value=" (Hrsg.)" prefix="" suffix=" "/>
+          <text value=" (Hrsg.)" suffix=" "/>
           <text variable="container-title" prefix=", " suffix=", "/>
-          <text variable="edition" prefix="" suffix=" "/>
-          <text variable="publisher-place" prefix="" suffix=" "/>
-          <date variable="issued" prefix="" suffix=". ">
-            <date-part name="year" form="long" prefix="" suffix=""/>
+          <text variable="edition" suffix=" "/>
+          <text variable="publisher-place" suffix=" "/>
+          <date variable="issued" suffix=". ">
+            <date-part name="year" form="long"/>
           </date>
           <text variable="page" suffix="."/>
         </else-if>
         <else-if type="thesis">
-          <names variable="author" prefix="" font-style="italic">
+          <names variable="author" font-style="italic">
             <name delimiter="/" name-as-sort-order="all" sort-separator=", " form="long"/>
           </names>
           <text variable="title" prefix=", " suffix=", Diss. jur., "/>
-          <text variable="publisher-place" prefix="" suffix=" "/>
-          <date variable="issued" prefix="" suffix=". ">
-            <date-part name="year" form="long" prefix="" suffix=""/>
+          <text variable="publisher-place" suffix=" "/>
+          <date variable="issued" suffix=". ">
+            <date-part name="year" form="long"/>
           </date>
         </else-if>
         <else-if type="entry-encyclopedia">
-          <names variable="author" prefix="" suffix="" font-style="italic">
+          <names variable="author" font-style="italic">
             <name delimiter="/" name-as-sort-order="all" sort-separator=", " form="long"/>
           </names>
           <text variable="title" prefix=", " suffix=", "/>
-          <text variable="edition" prefix="" suffix=" "/>
-          <text variable="publisher-place" prefix="" suffix=" "/>
-          <date variable="issued" prefix="" suffix=" (Zit.:  ">
-            <date-part name="year" form="long" prefix="" suffix=""/>
+          <text variable="edition" suffix=" "/>
+          <text variable="publisher-place" suffix=" "/>
+          <date variable="issued" suffix=" (Zit.:  ">
+            <date-part name="year" form="long"/>
           </date>
-          <names variable="editor" prefix="" suffix="/">
+          <names variable="editor" suffix="/">
             <name delimiter="; " form="long" initialize-with=""/>
           </names>
-          <text value="Bearbeiter," prefix="" suffix=" " font-style="italic"/>
-          <text value="in: " prefix="" suffix=" "/>
-          <text variable="title" prefix="" suffix="" form="short"/>
-          <text value=")." prefix="" suffix=" "/>
+          <text value="Bearbeiter," suffix=" " font-style="italic"/>
+          <text value="in: " suffix=" "/>
+          <text variable="title" form="short"/>
+          <text value=")." suffix=" "/>
         </else-if>
       </choose>
     </layout>
diff --git a/karger-journals-author-date.csl b/karger-journals-author-date.csl
index e51b3df2b2..bbb5aa5354 100644
--- a/karger-journals-author-date.csl
+++ b/karger-journals-author-date.csl
@@ -40,7 +40,7 @@
     </names>
   </macro>
   <macro name="editor">
-    <names variable="editor" suffix="">
+    <names variable="editor">
       <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
       <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
     </names>
@@ -52,9 +52,9 @@
   </macro>
   <macro name="publisher">
     <group delimiter=", ">
-      <text variable="publisher-place" suffix=""/>
+      <text variable="publisher-place"/>
       <text variable="publisher"/>
-      <group suffix="">
+      <group>
         <date variable="issued">
           <date-part name="year"/>
         </date>
@@ -82,7 +82,7 @@
       <else-if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
@@ -145,11 +145,11 @@
   <bibliography et-al-min="7" et-al-use-first="6" hanging-indent="true">
     <layout>
       <text macro="author"/>
-      <text macro="title" suffix=""/>
+      <text macro="title"/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group prefix=". " delimiter=" " suffix=".">
-            <text macro="edition" prefix="" suffix=" "/>
+            <text macro="edition" suffix=" "/>
             <text macro="publisher" prefix=" "/>
           </group>
         </if>
@@ -161,7 +161,7 @@
             <text macro="edition" prefix=", "/>
           </group>
           <group delimiter=", " suffix=".">
-            <text macro="publisher" prefix=""/>
+            <text macro="publisher"/>
             <group delimiter=" ">
               <label variable="page" form="short" strip-periods="true"/>
               <text variable="page"/>
diff --git a/karger-journals.csl b/karger-journals.csl
index 493fb180b4..d9d278445a 100644
--- a/karger-journals.csl
+++ b/karger-journals.csl
@@ -32,16 +32,16 @@
     </names>
   </macro>
   <macro name="editor">
-    <names variable="editor" suffix="">
+    <names variable="editor">
       <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
       <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
     </names>
   </macro>
   <macro name="publisher">
     <group delimiter=", ">
-      <text variable="publisher-place" suffix=""/>
+      <text variable="publisher-place"/>
       <text variable="publisher"/>
-      <group suffix="">
+      <group>
         <date variable="issued">
           <date-part name="year"/>
         </date>
@@ -69,7 +69,7 @@
       <else-if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
@@ -132,11 +132,11 @@
     <layout>
       <text variable="citation-number" suffix=". "/>
       <text macro="author"/>
-      <text macro="title" suffix=""/>
+      <text macro="title"/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group prefix=". " delimiter=" " suffix=".">
-            <text macro="edition" prefix="" suffix=" "/>
+            <text macro="edition" suffix=" "/>
             <text macro="publisher" prefix=" "/>
           </group>
         </if>
@@ -148,7 +148,7 @@
             <text macro="edition" prefix=", "/>
           </group>
           <group delimiter=", " suffix=".">
-            <text macro="publisher" prefix=""/>
+            <text macro="publisher"/>
             <group delimiter=" ">
               <label variable="page" form="short" strip-periods="true"/>
               <text variable="page"/>
diff --git a/kidney-international.csl b/kidney-international.csl
index 97063b029a..b8454d282b 100644
--- a/kidney-international.csl
+++ b/kidney-international.csl
@@ -34,7 +34,7 @@
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
         <et-al font-style="italic"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -181,7 +181,7 @@
         <else>
           <text macro="editor" prefix=" " suffix="."/>
           <group prefix=" " suffix=".">
-            <text variable="container-title" font-style="italic" form="short" suffix=""/>
+            <text variable="container-title" font-style="italic" form="short"/>
             <group delimiter=";" prefix=" ">
               <date variable="issued">
                 <date-part name="year"/>
diff --git a/kindheit-und-entwicklung.csl b/kindheit-und-entwicklung.csl
index 6867c7b8f9..6a56f537a8 100644
--- a/kindheit-und-entwicklung.csl
+++ b/kindheit-und-entwicklung.csl
@@ -45,7 +45,7 @@
       <if type="chapter paper-conference" match="none">
         <names variable="translator editor" delimiter=", " prefix=" (" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
-          <label form="short" prefix=", " text-case="title" suffix=""/>
+          <label form="short" prefix=", " text-case="title"/>
         </names>
       </if>
     </choose>
diff --git a/knee-surgery-sports-traumatology-arthroscopy.csl b/knee-surgery-sports-traumatology-arthroscopy.csl
index 5546a20bdb..b02d2cabad 100644
--- a/knee-surgery-sports-traumatology-arthroscopy.csl
+++ b/knee-surgery-sports-traumatology-arthroscopy.csl
@@ -58,7 +58,7 @@
         <text term="in" text-case="capitalize-first" prefix=" " suffix=" "/>
       </if>
     </choose>
-    <names variable="editor" delimiter=", " prefix=" " suffix="">
+    <names variable="editor" delimiter=", " prefix=" ">
       <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
       <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
     </names>
@@ -119,7 +119,7 @@
     </sort>
     <layout>
       <text variable="citation-number" suffix=". "/>
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <text macro="issued"/>
       <text variable="title" prefix=" " suffix="."/>
       <text macro="container-contributors"/>
diff --git a/landes-bioscience-journals.csl b/landes-bioscience-journals.csl
index a627b21a17..9ad29bbcbb 100644
--- a/landes-bioscience-journals.csl
+++ b/landes-bioscience-journals.csl
@@ -52,7 +52,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/le-mouvement-social.csl b/le-mouvement-social.csl
index c4bbd51978..5d79cecd69 100644
--- a/le-mouvement-social.csl
+++ b/le-mouvement-social.csl
@@ -79,7 +79,7 @@
         </group>
       </else-if>
       <else-if type="thesis" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" font-style="italic" suffix=","/>
           <text variable="genre" suffix=", " prefix=" "/>
           <text variable="publisher"/>
@@ -92,7 +92,7 @@
         </group>
       </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter="">
+        <group>
           <group suffix=", ">
             <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
           </group>
@@ -101,7 +101,7 @@
         </group>
       </else-if>
       <else-if type="webpage" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" font-style="italic" suffix=", "/>
           <text variable="URL" text-decoration="underline"/>
         </group>
@@ -200,7 +200,7 @@
       <else-if type="webpage" match="any">
         <group delimiter=" " font-style="normal">
           <text value="consulté le" suffix=" " prefix=" "/>
-          <date variable="accessed" form="text" suffix="">
+          <date variable="accessed" form="text">
             <date-part name="day"/>
             <date-part name="month"/>
             <date-part name="year"/>
@@ -225,7 +225,7 @@
         </choose>
       </if>
       <else-if type="article-journal article-magazine" match="any">
-        <group delimiter="" font-style="normal">
+        <group font-style="normal">
           <date variable="issued">
             <date-part name="month" suffix=" "/>
             <date-part name="year"/>
@@ -235,7 +235,7 @@
     </choose>
   </macro>
   <citation>
-    <layout prefix="" suffix="." delimiter="&#160;; ">
+    <layout suffix="." delimiter="&#160;; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
@@ -280,7 +280,7 @@
       <key macro="author" names-min="3" names-use-first="3"/>
       <key variable="issued" sort="descending"/>
     </sort>
-    <layout prefix="" suffix=".">
+    <layout suffix=".">
       <group delimiter=", ">
         <text macro="author"/>
         <text macro="title"/>
diff --git a/les-journees-de-la-recherche-avicole.csl b/les-journees-de-la-recherche-avicole.csl
index 9240e8f3a2..98a08f5160 100644
--- a/les-journees-de-la-recherche-avicole.csl
+++ b/les-journees-de-la-recherche-avicole.csl
@@ -123,7 +123,7 @@
       <group delimiter=", ">
         <group delimiter=" ">
           <text macro="author-short" suffix=","/>
-          <text macro="year-date" prefix=""/>
+          <text macro="year-date"/>
         </group>
         <group>
           <label variable="locator" suffix="." form="short" strip-periods="true"/>
@@ -158,8 +158,8 @@
             <text variable="container-title" font-style="normal" suffix=","/>
             <text variable="collection-title" suffix="."/>
             <group suffix="." delimiter=", ">
-              <text variable="publisher-place" prefix=""/>
-              <text macro="edition" suffix=""/>
+              <text variable="publisher-place"/>
+              <text macro="edition"/>
               <text variable="page" suffix="." prefix="pp"/>
             </group>
           </group>
diff --git a/les-journees-de-la-recherche-porcine.csl b/les-journees-de-la-recherche-porcine.csl
index fbc49498df..e8cc4a25e4 100644
--- a/les-journees-de-la-recherche-porcine.csl
+++ b/les-journees-de-la-recherche-porcine.csl
@@ -124,7 +124,7 @@
       <group delimiter=", ">
         <group delimiter=" ">
           <text macro="author-short" suffix=","/>
-          <text macro="year-date" prefix=""/>
+          <text macro="year-date"/>
         </group>
         <group>
           <label variable="locator" suffix="." form="short" strip-periods="true"/>
@@ -162,8 +162,8 @@
             <text variable="page" suffix="."/>
             <text variable="collection-title" suffix="."/>
             <group suffix="." delimiter=", ">
-              <text variable="publisher-place" prefix=""/>
-              <text macro="edition" suffix=""/>
+              <text variable="publisher-place"/>
+              <text macro="edition"/>
             </group>
           </group>
         </else-if>
diff --git a/lethaia.csl b/lethaia.csl
index 9f825fb267..8e6915a2bb 100644
--- a/lethaia.csl
+++ b/lethaia.csl
@@ -199,7 +199,7 @@
             </group>
           </else-if>
           <else-if type="webpage" match="any">
-            <group delimiter="">
+            <group>
               <text variable="title" font-style="italic" suffix=". "/>
               <text variable="container-title" form="long" suffix=". "/>
               <text variable="URL" prefix="Downloaded from " suffix=" "/>
@@ -214,7 +214,7 @@
           <else>
             <text variable="title" suffix=". "/>
             <group delimiter=", ">
-              <group font-style="italic" delimiter="">
+              <group font-style="italic">
                 <text variable="container-title" form="long" text-case="capitalize-first"/>
                 <text variable="volume" prefix=" "/>
               </group>
diff --git a/lettres-et-sciences-humaines-fr.csl b/lettres-et-sciences-humaines-fr.csl
index c44d9bb684..078ce51a24 100644
--- a/lettres-et-sciences-humaines-fr.csl
+++ b/lettres-et-sciences-humaines-fr.csl
@@ -396,7 +396,7 @@
   <macro name="access">
     <group>
       <text term="accessed" text-case="capitalize-first"/>
-      <date variable="accessed" suffix="">
+      <date variable="accessed">
         <date-part name="day" suffix=" "/>
         <date-part name="month" suffix=" "/>
         <date-part name="year"/>
diff --git a/leviathan.csl b/leviathan.csl
index 6e74028795..5b0a38107b 100644
--- a/leviathan.csl
+++ b/leviathan.csl
@@ -217,7 +217,7 @@ a) mit Name "collection-editor" (in jedem Fall)
           <if variable="author" match="all">
             <names variable="editor translator" delimiter=", ">
               <!-- Bezeichnung in Kurzform ("hg. v.", "uebers. v."). -->
-              <label form="verb-short" prefix="" text-case="lowercase" suffix=". " strip-periods="true"/>
+              <label form="verb-short" text-case="lowercase" suffix=". " strip-periods="true"/>
               <!-- Mehrere Herausgeber und/oder Uebersetzer durch Komma getrennt,
 	  der letztgenannte durch "und" abgetrennt. -->
               <name and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
@@ -284,7 +284,7 @@ a) mit Name "collection-editor" (in jedem Fall)
           <if variable="container-author" match="all">
             <names variable="editor">
               <!-- Bezeichnung in Kurzform ("hg. v."). -->
-              <label form="verb-short" prefix="" text-case="lowercase" suffix=". " strip-periods="true"/>
+              <label form="verb-short" text-case="lowercase" suffix=". " strip-periods="true"/>
               <!-- Mehrere Herausgeber durch Komma getrennt, der letztgenannte
 	       durch "und" abgetrennt. -->
               <name and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
diff --git a/limnology-and-oceanography.csl b/limnology-and-oceanography.csl
index 66e8c043c3..aff79953dc 100644
--- a/limnology-and-oceanography.csl
+++ b/limnology-and-oceanography.csl
@@ -161,7 +161,7 @@
               <group delimiter=". " suffix=".">
                 <text variable="container-title" font-style="italic"/>
                 <text variable="event" prefix="Proceedings of the "/>
-                <text variable="publisher" prefix=""/>
+                <text variable="publisher"/>
                 <text variable="page"/>
               </group>
             </group>
@@ -173,7 +173,7 @@
               <text term="in" text-case="capitalize-first" font-style="italic"/>
               <group delimiter=". ">
                 <group delimiter=", ">
-                  <text macro="editor" prefix="" suffix=""/>
+                  <text macro="editor"/>
                   <text variable="container-title"/>
                 </group>
                 <text macro="publisher"/>
@@ -196,7 +196,7 @@
                 </group>
               </if>
               <else>
-                <group prefix=" " suffix="" delimiter=" ">
+                <group prefix=" " delimiter=" ">
                   <text variable="container-title" form="short"/>
                   <choose>
                     <!--we use DOIs only for articles w/o page numbers conforming to published articles. 
diff --git a/liver-international.csl b/liver-international.csl
index af2cbac6e7..12b6d2e3c4 100644
--- a/liver-international.csl
+++ b/liver-international.csl
@@ -60,7 +60,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
@@ -149,7 +149,7 @@
             <text macro="accessed-date" prefix=" "/>
           </group>
           <group suffix=". ">
-            <text variable="volume" prefix="" suffix=""/>
+            <text variable="volume"/>
             <text variable="page" prefix=":" suffix="."/>
           </group>
         </else>
diff --git a/magnetic-resonance-in-medicine.csl b/magnetic-resonance-in-medicine.csl
index 3dda88b5d0..1c262a1f8e 100644
--- a/magnetic-resonance-in-medicine.csl
+++ b/magnetic-resonance-in-medicine.csl
@@ -31,7 +31,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -115,8 +115,8 @@
   </citation>
   <bibliography hanging-indent="false" et-al-min="11" et-al-use-first="3">
     <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
-      <text macro="author" suffix=""/>
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
           <group prefix=" " suffix="." delimiter=" ">
@@ -124,7 +124,7 @@
             <text macro="edition"/>
             <text macro="editor" prefix="(" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
           <group suffix="." prefix="; " delimiter=" ">
             <date variable="issued">
               <date-part name="year"/>
diff --git a/mammal-review.csl b/mammal-review.csl
index 4bb87addbd..7200ebe8cf 100644
--- a/mammal-review.csl
+++ b/mammal-review.csl
@@ -119,15 +119,15 @@
       <key variable="issued"/>
     </sort>
     <layout>
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <date variable="issued" prefix=" (" suffix=")">
         <date-part name="year"/>
       </date>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group suffix="">
+          <group>
             <text macro="title" prefix=" "/>
-            <text macro="edition" prefix=""/>
+            <text macro="edition"/>
           </group>
           <text prefix=" " suffix=" " macro="publisher"/>
         </if>
@@ -139,7 +139,7 @@
               <label form="short" prefix="(" suffix=")" strip-periods="true"/>
             </names>
           </group>
-          <group prefix="" suffix="">
+          <group>
             <text variable="container-title" font-style="italic" prefix=" " suffix=","/>
             <text variable="collection-title" prefix=" " suffix="."/>
             <group suffix=".">
diff --git a/mcrj7.csl b/mcrj7.csl
index 3d390d36ce..ccf6e6990e 100644
--- a/mcrj7.csl
+++ b/mcrj7.csl
@@ -58,12 +58,12 @@
   <macro name="editor-note">
     <names variable="editor">
       <name and="text" sort-separator=", " delimiter=", "/>
-      <label form="short" prefix=", " suffix="" strip-periods="true"/>
+      <label form="short" prefix=", " strip-periods="true"/>
     </names>
   </macro>
   <macro name="translator-note">
     <names variable="translator">
-      <label form="verb-short" prefix="" suffix=" " strip-periods="true"/>
+      <label form="verb-short" suffix=" " strip-periods="true"/>
       <name and="text" sort-separator=", " delimiter=", "/>
     </names>
   </macro>
@@ -92,12 +92,12 @@
   <macro name="editor">
     <names variable="editor">
       <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " suffix="" strip-periods="true"/>
+      <label form="short" prefix=", " strip-periods="true"/>
     </names>
   </macro>
   <macro name="translator">
     <names variable="translator">
-      <label form="verb-short" prefix="" suffix=" " strip-periods="true"/>
+      <label form="verb-short" suffix=" " strip-periods="true"/>
       <name and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
     </names>
   </macro>
@@ -284,7 +284,7 @@
         <if variable="author">
           <names variable="editor" delimiter=", ">
             <name and="text" delimiter=", "/>
-            <label form="verb-short" text-case="lowercase" prefix=", " suffix="" strip-periods="true"/>
+            <label form="verb-short" text-case="lowercase" prefix=", " strip-periods="true"/>
           </names>
           <choose>
             <if variable="container-author">
@@ -318,7 +318,7 @@
   <macro name="container-contributors-note">
     <choose>
       <if type="chapter paper-conference" match="any">
-        <text macro="editor-translator" prefix=""/>
+        <text macro="editor-translator"/>
       </if>
     </choose>
   </macro>
@@ -354,7 +354,7 @@
             <if variable="author">
               <names variable="editor" delimiter=", ">
                 <name and="text" delimiter=", "/>
-                <label form="verb" text-case="lowercase" prefix=", " suffix=""/>
+                <label form="verb" text-case="lowercase" prefix=", "/>
               </names>
               <choose>
                 <if variable="container-author">
@@ -411,11 +411,11 @@
     <group delimiter=", ">
       <text macro="secondary-contributors-note"/>
       <text macro="container-contributors-note"/>
-      <text variable="container-title" prefix="" font-style="italic"/>
-      <text macro="edition" prefix=""/>
-      <text macro="publisher-place" prefix="" suffix=""/>
-      <text macro="publisher" suffix=""/>
-      <text macro="issued-year" suffix=""/>
+      <text variable="container-title" font-style="italic"/>
+      <text macro="edition"/>
+      <text macro="publisher-place"/>
+      <text macro="publisher"/>
+      <text macro="issued-year"/>
     </group>
     <text macro="point-locators"/>
   </macro>
@@ -425,11 +425,11 @@
     <group delimiter=", ">
       <text macro="secondary-contributors"/>
       <text macro="container-contributors"/>
-      <text variable="container-title" prefix="" font-style="italic"/>
-      <text macro="edition" prefix=""/>
-      <text macro="publisher-place" prefix="" suffix=""/>
-      <text macro="publisher" suffix=""/>
-      <text macro="issued-year" suffix=""/>
+      <text variable="container-title" font-style="italic"/>
+      <text macro="edition"/>
+      <text macro="publisher-place"/>
+      <text macro="publisher"/>
+      <text macro="issued-year"/>
     </group>
     <text macro="point-locators"/>
   </macro>
@@ -439,7 +439,7 @@
       <text macro="title" font-style="italic"/>
       <text macro="genre"/>
       <text macro="publisher"/>
-      <text macro="issued-year" suffix=""/>
+      <text macro="issued-year"/>
     </group>
     <text macro="point-locators" prefix=" "/>
   </macro>
@@ -449,7 +449,7 @@
       <text macro="title" font-style="italic"/>
       <text macro="genre"/>
       <text macro="publisher"/>
-      <text macro="issued-year" suffix=""/>
+      <text macro="issued-year"/>
     </group>
   </macro>
   <macro name="bill">
@@ -459,7 +459,7 @@
       <text macro="publisher"/>
       <text macro="contributors"/>
       <text macro="note"/>
-      <text macro="issued-year" suffix=""/>
+      <text macro="issued-year"/>
       <text macro="point-locators"/>
     </group>
   </macro>
@@ -467,15 +467,15 @@
     <group delimiter=", ">
       <text macro="contributors-note"/>
       <text macro="title" font-style="italic"/>
-      <text macro="edition" prefix=""/>
-      <text macro="translator-note" suffix=""/>
-      <text macro="volume" suffix=""/>
+      <text macro="edition"/>
+      <text macro="translator-note"/>
+      <text macro="volume"/>
       <text macro="number-of-volumes"/>
-      <text macro="collection-title" suffix=""/>
-      <text macro="collection-number" suffix=""/>
-      <text macro="publisher-place" prefix="" suffix=""/>
-      <text macro="publisher" suffix=""/>
-      <text macro="issued-year" suffix=""/>
+      <text macro="collection-title"/>
+      <text macro="collection-number"/>
+      <text macro="publisher-place"/>
+      <text macro="publisher"/>
+      <text macro="issued-year"/>
       <text macro="page" prefix=" "/>
     </group>
     <text macro="point-locators" prefix=" "/>
@@ -484,24 +484,24 @@
     <text macro="contributors" suffix=". "/>
     <group delimiter=", ">
       <text macro="title" font-style="italic"/>
-      <text macro="edition" prefix=""/>
-      <text macro="translator" suffix=""/>
-      <text macro="volume" suffix=""/>
+      <text macro="edition"/>
+      <text macro="translator"/>
+      <text macro="volume"/>
       <text macro="number-of-volumes"/>
-      <text macro="collection-title" suffix=""/>
-      <text macro="collection-number" suffix=""/>
-      <text macro="publisher-place" prefix="" suffix=""/>
-      <text macro="publisher" suffix=""/>
-      <text macro="issued-year" suffix=""/>
+      <text macro="collection-title"/>
+      <text macro="collection-number"/>
+      <text macro="publisher-place"/>
+      <text macro="publisher"/>
+      <text macro="issued-year"/>
     </group>
     <text macro="page" prefix=" "/>
     <text macro="point-locators"/>
   </macro>
   <macro name="note-article-newspaper">
     <group delimiter=", ">
-      <text macro="contributors-note" suffix=""/>
+      <text macro="contributors-note"/>
       <text macro="title" quotes="true"/>
-      <text variable="container-title" prefix="" font-style="italic"/>
+      <text variable="container-title" font-style="italic"/>
       <text macro="publisher-place"/>
     </group>
     <text macro="issued" prefix=" (" suffix=")"/>
@@ -517,7 +517,7 @@
     <text macro="contributors" suffix=". "/>
     <group delimiter=", ">
       <text macro="title" quotes="true"/>
-      <text variable="container-title" prefix="" font-style="italic"/>
+      <text variable="container-title" font-style="italic"/>
       <text macro="publisher-place"/>
     </group>
     <text macro="issued" prefix=" (" suffix=")"/>
@@ -533,12 +533,12 @@
     <group delimiter=" ">
       <text macro="contributors-note" suffix=","/>
       <text macro="title" quotes="true" suffix=","/>
-      <text variable="container-title" prefix="" font-style="italic"/>
+      <text variable="container-title" font-style="italic"/>
       <choose>
         <if variable="volume" match="any">
           <group delimiter=":">
-            <text variable="volume" prefix=""/>
-            <number variable="issue" prefix=""/>
+            <text variable="volume"/>
+            <number variable="issue"/>
           </group>
         </if>
         <else>
@@ -560,12 +560,12 @@
     <text macro="contributors" suffix=". "/>
     <group delimiter=" ">
       <text macro="title" quotes="true" suffix=","/>
-      <text variable="container-title" prefix="" font-style="italic"/>
+      <text variable="container-title" font-style="italic"/>
       <choose>
         <if variable="volume" match="any">
           <group delimiter=":">
-            <text variable="volume" prefix=""/>
-            <number variable="issue" prefix=""/>
+            <text variable="volume"/>
+            <number variable="issue"/>
           </group>
         </if>
         <else>
@@ -590,7 +590,7 @@
       <choose>
         <if variable="volume" match="none">
           <text macro="issued-year" prefix="[" suffix="]"/>
-          <number variable="issue" prefix=""/>
+          <number variable="issue"/>
         </if>
         <else>
           <text macro="issued-year" prefix="(" suffix=")"/>
@@ -601,7 +601,7 @@
           </group>
         </else>
       </choose>
-      <text variable="container-title" form="short" prefix="" strip-periods="true"/>
+      <text variable="container-title" form="short" strip-periods="true"/>
       <text macro="point-locators"/>
     </group>
     <choose>
@@ -618,7 +618,7 @@
       <choose>
         <if variable="volume" match="none">
           <text macro="issued-year" prefix="[" suffix="]"/>
-          <number variable="issue" prefix=""/>
+          <number variable="issue"/>
         </if>
         <else>
           <text macro="issued-year" prefix="(" suffix=")"/>
@@ -629,7 +629,7 @@
           </group>
         </else>
       </choose>
-      <text variable="container-title" form="short" prefix="" strip-periods="true"/>
+      <text variable="container-title" form="short" strip-periods="true"/>
       <text macro="point-locators"/>
     </group>
     <choose>
@@ -672,7 +672,7 @@
       </choose>
       <choose>
         <if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
-          <text variable="URL" prefix="en ligne&#160;: " suffix=""/>
+          <text variable="URL" prefix="en ligne&#160;: "/>
         </if>
       </choose>
     </group>
@@ -725,7 +725,7 @@
   <macro name="pages">
     <choose>
       <if type="article-journal">
-        <text variable="page" prefix=""/>
+        <text variable="page"/>
       </if>
       <else-if type="chapter paper-conference" match="any">
         <text variable="page" prefix=", "/>
@@ -733,18 +733,18 @@
     </choose>
   </macro>
   <macro name="point-locators-sub">
-    <label variable="locator" suffix="" form="short" strip-periods="true"/>
-    <text variable="locator" prefix=""/>
+    <label variable="locator" form="short" strip-periods="true"/>
+    <text variable="locator"/>
   </macro>
   <macro name="point-locators">
     <choose>
       <if variable="locator" match="none">
-        <text macro="pages" suffix=""/>
+        <text macro="pages"/>
       </if>
       <else-if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
-        <text variable="page" prefix="" suffix=" "/>
-        <label variable="locator" suffix="" form="short" strip-periods="true"/>
-        <text variable="locator" prefix=""/>
+        <text variable="page" suffix=" "/>
+        <label variable="locator" form="short" strip-periods="true"/>
+        <text variable="locator"/>
       </else-if>
       <else-if type="chapter paper-conference" match="any">
         <choose>
@@ -754,13 +754,13 @@
           </if>
           <else-if locator="page" match="any">
             <text variable="page" prefix=", " suffix=" "/>
-            <label variable="locator" suffix="" form="short" strip-periods="true"/>
+            <label variable="locator" form="short" strip-periods="true"/>
             <text variable="locator"/>
           </else-if>
         </choose>
       </else-if>
       <else>
-        <label variable="locator" suffix="" form="short" strip-periods="true"/>
+        <label variable="locator" form="short" strip-periods="true"/>
         <text variable="locator"/>
       </else>
     </choose>
@@ -778,7 +778,7 @@
     </group>
   </macro>
   <macro name="locators">
-    <text macro="issued" prefix="" suffix=""/>
+    <text macro="issued"/>
     <group delimiter=":">
       <text variable="volume" prefix=" "/>
       <number variable="issue"/>
@@ -845,7 +845,7 @@
     </choose>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" et-al-subsequent-min="4" et-al-subsequent-use-first="1" disambiguate-add-names="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
@@ -898,7 +898,7 @@
             <text macro="title-note" font-style="italic"/>
             <text macro="description-note"/>
             <text macro="secondary-contributors-note"/>
-            <group delimiter="">
+            <group>
               <text macro="container-contributors-note"/>
               <text macro="container-title-note"/>
             </group>
@@ -953,7 +953,7 @@
             <text macro="title" font-style="italic"/>
             <text macro="description"/>
             <text macro="secondary-contributors"/>
-            <group delimiter="">
+            <group>
               <text macro="container-contributors"/>
               <text macro="container-title"/>
             </group>
@@ -963,7 +963,7 @@
           <text macro="issue"/>
           <text macro="locators-newspaper" prefix=", "/>
           <text macro="locators-journal"/>
-          <text macro="access" prefix=""/>
+          <text macro="access"/>
         </else>
       </choose>
     </layout>
diff --git a/medecine-sciences.csl b/medecine-sciences.csl
index 0aee93af24..ddc3144e17 100644
--- a/medecine-sciences.csl
+++ b/medecine-sciences.csl
@@ -118,7 +118,7 @@
         </else-if>
         <else>
           <text macro="title" prefix=" " suffix="."/>
-          <text variable="container-title" form="short" font-style="italic" prefix=" " suffix=""/>
+          <text variable="container-title" form="short" font-style="italic" prefix=" "/>
           <text macro="year-date" prefix=" " suffix=" ;"/>
           <text variable="volume" prefix=" " suffix=" "/>
           <text variable="page" prefix=": "/>
diff --git a/media-culture-and-society.csl b/media-culture-and-society.csl
index 568124c3fa..2db051abe8 100644
--- a/media-culture-and-society.csl
+++ b/media-culture-and-society.csl
@@ -140,7 +140,7 @@
     </sort>
     <layout suffix=".">
       <group delimiter=" ">
-        <text macro="author" suffix=""/>
+        <text macro="author"/>
       </group>
       <choose>
         <if type="article-newspaper article-magazine" match="any">
@@ -180,7 +180,7 @@
         <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group delimiter=" ">
             <text macro="year-date" prefix=" (" suffix=")"/>
-            <text macro="title" prefix="" suffix="." font-style="italic"/>
+            <text macro="title" suffix="." font-style="italic"/>
             <text macro="edition"/>
             <text macro="editor" suffix="."/>
             <text macro="publisher"/>
diff --git a/medicine-and-science-in-sports-and-exercise.csl b/medicine-and-science-in-sports-and-exercise.csl
index 360abd6343..a8607404c1 100644
--- a/medicine-and-science-in-sports-and-exercise.csl
+++ b/medicine-and-science-in-sports-and-exercise.csl
@@ -49,12 +49,12 @@
         <choose>
           <if type="article-journal">
             <date variable="issued">
-              <date-part name="year" suffix=""/>
+              <date-part name="year"/>
             </date>
           </if>
           <else>
             <date variable="issued">
-              <date-part name="year" suffix=""/>
+              <date-part name="year"/>
             </date>
           </else>
         </choose>
diff --git a/melbourne-school-of-theology.csl b/melbourne-school-of-theology.csl
index 2cc07ee518..43169ccecb 100644
--- a/melbourne-school-of-theology.csl
+++ b/melbourne-school-of-theology.csl
@@ -768,7 +768,7 @@
     </names>
   </macro>
   <citation et-al-min="4" et-al-use-first="3" disambiguate-add-names="true" disambiguate-add-givenname="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="subsequent ibid ibid-with-locator" match="any">
           <group delimiter=", ">
@@ -798,7 +798,7 @@
       <key variable="title"/>
       <key variable="issued"/>
     </sort>
-    <layout prefix="" suffix=".">
+    <layout suffix=".">
       <group delimiter=". ">
         <text macro="contributors"/>
         <text macro="title-note"/>
diff --git a/memorias-do-instituto-oswaldo-cruz.csl b/memorias-do-instituto-oswaldo-cruz.csl
index e65970a10b..44be6033c4 100644
--- a/memorias-do-instituto-oswaldo-cruz.csl
+++ b/memorias-do-instituto-oswaldo-cruz.csl
@@ -107,7 +107,7 @@
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" "/>
           <group prefix=".">
-            <group prefix=" In:" suffix="">
+            <group prefix=" In:">
               <names variable="editor translator">
                 <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always" prefix=" "/>
                 <et-al font-style="italic"/>
diff --git a/methods-of-information-in-medicine.csl b/methods-of-information-in-medicine.csl
index 5cd02dbbf3..37b05e6d1c 100644
--- a/methods-of-information-in-medicine.csl
+++ b/methods-of-information-in-medicine.csl
@@ -50,13 +50,13 @@
         <choose>
           <if type="article-journal">
             <date variable="issued">
-              <date-part name="year" suffix=""/>
-              <date-part name="month" form="short" prefix=" " suffix="" strip-periods="true"/>
+              <date-part name="year"/>
+              <date-part name="month" form="short" prefix=" " strip-periods="true"/>
             </date>
           </if>
           <else>
             <date variable="issued">
-              <date-part name="year" suffix=""/>
+              <date-part name="year"/>
             </date>
           </else>
         </choose>
@@ -110,8 +110,8 @@
       <text macro="title" suffix=". "/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <text macro="edition" prefix="" suffix=" "/>
-          <text macro="publisher" prefix="" suffix="."/>
+          <text macro="edition" suffix=" "/>
+          <text macro="publisher" suffix="."/>
         </if>
         <else-if type="chapter paper-conference" match="any">
           <group prefix=" " suffix=". ">
diff --git a/metropolitiques.csl b/metropolitiques.csl
index 54cd41e56a..d710a58fdc 100644
--- a/metropolitiques.csl
+++ b/metropolitiques.csl
@@ -113,7 +113,7 @@
         </group>
       </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter="">
+        <group>
           <group suffix=",">
             <text variable="title" text-case="capitalize-first" quotes="true"/>
           </group>
@@ -128,9 +128,9 @@
           <text variable="container-title" font-style="italic"/>
           <text variable="URL" prefix="URL&#160;: " text-decoration="underline"/>
         </group>
-        <group delimiter="" font-style="normal">
-          <text value="consulté le " suffix="" prefix=", "/>
-          <date variable="accessed" form="text" suffix="">
+        <group font-style="normal">
+          <text value="consulté le " prefix=", "/>
+          <date variable="accessed" form="text">
             <date-part name="day"/>
             <date-part name="month"/>
             <date-part name="year"/>
@@ -194,11 +194,11 @@
           <if is-numeric="edition">
             <group delimiter=" ">
               <number variable="edition" form="ordinal"/>
-              <text term="edition" form="short" suffix="" strip-periods="true"/>
+              <text term="edition" form="short" strip-periods="true"/>
             </group>
           </if>
           <else>
-            <text variable="edition" text-case="capitalize-first" suffix=""/>
+            <text variable="edition" text-case="capitalize-first"/>
           </else>
         </choose>
       </if>
@@ -225,10 +225,10 @@
     <choose>
       <if is-numeric="issue">
         <text term="issue" form="short" suffix="&#160;"/>
-        <text variable="issue" suffix=""/>
+        <text variable="issue"/>
       </if>
       <else>
-        <text variable="issue" suffix=""/>
+        <text variable="issue"/>
       </else>
     </choose>
   </macro>
@@ -263,7 +263,7 @@
       <key macro="author" names-min="3" names-use-first="3"/>
       <key variable="issued" sort="descending"/>
     </sort>
-    <layout prefix="" suffix=".">
+    <layout suffix=".">
       <group delimiter=". ">
         <text macro="author"/>
         <text macro="year-cite" suffix=". "/>
@@ -273,7 +273,7 @@
         <text macro="edition"/>
         <text macro="pub-place" suffix="&#160;: "/>
       </group>
-      <group delimiter="">
+      <group>
         <text macro="publisher"/>
         <text macro="pagination" prefix=", p.&#160;"/>
       </group>
diff --git a/microscopy-and-microanalysis.csl b/microscopy-and-microanalysis.csl
index 8c6d0e348e..812e3d41fa 100644
--- a/microscopy-and-microanalysis.csl
+++ b/microscopy-and-microanalysis.csl
@@ -205,7 +205,7 @@
               <text macro="editor" prefix=", "/>
               <text macro="pages"/>
             </group>
-            <text macro="publisher" prefix=""/>
+            <text macro="publisher"/>
           </group>
         </else-if>
         <else>
diff --git a/modern-humanities-research-association.csl b/modern-humanities-research-association.csl
index a92ac146ec..4d462b69f4 100644
--- a/modern-humanities-research-association.csl
+++ b/modern-humanities-research-association.csl
@@ -394,7 +394,7 @@
     </choose>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="subsequent">
           <group delimiter=", ">
diff --git a/modern-language-association-6th-edition-note.csl b/modern-language-association-6th-edition-note.csl
index 6ce2d7a729..cbb15acc7f 100644
--- a/modern-language-association-6th-edition-note.csl
+++ b/modern-language-association-6th-edition-note.csl
@@ -383,7 +383,7 @@
   <macro name="locators-note">
     <choose>
       <if type="article-journal">
-        <group prefix="" delimiter=".">
+        <group delimiter=".">
           <text variable="volume" prefix=" "/>
           <text variable="issue"/>
         </group>
@@ -415,7 +415,7 @@
   <macro name="locators">
     <choose>
       <if type="article-journal">
-        <group prefix="" delimiter=".">
+        <group delimiter=".">
           <text variable="volume" prefix=" "/>
           <text variable="issue"/>
         </group>
@@ -684,7 +684,7 @@
       </choose>
       <choose>
         <if type="legal_case" match="none">
-          <group prefix="" delimiter=", " suffix=". ">
+          <group delimiter=", " suffix=". ">
             <text term="online"/>
             <!--text variable="source"-->
             <text term="internet" text-case="capitalize-first"/>
@@ -717,7 +717,7 @@
       </choose>
       <choose>
         <if type="legal_case" match="none">
-          <group prefix="" delimiter=". " suffix=". ">
+          <group delimiter=". " suffix=". ">
             <text term="online" text-case="capitalize-first"/>
             <!--text variable="source"-->
             <text term="internet" text-case="capitalize-first"/>
@@ -732,7 +732,7 @@
     </group>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" et-al-subsequent-min="4" et-al-subsequent-use-first="1" disambiguate-add-names="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/molecular-and-cellular-proteomics.csl b/molecular-and-cellular-proteomics.csl
index e2428ba342..4ab3f6f1d9 100644
--- a/molecular-and-cellular-proteomics.csl
+++ b/molecular-and-cellular-proteomics.csl
@@ -19,7 +19,7 @@
   </info>
   <macro name="editor">
     <names variable="editor" prefix=" " delimiter=", ">
-      <label form="short" prefix="" suffix=" " strip-periods="true"/>
+      <label form="short" suffix=" " strip-periods="true"/>
       <name initialize-with="" name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always"/>
     </names>
   </macro>
diff --git a/molecular-biology-and-evolution.csl b/molecular-biology-and-evolution.csl
index 9c8c9e8e2c..8bbf05d0d9 100644
--- a/molecular-biology-and-evolution.csl
+++ b/molecular-biology-and-evolution.csl
@@ -34,7 +34,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -133,7 +133,7 @@
     </sort>
     <layout>
       <group suffix="." delimiter=". ">
-        <text macro="author" suffix=""/>
+        <text macro="author"/>
         <text macro="year-date"/>
         <text macro="title"/>
       </group>
@@ -143,7 +143,7 @@
             <text macro="edition"/>
             <text macro="editor" prefix="(" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
         </if>
         <else-if type="chapter paper-conference" match="any">
           <group prefix=" " delimiter=" ">
@@ -162,7 +162,7 @@
         <else>
           <text macro="editor" suffix="."/>
           <group prefix=" " suffix=".">
-            <text macro="journal" suffix=""/>
+            <text macro="journal"/>
             <text variable="volume" prefix=" "/>
             <!--<text variable="issue" prefix="(" suffix=")"/> -->
             <text variable="page" prefix=":"/>
diff --git a/molecular-ecology.csl b/molecular-ecology.csl
index b68c724311..80bdf60dd0 100644
--- a/molecular-ecology.csl
+++ b/molecular-ecology.csl
@@ -123,7 +123,7 @@
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" "/>
           <group prefix=".">
-            <group prefix=" In:" suffix="">
+            <group prefix=" In:">
               <text variable="container-title" font-style="italic" prefix=" " suffix=" "/>
               <text variable="collection-title" prefix=" " suffix="."/>
               <names variable="editor translator" prefix=" (" delimiter=", " suffix=")">
@@ -132,7 +132,7 @@
               </names>
               <group suffix=".">
                 <label variable="page" form="short" prefix=", " suffix=". " strip-periods="true"/>
-                <text variable="page" suffix=""/>
+                <text variable="page"/>
                 <text macro="publisher" prefix=". " suffix="."/>
               </group>
             </group>
diff --git a/molecular-microbiology.csl b/molecular-microbiology.csl
index 723b0aced9..6008e50052 100644
--- a/molecular-microbiology.csl
+++ b/molecular-microbiology.csl
@@ -171,7 +171,7 @@
           </group>
         </else>
       </choose>
-      <text prefix=" " macro="access" suffix=""/>
+      <text prefix=" " macro="access"/>
     </layout>
   </bibliography>
 </style>
diff --git a/molecular-plant.csl b/molecular-plant.csl
index bc61f9be93..41465b3c0e 100644
--- a/molecular-plant.csl
+++ b/molecular-plant.csl
@@ -106,7 +106,7 @@
   <macro name="pages">
     <group>
       <label variable="page" form="short" suffix=" "/>
-      <text variable="page" prefix="" suffix=""/>
+      <text variable="page"/>
     </group>
   </macro>
   <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true">
@@ -129,7 +129,7 @@
       <key variable="title"/>
     </sort>
     <layout suffix=".">
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <date variable="issued" prefix=" (" suffix=").">
         <date-part name="year" font-weight="normal"/>
       </date>
diff --git a/molecular-psychiatry-letters.csl b/molecular-psychiatry-letters.csl
index 1cfc740253..0a71fdb4e7 100644
--- a/molecular-psychiatry-letters.csl
+++ b/molecular-psychiatry-letters.csl
@@ -72,7 +72,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/molecular-psychiatry.csl b/molecular-psychiatry.csl
index ef8f5fbac4..ff6261cc9c 100644
--- a/molecular-psychiatry.csl
+++ b/molecular-psychiatry.csl
@@ -68,7 +68,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
           </date>
         </group>
diff --git a/moore-theological-college.csl b/moore-theological-college.csl
index c19d90a68c..a64ba74676 100644
--- a/moore-theological-college.csl
+++ b/moore-theological-college.csl
@@ -645,7 +645,7 @@
     <text variable="genre"/>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" et-al-subsequent-min="4" et-al-subsequent-use-first="1" disambiguate-add-names="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="subsequent">
           <group delimiter=", ">
diff --git a/moorlands-college.csl b/moorlands-college.csl
index c7bb0bc730..822d3074bd 100644
--- a/moorlands-college.csl
+++ b/moorlands-college.csl
@@ -915,7 +915,7 @@
               <text variable="DOI" prefix="doi:"/>
             </if>
             <else-if type="webpage" match="any">
-              <group delimiter="" prefix="&lt;" suffix="&gt;">
+              <group prefix="&lt;" suffix="&gt;">
                 <text variable="URL"/>
               </group>
             </else-if>
diff --git a/multidisciplinary-digital-publishing-institute.csl b/multidisciplinary-digital-publishing-institute.csl
index eb6b4a9276..a8349793b4 100644
--- a/multidisciplinary-digital-publishing-institute.csl
+++ b/multidisciplinary-digital-publishing-institute.csl
@@ -92,7 +92,7 @@
   </citation>
   <bibliography entry-spacing="0">
     <layout suffix=".">
-      <text variable="citation-number" prefix="" suffix=". "/>
+      <text variable="citation-number" suffix=". "/>
       <text macro="author" suffix=" "/>
       <choose>
         <if type="article-magazine">
diff --git a/multiple-sclerosis-journal.csl b/multiple-sclerosis-journal.csl
index a6362f7071..c3e7571724 100644
--- a/multiple-sclerosis-journal.csl
+++ b/multiple-sclerosis-journal.csl
@@ -33,7 +33,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always" font-weight="bold"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <et-al font-style="italic"/>
         <substitute>
           <names variable="editor"/>
@@ -111,7 +111,7 @@
   </citation>
   <bibliography hanging-indent="false" et-al-min="6" et-al-use-first="3">
     <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
+      <text variable="citation-number" suffix=". "/>
       <text macro="author"/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
@@ -120,7 +120,7 @@
             <text macro="edition" prefix=" "/>
             <text macro="editor" prefix=" (" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
           <group suffix="." prefix="; ">
             <date variable="issued">
               <date-part name="year"/>
diff --git a/nano-biomedicine-and-engineering.csl b/nano-biomedicine-and-engineering.csl
index fe895f1c06..e8806cfaad 100644
--- a/nano-biomedicine-and-engineering.csl
+++ b/nano-biomedicine-and-engineering.csl
@@ -67,7 +67,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/national-library-of-medicine-grant-proposals.csl b/national-library-of-medicine-grant-proposals.csl
index 89e362cdc8..2b3b2ed0a6 100644
--- a/national-library-of-medicine-grant-proposals.csl
+++ b/national-library-of-medicine-grant-proposals.csl
@@ -87,7 +87,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/national-science-foundation-grant-proposals.csl b/national-science-foundation-grant-proposals.csl
index 015ff4424b..6424e87f92 100644
--- a/national-science-foundation-grant-proposals.csl
+++ b/national-science-foundation-grant-proposals.csl
@@ -22,18 +22,18 @@
   </citation>
   <bibliography>
     <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
-      <names variable="author" prefix="" suffix=". ">
+      <text variable="citation-number" suffix=". "/>
+      <names variable="author" suffix=". ">
         <name and="text" delimiter=", " name-as-sort-order="all" sort-separator=", " form="long" initialize-with=". "/>
       </names>
-      <text variable="title" prefix="" suffix=" " font-weight="bold" quotes="true" text-case="title"/>
-      <text variable="container-title" prefix="" suffix=" " font-style="italic"/>
-      <text variable="volume" prefix="" suffix=", "/>
+      <text variable="title" suffix=" " font-weight="bold" quotes="true" text-case="title"/>
+      <text variable="container-title" suffix=" " font-style="italic"/>
+      <text variable="volume" suffix=", "/>
       <text variable="issue" prefix="no. " suffix=" "/>
       <date variable="issued" prefix="(" suffix="): ">
-        <date-part name="year" form="long" prefix="" suffix=""/>
+        <date-part name="year" form="long"/>
       </date>
-      <text variable="page" prefix="" suffix=". "/>
+      <text variable="page" suffix=". "/>
       <text variable="DOI" prefix="doi:" suffix=", "/>
       <text variable="URL" prefix="Available at " suffix=" "/>
     </layout>
diff --git a/natureza-e-conservacao.csl b/natureza-e-conservacao.csl
index 5e7d27d0af..dfd7a522af 100644
--- a/natureza-e-conservacao.csl
+++ b/natureza-e-conservacao.csl
@@ -179,7 +179,7 @@
   <macro name="locators">
     <choose>
       <if type="bill legislation" match="any">
-        <group prefix=". " suffix="" delimiter=", ">
+        <group prefix=". " delimiter=", ">
           <date variable="issued">
             <date-part name="day"/>
             <date-part prefix=" " name="month" form="short"/>
diff --git a/neurology-india.csl b/neurology-india.csl
index 6bb1d24d1c..ab56956617 100644
--- a/neurology-india.csl
+++ b/neurology-india.csl
@@ -53,7 +53,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/neurology.csl b/neurology.csl
index 3c778394d7..9b6cf4dccc 100644
--- a/neurology.csl
+++ b/neurology.csl
@@ -79,7 +79,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
           </date>
         </group>
diff --git a/neurorehabilitation-and-neural-repair.csl b/neurorehabilitation-and-neural-repair.csl
index 4340c7120d..4573748e29 100644
--- a/neurorehabilitation-and-neural-repair.csl
+++ b/neurorehabilitation-and-neural-repair.csl
@@ -31,7 +31,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
diff --git a/new-phytologist.csl b/new-phytologist.csl
index feebb4c407..9e40a610eb 100644
--- a/new-phytologist.csl
+++ b/new-phytologist.csl
@@ -108,7 +108,7 @@
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" "/>
           <group prefix=".">
-            <group prefix="" suffix="">
+            <group>
               <group suffix=".">
                 <names variable="editor translator">
                   <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always" prefix=" In: " suffix=","/>
diff --git a/new-zealand-veterinary-journal.csl b/new-zealand-veterinary-journal.csl
index 74a2222244..2cc956780b 100644
--- a/new-zealand-veterinary-journal.csl
+++ b/new-zealand-veterinary-journal.csl
@@ -87,8 +87,8 @@
                 <text variable="URL"/>
               </group>
               <group prefix="(accessed " suffix="). " delimiter=" ">
-                <date variable="accessed" suffix="">
-                  <date-part name="day" prefix=""/>
+                <date variable="accessed">
+                  <date-part name="day"/>
                   <date-part name="month" prefix=" " suffix=" " form="long" strip-periods="true"/>
                   <date-part name="year"/>
                 </date>
@@ -130,7 +130,7 @@
       <if is-numeric="edition">
         <group delimiter=" ">
           <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short" suffix="" strip-periods="true"/>
+          <text term="edition" form="short" strip-periods="true"/>
         </group>
       </if>
       <else>
@@ -160,12 +160,12 @@
       <key macro="author-bib"/>
       <key macro="date"/>
     </sort>
-    <layout suffix="">
+    <layout>
       <text macro="author-bib"/>
       <text macro="title" suffix=". "/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group delimiter=" " suffix="">
+          <group delimiter=" ">
             <text macro="edition" suffix="."/>
             <text macro="access"/>
             <text macro="publisher"/>
@@ -176,18 +176,18 @@
             <group>
               <text term="in" suffix=": " text-case="capitalize-first"/>
               <text macro="editor" suffix=". "/>
-              <text variable="container-title" suffix="" font-style="italic"/>
+              <text variable="container-title" font-style="italic"/>
             </group>
           </group>
           <text macro="edition" prefix=". "/>
           <text variable="page" prefix=". Pp " suffix=". "/>
           <text variable="event"/>
           <text macro="access" suffix=" "/>
-          <group delimiter=", " prefix="" suffix=", ">
+          <group delimiter=", " suffix=", ">
             <text variable="publisher"/>
             <text variable="publisher-place"/>
           </group>
-          <group delimiter=", " prefix="" suffix="">
+          <group delimiter=", ">
             <text macro="date"/>
           </group>
         </else-if>
@@ -196,8 +196,8 @@
             <if variable="issue volume" match="any">
               <text variable="container-title" suffix=" " form="short" font-style="italic"/>
               <text variable="volume"/>
-              <text variable="page" prefix=", " suffix=""/>
-              <text macro="date" prefix=", " suffix=""/>
+              <text variable="page" prefix=", "/>
+              <text macro="date" prefix=", "/>
             </if>
             <else>
               <choose>
@@ -206,7 +206,7 @@
                   <group prefix="(" suffix=").">
                     <date variable="issued">
                       <date-part name="month" prefix=" " suffix=" "/>
-                      <date-part name="day" prefix="" suffix=", "/>
+                      <date-part name="day" suffix=", "/>
                       <date-part name="year"/>
                     </date>
                   </group>
@@ -225,7 +225,7 @@
           <text macro="access"/>
           <text variable="publisher" suffix=". "/>
           <text variable="page" prefix=": " suffix=", "/>
-          <text macro="date" prefix="" suffix=""/>
+          <text macro="date"/>
         </else>
       </choose>
     </layout>
diff --git a/obesity.csl b/obesity.csl
index 69ea732304..f12d977810 100644
--- a/obesity.csl
+++ b/obesity.csl
@@ -32,7 +32,7 @@
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
         <et-al font-style="italic"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -97,8 +97,8 @@
   </citation>
   <bibliography et-al-min="7" et-al-use-first="3" second-field-align="margin">
     <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
-      <text macro="author" suffix=""/>
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group suffix=".">
@@ -106,7 +106,7 @@
             <text macro="edition" prefix=" "/>
             <text macro="editor" prefix=" (" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
           <group suffix="." prefix="; ">
             <date variable="issued">
               <date-part name="year"/>
diff --git a/occupational-medicine.csl b/occupational-medicine.csl
index c0a9b48b99..a3b37cd4e8 100644
--- a/occupational-medicine.csl
+++ b/occupational-medicine.csl
@@ -81,7 +81,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/oikos.csl b/oikos.csl
index 489f86e0cb..61e2638303 100644
--- a/oikos.csl
+++ b/oikos.csl
@@ -126,7 +126,7 @@
       <key variable="issued"/>
     </sort>
     <layout>
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <date variable="issued" prefix=" " suffix=".">
         <date-part name="year"/>
       </date>
@@ -147,7 +147,7 @@
               <label form="short" prefix=" (" suffix=")," strip-periods="true"/>
             </names>
             <text variable="container-title" prefix=" " suffix="."/>
-            <text macro="edition" prefix=" " suffix=""/>
+            <text macro="edition" prefix=" "/>
             <text variable="collection-title" prefix=" " suffix="."/>
             <group suffix=".">
               <text macro="publisher" prefix=" " suffix=","/>
diff --git a/oncogene.csl b/oncogene.csl
index 3a3d423771..326b1ca77f 100644
--- a/oncogene.csl
+++ b/oncogene.csl
@@ -38,7 +38,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" and="text" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <et-al font-style="italic"/>
         <substitute>
           <names variable="editor"/>
@@ -138,7 +138,7 @@
       <key macro="title"/>
     </sort>
     <layout>
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <date variable="issued" prefix=" " suffix=".">
         <date-part name="year" prefix="(" suffix=")."/>
       </date>
diff --git a/ophthalmology.csl b/ophthalmology.csl
index aa47987569..86656443a5 100644
--- a/ophthalmology.csl
+++ b/ophthalmology.csl
@@ -34,7 +34,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -116,8 +116,8 @@
   </citation>
   <bibliography hanging-indent="false" et-al-min="5" et-al-use-first="3">
     <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
-      <text macro="author" suffix=""/>
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group suffix=".">
@@ -125,7 +125,7 @@
             <text macro="edition" prefix=" "/>
             <text macro="editor" prefix=" (" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
           <group suffix="." prefix="; ">
             <date variable="issued">
               <date-part name="year"/>
diff --git a/ornitologia-neotropical.csl b/ornitologia-neotropical.csl
index 9c78a88aee..475c757c8a 100644
--- a/ornitologia-neotropical.csl
+++ b/ornitologia-neotropical.csl
@@ -135,7 +135,7 @@
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group prefix=" " delimiter=" " suffix=".">
-            <text macro="title" prefix="" suffix=""/>
+            <text macro="title"/>
             <text macro="edition"/>
             <text macro="editor"/>
           </group>
@@ -144,15 +144,15 @@
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" " suffix="."/>
           <group prefix=" " delimiter=" ">
-            <group suffix="" delimiter=". ">
+            <group delimiter=". ">
               <text macro="pages" prefix=" "/>
             </group>
             <text term="in" font-style="italic"/>
-            <text macro="editor" prefix="" suffix="."/>
-            <text variable="container-title" prefix="" suffix="."/>
+            <text macro="editor" suffix="."/>
+            <text variable="container-title" suffix="."/>
             <text variable="collection-title" suffix="."/>
             <text variable="event" suffix="."/>
-            <text macro="publisher" prefix=" " suffix=""/>
+            <text macro="publisher" prefix=" "/>
           </group>
         </else-if>
         <else-if type="thesis">
diff --git a/oryx.csl b/oryx.csl
index b8beab82b1..cf4ea0432d 100644
--- a/oryx.csl
+++ b/oryx.csl
@@ -108,7 +108,7 @@
         </group>
       </if>
       <else>
-        <text prefix="" term="no date" suffix=""/>
+        <text term="no date"/>
       </else>
     </choose>
   </macro>
@@ -147,7 +147,7 @@
         <text variable="page" prefix=", "/>
       </if>
       <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
-        <group prefix=". " delimiter="">
+        <group prefix=". ">
           <text term="in" suffix=" " text-case="capitalize-first"/>
           <text variable="container-title" font-style="italic"/>
           <text macro="container-contributors" prefix=" (" suffix="),"/>
@@ -182,7 +182,7 @@
       <key variable="issued"/>
     </sort>
     <layout suffix=".">
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <text macro="issued" prefix=" (" suffix=") "/>
       <text variable="title"/>
       <text macro="locators"/>
diff --git a/oscola-no-ibid.csl b/oscola-no-ibid.csl
index b90f42bb05..bb61db9c62 100644
--- a/oscola-no-ibid.csl
+++ b/oscola-no-ibid.csl
@@ -62,7 +62,7 @@
         <if variable="author editor" match="any">
           <names variable="translator" delimiter=", ">
             <name et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" and="text" delimiter=", "/>
-            <label form="short" prefix=" " suffix=""/>
+            <label form="short" prefix=" "/>
           </names>
         </if>
       </choose>
@@ -480,7 +480,7 @@
     <text macro="recipient-note" prefix=" "/>
   </macro>
   <citation>
-    <layout prefix="" suffix="" delimiter="; ">
+    <layout delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group>
diff --git a/oscola.csl b/oscola.csl
index 432fbe3003..86876f0fe5 100644
--- a/oscola.csl
+++ b/oscola.csl
@@ -63,7 +63,7 @@
         <if variable="author editor" match="any">
           <names variable="translator" delimiter=", ">
             <name et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" and="text" delimiter=", "/>
-            <label form="short" prefix=" " suffix=""/>
+            <label form="short" prefix=" "/>
           </names>
         </if>
       </choose>
@@ -485,16 +485,16 @@
     <text macro="recipient-note" prefix=" "/>
   </macro>
   <citation>
-    <layout prefix="" suffix="" delimiter="; ">
+    <layout delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group>
-            <text term="ibid" text-case="lowercase" suffix=""/>
+            <text term="ibid" text-case="lowercase"/>
             <text macro="point-locators-subsequent"/>
           </group>
         </if>
         <else-if position="ibid">
-          <text term="ibid" text-case="lowercase" suffix=""/>
+          <text term="ibid" text-case="lowercase"/>
         </else-if>
         <else-if position="subsequent">
           <group>
diff --git a/osterreichische-zeitschrift-fur-politikwissenschaft.csl b/osterreichische-zeitschrift-fur-politikwissenschaft.csl
index 888f249181..ac3713bff3 100644
--- a/osterreichische-zeitschrift-fur-politikwissenschaft.csl
+++ b/osterreichische-zeitschrift-fur-politikwissenschaft.csl
@@ -165,8 +165,8 @@
             <text variable="container-title" suffix=","/>
             <text variable="collection-title" suffix="."/>
             <text variable="event" suffix="."/>
-            <group suffix="" delimiter=", ">
-              <text macro="publisher" prefix=""/>
+            <group delimiter=", ">
+              <text macro="publisher"/>
               <text macro="pages"/>
             </group>
           </group>
@@ -183,7 +183,7 @@
             <text macro="title" prefix=" "/>
             <text macro="editor" prefix=" "/>
           </group>
-          <group prefix=" " suffix="">
+          <group prefix=" ">
             <text term="in" text-case="lowercase" suffix=": "/>
             <text variable="container-title" font-style="italic"/>
             <group prefix=", ">
diff --git a/owbarth-verlag.csl b/owbarth-verlag.csl
index c9154e339a..0bf02738e3 100644
--- a/owbarth-verlag.csl
+++ b/owbarth-verlag.csl
@@ -253,7 +253,7 @@
       </group>
       <choose>
         <if type="bill book broadcast graphic legal_case legislation manuscript map motion_picture report song" match="any">
-          <text prefix=" " macro="title" suffix=""/>
+          <text prefix=" " macro="title"/>
           <text prefix=", " variable="collection-title" font-style="italic"/>
           <text prefix=" (" macro="genre" suffix=")"/>
           <text prefix=". " macro="volumes"/>
@@ -285,7 +285,7 @@
           <text prefix=", " macro="pages"/>
         </else-if>
         <else-if type="thesis" match="any">
-          <text prefix=" " macro="title" font-style="italic" suffix=""/>
+          <text prefix=" " macro="title" font-style="italic"/>
           <text prefix=". " macro="edition"/>
           <text prefix=". " variable="publisher-place"/>
           <text prefix=", " variable="publisher" form="long"/>
diff --git a/oxford-the-university-of-new-south-wales.csl b/oxford-the-university-of-new-south-wales.csl
index 7289463008..bab7b61782 100644
--- a/oxford-the-university-of-new-south-wales.csl
+++ b/oxford-the-university-of-new-south-wales.csl
@@ -363,7 +363,7 @@
     </choose>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="subsequent">
           <group delimiter=", ">
diff --git a/padagogische-hochschule-heidelberg.csl b/padagogische-hochschule-heidelberg.csl
index 72653d23fe..8b12f61f53 100644
--- a/padagogische-hochschule-heidelberg.csl
+++ b/padagogische-hochschule-heidelberg.csl
@@ -40,7 +40,7 @@
   </macro>
   <macro name="editor">
     <names variable="editor" delimiter="; ">
-      <name name-as-sort-order="all" sort-separator=", " delimiter="; " delimiter-precedes-last="always" form="long" suffix=""/>
+      <name name-as-sort-order="all" sort-separator=", " delimiter="; " delimiter-precedes-last="always" form="long"/>
       <label form="short" prefix=" (" suffix=").&#160;"/>
     </names>
   </macro>
@@ -151,18 +151,18 @@
   <macro name="locator">
     <choose>
       <if type="article-journal">
-        <text variable="volume" prefix="" suffix="&#160;"/>
+        <text variable="volume" suffix="&#160;"/>
         <date variable="issued">
           <date-part name="year" prefix="(" suffix=")"/>
         </date>
-        <text variable="issue" prefix=",&#160;" suffix=""/>
+        <text variable="issue" prefix=",&#160;"/>
       </if>
       <else-if type="article-newspaper">
         <text variable="volume" prefix=",&#160;" suffix="&#160;"/>
         <!-- <date variable="issued">
 	     <date-part name="year" prefix="(" suffix=")"/>
 	     </date> -->
-        <text variable="issue" prefix=",&#160;" suffix=""/>
+        <text variable="issue" prefix=",&#160;"/>
       </else-if>
     </choose>
   </macro>
diff --git a/palaeontology.csl b/palaeontology.csl
index 2e4a588518..d8f35d3ad3 100644
--- a/palaeontology.csl
+++ b/palaeontology.csl
@@ -186,7 +186,7 @@
             </group>
           </else-if>
           <else-if type="webpage" match="any">
-            <group delimiter="">
+            <group>
               <text variable="title" font-style="italic" suffix=". "/>
               <text variable="container-title" form="long" suffix=". "/>
               <text variable="URL" prefix="Downloaded from " suffix=" "/>
diff --git a/paleobiology.csl b/paleobiology.csl
index e0e22b0205..3d0233524d 100644
--- a/paleobiology.csl
+++ b/paleobiology.csl
@@ -208,7 +208,7 @@
             </group>
           </else-if>
           <else-if type="webpage" match="any">
-            <group delimiter="">
+            <group>
               <text variable="title" font-style="italic" suffix=". "/>
               <text variable="container-title" form="long" suffix=". "/>
               <text variable="URL" prefix="Downloaded from " suffix=" "/>
@@ -222,7 +222,7 @@
           </else-if>
           <else>
             <text variable="title" suffix=". "/>
-            <group delimiter="">
+            <group>
               <text variable="container-title" form="long" text-case="capitalize-first"/>
               <text variable="volume" prefix=" "/>
               <text variable="page" prefix=":"/>
diff --git a/pediatric-allergy-and-immunology.csl b/pediatric-allergy-and-immunology.csl
index 8867781637..4f0ed920a6 100644
--- a/pediatric-allergy-and-immunology.csl
+++ b/pediatric-allergy-and-immunology.csl
@@ -51,7 +51,7 @@
             <text variable="URL"/>
             <group prefix=" (" suffix=")." delimiter=" ">
               <text term="accessed" text-case="lowercase"/>
-              <date variable="accessed" suffix="">
+              <date variable="accessed">
                 <date-part name="day" prefix=" "/>
                 <date-part name="month" prefix=" " form="short" strip-periods="true"/>
                 <date-part name="year"/>
diff --git a/pediatric-blood-and-cancer.csl b/pediatric-blood-and-cancer.csl
index e7fad450d9..8cfd23b2ff 100644
--- a/pediatric-blood-and-cancer.csl
+++ b/pediatric-blood-and-cancer.csl
@@ -51,7 +51,7 @@
         <group delimiter=" ">
           <group prefix="[" suffix="]" delimiter=" ">
             <text term="cited" text-case="lowercase"/>
-            <date variable="accessed" suffix="">
+            <date variable="accessed">
               <date-part name="year"/>
               <date-part name="month" prefix=" " form="short" strip-periods="true"/>
               <date-part name="day" prefix=" "/>
diff --git a/pediatric-research.csl b/pediatric-research.csl
index 7b05369f5e..f5b9abe319 100644
--- a/pediatric-research.csl
+++ b/pediatric-research.csl
@@ -54,7 +54,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/phyllomedusa.csl b/phyllomedusa.csl
index af3cc830f4..a31c036fc0 100644
--- a/phyllomedusa.csl
+++ b/phyllomedusa.csl
@@ -171,7 +171,7 @@
               <group delimiter=". " suffix=".">
                 <text variable="container-title" font-style="italic"/>
                 <text variable="event" prefix="Proceedings of the "/>
-                <text variable="publisher" prefix=""/>
+                <text variable="publisher"/>
                 <text variable="page"/>
               </group>
             </group>
@@ -195,7 +195,7 @@
               <text term="in" font-style="italic"/>
               <group delimiter=". ">
                 <group delimiter=", ">
-                  <text macro="editor" prefix="" suffix=""/>
+                  <text macro="editor"/>
                   <text variable="container-title"/>
                 </group>
                 <text macro="publisher"/>
@@ -218,7 +218,7 @@
                 </group>
               </if>
               <else>
-                <group prefix=" " suffix="" delimiter=" ">
+                <group prefix=" " delimiter=" ">
                   <text variable="container-title" font-style="italic"/>
                   <choose>
                     <!--we use DOIs only for articles w/o page numbers conforming to published articles. 
diff --git a/pisa-university-press.csl b/pisa-university-press.csl
index 8b255a0169..883638b379 100644
--- a/pisa-university-press.csl
+++ b/pisa-university-press.csl
@@ -42,7 +42,7 @@
       <if type="legal_case">
         <names variable="author">
           <name and="text" delimiter="" delimiter-precedes-last="never"/>
-          <label form="short" prefix=""/>
+          <label form="short"/>
           <substitute>
             <text variable="title"/>
           </substitute>
@@ -77,7 +77,7 @@
       <else-if type="interview">
         <names variable="author">
           <name and="symbol" delimiter=", "/>
-          <label form="short" prefix=" Interview with " suffix="" strip-periods="true"/>
+          <label form="short" prefix=" Interview with " strip-periods="true"/>
           <substitute>
             <text variable="title"/>
           </substitute>
@@ -89,13 +89,13 @@
     </choose>
   </macro>
   <macro name="editor">
-    <names variable="editor" prefix="" suffix="" delimiter=",">
+    <names variable="editor" delimiter=",">
       <name and="symbol" delimiter=", "/>
       <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
     </names>
   </macro>
   <macro name="editor-translator">
-    <names variable="editor translator" prefix="" suffix=" " delimiter=", ">
+    <names variable="editor translator" suffix=" " delimiter=", ">
       <name and="symbol" delimiter=", "/>
       <label form="short" prefix=" " suffix=","/>
     </names>
@@ -190,7 +190,7 @@
     <choose>
       <if variable="URL">
         <text variable="URL" prefix=" &lt;" suffix="&gt;"/>
-        <group prefix=" at " suffix="">
+        <group prefix=" at ">
           <date variable="accessed">
             <date-part name="day" suffix=" "/>
             <date-part name="month" suffix=" "/>
@@ -216,14 +216,14 @@
         <choose>
           <if variable="authority" match="none">
             <text variable="title" font-style="italic"/>
-            <text macro="volume-macro" suffix=""/>
+            <text macro="volume-macro"/>
             <text macro="container"/>
             <text variable="page" prefix=" "/>
             <text variable="locator" prefix=", "/>
           </if>
           <else>
             <text variable="title" suffix=","/>
-            <text variable="volume" prefix=" " suffix=""/>
+            <text variable="volume" prefix=" "/>
             <text macro="container"/>
             <text variable="page" prefix=" "/>
             <text variable="locator" prefix=", "/>
@@ -266,7 +266,7 @@
         <text variable="volume" suffix=" "/>
         <text macro="container" suffix=", " font-style="italic"/>
         <text macro="issuance"/>
-        <group delimiter="">
+        <group>
           <text value="at" prefix=", "/>
           <text variable="page" prefix=" "/>
         </group>
@@ -308,7 +308,7 @@
   <macro name="issuance">
     <choose>
       <if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
-        <group prefix="" suffix="">
+        <group>
           <choose>
             <if type="article-newspaper thesis" match="any">
               <date variable="issued">
@@ -333,7 +333,7 @@
   </macro>
   <!-- sets up citing to specific page numbers -->
   <macro name="at_page">
-    <group delimiter="">
+    <group>
       <text variable="locator"/>
     </group>
   </macro>
@@ -384,7 +384,7 @@
                 <text macro="author-short"/>
                 <choose>
                   <if disambiguate="true">
-                    <text variable="title" form="short" prefix=" " suffix="" quotes="true"/>
+                    <text variable="title" form="short" prefix=" " quotes="true"/>
                   </if>
                 </choose>
                 <text variable="first-reference-note-number" prefix=" above n "/>
diff --git a/plant-biology.csl b/plant-biology.csl
index e2723b6e8d..d7b6e270bf 100644
--- a/plant-biology.csl
+++ b/plant-biology.csl
@@ -80,7 +80,7 @@
       <if variable="URL">
         <text variable="URL"/>
         <group prefix=" (" suffix=").">
-          <text term="accessed" text-case="lowercase" prefix="" suffix=" "/>
+          <text term="accessed" text-case="lowercase" suffix=" "/>
           <date variable="accessed">
             <date-part name="day" suffix=" "/>
             <date-part name="month" suffix=" "/>
@@ -113,7 +113,7 @@
       <key variable="issued"/>
     </sort>
     <layout>
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <date variable="issued" prefix=" (" suffix=")">
         <date-part name="year"/>
       </date>
diff --git a/plant-physiology.csl b/plant-physiology.csl
index 21f6781378..127cec4554 100644
--- a/plant-physiology.csl
+++ b/plant-physiology.csl
@@ -127,7 +127,7 @@
               </group>
             </if>
             <else>
-              <group delimiter="">
+              <group>
                 <text variable="container-title" suffix=" " form="short" strip-periods="true"/>
                 <text variable="volume" suffix=": " font-weight="bold"/>
                 <text variable="page"/>
@@ -153,9 +153,9 @@
           </group>
         </else-if>
         <else-if type="webpage">
-          <group delimiter="">
+          <group>
             <text prefix=" " variable="container-title" suffix=", " form="short"/>
-            <text variable="URL" suffix=""/>
+            <text variable="URL"/>
           </group>
         </else-if>
         <else-if type="thesis">
@@ -171,7 +171,7 @@
         </else-if>
         <else>
           <!--    None of the provided formats need to add manually (some data provided) -->
-          <group delimiter="">
+          <group>
             <text variable="container-title" form="short" suffix=" "/>
             <text variable="volume" suffix=":"/>
             <text variable="page" suffix="."/>
diff --git a/pnas.csl b/pnas.csl
index e6d1daae85..5f151cc25e 100644
--- a/pnas.csl
+++ b/pnas.csl
@@ -24,7 +24,7 @@
   </info>
   <macro name="editor">
     <names variable="editor" prefix=" " delimiter=", ">
-      <label form="short" prefix="" suffix=" " strip-periods="true"/>
+      <label form="short" suffix=" " strip-periods="true"/>
       <name initialize-with="" name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always"/>
     </names>
   </macro>
diff --git a/presses-universitaires-de-rennes.csl b/presses-universitaires-de-rennes.csl
index ce204471b8..ed55399a91 100644
--- a/presses-universitaires-de-rennes.csl
+++ b/presses-universitaires-de-rennes.csl
@@ -78,7 +78,7 @@
         </group>
       </else-if>
       <else-if type="thesis" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" font-style="italic" suffix=","/>
           <text variable="genre" suffix=", " prefix=" "/>
           <text variable="publisher"/>
@@ -91,7 +91,7 @@
         </group>
       </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter="">
+        <group>
           <group suffix=", ">
             <text variable="title" text-case="capitalize-first" quotes="true"/>
           </group>
@@ -100,7 +100,7 @@
         </group>
       </else-if>
       <else-if type="webpage" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" font-style="italic" suffix=", "/>
           <text variable="URL" text-decoration="underline"/>
         </group>
@@ -199,7 +199,7 @@
       <else-if type="webpage" match="any">
         <group delimiter=" " font-style="normal">
           <text value="consulté le" suffix=" " prefix=" "/>
-          <date variable="accessed" form="text" suffix="">
+          <date variable="accessed" form="text">
             <date-part name="day"/>
             <date-part name="month"/>
             <date-part name="year"/>
@@ -273,7 +273,7 @@
       <else-if type="webpage" match="any">
         <group delimiter=" " font-style="normal">
           <text value="consulté le" suffix=" " prefix=" "/>
-          <date variable="accessed" form="text" suffix="">
+          <date variable="accessed" form="text">
             <date-part name="day"/>
             <date-part name="month"/>
             <date-part name="year"/>
@@ -298,7 +298,7 @@
         </choose>
       </if>
       <else-if type="article-journal article-magazine" match="any">
-        <group delimiter="" font-style="normal">
+        <group font-style="normal">
           <choose>
             <if variable="issued">
               <date variable="issued">
@@ -355,7 +355,7 @@
     </choose>
   </macro>
   <citation>
-    <layout prefix="" suffix="." delimiter="&#160;; ">
+    <layout suffix="." delimiter="&#160;; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
@@ -401,7 +401,7 @@
       <key macro="author" names-min="3" names-use-first="3"/>
       <key variable="issued" sort="descending"/>
     </sort>
-    <layout prefix="" suffix=".">
+    <layout suffix=".">
       <group delimiter=", ">
         <text macro="author"/>
         <text macro="title"/>
diff --git a/proceedings-of-the-royal-society-b.csl b/proceedings-of-the-royal-society-b.csl
index fc2689ab4c..450058d672 100644
--- a/proceedings-of-the-royal-society-b.csl
+++ b/proceedings-of-the-royal-society-b.csl
@@ -65,7 +65,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short"/>
             <date-part name="day" prefix=" "/>
@@ -140,7 +140,7 @@
       <choose>
         <if type="book">
           <text macro="edition" prefix=" " suffix=" "/>
-          <text macro="publisher" prefix=""/>
+          <text macro="publisher"/>
         </if>
         <else-if type="chapter">
           <group prefix=" " suffix=", ">
diff --git a/proinflow.csl b/proinflow.csl
index 500ea62afb..0c646519b6 100644
--- a/proinflow.csl
+++ b/proinflow.csl
@@ -171,7 +171,7 @@
           </if>
         </choose>
         <date variable="issued">
-          <date-part name="year" form="long" suffix=""/>
+          <date-part name="year" form="long"/>
         </date>
       </if>
       <else>
diff --git a/protein-science.csl b/protein-science.csl
index 3dba1a5b06..3fc9835bf2 100644
--- a/protein-science.csl
+++ b/protein-science.csl
@@ -28,10 +28,10 @@
     <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
   </macro>
   <macro name="author">
-    <group suffix="">
+    <group>
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -114,8 +114,8 @@
   </citation>
   <bibliography hanging-indent="false" et-al-min="10" et-al-use-first="10">
     <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
-      <text macro="author" suffix=""/>
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group prefix=" " suffix="." delimiter=" ">
@@ -123,7 +123,7 @@
             <text macro="edition"/>
             <text macro="editor" prefix="(" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
           <group suffix="." prefix="; " delimiter=" ">
             <date variable="issued">
               <date-part name="year"/>
diff --git a/psychiatry-and-clinical-neurosciences.csl b/psychiatry-and-clinical-neurosciences.csl
index d0e50e8f2d..fb0d4143e2 100644
--- a/psychiatry-and-clinical-neurosciences.csl
+++ b/psychiatry-and-clinical-neurosciences.csl
@@ -61,7 +61,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="capitalize-first"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/psychological-medicine.csl b/psychological-medicine.csl
index ad35845f91..5071373f62 100644
--- a/psychological-medicine.csl
+++ b/psychological-medicine.csl
@@ -94,7 +94,7 @@ KNOWN CHALLENGES
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <label form="short" prefix="" suffix=" "/>
+      <label form="short" suffix=" "/>
       <name form="short" name-as-sort-order="all" and="symbol" sort-separator=", " delimiter=", " delimiter-precedes-last="never" initialize-with=""/>
       <et-al font-style="italic"/>
       <substitute>
@@ -164,7 +164,7 @@ KNOWN CHALLENGES
     </choose>
   </macro>
   <macro name="pages">
-    <label variable="page" form="short" prefix=", " suffix="" strip-periods="true"/>
+    <label variable="page" form="short" prefix=", " strip-periods="true"/>
     <text variable="page"/>
   </macro>
   <macro name="journal-pages">
@@ -251,7 +251,7 @@ KNOWN CHALLENGES
         <if type="personal_communication" match="none">
           <text macro="author" font-weight="bold"/>
           <text macro="year-date" prefix=" (" suffix=")."/>
-          <group prefix=" " delimiter=", " suffix="">
+          <group prefix=" " delimiter=", ">
             <text macro="title"/>
             <choose>
               <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
diff --git a/public-health-nutrition.csl b/public-health-nutrition.csl
index b886fea80d..59fa535073 100644
--- a/public-health-nutrition.csl
+++ b/public-health-nutrition.csl
@@ -25,7 +25,7 @@
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
-    <names variable="author" suffix="">
+    <names variable="author">
       <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="never" and="symbol"/>
       <label form="long" prefix=" (" suffix=")"/>
       <substitute>
@@ -69,7 +69,7 @@
         <choose>
           <if variable="URL">
             <group prefix=" (accessed" suffix=")" delimiter=" ">
-              <date variable="accessed" suffix="">
+              <date variable="accessed">
                 <date-part name="month" prefix=" "/>
                 <date-part name="year" prefix=" "/>
               </date>
diff --git a/radiopaedia.csl b/radiopaedia.csl
index 286d9eece5..7f25e6de09 100644
--- a/radiopaedia.csl
+++ b/radiopaedia.csl
@@ -418,7 +418,7 @@
     </group>
   </macro>
   <citation et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-names="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <group delimiter=", ">
         <text macro="contributors-short"/>
         <text macro="title-short"/>
diff --git a/revista-argentina-de-antropologia-biologica.csl b/revista-argentina-de-antropologia-biologica.csl
index d4140b0ab2..67c96399a4 100644
--- a/revista-argentina-de-antropologia-biologica.csl
+++ b/revista-argentina-de-antropologia-biologica.csl
@@ -27,7 +27,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" text-case="lowercase" strip-periods="true"/>
+        <label form="short" prefix=" " text-case="lowercase" strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -129,7 +129,7 @@
       <key macro="year-issued"/>
     </sort>
     <layout>
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <date variable="issued" prefix=" " suffix=".">
         <date-part name="year"/>
       </date>
diff --git a/revue-archeologique.csl b/revue-archeologique.csl
index c88166c87b..db9c5cd747 100644
--- a/revue-archeologique.csl
+++ b/revue-archeologique.csl
@@ -124,7 +124,7 @@
         </group>
       </if>
       <else>
-        <text variable="edition" suffix=""/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
diff --git a/revue-de-medecine-veterinaire.csl b/revue-de-medecine-veterinaire.csl
index f651fc68c5..10627eb18a 100644
--- a/revue-de-medecine-veterinaire.csl
+++ b/revue-de-medecine-veterinaire.csl
@@ -40,7 +40,7 @@
     <text variable="publisher" suffix=", "/>
     <text variable="publisher-place" suffix=", "/>
     <date variable="issued">
-      <date-part name="year" suffix=""/>
+      <date-part name="year"/>
     </date>
   </macro>
   <macro name="title">
diff --git a/revue-dhistoire-moderne-et-contemporaine.csl b/revue-dhistoire-moderne-et-contemporaine.csl
index 37d1e2936f..9c1d8b6c95 100644
--- a/revue-dhistoire-moderne-et-contemporaine.csl
+++ b/revue-dhistoire-moderne-et-contemporaine.csl
@@ -117,7 +117,7 @@
         </group>
       </else-if>
       <else-if type="thesis" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" font-style="italic" suffix=","/>
           <text variable="genre" suffix=", " prefix=" "/>
           <text variable="publisher"/>
@@ -130,7 +130,7 @@
         </group>
       </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter="">
+        <group>
           <group suffix=",">
             <text variable="title" text-case="capitalize-first" quotes="true"/>
           </group>
@@ -355,7 +355,7 @@
     </choose>
   </macro>
   <citation>
-    <layout prefix="" suffix="." delimiter="&#160;; ">
+    <layout suffix="." delimiter="&#160;; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
@@ -401,7 +401,7 @@
       <key macro="author" names-min="3" names-use-first="3"/>
       <key variable="issued" sort="descending"/>
     </sort>
-    <layout prefix="" suffix=".">
+    <layout suffix=".">
       <group delimiter=", ">
         <text macro="author-bib"/>
         <text macro="title"/>
diff --git a/rofo.csl b/rofo.csl
index 772d404f9c..c5c4c549e2 100644
--- a/rofo.csl
+++ b/rofo.csl
@@ -119,10 +119,10 @@
           </group>
         </else-if>
         <else>
-          <group delimiter="">
+          <group>
             <text variable="title" suffix=". "/>
             <text variable="container-title" form="short" text-case="title" suffix=" "/>
-            <text macro="year-date" prefix="" suffix="; "/>
+            <text macro="year-date" suffix="; "/>
             <text variable="volume" suffix=":"/>
             <text variable="page" form="short" prefix=" "/>
           </group>
diff --git a/romanian-humanities.csl b/romanian-humanities.csl
index 2815b89666..f3384a05dd 100644
--- a/romanian-humanities.csl
+++ b/romanian-humanities.csl
@@ -169,7 +169,7 @@
     </group>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" et-al-subsequent-min="4" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="false" disambiguate-add-names="true" disambiguate-add-givenname="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/sage-harvard.csl b/sage-harvard.csl
index 8907b1c552..b73020df32 100644
--- a/sage-harvard.csl
+++ b/sage-harvard.csl
@@ -75,7 +75,7 @@
         <text variable="title" font-style="italic"/>
       </if>
       <else>
-        <text variable="title" prefix="" suffix=""/>
+        <text variable="title"/>
       </else>
     </choose>
   </macro>
diff --git a/sage-vancouver.csl b/sage-vancouver.csl
index 620f54b752..caa360bc72 100644
--- a/sage-vancouver.csl
+++ b/sage-vancouver.csl
@@ -58,7 +58,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/scandinavian-journal-of-infectious-diseases.csl b/scandinavian-journal-of-infectious-diseases.csl
index c33b59b552..81b9c108f0 100644
--- a/scandinavian-journal-of-infectious-diseases.csl
+++ b/scandinavian-journal-of-infectious-diseases.csl
@@ -53,7 +53,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="day" prefix=" "/>
           </date>
diff --git a/scandinavian-journal-of-work-environment-and-health.csl b/scandinavian-journal-of-work-environment-and-health.csl
index cd46da3fed..aa46b0b961 100644
--- a/scandinavian-journal-of-work-environment-and-health.csl
+++ b/scandinavian-journal-of-work-environment-and-health.csl
@@ -76,7 +76,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/science-translational-medicine.csl b/science-translational-medicine.csl
index 7de1b4e3ec..53f825d6c0 100644
--- a/science-translational-medicine.csl
+++ b/science-translational-medicine.csl
@@ -19,7 +19,7 @@
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="editor">
-    <names variable="editor" prefix="" suffix="" delimiter=", ">
+    <names variable="editor" delimiter=", ">
       <name initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
       <label form="short" prefix=", " text-case="capitalize-first"/>
     </names>
diff --git a/science-without-titles.csl b/science-without-titles.csl
index 664d71f726..222d75faab 100644
--- a/science-without-titles.csl
+++ b/science-without-titles.csl
@@ -30,7 +30,7 @@
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="editor">
-    <names variable="editor" prefix="" suffix="" delimiter=", ">
+    <names variable="editor" delimiter=", ">
       <name initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
       <label form="short" prefix=", " text-case="capitalize-first"/>
     </names>
diff --git a/science.csl b/science.csl
index 24eba83fe3..9f2209b43e 100644
--- a/science.csl
+++ b/science.csl
@@ -24,7 +24,7 @@
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="editor">
-    <names variable="editor" prefix="" suffix="" delimiter=", ">
+    <names variable="editor" delimiter=", ">
       <name initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
       <label form="short" prefix=", " text-case="capitalize-first"/>
     </names>
diff --git a/sexual-development.csl b/sexual-development.csl
index 27973eedec..8557ef8012 100644
--- a/sexual-development.csl
+++ b/sexual-development.csl
@@ -42,7 +42,7 @@
     </names>
   </macro>
   <macro name="editor">
-    <names variable="editor" suffix="">
+    <names variable="editor">
       <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
       <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
     </names>
@@ -77,7 +77,7 @@
       <else-if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
@@ -145,11 +145,11 @@
   <bibliography et-al-min="7" et-al-use-first="6" hanging-indent="true">
     <layout>
       <text macro="author"/>
-      <text macro="title" suffix=""/>
+      <text macro="title"/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group prefix=". " delimiter=" " suffix=".">
-            <text macro="edition" prefix="" suffix=" "/>
+            <text macro="edition" suffix=" "/>
             <text macro="publisher" prefix=" "/>
           </group>
         </if>
@@ -161,7 +161,7 @@
             <text macro="edition" prefix=", "/>
           </group>
           <group delimiter=", " suffix=".">
-            <text macro="publisher" prefix=""/>
+            <text macro="publisher"/>
             <group delimiter=" ">
               <label variable="page" form="short" strip-periods="true"/>
               <text variable="page"/>
diff --git a/social-studies-of-science.csl b/social-studies-of-science.csl
index adcad30cb7..3a7a4c1880 100644
--- a/social-studies-of-science.csl
+++ b/social-studies-of-science.csl
@@ -29,14 +29,14 @@
     </terms>
   </locale>
   <macro name="editor-translator">
-    <names variable="editor translator" prefix="" suffix="" delimiter=", ">
+    <names variable="editor translator" delimiter=", ">
       <label form="short" prefix=" (" suffix=") " strip-periods="true"/>
       <name and="symbol" delimiter=", "/>
     </names>
   </macro>
   <macro name="editor-translator-short">
     <group suffix=",">
-      <names variable="editor translator" prefix=" " suffix="" delimiter=", ">
+      <names variable="editor translator" prefix=" " delimiter=", ">
         <name and="symbol" delimiter=", "/>
         <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
       </names>
@@ -98,7 +98,7 @@
         <text value="available at "/>
         <text variable="URL" prefix="&lt;" suffix="&gt;"/>
         <group prefix=" (" suffix=")" delimiter=" ">
-          <text term="accessed" text-case="lowercase" suffix=""/>
+          <text term="accessed" text-case="lowercase"/>
           <date variable="accessed" suffix=" ">
             <date-part name="day" suffix=" "/>
             <date-part name="month" suffix=" "/>
@@ -173,7 +173,7 @@
       <key variable="title"/>
     </sort>
     <layout suffix=".">
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <text macro="date" prefix=" (" suffix=")"/>
       <choose>
         <if type="thesis">
@@ -188,8 +188,8 @@
           <group prefix=", ">
             <text term="in" text-case="lowercase"/>
             <text macro="editor-translator-short"/>
-            <text variable="container-title" font-style="italic" prefix=" " suffix=""/>
-            <text variable="collection-title" prefix=", " suffix=""/>
+            <text variable="container-title" font-style="italic" prefix=" "/>
+            <text variable="collection-title" prefix=", "/>
           </group>
           <group prefix=" (" suffix=")" delimiter=", ">
             <text macro="publisher"/>
@@ -200,7 +200,7 @@
             <text macro="title" prefix=" "/>
             <text macro="editor-translator" prefix=" "/>
           </group>
-          <group prefix=" " suffix="">
+          <group prefix=" ">
             <text variable="container-title" font-style="italic" prefix=" "/>
             <text variable="volume" prefix=" "/>
             <text variable="issue" prefix="(" suffix=")"/>
@@ -227,7 +227,7 @@
             <text macro="title" prefix=" "/>
             <text macro="editor-translator" prefix=" "/>
           </group>
-          <group suffix="">
+          <group>
             <text value="paper presented at" text-case="lowercase"/>
             <text variable="event" prefix=" "/>
             <text variable="event-place" prefix=", "/>
@@ -239,7 +239,7 @@
           </group>
         </else-if>
         <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <text macro="title" prefix=" " suffix=""/>
+          <text macro="title" prefix=" "/>
           <group delimiter=", " prefix=" ">
             <text macro="editor-translator-short"/>
             <text variable="collection-title"/>
@@ -256,7 +256,7 @@
             <text macro="title" prefix=" "/>
             <text macro="editor-translator" prefix=" "/>
           </group>
-          <group prefix=" " suffix="">
+          <group prefix=" ">
             <text variable="container-title" font-style="italic"/>
             <group prefix=", ">
               <text variable="volume" font-style="italic"/>
diff --git a/sociedade-brasileira-de-computacao.csl b/sociedade-brasileira-de-computacao.csl
index 7eafe13535..5772ee29c5 100644
--- a/sociedade-brasileira-de-computacao.csl
+++ b/sociedade-brasileira-de-computacao.csl
@@ -119,7 +119,7 @@
     </names>
   </macro>
   <macro name="access">
-    <text variable="URL" prefix=""/>
+    <text variable="URL"/>
     <date variable="accessed" prefix=", [accessed on " suffix="]">
       <date-part name="month" form="short" suffix=" " text-case="capitalize-first"/>
       <date-part name="day"/>
@@ -214,7 +214,7 @@
   <macro name="locators">
     <choose>
       <if type="bill legislation" match="any">
-        <group prefix=". " suffix="" delimiter=", ">
+        <group prefix=". " delimiter=", ">
           <date variable="issued">
             <date-part name="day"/>
             <date-part prefix=" " name="month" form="short"/>
@@ -228,7 +228,7 @@
         <group delimiter=", ">
           <group delimiter=", ">
             <text variable="volume" prefix="v. "/>
-            <text variable="issue" prefix="n. " suffix=""/>
+            <text variable="issue" prefix="n. "/>
           </group>
           <text variable="page" prefix="p. "/>
         </group>
diff --git a/societe-nationale-des-groupements-techniques-veterinaires.csl b/societe-nationale-des-groupements-techniques-veterinaires.csl
index dd067a3782..dc86529417 100644
--- a/societe-nationale-des-groupements-techniques-veterinaires.csl
+++ b/societe-nationale-des-groupements-techniques-veterinaires.csl
@@ -40,7 +40,7 @@
     <group delimiter=" ">
       <group prefix="[" suffix="]" delimiter=" ">
         <text term="cited" text-case="lowercase"/>
-        <date variable="accessed" suffix="">
+        <date variable="accessed">
           <date-part name="year"/>
           <date-part name="month" prefix=" " form="short" strip-periods="true"/>
           <date-part name="day" prefix=" "/>
diff --git a/society-of-biblical-literature-fullnote-bibliography.csl b/society-of-biblical-literature-fullnote-bibliography.csl
index cff08a1879..e2ad3e640c 100644
--- a/society-of-biblical-literature-fullnote-bibliography.csl
+++ b/society-of-biblical-literature-fullnote-bibliography.csl
@@ -719,7 +719,7 @@
     </group>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/socio-economic-review.csl b/socio-economic-review.csl
index 96a403dd8a..ae9e31254a 100644
--- a/socio-economic-review.csl
+++ b/socio-economic-review.csl
@@ -28,7 +28,7 @@
     </terms>
   </locale>
   <macro name="editor-translator">
-    <group suffix="">
+    <group>
       <names variable="editor translator" prefix=" ">
         <name delimiter=", " name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". "/>
         <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
@@ -126,7 +126,7 @@
       <key macro="date"/>
     </sort>
     <layout suffix=".">
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <text macro="date" prefix=" (" suffix=")"/>
       <text macro="title" prefix=" "/>
       <choose>
@@ -134,7 +134,7 @@
           <group prefix=". ">
             <text term="in" text-case="capitalize-first"/>
             <text macro="editor-translator"/>
-            <text variable="container-title" font-style="italic" prefix=" " suffix=""/>
+            <text variable="container-title" font-style="italic" prefix=" "/>
           </group>
           <group prefix=", " delimiter=", ">
             <text macro="publisher"/>
diff --git a/sozialwissenschaften-teilmann.csl b/sozialwissenschaften-teilmann.csl
index 7a88e6c6ed..9cae955f48 100644
--- a/sozialwissenschaften-teilmann.csl
+++ b/sozialwissenschaften-teilmann.csl
@@ -227,7 +227,7 @@ a) mit Name "collection-editor" (in jedem Fall)
       <if variable="author" type="book" match="all">
         <names variable="editor translator" delimiter=", ">
           <!-- Bezeichnung in Kurzform ("hg. v.", "übers. v."). -->
-          <label prefix="" form="verb-short" text-case="lowercase" suffix=". "/>
+          <label form="verb-short" text-case="lowercase" suffix=". "/>
           <!-- Mehrere Herausgeber und/oder Übersetzer durch Komma getrennt,
 	     der letztgenannte durch "und" abgetrennt. -->
           <name and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
@@ -292,7 +292,7 @@ a) mit Name "collection-editor" (in jedem Fall)
       <if variable="container-author" type="chapter" match="all">
         <names variable="editor">
           <!-- Bezeichnung in Kurzform ("hg. v."). -->
-          <label prefix="" form="verb-short" text-case="lowercase" suffix=". "/>
+          <label form="verb-short" text-case="lowercase" suffix=". "/>
           <!-- Mehrere Herausgeber durch Komma getrennt, der letztgenannte
 	     durch "und" abgetrennt. -->
           <name and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
@@ -473,7 +473,7 @@ a) mit Name "collection-editor" (in jedem Fall)
             </group>
           </if>
           <else>
-            <number prefix="" variable="issue" suffix=""/>
+            <number variable="issue"/>
           </else>
         </choose>
       </else-if>
diff --git a/soziologie.csl b/soziologie.csl
index b8bde30454..87cddf28ea 100644
--- a/soziologie.csl
+++ b/soziologie.csl
@@ -47,7 +47,7 @@
       <if type="chapter paper-conference" match="none">
         <names variable="translator" delimiter=", " prefix=" (" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="capitalize-first" suffix=""/>
+          <label form="short" prefix=", " text-case="capitalize-first"/>
           <substitute>
             <names variable="editor"/>
           </substitute>
@@ -326,7 +326,7 @@
   </macro>
   <macro name="citation-locator">
     <group>
-      <text variable="locator" form="long" prefix=""/>
+      <text variable="locator" form="long"/>
     </group>
   </macro>
   <macro name="container">
@@ -389,7 +389,7 @@
         <text macro="issued-year"/>
       </group>
       <group prefix=": ">
-        <text macro="citation-locator" prefix=""/>
+        <text macro="citation-locator"/>
       </group>
     </layout>
   </citation>
diff --git a/spie-bios.csl b/spie-bios.csl
index 1bc8dae985..9e68c73788 100644
--- a/spie-bios.csl
+++ b/spie-bios.csl
@@ -170,7 +170,7 @@
   </macro>
   <macro name="locators">
     <!-- issue is used, volume is always added (including book chapters) -->
-    <group delimiter="">
+    <group>
       <text variable="volume" prefix=" " font-weight="normal"/>
       <text variable="issue" prefix="(" suffix=")" font-weight="normal"/>
     </group>
@@ -199,7 +199,7 @@
     <sort>
       <key variable="citation-number"/>
     </sort>
-    <layout prefix="" suffix="" delimiter=",">
+    <layout delimiter=",">
       <text variable="citation-number" vertical-align="sup"/>
     </layout>
   </citation>
diff --git a/spip-cite.csl b/spip-cite.csl
index ba4d26536c..2f63bb21ab 100644
--- a/spip-cite.csl
+++ b/spip-cite.csl
@@ -20,7 +20,7 @@
         <name et-al-min="1" et-al-use-first="1" delimiter="; " name-as-sort-order="all" sort-separator=", " form="long"/>
       </names>
       <date variable="issued" prefix=" " suffix=") ">
-        <date-part name="year" form="long" prefix="" suffix=""/>
+        <date-part name="year" form="long"/>
       </date>
     </layout>
   </citation>
@@ -29,133 +29,133 @@
       <choose>
         <if type="book">
           <group prefix="&lt;cite|book" suffix="       &gt;">
-            <text variable="title" prefix="|title=" suffix=""/>
-            <names variable="author" prefix="           |authors=" suffix="">
+            <text variable="title" prefix="|title="/>
+            <names variable="author" prefix="           |authors=">
               <name delimiter="; " name-as-sort-order="all" sort-separator=", " form="long"/>
             </names>
-            <date variable="issued" prefix="          |year=" suffix="">
-              <date-part name="year" form="long" prefix="" suffix=""/>
+            <date variable="issued" prefix="          |year=">
+              <date-part name="year" form="long"/>
             </date>
-            <text variable="collection-title" prefix="             |series=" suffix=""/>
-            <text variable="number" prefix="          |volume=" suffix=""/>
-            <text variable="edition" prefix="           |edition=" suffix=""/>
-            <text variable="publisher" prefix="             |publisher=" suffix=""/>
+            <text variable="collection-title" prefix="             |series="/>
+            <text variable="number" prefix="          |volume="/>
+            <text variable="edition" prefix="           |edition="/>
+            <text variable="publisher" prefix="             |publisher="/>
             <text variable="publisher-place" prefix="            |place=" suffix=" "/>
-            <text variable="page" prefix="        |page=" suffix=""/>
-            <text variable="URL" prefix="       |url=" suffix=""/>
-            <text variable="DOI" prefix="       |doi=" suffix=""/>
-            <text variable="ISBN" prefix="        |isbn=" suffix=""/>
+            <text variable="page" prefix="        |page="/>
+            <text variable="URL" prefix="       |url="/>
+            <text variable="DOI" prefix="       |doi="/>
+            <text variable="ISBN" prefix="        |isbn="/>
           </group>
         </if>
         <else-if type="chapter">
           <group prefix="&lt;cite|chapter" suffix="          &gt;">
-            <text variable="title" prefix="|title=" suffix=""/>
-            <names variable="author" prefix="           |authors=" suffix="">
+            <text variable="title" prefix="|title="/>
+            <names variable="author" prefix="           |authors=">
               <name delimiter="; " name-as-sort-order="all" sort-separator=", " form="long"/>
             </names>
-            <text variable="container-title" prefix="            |booktitle=" suffix=""/>
-            <names variable="editor" prefix="           |editors=" suffix="">
+            <text variable="container-title" prefix="            |booktitle="/>
+            <names variable="editor" prefix="           |editors=">
               <name delimiter="; " name-as-sort-order="all" sort-separator=", " form="long" initialize-with=""/>
             </names>
-            <date variable="issued" prefix="          |year=" suffix="">
-              <date-part name="year" form="long" prefix="" suffix=""/>
+            <date variable="issued" prefix="          |year=">
+              <date-part name="year" form="long"/>
             </date>
-            <text variable="collection-title" prefix="             |series=" suffix=""/>
-            <text variable="number" prefix="          |volume=" suffix=""/>
-            <text variable="edition" prefix="           |edition=" suffix=""/>
-            <text variable="publisher" prefix="             |publisher=" suffix=""/>
+            <text variable="collection-title" prefix="             |series="/>
+            <text variable="number" prefix="          |volume="/>
+            <text variable="edition" prefix="           |edition="/>
+            <text variable="publisher" prefix="             |publisher="/>
             <text variable="publisher-place" prefix="            |place=" suffix=" "/>
-            <text variable="page" prefix="        |page=" suffix=""/>
-            <text variable="URL" prefix="       |url=" suffix=""/>
-            <text variable="DOI" prefix="       |doi=" suffix=""/>
-            <text variable="ISBN" prefix="        |isbn=" suffix=""/>
+            <text variable="page" prefix="        |page="/>
+            <text variable="URL" prefix="       |url="/>
+            <text variable="DOI" prefix="       |doi="/>
+            <text variable="ISBN" prefix="        |isbn="/>
           </group>
         </else-if>
         <else-if type="article-journal">
           <group prefix="&lt;cite|journal" suffix="          &gt;">
-            <text variable="title" prefix="|title=" suffix=""/>
-            <names variable="author" prefix="           |authors=" suffix="">
+            <text variable="title" prefix="|title="/>
+            <names variable="author" prefix="           |authors=">
               <name delimiter="; " name-as-sort-order="all" sort-separator=", " form="long"/>
             </names>
-            <text variable="container-title" prefix="            |journal=" suffix=""/>
-            <date variable="issued" prefix="          |year=" suffix="">
-              <date-part name="year" form="long" prefix="" suffix=""/>
+            <text variable="container-title" prefix="            |journal="/>
+            <date variable="issued" prefix="          |year=">
+              <date-part name="year" form="long"/>
             </date>
-            <text variable="volume" prefix="          |volume=" suffix=""/>
-            <text variable="issue" prefix="         |issues=" suffix=""/>
-            <text variable="page" prefix="        |page=" suffix=""/>
-            <text variable="URL" prefix="       |url=" suffix=""/>
-            <text variable="DOI" prefix="       |doi=" suffix=""/>
+            <text variable="volume" prefix="          |volume="/>
+            <text variable="issue" prefix="         |issues="/>
+            <text variable="page" prefix="        |page="/>
+            <text variable="URL" prefix="       |url="/>
+            <text variable="DOI" prefix="       |doi="/>
           </group>
         </else-if>
         <else-if type="report">
           <group prefix="&lt;cite|report" suffix="         &gt;">
-            <text variable="title" prefix="|title=" suffix=""/>
-            <names variable="author" prefix="           |authors=" suffix="">
+            <text variable="title" prefix="|title="/>
+            <names variable="author" prefix="           |authors=">
               <name delimiter="; " name-as-sort-order="all" sort-separator=", " form="long"/>
             </names>
-            <date variable="issued" prefix="          |year=" suffix="">
-              <date-part name="year" form="long" prefix="" suffix=""/>
+            <date variable="issued" prefix="          |year=">
+              <date-part name="year" form="long"/>
             </date>
-            <text variable="genre" prefix="         |report_type=" suffix=""/>
-            <text variable="number" prefix="          |number=" suffix=""/>
-            <text variable="publisher" prefix="             |institution=" suffix=""/>
+            <text variable="genre" prefix="         |report_type="/>
+            <text variable="number" prefix="          |number="/>
+            <text variable="publisher" prefix="             |institution="/>
             <text variable="publisher-place" prefix="            |place=" suffix=" "/>
-            <text variable="page" prefix="        |page=" suffix=""/>
-            <text variable="URL" prefix="       |url=" suffix=""/>
-            <text variable="DOI" prefix="       |doi=" suffix=""/>
-            <text variable="ISBN" prefix="        |isbn=" suffix=""/>
+            <text variable="page" prefix="        |page="/>
+            <text variable="URL" prefix="       |url="/>
+            <text variable="DOI" prefix="       |doi="/>
+            <text variable="ISBN" prefix="        |isbn="/>
           </group>
         </else-if>
         <else-if type="thesis">
           <group prefix="&lt;cite|thesis" suffix="         &gt;">
-            <text variable="title" prefix="|title=" suffix=""/>
-            <names variable="author" prefix="           |authors=" suffix="">
+            <text variable="title" prefix="|title="/>
+            <names variable="author" prefix="           |authors=">
               <name delimiter="; " name-as-sort-order="all" sort-separator=", " form="long"/>
             </names>
-            <date variable="issued" prefix="          |year=" suffix="">
-              <date-part name="year" form="long" prefix="" suffix=""/>
+            <date variable="issued" prefix="          |year=">
+              <date-part name="year" form="long"/>
             </date>
-            <text variable="genre" prefix="         |thesis_type=" suffix=""/>
-            <text variable="publisher" prefix="             |university=" suffix=""/>
+            <text variable="genre" prefix="         |thesis_type="/>
+            <text variable="publisher" prefix="             |university="/>
             <text variable="publisher-place" prefix="            |place=" suffix=" "/>
-            <text variable="page" prefix="        |page=" suffix=""/>
-            <text variable="URL" prefix="       |url=" suffix=""/>
+            <text variable="page" prefix="        |page="/>
+            <text variable="URL" prefix="       |url="/>
           </group>
         </else-if>
         <else-if type="webpage">
           <group prefix="&lt;cite|web" suffix="             &gt;">
-            <text variable="title" prefix="|title=" suffix=""/>
-            <names variable="author" prefix="           |authors=" suffix="">
+            <text variable="title" prefix="|title="/>
+            <names variable="author" prefix="           |authors=">
               <name delimiter="; " name-as-sort-order="all" sort-separator=", " form="long"/>
             </names>
-            <date variable="accessed" prefix="            |accessdate=" suffix="">
-              <date-part name="year" form="long" prefix="" suffix=""/>
-              <date-part name="month" form="numeric-leading-zeros" prefix="/" suffix=""/>
-              <date-part name="day" form="numeric" prefix="/" suffix=""/>
+            <date variable="accessed" prefix="            |accessdate=">
+              <date-part name="year" form="long"/>
+              <date-part name="month" form="numeric-leading-zeros" prefix="/"/>
+              <date-part name="day" form="numeric" prefix="/"/>
             </date>
-            <text variable="container-title" prefix="            |site=" suffix=""/>
-            <text variable="URL" prefix="       |url=" suffix=""/>
+            <text variable="container-title" prefix="            |site="/>
+            <text variable="URL" prefix="       |url="/>
           </group>
         </else-if>
         <else>
           <group prefix="&lt;cite|book" suffix="       &gt;">
-            <text variable="title" prefix="|title=" suffix=""/>
-            <names variable="author" prefix="           |authors=" suffix="">
+            <text variable="title" prefix="|title="/>
+            <names variable="author" prefix="           |authors=">
               <name delimiter="; " name-as-sort-order="all" sort-separator=", " form="long"/>
             </names>
-            <date variable="issued" prefix="          |year=" suffix="">
-              <date-part name="year" form="long" prefix="" suffix=""/>
+            <date variable="issued" prefix="          |year=">
+              <date-part name="year" form="long"/>
             </date>
-            <text variable="collection-title" prefix="             |series=" suffix=""/>
-            <text variable="number" prefix="          |volume=" suffix=""/>
-            <text variable="edition" prefix="           |edition=" suffix=""/>
-            <text variable="publisher" prefix="             |publisher=" suffix=""/>
+            <text variable="collection-title" prefix="             |series="/>
+            <text variable="number" prefix="          |volume="/>
+            <text variable="edition" prefix="           |edition="/>
+            <text variable="publisher" prefix="             |publisher="/>
             <text variable="publisher-place" prefix="            |place=" suffix=" "/>
-            <text variable="page" prefix="        |page=" suffix=""/>
-            <text variable="URL" prefix="       |url=" suffix=""/>
-            <text variable="DOI" prefix="       |doi=" suffix=""/>
-            <text variable="ISBN" prefix="        |isbn=" suffix=""/>
+            <text variable="page" prefix="        |page="/>
+            <text variable="URL" prefix="       |url="/>
+            <text variable="DOI" prefix="       |doi="/>
+            <text variable="ISBN" prefix="        |isbn="/>
           </group>
         </else>
       </choose>
diff --git a/springer-basic-author-date-no-et-al.csl b/springer-basic-author-date-no-et-al.csl
index 133eeca5b1..72d575a067 100644
--- a/springer-basic-author-date-no-et-al.csl
+++ b/springer-basic-author-date-no-et-al.csl
@@ -136,7 +136,7 @@
 		   in long author lists will also be accepted:
 		   Smith J, Jones M Jr, Houghton L et al (1999)
 		   Future of health insurance. N Engl J Med 965:325-329   -->
-              <group delimiter="">
+              <group>
                 <text variable="container-title" suffix=" " form="short" strip-periods="true"/>
                 <text variable="volume" suffix=":"/>
                 <text variable="page" suffix="."/>
@@ -168,7 +168,7 @@
 	       Royal Society of Chemistry. Available via DIALOG.
 	       http://www.rsc.org/dose/title of subordinate document. Accessed 15 Jan 1999
 	       Unfortunately, "Royal Society of Chemistry. Available via DIALOG." cannot seem to be mapped here -->
-          <group delimiter="">
+          <group>
             <text prefix="In: " variable="container-title" suffix=". " form="short"/>
             <text variable="URL" suffix=". "/>
             <date variable="accessed">
@@ -188,7 +188,7 @@
         </else-if>
         <else>
           <!--    None of the provided formats need to add manually (some data provided) -->
-          <group delimiter="">
+          <group>
             <text variable="container-title" form="short" suffix=" "/>
             <text variable="volume" suffix=":"/>
             <text variable="page" suffix="."/>
diff --git a/springer-basic-author-date.csl b/springer-basic-author-date.csl
index cad82a7f75..be2e678340 100644
--- a/springer-basic-author-date.csl
+++ b/springer-basic-author-date.csl
@@ -136,7 +136,7 @@
 		   in long author lists will also be accepted:
 		   Smith J, Jones M Jr, Houghton L et al (1999)
 		   Future of health insurance. N Engl J Med 965:325-329   -->
-              <group delimiter="">
+              <group>
                 <text variable="container-title" suffix=" " form="short" strip-periods="true"/>
                 <text variable="volume" suffix=":"/>
                 <text variable="page" suffix="."/>
@@ -168,7 +168,7 @@
 	       Royal Society of Chemistry. Available via DIALOG.
 	       http://www.rsc.org/dose/title of subordinate document. Accessed 15 Jan 1999
 	       Unfortunately, "Royal Society of Chemistry. Available via DIALOG." cannot seem to be mapped here -->
-          <group delimiter="">
+          <group>
             <text prefix="In: " variable="container-title" suffix=". " form="short"/>
             <text variable="URL" suffix=". "/>
             <date variable="accessed">
@@ -188,7 +188,7 @@
         </else-if>
         <else>
           <!--    None of the provided formats need to add manually (some data provided) -->
-          <group delimiter="">
+          <group>
             <text variable="container-title" form="short" suffix=" "/>
             <text variable="volume" suffix=":"/>
             <text variable="page" suffix="."/>
diff --git a/springer-basic-brackets-no-et-al.csl b/springer-basic-brackets-no-et-al.csl
index a903f757f5..de5cb5289d 100644
--- a/springer-basic-brackets-no-et-al.csl
+++ b/springer-basic-brackets-no-et-al.csl
@@ -127,7 +127,7 @@
 		   in long author lists will also be accepted:
 		   Smith J, Jones M Jr, Houghton L et al (1999)
 		   Future of health insurance. N Engl J Med 965:325-329   -->
-              <group delimiter="">
+              <group>
                 <text variable="container-title" suffix=" " form="short" strip-periods="true"/>
                 <text variable="volume" suffix=":"/>
                 <text variable="page" suffix="."/>
@@ -159,7 +159,7 @@
 	       Royal Society of Chemistry. Available via DIALOG.
 	       http://www.rsc.org/dose/title of subordinate document. Accessed 15 Jan 1999
 	       Unfortunately, "Royal Society of Chemistry. Available via DIALOG." cannot seem to be mapped here -->
-          <group delimiter="">
+          <group>
             <text prefix="In: " variable="container-title" suffix=". " form="short"/>
             <text variable="URL" suffix=". "/>
             <date variable="accessed">
@@ -179,7 +179,7 @@
         </else-if>
         <else>
           <!--    None of the provided formats need to add manually (some data provided) -->
-          <group delimiter="">
+          <group>
             <text variable="container-title" form="short" suffix=" "/>
             <text variable="volume" suffix=":"/>
             <text variable="page" suffix="."/>
diff --git a/springer-basic-brackets.csl b/springer-basic-brackets.csl
index cc5abe2fd7..d6debd6884 100644
--- a/springer-basic-brackets.csl
+++ b/springer-basic-brackets.csl
@@ -127,7 +127,7 @@
 		   in long author lists will also be accepted:
 		   Smith J, Jones M Jr, Houghton L et al (1999)
 		   Future of health insurance. N Engl J Med 965:325-329   -->
-              <group delimiter="">
+              <group>
                 <text variable="container-title" suffix=" " form="short" strip-periods="true"/>
                 <text variable="volume" suffix=":"/>
                 <text variable="page" suffix="."/>
@@ -159,7 +159,7 @@
 	       Royal Society of Chemistry. Available via DIALOG.
 	       http://www.rsc.org/dose/title of subordinate document. Accessed 15 Jan 1999
 	       Unfortunately, "Royal Society of Chemistry. Available via DIALOG." cannot seem to be mapped here -->
-          <group delimiter="">
+          <group>
             <text prefix="In: " variable="container-title" suffix=". " form="short"/>
             <text variable="URL" suffix=". "/>
             <date variable="accessed">
@@ -179,7 +179,7 @@
         </else-if>
         <else>
           <!--    None of the provided formats need to add manually (some data provided) -->
-          <group delimiter="">
+          <group>
             <text variable="container-title" form="short" suffix=" "/>
             <text variable="volume" suffix=":"/>
             <text variable="page" suffix="."/>
diff --git a/springer-lecture-notes-in-computer-science-alphabetical.csl b/springer-lecture-notes-in-computer-science-alphabetical.csl
index cb3fcc3dce..4aff7f74c3 100644
--- a/springer-lecture-notes-in-computer-science-alphabetical.csl
+++ b/springer-lecture-notes-in-computer-science-alphabetical.csl
@@ -24,10 +24,10 @@
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
-    <group suffix="">
+    <group>
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
         </substitute>
diff --git a/springer-lecture-notes-in-computer-science.csl b/springer-lecture-notes-in-computer-science.csl
index b800bdf8ce..c1b7a1f400 100644
--- a/springer-lecture-notes-in-computer-science.csl
+++ b/springer-lecture-notes-in-computer-science.csl
@@ -19,10 +19,10 @@
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
-    <group suffix="">
+    <group>
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
         </substitute>
diff --git a/springer-mathphys-author-date.csl b/springer-mathphys-author-date.csl
index 982b3f0171..1df2f3ac5c 100644
--- a/springer-mathphys-author-date.csl
+++ b/springer-mathphys-author-date.csl
@@ -61,10 +61,10 @@
     </choose>
   </macro>
   <macro name="author">
-    <group suffix="">
+    <group>
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" text-case="lowercase" strip-periods="true"/>
+        <label form="short" prefix=" " text-case="lowercase" strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
         </substitute>
diff --git a/springer-mathphys-brackets.csl b/springer-mathphys-brackets.csl
index 5738cc17f2..1ed44461cd 100644
--- a/springer-mathphys-brackets.csl
+++ b/springer-mathphys-brackets.csl
@@ -21,10 +21,10 @@
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
-    <group suffix="">
+    <group>
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" text-case="lowercase" strip-periods="true"/>
+        <label form="short" prefix=" " text-case="lowercase" strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
         </substitute>
diff --git a/springer-socpsych-author-date.csl b/springer-socpsych-author-date.csl
index 1736e196cd..1df2399b86 100644
--- a/springer-socpsych-author-date.csl
+++ b/springer-socpsych-author-date.csl
@@ -47,7 +47,7 @@
       <if type="article-journal chapter paper-conference" match="none">
         <names variable="translator editor" delimiter=", " prefix=" (" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="title" suffix=""/>
+          <label form="short" prefix=", " text-case="title"/>
         </names>
       </if>
     </choose>
diff --git a/springer-socpsych-brackets.csl b/springer-socpsych-brackets.csl
index f2d23c4206..ab34c9a7fa 100644
--- a/springer-socpsych-brackets.csl
+++ b/springer-socpsych-brackets.csl
@@ -48,7 +48,7 @@
       <if type="article-journal chapter paper-conference" match="none">
         <names variable="translator editor" delimiter=", " prefix=" (" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="title" suffix=""/>
+          <label form="short" prefix=", " text-case="title"/>
         </names>
       </if>
     </choose>
diff --git a/springer-vancouver.csl b/springer-vancouver.csl
index 6f6551cb0c..fc82e17ce4 100644
--- a/springer-vancouver.csl
+++ b/springer-vancouver.csl
@@ -159,7 +159,7 @@
 	       Royal Society of Chemistry. Available via DIALOG.
 	       http://www.rsc.org/dose/title of subordinate document. Accessed 15 Jan 1999
 	       Unfortunately, "Royal Society of Chemistry. Available via DIALOG." cannot seem to be mapped here -->
-          <group delimiter="">
+          <group>
             <text prefix="In: " variable="container-title" suffix=". " form="short"/>
             <text variable="URL" suffix=". "/>
             <date variable="accessed">
@@ -179,7 +179,7 @@
         </else-if>
         <else>
           <!--    None of the provided formats need to add manually (some data provided) -->
-          <group delimiter="">
+          <group>
             <text variable="container-title" form="short" suffix=" "/>
             <text variable="volume" suffix=":"/>
             <text variable="page" suffix="."/>
diff --git a/springerprotocols.csl b/springerprotocols.csl
index 9ddee2f279..2e50f42fcc 100644
--- a/springerprotocols.csl
+++ b/springerprotocols.csl
@@ -18,7 +18,7 @@
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
-    <group suffix="">
+    <group>
       <names variable="author">
         <name initialize-with="." delimiter=", " and="text"/>
         <label form="short" prefix=", " suffix=", " text-case="capitalize-first" strip-periods="true"/>
diff --git a/st-patricks-college.csl b/st-patricks-college.csl
index d2ed41e4b1..e46bf5e1f4 100644
--- a/st-patricks-college.csl
+++ b/st-patricks-college.csl
@@ -73,11 +73,11 @@
       <if is-numeric="edition">
         <group delimiter=" ">
           <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short" suffix="" text-case="lowercase" strip-periods="true"/>
+          <text term="edition" form="short" text-case="lowercase" strip-periods="true"/>
         </group>
       </if>
       <else>
-        <text variable="edition" suffix=""/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
@@ -95,7 +95,7 @@
   </macro>
   <macro name="access">
     <group delimiter=" ">
-      <text variable="archive" prefix="" suffix="" font-style="italic"/>
+      <text variable="archive" font-style="italic"/>
       <text macro="location" prefix="[Online]. "/>
       <group prefix="(" suffix=")">
         <text term="accessed" text-case="capitalize-first" suffix=": "/>
@@ -110,10 +110,10 @@
   <macro name="location">
     <choose>
       <if variable="DOI">
-        <text variable="DOI" prefix="doi:" suffix=""/>
+        <text variable="DOI" prefix="doi:"/>
       </if>
       <else-if variable="URL">
-        <text variable="URL" prefix="Available at: " suffix=""/>
+        <text variable="URL" prefix="Available at: "/>
       </else-if>
     </choose>
   </macro>
@@ -150,7 +150,7 @@
   </macro>
   <macro name="pages">
     <group>
-      <!-- <label variable="page" form="short" suffix=""/> -->
+      <!-- <label variable="page" form="short"/> -->
       <text variable="page" form="short" prefix="pp."/>
     </group>
   </macro>
@@ -181,7 +181,7 @@
       <key variable="title"/>
     </sort>
     <layout>
-      <group delimiter=". " suffix="">
+      <group delimiter=". ">
         <!--
  <text variable="type" prefix="[DEBUG: " suffix="]"/> 
 -->
diff --git a/standards-in-genomic-sciences.csl b/standards-in-genomic-sciences.csl
index d5cdc4a703..1fef2d1152 100644
--- a/standards-in-genomic-sciences.csl
+++ b/standards-in-genomic-sciences.csl
@@ -31,7 +31,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <et-al font-style="italic"/>
         <substitute>
           <names variable="editor"/>
diff --git a/stavebni-obzor.csl b/stavebni-obzor.csl
index b36ae7a38d..bc58ae0c4b 100644
--- a/stavebni-obzor.csl
+++ b/stavebni-obzor.csl
@@ -48,7 +48,7 @@
     <choose>
       <if variable="issued">
         <date variable="issued">
-          <date-part name="year" form="long" suffix=""/>
+          <date-part name="year" form="long"/>
         </date>
       </if>
       <else>
diff --git a/stem-cells.csl b/stem-cells.csl
index db245fc36f..e3ab2eb763 100644
--- a/stem-cells.csl
+++ b/stem-cells.csl
@@ -32,7 +32,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
diff --git a/strahlentherapie-und-onkologie.csl b/strahlentherapie-und-onkologie.csl
index 7098ce942e..1c685f059c 100644
--- a/strahlentherapie-und-onkologie.csl
+++ b/strahlentherapie-und-onkologie.csl
@@ -54,7 +54,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/strategic-management-journal.csl b/strategic-management-journal.csl
index 1c799a0dd2..80681d0c2f 100644
--- a/strategic-management-journal.csl
+++ b/strategic-management-journal.csl
@@ -207,7 +207,7 @@
       <key variable="issued"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter="">
+      <group>
         <text macro="author-short" suffix=", "/>
         <text macro="issued-year"/>
         <text macro="citation-locator" prefix=": "/>
diff --git a/stroke.csl b/stroke.csl
index 0e868a4e4b..458934b046 100644
--- a/stroke.csl
+++ b/stroke.csl
@@ -64,7 +64,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/studii-teologice.csl b/studii-teologice.csl
index b8e0aa320f..9979078178 100644
--- a/studii-teologice.csl
+++ b/studii-teologice.csl
@@ -256,7 +256,7 @@
     </group>
   </macro>
   <citation et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="false" disambiguate-add-names="true" disambiguate-add-givenname="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/stuttgart-media-university.csl b/stuttgart-media-university.csl
index 81929c8ae8..5b7bf0cf7c 100644
--- a/stuttgart-media-university.csl
+++ b/stuttgart-media-university.csl
@@ -69,7 +69,7 @@
   </macro>
   <macro name="editor">
     <names variable="editor" delimiter="; ">
-      <name name-as-sort-order="all" sort-separator=", " delimiter="; " delimiter-precedes-last="never" form="long" suffix=""/>
+      <name name-as-sort-order="all" sort-separator=", " delimiter="; " delimiter-precedes-last="never" form="long"/>
       <label form="short" prefix=" (" suffix=")"/>
     </names>
   </macro>
@@ -148,7 +148,7 @@
                   <group>
                     <text term="volume" form="short" text-case="lowercase" suffix=". " strip-periods="true"/>
                     <number variable="volume" form="numeric"/>
-                    <label variable="locator" form="short" prefix=", " suffix=""/>
+                    <label variable="locator" form="short" prefix=", "/>
                   </group>
                 </if>
                 <else>
diff --git a/surgical-neurology-international.csl b/surgical-neurology-international.csl
index ad2ea2c754..c17acfb4fa 100644
--- a/surgical-neurology-international.csl
+++ b/surgical-neurology-international.csl
@@ -50,7 +50,7 @@
       <if variable="URL">
         <text value="Available:" suffix=" "/>
         <text variable="URL" suffix="."/>
-        <group prefix=" " suffix="">
+        <group prefix=" ">
           <text term="accessed" text-case="capitalize-first" suffix=" "/>
           <date variable="accessed">
             <date-part name="day" suffix=" "/>
diff --git a/systematic-biology.csl b/systematic-biology.csl
index 0c8225646e..65e21d5372 100644
--- a/systematic-biology.csl
+++ b/systematic-biology.csl
@@ -18,7 +18,7 @@
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
-    <names variable="author" prefix="" suffix=" ">
+    <names variable="author" suffix=" ">
       <name delimiter=", " name-as-sort-order="all" sort-separator=" " form="long" initialize-with="."/>
     </names>
   </macro>
@@ -28,12 +28,12 @@
     </names>
   </macro>
   <macro name="year">
-    <date variable="issued" prefix="" suffix=". ">
+    <date variable="issued" suffix=". ">
       <date-part name="year"/>
     </date>
   </macro>
   <macro name="title">
-    <text variable="title" prefix="" suffix=". "/>
+    <text variable="title" suffix=". "/>
   </macro>
   <citation disambiguate-add-year-suffix="true" collapse="year" et-al-min="3" et-al-use-first="1">
     <sort>
@@ -41,12 +41,12 @@
       <key variable="issued" sort="ascending"/>
     </sort>
     <layout delimiter="; " prefix="(" suffix=")">
-      <group delimiter=" " prefix="" suffix="">
-        <names variable="author" prefix="" suffix="">
+      <group delimiter=" ">
+        <names variable="author">
           <name and="text" delimiter=" " name-as-sort-order="all" sort-separator=", " form="short"/>
         </names>
-        <date variable="issued" prefix="" suffix="">
-          <date-part name="year" form="long" prefix="" suffix=""/>
+        <date variable="issued">
+          <date-part name="year" form="long"/>
         </date>
       </group>
     </layout>
@@ -62,24 +62,24 @@
       <text macro="title"/>
       <choose>
         <if type="book">
-          <text variable="publisher-place" prefix="" suffix=": "/>
-          <text variable="publisher" prefix="" suffix=" "/>
+          <text variable="publisher-place" suffix=": "/>
+          <text variable="publisher" suffix=" "/>
         </if>
         <else-if type="chapter">
           <text macro="editor"/>
-          <text variable="container-title" prefix="" suffix=". "/>
-          <text variable="publisher-place" prefix="" suffix=": "/>
-          <text variable="publisher" prefix="" suffix=". "/>
+          <text variable="container-title" suffix=". "/>
+          <text variable="publisher-place" suffix=": "/>
+          <text variable="publisher" suffix=". "/>
           <text variable="page" prefix="p. " suffix=". "/>
         </else-if>
         <else-if type="webpage">
           <text variable="URL" prefix="Available from " suffix=". "/>
         </else-if>
         <else>
-          <group delimiter="" prefix="" suffix=". ">
-            <text variable="container-title" prefix="" suffix=". " form="short"/>
-            <text variable="volume" prefix="" suffix=":"/>
-            <text variable="page" prefix="" suffix="."/>
+          <group suffix=". ">
+            <text variable="container-title" suffix=". " form="short"/>
+            <text variable="volume" suffix=":"/>
+            <text variable="page" suffix="."/>
           </group>
         </else>
       </choose>
diff --git a/taylor-and-francis-council-of-science-editors-author-date.csl b/taylor-and-francis-council-of-science-editors-author-date.csl
index 9504f95200..4fd561d340 100644
--- a/taylor-and-francis-council-of-science-editors-author-date.csl
+++ b/taylor-and-francis-council-of-science-editors-author-date.csl
@@ -164,7 +164,7 @@
     </sort>
     <layout>
       <group suffix="." delimiter=". ">
-        <text macro="author" suffix=""/>
+        <text macro="author"/>
         <text macro="year-date"/>
         <text macro="title"/>
       </group>
@@ -175,7 +175,7 @@
               <text macro="edition"/>
               <text macro="editor-translator"/>
             </group>
-            <text prefix=" " suffix="" macro="publisher"/>
+            <text prefix=" " macro="publisher"/>
           </if>
           <else-if type="chapter paper-conference" match="any">
             <text term="in" text-case="capitalize-first" suffix=":" prefix=" "/>
diff --git a/technische-universitat-munchen-controlling.csl b/technische-universitat-munchen-controlling.csl
index da0402a6f0..394d094520 100644
--- a/technische-universitat-munchen-controlling.csl
+++ b/technische-universitat-munchen-controlling.csl
@@ -130,7 +130,7 @@
                   <group>
                     <text term="volume" form="short" text-case="lowercase" suffix=". " strip-periods="true"/>
                     <number variable="volume" form="numeric"/>
-                    <label variable="locator" form="short" prefix=", " suffix=""/>
+                    <label variable="locator" form="short" prefix=", "/>
                   </group>
                 </if>
                 <else>
@@ -162,7 +162,7 @@
     <text variable="locator"/>
   </macro>
   <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true">
-    <layout delimiter="; " suffix="">
+    <layout delimiter="; ">
       <text macro="author-short"/>
       <text macro="year-date" prefix="(" suffix=")"/>
       <text macro="point-locators"/>
diff --git a/technische-universitat-wien.csl b/technische-universitat-wien.csl
index fdcd5cad6b..8c42fc9561 100644
--- a/technische-universitat-wien.csl
+++ b/technische-universitat-wien.csl
@@ -62,7 +62,7 @@
   <macro name="editor">
     <names variable="editor translator">
       <name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
-      <label form="short" prefix=" " suffix="" strip-periods="true"/>
+      <label form="short" prefix=" " strip-periods="true"/>
     </names>
   </macro>
   <macro name="accessed">
@@ -133,7 +133,7 @@
                   <group>
                     <text term="volume" form="short" text-case="lowercase" suffix=". " strip-periods="true"/>
                     <number variable="volume" form="numeric"/>
-                    <label variable="locator" form="short" prefix=", " suffix=""/>
+                    <label variable="locator" form="short" prefix=", "/>
                   </group>
                 </if>
                 <else>
diff --git a/teologia-catalunya.csl b/teologia-catalunya.csl
index c5548960b2..3623f9714c 100644
--- a/teologia-catalunya.csl
+++ b/teologia-catalunya.csl
@@ -266,7 +266,7 @@
     <choose>
       <if is-numeric="edition">
         <text variable="edition" prefix=" " vertical-align="sup"/>
-        <text macro="issued" prefix=""/>
+        <text macro="issued"/>
       </if>
       <else>
         <text variable="edition" prefix=", "/>
@@ -282,7 +282,7 @@
     </choose>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/tgm-wien-diplom.csl b/tgm-wien-diplom.csl
index ab858e00a9..788c9a623c 100644
--- a/tgm-wien-diplom.csl
+++ b/tgm-wien-diplom.csl
@@ -61,7 +61,7 @@
   <macro name="editor">
     <names variable="editor translator">
       <name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
-      <label form="short" prefix=" " suffix="" strip-periods="true"/>
+      <label form="short" prefix=" " strip-periods="true"/>
     </names>
   </macro>
   <macro name="accessed">
@@ -132,7 +132,7 @@
                   <group>
                     <text term="volume" form="short" text-case="lowercase" suffix=". " strip-periods="true"/>
                     <number variable="volume" form="numeric"/>
-                    <label variable="locator" form="short" prefix=", " suffix=""/>
+                    <label variable="locator" form="short" prefix=", "/>
                   </group>
                 </if>
                 <else>
diff --git a/the-american-journal-of-cardiology.csl b/the-american-journal-of-cardiology.csl
index 7dbc4e9c79..9b20f0f2a6 100644
--- a/the-american-journal-of-cardiology.csl
+++ b/the-american-journal-of-cardiology.csl
@@ -31,7 +31,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
diff --git a/the-american-journal-of-gastroenterology.csl b/the-american-journal-of-gastroenterology.csl
index 3d85e135ea..d9d1a7ef71 100644
--- a/the-american-journal-of-gastroenterology.csl
+++ b/the-american-journal-of-gastroenterology.csl
@@ -40,7 +40,7 @@
     <group delimiter=" ">
       <group prefix="[" suffix="]" delimiter=" ">
         <text term="cited" text-case="lowercase"/>
-        <date variable="accessed" suffix="">
+        <date variable="accessed">
           <date-part name="year"/>
           <date-part name="month" prefix=" " form="short" strip-periods="true"/>
           <date-part name="day" prefix=" "/>
diff --git a/the-american-journal-of-geriatric-pharmacotherapy.csl b/the-american-journal-of-geriatric-pharmacotherapy.csl
index 434fb07fff..6edd328dd1 100644
--- a/the-american-journal-of-geriatric-pharmacotherapy.csl
+++ b/the-american-journal-of-geriatric-pharmacotherapy.csl
@@ -31,7 +31,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -43,7 +43,7 @@
     <group>
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -141,16 +141,16 @@
   </citation>
   <bibliography hanging-indent="false" et-al-min="4" et-al-use-first="3">
     <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
+      <text variable="citation-number" suffix=". "/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture song" match="any">
           <group suffix=".">
-            <text macro="author" suffix=""/>
+            <text macro="author"/>
             <text macro="title" prefix=" " suffix="."/>
             <text macro="edition" prefix=" "/>
             <text macro="editor" prefix=" (" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
           <group suffix="." prefix="; ">
             <date variable="issued">
               <date-part name="year"/>
@@ -159,7 +159,7 @@
           </group>
         </if>
         <else-if type="chapter paper-conference" match="any">
-          <text macro="author" suffix=""/>
+          <text macro="author"/>
           <text macro="title" prefix=" " suffix="."/>
           <group prefix=" ">
             <text term="in" text-case="capitalize-first" suffix=": "/>
@@ -181,13 +181,13 @@
         </else-if>
         <else-if type="report">
           <text macro="title" suffix=". "/>
-          <text macro="product-label-publisher" prefix=" " suffix=""/>
+          <text macro="product-label-publisher" prefix=" "/>
           <text macro="report-author" prefix=" " strip-periods="true" suffix=";"/>
           <text macro="year-date" prefix=" " suffix="."/>
         </else-if>
         <else>
           <group suffix=".">
-            <text macro="author" suffix=""/>
+            <text macro="author"/>
             <text macro="title" prefix=" "/>
             <text macro="editor" prefix=" "/>
           </group>
diff --git a/the-american-journal-of-pathology.csl b/the-american-journal-of-pathology.csl
index b9e6607e7c..757411198e 100644
--- a/the-american-journal-of-pathology.csl
+++ b/the-american-journal-of-pathology.csl
@@ -82,7 +82,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
@@ -94,7 +94,7 @@
   <macro name="container-title">
     <choose>
       <if type="article-journal article-magazine chapter paper-conference article-newspaper" match="any">
-        <group suffix="" delimiter=" ">
+        <group delimiter=" ">
           <text variable="container-title" form="short" strip-periods="true"/>
           <choose>
             <if variable="URL">
diff --git a/the-american-journal-of-psychiatry.csl b/the-american-journal-of-psychiatry.csl
index 5b782bfca7..2543bb8d64 100644
--- a/the-american-journal-of-psychiatry.csl
+++ b/the-american-journal-of-psychiatry.csl
@@ -33,7 +33,7 @@
     <group delimiter=" ">
       <group prefix="[" suffix="]" delimiter=" ">
         <text term="cited" text-case="lowercase"/>
-        <date variable="accessed" suffix="">
+        <date variable="accessed">
           <date-part name="year"/>
           <date-part name="month" prefix=" " form="short" strip-periods="true"/>
           <date-part name="day" prefix=" "/>
diff --git a/the-astrophysical-journal.csl b/the-astrophysical-journal.csl
index f8f671fb38..c4cdf36512 100644
--- a/the-astrophysical-journal.csl
+++ b/the-astrophysical-journal.csl
@@ -58,7 +58,7 @@
   <macro name="issuance">
     <choose>
       <if type="bill book graphic legal_case legislation motion_picture report song chapter paper-conference" match="any">
-        <group delimiter=", " prefix="" suffix=",">
+        <group delimiter=", " suffix=",">
           <text variable="publisher" form="long"/>
           <date variable="issued">
             <date-part name="year"/>
@@ -66,7 +66,7 @@
         </group>
       </if>
       <else>
-        <date prefix="" suffix="," variable="issued">
+        <date suffix="," variable="issued">
           <date-part name="year"/>
         </date>
       </else>
diff --git a/the-auk.csl b/the-auk.csl
index 940a8637fa..5b80770dd3 100644
--- a/the-auk.csl
+++ b/the-auk.csl
@@ -98,7 +98,7 @@
         </group>
       </if>
       <else>
-        <text prefix="" term="no date" suffix=""/>
+        <text term="no date"/>
       </else>
     </choose>
   </macro>
diff --git a/the-embo-journal.csl b/the-embo-journal.csl
index 296fa7b869..c1fd1919da 100644
--- a/the-embo-journal.csl
+++ b/the-embo-journal.csl
@@ -72,7 +72,7 @@
     <text variable="title"/>
   </macro>
   <macro name="publisher">
-    <group prefix="" delimiter=": " suffix="">
+    <group delimiter=": ">
       <text variable="publisher-place"/>
       <text variable="publisher"/>
     </group>
@@ -109,7 +109,7 @@
       <key macro="author"/>
       <key variable="issued"/>
     </sort>
-    <layout suffix="">
+    <layout>
       <text macro="author"/>
       <date variable="issued" prefix=" (" suffix=")">
         <date-part name="year"/>
diff --git a/the-institute-of-electronics-information-and-communication-engineers.csl b/the-institute-of-electronics-information-and-communication-engineers.csl
index 9e56bbe8f4..649643cb10 100644
--- a/the-institute-of-electronics-information-and-communication-engineers.csl
+++ b/the-institute-of-electronics-information-and-communication-engineers.csl
@@ -76,7 +76,7 @@
   <macro name="locators">
     <group delimiter=", ">
       <text macro="edition"/>
-      <group delimiter="">
+      <group>
         <text term="volume" form="short"/>
         <number variable="volume" form="numeric"/>
       </group>
@@ -163,7 +163,7 @@
       <!-- Citation Number -->
       <text variable="citation-number" prefix="[" suffix="]"/>
       <!-- Author(s) -->
-      <text macro="author" prefix="" suffix=", "/>
+      <text macro="author" suffix=", "/>
       <!-- Rest of Citation -->
       <choose>
         <!-- Specific Formats -->
diff --git a/the-journal-of-adhesive-dentistry.csl b/the-journal-of-adhesive-dentistry.csl
index e95910498d..7e5d1d6635 100644
--- a/the-journal-of-adhesive-dentistry.csl
+++ b/the-journal-of-adhesive-dentistry.csl
@@ -54,7 +54,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/the-journal-of-clinical-endocrinology-and-metabolism.csl b/the-journal-of-clinical-endocrinology-and-metabolism.csl
index cc6cf23f2c..846dc9b975 100644
--- a/the-journal-of-clinical-endocrinology-and-metabolism.csl
+++ b/the-journal-of-clinical-endocrinology-and-metabolism.csl
@@ -83,7 +83,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/the-journal-of-clinical-investigation.csl b/the-journal-of-clinical-investigation.csl
index bb2b1d3feb..62c4b1d43e 100644
--- a/the-journal-of-clinical-investigation.csl
+++ b/the-journal-of-clinical-investigation.csl
@@ -39,7 +39,7 @@
     </names>
   </macro>
   <macro name="publisher">
-    <group delimiter="">
+    <group>
       <text variable="publisher-place" suffix=": "/>
       <text variable="publisher" suffix="; "/>
       <date variable="issued">
@@ -58,7 +58,7 @@
             <group delimiter=" ">
               <text variable="URL" suffix=". "/>
               <text term="cited" text-case="lowercase"/>
-              <date variable="accessed" suffix="">
+              <date variable="accessed">
                 <date-part name="month"/>
                 <date-part name="day" prefix=" "/>
                 <date-part name="year" prefix=", "/>
diff --git a/the-journal-of-comparative-neurology.csl b/the-journal-of-comparative-neurology.csl
index 875e714815..9c91b975d6 100644
--- a/the-journal-of-comparative-neurology.csl
+++ b/the-journal-of-comparative-neurology.csl
@@ -37,7 +37,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -135,7 +135,7 @@
       <key macro="year-issued"/>
     </sort>
     <layout>
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <date variable="issued" prefix=" " suffix=".">
         <date-part name="year"/>
       </date>
diff --git a/the-journal-of-eukaryotic-microbiology.csl b/the-journal-of-eukaryotic-microbiology.csl
index 3515b994fd..a2c00eb0a2 100644
--- a/the-journal-of-eukaryotic-microbiology.csl
+++ b/the-journal-of-eukaryotic-microbiology.csl
@@ -32,7 +32,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " and="symbol" initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -135,7 +135,7 @@
     </sort>
     <layout>
       <group suffix="." delimiter=". ">
-        <text macro="author" suffix=""/>
+        <text macro="author"/>
         <text macro="year-date"/>
         <text macro="title"/>
       </group>
diff --git a/the-journal-of-hellenic-studies.csl b/the-journal-of-hellenic-studies.csl
index 0c0d2ffa86..b6cd8c5f3d 100644
--- a/the-journal-of-hellenic-studies.csl
+++ b/the-journal-of-hellenic-studies.csl
@@ -94,7 +94,7 @@
     <choose>
       <if variable="URL">
         <text value="Available at: "/>
-        <text variable="URL" prefix="" suffix=""/>
+        <text variable="URL"/>
         <group prefix=" [" suffix="]">
           <text value="Accessed:" text-case="capitalize-first" suffix=" "/>
           <date variable="accessed">
@@ -119,13 +119,13 @@
   <macro name="edition">
     <choose>
       <if is-numeric="edition">
-        <group delimiter="">
-          <number variable="edition" form="ordinal" prefix=""/>
-          <text term="edition" form="short" prefix=" " suffix="" strip-periods="true"/>
+        <group>
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" prefix=" " strip-periods="true"/>
         </group>
       </if>
       <else>
-        <text variable="edition" prefix="" suffix=", "/>
+        <text variable="edition" suffix=", "/>
       </else>
     </choose>
   </macro>
@@ -163,7 +163,7 @@
   <macro name="locator">
     <choose>
       <if locator="page">
-        <text variable="locator" prefix=""/>
+        <text variable="locator"/>
       </if>
       <else>
         <group>
@@ -174,7 +174,7 @@
     </choose>
   </macro>
   <citation et-al-min="3" et-al-use-first="1" et-al-subsequent-min="1" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true">
-    <layout prefix="" suffix="" delimiter="; ">
+    <layout delimiter="; ">
       <group delimiter=" ">
         <text macro="author-short"/>
         <text macro="year-date" prefix=" (" suffix=")"/>
@@ -194,7 +194,7 @@
       </date>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group prefix=" " delimiter="" suffix="">
+          <group prefix=" ">
             <text macro="title"/>
             <number variable="volume" form="numeric" prefix=" " suffix=" "/>
             <text macro="editor"/>
@@ -205,10 +205,10 @@
         </if>
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" " suffix=","/>
-          <group prefix=" " delimiter="">
+          <group prefix=" ">
             <text term="in" text-case="lowercase" suffix=" "/>
             <text macro="container-contributors"/>
-            <text variable="container-title" font-style="italic" suffix=""/>
+            <text variable="container-title" font-style="italic"/>
             <number variable="volume" form="numeric" prefix=" " suffix=" "/>
             <text macro="translator"/>
             <text macro="additional-info"/>
@@ -217,7 +217,7 @@
           </group>
         </else-if>
         <else-if type="article-journal article-magazine article-newspaper" match="any">
-          <group prefix=" " delimiter=" " suffix="">
+          <group prefix=" " delimiter=" ">
             <group>
               <text macro="title" suffix=", "/>
               <text variable="container-title" form="short" font-style="italic" suffix=" "/>
@@ -234,14 +234,14 @@
           </group>
         </else-if>
         <else-if type="webpage">
-          <group prefix=" " suffix="">
+          <group prefix=" ">
             <text macro="title" suffix=" [Online]"/>
             <text macro="edition"/>
-            <text prefix=" " macro="access" suffix=""/>
+            <text prefix=" " macro="access"/>
           </group>
         </else-if>
         <else>
-          <group suffix="">
+          <group>
             <text macro="title" prefix=". "/>
             <text macro="editor" prefix=" "/>
           </group>
diff --git a/the-journal-of-immunology.csl b/the-journal-of-immunology.csl
index f2183a32d1..678234043d 100644
--- a/the-journal-of-immunology.csl
+++ b/the-journal-of-immunology.csl
@@ -71,7 +71,7 @@
               <text macro="edition" prefix=" "/>
               <text macro="editor" prefix=" (" suffix=")"/>
             </group>
-            <text prefix=" " suffix="" macro="publisher"/>
+            <text prefix=" " macro="publisher"/>
             <group suffix="." prefix="; ">
               <text variable="page" prefix=":"/>
             </group>
diff --git a/the-journal-of-juristic-papyrology.csl b/the-journal-of-juristic-papyrology.csl
index 3941870bc2..748b77d7bf 100644
--- a/the-journal-of-juristic-papyrology.csl
+++ b/the-journal-of-juristic-papyrology.csl
@@ -353,7 +353,7 @@
     </choose>
   </macro>
   <citation et-al-min="9" et-al-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="subsequent">
           <text macro="contributors-short"/>
diff --git a/the-journal-of-neuropsychiatry-and-clinical-neurosciences.csl b/the-journal-of-neuropsychiatry-and-clinical-neurosciences.csl
index 27caaf0efa..c4bf3a5bb0 100644
--- a/the-journal-of-neuropsychiatry-and-clinical-neurosciences.csl
+++ b/the-journal-of-neuropsychiatry-and-clinical-neurosciences.csl
@@ -46,7 +46,7 @@
         <group delimiter=" ">
           <group prefix="[" suffix="]" delimiter=" ">
             <text term="cited" text-case="lowercase"/>
-            <date variable="accessed" suffix="">
+            <date variable="accessed">
               <date-part name="year"/>
               <date-part name="month" prefix=" " form="short" strip-periods="true"/>
               <date-part name="day" prefix=" "/>
diff --git a/the-journal-of-neuroscience.csl b/the-journal-of-neuroscience.csl
index 53ea9d7198..40b6236272 100644
--- a/the-journal-of-neuroscience.csl
+++ b/the-journal-of-neuroscience.csl
@@ -25,7 +25,7 @@
   <macro name="editor">
     <names variable="editor">
       <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " suffix="" strip-periods="true"/>
+      <label form="short" prefix=", " strip-periods="true"/>
     </names>
   </macro>
   <macro name="anon">
@@ -176,12 +176,12 @@
             <text variable="container-title" font-style="normal" form="short" strip-periods="true"/>
             <text variable="volume" prefix=" "/>
             <group prefix=":">
-              <text variable="page" prefix=""/>
+              <text variable="page"/>
             </group>
           </group>
         </else>
       </choose>
-      <text prefix=" " macro="access" suffix=""/>
+      <text prefix=" " macro="access"/>
     </layout>
   </bibliography>
 </style>
diff --git a/the-journal-of-physiology.csl b/the-journal-of-physiology.csl
index 6d55b2343b..2bbf4941ad 100644
--- a/the-journal-of-physiology.csl
+++ b/the-journal-of-physiology.csl
@@ -119,7 +119,7 @@
     </group>
   </macro>
   <macro name="thesis-title">
-    <group prefix=" " delimiter="" suffix=".">
+    <group prefix=" " suffix=".">
       <text variable="title" font-style="italic"/>
       <group prefix=" (" suffix=")" delimiter=" ">
         <choose>
@@ -211,7 +211,7 @@
       </group>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group prefix=" " delimiter="" suffix=".">
+          <group prefix=" " suffix=".">
             <text macro="title"/>
             <text macro="edition" prefix=", "/>
             <text macro="editor"/>
@@ -250,7 +250,7 @@
           </group>
         </else>
       </choose>
-      <text prefix=". " macro="access" suffix=""/>
+      <text prefix=". " macro="access"/>
     </layout>
   </bibliography>
 </style>
diff --git a/the-journal-of-the-acoustical-society-of-america.csl b/the-journal-of-the-acoustical-society-of-america.csl
index d828c1160f..4b33741f6f 100644
--- a/the-journal-of-the-acoustical-society-of-america.csl
+++ b/the-journal-of-the-acoustical-society-of-america.csl
@@ -50,7 +50,7 @@
       <if type="chapter paper-conference" match="none">
         <names variable="translator" delimiter=", " prefix=" (" suffix=")">
           <name and="text" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="capitalize-first" suffix=""/>
+          <label form="short" prefix=", " text-case="capitalize-first"/>
           <substitute>
             <names variable="editor"/>
           </substitute>
diff --git a/the-journal-of-urology.csl b/the-journal-of-urology.csl
index 0499754dc8..f4eabc01e6 100644
--- a/the-journal-of-urology.csl
+++ b/the-journal-of-urology.csl
@@ -38,7 +38,7 @@
     <group>
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="never" and="text"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -61,7 +61,7 @@
       <if variable="URL">
         <text value="Available at:" suffix=" "/>
         <text variable="URL"/>
-        <group prefix=", " suffix="">
+        <group prefix=", ">
           <text term="accessed" text-case="lowercase" suffix=" "/>
           <date variable="accessed">
             <date-part name="month" suffix=" "/>
@@ -122,7 +122,7 @@
   </citation>
   <bibliography hanging-indent="false" et-al-min="4" et-al-use-first="3" second-field-align="flush">
     <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
+      <text variable="citation-number" suffix=". "/>
       <text macro="author" suffix=": "/>
       <text macro="title" suffix="."/>
       <choose>
@@ -131,7 +131,7 @@
             <text macro="edition" prefix=" "/>
             <text macro="editor" prefix=" (" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
           <group suffix="." prefix="; ">
             <date variable="issued">
               <date-part name="year"/>
diff --git a/the-lancet.csl b/the-lancet.csl
index 4db81a61a0..cd5b8ebfc1 100644
--- a/the-lancet.csl
+++ b/the-lancet.csl
@@ -54,7 +54,7 @@
             <text variable="URL"/>
             <group prefix=" (" suffix=")." delimiter=" ">
               <text term="accessed" text-case="lowercase"/>
-              <date variable="accessed" suffix="">
+              <date variable="accessed">
                 <date-part name="day" prefix=" "/>
                 <date-part name="month" prefix=" " form="short" strip-periods="true"/>
                 <date-part name="year"/>
diff --git a/the-lichenologist.csl b/the-lichenologist.csl
index 7e25375262..e7663fce9e 100644
--- a/the-lichenologist.csl
+++ b/the-lichenologist.csl
@@ -85,7 +85,7 @@
         <text macro="author-short"/>
         <group>
           <date variable="issued" font-style="normal">
-            <date-part name="year" font-style="normal" suffix=""/>
+            <date-part name="year" font-style="normal"/>
           </date>
           <text variable="year-suffix" font-style="italic"/>
         </group>
@@ -105,7 +105,7 @@
       <key variable="title"/>
     </sort>
     <layout>
-      <text macro="author" suffix=""/>
+      <text macro="author"/>
       <group prefix=" (" suffix=") ">
         <date variable="issued" font-style="normal">
           <date-part name="year" font-style="normal"/>
@@ -123,8 +123,8 @@
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" "/>
           <group prefix=".">
-            <group prefix="" suffix="">
-              <text variable="container-title" font-style="italic" prefix=" " suffix=""/>
+            <group>
+              <text variable="container-title" font-style="italic" prefix=" "/>
               <text variable="collection-title" prefix=" " suffix="."/>
               <group suffix=".">
                 <names variable="editor translator">
diff --git a/the-neuroscientist.csl b/the-neuroscientist.csl
index 5aaf4e6f50..bb4e0fc3d3 100644
--- a/the-neuroscientist.csl
+++ b/the-neuroscientist.csl
@@ -41,7 +41,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -138,7 +138,7 @@
     </sort>
     <layout>
       <group suffix="." delimiter=". ">
-        <text macro="author" suffix=""/>
+        <text macro="author"/>
         <text macro="year-date"/>
         <text macro="title"/>
       </group>
@@ -148,7 +148,7 @@
             <text macro="edition"/>
             <text macro="editor" prefix="(" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
         </if>
         <else-if type="chapter paper-conference" match="any">
           <group prefix=" " delimiter=" ">
@@ -167,7 +167,7 @@
         <else>
           <text macro="editor" suffix="."/>
           <group prefix=" " suffix=".">
-            <text macro="journal" suffix=""/>
+            <text macro="journal"/>
             <text variable="volume" prefix=" "/>
             <!--<text variable="issue" prefix="(" suffix=")"/> -->
             <text variable="page" prefix=":"/>
diff --git a/the-new-england-journal-of-medicine.csl b/the-new-england-journal-of-medicine.csl
index caa09615b2..e2868654bc 100644
--- a/the-new-england-journal-of-medicine.csl
+++ b/the-new-england-journal-of-medicine.csl
@@ -61,7 +61,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/the-oncologist.csl b/the-oncologist.csl
index b9554828d8..ad11a52a59 100644
--- a/the-oncologist.csl
+++ b/the-oncologist.csl
@@ -52,7 +52,7 @@
             <text variable="URL" prefix="Available at "/>
             <group prefix=". " suffix="." delimiter=" ">
               <text term="accessed" text-case="capitalize-first"/>
-              <date variable="accessed" suffix="">
+              <date variable="accessed">
                 <date-part name="month" prefix=" "/>
                 <date-part name="day" prefix=" "/>
                 <date-part name="year" prefix=", "/>
diff --git a/the-optical-society.csl b/the-optical-society.csl
index 8837cea2a2..d8aa8fbadd 100644
--- a/the-optical-society.csl
+++ b/the-optical-society.csl
@@ -125,7 +125,7 @@
   <!--********************************************************************-->
   <bibliography entry-spacing="0" second-field-align="flush">
     <layout suffix=".">
-      <text variable="citation-number" prefix="" suffix=". "/>
+      <text variable="citation-number" suffix=". "/>
       <text macro="author" prefix=" " suffix=", "/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
diff --git a/the-pharmacogenomics-journal.csl b/the-pharmacogenomics-journal.csl
index c303e3b0aa..99064adf98 100644
--- a/the-pharmacogenomics-journal.csl
+++ b/the-pharmacogenomics-journal.csl
@@ -58,7 +58,7 @@
             <text variable="URL"/>
             <group prefix=" (" suffix=")." delimiter=" ">
               <text term="accessed" text-case="lowercase"/>
-              <date variable="accessed" suffix="">
+              <date variable="accessed">
                 <date-part name="day" prefix=" "/>
                 <date-part name="month" prefix=" " form="short" strip-periods="true"/>
                 <date-part name="year"/>
diff --git a/the-plant-cell.csl b/the-plant-cell.csl
index 8c3908ef89..2262dbc702 100644
--- a/the-plant-cell.csl
+++ b/the-plant-cell.csl
@@ -41,7 +41,7 @@
   <macro name="editor">
     <names variable="editor" delimiter=",">
       <name sort-separator=", " and="text" initialize-with="." delimiter=", "/>
-      <label form="short" prefix=", " suffix="" strip-periods="true"/>
+      <label form="short" prefix=", " strip-periods="true"/>
     </names>
   </macro>
   <macro name="author">
@@ -138,7 +138,7 @@
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" " suffix=". "/>
           <text term="in" text-case="capitalize-first"/>
-          <group prefix=" " delimiter=", " suffix="">
+          <group prefix=" " delimiter=", ">
             <text variable="container-title"/>
             <text macro="editor"/>
             <text variable="collection-title" prefix=" " suffix="."/>
diff --git a/the-plant-journal.csl b/the-plant-journal.csl
index 96ea0988e4..0f049408d4 100644
--- a/the-plant-journal.csl
+++ b/the-plant-journal.csl
@@ -105,7 +105,7 @@
   <macro name="pages">
     <group>
       <label variable="page" form="short" suffix=" "/>
-      <text variable="page" prefix="" suffix=""/>
+      <text variable="page"/>
     </group>
   </macro>
   <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true">
diff --git a/the-scandinavian-journal-of-clinical-and-laboratory-investigation.csl b/the-scandinavian-journal-of-clinical-and-laboratory-investigation.csl
index 71f192335c..6f2c6fd933 100644
--- a/the-scandinavian-journal-of-clinical-and-laboratory-investigation.csl
+++ b/the-scandinavian-journal-of-clinical-and-laboratory-investigation.csl
@@ -82,7 +82,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/the-world-journal-of-biological-psychiatry.csl b/the-world-journal-of-biological-psychiatry.csl
index 6e04854f9d..6eec7452b8 100644
--- a/the-world-journal-of-biological-psychiatry.csl
+++ b/the-world-journal-of-biological-psychiatry.csl
@@ -33,7 +33,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -130,7 +130,7 @@
     </sort>
     <layout>
       <group suffix="." delimiter=". ">
-        <text macro="author" suffix=""/>
+        <text macro="author"/>
         <text macro="year-date"/>
         <text macro="title"/>
       </group>
@@ -140,7 +140,7 @@
             <text macro="edition"/>
             <text macro="editor" prefix="(" suffix=")"/>
           </group>
-          <text prefix=" " suffix="" macro="publisher"/>
+          <text prefix=" " macro="publisher"/>
         </if>
         <else-if type="chapter paper-conference" match="any">
           <group prefix=" " delimiter=" ">
@@ -159,7 +159,7 @@
         <else>
           <text macro="editor" suffix="."/>
           <group prefix=" " suffix=".">
-            <text macro="journal" suffix=""/>
+            <text macro="journal"/>
             <text variable="volume" prefix=" "/>
             <!--<text variable="issue" prefix="(" suffix=")"/> -->
             <text variable="page" prefix=":"/>
diff --git a/theory-culture-and-society.csl b/theory-culture-and-society.csl
index 7234de83a1..ce56b4251c 100644
--- a/theory-culture-and-society.csl
+++ b/theory-culture-and-society.csl
@@ -240,7 +240,7 @@
   <macro name="locators">
     <choose>
       <if type="article-journal article-magazine article-newspaper" match="any">
-        <group delimiter="">
+        <group>
           <group font-style="normal">
             <text variable="volume" form="long" font-style="normal" prefix=" "/>
             <text variable="issue" prefix="(" suffix=")"/>
diff --git a/tissue-engineering.csl b/tissue-engineering.csl
index 9d1398d962..e26a828d65 100644
--- a/tissue-engineering.csl
+++ b/tissue-engineering.csl
@@ -77,7 +77,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/traces.csl b/traces.csl
index b252720a27..8bb9e0e6e6 100644
--- a/traces.csl
+++ b/traces.csl
@@ -132,7 +132,7 @@
             <text macro="title" suffix=","/>
             <text variable="genre" suffix=","/>
             <text macro="edition"/>
-            <text macro="editor" suffix=""/>
+            <text macro="editor"/>
           </group>
           <text prefix=" " suffix="." macro="publisher"/>
         </if>
@@ -163,7 +163,7 @@
             <text variable="container-title" font-style="italic"/>
             <group prefix=", vol. ">
               <text variable="volume"/>
-              <text variable="issue" prefix=", n°&#160;" suffix=""/>
+              <text variable="issue" prefix=", n°&#160;"/>
             </group>
             <text variable="page" prefix=", p. "/>
           </group>
diff --git a/traffic-injury-prevention.csl b/traffic-injury-prevention.csl
index dbf0c39c49..868bd1bc88 100644
--- a/traffic-injury-prevention.csl
+++ b/traffic-injury-prevention.csl
@@ -31,7 +31,7 @@
     <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" strip-periods="true"/>
+        <label form="short" prefix=" " strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="title"/>
diff --git a/traffic.csl b/traffic.csl
index f6a75c716d..3fc9bb39ad 100644
--- a/traffic.csl
+++ b/traffic.csl
@@ -61,7 +61,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/triangle.csl b/triangle.csl
index 780de5d193..c7e6264f13 100644
--- a/triangle.csl
+++ b/triangle.csl
@@ -122,13 +122,13 @@
         </group>
       </else-if>
       <else-if type="thesis" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" font-style="italic" suffix=","/>
           <!-- pour le jour où il y aura un champ 'directeur' dans la fiche thèse de zotero...-->
           <!--
 										<text term="editor" form="verb" prefix="&#160;" />
 										<text variable="editor" suffix=",&#160;" />   
-										<text variable="genre" suffix="" prefix="" /> 
+										<text variable="genre" /> 
 										-->
         </group>
       </else-if>
@@ -139,7 +139,7 @@
         </group>
       </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»,"/>
           <text value="in" font-style="italic" suffix=" " prefix=" "/>
           <text macro="editor" suffix=", "/>
@@ -209,12 +209,12 @@
       </else-if>
       <else-if type="webpage" match="any">
         <group delimiter=", " font-style="normal">
-          <date variable="issued" form="text" suffix="">
+          <date variable="issued" form="text">
             <date-part name="day"/>
             <date-part name="month" text-case="lowercase"/>
             <date-part name="year"/>
           </date>
-          <text variable="container-title" prefix="" suffix=""/>
+          <text variable="container-title"/>
         </group>
       </else-if>
       <else-if type="article-journal chapter" match="any">
@@ -278,12 +278,12 @@
       </else-if>
       <else-if type="webpage" match="any">
         <group delimiter=", " font-style="normal">
-          <date variable="issued" form="text" suffix="">
+          <date variable="issued" form="text">
             <date-part name="day"/>
             <date-part name="month" text-case="lowercase"/>
             <date-part name="year"/>
           </date>
-          <text variable="container-title" prefix="" suffix=""/>
+          <text variable="container-title"/>
         </group>
       </else-if>
     </choose>
@@ -304,7 +304,7 @@
         </choose>
       </if>
       <else-if type="article-journal article-magazine article-newspaper" match="any">
-        <group delimiter="" font-style="normal">
+        <group font-style="normal">
           <choose>
             <if variable="issued">
               <date variable="issued">
@@ -366,7 +366,7 @@
           <if variable="URL" match="any">
             <group>
               <text value="URL complète en bibliographie" prefix="&#160;(" suffix=",&#160;" text-case="capitalize-first"/>
-              <text term="accessed" suffix=""/>
+              <text term="accessed"/>
               <date variable="accessed" form="text" suffix=")">
                 <date-part name="day"/>
                 <date-part name="month" text-case="lowercase"/>
@@ -377,7 +377,7 @@
           <else-if variable="DOI" match="any">
             <group>
               <text value="URL complète en bibliographie" prefix="&#160;(" suffix=",&#160;" text-case="capitalize-first"/>
-              <text term="accessed" suffix=""/>
+              <text term="accessed"/>
               <date variable="accessed" form="text" suffix=")">
                 <date-part name="day"/>
                 <date-part name="month" text-case="lowercase"/>
@@ -431,7 +431,7 @@
   </macro>
   <!--_-_-_-_-_-SECTION DEFINITION DES Notes de bas de pages (citation)-_-_-_-_-_-_-->
   <citation>
-    <layout prefix="" suffix="." delimiter="&#160;">
+    <layout suffix="." delimiter="&#160;">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=",&#160;">
@@ -485,7 +485,7 @@
       <key macro="author" names-min="3" names-use-first="3"/>
       <key variable="issued" sort="descending"/>
     </sort>
-    <layout prefix="" suffix=".">
+    <layout suffix=".">
       <group delimiter=", ">
         <text macro="author-bib"/>
         <text macro="title"/>
diff --git a/turabian-fullnote-bibliography.csl b/turabian-fullnote-bibliography.csl
index b9d56961de..9de9f44d87 100644
--- a/turabian-fullnote-bibliography.csl
+++ b/turabian-fullnote-bibliography.csl
@@ -734,7 +734,7 @@
     </group>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" et-al-subsequent-min="4" et-al-subsequent-use-first="1" disambiguate-add-names="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/unified-style-linguistics.csl b/unified-style-linguistics.csl
index e347d83c30..befc31d0db 100644
--- a/unified-style-linguistics.csl
+++ b/unified-style-linguistics.csl
@@ -61,7 +61,7 @@
     <choose>
       <if type="chapter paper-conference" match="any">
         <text term="in" text-case="capitalize-first" suffix=" "/>
-        <group prefix="" delimiter=", ">
+        <group delimiter=", ">
           <choose>
             <if variable="author">
               <names variable="editor">
diff --git a/united-nations-conference-on-trade-and-development.csl b/united-nations-conference-on-trade-and-development.csl
index fd9aa33af2..d765f264d3 100644
--- a/united-nations-conference-on-trade-and-development.csl
+++ b/united-nations-conference-on-trade-and-development.csl
@@ -74,7 +74,7 @@
   <macro name="editor">
     <names variable="editor" delimiter=", ">
       <name name-as-sort-order="all" sort-separator=" " initialize-with=" " and="text" prefix="In: " suffix="," delimiter=", "/>
-      <label form="short" prefix=" " suffix="" strip-periods="true"/>
+      <label form="short" prefix=" " strip-periods="true"/>
     </names>
   </macro>
   <macro name="publisher">
@@ -114,7 +114,7 @@
     <choose>
       <if type="webpage">
         <text value="See" prefix=" " suffix=" "/>
-        <text variable="URL" prefix=" " suffix="" font-style="normal"/>
+        <text variable="URL" prefix=" " font-style="normal"/>
         <group prefix=" " delimiter=" ">
           <group prefix="(" suffix=")">
             <text term="accessed" suffix=" "/>
@@ -208,14 +208,14 @@
   <macro name="locators">
     <choose>
       <if type="article-journal">
-        <group delimiter="">
+        <group>
           <text variable="volume"/>
           <text variable="issue" prefix="(" suffix="):"/>
-          <text variable="page" prefix=""/>
+          <text variable="page"/>
         </group>
       </if>
       <else-if type="report">
-        <text variable="number" prefix=" No. " suffix=""/>
+        <text variable="number" prefix=" No. "/>
       </else-if>
       <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference song" match="any">
         <choose>
@@ -258,7 +258,7 @@
       <!-- Specific Formats -->
       <choose>
         <if type="report">
-          <text macro="title" prefix=" " suffix=""/>
+          <text macro="title" prefix=" "/>
           <group prefix=". " delimiter=" ">
             <choose>
               <if variable="collection-title">
@@ -286,13 +286,13 @@
             </if>
           </choose>
           <group prefix=". " delimiter=". ">
-            <text macro="un-sales" prefix=""/>
+            <text macro="un-sales"/>
             <text macro="publisher"/>
           </group>
         </else-if>
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" "/>
-          <group prefix=". " delimiter="">
+          <group prefix=". ">
             <text macro="editor" suffix=". "/>
             <text variable="container-title" suffix=". " font-style="italic" text-case="title"/>
             <text variable="collection-title"/>
@@ -328,7 +328,7 @@
             <date-part name="day" prefix=". "/>
             <date-part name="month" prefix=" "/>
           </date>
-          <text variable="URL" prefix=". Available at " suffix="" font-style="normal"/>
+          <text variable="URL" prefix=". Available at " font-style="normal"/>
           <text macro="access-date"/>
         </else-if>
         <else-if type="webpage">
diff --git a/universidad-evangelica-del-paraguay.csl b/universidad-evangelica-del-paraguay.csl
index d9ae7ad772..1c12c40acf 100644
--- a/universidad-evangelica-del-paraguay.csl
+++ b/universidad-evangelica-del-paraguay.csl
@@ -73,7 +73,7 @@
   <macro name="locators">
     <choose>
       <if type="article-journal article-magazine article-newspaper" match="any">
-        <group prefix="" delimiter=", ">
+        <group delimiter=", ">
           <group>
             <choose>
               <if variable="volume">
@@ -88,7 +88,7 @@
         </group>
       </if>
       <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
-        <group prefix=". " suffix="" delimiter=", ">
+        <group prefix=". " delimiter=", ">
           <text macro="edition"/>
           <group>
             <text variable="volume" prefix="v. "/>
@@ -205,7 +205,7 @@
         <else-if type="webpage">
           <text macro="author-citation"/>
           <text value="en línea" prefix=" [" suffix="], " text-case="capitalize-first"/>
-          <date variable="accessed" prefix="" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
           </date>
         </else-if>
@@ -230,17 +230,17 @@
     <layout>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <text macro="author-short" prefix="" suffix=" "/>
+          <text macro="author-short" suffix=" "/>
           <text macro="year-date" prefix="(" suffix=")"/>
           <text macro="title" prefix=" " suffix=". "/>
           <text macro="translator" prefix="Traducido por " suffix=". "/>
           <text macro="edition" prefix="(" suffix=") "/>
-          <text macro="editor" prefix="" suffix=", "/>
-          <text macro="publisher-place" prefix="" suffix=", "/>
-          <text macro="publisher" prefix="" suffix="."/>
+          <text macro="editor" suffix=", "/>
+          <text macro="publisher-place" suffix=", "/>
+          <text macro="publisher" suffix="."/>
         </if>
         <else-if type="webpage">
-          <text macro="author-short" prefix="" suffix=" "/>
+          <text macro="author-short" suffix=" "/>
           <choose>
             <if variable="URL">
               <text value="en línea" prefix=" [" suffix="] " text-case="capitalize-first"/>
@@ -250,7 +250,7 @@
           <text macro="access" prefix=" " suffix=". "/>
         </else-if>
         <else>
-          <text macro="author-short" prefix="" suffix=" "/>
+          <text macro="author-short" suffix=" "/>
           <text macro="year-date" prefix="(" suffix=")"/>
           <text macro="title" prefix=" &quot;" suffix="&quot;."/>
           <group prefix=" " delimiter=" ">
@@ -258,7 +258,7 @@
             <text variable="container-title" font-style="italic" suffix="."/>
             <text macro="editor" suffix="."/>
             <text macro="locators" suffix=","/>
-            <text macro="date" prefix="" suffix="."/>
+            <text macro="date" suffix="."/>
             <text variable="page" prefix="Págs. " suffix="."/>
             <group suffix=".">
               <text macro="publisher"/>
diff --git a/universita-cattolica-del-sacro-cuore.csl b/universita-cattolica-del-sacro-cuore.csl
index 896b5204e8..5cb814268b 100644
--- a/universita-cattolica-del-sacro-cuore.csl
+++ b/universita-cattolica-del-sacro-cuore.csl
@@ -523,7 +523,7 @@
     <text variable="genre"/>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/universita-di-bologna-lettere.csl b/universita-di-bologna-lettere.csl
index 791fd7cb7e..5583cdac36 100644
--- a/universita-di-bologna-lettere.csl
+++ b/universita-di-bologna-lettere.csl
@@ -412,7 +412,7 @@
           <number variable="volume" form="numeric" suffix=":"/>
         </else-if>
       </choose>
-      <label variable="locator" form="short" prefix="" suffix=" "/>
+      <label variable="locator" form="short" suffix=" "/>
       <text variable="locator"/>
     </group>
   </macro>
@@ -432,7 +432,7 @@
               <label variable="locator" form="short" suffix=" "/>
             </if>
           </choose>
-          <label variable="locator" form="short" prefix="" suffix=" "/>
+          <label variable="locator" form="short" suffix=" "/>
           <text variable="locator"/>
         </group>
       </else>
@@ -482,7 +482,7 @@
         <text macro="issued" prefix=", "/>
       </if>
       <else-if variable="publisher-place publisher" match="any">
-        <group prefix=", " suffix="" delimiter=", ">
+        <group prefix=", " delimiter=", ">
           <group delimiter=", ">
             <choose>
               <if variable="title" match="none"/>
@@ -568,7 +568,7 @@
     </group>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" et-al-subsequent-min="4" et-al-subsequent-use-first="1">
-    <layout prefix="" delimiter="; ">
+    <layout delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/universitat-freiburg-geschichte.csl b/universitat-freiburg-geschichte.csl
index 57cf8472f3..1c7d06187c 100644
--- a/universitat-freiburg-geschichte.csl
+++ b/universitat-freiburg-geschichte.csl
@@ -59,7 +59,7 @@
   <macro name="editor">
     <names variable="editor translator">
       <name and="text" sort-separator=", " delimiter="/ " delimiter-precedes-last="never"/>
-      <label form="short" prefix="" suffix="" strip-periods="false"/>
+      <label form="short" strip-periods="false"/>
     </names>
   </macro>
   <macro name="accessed">
@@ -130,7 +130,7 @@
                   <group>
                     <text term="volume" form="short" text-case="lowercase" suffix=". " strip-periods="true"/>
                     <number variable="volume" form="numeric"/>
-                    <label variable="locator" form="short" prefix=", " suffix=""/>
+                    <label variable="locator" form="short" prefix=", "/>
                   </group>
                 </if>
                 <else>
@@ -195,7 +195,7 @@
       <text variable="title" prefix=": "/>
       <choose>
         <if type="webpage">
-          <!-- <text macro="date" prefix=""/> -->
+          <!-- <text macro="date"/> -->
         </if>
         <else-if type="speech" match="any">
           <text variable="publisher-place" prefix=", "/>
diff --git a/universitat-heidelberg-historisches-seminar.csl b/universitat-heidelberg-historisches-seminar.csl
index b4a0b27922..dde9dee99a 100644
--- a/universitat-heidelberg-historisches-seminar.csl
+++ b/universitat-heidelberg-historisches-seminar.csl
@@ -88,7 +88,7 @@
         </group>
       </else-if>
       <else-if type="thesis" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" suffix=", Diss."/>
         </group>
       </else-if>
@@ -99,7 +99,7 @@
         </group>
       </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" suffix=", "/>
           <text value="in" suffix=": " prefix=" "/>
           <text variable="container-title" text-case="capitalize-first" suffix=", "/>
@@ -111,7 +111,7 @@
         </group>
       </else-if>
       <else-if type="webpage">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" suffix=", "/>
           <text variable="container-title" prefix="unter: " suffix=", "/>
           <text variable="URL" prefix="&lt;&#160;" suffix="&#160;&gt;"/>
@@ -134,7 +134,7 @@
         </group>
       </else-if>
       <else-if type="thesis" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" form="short" text-case="capitalize-first" suffix=", Diss."/>
         </group>
       </else-if>
@@ -145,7 +145,7 @@
         </group>
       </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" form="short" text-case="capitalize-first" suffix=", "/>
           <text value="in" suffix=": " prefix=" "/>
           <text variable="container-title" text-case="capitalize-first" suffix=", "/>
@@ -157,7 +157,7 @@
         </group>
       </else-if>
       <else-if type="webpage">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" suffix=", "/>
           <text variable="container-title" prefix="unter: " suffix=", "/>
           <text variable="URL" prefix="&lt;&#160;" suffix="&#160;&gt;"/>
@@ -245,11 +245,11 @@
         </choose>
       </if>
       <else-if type="article-journal article-magazine" match="any">
-        <group delimiter="">
+        <group>
           <choose>
             <if variable="issued">
               <text macro="volume" suffix="&#160;"/>
-              <group delimiter="">
+              <group>
                 <date variable="issued">
                   <date-part name="year" prefix="(" suffix=")"/>
                 </date>
@@ -296,7 +296,7 @@
     </choose>
   </macro>
   <citation>
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
@@ -339,7 +339,7 @@
       <key macro="author" names-min="3" names-use-first="3"/>
       <key variable="issued" sort="descending"/>
     </sort>
-    <layout prefix="" suffix=".">
+    <layout suffix=".">
       <group delimiter=", ">
         <text macro="author-bib"/>
         <text macro="title"/>
diff --git a/universite-de-liege-histoire.csl b/universite-de-liege-histoire.csl
index 17a681e01c..51e5c1c586 100644
--- a/universite-de-liege-histoire.csl
+++ b/universite-de-liege-histoire.csl
@@ -95,7 +95,7 @@
         <text variable="title" text-case="capitalize-first" font-style="italic"/>
       </if>
       <else-if type="article-journal article-newspaper article-magazine" match="any">
-        <group delimiter="">
+        <group>
           <group suffix=", ">
             <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
           </group>
@@ -104,7 +104,7 @@
         </group>
       </else-if>
       <else-if type="thesis" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" font-style="italic" suffix=","/>
           <text variable="genre" suffix=", " prefix=" "/>
           <text variable="publisher"/>
@@ -119,7 +119,7 @@
         </group>
       </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter="">
+        <group>
           <group suffix=",">
             <text variable="title" text-case="capitalize-first" quotes="true"/>
           </group>
@@ -129,7 +129,7 @@
         </group>
       </else-if>
       <else-if type="webpage" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" font-style="italic" suffix=", "/>
           <text variable="URL" text-decoration="underline"/>
         </group>
@@ -227,7 +227,7 @@
       <else-if type="webpage" match="any">
         <group delimiter=" " font-style="normal">
           <text value="consulté le" suffix=" " prefix=" "/>
-          <date variable="accessed" form="text" suffix="">
+          <date variable="accessed" form="text">
             <date-part name="day"/>
             <date-part name="month"/>
             <date-part name="year"/>
@@ -287,7 +287,7 @@
       <else-if type="webpage" match="any">
         <group delimiter=" " font-style="normal">
           <text value="consulté le" suffix=" " prefix=" "/>
-          <date variable="accessed" form="text" suffix="">
+          <date variable="accessed" form="text">
             <date-part name="day"/>
             <date-part name="month"/>
             <date-part name="year"/>
@@ -312,7 +312,7 @@
         </choose>
       </if>
       <else-if type="article-journal article-magazine" match="any">
-        <group delimiter="" font-style="normal">
+        <group font-style="normal">
           <text macro="volume"/>
           <choose>
             <if variable="issued">
@@ -369,7 +369,7 @@
     </choose>
   </macro>
   <citation>
-    <layout prefix="" suffix="." delimiter="&#160;; ">
+    <layout suffix="." delimiter="&#160;; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
@@ -414,7 +414,7 @@
       <key macro="author" names-min="3" names-use-first="3"/>
       <key variable="issued" sort="descending"/>
     </sort>
-    <layout prefix="" suffix=".">
+    <layout suffix=".">
       <group delimiter=", ">
         <text macro="author-bib"/>
         <text macro="title"/>
diff --git a/universite-de-picardie-jules-verne-ufr-de-medecine.csl b/universite-de-picardie-jules-verne-ufr-de-medecine.csl
index 084c8fbe5c..e805ff1fab 100644
--- a/universite-de-picardie-jules-verne-ufr-de-medecine.csl
+++ b/universite-de-picardie-jules-verne-ufr-de-medecine.csl
@@ -51,7 +51,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/universite-de-sherbrooke-faculte-d-education.csl b/universite-de-sherbrooke-faculte-d-education.csl
index b340c62a60..c60c600459 100644
--- a/universite-de-sherbrooke-faculte-d-education.csl
+++ b/universite-de-sherbrooke-faculte-d-education.csl
@@ -46,7 +46,7 @@
       <if type="chapter paper-conference" match="none">
         <names variable="translator" delimiter=", " prefix=" (" suffix=")">
           <name and="text" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="capitalize-first" suffix=""/>
+          <label form="short" prefix=", " text-case="capitalize-first"/>
           <substitute>
             <names variable="editor"/>
           </substitute>
@@ -123,7 +123,7 @@
           <else>
             <choose>
               <if type="webpage">
-                <group delimiter="">
+                <group>
                   <text term="from" prefix="Site téléaccessible " suffix=" &lt;"/>
                   <text variable="URL" suffix="&gt;. "/>
                   <text term="retrieved" text-case="capitalize-first" suffix=" le "/>
diff --git a/universite-du-quebec-a-montreal.csl b/universite-du-quebec-a-montreal.csl
index 57560634a1..e4d1dfa6cd 100644
--- a/universite-du-quebec-a-montreal.csl
+++ b/universite-du-quebec-a-montreal.csl
@@ -221,8 +221,8 @@
   <macro name="locators">
     <choose>
       <if type="article-journal">
-        <text variable="volume" prefix=", vol.&#160;" suffix=""/>
-        <text variable="issue" prefix=", no&#160;" suffix=""/>
+        <text variable="volume" prefix=", vol.&#160;"/>
+        <text variable="issue" prefix=", no&#160;"/>
       </if>
       <else-if type="legal_case">
         <text variable="volume" prefix=", "/>
@@ -342,7 +342,7 @@
       <if type="bill legal_case legislation" match="none">
         <choose>
           <if variable="issued">
-            <group prefix=" " suffix="">
+            <group prefix=" ">
               <date variable="issued">
                 <date-part name="year"/>
               </date>
@@ -358,7 +358,7 @@
             </group>
           </if>
           <else>
-            <group prefix="" suffix="">
+            <group>
               <text term="no date" form="short" text-case="capitalize-first"/>
               <text variable="year-suffix" prefix="&#160;[" suffix="]"/>
             </group>
@@ -372,7 +372,7 @@
       <if type="bill legal_case legislation" match="none">
         <choose>
           <if variable="issued">
-            <group prefix="" suffix="">
+            <group>
               <!--        <date variable="issued">
                 <date-part name="year"/> 
               </date> -->
@@ -381,7 +381,7 @@
                 <if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
                   <date variable="issued">
                     <date-part name="day" suffix="&#160;"/>
-                    <date-part name="month" prefix=""/>
+                    <date-part name="month"/>
                     <date-part name="year" prefix="&#160;"/>
                   </date>
                 </if>
@@ -389,7 +389,7 @@
             </group>
           </if>
           <else>
-            <group prefix="" suffix="">
+            <group>
               <text term="no date" form="short" text-case="capitalize-first"/>
               <text variable="year-suffix" prefix="&#160;[" suffix="]"/>
             </group>
@@ -476,12 +476,12 @@
     </sort>
     <layout suffix=".">
       <text macro="contributors" suffix=". "/>
-      <text macro="date" suffix=""/>
-      <text macro="title" prefix=". " suffix=""/>
+      <text macro="date"/>
+      <text macro="title" prefix=". "/>
       <text macro="description"/>
       <text macro="secondary-contributors" prefix=". "/>
-      <text macro="container-title" prefix=". " suffix=""/>
-      <text macro="container-contributors" prefix=""/>
+      <text macro="container-title" prefix=". "/>
+      <text macro="container-contributors"/>
       <text macro="locators-chapter"/>
       <text macro="edition" prefix=". "/>
       <text macro="locators"/>
diff --git a/universite-laval-departement-dinformation-et-de-communication.csl b/universite-laval-departement-dinformation-et-de-communication.csl
index 9cc8b4047d..6997cdf884 100644
--- a/universite-laval-departement-dinformation-et-de-communication.csl
+++ b/universite-laval-departement-dinformation-et-de-communication.csl
@@ -77,7 +77,7 @@
       <if variable="URL">
         <group prefix="(" suffix=")" delimiter=" ">
           <text value="Consulté le"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="day" suffix=" "/>
             <date-part name="month" suffix=" "/>
             <date-part name="year"/>
@@ -199,7 +199,7 @@
         </if>
         <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <text macro="edition"/>
-          <text macro="publisher" prefix=""/>
+          <text macro="publisher"/>
           <text variable="number-of-pages" suffix=" p."/>
           <text macro="collection"/>
         </else-if>
diff --git a/universite-laval-faculte-de-theologie-et-de-sciences-religieuses.csl b/universite-laval-faculte-de-theologie-et-de-sciences-religieuses.csl
index 7d1c6c01c3..718f272807 100644
--- a/universite-laval-faculte-de-theologie-et-de-sciences-religieuses.csl
+++ b/universite-laval-faculte-de-theologie-et-de-sciences-religieuses.csl
@@ -241,7 +241,7 @@
       </if>
       <else-if type="bill book graphic  legislation motion_picture report song" match="any">
         <text variable="title" text-case="title" font-style="italic"/>
-        <text variable="version" prefix=" , version " suffix=""/>
+        <text variable="version" prefix=" , version "/>
       </else-if>
       <else-if type="legal_case">
         <text variable="title"/>
diff --git a/universiteit-utrecht-onderzoeksgids-geschiedenis.csl b/universiteit-utrecht-onderzoeksgids-geschiedenis.csl
index 5441c611d8..3e8d144b50 100644
--- a/universiteit-utrecht-onderzoeksgids-geschiedenis.csl
+++ b/universiteit-utrecht-onderzoeksgids-geschiedenis.csl
@@ -378,7 +378,7 @@
     </choose>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/university-college-dublin-school-of-history-and-archives.csl b/university-college-dublin-school-of-history-and-archives.csl
index 698cfa9814..4e0db6f9cb 100644
--- a/university-college-dublin-school-of-history-and-archives.csl
+++ b/university-college-dublin-school-of-history-and-archives.csl
@@ -739,7 +739,7 @@
     <text variable="genre"/>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
-    <layout prefix="" suffix="." delimiter="; ">
+    <layout suffix="." delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/university-of-south-australia-harvard-2011.csl b/university-of-south-australia-harvard-2011.csl
index db490e0996..caf7f330a4 100644
--- a/university-of-south-australia-harvard-2011.csl
+++ b/university-of-south-australia-harvard-2011.csl
@@ -139,7 +139,7 @@ TO DO
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <label form="short" prefix="" suffix=" " strip-periods="true"/>
+      <label form="short" suffix=" " strip-periods="true"/>
       <name form="short" name-as-sort-order="all" and="symbol" sort-separator=", " delimiter=", " delimiter-precedes-last="never" initialize-with=""/>
       <substitute>
         <names variable="editor"/>
diff --git a/university-of-south-australia-harvard-2013.csl b/university-of-south-australia-harvard-2013.csl
index 0616206fca..5e75eaf9a4 100644
--- a/university-of-south-australia-harvard-2013.csl
+++ b/university-of-south-australia-harvard-2013.csl
@@ -139,7 +139,7 @@ TO DO
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <label form="short" prefix="" suffix=" " strip-periods="true"/>
+      <label form="short" suffix=" " strip-periods="true"/>
       <name form="short" name-as-sort-order="all" and="symbol" sort-separator=", " delimiter=", " delimiter-precedes-last="never" initialize-with=""/>
       <substitute>
         <names variable="editor"/>
diff --git a/urban-habitats.csl b/urban-habitats.csl
index ebabd6ea9e..6570a88bbc 100644
--- a/urban-habitats.csl
+++ b/urban-habitats.csl
@@ -50,7 +50,7 @@
     <choose>
       <if variable="URL">
         <text value="Retreived " suffix=" "/>
-        <group prefix="" suffix=", ">
+        <group suffix=", ">
           <date variable="accessed">
             <date-part name="month" suffix=" "/>
             <date-part name="day" suffix=", "/>
diff --git a/vancouver-brackets-only-year-no-issue.csl b/vancouver-brackets-only-year-no-issue.csl
index 15fb4728f8..3cb5541891 100644
--- a/vancouver-brackets-only-year-no-issue.csl
+++ b/vancouver-brackets-only-year-no-issue.csl
@@ -69,7 +69,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/vancouver-superscript-brackets-only-year.csl b/vancouver-superscript-brackets-only-year.csl
index 28a1c601ef..4ab73c30b3 100644
--- a/vancouver-superscript-brackets-only-year.csl
+++ b/vancouver-superscript-brackets-only-year.csl
@@ -62,7 +62,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/vancouver-superscript-only-year.csl b/vancouver-superscript-only-year.csl
index 2c66a7e20d..05e537b781 100644
--- a/vancouver-superscript-only-year.csl
+++ b/vancouver-superscript-only-year.csl
@@ -64,7 +64,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/veterinary-radiology-and-ultrasound.csl b/veterinary-radiology-and-ultrasound.csl
index d445782d87..d9b8ca0921 100644
--- a/veterinary-radiology-and-ultrasound.csl
+++ b/veterinary-radiology-and-ultrasound.csl
@@ -83,7 +83,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/vingtieme-siecle.csl b/vingtieme-siecle.csl
index 657f5f0a51..d18adb8847 100644
--- a/vingtieme-siecle.csl
+++ b/vingtieme-siecle.csl
@@ -76,7 +76,7 @@
         </group>
       </else-if>
       <else-if type="thesis" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" font-style="italic" suffix=","/>
           <text variable="genre" suffix=", " prefix=" "/>
           <text variable="publisher"/>
@@ -89,7 +89,7 @@
         </group>
       </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter="">
+        <group>
           <group suffix=",">
             <text variable="title" text-case="capitalize-first" quotes="true"/>
           </group>
@@ -99,7 +99,7 @@
         </group>
       </else-if>
       <else-if type="webpage" match="any">
-        <group delimiter="">
+        <group>
           <text variable="title" text-case="capitalize-first" font-style="italic" suffix=", "/>
           <text variable="URL" text-decoration="underline"/>
         </group>
@@ -201,7 +201,7 @@
       <else-if type="webpage" match="any">
         <group delimiter=" " font-style="normal">
           <text value="consulté le" suffix=" " prefix=" "/>
-          <date variable="accessed" form="text" suffix="">
+          <date variable="accessed" form="text">
             <date-part name="day"/>
             <date-part name="month"/>
             <date-part name="year"/>
@@ -275,7 +275,7 @@
       <else-if type="webpage" match="any">
         <group delimiter=" " font-style="normal">
           <text value="consulté le" suffix=" " prefix=" "/>
-          <date variable="accessed" form="text" suffix="">
+          <date variable="accessed" form="text">
             <date-part name="day"/>
             <date-part name="month"/>
             <date-part name="year"/>
@@ -300,7 +300,7 @@
         </choose>
       </if>
       <else-if type="article-journal article-magazine" match="any">
-        <group delimiter="" font-style="normal">
+        <group font-style="normal">
           <choose>
             <if variable="issued">
               <date variable="issued">
@@ -357,7 +357,7 @@
     </choose>
   </macro>
   <citation>
-    <layout prefix="" suffix="." delimiter="&#160;; ">
+    <layout suffix="." delimiter="&#160;; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
@@ -402,7 +402,7 @@
       <key macro="author" names-min="3" names-use-first="3"/>
       <key variable="issued" sort="descending"/>
     </sort>
-    <layout prefix="" suffix=".">
+    <layout suffix=".">
       <group delimiter=", ">
         <text macro="author"/>
         <text macro="title"/>
diff --git a/water-environment-research.csl b/water-environment-research.csl
index 224474f2e2..c43610b039 100644
--- a/water-environment-research.csl
+++ b/water-environment-research.csl
@@ -21,7 +21,7 @@
       <if type="chapter paper-conference" match="any">
         <names variable="editor" delimiter=", " prefix="(" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
-          <label form="short" prefix=", " suffix=""/>
+          <label form="short" prefix=", "/>
           <substitute>
             <names variable="translator"/>
           </substitute>
@@ -34,7 +34,7 @@
       <if type="chapter paper-conference" match="none">
         <names variable="translator" delimiter=", " prefix=" (" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
-          <label form="short" prefix=", " text-case="capitalize-first" suffix=""/>
+          <label form="short" prefix=", " text-case="capitalize-first"/>
           <substitute>
             <names variable="editor"/>
           </substitute>
@@ -263,7 +263,7 @@
         </group>
       </if>
       <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
-        <group prefix=", " suffix="" delimiter=", ">
+        <group prefix=", " delimiter=", ">
           <text macro="edition"/>
           <group>
             <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=". " strip-periods="true"/>
diff --git a/wheaton-college-phd-in-biblical-and-theological-studies.csl b/wheaton-college-phd-in-biblical-and-theological-studies.csl
index 83f07891c1..f2d1ae563c 100644
--- a/wheaton-college-phd-in-biblical-and-theological-studies.csl
+++ b/wheaton-college-phd-in-biblical-and-theological-studies.csl
@@ -735,7 +735,7 @@
     </group>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" et-al-subsequent-min="4" et-al-subsequent-use-first="1" disambiguate-add-names="true">
-    <layout prefix="" suffix="" delimiter="; ">
+    <layout delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/who-europe-harvard.csl b/who-europe-harvard.csl
index 6637372cad..b0bbf154fa 100644
--- a/who-europe-harvard.csl
+++ b/who-europe-harvard.csl
@@ -28,7 +28,7 @@
     <group>
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix="" suffix="" strip-periods="true"/>
+        <label form="short" strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
           <text macro="anon"/>
@@ -52,7 +52,7 @@
         <group delimiter=", ">
           <text variable="URL"/>
           <group>
-            <text value="accessed " suffix=""/>
+            <text value="accessed "/>
             <date variable="accessed ">
               <date-part name="day" suffix=" "/>
               <date-part name="month" suffix=" "/>
@@ -66,12 +66,12 @@
   <macro name="accessSeries">
     <choose>
       <if variable="URL collection-title collection-number" match="any">
-        <text value="(" suffix=""/>
+        <text value="("/>
         <group delimiter="; ">
           <text macro="series"/>
           <text macro="access"/>
         </group>
-        <text value=")" suffix=""/>
+        <text value=")"/>
       </if>
     </choose>
   </macro>
@@ -111,7 +111,7 @@
     </group>
   </macro>
   <macro name="year-date">
-    <group prefix="">
+    <group>
       <choose>
         <if variable="issued">
           <date variable="issued">
@@ -150,8 +150,8 @@
   <citation collapse="year-suffix-ranged" et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="false" disambiguate-add-givenname="false" year-suffix-delimiter=",">
     <layout delimiter="; " prefix="(" suffix=")">
       <group delimiter=", ">
-        <text macro="author-short" suffix=""/>
-        <group prefix="" suffix="">
+        <text macro="author-short"/>
+        <group>
           <date variable="issued">
             <date-part name="year"/>
           </date>
@@ -167,7 +167,7 @@
     <layout>
       <group suffix=".">
         <group suffix=". ">
-          <text macro="author" suffix=""/>
+          <text macro="author"/>
           <group prefix=" (" suffix=")">
             <date variable="issued">
               <date-part name="year"/>
@@ -177,24 +177,24 @@
         <choose>
           <if type="bill book graphic legal_case motion_picture song report thesis" match="any">
             <group suffix=".">
-              <text macro="title" prefix="" suffix=""/>
+              <text macro="title"/>
               <text macro="edition" prefix=", "/>
               <text macro="editor" prefix=" (" suffix=")"/>
             </group>
-            <text prefix=" " suffix="" macro="publisher"/>
+            <text prefix=" " macro="publisher"/>
             <group prefix=",">
               <text variable="page" prefix=":"/>
             </group>
           </if>
           <else-if type="chapter" match="any">
-            <text macro="title" prefix="" suffix="."/>
+            <text macro="title" suffix="."/>
             <group prefix=" ">
               <text term="in" text-case="capitalize-first" suffix=": "/>
               <text macro="editor"/>
               <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
               <text variable="volume" prefix="Vol" suffix="."/>
               <text macro="edition" prefix=","/>
-              <text variable="collection-title" prefix="" suffix="."/>
+              <text variable="collection-title" suffix="."/>
               <group suffix=".">
                 <text macro="publisher" prefix=" "/>
                 <group suffix="." prefix=",">
@@ -207,24 +207,24 @@
             </group>
           </else-if>
           <else-if type="paper-conference" match="any">
-            <text macro="title" prefix="" suffix="."/>
+            <text macro="title" suffix="."/>
             <group prefix=" ">
               <choose>
                 <if variable="editor">
                   <text term="in" text-case="capitalize-first" suffix=": " prefix=" "/>
                   <text macro="editor" suffix=" "/>
-                  <text variable="container-title" font-style="italic" prefix="" suffix="."/>
+                  <text variable="container-title" font-style="italic" suffix="."/>
                   <text variable="volume" prefix="Vol" suffix="."/>
-                  <text macro="edition" prefix=""/>
-                  <text variable="collection-title" prefix="" suffix="."/>
-                  <group suffix="">
+                  <text macro="edition"/>
+                  <text variable="collection-title" suffix="."/>
+                  <group>
                     <text macro="publisher" prefix=" "/>
                     <text variable="page" prefix=", "/>
                   </group>
                 </if>
                 <else>
                   <!-- no editor given -->
-                  <text variable="event" prefix="" font-style="italic" suffix="."/>
+                  <text variable="event" font-style="italic" suffix="."/>
                   <group>
                     <text macro="publisher" prefix=" "/>
                     <!--group suffix="." prefix=",">
@@ -238,12 +238,12 @@
             </group>
           </else-if>
           <else-if type="webpage" match="any">
-            <text macro="title" prefix="" suffix="."/>
+            <text macro="title" suffix="."/>
             <text variable="note" prefix=" "/>
           </else-if>
           <else-if type="article-newspaper broadcast" match="any">
             <group suffix=".">
-              <text macro="title" prefix="" suffix="."/>
+              <text macro="title" suffix="."/>
               <group suffix=", ">
                 <text variable="container-title" prefix=" " font-style="italic"/>
                 <text variable="publisher-place" prefix=" (" suffix=")"/>
@@ -261,8 +261,8 @@
           </else-if>
           <else>
             <group suffix=".">
-              <text macro="title" prefix=""/>
-              <text macro="editor" prefix=""/>
+              <text macro="title"/>
+              <text macro="editor"/>
             </group>
             <group prefix=" " suffix=".">
               <text variable="container-title" font-style="italic"/>
diff --git a/who-europe-numeric.csl b/who-europe-numeric.csl
index 48e3e43453..7dc23a7497 100644
--- a/who-europe-numeric.csl
+++ b/who-europe-numeric.csl
@@ -30,7 +30,7 @@
         <group suffix=".">
           <names variable="author">
             <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-            <label form="short" prefix="" suffix="" strip-periods="true"/>
+            <label form="short" strip-periods="true"/>
             <substitute>
               <names variable="editor"/>
               <!--text macro="anon"/-->
@@ -56,7 +56,7 @@
         <group delimiter=", ">
           <text variable="URL"/>
           <group>
-            <text value="accessed " suffix=""/>
+            <text value="accessed "/>
             <date variable="accessed">
               <date-part name="day" suffix=" "/>
               <date-part name="month" suffix=" "/>
@@ -70,12 +70,12 @@
   <macro name="accessSeries">
     <choose>
       <if variable="URL collection-title collection-number" match="any">
-        <text value="(" suffix=""/>
+        <text value="("/>
         <group delimiter="; ">
           <text macro="series"/>
           <text macro="access"/>
         </group>
-        <text value=")" suffix=""/>
+        <text value=")"/>
       </if>
     </choose>
   </macro>
@@ -115,7 +115,7 @@
     </group>
   </macro>
   <macro name="year-date">
-    <group prefix="">
+    <group>
       <choose>
         <if variable="issued">
           <date variable="issued">
@@ -161,17 +161,17 @@
   </citation>
   <bibliography hanging-indent="false" et-al-min="4" et-al-use-first="1">
     <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
-      <group prefix="" suffix=".">
+      <text variable="citation-number" suffix=". "/>
+      <group suffix=".">
         <text macro="author" suffix=" "/>
         <choose>
           <if type="bill book graphic legal_case motion_picture song report thesis" match="any">
             <group suffix=".">
-              <text macro="title" prefix="" suffix=""/>
+              <text macro="title"/>
               <text macro="edition" prefix=", "/>
               <text macro="editor" prefix=" (" suffix=")"/>
             </group>
-            <text prefix=" " suffix="" macro="publisher"/>
+            <text prefix=" " macro="publisher"/>
             <group prefix=", ">
               <date variable="issued">
                 <date-part name="year"/>
@@ -180,16 +180,16 @@
             </group>
           </if>
           <else-if type="chapter" match="any">
-            <text macro="title" prefix="" suffix="."/>
+            <text macro="title" suffix="."/>
             <group prefix=" ">
               <text term="in" text-case="capitalize-first" suffix=": "/>
               <text macro="editor"/>
               <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
               <text variable="volume" prefix="Vol" suffix="."/>
               <text macro="edition" prefix=","/>
-              <text variable="collection-title" prefix="" suffix="."/>
+              <text variable="collection-title" suffix="."/>
               <group suffix="." prefix=" ">
-                <text macro="publisher" prefix=""/>
+                <text macro="publisher"/>
                 <group suffix="." prefix=", ">
                   <date variable="issued">
                     <date-part name="year"/>
@@ -200,7 +200,7 @@
             </group>
           </else-if>
           <else-if type="paper-conference" match="any">
-            <text macro="title" prefix="" suffix="."/>
+            <text macro="title" suffix="."/>
             <group prefix=" ">
               <choose>
                 <if variable="editor">
@@ -209,8 +209,8 @@
                   <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
                   <text variable="volume" prefix="Vol" suffix="."/>
                   <text macro="edition" prefix=" "/>
-                  <text variable="collection-title" prefix="" suffix="."/>
-                  <group suffix="">
+                  <text variable="collection-title" suffix="."/>
+                  <group>
                     <text macro="publisher" prefix=" "/>
                     <group suffix="." prefix=", ">
                       <date variable="issued">
@@ -222,7 +222,7 @@
                 </if>
                 <else>
                   <!-- no editor given -->
-                  <text variable="event" prefix="" font-style="italic" suffix="."/>
+                  <text variable="event" font-style="italic" suffix="."/>
                   <group>
                     <text macro="publisher" prefix=" "/>
                     <group prefix=", ">
@@ -236,7 +236,7 @@
             </group>
           </else-if>
           <else-if type="webpage" match="any">
-            <text macro="title" prefix="" suffix="."/>
+            <text macro="title" suffix="."/>
             <text variable="note" prefix=" "/>
             <date variable="issued" prefix=", ">
               <date-part name="year"/>
@@ -244,7 +244,7 @@
           </else-if>
           <else-if type="article-newspaper broadcast" match="any">
             <group suffix=".">
-              <text macro="title" prefix="" suffix="."/>
+              <text macro="title" suffix="."/>
               <group suffix=", ">
                 <text variable="container-title" prefix=" " font-style="italic"/>
                 <text variable="publisher-place" prefix=" (" suffix=")"/>
@@ -262,8 +262,8 @@
           </else-if>
           <else>
             <group suffix=".">
-              <text macro="title" prefix=""/>
-              <text macro="editor" prefix=""/>
+              <text macro="title"/>
+              <text macro="editor"/>
             </group>
             <group prefix=" " suffix=".">
               <text variable="container-title" font-style="italic"/>
diff --git a/wissenschaftlicher-industrielogistik-dialog.csl b/wissenschaftlicher-industrielogistik-dialog.csl
index 0b3ce02611..007fb7f562 100644
--- a/wissenschaftlicher-industrielogistik-dialog.csl
+++ b/wissenschaftlicher-industrielogistik-dialog.csl
@@ -16,10 +16,10 @@
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
-    <group suffix="">
+    <group>
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
-        <label form="short" prefix=" " suffix="" text-case="lowercase" strip-periods="true"/>
+        <label form="short" prefix=" " text-case="lowercase" strip-periods="true"/>
         <substitute>
           <names variable="editor"/>
         </substitute>
diff --git a/world-congress-on-engineering-asset-management.csl b/world-congress-on-engineering-asset-management.csl
index 14be52dd61..cabbb0e0a4 100644
--- a/world-congress-on-engineering-asset-management.csl
+++ b/world-congress-on-engineering-asset-management.csl
@@ -60,7 +60,7 @@
           <date-part name="day" form="numeric" suffix=", "/>
           <date-part name="year" form="long"/>
         </date>
-        <text variable="URL" prefix=", from " suffix=""/>
+        <text variable="URL" prefix=", from "/>
       </if>
     </choose>
   </macro>
@@ -116,7 +116,7 @@
         <else>
           <group prefix=" " delimiter=", " suffix=".">
             <text variable="container-title" form="short" font-style="italic"/>
-            <group delimiter="">
+            <group>
               <text variable="volume"/>
               <text variable="issue" prefix="(" suffix=")"/>
             </group>
diff --git a/xenotransplantation.csl b/xenotransplantation.csl
index 1f6db05a9d..cdd5ec11b2 100644
--- a/xenotransplantation.csl
+++ b/xenotransplantation.csl
@@ -43,9 +43,9 @@
     </date>
   </macro>
   <macro name="journal">
-    <group suffix="" delimiter=" ">
+    <group delimiter=" ">
       <text variable="container-title" form="short" strip-periods="true"/>
-      <text macro="year" prefix="" suffix=";"/>
+      <text macro="year" suffix=";"/>
       <text variable="volume"/>
     </group>
   </macro>
@@ -54,7 +54,7 @@
       <text variable="container-title"/>
       <group delimiter=" ">
         <text variable="publisher"/>
-        <text macro="year" prefix="" suffix=""/>
+        <text macro="year"/>
       </group>
     </group>
   </macro>
@@ -116,13 +116,13 @@
           <text macro="editor" suffix=" "/>
           <text variable="container-title" suffix=". "/>
           <text macro="edition" suffix=" "/>
-          <group suffix="." delimiter="">
+          <group suffix=".">
             <text macro="book-publisher"/>
             <text variable="page" prefix=": "/>
           </group>
         </else-if>
         <else-if type="article-journal">
-          <group suffix="." delimiter="">
+          <group suffix=".">
             <text macro="journal"/>
             <text variable="page" prefix=": "/>
           </group>
diff --git a/zdravniski-vestnik.csl b/zdravniski-vestnik.csl
index 9e0c4e9481..3b251bec97 100644
--- a/zdravniski-vestnik.csl
+++ b/zdravniski-vestnik.csl
@@ -80,7 +80,7 @@
       <if variable="URL">
         <group prefix="[" suffix="]" delimiter=" ">
           <text term="cited" text-case="lowercase"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="year"/>
             <date-part name="month" prefix=" " form="short" strip-periods="true"/>
             <date-part name="day" prefix=" "/>
diff --git a/zeitschrift-fur-medienwissenschaft.csl b/zeitschrift-fur-medienwissenschaft.csl
index d985001d6f..2aed2bb1ba 100644
--- a/zeitschrift-fur-medienwissenschaft.csl
+++ b/zeitschrift-fur-medienwissenschaft.csl
@@ -226,7 +226,7 @@ a) mit Name "collection-editor" (in jedem Fall)
       <if variable="author" type="book" match="all">
         <names variable="editor" delimiter=", ">
           <!-- Bezeichnung in Kurzform ("hg. v."). -->
-          <label prefix="" form="verb-short" text-case="lowercase" suffix=". "/>
+          <label form="verb-short" text-case="lowercase" suffix=". "/>
           <!-- Mehrere Herausgeber durch Komma getrennt. -->
           <name delimiter=", " delimiter-precedes-last="always"/>
           <!-- Fehlen diese, so werden sie durch ?? ersetzt.
@@ -285,7 +285,7 @@ a) mit Name "collection-editor" (in jedem Fall)
       <if variable="container-author" type="chapter" match="all">
         <names variable="editor">
           <!-- Bezeichnung in Kurzform ("hg. v."). -->
-          <label prefix="" form="verb-short" text-case="lowercase" suffix=". "/>
+          <label form="verb-short" text-case="lowercase" suffix=". "/>
           <!-- Mehrere Herausgeber durch Komma getrennt. -->
           <name delimiter=", " delimiter-precedes-last="always"/>
           <!-- Fehlen diese, so werden sie durch ?? ersetzt.
@@ -309,7 +309,7 @@ a) mit Name "collection-editor" (in jedem Fall)
   <!-- ÜBERSETZER -->
   <macro name="translatedby">
     <names variable="translator">
-      <label prefix="" form="verb-short" text-case="lowercase" suffix=". "/>
+      <label form="verb-short" text-case="lowercase" suffix=". "/>
       <name delimiter=", " delimiter-precedes-last="always"/>
     </names>
   </macro>
@@ -379,7 +379,7 @@ a) mit Name "collection-editor" (in jedem Fall)
         <choose>
           <if variable="volume">
             <text prefix=", " term="volume" form="short" suffix=".&#160;"/>
-            <text prefix="" variable="volume"/>
+            <text variable="volume"/>
           </if>
         </choose>
         <!-- 2. Container-Beitragende -->
@@ -478,11 +478,11 @@ a) mit Name "collection-editor" (in jedem Fall)
           </if>
           <!-- wenn nur Ausgabe vorhanden ist: -->
           <else>
-            <number prefix="" variable="issue" suffix=""/>
+            <number variable="issue"/>
           </else>
         </choose>
         <!-- Jahr -->
-        <date prefix=", " variable="issued" suffix="">
+        <date prefix=", " variable="issued">
           <date-part name="year"/>
         </date>
       </else-if>
@@ -507,7 +507,7 @@ a) mit Name "collection-editor" (in jedem Fall)
     <choose>
       <if variable="URL">
         <text variable="URL"/>
-        <group prefix=", " suffix="" delimiter=" ">
+        <group prefix=", " delimiter=" ">
           <text term="accessed" text-case="lowercase"/>
           <date variable="accessed">
             <date-part name="day" form="numeric" suffix="."/>
diff --git a/zeitschrift-fur-soziologie.csl b/zeitschrift-fur-soziologie.csl
index 05ace57798..87f1681c63 100644
--- a/zeitschrift-fur-soziologie.csl
+++ b/zeitschrift-fur-soziologie.csl
@@ -40,7 +40,7 @@
       <if type="chapter paper-conference" match="none">
         <names variable="translator" delimiter=", " prefix=" (" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="capitalize-first" suffix=""/>
+          <label form="short" prefix=", " text-case="capitalize-first"/>
           <substitute>
             <names variable="editor"/>
           </substitute>
@@ -322,7 +322,7 @@
   </macro>
   <macro name="citation-locator">
     <group>
-      <text variable="locator" form="long" prefix=""/>
+      <text variable="locator" form="long"/>
     </group>
   </macro>
   <macro name="container">
@@ -385,7 +385,7 @@
         <text macro="issued-year"/>
       </group>
       <group prefix=": ">
-        <text macro="citation-locator" prefix=""/>
+        <text macro="citation-locator"/>
       </group>
     </layout>
   </citation>
diff --git a/zookeys.csl b/zookeys.csl
index 614da6d939..e48ce2893c 100644
--- a/zookeys.csl
+++ b/zookeys.csl
@@ -24,34 +24,34 @@
     <layout>
       <choose>
         <if type="chapter">
-          <names variable="author" prefix="" suffix="">
+          <names variable="author">
             <name delimiter=", " name-as-sort-order="all" sort-separator=" " form="long" initialize-with=""/>
           </names>
           <date variable="issued" prefix="(" suffix=")">
-            <date-part name="year" form="long" prefix="" suffix=""/>
+            <date-part name="year" form="long"/>
           </date>
-          <text variable="title" prefix="" suffix="."/>
-          <text variable="container-title" prefix="" suffix=" "/>
-          <group delimiter=" " prefix="" suffix=". ">
-            <group delimiter="" prefix="" suffix="">
-              <text variable="volume" prefix="" suffix=""/>
+          <text variable="title" suffix="."/>
+          <text variable="container-title" suffix=" "/>
+          <group delimiter=" " suffix=". ">
+            <group>
+              <text variable="volume"/>
               <text variable="issue" prefix="(" suffix=") "/>
             </group>
             <text variable="page" prefix=" :" suffix="."/>
           </group>
         </if>
         <else>
-          <names variable="author" prefix="" suffix=" ">
+          <names variable="author" suffix=" ">
             <name delimiter=", " name-as-sort-order="all" sort-separator=" " form="long" initialize-with=""/>
           </names>
           <date variable="issued" prefix="(" suffix=") ">
-            <date-part name="year" form="long" prefix="" suffix=""/>
+            <date-part name="year" form="long"/>
           </date>
-          <text variable="title" prefix="" suffix=". "/>
-          <group delimiter="" prefix="" suffix=". ">
-            <text variable="container-title" prefix="" suffix="" font-style="italic"/>
-            <group delimiter="" prefix="" suffix="">
-              <text variable="volume" prefix=" " suffix=""/>
+          <text variable="title" suffix=". "/>
+          <group suffix=". ">
+            <text variable="container-title" font-style="italic"/>
+            <group>
+              <text variable="volume" prefix=" "/>
               <text variable="issue" prefix=" (" suffix=")"/>
               <text variable="page" prefix=": " suffix="."/>
               <choose>
diff --git a/zootaxa.csl b/zootaxa.csl
index 68ba42fcc6..52390550b6 100644
--- a/zootaxa.csl
+++ b/zootaxa.csl
@@ -92,8 +92,8 @@
   <macro name="publisher">
     <choose>
       <if type="thesis" match="none">
-        <group prefix="" suffix="" delimiter=", ">
-          <text variable="publisher" suffix=""/>
+        <group delimiter=", ">
+          <text variable="publisher"/>
           <text variable="publisher-place"/>
         </group>
         <text variable="genre" prefix=". "/>
@@ -151,7 +151,7 @@
       <key macro="author-short"/>
       <key macro="year-date"/>
     </sort>
-    <layout prefix="" delimiter="; ">
+    <layout delimiter="; ">
       <group delimiter=", ">
         <group delimiter=" ">
           <text macro="author-short"/>
@@ -206,7 +206,7 @@
             <text macro="edition"/>
             <text macro="editor" suffix="."/>
           </group>
-          <group prefix=" " suffix="" delimiter=", ">
+          <group prefix=" " delimiter=", ">
             <text macro="publisher"/>
             <text variable="page" prefix=" " suffix="pp."/>
           </group>