diff --git a/tex/latex/biblatex/cbx/alphabetic.cbx b/tex/latex/biblatex/cbx/alphabetic.cbx
index b205b68bb..4d6768108 100644
--- a/tex/latex/biblatex/cbx/alphabetic.cbx
+++ b/tex/latex/biblatex/cbx/alphabetic.cbx
@@ -49,7 +49,7 @@
 
 \newbibmacro*{textcite:postnote}{%
   \usebibmacro{postnote}%
-  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+  \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
@@ -109,7 +109,8 @@
    \pagetrackerfalse%
    \DeferNextCitekeyHook%
    \usebibmacro{textcite:init}}
-  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+  {\ifboolexpr{test {\iffirstcitekey}
+               and test {\ifnumgreater{\value{multicitetotal}}{0}}}
      {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
       \global\clearfield{multipostnote}}
      {}%
diff --git a/tex/latex/biblatex/cbx/authortitle-comp.cbx b/tex/latex/biblatex/cbx/authortitle-comp.cbx
index cf60c11b1..70be388d6 100644
--- a/tex/latex/biblatex/cbx/authortitle-comp.cbx
+++ b/tex/latex/biblatex/cbx/authortitle-comp.cbx
@@ -73,7 +73,7 @@
        \printdelim{extpostnotedelim}\bibopenparen}}
     {\setunit{\printdelim{postnotedelim}}}%
   \printfield{postnote}%
-  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+  \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
@@ -154,7 +154,8 @@
    \pagetrackerfalse%
    \DeferNextCitekeyHook%
    \usebibmacro{cite:init}}
-  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+  {\ifboolexpr{test {\iffirstcitekey}
+               and test {\ifnumgreater{\value{multicitetotal}}{0}}}
      {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
       \global\clearfield{multipostnote}}
      {}%
diff --git a/tex/latex/biblatex/cbx/authortitle-ibid.cbx b/tex/latex/biblatex/cbx/authortitle-ibid.cbx
index 4ccfc33ca..0eaa9b8bf 100644
--- a/tex/latex/biblatex/cbx/authortitle-ibid.cbx
+++ b/tex/latex/biblatex/cbx/authortitle-ibid.cbx
@@ -18,7 +18,7 @@
 \newbibmacro*{cite}{%
   \global\boolfalse{cbx:loccit}%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
        {\printnames{labelname}%
         \setunit*{\printdelim{nametitledelim}}%
@@ -28,7 +28,7 @@
 \newbibmacro*{citetitle}{%
   \global\boolfalse{cbx:loccit}%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
        {\usebibmacro{cite:title}}}%
     {\usebibmacro{cite:shorthand}}}
@@ -43,7 +43,7 @@
     {\usebibmacro{prenote}}
     {}%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
        {\usebibmacro{cite:title}}}%
     {\usebibmacro{cite:shorthand}}}
@@ -67,7 +67,7 @@
     {\usebibmacro{postnote}}}
 
 \newbibmacro*{textcite:postnote}{%
-  \ifthenelse{\iffieldundef{postnote}\OR\boolean{cbx:loccit}}
+  \ifboolexpr{test {\iffieldundef{postnote}} or bool {cbx:loccit}}
     {\ifbool{cbx:parens}
        {\bibcloseparen}
        {}}
diff --git a/tex/latex/biblatex/cbx/authortitle-icomp.cbx b/tex/latex/biblatex/cbx/authortitle-icomp.cbx
index fdf5bcc2c..b84b8036b 100644
--- a/tex/latex/biblatex/cbx/authortitle-icomp.cbx
+++ b/tex/latex/biblatex/cbx/authortitle-icomp.cbx
@@ -32,7 +32,7 @@
 
 \newbibmacro*{cite}{%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
        {\iffieldequals{namehash}{\cbx@lasthash}
           {\setunit{\compcitedelim}}
@@ -46,7 +46,7 @@
 
 \newbibmacro*{citetitle}{%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
        {\usebibmacro{cite:title}}}%
     {\usebibmacro{cite:shorthand}}%
@@ -65,7 +65,7 @@
     {\usebibmacro{prenote}}
     {}%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
        {\usebibmacro{cite:title}}}%
     {\usebibmacro{cite:shorthand}}%
@@ -102,7 +102,7 @@
           \printdelim{extpostnotedelim}\bibopenparen}}
        {\setunit{\printdelim{postnotedelim}}}%
      \printfield{postnote}}%
-  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+  \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
@@ -183,7 +183,8 @@
    \pagetrackerfalse%
    \DeferNextCitekeyHook%
    \usebibmacro{cite:init}}
-  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+  {\ifboolexpr{test {\iffirstcitekey}
+               and test {\ifnumgreater{\value{multicitetotal}}{0}}}
      {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
       \global\clearfield{multipostnote}}
      {}%
diff --git a/tex/latex/biblatex/cbx/authortitle-tcomp.cbx b/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
index 33ef14561..c6cc63ef3 100644
--- a/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
+++ b/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
@@ -47,8 +47,10 @@
         \iffieldundef{shorthand}
           {\usebibmacro{cite:title}}%
           {\usebibmacro{cite:shorthand}}}
-       {\ifthenelse{\ifsingletitle\AND
-                    \(\iffieldundef{prenote}\OR\value{citecount}>1\)}
+       {\ifboolexpr{test {\ifsingletitle}
+                    and
+                    (test{\iffieldundef{prenote}}
+                     or test {\ifnumgreater{\value{citecount}}{1})}
           {\printtext[bibhyperref]{\printnames{labelname}}}
           {\printnames{labelname}
            \setunit{%
@@ -75,7 +77,7 @@
        \global\booltrue{cbx:parens}%
        \printdelim{extpostnotedelim}\bibopenparen}}%
   \printfield{postnote}%
-  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+  \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
diff --git a/tex/latex/biblatex/cbx/authortitle-terse.cbx b/tex/latex/biblatex/cbx/authortitle-terse.cbx
index 1ffd3ba45..6ce801a4a 100644
--- a/tex/latex/biblatex/cbx/authortitle-terse.cbx
+++ b/tex/latex/biblatex/cbx/authortitle-terse.cbx
@@ -23,8 +23,10 @@
      \iffieldundef{shorthand}
        {\usebibmacro{cite:title}}%
        {\usebibmacro{cite:shorthand}}}
-    {\ifthenelse{\ifsingletitle\AND
-                 \(\iffieldundef{prenote}\OR\value{citecount}>1\)}
+    {\ifboolexpr{test {\ifsingletitle}
+                 and
+                 (test{\iffieldundef{prenote}}
+                  or test {\ifnumgreater{\value{citecount}}{1})}
        {\printtext[bibhyperref]{\printnames{labelname}}}
        {\printnames{labelname}%
         \setunit{%
diff --git a/tex/latex/biblatex/cbx/authortitle-ticomp.cbx b/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
index 7dd3d8a52..989755d35 100644
--- a/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
+++ b/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
@@ -9,7 +9,7 @@
 
 \renewbibmacro*{cite}{%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
        {\iffieldequals{namehash}{\cbx@lasthash}
           {\setunit{\compcitedelim}%
@@ -28,7 +28,7 @@
 
 \renewbibmacro*{citetitle}{%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
        {\iffieldequals{namehash}{\cbx@lasthash}
           {\setunit{\compcitedelim}}
@@ -42,7 +42,7 @@
   \iffieldequals{namehash}{\cbx@lasthash}
     {\setunit{\compcitedelim}%
      \iffieldundef{shorthand}
-       {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+       {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
           {\usebibmacro{cite:ibid}}
           {\usebibmacro{cite:title}}}%
        {\usebibmacro{cite:shorthand}}}
@@ -51,12 +51,14 @@
           {\usebibmacro{prenote}}
           {}%
         \iffieldundef{shorthand}
-          {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+          {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
              {\usebibmacro{cite:ibid}}
              {\usebibmacro{cite:title}}}%
           {\usebibmacro{cite:shorthand}}}
-       {\ifthenelse{\ifsingletitle\AND
-                    \(\iffieldundef{prenote}\OR\value{citecount}>1\)}
+       {\ifboolexpr{test {\ifsingletitle}
+                    and
+                    (test{\iffieldundef{prenote}}
+                     or test {\ifnumgreater{\value{citecount}}{1})}
           {\printtext[bibhyperref]{\printnames{labelname}}}
           {\printnames{labelname}
            \setunit{%
@@ -66,7 +68,7 @@
              {\usebibmacro{prenote}}
              {}%
            \iffieldundef{shorthand}
-             {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+             {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
                 {\usebibmacro{cite:ibid}}
                 {\usebibmacro{cite:title}}}%
              {\usebibmacro{cite:shorthand}}}}%
@@ -85,7 +87,7 @@
        \global\booltrue{cbx:parens}%
        \printdelim{extpostnotedelim}\bibopenparen}}%
   \printfield{postnote}%
-  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+  \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
diff --git a/tex/latex/biblatex/cbx/authoryear-comp.cbx b/tex/latex/biblatex/cbx/authoryear-comp.cbx
index d764eac8b..35e9fae34 100644
--- a/tex/latex/biblatex/cbx/authoryear-comp.cbx
+++ b/tex/latex/biblatex/cbx/authoryear-comp.cbx
@@ -25,14 +25,16 @@
 
 \newbibmacro*{cite}{%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
+    {\ifboolexpr{test {\ifnameundef{labelname}}
+                 or test {\iffieldundef{labelyear}}}
        {\usebibmacro{cite:label}%
         \setunit{\printdelim{nonameyeardelim}}%
         \usebibmacro{cite:labeldate+extradate}%
         \usebibmacro{cite:reinit}}
        {\iffieldequals{namehash}{\cbx@lasthash}
-          {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                       \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+          {\ifboolexpr{test {\iffieldequals{labelyear}{\cbx@lastyear}}
+                       and (test {\ifnumequal{\value{multicitecount}}{0}}
+                            or test {\iffieldundef{postnote}})}
              {\setunit{\addcomma}%
               \usebibmacro{cite:extradate}}
              {\setunit{\compcitedelim}%
@@ -53,8 +55,9 @@
        {\usebibmacro{cite:label}%
         \usebibmacro{cite:reinit}}
        {\iffieldequals{namehash}{\cbx@lasthash}
-          {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                       \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+          {\ifboolexpr{test {\iffieldequals{labelyear}{\cbx@lastyear}}
+                       and (test {\ifnumequal{\value{multicitecount}}{0}}
+                            or test {\iffieldundef{postnote}})}
              {\setunit{\addcomma}%
               \usebibmacro{cite:extradate}}
              {\setunit{\compcitedelim}%
@@ -70,8 +73,9 @@
 \newbibmacro*{textcite}{%
   \iffieldequals{namehash}{\cbx@lasthash}
     {\iffieldundef{shorthand}
-       {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                    \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+       {\ifboolexpr{test {\iffieldequals{labelyear}{\cbx@lastyear}}
+                    and (test {\ifnumequal{\value{multicitecount}}{0}}
+                         or test {\iffieldundef{postnote}})}
           {\setunit{\addcomma}%
            \usebibmacro{cite:extradate}}
           {\setunit{\compcitedelim}%
@@ -145,7 +149,7 @@
 
 \newbibmacro*{textcite:postnote}{%
   \usebibmacro{postnote}%
-  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+  \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
@@ -226,7 +230,8 @@
    \pagetrackerfalse%
    \DeferNextCitekeyHook%
    \usebibmacro{cite:init}}
-  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+  {\ifboolexpr{test {\iffirstcitekey}
+               and test {\ifnumgreater{\value{multicitetotal}}{0}}
      {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
       \global\clearfield{multipostnote}}
      {}%
diff --git a/tex/latex/biblatex/cbx/authoryear-ibid.cbx b/tex/latex/biblatex/cbx/authoryear-ibid.cbx
index 2f361a003..9b8a9f648 100644
--- a/tex/latex/biblatex/cbx/authoryear-ibid.cbx
+++ b/tex/latex/biblatex/cbx/authoryear-ibid.cbx
@@ -18,9 +18,10 @@
 \newbibmacro*{cite}{%
   \global\boolfalse{cbx:loccit}%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
-       {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
+       {\ifboolexpr{test {\ifnameundef{labelname}}
+                    or test {\iffieldundef{labelyear}}}
           {\usebibmacro{cite:label}%
            \setunit{\printdelim{nonameyeardelim}}}
           {\printnames{labelname}%
@@ -31,7 +32,7 @@
 \newbibmacro*{citeyear}{%
   \global\boolfalse{cbx:loccit}%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
        {\iffieldundef{labelyear}
           {\usebibmacro{cite:label}}
@@ -59,7 +60,7 @@
        {\usebibmacro{prenote}}
        {}%
      \iffieldundef{shorthand}
-       {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+       {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
           {\usebibmacro{cite:ibid}}
           {\iffieldundef{labelyear}
              {\usebibmacro{cite:label}}
@@ -97,7 +98,7 @@
     {\usebibmacro{postnote}}}
 
 \newbibmacro*{textcite:postnote}{%
-  \ifthenelse{\iffieldundef{postnote}\OR\boolean{cbx:loccit}}
+  \ifboolexpr{test {\iffieldundef{postnote}} or bool {cbx:loccit}}
     {\ifbool{cbx:parens}
        {\bibcloseparen}
        {}}
diff --git a/tex/latex/biblatex/cbx/authoryear-icomp.cbx b/tex/latex/biblatex/cbx/authoryear-icomp.cbx
index 8897a7ad4..2aca0068e 100644
--- a/tex/latex/biblatex/cbx/authoryear-icomp.cbx
+++ b/tex/latex/biblatex/cbx/authoryear-icomp.cbx
@@ -33,16 +33,18 @@
 
 \newbibmacro*{cite}{%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
-       {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
+       {\ifboolexpr{test {\ifnameundef{labelname}}
+                    or test {\iffieldundef{labelyear}}}
           {\usebibmacro{cite:label}%
            \setunit{\printdelim{nonameyeardelim}}%
            \usebibmacro{cite:labeldate+extradate}%
            \usebibmacro{cite:reinit}}
           {\iffieldequals{namehash}{\cbx@lasthash}
-             {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                          \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+             {\ifboolexpr{test {\iffieldequals{labelyear}{\cbx@lastyear}}
+                       and (test {\ifnumequal{\value{multicitecount}}{0}}
+                            or test {\iffieldundef{postnote}})}
                 {\setunit{\addcomma}%
                  \usebibmacro{cite:extradate}}
                 {\setunit{\compcitedelim}%
@@ -59,14 +61,15 @@
 
 \newbibmacro*{citeyear}{%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
        {\iffieldundef{labelyear}
           {\usebibmacro{cite:label}%
            \usebibmacro{cite:reinit}}
           {\iffieldequals{namehash}{\cbx@lasthash}
-             {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                          \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+             {\ifboolexpr{test {\iffieldequals{labelyear}{\cbx@lastyear}}
+                       and (test {\ifnumequal{\value{multicitecount}}{0}}
+                            or test {\iffieldundef{postnote}})}
                 {\setunit{\addcomma}%
                  \usebibmacro{cite:extradate}}
                 {\setunit{\compcitedelim}%
@@ -82,8 +85,9 @@
 \newbibmacro*{textcite}{%
   \iffieldequals{namehash}{\cbx@lasthash}
     {\iffieldundef{shorthand}
-       {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                    \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+       {\ifboolexpr{test {\iffieldequals{labelyear}{\cbx@lastyear}}
+                    and (test {\ifnumequal{\value{multicitecount}}{0}}
+                         or test {\iffieldundef{postnote}})}
           {\setunit{\addcomma}%
            \usebibmacro{cite:extradate}}
           {\setunit{\compcitedelim}%
@@ -101,7 +105,7 @@
            \ifnumequal{\value{citecount}}{1}
              {\usebibmacro{prenote}}
              {}%
-           \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+           \ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
              {\usebibmacro{cite:ibid}}
              {\usebibmacro{cite:labeldate+extradate}}}
           {\usebibmacro{cite:shorthand}}}
@@ -115,7 +119,7 @@
         \iffieldundef{shorthand}
           {\iffieldundef{labelyear}
              {\usebibmacro{cite:label}}
-             {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+             {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
                 {\usebibmacro{cite:ibid}}
                 {\usebibmacro{cite:labeldate+extradate}}}%
            \savefield{labelyear}{\cbx@lastyear}}
@@ -174,7 +178,7 @@
   \ifbool{cbx:loccit}
     {}
     {\usebibmacro{postnote}}%
-  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+  \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
@@ -255,7 +259,8 @@
    \pagetrackerfalse%
    \DeferNextCitekeyHook%
    \usebibmacro{cite:init}}
-  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+  {\ifboolexpr{test {\iffirstcitekey}
+               and test {\ifnumgreater{\value{multicitetotal}}{0}}
      {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
       \global\clearfield{multipostnote}}
      {}%
diff --git a/tex/latex/biblatex/cbx/authoryear.cbx b/tex/latex/biblatex/cbx/authoryear.cbx
index 49c8d9d03..afafae82a 100644
--- a/tex/latex/biblatex/cbx/authoryear.cbx
+++ b/tex/latex/biblatex/cbx/authoryear.cbx
@@ -9,7 +9,8 @@
 
 \newbibmacro*{cite}{%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
+    {\ifboolexpr{test {\ifnameundef{labelname}}
+                 or test {\iffieldundef{labelyear}}}
        {\usebibmacro{cite:label}%
         \setunit{\printdelim{nonameyeardelim}}}
        {\printnames{labelname}%
diff --git a/tex/latex/biblatex/cbx/numeric-comp.cbx b/tex/latex/biblatex/cbx/numeric-comp.cbx
index 187ca2bce..7da4de23c 100644
--- a/tex/latex/biblatex/cbx/numeric-comp.cbx
+++ b/tex/latex/biblatex/cbx/numeric-comp.cbx
@@ -285,7 +285,7 @@
    \pagetrackerfalse%
    \DeferNextCitekeyHook%
    \usebibmacro{cite:init}}
-  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+  {\ifboolexpr{test {\iffirstcitekey} and test {\ifnumgreater{\value{multicitetotal}}{0}}
      {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
       \global\clearfield{multipostnote}}
      {}%
diff --git a/tex/latex/biblatex/cbx/numeric.cbx b/tex/latex/biblatex/cbx/numeric.cbx
index 68b10d891..f4c87662d 100644
--- a/tex/latex/biblatex/cbx/numeric.cbx
+++ b/tex/latex/biblatex/cbx/numeric.cbx
@@ -48,7 +48,7 @@
 
 \newbibmacro*{textcite:postnote}{%
   \usebibmacro{postnote}%
-  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+  \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
@@ -120,7 +120,8 @@
    \pagetrackerfalse%
    \DeferNextCitekeyHook%
    \usebibmacro{textcite:init}}
-  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+  {\ifboolexpr{test {\iffirstcitekey}
+               and test {\ifnumgreater{\value{multicitetotal}}{0}}
      {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
       \global\clearfield{multipostnote}}
      {}%
diff --git a/tex/latex/biblatex/cbx/verbose-ibid.cbx b/tex/latex/biblatex/cbx/verbose-ibid.cbx
index 7d9457779..061ab0b20 100644
--- a/tex/latex/biblatex/cbx/verbose-ibid.cbx
+++ b/tex/latex/biblatex/cbx/verbose-ibid.cbx
@@ -216,7 +216,8 @@
   {\usebibmacro{textcite:init}%
    \gdef\cbx@savedkeys{}%
    \DeferNextCitekeyHook}
-  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+  {\ifboolexpr{test {\iffirstcitekey}
+               and test {\ifnumgreater{\value{multicitetotal}}{0}}
      {\protected@xappto\cbx@footcite@args{%
         (\thefield{multiprenote})(\thefield{multipostnote})}}
      {}%
diff --git a/tex/latex/biblatex/cbx/verbose-inote.cbx b/tex/latex/biblatex/cbx/verbose-inote.cbx
index bb0b04575..be1a22852 100644
--- a/tex/latex/biblatex/cbx/verbose-inote.cbx
+++ b/tex/latex/biblatex/cbx/verbose-inote.cbx
@@ -100,7 +100,7 @@
   \global\togglefalse{cbx:loccit}%
   \ifciteseen
     {\iffieldundef{shorthand}
-       {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+       {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
           {\usebibmacro{cite:ibid}}
           {\usebibmacro{cite:short}}}
        {\usebibmacro{cite:shorthand}}}
@@ -143,7 +143,7 @@
   \global\togglefalse{cbx:loccit}%
   \ifciteseen
     {\iffieldundef{shorthand}
-       {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+       {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
           {\usebibmacro{footcite:ibid}}
           {\usebibmacro{footcite:note}}}
        {\usebibmacro{footcite:shorthand}}}
@@ -275,7 +275,8 @@
   {\usebibmacro{textcite:init}%
    \gdef\cbx@savedkeys{}%
    \DeferNextCitekeyHook}
-  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+  {\ifboolexpr{test {\iffirstcitekey}
+               and test {\ifnumgreater{\value{multicitetotal}}{0}}
      {\protected@xappto\cbx@footcite@args{%
         (\thefield{multiprenote})(\thefield{multipostnote})}}
      {}%
diff --git a/tex/latex/biblatex/cbx/verbose-note.cbx b/tex/latex/biblatex/cbx/verbose-note.cbx
index b1c8f0683..f17623422 100644
--- a/tex/latex/biblatex/cbx/verbose-note.cbx
+++ b/tex/latex/biblatex/cbx/verbose-note.cbx
@@ -246,7 +246,8 @@
   {\usebibmacro{textcite:init}%
    \gdef\cbx@savedkeys{}%
    \DeferNextCitekeyHook}
-  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+  {\ifboolexpr{test {\iffirstcitekey}
+               and test {\ifnumgreater{\value{multicitetotal}}{0}}
      {\protected@xappto\cbx@footcite@args{%
         (\thefield{multiprenote})(\thefield{multipostnote})}}
      {}%
diff --git a/tex/latex/biblatex/cbx/verbose-trad1.cbx b/tex/latex/biblatex/cbx/verbose-trad1.cbx
index 1f24a4dac..8baa874cb 100644
--- a/tex/latex/biblatex/cbx/verbose-trad1.cbx
+++ b/tex/latex/biblatex/cbx/verbose-trad1.cbx
@@ -108,7 +108,7 @@
       {\iffieldundef{shorthand}
          {\ifciteibid
             {\usebibmacro{cite:ibid}}
-            {\ifthenelse{\ifciteidem\AND\NOT\boolean{cbx:noidem}}
+            {\ifboolexpr{test {\ifciteidem} and not bool {cbx:noidem}}
                {\usebibmacro{cite:idem}%
                 \usebibmacro{cite:title}}
                {\ifnameundef{labelname}
@@ -248,7 +248,8 @@
   {\usebibmacro{textcite:init}%
    \gdef\cbx@savedkeys{}%
    \DeferNextCitekeyHook}
-  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+  {\ifboolexpr{test {\iffirstcitekey}
+               and test {\ifnumgreater{\value{multicitetotal}}{0}}
      {\protected@xappto\cbx@footcite@args{%
         (\thefield{multiprenote})(\thefield{multipostnote})}}
      {}%
diff --git a/tex/latex/biblatex/cbx/verbose-trad2.cbx b/tex/latex/biblatex/cbx/verbose-trad2.cbx
index 60e5dfc80..c674b22ec 100644
--- a/tex/latex/biblatex/cbx/verbose-trad2.cbx
+++ b/tex/latex/biblatex/cbx/verbose-trad2.cbx
@@ -115,7 +115,7 @@
       {\iffieldundef{shorthand}
          {\ifciteibid
             {\usebibmacro{cite:ibid}}
-            {\ifthenelse{\ifciteidem\AND\NOT\boolean{cbx:noidem}}
+            {\ifboolexpr{test {\ifciteidem} and not bool {cbx:noidem}}
                {\usebibmacro{cite:idem}}
                {\usebibmacro{cite:name}}%
              \usebibmacro{cite:title}}%
@@ -242,7 +242,8 @@
   {\usebibmacro{textcite:init}%
    \gdef\cbx@savedkeys{}%
    \DeferNextCitekeyHook}
-  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+  {\ifboolexpr{test {\iffirstcitekey}
+               and test {\ifnumgreater{\value{multicitetotal}}{0}}
      {\protected@xappto\cbx@footcite@args{%
         (\thefield{multiprenote})(\thefield{multipostnote})}}
      {}%
diff --git a/tex/latex/biblatex/cbx/verbose-trad3.cbx b/tex/latex/biblatex/cbx/verbose-trad3.cbx
index c410692b6..c3b35ef7e 100644
--- a/tex/latex/biblatex/cbx/verbose-trad3.cbx
+++ b/tex/latex/biblatex/cbx/verbose-trad3.cbx
@@ -215,7 +215,8 @@
   {\usebibmacro{textcite:init}%
    \gdef\cbx@savedkeys{}%
    \DeferNextCitekeyHook}
-  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+  {\ifboolexpr{test {\iffirstcitekey}
+               and test {\ifnumgreater{\value{multicitetotal}}{0}}
      {\protected@xappto\cbx@footcite@args{%
         (\thefield{multiprenote})(\thefield{multipostnote})}}
      {}%
diff --git a/tex/latex/biblatex/cbx/verbose.cbx b/tex/latex/biblatex/cbx/verbose.cbx
index 1291f0dfc..eb65a1172 100644
--- a/tex/latex/biblatex/cbx/verbose.cbx
+++ b/tex/latex/biblatex/cbx/verbose.cbx
@@ -185,7 +185,8 @@
   {\usebibmacro{textcite:init}%
    \gdef\cbx@savedkeys{}%
    \DeferNextCitekeyHook}
-  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+  {\ifboolexpr{test {\iffirstcitekey}
+               and test {\ifnumgreater{\value{multicitetotal}}{0}}
      {\protected@xappto\cbx@footcite@args{%
         (\thefield{multiprenote})(\thefield{multipostnote})}}
      {}%
diff --git a/tex/latex/biblatex/lbx/catalan.lbx b/tex/latex/biblatex/lbx/catalan.lbx
index cd968410c..53bd7eff2 100644
--- a/tex/latex/biblatex/lbx/catalan.lbx
+++ b/tex/latex/biblatex/lbx/catalan.lbx
@@ -22,11 +22,11 @@
        \iffieldundef{#2}
          {}
          {\space%
-          \ifthenelse{\thefield{#2}=4}
+          \ifnumequal{\thefield{#2}}{4}
             {d'}
-            {\ifthenelse{\thefield{#2}=8}
+            {\ifnumequal{\thefield{#2}}{8}
                {d'}
-               {\ifthenelse{\thefield{#2}=10}
+               {\ifnumequal{\thefield{#2}}{10}
                   {d'}
                   {de\nobreakspace}}}}}%
     \iffieldundef{#2}