diff --git a/latex/citation-style-language-init.sty b/latex/citation-style-language-init.sty
index e59cd280..c3057f8a 100644
--- a/latex/citation-style-language-init.sty
+++ b/latex/citation-style-language-init.sty
@@ -28,13 +28,15 @@
   {
     \tl_if_empty:NT \l__csl_style_tl
       { \tl_set_eq:NN \l__csl_style_tl \g__csl_aux_bibstyle_tl }
-    \tl_if_empty:NT \l__csl_style_tl
+    \tl_if_empty:NTF \l__csl_style_tl
       {
         \msg_warning:nn { citation-style-language } { missing-style-name }
         \tl_set:Nn \l__csl_style_tl { apa }
       }
+      {
+        \exp_args:NV \__csl_write_aux_bibstyle:n \l__csl_style_tl
+      }
     \tl_set_eq:NN \csl@style \l__csl_style_tl
-    \exp_args:NV \__csl_write_aux_bibstyle:n \l__csl_style_tl
     \clist_if_empty:NT \l__csl_bib_resources_clist
       { \clist_set_eq:NN \l__csl_bib_resources_clist \g__csl_aux_bib_files_clist }
     \exp_args:Nx \__csl_write_aux_bibdata:n
diff --git a/tests/latex/pdftex-1/annotated-bibliography.tlg b/tests/latex/pdftex-1/annotated-bibliography.tlg
index 7cabde85..4d55c4d9 100644
--- a/tests/latex/pdftex-1/annotated-bibliography.tlg
+++ b/tests/latex/pdftex-1/annotated-bibliography.tlg
@@ -3,7 +3,7 @@ Don't change this file in any respect.
 ============================================================
 TEST 1: Citation
 ============================================================
-> \l__csl_citation_info_tl=citationID={barber2016work-life,carlson2019double@1},citationItems={{id={barber2016work-life}},{id={carlson2019double}}},properties={noteIndex={1}}.
+> \l__csl_citation_info_tl=citationID={barber2016work-life,carlson2019double@1},citationItems={{id={barber2016work-life}},{id={carlson2019double}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `barber2016work-life' on page 1 undefined on input line ....
diff --git a/tests/latex/pdftex-1/bib-filter.tlg b/tests/latex/pdftex-1/bib-filter.tlg
index 85d8afa3..745d9772 100644
--- a/tests/latex/pdftex-1/bib-filter.tlg
+++ b/tests/latex/pdftex-1/bib-filter.tlg
@@ -3,7 +3,7 @@ Don't change this file in any respect.
 ============================================================
 TEST 1: Citations
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2,ITEM-3,ITEM-4@1},citationItems={{id={ITEM-1}},{id={ITEM-2}},{id={ITEM-3}},{id={ITEM-4}}},properties={noteIndex={1}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2,ITEM-3,ITEM-4@1},citationItems={{id={ITEM-1}},{id={ITEM-2}},{id={ITEM-3}},{id={ITEM-4}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
diff --git a/tests/latex/pdftex-1/bibstyle-in-preamble.tlg b/tests/latex/pdftex-1/bibstyle-in-preamble.tlg
index 52005338..780a785d 100644
--- a/tests/latex/pdftex-1/bibstyle-in-preamble.tlg
+++ b/tests/latex/pdftex-1/bibstyle-in-preamble.tlg
@@ -20,7 +20,7 @@ No file bibstyle-in-preamble.bbl.
 ============================================================
 TEST 1: Single cite item in a citation
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={1}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -31,7 +31,7 @@ l. ...}
 ============================================================
 TEST 2: Multiple cite items in a citation
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@1},citationItems={{id={ITEM-1}},{id={ITEM-2}}},properties={noteIndex={2}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@1},citationItems={{id={ITEM-1}},{id={ITEM-2}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -43,7 +43,7 @@ l. ...}
 ============================================================
 TEST 3: Citation with page locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@2},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={3}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@2},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -54,7 +54,7 @@ l. ...}
 ============================================================
 TEST 4: Citation with section locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@3},citationItems={{id={ITEM-1},label={section},locator={2.3}}},properties={noteIndex={4}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@3},citationItems={{id={ITEM-1},label={section},locator={2.3}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -65,7 +65,7 @@ l. ...}
 ============================================================
 TEST 5: Citation with implicit page locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@4},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={5}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@4},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -76,7 +76,7 @@ l. ...}
 ============================================================
 TEST 6: Citation with prefix and suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@5},citationItems={{id={ITEM-1},prefix={prefix },suffix={ suffix}}},properties={noteIndex={6}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@5},citationItems={{id={ITEM-1},prefix={prefix },suffix={ suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -87,7 +87,7 @@ l. ...}
 ============================================================
 TEST 7: Citation with implicit prefix and suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@6},citationItems={{id={ITEM-1},prefix={prefix },suffix={, suffix}}},properties={noteIndex={7}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@6},citationItems={{id={ITEM-1},prefix={prefix },suffix={, suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -98,7 +98,7 @@ l. ...}
 ============================================================
 TEST 8: Citation with implicit suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@7},citationItems={{id={ITEM-1},suffix={, suffix}}},properties={noteIndex={8}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@7},citationItems={{id={ITEM-1},suffix={, suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -109,7 +109,7 @@ l. ...}
 ============================================================
 TEST 9: Citation with implicit prefix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@8},citationItems={{id={ITEM-1},prefix={prefix }}},properties={noteIndex={9}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@8},citationItems={{id={ITEM-1},prefix={prefix }}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -142,7 +142,7 @@ l. ...}
 ============================================================
 TEST 12: Multiple cite items with options
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@2},citationItems={{id={ITEM-1},prefix={See },label={page},locator={6}},{id={ITEM-2},label={figure},locator={2}}},properties={noteIndex={12}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@2},citationItems={{id={ITEM-1},prefix={See },label={page},locator={6}},{id={ITEM-2},label={figure},locator={2}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
diff --git a/tests/latex/pdftex-1/bibstyle.tlg b/tests/latex/pdftex-1/bibstyle.tlg
index a9986040..0ef500aa 100644
--- a/tests/latex/pdftex-1/bibstyle.tlg
+++ b/tests/latex/pdftex-1/bibstyle.tlg
@@ -4,7 +4,7 @@ Don't change this file in any respect.
 ============================================================
 TEST 1: Single cite item in a citation
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={1}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -15,7 +15,7 @@ l. ...}
 ============================================================
 TEST 2: Multiple cite items in a citation
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@1},citationItems={{id={ITEM-1}},{id={ITEM-2}}},properties={noteIndex={2}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@1},citationItems={{id={ITEM-1}},{id={ITEM-2}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -27,7 +27,7 @@ l. ...}
 ============================================================
 TEST 3: Citation with page locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@2},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={3}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@2},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -38,7 +38,7 @@ l. ...}
 ============================================================
 TEST 4: Citation with section locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@3},citationItems={{id={ITEM-1},label={section},locator={2.3}}},properties={noteIndex={4}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@3},citationItems={{id={ITEM-1},label={section},locator={2.3}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -49,7 +49,7 @@ l. ...}
 ============================================================
 TEST 5: Citation with implicit page locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@4},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={5}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@4},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -60,7 +60,7 @@ l. ...}
 ============================================================
 TEST 6: Citation with prefix and suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@5},citationItems={{id={ITEM-1},prefix={prefix },suffix={ suffix}}},properties={noteIndex={6}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@5},citationItems={{id={ITEM-1},prefix={prefix },suffix={ suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -71,7 +71,7 @@ l. ...}
 ============================================================
 TEST 7: Citation with implicit prefix and suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@6},citationItems={{id={ITEM-1},prefix={prefix },suffix={, suffix}}},properties={noteIndex={7}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@6},citationItems={{id={ITEM-1},prefix={prefix },suffix={, suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -82,7 +82,7 @@ l. ...}
 ============================================================
 TEST 8: Citation with implicit suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@7},citationItems={{id={ITEM-1},suffix={, suffix}}},properties={noteIndex={8}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@7},citationItems={{id={ITEM-1},suffix={, suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -93,7 +93,7 @@ l. ...}
 ============================================================
 TEST 9: Citation with implicit prefix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@8},citationItems={{id={ITEM-1},prefix={prefix }}},properties={noteIndex={9}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@8},citationItems={{id={ITEM-1},prefix={prefix }}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -126,7 +126,7 @@ l. ...}
 ============================================================
 TEST 12: Multiple cite items with options
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@2},citationItems={{id={ITEM-1},prefix={See },label={page},locator={6}},{id={ITEM-2},label={figure},locator={2}}},properties={noteIndex={12}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@2},citationItems={{id={ITEM-1},prefix={See },label={page},locator={6}},{id={ITEM-2},label={figure},locator={2}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
diff --git a/tests/latex/pdftex-1/data-yaml.tlg b/tests/latex/pdftex-1/data-yaml.tlg
index a2ae1273..6434ff76 100644
--- a/tests/latex/pdftex-1/data-yaml.tlg
+++ b/tests/latex/pdftex-1/data-yaml.tlg
@@ -4,7 +4,7 @@ Don't change this file in any respect.
 ============================================================
 TEST 1: Single cite item in a citation
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={1}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -15,7 +15,7 @@ l. ...}
 ============================================================
 TEST 2: Multiple cite items in a citation
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@1},citationItems={{id={ITEM-1}},{id={ITEM-2}}},properties={noteIndex={2}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@1},citationItems={{id={ITEM-1}},{id={ITEM-2}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -27,7 +27,7 @@ l. ...}
 ============================================================
 TEST 3: Citation with page locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@2},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={3}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@2},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -38,7 +38,7 @@ l. ...}
 ============================================================
 TEST 4: Citation with section locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@3},citationItems={{id={ITEM-1},label={section},locator={2.3}}},properties={noteIndex={4}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@3},citationItems={{id={ITEM-1},label={section},locator={2.3}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -49,7 +49,7 @@ l. ...}
 ============================================================
 TEST 5: Citation with implicit page locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@4},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={5}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@4},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -60,7 +60,7 @@ l. ...}
 ============================================================
 TEST 6: Citation with prefix and suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@5},citationItems={{id={ITEM-1},prefix={prefix },suffix={ suffix}}},properties={noteIndex={6}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@5},citationItems={{id={ITEM-1},prefix={prefix },suffix={ suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -71,7 +71,7 @@ l. ...}
 ============================================================
 TEST 7: Citation with implicit prefix and suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@6},citationItems={{id={ITEM-1},prefix={prefix },suffix={, suffix}}},properties={noteIndex={7}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@6},citationItems={{id={ITEM-1},prefix={prefix },suffix={, suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -82,7 +82,7 @@ l. ...}
 ============================================================
 TEST 8: Citation with implicit suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@7},citationItems={{id={ITEM-1},suffix={, suffix}}},properties={noteIndex={8}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@7},citationItems={{id={ITEM-1},suffix={, suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -93,7 +93,7 @@ l. ...}
 ============================================================
 TEST 9: Citation with implicit prefix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@8},citationItems={{id={ITEM-1},prefix={prefix }}},properties={noteIndex={9}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@8},citationItems={{id={ITEM-1},prefix={prefix }}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -126,7 +126,7 @@ l. ...}
 ============================================================
 TEST 12: Multiple cite items with options
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@2},citationItems={{id={ITEM-1},prefix={See },label={page},locator={6}},{id={ITEM-2},label={figure},locator={2}}},properties={noteIndex={12}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@2},citationItems={{id={ITEM-1},prefix={See },label={page},locator={6}},{id={ITEM-2},label={figure},locator={2}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
diff --git a/tests/latex/pdftex-1/error-item-unavailable.tlg b/tests/latex/pdftex-1/error-item-unavailable.tlg
index f56511c9..73ccd88a 100644
--- a/tests/latex/pdftex-1/error-item-unavailable.tlg
+++ b/tests/latex/pdftex-1/error-item-unavailable.tlg
@@ -19,7 +19,7 @@ No file error-item-unavailable.bbl.
 ============================================================
 TEST 1: Entry not available
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-UNAVAILABLE@1},citationItems={{id={ITEM-UNAVAILABLE}}},properties={noteIndex={1}}.
+> \l__csl_citation_info_tl=citationID={ITEM-UNAVAILABLE@1},citationItems={{id={ITEM-UNAVAILABLE}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-UNAVAILABLE' on page 1 undefined on input line ....
@@ -30,7 +30,7 @@ l. ...}
 ============================================================
 TEST 2: Multiple enties
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-UNAVAILABLE,ANOTHER-ITEM@1},citationItems={{id={ITEM-UNAVAILABLE}},{id={ANOTHER-ITEM}}},properties={noteIndex={2}}.
+> \l__csl_citation_info_tl=citationID={ITEM-UNAVAILABLE,ANOTHER-ITEM@1},citationItems={{id={ITEM-UNAVAILABLE}},{id={ANOTHER-ITEM}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-UNAVAILABLE' on page 1 undefined on input line ....
@@ -42,7 +42,7 @@ l. ...}
 ============================================================
 TEST 3: Mixture
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-UNAVAILABLE,ITEM-1,ANOTHER-ITEM@1},citationItems={{id={ITEM-UNAVAILABLE}},{id={ITEM-1}},{id={ANOTHER-ITEM}}},properties={noteIndex={3}}.
+> \l__csl_citation_info_tl=citationID={ITEM-UNAVAILABLE,ITEM-1,ANOTHER-ITEM@1},citationItems={{id={ITEM-UNAVAILABLE}},{id={ITEM-1}},{id={ANOTHER-ITEM}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-UNAVAILABLE' on page 1 undefined on input line ....
diff --git a/tests/latex/pdftex-1/fullcite.tlg b/tests/latex/pdftex-1/fullcite.tlg
index 61c05c86..d077f431 100644
--- a/tests/latex/pdftex-1/fullcite.tlg
+++ b/tests/latex/pdftex-1/fullcite.tlg
@@ -25,7 +25,7 @@ l. ...}
 ============================================================
 TEST 3: Disambiguation with \cite 
 ============================================================
-> \l__csl_citation_info_tl=citationID={apa.9.47:3@1},citationItems={{id={apa.9.47:3}}},properties={noteIndex={3}}.
+> \l__csl_citation_info_tl=citationID={apa.9.47:3@1},citationItems={{id={apa.9.47:3}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `apa.9.47:3' on page 1 undefined on input line ....
diff --git a/tests/latex/pdftex-1/hyperref.tlg b/tests/latex/pdftex-1/hyperref.tlg
index 37c1bda4..066bc379 100644
--- a/tests/latex/pdftex-1/hyperref.tlg
+++ b/tests/latex/pdftex-1/hyperref.tlg
@@ -3,7 +3,7 @@ Don't change this file in any respect.
 ============================================================
 TEST 1: Citation with hyperlink
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2,ITEM-3,ITEM-4@1},citationItems={{id={ITEM-1}},{id={ITEM-2}},{id={ITEM-3}},{id={ITEM-4}}},properties={noteIndex={1}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2,ITEM-3,ITEM-4@1},citationItems={{id={ITEM-1}},{id={ITEM-2}},{id={ITEM-3}},{id={ITEM-4}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
diff --git a/tests/latex/pdftex-1/issue-48.tlg b/tests/latex/pdftex-1/issue-48.tlg
index a05f755a..2b231497 100644
--- a/tests/latex/pdftex-1/issue-48.tlg
+++ b/tests/latex/pdftex-1/issue-48.tlg
@@ -3,7 +3,7 @@ Don't change this file in any respect.
 ============================================================
 TEST 1: Citation
 ============================================================
-> \l__csl_citation_info_tl=citationID={afGeijersstam1998Stability@1},citationItems={{id={afGeijersstam1998Stability}}},properties={noteIndex={1}}.
+> \l__csl_citation_info_tl=citationID={afGeijersstam1998Stability@1},citationItems={{id={afGeijersstam1998Stability}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `afGeijersstam1998Stability' on page 1 undefined on input line ....
diff --git a/tests/latex/pdftex-1/issue-49.tlg b/tests/latex/pdftex-1/issue-49.tlg
index dec4f69a..53e6a9e8 100644
--- a/tests/latex/pdftex-1/issue-49.tlg
+++ b/tests/latex/pdftex-1/issue-49.tlg
@@ -3,7 +3,7 @@ Don't change this file in any respect.
 ============================================================
 TEST 1: Citation
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1},prefix={That typically happens in 10$^{-15}$ seconds. See }}},properties={noteIndex={1}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1},prefix={That typically happens in 10$^{-15}$ seconds. See }}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
diff --git a/tests/latex/pdftex-1/refsection-option.tlg b/tests/latex/pdftex-1/refsection-option.tlg
index 76c97530..2279ce58 100644
--- a/tests/latex/pdftex-1/refsection-option.tlg
+++ b/tests/latex/pdftex-1/refsection-option.tlg
@@ -1,7 +1,7 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
 Chapter 1.
-> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={1}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...This is just filler text \cite{ITEM-1}
                                            .\par
@@ -10,7 +10,7 @@ LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
 <recently read> }
 l. ...This is just filler text \cite{ITEM-1}
                                            .\par
-> \l__csl_citation_info_tl=citationID={ITEM-2@1},citationItems={{id={ITEM-2}}},properties={noteIndex={2}}.
+> \l__csl_citation_info_tl=citationID={ITEM-2@1},citationItems={{id={ITEM-2}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...This is just filler text \cite{ITEM-2}
                                            .\par
@@ -244,7 +244,7 @@ Completed box being shipped out [2]
 ...\hbox(0.0+0.0)x345.0
 ....\hbox(0.0+0.0)x345.0
 Chapter 2.
-> \l__csl_citation_info_tl=citationID={ITEM-1@2},citationItems={{id={ITEM-1}}},properties={noteIndex={3}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@2},citationItems={{id={ITEM-1}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...This is just filler text \cite{ITEM-1}
                                            .\par
@@ -431,7 +431,7 @@ Completed box being shipped out [4]
 ...\hbox(0.0+0.0)x345.0
 ....\hbox(0.0+0.0)x345.0
 Chapter 3.
-> \l__csl_citation_info_tl=citationID={ITEM-3@1},citationItems={{id={ITEM-3}}},properties={noteIndex={4}}.
+> \l__csl_citation_info_tl=citationID={ITEM-3@1},citationItems={{id={ITEM-3}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...This is just filler text \cite{ITEM-3}
                                            .\par
@@ -440,7 +440,7 @@ LaTeX Warning: Citation `ITEM-3' on page 5 undefined on input line ....
 <recently read> }
 l. ...This is just filler text \cite{ITEM-3}
                                            .\par
-> \l__csl_citation_info_tl=citationID={ITEM-4@1},citationItems={{id={ITEM-4}}},properties={noteIndex={5}}.
+> \l__csl_citation_info_tl=citationID={ITEM-4@1},citationItems={{id={ITEM-4}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...This is just filler text \cite{ITEM-4}
                                            .\par
diff --git a/tests/latex/pdftex-1/style-author-date.tlg b/tests/latex/pdftex-1/style-author-date.tlg
index e9caf87f..c3346bef 100644
--- a/tests/latex/pdftex-1/style-author-date.tlg
+++ b/tests/latex/pdftex-1/style-author-date.tlg
@@ -4,7 +4,7 @@ Don't change this file in any respect.
 ============================================================
 TEST 1: Single cite item in a citation
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={1}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -15,7 +15,7 @@ l. ...}
 ============================================================
 TEST 2: Multiple cite items in a citation
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@1},citationItems={{id={ITEM-1}},{id={ITEM-2}}},properties={noteIndex={2}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@1},citationItems={{id={ITEM-1}},{id={ITEM-2}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -27,7 +27,7 @@ l. ...}
 ============================================================
 TEST 3: Citation with page locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@2},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={3}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@2},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -38,7 +38,7 @@ l. ...}
 ============================================================
 TEST 4: Citation with section locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@3},citationItems={{id={ITEM-1},label={section},locator={2.3}}},properties={noteIndex={4}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@3},citationItems={{id={ITEM-1},label={section},locator={2.3}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -49,7 +49,7 @@ l. ...}
 ============================================================
 TEST 5: Citation with implicit page locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@4},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={5}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@4},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -60,7 +60,7 @@ l. ...}
 ============================================================
 TEST 6: Citation with prefix and suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@5},citationItems={{id={ITEM-1},prefix={prefix },suffix={ suffix}}},properties={noteIndex={6}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@5},citationItems={{id={ITEM-1},prefix={prefix },suffix={ suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -71,7 +71,7 @@ l. ...}
 ============================================================
 TEST 7: Citation with implicit prefix and suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@6},citationItems={{id={ITEM-1},prefix={prefix },suffix={, suffix}}},properties={noteIndex={7}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@6},citationItems={{id={ITEM-1},prefix={prefix },suffix={, suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -82,7 +82,7 @@ l. ...}
 ============================================================
 TEST 8: Citation with implicit suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@7},citationItems={{id={ITEM-1},suffix={, suffix}}},properties={noteIndex={8}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@7},citationItems={{id={ITEM-1},suffix={, suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -93,7 +93,7 @@ l. ...}
 ============================================================
 TEST 9: Citation with implicit prefix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@8},citationItems={{id={ITEM-1},prefix={prefix }}},properties={noteIndex={9}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@8},citationItems={{id={ITEM-1},prefix={prefix }}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -126,7 +126,7 @@ l. ...}
 ============================================================
 TEST 12: Multiple cite items with options
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@2},citationItems={{id={ITEM-1},prefix={See },label={page},locator={6}},{id={ITEM-2},label={figure},locator={2}}},properties={noteIndex={12}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@2},citationItems={{id={ITEM-1},prefix={See },label={page},locator={6}},{id={ITEM-2},label={figure},locator={2}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
diff --git a/tests/latex/pdftex-1/style-numeric.tlg b/tests/latex/pdftex-1/style-numeric.tlg
index a24adf5e..3636cdd0 100644
--- a/tests/latex/pdftex-1/style-numeric.tlg
+++ b/tests/latex/pdftex-1/style-numeric.tlg
@@ -4,7 +4,7 @@ Don't change this file in any respect.
 ============================================================
 TEST 1: Single cite item in a citation
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={1}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -15,7 +15,7 @@ l. ...}
 ============================================================
 TEST 2: Multiple cite items in a citation
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@1},citationItems={{id={ITEM-1}},{id={ITEM-2}}},properties={noteIndex={2}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@1},citationItems={{id={ITEM-1}},{id={ITEM-2}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -27,7 +27,7 @@ l. ...}
 ============================================================
 TEST 3: Citation with page locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@2},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={3}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@2},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -38,7 +38,7 @@ l. ...}
 ============================================================
 TEST 4: Citation with section locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@3},citationItems={{id={ITEM-1},label={section},locator={2.3}}},properties={noteIndex={4}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@3},citationItems={{id={ITEM-1},label={section},locator={2.3}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -49,7 +49,7 @@ l. ...}
 ============================================================
 TEST 5: Citation with implicit page locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@4},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={5}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@4},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -60,7 +60,7 @@ l. ...}
 ============================================================
 TEST 6: Citation with prefix and suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@5},citationItems={{id={ITEM-1},prefix={prefix },suffix={ suffix}}},properties={noteIndex={6}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@5},citationItems={{id={ITEM-1},prefix={prefix },suffix={ suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -71,7 +71,7 @@ l. ...}
 ============================================================
 TEST 7: Citation with implicit prefix and suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@6},citationItems={{id={ITEM-1},prefix={prefix },suffix={, suffix}}},properties={noteIndex={7}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@6},citationItems={{id={ITEM-1},prefix={prefix },suffix={, suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -82,7 +82,7 @@ l. ...}
 ============================================================
 TEST 8: Citation with implicit suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@7},citationItems={{id={ITEM-1},suffix={, suffix}}},properties={noteIndex={8}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@7},citationItems={{id={ITEM-1},suffix={, suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -93,7 +93,7 @@ l. ...}
 ============================================================
 TEST 9: Citation with implicit prefix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@8},citationItems={{id={ITEM-1},prefix={prefix }}},properties={noteIndex={9}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@8},citationItems={{id={ITEM-1},prefix={prefix }}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -126,7 +126,7 @@ l. ...}
 ============================================================
 TEST 12: Multiple cite items with options
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@2},citationItems={{id={ITEM-1},prefix={See },label={page},locator={6}},{id={ITEM-2},label={figure},locator={2}}},properties={noteIndex={12}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@2},citationItems={{id={ITEM-1},prefix={See },label={page},locator={6}},{id={ITEM-2},label={figure},locator={2}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
diff --git a/tests/latex/pdftex-1/url-links.tlg b/tests/latex/pdftex-1/url-links.tlg
index a9eced3c..fff7c566 100644
--- a/tests/latex/pdftex-1/url-links.tlg
+++ b/tests/latex/pdftex-1/url-links.tlg
@@ -1,6 +1,6 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
-> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={1}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...\cite{ITEM-1}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
diff --git a/tests/latex/pdftex-1/warning-missing-style-name.tlg b/tests/latex/pdftex-1/warning-missing-style-name.tlg
index 54eb9f5f..a0c656fc 100644
--- a/tests/latex/pdftex-1/warning-missing-style-name.tlg
+++ b/tests/latex/pdftex-1/warning-missing-style-name.tlg
@@ -21,7 +21,7 @@ No file warning-missing-style-name.bbl.
 ============================================================
 TEST 1: Citation
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={1}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....