diff --git a/csl/chicago-fullnote-bibliography.csl b/csl/chicago-fullnote-bibliography.csl
index cc241f483..a986c9e7b 100644
--- a/csl/chicago-fullnote-bibliography.csl
+++ b/csl/chicago-fullnote-bibliography.csl
@@ -21,7 +21,7 @@
     <category term="numeric"/>
     <updated></updated>
   </info>
-  <macro name="secondary-contributors">
+  <macro name="editor-translator">
     <group delimiter=", ">
       <choose>
         <if variable="author">
@@ -41,21 +41,21 @@
       </choose>
     </group>
   </macro>
-  <macro name="contributors">
+  <macro name="secondary-contributors-note">
     <choose>
       <if type="chapter" match="none">
-        <text macro="secondary-contributors"/>
+        <text macro="editor-translator"/>
       </if>
     </choose>
   </macro>
-  <macro name="container-contributors">
+  <macro name="container-contributors-note">
     <choose>
       <if type="chapter">
-        <text macro="secondary-contributors"/>
+        <text macro="editor-translator"/>
       </if>
     </choose>
   </macro>
-  <macro name="contributors-bib">
+  <macro name="secondary-contributors">
     <choose>
       <if type="chapter" match="none">
     <group delimiter=". ">
@@ -79,7 +79,7 @@
       </if>
     </choose>
   </macro>
-  <macro name="container-contributors-bib">
+  <macro name="container-contributors">
     <choose>
       <if type="chapter">
     <group delimiter=", ">
@@ -103,75 +103,47 @@
       </if>
     </choose>
   </macro>
-  <macro name="editor">
+  <macro name="editor-note">
     <names variable="editor">
       <name and="text" sort-separator=", " delimiter=", "/>
       <label form="short" prefix=", " suffix="."/>
     </names>
   </macro>
-  <macro name="translator">
+  <macro name="translator-note">
     <names variable="translator">
       <name and="text" sort-separator=", " delimiter=", "/>
       <label form="verb-short" prefix=", " suffix="."/>
     </names>
   </macro>
-  <macro name="author">
-    <names variable="author">
-      <name and="text" sort-separator=", " delimiter=", "/>
-      <substitute>
-	<text macro="editor"/>
-	<text macro="translator"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="editor-bib">
-    <names variable="editor">
-      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " suffix="."/>
-    </names>
-  </macro>
-  <macro name="translator-bib">
-    <names variable="translator">
-      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="verb-short" prefix=", " suffix="."/>
-    </names>
-  </macro>
-  <macro name="author-bib">
-    <names variable="author">
-      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-      <substitute>
-	<text macro="editor-bib"/>
-	<text macro="translator-bib"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="author-short">
-    <names variable="author">
-      <name form="short" and="text" delimiter=", " />
-      <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="author-sort">
-    <names variable="author">
-      <name name-as-sort-order="all" and="text" sort-separator=", "
-	    delimiter=", " delimiter-precedes-last="always"/>
-      <label form="verb-short" prefix=", " suffix="."/>
-      <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="recipient">
+  <macro name="recipient-note">
     <names variable="recipient" delimiter=", ">
       <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
       <name and="text" delimiter=", "/>
     </names>
   </macro>
-  <macro name="recipient-bib">
+  <macro name="contributors-note">
+    <names variable="author">
+      <name and="text" sort-separator=", " delimiter=", "/>
+      <substitute>
+	<text macro="editor-note"/>
+	<text macro="translator-note"/>
+      </substitute>
+    </names>
+    <text macro="recipient-note"/>
+  </macro>
+  <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="."/>
+    </names>
+  </macro>
+  <macro name="translator">
+    <names variable="translator">
+      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="verb-short" prefix=", " suffix="."/>
+    </names>
+  </macro>
+  <macro name="recipient">
     <choose>
       <if type="personal_communication">
     	<choose>
@@ -184,7 +156,17 @@
 	    </choose>
 	  </if>
 	</choose>
-	<text macro="recipient" prefix=" "/>
+	<text macro="recipient-note" prefix=" "/>
+  </macro>
+  <macro name="contributors">
+    <names variable="author">
+      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <substitute>
+	<text macro="editor"/>
+	<text macro="translator"/>
+      </substitute>
+    </names>
+    <text macro="recipient" prefix=". "/>
   </macro>
   <macro name="recipient-short">
     <names variable="recipient"> 
@@ -192,19 +174,40 @@
       <name form="short" and="text" delimiter=", " />
     </names>
   </macro>
-  <macro name="interviewer">
+  <macro name="contributors-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " />
+      <substitute>
+	<names variable="editor"/>
+	<names variable="translator"/>
+      </substitute>
+    </names>
+    <text macro="recipient-short"/>
+  </macro>
+  <macro name="contributors-sort">
+    <names variable="author">
+      <name name-as-sort-order="all" and="text" sort-separator=", "
+	    delimiter=", " delimiter-precedes-last="always"/>
+      <label form="verb-short" prefix=", " suffix="."/>
+      <substitute>
+	<names variable="editor"/>
+	<names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="interviewer-note">
     <names variable="interviewer" delimiter=", ">
       <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
       <name and="text" delimiter=", "/>
     </names>
   </macro>
-  <macro name="interviewer-bib">
+  <macro name="interviewer">
     <names variable="interviewer" delimiter=", ">
       <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
       <name and="text" delimiter=", "/>
     </names>
   </macro>
-  <macro name="title">
+  <macro name="title-note">
     <choose>
       <if variable="title" match="none">
         <text variable="genre"/>
@@ -217,7 +220,7 @@
       </else>
     </choose>
   </macro>
-  <macro name="title-bib">
+  <macro name="title">
     <choose>
       <if variable="title" match="none">
         <choose>
@@ -257,9 +260,9 @@
       </else>
     </choose>
   </macro>
-  <macro name="description">
+  <macro name="description-note">
     <group delimiter=", ">
-      <text macro="interviewer"/>
+      <text macro="interviewer-note"/>
       <text variable="medium"/>
       <choose>
         <if variable="title" match="none"> </if>
@@ -270,10 +273,10 @@
       </choose>
     </group>
   </macro>
-  <macro name="description-bib">
+  <macro name="description">
     <group delimiter=", ">
       <group delimiter=". ">
-        <text macro="interviewer-bib"/>
+        <text macro="interviewer"/>
         <text variable="medium" text-case="capitalize-first"/>
       </group>
       <choose>
@@ -285,21 +288,21 @@
       </choose>
     </group>
   </macro>
-  <macro name="container-prefix">
+  <macro name="container-prefix-note">
     <choose>
       <if type="chapter">
     <text term="in" text-case="lowercase" suffix=" "/>
       </if>
     </choose>
   </macro>
-  <macro name="container-prefix-bib">
+  <macro name="container-prefix">
     <choose>
       <if type="chapter">
     <text term="in" text-case="capitalize-first" suffix=" "/>
       </if>
     </choose>
   </macro>
-  <macro name="locators">
+  <macro name="locators-note">
     <choose>
       <if type="article-journal">
         <text variable="volume" prefix=" "/>
@@ -324,7 +327,7 @@
       </else-if>
     </choose>
   </macro>
-  <macro name="locators-bib">
+  <macro name="locators">
     <choose>
       <if type="article-journal">
         <text variable="volume" prefix=" "/>
@@ -396,6 +399,16 @@
       </else>
     </choose>
   </macro>
+  <macro name="point-locators-subsequent">
+    <group>
+      <choose>
+	    <if locator="page" match="none">
+	  <label variable="locator" form="short" include-period="true" suffix=" "/>
+	    </if>
+	  </choose>
+      <text variable="locator"/>
+	</group>
+  </macro>
   <macro name="point-locators">
     <choose>
       <if variable="locator" match="none">
@@ -405,7 +418,7 @@
         <text variable="locator" prefix=": "/>
       </else-if>
       <else>
-        <text variable="locator" prefix=", "/>
+        <text macro="point-locators-subsequent" prefix=", "/>
       </else>
     </choose>
   </macro>
@@ -434,21 +447,21 @@
       </if>
     </choose>
   </macro>
-  <macro name="archive">
+  <macro name="archive-note">
     <group delimiter=", ">
       <text variable="archive_location"/>
       <text variable="archive"/>
       <text variable="archive-place"/>
     </group>
   </macro>
-  <macro name="archive-bib">
+  <macro name="archive">
     <group delimiter=". ">
       <text variable="archive_location" text-case="capitalize-first"/>
       <text variable="archive"/>
       <text variable="archive-place"/>
     </group>
   </macro>
-  <macro name="issue">
+  <macro name="issue-note">
     <choose>
       <if type="article-journal">
         <text macro="issued" prefix=" (" suffix=")"/>
@@ -473,7 +486,7 @@
       </else>
     </choose>
   </macro>
-  <macro name="issue-bib">
+  <macro name="issue">
     <choose>
       <if type="article-journal">
         <text macro="issued" prefix=" (" suffix=")"/>
@@ -501,34 +514,34 @@
       </else>
     </choose>
   </macro>
-  <macro name="access">
+  <macro name="access-note">
     <group delimiter=", ">
 	  <choose>
 	    <if type="graphic report" match="any">
-      <text macro="archive"/>
+      <text macro="archive-note"/>
 	    </if>
 	    <else-if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
-      <text macro="archive"/>
+      <text macro="archive-note"/>
 	    </else-if>
 	  </choose>
       <text variable="URL"/>
     </group>
   </macro>
-  <macro name="access-bib">
+  <macro name="access">
     <group delimiter=". ">
 	  <choose>
 	    <if type="graphic report" match="any">
-      <text macro="archive-bib"/>
+      <text macro="archive"/>
 	    </if>
 	    <else-if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
-      <text macro="archive-bib"/>
+      <text macro="archive"/>
 	    </else-if>
 	  </choose>
       <text variable="URL"/>
     </group>
   </macro>
   <macro name="sort-key">
-      <text macro="author-sort" suffix=" "/>
+      <text macro="contributors-sort" suffix=" "/>
       <text variable="title" suffix=" "/>
       <text variable="genre"/>
   </macro>
@@ -538,13 +551,12 @@
     <option name="et-al-subsequent-min" value="4"/>
     <option name="et-al-subsequent-use-first" value="1"/>
     <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="true"/>
     <layout prefix="" suffix="." delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
             <text term="ibid" text-case="capitalize-first" suffix="."/>
-            <text variable="locator"/>
+            <text macro="point-locators-subsequent"/>
           </group>
         </if>
         <else-if position="ibid">
@@ -552,35 +564,29 @@
         </else-if>
         <else-if position="subsequent">
           <group delimiter=", ">
-            <group>
-              <text macro="author-short"/>
-              <text macro="recipient-short"/>
-            </group>
+            <text macro="contributors-short"/>
             <text macro="title-short"/>
-            <text variable="locator"/>
+            <text macro="point-locators-subsequent"/>
           </group>
         </else-if>
         <else>
           <group delimiter=", ">
+            <text macro="contributors-note"/>
+            <text macro="title-note"/>
+            <text macro="description-note"/>
+            <text macro="secondary-contributors-note"/>
             <group>
-              <text macro="author"/>
-              <text macro="recipient"/>
-            </group>
-            <text macro="title"/>
-            <text macro="description"/>
-            <text macro="contributors"/>
-            <group>
-              <text macro="container-prefix"/>
+              <text macro="container-prefix-note"/>
               <text variable="container-title" font-style="italic"/>
             </group>
-            <text macro="container-contributors"/>
+            <text macro="container-contributors-note"/>
           </group>
-          <text macro="locators"/>
+          <text macro="locators-note"/>
           <text variable="collection-title" prefix=", "/>
-          <text macro="issue"/>
+          <text macro="issue-note"/>
           <text macro="locators-newspaper" prefix=", "/>
           <text macro="point-locators"/>
-          <text macro="access" prefix=", "/>
+          <text macro="access-note" prefix=", "/>
         </else>
       </choose>
     </layout>
@@ -595,26 +601,25 @@
     </sort>
     <layout suffix=".">
       <group delimiter=". ">
-        <text macro="author-bib"/>
-        <text macro="recipient-bib"/>
-        <text macro="title-bib"/>
-        <text macro="description-bib"/>
-        <text macro="contributors-bib"/>
+        <text macro="contributors"/>
+        <text macro="title"/>
+        <text macro="description"/>
+        <text macro="secondary-contributors"/>
         <group delimiter=", ">
           <group>
-            <text macro="container-prefix-bib"/>
+            <text macro="container-prefix"/>
             <text variable="container-title" font-style="italic"/>
           </group>
-          <text macro="container-contributors-bib"/>
+          <text macro="container-contributors"/>
           <text macro="pages-chapter"/>
         </group>
       </group>
-      <text macro="locators-bib"/>
+      <text macro="locators"/>
       <text variable="collection-title" text-case="capitalize-first" prefix=". "/>
-      <text macro="issue-bib"/>
+      <text macro="issue"/>
       <text macro="locators-newspaper" prefix=", "/>
       <text macro="pages-article"/>
-      <text macro="access-bib" prefix=". "/>
+      <text macro="access" prefix=". "/>
     </layout>
   </bibliography>
 </style>
diff --git a/csl/chicago-note-bibliography.csl b/csl/chicago-note-bibliography.csl
index 6e4522b1b..77a51728a 100644
--- a/csl/chicago-note-bibliography.csl
+++ b/csl/chicago-note-bibliography.csl
@@ -23,7 +23,7 @@
     <category term="numeric"/>
     <updated></updated>
   </info>
-  <macro name="contributors-bib">
+  <macro name="secondary-contributors">
     <choose>
       <if type="chapter" match="none">
     <group delimiter=". ">
@@ -43,7 +43,7 @@
       </if>
     </choose>
   </macro>
-  <macro name="container-contributors-bib">
+  <macro name="container-contributors">
     <choose>
       <if type="chapter">
     <group delimiter=", ">
@@ -63,54 +63,25 @@
       </if>
     </choose>
   </macro>
-  <macro name="editor-bib">
+  <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="."/>
     </names>
   </macro>
-  <macro name="translator-bib">
+  <macro name="translator">
     <names variable="translator">
       <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
       <label form="verb-short" prefix=", " suffix="."/>
     </names>
   </macro>
-  <macro name="author-bib">
-    <names variable="author">
-      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-      <substitute>
-	<text macro="editor-bib"/>
-	<text macro="translator-bib"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="author-short">
-    <names variable="author">
-      <name form="short" and="text" delimiter=", " />
-      <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="author-sort">
-    <names variable="author">
-      <name name-as-sort-order="all" and="text" sort-separator=", "
-	    delimiter=", " delimiter-precedes-last="always"/>
-      <label form="verb-short" prefix=", " suffix="."/>
-      <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="recipient">
+  <macro name="recipient-note">
     <names variable="recipient" delimiter=", ">
       <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
       <name and="text" delimiter=", "/>
     </names>
   </macro>
-  <macro name="recipient-bib">
+  <macro name="recipient">
     <choose>
       <if type="personal_communication">
     	<choose>
@@ -123,7 +94,17 @@
 	    </choose>
 	  </if>
 	</choose>
-	<text macro="recipient" prefix=" "/>
+	<text macro="recipient-note" prefix=" "/>
+  </macro>
+  <macro name="contributors">
+    <names variable="author">
+      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <substitute>
+	<text macro="editor"/>
+	<text macro="translator"/>
+      </substitute>
+    </names>
+    <text macro="recipient" prefix=". "/>
   </macro>
   <macro name="recipient-short">
     <names variable="recipient"> 
@@ -131,13 +112,34 @@
       <name form="short" and="text" delimiter=", " />
     </names>
   </macro>
-  <macro name="interviewer-bib">
+  <macro name="contributors-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " />
+      <substitute>
+	<names variable="editor"/>
+	<names variable="translator"/>
+      </substitute>
+    </names>
+    <text macro="recipient-short"/>
+  </macro>
+  <macro name="contributors-sort">
+    <names variable="author">
+      <name name-as-sort-order="all" and="text" sort-separator=", "
+	    delimiter=", " delimiter-precedes-last="always"/>
+      <label form="verb-short" prefix=", " suffix="."/>
+      <substitute>
+	<names variable="editor"/>
+	<names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="interviewer">
     <names variable="interviewer" delimiter=", ">
       <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
       <name and="text" delimiter=", "/>
     </names>
   </macro>
-  <macro name="title-bib">
+  <macro name="title">
     <choose>
       <if variable="title" match="none">
         <choose>
@@ -177,10 +179,10 @@
       </else>
     </choose>
   </macro>
-  <macro name="description-bib">
+  <macro name="description">
     <group delimiter=", ">
       <group delimiter=". ">
-        <text macro="interviewer-bib"/>
+        <text macro="interviewer"/>
         <text variable="medium" text-case="capitalize-first"/>
       </group>
       <choose>
@@ -192,14 +194,14 @@
       </choose>
     </group>
   </macro>
-  <macro name="container-prefix-bib">
+  <macro name="container-prefix">
     <choose>
       <if type="chapter">
     <text term="in" text-case="capitalize-first" suffix=" "/>
       </if>
     </choose>
   </macro>
-  <macro name="locators-bib">
+  <macro name="locators">
     <choose>
       <if type="article-journal">
         <text variable="volume" prefix=" "/>
@@ -286,14 +288,24 @@
       </if>
     </choose>
   </macro>
-  <macro name="archive-bib">
+  <macro name="point-locators-subsequent">
+    <group>
+      <choose>
+	    <if locator="page" match="none">
+	  <label variable="locator" form="short" include-period="true" suffix=" "/>
+	    </if>
+	  </choose>
+      <text variable="locator"/>
+	</group>
+  </macro>
+  <macro name="archive">
     <group delimiter=". ">
       <text variable="archive_location" text-case="capitalize-first"/>
       <text variable="archive"/>
       <text variable="archive-place"/>
     </group>
   </macro>
-  <macro name="issue-bib">
+  <macro name="issue">
     <choose>
       <if type="article-journal">
         <text macro="issued" prefix=" (" suffix=")"/>
@@ -321,21 +333,21 @@
       </else>
     </choose>
   </macro>
-  <macro name="access-bib">
+  <macro name="access">
     <group delimiter=". ">
 	  <choose>
 	    <if type="graphic report" match="any">
-      <text macro="archive-bib"/>
+      <text macro="archive"/>
 	    </if>
 	    <else-if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
-      <text macro="archive-bib"/>
+      <text macro="archive"/>
 	    </else-if>
 	  </choose>
       <text variable="URL"/>
     </group>
   </macro>
   <macro name="sort-key">
-      <text macro="author-sort" suffix=" "/>
+      <text macro="contributors-sort" suffix=" "/>
       <text variable="title" suffix=" "/>
       <text variable="genre"/>
   </macro>
@@ -345,13 +357,12 @@
     <option name="et-al-subsequent-min" value="4"/>
     <option name="et-al-subsequent-use-first" value="1"/>
     <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="true"/>
     <layout prefix="" suffix="." delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
             <text term="ibid" text-case="capitalize-first" suffix="."/>
-            <text variable="locator"/>
+            <text macro="point-locators-subsequent"/>
           </group>
         </if>
         <else-if position="ibid">
@@ -359,12 +370,9 @@
         </else-if>
         <else>
           <group delimiter=", ">
-            <group>
-              <text macro="author-short"/>
-              <text macro="recipient-short"/>
-            </group>
+            <text macro="contributors-short"/>
             <text macro="title-short"/>
-            <text variable="locator"/>
+            <text macro="point-locators-subsequent"/>
           </group>
         </else>
       </choose>
@@ -380,26 +388,25 @@
     </sort>
     <layout suffix=".">
       <group delimiter=". ">
-        <text macro="author-bib"/>
-        <text macro="recipient-bib"/>
-        <text macro="title-bib"/>
-        <text macro="description-bib"/>
-        <text macro="contributors-bib"/>
+        <text macro="contributors"/>
+        <text macro="title"/>
+        <text macro="description"/>
+        <text macro="secondary-contributors"/>
         <group delimiter=", ">
           <group>
-            <text macro="container-prefix-bib"/>
+            <text macro="container-prefix"/>
             <text variable="container-title" font-style="italic"/>
           </group>
-          <text macro="container-contributors-bib"/>
+          <text macro="container-contributors"/>
           <text macro="pages-chapter"/>
         </group>
       </group>
-      <text macro="locators-bib"/>
+      <text macro="locators"/>
       <text variable="collection-title" text-case="capitalize-first" prefix=". "/>
-      <text macro="issue-bib"/>
+      <text macro="issue"/>
       <text macro="locators-newspaper" prefix=", "/>
       <text macro="pages-article"/>
-      <text macro="access-bib" prefix=". "/>
+      <text macro="access" prefix=". "/>
     </layout>
   </bibliography>
 </style>
diff --git a/csl/chicago-note-no-ibid.csl b/csl/chicago-note-no-ibid.csl
index d4a76489c..99e83c615 100644
--- a/csl/chicago-note-no-ibid.csl
+++ b/csl/chicago-note-no-ibid.csl
@@ -23,7 +23,7 @@
     <category term="note"/>
     <updated/>
   </info>
-  <macro name="secondary-contributors">
+  <macro name="editor-translator">
     <group delimiter=", ">
       <names variable="editor" delimiter=", ">
         <label form="verb-short" prefix=" " text-case="lowercase" suffix=". "/>
@@ -39,69 +39,71 @@
       </choose>
     </group>
   </macro>
-  <macro name="contributors">
+  <macro name="secondary-contributors-note">
     <choose>
       <if type="chapter" match="none">
-        <text macro="secondary-contributors"/>
+        <text macro="editor-translator"/>
       </if>
     </choose>
   </macro>
-  <macro name="container-contributors">
+  <macro name="container-contributors-note">
     <choose>
       <if type="chapter">
-        <text macro="secondary-contributors"/>
+        <text macro="editor-translator"/>
       </if>
     </choose>
   </macro>
-  <macro name="editor">
+  <macro name="editor-note">
     <names variable="editor">
       <name and="text" sort-separator=", " delimiter=", "/>
       <label form="short" prefix=", " suffix="."/>
     </names>
   </macro>
-  <macro name="translator">
+  <macro name="translator-note">
     <names variable="translator">
       <name and="text" sort-separator=", " delimiter=", "/>
       <label form="verb-short" prefix=", " suffix="."/>
     </names>
   </macro>
-  <macro name="author">
-    <names variable="author">
-      <name and="text" sort-separator=", " delimiter=", "/>
-      <substitute>
-	<text macro="editor"/>
-	<text macro="translator"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="author-short">
-    <names variable="author">
-      <name form="short" and="text" delimiter=", "/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="recipient">
+  <macro name="recipient-note">
     <names variable="recipient" delimiter=", ">
       <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
       <name and="text" delimiter=", "/>
     </names>
   </macro>
+  <macro name="contributors-note">
+    <names variable="author">
+      <name and="text" sort-separator=", " delimiter=", "/>
+      <substitute>
+	<text macro="editor-note"/>
+	<text macro="translator-note"/>
+      </substitute>
+    </names>
+    <text macro="recipient-note"/>
+  </macro>
   <macro name="recipient-short">
     <names variable="recipient">
       <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
       <name form="short" and="text" delimiter=", "/>
     </names>
   </macro>
-  <macro name="interviewer">
+  <macro name="contributors-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+    <text macro="recipient-short"/>
+  </macro>
+  <macro name="interviewer-note">
     <names variable="interviewer" delimiter=", ">
       <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
       <name and="text" delimiter=", "/>
     </names>
   </macro>
-  <macro name="title">
+  <macro name="title-note">
     <choose>
       <if variable="title" match="none">
         <text variable="genre"/>
@@ -137,9 +139,9 @@
       </else>
     </choose>
   </macro>
-  <macro name="description">
+  <macro name="description-note">
     <group delimiter=", ">
-      <text macro="interviewer"/>
+      <text macro="interviewer-note"/>
       <text variable="medium"/>
       <choose>
         <if variable="title" match="none"> </if>
@@ -150,14 +152,14 @@
       </choose>
     </group>
   </macro>
-  <macro name="container-prefix">
+  <macro name="container-prefix-note">
     <choose>
       <if type="chapter">
     <text term="in" text-case="lowercase" suffix=" "/>
       </if>
     </choose>
   </macro>
-  <macro name="locators">
+  <macro name="locators-note">
     <choose>
       <if type="article-journal">
         <text variable="volume" prefix=" "/>
@@ -243,6 +245,16 @@
       </else-if>
     </choose>
   </macro>
+  <macro name="point-locators-subsequent">
+    <group>
+      <choose>
+	    <if locator="page" match="none">
+	  <label variable="locator" form="short" include-period="true" suffix=" "/>
+	    </if>
+	  </choose>
+      <text variable="locator"/>
+	</group>
+  </macro>
   <macro name="point-locators">
     <choose>
       <if variable="locator" match="none">
@@ -252,18 +264,18 @@
         <text variable="locator" prefix=": "/>
       </else-if>
       <else>
-        <text variable="locator" prefix=", "/>
+        <text macro="point-locators-subsequent" prefix=", "/>
       </else>
     </choose>
   </macro>
-  <macro name="archive">
+  <macro name="archive-note">
     <group delimiter=", ">
       <text variable="archive_location"/>
       <text variable="archive"/>
       <text variable="archive-place"/>
     </group>
   </macro>
-  <macro name="issue">
+  <macro name="issue-note">
     <choose>
       <if type="article-journal">
         <text macro="issued" prefix=" (" suffix=")"/>
@@ -288,14 +300,14 @@
       </else>
     </choose>
   </macro>
-  <macro name="access">
+  <macro name="access-note">
     <group delimiter=", ">
 	  <choose>
 	    <if type="graphic report" match="any">
-      <text macro="archive"/>
+      <text macro="archive-note"/>
 	    </if>
 	    <else-if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
-      <text macro="archive"/>
+      <text macro="archive-note"/>
 	    </else-if>
 	  </choose>
       <text variable="URL"/>
@@ -312,35 +324,29 @@
       <choose>
         <if position="subsequent">
           <group delimiter=", ">
-            <group>
-              <text macro="author-short"/>
-              <text macro="recipient-short"/>
-            </group>
+            <text macro="contributors-short"/>
             <text macro="title-short"/>
-            <text variable="locator"/>
+            <text macro="point-locators-subsequent"/>
           </group>
         </if>
         <else>
           <group delimiter=", ">
+            <text macro="contributors-note"/>
+            <text macro="title-note"/>
+            <text macro="description-note"/>
+            <text macro="secondary-contributors-note"/>
             <group>
-              <text macro="author"/>
-              <text macro="recipient"/>
-            </group>
-            <text macro="title"/>
-            <text macro="description"/>
-            <text macro="contributors"/>
-            <group>
-              <text macro="container-prefix"/>
+              <text macro="container-prefix-note"/>
               <text variable="container-title" font-style="italic"/>
             </group>
-            <text macro="container-contributors"/>
+            <text macro="container-contributors-note"/>
           </group>
-          <text macro="locators"/>
+          <text macro="locators-note"/>
           <text variable="collection-title" prefix=", "/>
-          <text macro="issue"/>
+          <text macro="issue-note"/>
           <text macro="locators-newspaper" prefix=", "/>
           <text macro="point-locators"/>
-          <text macro="access" prefix=", "/>
+          <text macro="access-note" prefix=", "/>
         </else>
       </choose>
     </layout>
diff --git a/csl/chicago-note.csl b/csl/chicago-note.csl
index 17f9c4ec0..97354f646 100644
--- a/csl/chicago-note.csl
+++ b/csl/chicago-note.csl
@@ -23,7 +23,7 @@
     <category term="note"/>
     <updated/>
   </info>
-  <macro name="secondary-contributors">
+  <macro name="editor-translator">
     <group delimiter=", ">
       <names variable="editor" delimiter=", ">
         <label form="verb-short" prefix=" " text-case="lowercase" suffix=". "/>
@@ -39,69 +39,71 @@
       </choose>
     </group>
   </macro>
-  <macro name="contributors">
+  <macro name="secondary-contributors-note">
     <choose>
       <if type="chapter" match="none">
-        <text macro="secondary-contributors"/>
+        <text macro="editor-translator"/>
       </if>
     </choose>
   </macro>
-  <macro name="container-contributors">
+  <macro name="container-contributors-note">
     <choose>
       <if type="chapter">
-        <text macro="secondary-contributors"/>
+        <text macro="editor-translator"/>
       </if>
     </choose>
   </macro>
-  <macro name="editor">
+  <macro name="editor-note">
     <names variable="editor">
       <name and="text" sort-separator=", " delimiter=", "/>
       <label form="short" prefix=", " suffix="."/>
     </names>
   </macro>
-  <macro name="translator">
+  <macro name="translator-note">
     <names variable="translator">
       <name and="text" sort-separator=", " delimiter=", "/>
       <label form="verb-short" prefix=", " suffix="."/>
     </names>
   </macro>
-  <macro name="author">
-    <names variable="author">
-      <name and="text" sort-separator=", " delimiter=", "/>
-      <substitute>
-	<text macro="editor"/>
-	<text macro="translator"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="author-short">
-    <names variable="author">
-      <name form="short" and="text" delimiter=", "/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="recipient">
+  <macro name="recipient-note">
     <names variable="recipient" delimiter=", ">
       <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
       <name and="text" delimiter=", "/>
     </names>
   </macro>
+  <macro name="contributors-note">
+    <names variable="author">
+      <name and="text" sort-separator=", " delimiter=", "/>
+      <substitute>
+	<text macro="editor-note"/>
+	<text macro="translator-note"/>
+      </substitute>
+    </names>
+    <text macro="recipient-note"/>
+  </macro>
   <macro name="recipient-short">
     <names variable="recipient">
       <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
       <name form="short" and="text" delimiter=", "/>
     </names>
   </macro>
-  <macro name="interviewer">
+  <macro name="contributors-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+    <text macro="recipient-short"/>
+  </macro>
+  <macro name="interviewer-note">
     <names variable="interviewer" delimiter=", ">
       <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
       <name and="text" delimiter=", "/>
     </names>
   </macro>
-  <macro name="title">
+  <macro name="title-note">
     <choose>
       <if variable="title" match="none">
         <text variable="genre"/>
@@ -137,9 +139,9 @@
       </else>
     </choose>
   </macro>
-  <macro name="description">
+  <macro name="description-note">
     <group delimiter=", ">
-      <text macro="interviewer"/>
+      <text macro="interviewer-note"/>
       <text variable="medium"/>
       <choose>
         <if variable="title" match="none"> </if>
@@ -150,14 +152,14 @@
       </choose>
     </group>
   </macro>
-  <macro name="container-prefix">
+  <macro name="container-prefix-note">
     <choose>
       <if type="chapter">
     <text term="in" text-case="lowercase" suffix=" "/>
       </if>
     </choose>
   </macro>
-  <macro name="locators">
+  <macro name="locators-note">
     <choose>
       <if type="article-journal">
         <text variable="volume" prefix=" "/>
@@ -243,6 +245,16 @@
       </else-if>
     </choose>
   </macro>
+  <macro name="point-locators-subsequent">
+    <group>
+      <choose>
+	    <if locator="page" match="none">
+	  <label variable="locator" form="short" include-period="true" suffix=" "/>
+	    </if>
+	  </choose>
+      <text variable="locator"/>
+	</group>
+  </macro>
   <macro name="point-locators">
     <choose>
       <if variable="locator" match="none">
@@ -252,18 +264,18 @@
         <text variable="locator" prefix=": "/>
       </else-if>
       <else>
-        <text variable="locator" prefix=", "/>
+        <text macro="point-locators-subsequent" prefix=", "/>
       </else>
     </choose>
   </macro>
-  <macro name="archive">
+  <macro name="archive-note">
     <group delimiter=", ">
       <text variable="archive_location"/>
       <text variable="archive"/>
       <text variable="archive-place"/>
     </group>
   </macro>
-  <macro name="issue">
+  <macro name="issue-note">
     <choose>
       <if type="article-journal">
         <text macro="issued" prefix=" (" suffix=")"/>
@@ -288,14 +300,14 @@
       </else>
     </choose>
   </macro>
-  <macro name="access">
+  <macro name="access-note">
     <group delimiter=", ">
 	  <choose>
 	    <if type="graphic report" match="any">
-      <text macro="archive"/>
+      <text macro="archive-note"/>
 	    </if>
 	    <else-if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
-      <text macro="archive"/>
+      <text macro="archive-note"/>
 	    </else-if>
 	  </choose>
       <text variable="URL"/>
@@ -313,7 +325,7 @@
         <if position="ibid-with-locator">
           <group delimiter=", ">
             <text term="ibid" text-case="capitalize-first" suffix="."/>
-            <text variable="locator"/>
+            <text macro="point-locators-subsequent"/>
           </group>
         </if>
         <else-if position="ibid">
@@ -321,35 +333,29 @@
         </else-if>
         <else-if position="subsequent">
           <group delimiter=", ">
-            <group>
-              <text macro="author-short"/>
-              <text macro="recipient-short"/>
-            </group>
+            <text macro="contributors-short"/>
             <text macro="title-short"/>
-            <text variable="locator"/>
+            <text macro="point-locators-subsequent"/>
           </group>
         </else-if>
         <else>
           <group delimiter=", ">
+            <text macro="contributors-note"/>
+            <text macro="title-note"/>
+            <text macro="description-note"/>
+            <text macro="secondary-contributors-note"/>
             <group>
-              <text macro="author"/>
-              <text macro="recipient"/>
-            </group>
-            <text macro="title"/>
-            <text macro="description"/>
-            <text macro="contributors"/>
-            <group>
-              <text macro="container-prefix"/>
+              <text macro="container-prefix-note"/>
               <text variable="container-title" font-style="italic"/>
             </group>
-            <text macro="container-contributors"/>
+            <text macro="container-contributors-note"/>
           </group>
-          <text macro="locators"/>
+          <text macro="locators-note"/>
           <text variable="collection-title" prefix=", "/>
-          <text macro="issue"/>
+          <text macro="issue-note"/>
           <text macro="locators-newspaper" prefix=", "/>
           <text macro="point-locators"/>
-          <text macro="access" prefix=", "/>
+          <text macro="access-note" prefix=", "/>
         </else>
       </choose>
     </layout>