* lisp/oc.el (org-cite-main-affixes): New function. * lisp/oc-natbib.el (org-cite-natbib--build-optional-arguments): Use new function. * testing/lisp/test-oc.el (test-org-cite/main-affixes): New test.