From 925df96b9ead00c00be69bacf3480796da473a85 Mon Sep 17 00:00:00 2001
From: mbertucci47 <61854785+mbertucci47@users.noreply.github.com>
Date: Tue, 3 Oct 2023 05:48:29 -0600
Subject: [PATCH 1/6] fix typos in lthooks.dtx (#1142)

* fix typos in lthooks.dtx

`\cs{DeclareHookrule}` -> `\cs{DeclareHookRule}`
`processessing` -> `processing`
`conciderably` -> `considerably`

* update date
---
 base/lthooks.dtx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/base/lthooks.dtx b/base/lthooks.dtx
index e43fa4ef3..20d48730c 100644
--- a/base/lthooks.dtx
+++ b/base/lthooks.dtx
@@ -32,7 +32,7 @@
 %
 %    \begin{macrocode}
 \def\lthooksversion{v1.1f}
-\def\lthooksdate{2023/08/11}
+\def\lthooksdate{2023/10/02}
 %    \end{macrocode}
 %
 %<*driver>
@@ -795,7 +795,7 @@
 %    \end{itemize}
 %    There can only be a single relation between two labels for a
 %    given hook,
-%    i.e., a later \cs{DeclareHookrule} overwrites any previous
+%    i.e., a later \cs{DeclareHookRule} overwrites any previous
 %    declaration.
 %
 %    The \meta{hook} and \meta{label} can be specified using the
@@ -1566,8 +1566,8 @@
 %
 %    Generic hooks defined in this way are always normal hooks (i.e.,
 %    you can't implement reversed hooks this way). This is a
-%    deliberate limitation, because it speeds up the processessing
-%    conciderably.
+%    deliberate limitation, because it speeds up the processing
+%    considerably.
 %
 %
 % \subsection{Hooks with arguments}

From 0fd10624a6767899ced065c71226efc3ed5676f8 Mon Sep 17 00:00:00 2001
From: Ivan Panchenko <39594356+ivan-pan@users.noreply.github.com>
Date: Thu, 5 Oct 2023 20:55:22 +0200
Subject: [PATCH 2/6] Fix mistakes (#1103)

* Update indentfirst.dtx

* Update afterpage.dtx

* Update enumerate.dtx

* Update xr.dtx

* Update theorem.dtx

* Update bm.dtx

* Update calc.dtx

* Update dcolumn.dtx

* Update ftnright.dtx

* Update longtable.dtx

* Update shellesc.dtx

* Update showkeys.dtx

* Update tabularx.dtx

* Update verbatim.dtx

* Update layout.dtx
---
 required/tools/afterpage.dtx   | 12 +++----
 required/tools/bm.dtx          | 63 +++++++++++++++++-----------------
 required/tools/calc.dtx        | 26 +++++++-------
 required/tools/dcolumn.dtx     | 22 ++++++------
 required/tools/enumerate.dtx   | 10 +++---
 required/tools/ftnright.dtx    | 18 +++++-----
 required/tools/indentfirst.dtx |  4 +--
 required/tools/layout.dtx      | 42 +++++++++++------------
 required/tools/longtable.dtx   | 30 ++++++++--------
 required/tools/shellesc.dtx    | 18 +++++-----
 required/tools/showkeys.dtx    | 20 +++++------
 required/tools/tabularx.dtx    | 38 ++++++++++----------
 required/tools/theorem.dtx     | 12 +++----
 required/tools/verbatim.dtx    | 24 ++++++-------
 required/tools/xr.dtx          |  4 +--
 15 files changed, 172 insertions(+), 171 deletions(-)

diff --git a/required/tools/afterpage.dtx b/required/tools/afterpage.dtx
index b94a85d26..518b70761 100644
--- a/required/tools/afterpage.dtx
+++ b/required/tools/afterpage.dtx
@@ -25,7 +25,7 @@
 %
 %<package>\NeedsTeXFormat{LaTeX2e}
 %<package>\ProvidesPackage{afterpage}
-%<package>         [2014/10/28 v1.08 After-Page Package (DPC)]
+%<package>         [2023/07/04 v1.08 After-Page Package (DPC)]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -199,7 +199,7 @@
          \global\setbox\@ne\lastbox}%
 %    \end{macrocode}
 % If the text that is saved in |\AP@partial| had footnotes, we'd
-% better grab them as well otherwise they may come out on a page
+% better grab them as well, otherwise they may come out on a page
 % with the `afterpage' text, before the page that has the
 % footnote mark! (Added at v1.08.)
 %    \begin{macrocode}
@@ -218,7 +218,7 @@
 %    \end{macrocode}
 %
 % Restore the |\everydisplay| register. |\ignorespaces| prevents a space
-% or newline after |$$| creating rogue a indentation or paragraph.
+% or newline after |$$| creating a rogue indentation or paragraph.
 %    \begin{macrocode}
 \def\AP@ed{\everydisplay\expandafter{\the\toks@}\ignorespaces}
 %    \end{macrocode}
@@ -264,7 +264,7 @@
 % `afterpage' commands, so just add the new commands to the end of the
 % list. Otherwise save the commands in |\AP@|. (within a local group),
 % and switch the output routine. (The new output routine just calls the
-% old one if it is invoked by a \LaTeX{} float.
+% old one if it is invoked by a \LaTeX{} float.)
 %    \begin{macrocode}
 \long\def\afterpage#1{%
   \ifx\AP@\relax
@@ -291,7 +291,7 @@
     \global\output\expandafter{\the\AP@output}%
     \AP@clearpage
 %    \end{macrocode}
-% At this point (since v1.08) Need to clear |\AP@| \emph{before}
+% At this point (since v1.08) need to clear |\AP@| \emph{before}
 % using its expansion, as otherwise hit an infinite loop. Sigh.
 %    \begin{macrocode}
     \global\expandafter\let\expandafter\AP@\expandafter\relax
@@ -350,7 +350,7 @@
 %    \end{macrocode}
 % Subtract the new height of |#1| from |\skip@|, and add back on
 % |\splittopskip|, so |\skip@| is now the height of the first row of
-% |#1| This may still be 0pt if (eg) a mark or whatsit is between the
+% |#1|. This may still be 0pt if (eg) a mark or whatsit is between the
 % top glue and the first box. Save (this height${}-{}$|\splittopskip|)
 % in |\skip\tw@|.
 %    \begin{macrocode}
diff --git a/required/tools/bm.dtx b/required/tools/bm.dtx
index 51ae53f04..a608c6aeb 100644
--- a/required/tools/bm.dtx
+++ b/required/tools/bm.dtx
@@ -36,7 +36,7 @@
 %<driver>\ProvidesFile{bm.drv}
 % \fi
 %         \ProvidesFile{bm.dtx}
-          [2022/01/05 v1.2f Bold Symbol Support (DPC/FMi)]
+          [2023/07/08 v1.2f Bold Symbol Support (DPC/FMi)]
 %
 % \iffalse
 %<*driver>
@@ -97,7 +97,7 @@
 %
 % If there is a `heavy' math version defined (usually accessed by a
 % user-command |\heavymath|) then a similar command |\hm|
-% is defined which access these `ultra bold' fonts. Currently this is
+% is defined which accesses these `ultra bold' fonts. Currently this is
 % probably only useful with the `mathtime plus' font collection.
 % Definitions of commands that use these fonts may be made by
 % specifying the optional argument `heavy' to |\DeclareBoldMathCommand|.
@@ -140,7 +140,7 @@
 % your font set.
 %
 % \section{Features}
-% In most cases this package should work in a fairly self explanatory
+% In most cases this package should work in a fairly self-explanatory
 % way, but there are some things that might not be obvious.
 %
 % \subsection{Interaction with Math Alphabet Commands}
@@ -209,7 +209,7 @@
 % Normally if a command takes arguments the full command, including
 % any arguments, should be included in |\bm|.
 %
-% So |\bm{\overbrace{abc}}| (producing \smash{$\bm{\overbrace{abc}}$})
+% So |\bm{\overbrace{abc}}| (producing \smash{$\bm{\overbrace{abc}}$}),
 % not
 % |\bm{\overbrace}{abc}|. If you do not include all the arguments you
 % will typically get the error message:\\
@@ -245,7 +245,7 @@
 % allocations.
 %
 % If no bold font appears to be available for a particular symbol,
-% |\bm| will use `poor man's bold' that is, overprinting the same
+% |\bm| will use `poor man's bold', which will overprint the same
 % character in slightly offset
 % positions to give an appearance of boldness.
 %
@@ -255,8 +255,8 @@
 % font set there are suitable fonts for bold and heavy math setting,
 % and so |\bm| and |\hm| work well. Similarly in the basic Lucida
 % New Math font set there are no bold math fonts, so |\bm| will
-% use `poor man's bold. However if the Lucida Expert set is used,
-% Then |\bm| will detect, and use the bold math fonts that are
+% use `poor man's bold'. However, if the Lucida Expert set is used,
+% then |\bm| will detect, and use, the bold math fonts that are
 % available.
 %
 % As discussed above, one may set |\bmmax| higher or lower than its
@@ -310,7 +310,7 @@
 % ``poor man's bold''. That is, over-printing the character with slight offsets.
 % Since version 1.2e, the package now warns if a font is set up to use this over-printing and
 % the package option |nopbm|  is available which prevents its use in which case |\bm| will
-% use the non-bold for characters from the affected font,
+% use the non-bold for characters from the affected font.
 %
 % \MaybeStop{}
 %
@@ -339,7 +339,7 @@
 %
 % \changes{v1.2e}{2021/04/25}
 %      {Package options gh/71}
-% Options to use or not use poor mans bold (over-printing)
+% Options to use or not use poor man's bold (over-printing)
 % and level of warning messages.
 %    \begin{macrocode}
 %<*package>
@@ -399,7 +399,7 @@
 % code, which is temporarily defined to |\bm|, to save wasting a csname.
 % Similarly |\bm@pmb|\ldots\ (which will be defined later) are used
 % as scratch macros.
-% (This csname saving no longer used, setup command is |\bm@setup| not |\bm|).
+% (This csname saving no longer used, setup command is |\bm@setup|, not |\bm|.)
 %
 % The general plan. Run through the fonts allocated to the normal math
 % version. Ignore \meta{math alphabet} allocations\footnote{For now?}
@@ -505,11 +505,11 @@
                \ifx\bm@pmb@\@firstofone\else, using \string\pmb\fi}%
     \else
 %    \end{macrocode}
-% Else make a new name by adjoining |#1| to the name of the symbol font
+% Else make a new name by adjoining |#1| to the name of the symbol font,
 % eg, |\symboldsymbols| to match |\symsymbols|. If that font has already
 % been allocated, or if |\@tempcnta| is positive so we can allocate a
 % new slot for this font, then the table will be
-% set with the offset between the two fonts. otherwise set the offset to
+% set with the offset between the two fonts. Otherwise set the offset to
 % zero (so |\boldmath| will be used to access the font).
 %    \begin{macrocode}
       \edef\@tempa{sym#1\expandafter\@gobblefour\string##1}%
@@ -673,8 +673,8 @@
 \fi
 %    \end{macrocode}
 %
-% If there is no bold math version, It is very easy to set up
-% the table, no need to use all the tricky code above.
+% If there is no bold math version, it is very easy to set up
+% the table since there is no need to use all the tricky code above.
 % Also, at the end of the package redefine the internal macro
 % that |\bm| uses to call |\boldmath|, to use poor man's bold
 % instead.
@@ -711,7 +711,7 @@
 %
 % \begin{macro}{\hmmax}
 %
-% Same for heavy (but default to three this time (enough for mathtime
+% Same for heavy, but default to three this time (enough for mathtime
 % plus, as no heavy operators font).
 %    \begin{macrocode}
 \ifx\hmmax\@undefined
@@ -777,7 +777,7 @@
     \let\protect\@empty
     \let\@typeset@protect\@empty
 %    \end{macrocode}
-% Set up either bold or heavy
+% Set up either bold or heavy.
 %    \begin{macrocode}
     \def\bm@mathchoice{\bm@m@thchoice#1}%
     \def\bm@group{\bm@gr@up#1}%
@@ -848,9 +848,9 @@
     \let\next@\copy
     \global\let\bm@first\@empty
 %    \end{macrocode}
-%   For AMS version of |\sqrt|: don't expand just wrap in brace group
-%   so that it can be made bold in a safe but slow way. Do the same for
-%   internal accent command
+%   For AMS version of |\sqrt|: don't expand, just wrap it in a brace
+%   group so that it can be made bold in a safe but slow way. Do the same
+%   for internal accent command.
 % \changes{v1.1b}{2003/10/05}{AMS \cs{sqrt} not working}
 %
 % \changes{v1.1c}{2004/02/26}{\cs{accentV} made safe (pr/3625)}
@@ -886,7 +886,7 @@
 %    |\mv@bold| or |\mv@heavy| and we execute that after redefining
 %    |\install@mathalphabet| and |\getanddefine@fonts| suitably.
 %    The definitions are reverted back to their original the moment
-%    the scanning is done
+%    the scanning is done.
 % \changes{v1.0h}{2002/11/22}{Get math alphabets right (pr/3476)}
 %    \begin{macrocode}
      \let\install@mathalphabet\def
@@ -972,7 +972,7 @@
 % |\bm| is empty within the definition, so that either\\
 % |\bmdefine\balpha{\bm\alpha}| or  |\bmdefine\balpha{\alpha}| \\
 % may be used. (The former just for compatibility with the original
-% version for plain \TeX).
+% version for plain \TeX.)
 %    \begin{macrocode}
 \def\bmdefine{\DeclareBoldMathCommand[bold]}
 %    \end{macrocode}
@@ -1092,8 +1092,8 @@
 % \begin{macro}{\bm@gr@up}
 % \changes{v1.0c}{1997/10/09}
 %      {Extra brace around argument for \cs{over}}
-% If faced with a group,
-% If we are in math mode, stick it in a |\boldsymbol| like construct
+% If faced with a group
+% when we are in math mode, put it in a |\boldsymbol|-like construct
 % and then recurse on |\bm@expand|.
 % Otherwise just use |\bfseries\boldmath|.
 % The actual test is deferred till `run time'.
@@ -1131,7 +1131,7 @@
 % Other things just copy straight over to the command being built.
 % (Anything inside a |\mathop| or similar will end up being made bold
 % as the |\mathop| will be copied over, but its argument will be made
-% bold by the group code above.
+% bold by the group code above.)
 %    \begin{macrocode}
 \def\bm@test@token#1{%
   \let\bm@next\@empty
@@ -1139,7 +1139,7 @@
 %
 % Stop here. Note that it is vital that the terminating token
 % is non-expandable and defined, rather than the usual \LaTeX\
-% terminators |\@nil| or |\@@|. (Worse still would be a `quark'
+% terminators |\@nil| and |\@@|. (Worse still would be a `quark'
 % like |docstrip|'s |\qStop|.)
 %    \begin{macrocode}
   \ifx#1\@@end
@@ -1166,7 +1166,7 @@
     \afterassignment\bm@radical\count@
 %    \end{macrocode}
 %
-% Need to trap spaces otherwise digits will get turned to bold
+% Need to trap spaces, otherwise digits will get turned to bold
 % mathchars.
 % \changes{v1.1a}{2003/09/01}{Forgotten to check for \cs{hskip} (pr/3572)}
 %    \begin{macrocode}
@@ -1451,7 +1451,7 @@
 % \begin{macro}{\bm@pmb@}
 % \changes{v0.10}{1997/01/04}
 %      {Macro added}
-% |\pmb| variant. (See \TeX{}Book, or AMS \textsf{amsbsy} package).
+% |\pmb| variant. (See \TeX{}book, or AMS \textsf{amsbsy} package.)
 % This one takes a bit more care to use smaller offsets in subscripts.
 %    \begin{macrocode}
 \ifx\bm@pmb@\@firstofone\else
@@ -1544,7 +1544,7 @@
 \def\bm@mathaccent{%
  \bm@changefam{}%
 %    \end{macrocode}
-% The next four lines were added a v1.0e. Without them |\bm{\hat{A}}|
+% The next four lines were added in v1.0e. Without them |\bm{\hat{A}}|
 % makes the accent bold using |\bm| but the group |{A}| is made bold
 % via a |\mathchoice| construction as for any other group, as |\bm|
 % does not attempt to parse inside brace groups. While that produces
@@ -1674,9 +1674,10 @@
 % \begin{macro}{\bm@changefam}
 % \changes{v0.10}{1997/01/04}
 %      {Rewrite for new \cs{bm@table} system}
-% Pull out one specified hex digit and passes
-% it to |\bm@modify| to change. argument is empty normally but |000| to
-% access the second math group in a delimiter code.
+% Pull out one specified hex digit and pass
+% it to |\bm@modify| to change. Its one argument is normally empty,
+% but it will be |000| when necessary to access the second math group
+% in a delimiter code.
 %    \begin{macrocode}
 \def\bm@changefam#1{%
   \@tempcnta\count@
diff --git a/required/tools/calc.dtx b/required/tools/calc.dtx
index c243eed8d..2c4cecbf0 100644
--- a/required/tools/calc.dtx
+++ b/required/tools/calc.dtx
@@ -40,7 +40,7 @@
 %<driver> \ProvidesFile{calc.drv}
 % \fi
 %         \ProvidesFile{calc.dtx}
-          [2017/05/25 v4.3 Infix arithmetic (KKT,FJ)]
+          [2023/07/08 v4.3 Infix arithmetic (KKT,FJ)]
 %
 % \iffalse
 %<*driver>
@@ -102,7 +102,7 @@
 % Arithmetic in \TeX\ is done using low-level operations such as
 % |\advance| and |\multiply|.  This may be acceptable when developing
 % a macro package, but it is not an acceptable interface for the
-% end-user.
+% end user.
 %
 % This package introduces proper infix notation arithmetic which is
 % much more familiar to most people.  The infix notation is more
@@ -271,7 +271,7 @@
 % or at the end of the expression being evaluated.
 %
 % When \TeX\ performs arithmetic on integers, any fractional part of
-% the results are discarded.  For example,
+% the result is discarded.  For example,
 %\begin{verbatim}
 %    \setcounter{x}{7/2}
 %    \setcounter{y}{3*\real{1.6}}
@@ -318,7 +318,7 @@
 %  \setlength{\parindent}{%
 %    \minof{3pt}{\parskip}*\real{1.5}*\maxof{2*\real{1.6}}{2-1}}
 %\end{verbatim}
-% will assign $\min(13.5\textrm{pt},4.5\cs{parskip})$ to \cs{parindent}
+% will assign $\min(13.5\textrm{pt},4.5\cs{parskip})$ to \cs{parindent}.
 %
 %
 %
@@ -453,7 +453,7 @@
 % or a parenthesized expression~$(E')$.
 %
 % Since the \TeX\ engine can only execute arithmetic operations in a
-% machine-code like manner, we have to find a way to translate the
+% machine-code-like manner, we have to find a way to translate the
 % infix notation into this `instruction set'.
 %
 % Our goal is to design a translation scheme that translates~$X$ (an
@@ -565,9 +565,9 @@
 % When an \<integer factor> is expected, we must change $A$ and~$B$ to
 % refer to integer type registers.  We can accomplish this by
 % including instructions to change the type of $A$ and~$B$ to integer
-% type as part of the replacement code for~`$*$; if we append such
+% type as part of the replacement code for~`$*$'; if we append such
 % instructions to the replacement code described above, we also ensure
-% that the type-change is local (provided that the type-changing
+% that the type change is local (provided that the type-changing
 % instructions only have local effect).  However, note that the
 % instance of~$A$ referred to in $\savecode{B\lassign B*A}$ is the
 % integer instance of~$A$.
@@ -933,7 +933,7 @@
 % \begin{macro}{\calc@addAtoB}
 % \begin{macro}{\calc@subtractAfromB}
 % The replacement code for the binary operators `\texttt{+}' and
-% `\texttt{-}' follow a common pattern; the only difference is the
+% `\texttt{-}' follows a common pattern; the only difference is the
 % token that is stored away by |\aftergroup|.  After this replacement
 % code, control is transferred to |\calc@pre@scan|.
 %    \begin{macrocode}
@@ -1063,7 +1063,7 @@
 % \begin{macro}{\calc@ratio@multiply}
 % \begin{macro}{\calc@ratio@divide}
 % When |\calc@post@scan| encounters a |\ratio| control sequence, it hands
-% control to one of the macros |\calc@ratio@multiply| or |\calc@ratio@divide|,
+% control to one of the macros |\calc@ratio@multiply| and |\calc@ratio@divide|,
 % depending on the preceding character. Those macros both forward the
 % control to the macro |\calc@ratio@evaluate|, which performs two steps: (1) it
 % calculates the ratio, which is saved in the global macro token
@@ -1109,7 +1109,7 @@
 % Here we calculate the ratio.  First, we check for negative numerator
 % and/or denominator; note that \TeX\ interprets two minus signs the
 % same as a plus sign.  Then, we calculate the integer part.
-% The minus sign(s), the integer part, and a decimal point, form the
+% The minus sign(s), the integer part, and a decimal point form the
 % initial expansion of the |\calc@the@ratio| macro.
 %    \begin{macrocode}
       \gdef\calc@the@ratio{}%
@@ -1305,8 +1305,8 @@
 %    {Use \cs{PackageError} for error messages (DPC)}
 % \changes{v4.0e}{1997/11/11}
 %    {typo fixed}
-% If |\calc@post@scan| reads a character that is not one of `\texttt{+}',
-% `\texttt{-}', `\texttt{*}', `\texttt{/}', or `\texttt{)}', an error
+% If |\calc@post@scan| reads a character that is neither `\texttt{+}',
+% `\texttt{-}', `\texttt{*}', `\texttt{/}', nor `\texttt{)}', an error
 % has occurred, and this is reported to the user.  Violations in the
 % syntax of \<numeric>s will be detected and reported by \TeX.
 % \changes{v4.1a}{1998/06/07}
@@ -1327,7 +1327,7 @@
 % \changes{v4.2}{2005/08/06}
 %    {Added macro}
 % The kernel macro \cs{@settodim} is changed so that it runs through a list
-% containing \cs{ht}, \cs{wd}, and \cs{dp} and than advance the length
+% containing \cs{ht}, \cs{wd}, and \cs{dp} and then advances the length
 % one step at a time. We just have to use a scratch register in case the
 % user decides to put in a \cs{global} prefix on the length register.
 % A search on the internet confirmed that some people do that kind of thing.
diff --git a/required/tools/dcolumn.dtx b/required/tools/dcolumn.dtx
index cfb7b4d33..c8ddaf4ce 100644
--- a/required/tools/dcolumn.dtx
+++ b/required/tools/dcolumn.dtx
@@ -31,7 +31,7 @@
 %<driver>\ProvidesFile{dcolumn.drv}
 % \fi
 %         \ProvidesFile{dcolumn.dtx}
-          [2014/10/28 v1.06 decimal alignment package (DPC)]
+          [2023/07/08 v1.06 decimal alignment package (DPC)]
 %
 % \iffalse
 %<*driver>
@@ -117,7 +117,7 @@
 %
 % \noindent"\newcolumntype{,}{D{,}{,}{2}}"
 %
-% {\tt ,} specifies takes a column of entries with at most two decimal
+% {\tt ,} specifies a column of entries with at most two decimal
 % places after a~$,$.
 %
 % \newcolumntype{d}[1]{D{.}{\cdot}{#1}}
@@ -138,7 +138,7 @@
 % \end{center}
 %
 % Note that the first column, which had a negative \meta{decimal places}
-% argument is wider than the second column, so that the decimal point
+% argument, is wider than the second column, so that the decimal point
 % appears in the middle of the column.
 % Also note that this package deals correctly with entries with no
 % decimal part, no integer part, and blank entries.
@@ -200,7 +200,7 @@
 %<*package>
 %    \end{macrocode}
 %
-% First we load {\tt array.sty} if it not already loaded.
+% First we load {\tt array.sty} if it is not already loaded.
 %    \begin{macrocode}
 \RequirePackage{array}
 %    \end{macrocode}
@@ -243,10 +243,10 @@
 % \begin{macro}{\DC@x}
 % \changes{v1.03}{1996/02/28}{Macro added}
 % If "\count@" is negative, centre on the decimal point. If it is
-% positive either "#1" will be empty in which case bad out decimal
+% positive either "#1" will be empty in which case pad out decimal
 % part to the number of digits specified by "\count@" or (new feature
 % in v1.03) it is none empty in which case "\count@" contains the
-% number of digits to the left of the point, and "#1" contains a junk
+% number of digits to the left of the point and "#1" contains a junk
 % token (probably ".") followed by the number of digits to the right
 % of the point. In either of these latter cases, "\DC@right" is used.
 %    \begin{macrocode}
@@ -261,7 +261,7 @@
 % \end{macro}
 %
 % \begin{macro}{\DC@centre}
-% If centering on the decimal point, just need to box up the two halves.
+% If centering on the decimal point, just need to box up the two halves:
 %    \begin{macrocode}
 \def\DC@centre#1#2#3{%
   \let\DC@end\DC@endcentre
@@ -293,16 +293,16 @@
   \ifx\relax#3\relax
 %    \end{macrocode}
 % If "#3" is empty, add "\hfill" to right align the column, and
-% Just set "\DC@rl" to begin a group, so nothing fancy is done with
+% just set "\DC@rl" to begin a group, so that nothing fancy is done with
 % the whole number part.
 %    \begin{macrocode}
     \hfill
     \let\DC@rl\bgroup
   \else
 %    \end{macrocode}
-% Otherwise  set "\DC@rl" so that the whole number part is put in a
+% Otherwise set "\DC@rl" so that the whole number part is put in a
 % box "\count@" times as wide as a digit.
-% In order to share code with the other branch, then move "#3" (the
+% In order to share code with the other branch, move "#3" (the
 % number of decimal places) into "\count@" throwing away the `.' from
 % the user syntax.
 % \changes{v1.04}{1996/09/23}{Add \cs{hfill} so integer part
@@ -318,7 +318,7 @@
 %    \end{macrocode}
 % Box 2 contains the decimal part, set to "\dimen@" which is
 % calculated below to be "\count@" times the width of a digit, plus
-% the with of the `decimal point'.
+% the width of the `decimal point'.
 %    \begin{macrocode}
   \uppercase{\def~}{$\egroup\setbox\tw@\hbox to\dimen@\bgroup${#2}}%
    \setbox\z@\hbox{$1$}\dimen@ii\wd\z@
diff --git a/required/tools/enumerate.dtx b/required/tools/enumerate.dtx
index 49179cfa0..2818a73a0 100644
--- a/required/tools/enumerate.dtx
+++ b/required/tools/enumerate.dtx
@@ -31,7 +31,7 @@
 %<driver> \ProvidesFile{enumerate.drv}
 % \fi
 %         \ProvidesFile{enumerate.dtx}
-          [2015/07/23 v3.00 enumerate extensions (DPC)]
+          [2023/07/04 v3.00 enumerate extensions (DPC)]
 %
 % \iffalse
 %<*driver>
@@ -66,7 +66,7 @@
 % This package gives the enumerate environment an optional argument
 % which determines the style in which the counter is printed.
 %
-% An occurrence of one of the tokens |A a I i| or |1| produces the value
+% An occurrence of one of the tokens |A a I i 1| produces the value
 % of the counter printed with (respectively) |\Alph \alph \Roman \roman|
 % or |\arabic|.
 %
@@ -233,7 +233,7 @@
 %
 % To enable a new counter type based on a letter, you just need
 % to add a new |\ifx| clause by analogy with the code above.
-% So for example to make |*| trigger footnote symbol counting.
+% So for example to make |*| trigger footnote symbol counting,
 % a package should do the following.
 %
 % Initialise the hook, in case the package is loaded before
@@ -255,7 +255,7 @@
 % in this way.
 %
 % At this point we just need initialise the hook, taking care not
-% to over write any definitions another package may already have added.
+% to overwrite any definitions another package may already have added.
 %    \begin{macrocode}
 \providecommand\@enhook{}
 %    \end{macrocode}
@@ -276,7 +276,7 @@
 % \end{macro}
 %
 % \begin{macro}{\@@enum@}
-% Handle the optional argument..
+% Handle the optional argument.
 %    \begin{macrocode}
 \def\@@enum@[#1]{%
 %    \end{macrocode}
diff --git a/required/tools/ftnright.dtx b/required/tools/ftnright.dtx
index 00e98c3f7..663fa304a 100644
--- a/required/tools/ftnright.dtx
+++ b/required/tools/ftnright.dtx
@@ -26,7 +26,7 @@
 %% Copyright (C) 1989-2004 Frank Mittelbach, all rights reserved.
 %<+package>\NeedsTeXFormat{LaTeX2e}[1995/06/01]
 %<+package>\ProvidesPackage{ftnright}
-%<+package>         [2014/10/28 v1.1f footnote layout package (FMi)]
+%<+package>         [2023/07/08 v1.1f footnote layout package (FMi)]
 %
 % \fi
 %%
@@ -171,7 +171,7 @@
 %
 % I also upgraded the documentation to conform to the \LaTeXe{}
 % terminology, e.g., this is a package since document classes will not
-% know about it. However it is very likely that i have missed some
+% know about it. However it is very likely that I have missed some
 % necessary corrections.
 %
 % \section{Introduction}
@@ -220,7 +220,7 @@
 %
 % The result of this effort is presented in this paper and the reader
 % can judge for himself whether it was successful or
-% not.\footnote{Please note, that this option only changed the
+% not.\footnote{Please note that this option changed only the
 % placement of footnotes. Since this article also makes use of the
 % {\tt doc} package \cite{bk:GMS94}, that assigns tiny numbers to
 % code lines sprinkled throughout the text, the resulting design is
@@ -235,7 +235,7 @@
 % footnote separator rule which is used in most publications prepared
 % with \TeX{}.\footnote{People who prefer the rule can add it by
 % redefining the command {\tt\bslash footnoterule}
-% \cite[p.~156]{book:LLa86}. Please, note, that this command should
+% \cite[p.~156]{book:LLa86}. Please note that this command should
 % occupy no space, so that a negative space should be used to
 % compensate for the width of the rule used.} Furthermore, I decided
 % to place the footnote markers\footnote{\label{thisftn}The tiny
@@ -572,7 +572,7 @@
 %    are only partly typeset on the preceding page are not resolved.
 %    They are held over until \LaTeX{} starts a page (or column)
 %    containing text besides floats again. For our current layout,
-%    this would mean, that if \LaTeX{} decided to make the right
+%    this would mean that if \LaTeX{} decided to make the right
 %    column of a page a float column, footnotes from the left column
 %    would appear on a later page. A real cure for this problem would
 %    be to rewrite two-thirds of \LaTeX{}'s output routine, so I am
@@ -615,8 +615,8 @@
 %    footnotes from the left column. So we have to change the output
 %    routine at least in the part that contributes floats to the next
 %    column. The macro involved is called |\@startcolumn|. The first
-%    thing we do is to check and see whether any deferred floats
-%    exists.
+%    thing we do is to check and see whether there are any deferred
+%    floats.
 %    \begin{macrocode}
 \def\@startcolumn{%
  \ifx\@deferlist\@empty
@@ -764,7 +764,7 @@
 %    and output the footnotes on a separate page in an
 %    emergency.\footnote{Otherwise, the footnotes are held over for
 %    ever, preventing \TeX{} from finishing the document successfully.
-%    Instead, \TeX{} will produce infinity many empty pages at the end
+%    Instead, \TeX{} will produce infinitely many empty pages at the end
 %    of the document, trying in vain to output the held over
 %    footnotes.  This problem was found by Rainer Sch\"opf when we
 %    prepared the paper for the Cork conference.}
@@ -790,7 +790,7 @@
 %    moment we simply detect it here, perhaps some better scheme can be
 %    implemented. One way to avoid this is to allow more than |\textheight| of
 %    footnotes in |\preparefootins|. However, that isn't such a good idea
-%    either as that means that a footnote from column one, might end up
+%    either since it means that a footnote from column one might end up
 %    completely on a later page.
 % \changes{v1.1f}{2010/02/25}{Check for split footnotes (pr/4099)}
 %    \begin{macrocode}
diff --git a/required/tools/indentfirst.dtx b/required/tools/indentfirst.dtx
index 295b678fd..2314db1c7 100644
--- a/required/tools/indentfirst.dtx
+++ b/required/tools/indentfirst.dtx
@@ -25,7 +25,7 @@
 %
 %<package>\NeedsTeXFormat{LaTeX2e}
 %<package>\ProvidesPackage{indentfirst}
-%<package>         [1995/11/23 v1.03 Indent first paragraph (DPC)]
+%<package>         [2023/07/02 v1.03 Indent first paragraph (DPC)]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -52,7 +52,7 @@
 % \changes{v1.03}{1995/11/23}{Typo fixes in documentation}
 %
 % \begin{abstract}
-% Make the first line of all sections etc., be indented by the usual
+% Make the first line of all sections etc. be indented by the usual
 % paragraph indentation. This should work with all the standard document
 % classes.
 % \end{abstract}
diff --git a/required/tools/layout.dtx b/required/tools/layout.dtx
index fffa6d8e1..2798bd4f6 100644
--- a/required/tools/layout.dtx
+++ b/required/tools/layout.dtx
@@ -30,7 +30,7 @@
 %<+package>\ProvidesPackage{layout}
 %<+driver>\ProvidesFile{layout.drv}
 %\ProvidesFile{layout.dtx}
-                [2021-03-10 v1.2e Show layout parameters]
+                [2023-08-20 v1.2e Show layout parameters]
 %
 %    A short driver is provided that can be extracted if necessary by
 %    the \textsf{DocStrip} program provided with \LaTeXe.
@@ -409,7 +409,7 @@
 %
 % \begin{macro}{\cnt@paperwidth}
 % \begin{macro}{\cnt@paperheight}
-%    The dimensions of the paper
+%    The dimensions of the paper,
 %    \begin{macrocode}
 \newcount\cnt@paperwidth
 \newcount\cnt@paperheight
@@ -514,7 +514,7 @@
 \newcount\ref@hoffset
 \newcount\ref@voffset
 %    \end{macrocode}
-%    The |\hoffset| and |\voffset| values are added to the default
+%    the |\hoffset| and |\voffset| values are added to the default
 %    offset of one inch.
 %    \begin{macrocode}
 \ref@hoffset=\cnt@hoffset  \advance\cnt@hoffset by \oneinch
@@ -531,7 +531,7 @@
 % \end{macro}
 %
 % \begin{macro}{\ref@head}
-%    and the text areas, running heads,
+%    And the text areas, running heads,
 %    \begin{macrocode}
 \newcount\ref@head
 %    \end{macrocode}
@@ -566,7 +566,7 @@
 % \end{macro}
 %
 %    The following are a number of scratch registers, used in the
-%    positioning of the various pices of the picture.
+%    positioning of the various pieces of the picture.
 %    \begin{macrocode}
 \newcount\Interval
 \newcount\ExtraYPos
@@ -639,7 +639,7 @@
     \ifodd\count\z@
 %    \end{macrocode}
 %
-%    Here we deal with an odd page in the twosided case.
+%    Here we deal with an odd page in the two-sided case.
 %
 %    \begin{macrocode}
       \typeout{Two-sided document style, odd page.}
@@ -667,7 +667,7 @@
     \else
 %    \end{macrocode}
 %
-%    Here we deal with an even page in the twosided case.
+%    Here we deal with an even page in the two-sided case.
 %
 %    \begin{macrocode}
   \typeout{Two-sided document style, even page.}
@@ -696,7 +696,7 @@
   \else
 %    \end{macrocode}
 %
-%    Finally we the case for single sided printing.
+%    Finally we deal with the case for single-sided printing.
 %
 % \changes{v1.1}{1994/02/23}{Added check for reversemargin}
 %    \begin{macrocode}
@@ -718,7 +718,7 @@
 %
 %
 %  Now we begin the picture environment; dividing all the lengths by
-%  two is done by setting |\unitlength| to \texttt{0.5pt}
+%  two is done by setting |\unitlength| to \texttt{0.5pt}.
 %    \begin{macrocode}
   \setlength{\unitlength}{.5pt}
   \begin{picture}(\cnt@paperwidth,\cnt@paperheight)
@@ -790,7 +790,7 @@
     \InsideHArrow\cnt@textwidth
 %    \end{macrocode}
 %
-%    Now the |\textheight|
+%    Now the |\textheight|.
 %    \begin{macrocode}
     \SetToHalf\PositionY\cnt@textheight
     \advance\PositionY by \ref@body
@@ -812,7 +812,7 @@
 %    \end{macrocode}
 %
 %
-%    The |\hoffset|,
+%    The |\hoffset|.
 % \changes{v1.2}{1998/04/13}{\cs{PositionY} for label 1 is
 %    fixed at 50}
 %    \begin{macrocode}
@@ -840,12 +840,12 @@
     \Identify{3}
 %    \end{macrocode}
 %
-%    the |\marginparwidth|,
+%    The |\marginparwidth|.
 %    \begin{macrocode}
     \SetToQuart\PositionY\cnt@textheight
     \advance\PositionY by \ref@body
 %    \end{macrocode}
-%    This arrow has to be bit below the one for the |\oddsidemargin|
+%    This arrow has to be a bit below the one for the |\oddsidemargin|
 %    or\\ |\evensidemargin|.
 %    \begin{macrocode}
     \advance\PositionY by 30
@@ -856,14 +856,14 @@
 %    \end{macrocode}
 %
 %
-%    The |\marginparsep|, this depends on single or double sided
+%    The |\marginparsep|, this depends on single- or double-sided
 %    printing.
 %    \begin{macrocode}
     \advance\PositionY by 30
     \if@twoside
 %    \end{macrocode}
 %
-%    Twosided mode, reversemargin;
+%    Two-sided mode, reversemargin:
 % \changes{v1.1b}{1994/03/23}{\cs{OutSideHArrow} should be
 %    \cs{OutsideHArrow}}
 % \changes{v1.2}{1998/04/13}{Added check for reversemargin}
@@ -878,7 +878,7 @@
         \fi
       \else
 %    \end{macrocode}
-%    Not reversemargin;
+%    Not reversemargin:
 %    \begin{macrocode}
         \ifodd\count\z@
           \OutsideHArrow\ref@marginpar\cnt@marginparsep{20}
@@ -891,7 +891,7 @@
     \else
 %    \end{macrocode}
 %
-%    Single sided mode.
+%    Single-sided mode.
 % \changes{v1.2}{1998/04/13}{Added check for reversemargin}
 %    \begin{macrocode}
       \if@reversemargin
@@ -911,7 +911,7 @@
     \Identify{9}
 %    \end{macrocode}
 %
-%    Identify the |\footskip|. The arrow will be located on $1/8$th of
+%    Identify the |\footskip|. The arrow will be located on $1/8$ of
 %    the |\textwidth|.
 % \changes{v1.2}{1998/04/13}{The \cs{PositionY} of the label 11 is
 %    changed to the upper side of the arrows}
@@ -942,7 +942,7 @@
 %
 %    Identify |\topmargin|, |\headheight| and |\headsep|.
 %
-%    The arrows will be located on $1/8$th of the |\textwidth|, with
+%    The arrows will be located on $1/8$ of the |\textwidth|, with
 %    intervals of the same size, stored in |\Interval|.
 %    \begin{macrocode}
     \Interval = \cnt@textwidth
@@ -983,7 +983,7 @@
     \Identify{5}
     \advance\PositionX by \Interval
 %    \end{macrocode}
-%    and finally the |\headsep|
+%    and finally the |\headsep|.
 % \changes{v1.2}{1998/04/13}{The \cs{PositionY} of the label 6 is
 %    fixed}
 %    \begin{macrocode}
@@ -1006,7 +1006,7 @@
 %
 %    Below the picture we put a table to show the actual values of the
 %    parameters.  Note that fractional points are truncated, i.e.,
-%    \texttt{72.27pt} is displayed as \texttt{72pt}
+%    \texttt{72.27pt} is displayed as \texttt{72pt}.
 %
 %    The table is typeset inside a box with a depth of 0 to always
 %    keep it on the same page as the picture.
diff --git a/required/tools/longtable.dtx b/required/tools/longtable.dtx
index 332a95d22..1bcf86596 100644
--- a/required/tools/longtable.dtx
+++ b/required/tools/longtable.dtx
@@ -37,7 +37,7 @@
 %<driver> \ProvidesFile{longtable.drv}
 % \fi
 %         \ProvidesFile{longtable.dtx}
-          [2021-09-01 v4.17 Multi-page Table package (DPC)]
+          [2023-07-08 v4.17 Multi-page Table package (DPC)]
 %
 % \iffalse
 %<*driver>
@@ -54,7 +54,7 @@
 %        has version number \fileversion, last
 %        revised \filedate.}}
 % \author{David Carlisle\thanks{The new algorithm for aligning `chunks'
-% of a table used in version 4 of this package was devised coded
+% of a table used in version 4 of this package was devised, coded
 % and documented by David Kastrup.}}
 % \date{\filedate}
 %
@@ -317,7 +317,7 @@
 % ".aux" file, so that it can line up the different chunks.
 % Prior to version~4 of this package, this information was not used
 % unless a "\setlongtables" command was issued,  however, now the
-% information is always used, using a new algorithm\footnote{Due to
+% information is always used, via a new algorithm,\footnote{Due to
 % David Kastrup.} and so "\setlongtables" is no longer needed. It is
 % defined (but does nothing) for the benefit of old documents that
 % use it.
@@ -396,7 +396,7 @@
 % are modified in a compatible manner.
 %
 % You may use the "\label" command so that you can cross reference
-% \env{longtable}s with "\ref". Note however, that the "\label" command
+% \env{longtable}s with "\ref". Note, however, that the "\label" command
 % should not be used in a heading that may appear more than once. Place
 % it either in the \env{firsthead}, or in the body of the table. It
 % should not be the \emph{first} command in any entry.
@@ -493,7 +493,7 @@
 % always converged in three passes as described above, but in examples
 % such as the ones in Tables \ref{pass1}--\ref{pass4}, the final
 % widths were not optimal as the width of column~2, which is
-% determined by a "\multicolumn" entry was not known when the final
+% determined by a "\multicolumn" entry, was not known when the final
 % width for column~3 was fixed, due to the fact that \emph{both}
 % "\multicolumn" commands were switched from `draft' mode to `normal'
 % mode at the same time.
@@ -511,7 +511,7 @@
 % many overlapping "\multicolumn" entries, all being wider than the
 % natural widths of the columns they span, and all occurring in
 % different chunks. In the typical case the algorithm will converge
-% after three or four passes, and, the benefits of not needing to edit
+% after three or four passes, and the benefits of not needing to edit
 % the document before the final run to add "\setlongtables", and the
 % better choice of final column widths in the case of multiple
 % "\multicolumn" entries  will hopefully more than pay for the extra
@@ -576,7 +576,7 @@
 % \item The mechanism for adding the head and foot of the table has been
 % completely rewritten. With this new mechanism, \env{longtable} does
 % not need to issue a "\clearpage" at the start of the table, and so the
-% table may start half way down a page. Also the "\endlastfoot" command
+% table may start half way down a page. Also the "\endlastfoot" command,
 % which could not safely be implemented under the old scheme, has been
 % added.
 % \item \env{longtable} now issues an error if started in the scope of
@@ -673,7 +673,7 @@
 % "\endhead"&
 %     Specifies rows to appear at the top of every page.\\
 % "\endfirsthead"&
-%     Specifies rows to appear at the top the first page.\\
+%     Specifies rows to appear at the top of the first page.\\
 % "\endfoot"&
 %     Specifies rows to appear at the bottom of every page.\\
 % "\endlastfoot"&
@@ -885,7 +885,7 @@
 % \begin{macro}{\LTchunksize}
 % \changes{v4.14}{2020/02/07}
 %      {Increase default chunksize from 20 to 200}
-% Chunk size (The number of rows taken per "\halign"). Default 200.
+% Chunk size (the number of rows taken per "\halign"). Default 200.
 %    \begin{macrocode}
 \newcount\LTchunksize \LTchunksize=200
 %    \end{macrocode}
@@ -1189,12 +1189,12 @@
 % \changes{v4.05}{1996/11/12}
 %      {\cs{LT@setprevdepth} added}
 % The following line was added in v4.05.
-% In order to get the "\penalties" to work at chunk boundaries
-% Need to take more care about where and when "\lineskip" glue
+% In order to get the "\penalties" to work at chunk boundaries,
+% we need to take more care about where and when "\lineskip" glue
 % is added. The following does nothing at top of table, and in
 % header chunks, but in normal body chunks it sets "\prevdepth"
 % (to 0pt, but any value would do) so that "\lineskip" glue will
-% be added. the important thing to note is that the glue will be
+% be added. The important thing to note is that the glue will be
 % added \emph{after} any vertical material coming from "\noalign".
 %    \begin{macrocode}
        \LT@setprevdepth
@@ -1257,7 +1257,7 @@
 %    \end{macrocode}
 % \changes{v4.14}{2020/02/07}
 %      {Guard against shrink glue on current page tools/3396 and github 183}
-% This next block was suggested by Lars Hellström in pr tools/3396
+% This next block was suggested by Lars Hellström in pr tools/3396.
 % He documents it as:
 %
 % The original problem occurs because TeX has not yet found an awfully bad
@@ -1325,7 +1325,7 @@
 % \changes{v4.14}{2020/02/07}
 %      {Guard against shrink glue on current page see github 183}
 % The LT output routine does not handle shrink on the page, which can cause
-% The first page to be over-long, so forget it is there.
+% the first page to be over-long, so forget it is there.
 %    \begin{macrocode}
     \ifdim\pageshrink>\z@\pageshrink\z@\fi
   \fi
@@ -1551,7 +1551,7 @@
 % Increment the counter, and do  \env{tabular}'s "\\" or finish the
 % chunk.\\ The "\expandafter" trick was added in Version~3.
 % Set the "\prevdepth" at the start of a new chunk. (Done here
-% so not set in header chunks).
+% so not set in header chunks.)
 %    \begin{macrocode}
   \global\advance\LT@rows\@ne
   \ifnum\LT@rows=\LTchunksize
diff --git a/required/tools/shellesc.dtx b/required/tools/shellesc.dtx
index 97ec542b6..aa707fe55 100644
--- a/required/tools/shellesc.dtx
+++ b/required/tools/shellesc.dtx
@@ -20,7 +20,7 @@
 %<driver> \ProvidesFile{shellesc.drv}
 % \fi
 %         \ProvidesFile{shellesc.dtx}
-       [2023/04/15 v1.0d unified shell escape interface for LaTeX]
+       [2023/07/08 v1.0d unified shell escape interface for LaTeX]
 %
 % \iffalse
 %<*driver>
@@ -50,7 +50,7 @@
 % \section{Introduction}
 %
 %
-% For many years web2c based \TeX\ implementations have used the syntax
+% For many years web2c-based \TeX\ implementations have used the syntax
 % of the \verb|\write| command to access  system commands by using a
 % special stream 18 (streams above 15 can not be allocated to files in
 % classical \TeX\ so stream 18 would otherwise just print to the
@@ -59,9 +59,9 @@
 % This is a useful extension that did not break the strict rules on
 % extensions in classical \TeX.  This package provides a simple
 % macro level interface hiding the \verb|write18| implementation
-% so a command to remove a file on a unix-like system could be
+% so a command to remove a file on a Unix-like system could be
 % specified  using \verb|\ShellEscape{rm file.txt}| (or \verb|del| in
-% windows). Note that by default system access is not allowed and
+% Windows). Note that by default system access is not allowed and
 % \LaTeX\ will typically need to be called with the \verb|--shell-escape|
 % command line option.
 %
@@ -77,7 +77,7 @@
 % \verb|\ShellEscape| in fact corresponds to \verb|\immediate\write18|
 % (or \verb|\directlua|). Very rarely you may need to delay a system
 % command until the current page is output (when page numbers are
-% known) for this classically you could use \verb|\write18| (or
+% known), for this you could classically use \verb|\write18| (or
 % (\verb|\latelua|). This package provides \verb|\DelayedShellEscape|
 % as a common syntax for this use.
 %
@@ -92,7 +92,7 @@
 % \verb|\immediate| will work as normal when writing to file streams
 % or the terminal but the special case of stream 18 which is defined to
 % use \verb|os.execute| always uses \verb|\directlua| (so corresponds
-% to \verb|\immediate\write18|. In the rare situations that you need
+% to \verb|\immediate\write18|). In the rare situations that you need
 % non-immediate \verb|\write18| in a document being ported to current
 % Lua\TeX, you will need to change to use the
 % \verb|\DelayedShellEscape| command.
@@ -118,7 +118,7 @@
 %
 % \begin{macro}{\ShellEscapeStatus}
 % \changes{v1.0a}{2019/10/13}{Command Introduced}
-% Integer value with meanings 0 (shell escape disabled), 1 (shell escape allowed), 2 (Restricted shell escape).
+% Integer value with meanings 0 (shell escape disabled), 1 (shell escape allowed), 2 (restricted shell escape).
 %
 %    \begin{macrocode}
 \chardef\ShellEscapeStatus
@@ -215,8 +215,8 @@ if status == nil then
 %
 % \subsection{The write18 package interface}
 %
-% In web2c based engines other than Lua\TeX, |\write18| may be used
-% directly.  The same was true in older LuaTeX, but from version 0.85
+% In web2c-based engines other than Lua\TeX, |\write18| may be used
+% directly.  The same was true in older Lua\TeX, but from version 0.85
 % onwards that is not available.
 %
 % The above |shellesc| package interface is recommended for new code,
diff --git a/required/tools/showkeys.dtx b/required/tools/showkeys.dtx
index 984100415..c90b3863e 100644
--- a/required/tools/showkeys.dtx
+++ b/required/tools/showkeys.dtx
@@ -39,7 +39,7 @@
 %<driver> \ProvidesFile{showkeys.drv}
 % \fi
 %         \ProvidesFile{showkeys.dtx}
-          [2023/05/11 v3.19 Show cite and label keys (DPC, MH)]
+          [2023/07/08 v3.19 Show cite and label keys (DPC, MH)]
 %
 % \iffalse
 %<*driver>
@@ -112,13 +112,13 @@
 % print its key argument (usually in the margin).
 %
 % If you find the printed keys distracting, but don't want to use the
-% above options to stop them altogether you may use:
+% above options to stop them altogether, you may use:
 % \begin{description}
 % \item[color] Print the keys in a distinguishing colour. The default
 %  value is a light grey.
 % \end{description}
 % The colours may be changed by redefining the following two colours
-% after the package is loaded.
+% after the package is loaded:
 % |refkey| (also used for |\cite|) and
 % |labelkey| (also used for |\bibitem|).
 % The defaults are:
@@ -131,7 +131,7 @@
 %
 % The package accepts two further options.
 % \begin{description}
-% \item[final] to suporess the action of this package, for `final'
+% \item[final] to suppress the action of this package, for `final'
 % versions.
 % \item[draft] the normal behaviour of this package.
 % \end{description}
@@ -437,7 +437,7 @@
 % change |\prevdepth| as that would affect vertical spacing in the
 % document. (The box itself should not cause any difference in break
 % points as there is a node there anyway coming from the |\write| to
-% the aux file.
+% the aux file.)
 %    \begin{macrocode}
       \dimen@\prevdepth
       \nointerlineskip
@@ -451,8 +451,8 @@
 % In inner vertical mode, attach the label to the right of the
 % immediately preceding box, if it is a box before the current point.
 % Otherwise just put it in a box of zero dimensions, with no interline
-% skip. (This may slightly move the surrounding text (but perhaps not
-% now that |\prevdepth| is restored.)
+% skip. This may slightly move the surrounding text (but perhaps not
+% now that |\prevdepth| is restored).
 % \changes{v3.00}{1994/09/07}
 %      {Back up over a previous skip because of the new
 %       \cs{belowcaptionskip}}
@@ -502,7 +502,7 @@
     \fi
   \else
 %    \end{macrocode}
-% If we are in an numbered equation-style environment, do nothing as the
+% If we are in a numbered equation-style environment, do nothing as the
 % code to print the number will also print the label, otherwise just
 % stick the label at the current point, in a box of zero dimensions.
 % \changes{v3.02}{1995/03/17}
@@ -650,7 +650,7 @@
 % The following environments print an equation number, so |\label|
 % should not print its argument at the point where it appears.
 % Note this will fail to show the label if you are in an |eqnarray|
-% environment, and use |\label| together with |\nonumber| This might
+% environment, and use |\label| together with |\nonumber|. This might
 % just about make sense if you are going to use |\pageref|, but that is
 % too bad\ldots
 %    \begin{macrocode}
@@ -665,7 +665,7 @@
 % \changes{v3.09}{1996/08/30}
 %      {Fix eqnarray AMS incompatibility. tools/2252}
 % When the AMS packages are loaded |showkeys| assumes environments
-% work `The AMS way' However |eqnarray| (unlike |equation|) is not
+% work `The AMS way'. However, |eqnarray| (unlike |equation|) is not
 % redefined, so here we need to remove some of the AMS hacks.
 %    \begin{macrocode}
 \toks@\expandafter{\eqnarray}
diff --git a/required/tools/tabularx.dtx b/required/tools/tabularx.dtx
index 177d92f12..6d59ca4c2 100644
--- a/required/tools/tabularx.dtx
+++ b/required/tools/tabularx.dtx
@@ -31,7 +31,7 @@
 %<driver> \ProvidesFile{tabularx.drv}
 % \fi
 %         \ProvidesFile{tabularx.dtx}
-          [2020/01/15 v2.11c `tabularx' package (DPC)]
+          [2023/07/08 v2.11c `tabularx' package (DPC)]
 % \iffalse
 %<*driver>
 \documentclass{ltxdoc}
@@ -164,7 +164,7 @@
 % \item The body of the {\ttfamily tabularx} environment is in fact the
 % argument to a command, and so certain constructions which are not
 % allowed in command arguments (like "\verb") may not be used.\footnote
-% {Since Version 1.02, {\ttfamily\bslash verb and \ttfamily\bslash
+% {Since Version 1.02, {\ttfamily\bslash verb} and {\ttfamily\bslash
 % verb*} may be used, but they may treat spaces incorrectly, and the
 % argument can not contain an unmatched {\ttfamily\char`\{} or
 % {\ttfamily\char`\}}, or a  {\ttfamily\char`\%} character.}
@@ -207,7 +207,7 @@
 %
 % \DescribeMacro{\newcolumntype}
 % These preamble specifications may of course be saved using the
-% command, "\newcolumntype", defined in {\ttfamily array.sty}. Thus we
+% command "\newcolumntype" defined in {\ttfamily array.sty}. Thus we
 % may say\\
 % "\newcolumntype{Y}{>{\small\raggedright\arraybackslash}X}"\\
 % and then use {\ttfamily Y} in the {\ttfamily tabularx} preamble
@@ -314,7 +314,7 @@
 % \footnote{This adds an extra level of grouping,
 % which is not really needed. Instead, I could use \box0\ here, and
 % \box2\ below, however the code here would then have to be moved after
-% the first line, because of the footnote to page 386 of the \TeX{}Book,
+% the first line, because of the footnote to page 386 of the \TeX{}book,
 % and I do not think I should be writing code that is so obscure as to
 % be documented in a footnote in an appendix called ``Dirty Tricks''!}
 %
@@ -331,9 +331,9 @@
 %\newenvironment{foo}{\tabularx{XX}}{\endtabularx}
 %\end{verbatim}
 % The scanner now looks for the end of the current environment ("foo" in
-% this example.) There are some restrictions on this usage, the
-% principal one being that "\endtabularx" must not be inside any "{ }" pairs
-% ao that the code before "\endtabularx"  may be extracted and added to the table body
+% this example). There are some restrictions on this usage, the
+% principal one being that "\endtabularx" must not be inside any "{ }" pairs,
+% so that the code before "\endtabularx"  may be extracted and added to the table body
 % (prior to version 2.09  "\endtabularx" had to be
 % the \emph{first} token of the `end code' of the environment).
 %    \begin{macrocode}
@@ -396,7 +396,7 @@
 % \changes{v2.09}{2014/04/22}{macro added}
 % \changes{v2.10}{2014/05/13}{macro modified to test for missing \cs{endtabularx}}
 % \changes{v2.11}{2016/01/03}{Fix to previous change to guard against empty arg 2. (Ulrike Fischer)}
-% split up the end code, and extract the part that lives in the table body.
+% Split up the end code, and extract the part that lives in the table body.
 %    \begin{macrocode}
 \long\def\TX@find@endtabularxa
        #1\endtabularx#2\endtabularx#3\TX@find@endtabularxa{%
@@ -408,7 +408,7 @@
 % \begin{macro}{\TX@find@endtabularxb}
 % \changes{v2.09}{2014/04/22}{macro added}
 % \changes{v2.10}{2014/05/13}{macro modified to test for missing \cs{endtabularx}}
-% split up the end code, and extract the part that lives outside the table body.
+% Split up the end code, and extract the part that lives outside the table body.
 %    \begin{macrocode}
 \long\def\TX@find@endtabularxb
        #1\endtabularx#2\endtabularx#3\TX@find@endtabularxb{%
@@ -502,7 +502,7 @@
   \TX@col@width\TX@target
   \global\TX@cols\@ne
 %    \end{macrocode}
-% Typeout some headings (unless this is disabled).
+% Type out some headings (unless this is disabled).
 %    \begin{macrocode}
   \TX@typeout@
     {\@spaces Table Width\@spaces Column Width\@spaces X Columns}%
@@ -514,7 +514,7 @@
           \global\advance\TX@cols\@ne\NC@find p{\TX@col@width}}}%
 %    \end{macrocode}
 % Repeatedly decrease column width until table is the correct width,
-% or stops shrinking, or the columns become two narrow.
+% or stops shrinking, or the columns become too narrow.
 % If there are no multicolumn entries, this will only take one attempt.
 %    \begin{macrocode}
   \loop
@@ -601,7 +601,7 @@
     \ifdim\dimen@<\TX@delta
 %    \end{macrocode}
 % If this amount is less than "\TX@delta", stop. ("\TX@delta"
-% should be non-zero otherwise we may miss the target due to rounding
+% should be non-zero, otherwise we may miss the target due to rounding
 % error.)
 %    \begin{macrocode}
       \TX@typeout@{Reached target.}%
@@ -621,7 +621,7 @@
       \ifdim \dimen@ >\z@
 %    \end{macrocode}
 % If the new width would be too narrow, abort the loop. At the moment
-% too narrow, means less than 0\,pt!
+% too narrow means less than 0\,pt!
 %
 % Prior to v2.03, if the loop was aborted here, the X columns were left
 % with the width of the previous run, but this may make the table far
@@ -715,7 +715,7 @@
    \expandafter\let\expandafter\endtabularx\csname endtabular*\endcsname
 %    \end{macrocode}
 % Added at v1.05: disable "\write"s during a trial run. This trick is
-% from the \TeX{}Book.\footnote{Actually the \TeX{}Book trick does
+% from the \TeX{}book.\footnote{Actually the \TeX{}book trick does
 % not work correctly, so changed for v2.05.}
 % \changes{v2.05}{1997/09/18}
 %    {New \cs{write} trick. tools/2607}
@@ -789,7 +789,7 @@
 % \end{macro}
 %
 % \begin{macro}{\TX@typeout}
-% The default is to be to be quiet
+% The default is to be quiet.
 %    \begin{macrocode}
 \let\TX@typeout\@gobble
 \let\TX@typeout@\@gobble
@@ -830,7 +830,7 @@
 % tabularx}, but that did not stop people using it! This usually put
 % \LaTeX\ into an irrecoverable error position, with error messages that
 % did not mention the cause of the error. The `poor man's "\verb"' (and
-% "\verb*") defined here is based on page 382 of the \TeX{}Book. As
+% "\verb*") defined here is based on page 382 of the \TeX{}book. As
 % explained there, doing verbatim this way means that spaces are not
 % treated correctly, and so "\verb*" may well be useless, however I
 % consider this section of code to be error-recovery, rather than a real
@@ -882,10 +882,10 @@
 % does not consist of a single "{ }" group. \TeX\ would strip the outer
 % braces from such a group. The `"!"' will be removed later.
 %
-% Originally I followed Knuth, and had "\def\@tempa{##1}", however this
+% Originally I followed Knuth, and had "\def\@tempa{##1}", however, this
 % did not allow "#" to appear in the argument. So in v1.04, I changed
-% this to use a token register, and "\edef". This allows "#" appear,
-% but makes each one appear twice!, so later we loop through, replacing
+% this to use a token register, and "\edef". This allows "#" to appear
+% but makes each one appear twice, so later we loop through, replacing
 % "##" by "#".
 %    \begin{macrocode}
 \def\TX@vb#1{\def\@tempa##1#1{\toks@{##1}\edef\@tempa{\the\toks@}%
diff --git a/required/tools/theorem.dtx b/required/tools/theorem.dtx
index 58476db07..e3a8e90b8 100644
--- a/required/tools/theorem.dtx
+++ b/required/tools/theorem.dtx
@@ -24,7 +24,7 @@
 %%
 %
 %
-\def\FMithmInfo{2014/10/28 v2.2c Theorem extension package (FMi)}
+\def\FMithmInfo{2023/07/05 v2.2c Theorem extension package (FMi)}
 %
 % \ProvidesFile{theorem.dtx}[\FMithmInfo]
 %\iffalse   % this is a METACOMMENT !
@@ -100,7 +100,7 @@
 %
 % \begin{abstract}
 %    The macros described in this paper yield an extension of the
-%    \LaTeX{} theorem mechanism. It is designed is to satisfy the
+%    \LaTeX{} theorem mechanism. It is designed to satisfy the
 %    different requirements of various journals. Thus, the
 %    layout of the ``theorems'' can be manipulated by determining a
 %    ``style''. This article describes not only the use, but
@@ -226,7 +226,7 @@
 % |\theorempreskipamount| and |\theorempostskipamount| define,
 % respectively, the spacing before and after such an environment.
 % These parameters apply for all theorem sets and can be manipulated
-% with the ordinary length macros.  They are rubber lengths,
+% with the ordinary length macros.  They are rubber lengths
 % (`\textsf{skips}'), and therefore can contain \texttt{plus} and
 % \texttt{minus} parts.
 %
@@ -385,7 +385,7 @@
 % \section{Definition of the Macros}
 %
 % If the file has been loaded before, we abort immediately. If not the
-% package announces itself (this is actually done at the very top if
+% package announces itself (this is actually done at the very top of
 % the file---the way it is done isn't good style so don't copy it).
 % \changes{v2.0e}{89/07/19}{Spaces removed from `typeout'.}
 % \changes{v2.2b}{95/11/19}{Announce moved to top of file}
@@ -546,8 +546,8 @@
 %    ``non-Big-versions'', we have to avoid offering too many unused
 %    definitions.  Therefore we define these styles in separate files
 %    that can be loaded on demand.  Thus the commands themselves only
-%    load these files. We use |\@input@| a \LaTeXe{} internal command
-%    that ensures that the file will be listed with |\listfiles|
+%    load these files. We use |\@input@|, a \LaTeXe{} internal command
+%    that ensures that the file will be listed with |\listfiles|.
 % \changes{v2.2a}{94/02/02}{Use `@input@ to load theorem layout files}
 %    \begin{macrocode}
 \gdef\th@plain{\@input@{thp.sty}}
diff --git a/required/tools/verbatim.dtx b/required/tools/verbatim.dtx
index 0085f166e..832f80ef3 100644
--- a/required/tools/verbatim.dtx
+++ b/required/tools/verbatim.dtx
@@ -48,14 +48,14 @@
 \pagestyle{myheadings}
 
 \title{A New Implementation of \LaTeX{}'s \\ \texttt{verbatim}
-       and \texttt{verbatim*} Environments.}
+       and \texttt{verbatim*} Environments}
 \author{Rainer Sch\"opf\\
         \and
         Bernd Raichle\\
         \and
         Chris Rowley}
 
-\date{2022/07/02}
+\date{2023/07/08}
 \begin{document}
 \markboth{Verbatim style option}{Verbatim style option}
 \MaintainedByLaTeXTeam{tools}
@@ -434,7 +434,7 @@
 %
 % A further possibility is to define a variant of the |verbatim|
 % environment that boxes and centers the whole verbatim text.
-% Note that the boxed text should be less than a page otherwise you
+% Note that the boxed text should be less than a page, otherwise you
 % have to change this example.
 %
 %\begin{verbatim}
@@ -706,7 +706,7 @@
 %           necessary for correct vertical spacing if \texttt{verbatim}
 %           is nested inside \texttt{quote}.}
 %    The following extra vertical space is for compatibility with the
-%    \LaTeX kernel: otherwise, using the |verbatim| package changes
+%    \LaTeX{} kernel: otherwise, using the |verbatim| package changes
 %    the vertical spacing of a |verbatim| environment nested within a
 %    |quote| environment.
 %    \begin{macrocode}
@@ -790,18 +790,18 @@
   \def\@noitemerr{\@warning{No verbatim text}}%
 %    \end{macrocode}
 %    Now we call |\obeylines| to make the end of line character
-%    active,
+%    active.
 %    \begin{macrocode}
   \obeylines
 %    \end{macrocode}
-%    change the category code of all special characters,
+%    The category code of all special characters is changed,
 %    to $12$ (other).
 %    \changes{v1.5i}{1996/06/04}{Moved \cs{verbatim@font} after
 %           \cs{dospecials}.}
 %    \begin{macrocode}
   \let\do\@makeother \dospecials
 %    \end{macrocode}
-%    and switch to the font to be used.
+%    We switch to the font to be used.
 %    \begin{macrocode}
   \verbatim@font
 %    \end{macrocode}
@@ -1391,7 +1391,7 @@
 %    (This token list was inserted after the current macro
 %    by |\verbatim@@@|.)
 %    Since we are still in an |\edef| we protect it
-%    by means of|\noexpand|.
+%    by means of |\noexpand|.
 %    \begin{macrocode}
                     \noexpand\verbatim@rescan{\@currenvir}}%
 %    \end{macrocode}
@@ -1493,7 +1493,7 @@
   \else
 %    \end{macrocode}
 %    At this point we pass the name of the file to |\@addtofilelist|
-%    so that its appears in the output of a |\listfiles|
+%    so that it appears in the output of a |\listfiles|
 %    command.
 % \changes{v1.5j}{1996/09/25}{Add \cs{@addtofilelist} and
 %    \cs{ProvidesFile} so that the name of the file
@@ -1579,9 +1579,9 @@
 %    the contents of |\@filef@und|, we need to save it by expanding it
 %    first. The use of |\@swaptwoargs| makes it so that the
 %    \emph{expansion} of |\@filef@und| gets to be the second argument
-%    of |\verbatim@readfile|. 
+%    of |\verbatim@readfile|.
 % \changes{v1.5t}{2020-07-06}{Expand \cs{@filef@und} before the call
-%    of \cs{@verbatim} (gh/222)}m 
+%    of \cs{@verbatim} (gh/222)}
 %    \begin{macrocode}
 \def\verbatim@input#1#2{%
   \IfFileExists {#2}{%
@@ -1606,7 +1606,7 @@
 % \end{macro}
 %
 %
-% \subsection{Getting verbatim text into arguments.}
+% \subsection{Getting verbatim text into arguments}
 %
 % One way of achieving this is to define a macro (command) whose
 % expansion is the required verbatim text.  This command can then be
diff --git a/required/tools/xr.dtx b/required/tools/xr.dtx
index 0dd5f3ad9..be48f5a01 100644
--- a/required/tools/xr.dtx
+++ b/required/tools/xr.dtx
@@ -25,7 +25,7 @@
 %
 %<package>\NeedsTeXFormat{LaTeX2e}
 %<package>\ProvidesPackage{xr}
-%<package>         [2020-05-10 v5.06 eXternal References (DPC)]
+%<package>         [2023-07-04 v5.06 eXternal References (DPC)]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -74,7 +74,7 @@
 % If any of the external documents, or the main document, use the same
 % |\label| then an error will occur as the label will be multiply
 % defined. To overcome this problem |\externaldocument| has an optional
-% argument. If you declare |\externaldocument[A-]{aaa}| Then all
+% argument. If you declare |\externaldocument[A-]{aaa}|, then all
 % references from |aaa| are prefixed by |A-|. So for instance, if a
 % section of |aaa| had |\label{intro}|, then this could be referenced
 % with |\ref{A-intro}|. The prefix need not be |A-|, it can be any

From f0f0f559a547f92d508507efbd183f6fe5d692ae Mon Sep 17 00:00:00 2001
From: Ulrike Fischer <news3@nililand.de>
Date: Tue, 10 Oct 2023 12:39:10 +0200
Subject: [PATCH 3/6] update pdfmanagement to v96a (#1143)

Co-authored-by: Ulrike Fischer <fischer@troubleshooting-tex.de>
---
 .../pdfmanagement-testphase/color-ltx.sty     |  2 +-
 .../colorspace-patches-tmp-ltx.sty            |  2 +-
 .../hgeneric-testphase.def                    | 69 +++++++++-----
 .../l3backend-testphase-dvipdfmx.def          | 93 +++++++++++--------
 .../l3backend-testphase-dvips.def             | 65 ++++++++-----
 .../l3backend-testphase-dvisvgm.def           | 47 +++++++---
 .../l3backend-testphase-luatex.def            | 60 +++++++-----
 .../l3backend-testphase-pdftex.def            | 76 +++++++++------
 .../l3backend-testphase-xetex.def             | 93 +++++++++++--------
 .../l3pdffield-testphase.sty                  | 43 ++++++---
 .../pdfmanagement-firstaid.sty                |  3 +-
 .../pdfmanagement-testphase.ltx               |  6 +-
 .../pdfmanagement-testphase.sty               |  2 +-
 .../xcolor-patches-tmp-ltx.sty                |  4 +-
 14 files changed, 353 insertions(+), 212 deletions(-)

diff --git a/texmf/tex/latex/pdfmanagement-testphase/color-ltx.sty b/texmf/tex/latex/pdfmanagement-testphase/color-ltx.sty
index ff7305d34..b04fa5aa9 100644
--- a/texmf/tex/latex/pdfmanagement-testphase/color-ltx.sty
+++ b/texmf/tex/latex/pdfmanagement-testphase/color-ltx.sty
@@ -24,7 +24,7 @@
 %% This file has the LPPL maintenance status "maintained".
 %%
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{color-ltx}[2023-08-29 v0.95z
+\ProvidesPackage{color-ltx}[2023-10-09 v0.96a
   Standard LaTeX Color (patched for l3color, part of pdfmanagement-testphase, original version 2022/01/06 v1.3d) (DPC)]
 \edef\Gin@codes{%
  \catcode`\noexpand\^^A\the\catcode`\^^A\relax
diff --git a/texmf/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty b/texmf/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty
index fc7f93841..6af2ce080 100644
--- a/texmf/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty
+++ b/texmf/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty
@@ -19,7 +19,7 @@
 %
 % for those people who are interested.
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
-\ProvidesExplPackage{colorspace-patches-tmp-ltx}{2023-08-29}{0.95z}
+\ProvidesExplPackage{colorspace-patches-tmp-ltx}{2023-10-09}{0.96a}
   {temporay patches to for the colorspace package to test pdfresource management ... UF}
 
 % colorspace can define more models, that l3color can't yet handle.
diff --git a/texmf/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def b/texmf/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def
index 70fd178ab..4c37ce15f 100644
--- a/texmf/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def
+++ b/texmf/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: hyperref-generic.dtx
-\ProvidesFile{hgeneric-testphase.def}[2023-08-29 v0.95z %
+\ProvidesFile{hgeneric-testphase.def}[2023-10-09 v0.96a %
   generic Hyperref driver for the LaTeX PDF management testphase bundle]
 
 \RequirePackage{etoolbox} %why?
@@ -173,6 +173,7 @@
   }
 \cs_generate_variant:Nn\pdf_destination:nn {nf}
 \cs_generate_variant:Nn\pdf_object_ref:n {e}
+\cs_generate_variant:Nn\pdf_pageobject_ref:n {e}
 \chardef\Hy@VersionChecked=1 %don't check the version!
 \cs_set_eq:NN \hypercalcbp \dim_to_decimal_in_bp:n
 \providecommand\@pdfborder{}
@@ -453,33 +454,51 @@
   {
     \PassOptionsToPackage{draft}{bookmark}
   }
-\cs_new_protected:Npn \__hyp_ref_label:nn #1 #2 %label/attributes
+\cs_if_exist:NTF \property_new:nnnn
   {
-    \@bsphack
-      \ref_label:nn{#1}{#2}
-    \@esphack
+    \cs_new_protected:Npn \__hyp_property_record:nn #1 #2 %label/attributes
+     {
+       \@bsphack
+         \property_record:nn{#1}{#2}
+       \@esphack
+     }
+    \prg_new_eq_conditional:NNn
+      \__hyp_property_if_recorded:nn \property_if_recorded:nn { T }
+    \cs_new_eq:NN \__hyp_property_ref_undefined_warn:nn \property_ref_undefined_warn:nn
+    \cs_new_eq:NN \__hyp_property_ref:nn \property_ref:nn
   }
-\cs_generate_variant:Nn \__hyp_ref_label:nn {en}
-\prg_new_eq_conditional:NNn \__hyp_ref_if_exist:nn \ref_if_exist:nn { p , T , F,  TF }
-\prg_generate_conditional_variant:Nnn \__hyp_ref_if_exist:nn  {en}  { p , T , F, TF }
-\cs_new_protected:Npn \__hyp_ref_check:nn #1 #2 %label/attribute
   {
-    \__hyp_ref_if_exist:nnF {#1}{#2}
+    \cs_new_protected:Npn \__hyp_property_record:nn #1 #2 %label/attributes
       {
-        \protect\G@refundefinedtrue
-        \@latex@warning
+        \@bsphack
+          \ref_label:nn{#1}{#2}
+        \@esphack
+      }
+
+    \prg_new_eq_conditional:NNn \__hyp_property_if_recorded:nn \ref_if_exist:nn { T }
+
+    \cs_new_protected:Npn \__hyp_property_ref_undefined_warn:nn #1 #2 %label/attribute
+      {
+        \__hyp_property_if_recorded:nnF {#1}{#2}
           {
-            Reference~'\tl_to_str:n {#1}'~with~attribute~'\tl_to_str:n {#2}'~
-            on~page~\thepage~\space undefined
+            \protect\G@refundefinedtrue
+            \@latex@warning
+              {
+                Reference~'\tl_to_str:n {#1}'~with~attribute~'\tl_to_str:n {#2}'~
+                on~page~\thepage~\space undefined
+              }
           }
       }
+
+    \cs_new:Npn \__hyp_property_ref:nn #1 #2
+      {
+        \ref_value:nn{#1}{#2}
+      }
   }
-\cs_generate_variant:Nn \__hyp_ref_check:nn {en}
-\cs_new:Npn \__hyp_ref_value:nn #1 #2
-  {
-    \ref_value:nn{#1}{#2}
-  }
-\cs_generate_variant:Nn \__hyp_ref_value:nn {en}
+\cs_generate_variant:Nn \__hyp_property_record:nn {ee}
+\prg_generate_conditional_variant:Nnn \__hyp_property_if_recorded:nn  {ee}  { T }
+\cs_generate_variant:Nn \__hyp_property_ref_undefined_warn:nn {ee}
+\cs_generate_variant:Nn \__hyp_property_ref:nn {ee}
 \box_new:N \l__hyp_tmpa_box
 \tl_new:N  \l__hyp_tmpa_tl
 \seq_new:N \l__hyp_tmpa_seq
@@ -2560,16 +2579,16 @@
     %\zref@labelbyprops{HyAnn@\the\HyAnn@Count}{abspage}%
     %\zref@labelbylist {HyAnn@\the\HyAnn@Count} {l3pdf}
     %\zref@refused{HyAnn@\the\HyAnn@Count}%
-    \__hyp_ref_label:en {HyAnn@\the\HyAnn@Count}{abspage}
-    \__hyp_ref_check:en {HyAnn@\the\HyAnn@Count}{abspage}
+    \__hyp_property_record:ee {HyAnn@\the\HyAnn@Count}{abspage}
+    \__hyp_property_ref_undefined_warn:ee {HyAnn@\the\HyAnn@Count}{abspage}
   }%
 \def\Fld@pageobjref
   {
-    \__hyp_ref_if_exist:enT {HyAnn@\the\HyAnn@Count}{abspage}
+    \__hyp_property_if_recorded:eeT {HyAnn@\the\HyAnn@Count}{abspage}
       {
-        /P~\pdf_pageobject_ref:n
+        /P~\pdf_pageobject_ref:e
           {
-            \__hyp_ref_value:en{HyAnn@\the\HyAnn@Count}{abspage}
+            \__hyp_property_ref:ee{HyAnn@\the\HyAnn@Count}{abspage}
           }
       }
   }
diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def
index c56535df9..2014531e7 100644
--- a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def
+++ b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def
@@ -20,8 +20,10 @@
 %% 
 %% File: l3backend-testphase.dtx
 \ProvidesExplFile
-  {l3backend-testphase-dvipdfmx.def}{2023-08-29}{}
+  {l3backend-testphase-dvipdfmx.def}{2023-10-09}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: dvipdfmx}
+\cs_generate_variant:Nn \__kernel_backend_literal:n { e }
+\cs_generate_variant:Nn \__pdf_backend:n { e }
 \bool_if:NT \l__pdfmanagement_delayed_shipout_bool
  {
    \cs_new_protected:Npn \__kernel_backend_shipout_literal:e #1
@@ -29,21 +31,37 @@
  }
 
 \RequirePackage{l3ref-tmp}
-\cs_generate_variant:Nn \ref_label:nn {en}
-\cs_generate_variant:Nn \ref_value:nn {en}
-\cs_new_protected:Npn \__pdf_backend_ref_label:nn #1 #2
-  {
-     \@bsphack
-     \ref_label:nn{#1}{abspage}
-     \@esphack
-  }
-\cs_new:Npn \__pdf_backend_ref_value:nn #1 #2
-  {
-     \ref_value:nn{#1}{#2}
-  }
-\cs_generate_variant:Nn \__pdf_backend_ref_label:nn {en}
-\cs_generate_variant:Nn \__pdf_backend_ref_value:nn {en}
-    \__kernel_backend_literal:x { dvipdfmx:config~C~ 0x0010 }
+\cs_if_exist:NTF \property_new:nnnn
+ {
+   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
+     {
+        \@bsphack
+        \property_record:nn{#1}{abspage}
+        \@esphack
+     }
+   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
+     {
+        \property_ref:nn{#1}{abspage}
+     }
+
+ }
+ {
+   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
+    %% \__pdf_backend_ref_label:nn #1 #2
+     {
+        \@bsphack
+        \ref_label:nn{#1}{abspage}
+        \@esphack
+     }
+   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
+    %% \__pdf_backend_ref_value:nn #1 #2
+     {
+        \ref_value:nn{#1}{abspage}
+     }
+ }
+\cs_generate_variant:Nn \__pdf_backend_record_abspage:n {e}
+\cs_generate_variant:Nn \__pdf_backend_ref_abspage:n {e}
+    \__kernel_backend_literal:n { dvipdfmx:config~C~ 0x0010 }
 \prop_new:N \g__pdf_tmpa_prop
 \tl_new:N   \l__pdf_tmpa_tl
 \box_new:N  \l__pdf_backend_tmpa_box
@@ -113,9 +131,10 @@
   %issues the values stored in the global prop with dvi
 \cs_new_protected:Npn \__pdf_backend_ThisPage_gpush:n #1
   {
-    \exp_args:Nx \__pdf_backend_Page_primitive:n
+    \__pdf_backend_Page_primitive:e
       { \pdfdict_use:n { g__pdf_Core/Page} }
   }
+\cs_generate_variant:Nn \__pdf_backend_Page_primitive:n { e }
 \clist_const:Nn \c__pdf_backend_PageResources_clist
   {
     ExtGState,
@@ -139,11 +158,10 @@
 \cs_new_protected:Npn \__pdf_backend_PageResources_gput:nnn #1 #2 #3
   {
    % this is not used for output, but there is a test if the resource is empty
-   \exp_args:Nnx
-   \prop_gput:cnn { \__kernel_pdfdict_name:n { g__pdf_Core/Page/Resources/#1} }
+   \prop_gput:cne { \__kernel_pdfdict_name:n { g__pdf_Core/Page/Resources/#1} }
      { \str_convert_pdfname:n {#2} }{ #3 }
    %objects are not filled with \pdf_object_write as this is not additive!
-    \__pdf_backend:x
+    \__pdf_backend:e
       {
         put~\__pdf_backend_object_ref:n {__pdf/Page/Resources/#1}<</#2~#3>>
       }
@@ -155,11 +173,11 @@
  \cs_set_protected:Npn \__pdf_backend_bdcobject:nn #1 #2 % #1 eg. Span, #2: object name
    {
      \int_gincr:N \g__pdf_backend_name_int
-     \__kernel_backend_literal:x
+     \__kernel_backend_literal:e
        {
          pdf:code~/#1/l3pdf\int_use:N\g__pdf_backend_name_int\c_space_tl BDC
        }
-     \__kernel_backend_literal:x
+     \__kernel_backend_literal:e
        {
          pdf:put~@resources~
            <<
@@ -174,11 +192,11 @@
  \cs_set_protected:Npn \__pdf_backend_bdcobject:n #1  % #1 eg. Span
    {
      \int_gincr:N \g__pdf_backend_name_int
-     \__kernel_backend_literal:x
+     \__kernel_backend_literal:e
        {
          pdf:code~/\exp_not:n{#1}/l3pdf\int_use:N\g__pdf_backend_name_int\c_space_tl BDC
        }
-     \__kernel_backend_literal:x
+     \__kernel_backend_literal:e
        {
          pdf:put~@resources~
            <<
@@ -234,7 +252,7 @@
       {
         \prop_if_empty:cF { \__kernel_pdfdict_name:n { g__pdf_Core/Page/Resources/##1} }
           {
-            \__kernel_backend_literal:x
+            \__kernel_backend_literal:e
               {
                 pdf:put~@resources~
                   <</##1~\__pdf_backend_object_ref:n {__pdf/Page/Resources/##1}>>
@@ -245,7 +263,7 @@
 \cs_new_protected:Npn \__pdf_backend_Names_gpush:nn #1 #2 %#1 name of name tree, #2 array content
   {
      \pdf_object_unnamed_write:nn {dict} {/Names [#2] }
-     \__pdf_backend:x {put~@names~<</#1~\pdf_object_ref_last: >>}
+     \__pdf_backend:e {put~@names~<</#1~\pdf_object_ref_last: >>}
   }
 
 \cs_new_protected:Npn  \__pdf_backend_NamesEmbeddedFiles_add:nn #1 #2 {}
@@ -298,7 +316,7 @@
          \hook_gput_next_code:nn {shipout/background}
            {
              \mode_leave_vertical: %needed, the xform disappears without it.
-             \__pdf_backend:x
+             \__pdf_backend:e
                {
                  bxobj  ~ \__pdf_backend_xform_ref:n  { #1 }
                  \c_space_tl width  ~ \pdfxform_wd:n { #1 }
@@ -306,29 +324,29 @@
                  \c_space_tl depth  ~ \pdfxform_dp:n { #1 }
                }
              \box_use_drop:c { g__pdf_backend_xform_#1_box }
-             \__pdf_backend:x {put ~ @resources ~<<#3>> }
-             \__pdf_backend:x
+             \__pdf_backend:e {put ~ @resources ~<<#3>> }
+             \__pdf_backend:e
                {
                  put~ @resources ~
                    <<
                      /ExtGState~ \pdf_object_ref:n { __pdf/Page/Resources/ExtGState }
                    >>
                }
-             \__pdf_backend:x
+             \__pdf_backend:e
                {
                  put~ @resources ~
                  <<
                    /Pattern~ \pdf_object_ref:n { __pdf/Page/Resources/Pattern }
                  >>
                }
-             \__pdf_backend:x
+             \__pdf_backend:e
                {
                  put~ @resources ~
                  <<
                    /Shading~ \pdf_object_ref:n { __pdf/Page/Resources/Shading }
                  >>
                }
-             \__pdf_backend:x
+             \__pdf_backend:e
                {
                  put~ @resources ~
                  <<
@@ -336,8 +354,7 @@
                    \pdf_object_ref:n { __pdf/Page/Resources/ColorSpace }
                  >>
                }
-             \exp_args:Nx
-             \__pdf_backend:x {exobj ~<<#2>>}
+             \__pdf_backend:e {exobj ~<<#2>>}
            }
       }
 
@@ -350,7 +367,7 @@
      {
        \hbox_set:Nn \l__pdf_backend_tmpa_box
          {
-           \__pdf_backend:x
+           \__pdf_backend:e
              {
                uxobj~ \__pdf_backend_xform_ref:n { #1 }
              }
@@ -381,7 +398,7 @@
 \cs_set_eq:NN \__pdf_backend_link_begin_structure_goto:nnw  \__pdf_backend_link_begin_goto:nnw
 \cs_set_protected:Npn \__pdf_backend_structure_destination:nn #1#2
   {
-    \__pdf_backend:x
+    \__pdf_backend:e
       {
         dest ~ ( \exp_not:n {#1} )
         [
@@ -402,7 +419,7 @@
       }
     \exp_args:Ne \pdf_object_if_exist:nT { \l_pdf_current_structure_destination_tl }
       {
-        \__pdf_backend:x
+        \__pdf_backend:e
          {
           obj ~ @pdf.SDest.\exp_not:n{#1}
           [
@@ -453,7 +470,7 @@
               }
             \exp_args:Ne \pdf_object_if_exist:nT { \l_pdf_current_structure_destination_tl }
               {
-                \__pdf_backend:x
+                \__pdf_backend:e
                   {
                     obj ~ @pdf.SDest.\exp_not:n{#2}
                     [
diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def
index 78b8bde46..8b4d25eff 100644
--- a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def
+++ b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def
@@ -20,8 +20,10 @@
 %% 
 %% File: l3backend-testphase.dtx
 \ProvidesExplFile
-  {l3backend-testphase-dvips.def}{2023-08-29}{}
+  {l3backend-testphase-dvips.def}{2023-10-09}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: dvips}
+\cs_generate_variant:Nn \__kernel_backend_postscript:n { e }
+\cs_generate_variant:Nn \__pdf_backend_pdfmark:n { e }
 \bool_if:NT \l__pdfmanagement_delayed_shipout_bool
  {
    \cs_new_protected:Npn \__kernel_backend_shipout_literal:e #1
@@ -29,20 +31,36 @@
  }
 
 \RequirePackage{l3ref-tmp}
-\cs_generate_variant:Nn \ref_label:nn {en}
-\cs_generate_variant:Nn \ref_value:nn {en}
-\cs_new_protected:Npn \__pdf_backend_ref_label:nn #1 #2
-  {
-     \@bsphack
-     \ref_label:nn{#1}{abspage}
-     \@esphack
-  }
-\cs_new:Npn \__pdf_backend_ref_value:nn #1 #2
-  {
-     \ref_value:nn{#1}{#2}
-  }
-\cs_generate_variant:Nn \__pdf_backend_ref_label:nn {en}
-\cs_generate_variant:Nn \__pdf_backend_ref_value:nn {en}
+\cs_if_exist:NTF \property_new:nnnn
+ {
+   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
+     {
+        \@bsphack
+        \property_record:nn{#1}{abspage}
+        \@esphack
+     }
+   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
+     {
+        \property_ref:nn{#1}{abspage}
+     }
+
+ }
+ {
+   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
+    %% \__pdf_backend_ref_label:nn #1 #2
+     {
+        \@bsphack
+        \ref_label:nn{#1}{abspage}
+        \@esphack
+     }
+   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
+    %% \__pdf_backend_ref_value:nn #1 #2
+     {
+        \ref_value:nn{#1}{abspage}
+     }
+ }
+\cs_generate_variant:Nn \__pdf_backend_record_abspage:n {e}
+\cs_generate_variant:Nn \__pdf_backend_ref_abspage:n {e}
 \prop_new:N \g__pdf_tmpa_prop
 \tl_new:N   \l__pdf_tmpa_tl
 \box_new:N  \l__pdf_backend_tmpa_box
@@ -111,9 +129,10 @@
   %issues the values stored in the global prop with dvi
 \cs_new_protected:Npn \__pdf_backend_ThisPage_gpush:n #1
   {
-    \exp_args:Nx \__pdf_backend_Page_primitive:n
-          { \pdfdict_use:n { g__pdf_Core/Page} }
+    \__pdf_backend_Page_primitive:e
+      { \pdfdict_use:n { g__pdf_Core/Page} }
   }
+\cs_generate_variant:Nn \__pdf_backend_Page_primitive:n { e }
 \clist_const:Nn \c__pdf_backend_PageResources_clist
   {
     ExtGState,
@@ -144,11 +163,11 @@
 
 \cs_set_protected:Npn \__pdf_backend_bdcobject:nn #1 #2 % #1 eg. Span, #2: object name
   {
-    \__pdf_backend_pdfmark:x{/#1~\__pdf_backend_object_ref:n{#2}~/BDC}
+    \__pdf_backend_pdfmark:e{/#1~\__pdf_backend_object_ref:n{#2}~/BDC}
   }
 \cs_set_protected:Npn \__pdf_backend_bdcobject:n #1  % #1 eg. Span,
   {
-    \__pdf_backend_pdfmark:x{/#1~\__pdf_backend_object_last:~/BDC}
+    \__pdf_backend_pdfmark:e{/#1~\__pdf_backend_object_last:~/BDC}
   }
 \cs_set_protected:Npn \__pdf_backend_emc:
   {
@@ -165,7 +184,7 @@
 \cs_new_protected:Npn \__pdf_backend_Names_gpush:nn #1 #2  {}
 \cs_new_protected:Npn  \__pdf_backend_NamesEmbeddedFiles_add:nn #1 #2
       {
-        \__pdf_backend_pdfmark:x
+        \__pdf_backend_pdfmark:e
           {
             /Name~#1~
             /FS~#2~
@@ -220,7 +239,7 @@
     %\box_scale:Nnn \l__pdf_backend_tmpa_box {1} {-1}
     \hbox_set:Nn\l__pdf_backend_tmpb_box
       {
-        \__kernel_backend_postscript:x
+        \__kernel_backend_postscript:e
           {
             gsave~currentpoint~
             initclip~ % restore default clipping path (page device/whole page)
@@ -248,7 +267,7 @@
           }
        \str_if_eq:eeF{#1}{}
          {
-           \__kernel_backend_postscript:x
+           \__kernel_backend_postscript:e
              {
                product~(Ghostscript)~search~
                 {
@@ -274,7 +293,7 @@
   {
     \hbox_set:Nn \l__pdf_backend_tmpa_box
       {
-        \__kernel_backend_postscript:x
+        \__kernel_backend_postscript:e
          {
            gsave~currentpoint~translate~1~-1~scale~
            mark~{ pdf.obj \int_use:c{c__pdf_backend_xform_ \tl_to_str:n {#1} _int }}~
diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def
index 19b003dce..7420d8d22 100644
--- a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def
+++ b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def
@@ -20,7 +20,7 @@
 %% 
 %% File: l3backend-testphase.dtx
 \ProvidesExplFile
-  {l3backend-testphase-dvisvgm.def}{2023-08-29}{}
+  {l3backend-testphase-dvisvgm.def}{2023-10-09}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: dvisvgm}
 \bool_if:NT \l__pdfmanagement_delayed_shipout_bool
  {
@@ -29,20 +29,36 @@
  }
 
 \RequirePackage{l3ref-tmp}
-\cs_generate_variant:Nn \ref_label:nn {en}
-\cs_generate_variant:Nn \ref_value:nn {en}
-\cs_new_protected:Npn \__pdf_backend_ref_label:nn #1 #2
-  {
-     \@bsphack
-     \ref_label:nn{#1}{abspage}
-     \@esphack
-  }
-\cs_new:Npn \__pdf_backend_ref_value:nn #1 #2
-  {
-     \ref_value:nn{#1}{#2}
-  }
-\cs_generate_variant:Nn \__pdf_backend_ref_label:nn {en}
-\cs_generate_variant:Nn \__pdf_backend_ref_value:nn {en}
+\cs_if_exist:NTF \property_new:nnnn
+ {
+   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
+     {
+        \@bsphack
+        \property_record:nn{#1}{abspage}
+        \@esphack
+     }
+   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
+     {
+        \property_ref:nn{#1}{abspage}
+     }
+
+ }
+ {
+   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
+    %% \__pdf_backend_ref_label:nn #1 #2
+     {
+        \@bsphack
+        \ref_label:nn{#1}{abspage}
+        \@esphack
+     }
+   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
+    %% \__pdf_backend_ref_value:nn #1 #2
+     {
+        \ref_value:nn{#1}{abspage}
+     }
+ }
+\cs_generate_variant:Nn \__pdf_backend_record_abspage:n {e}
+\cs_generate_variant:Nn \__pdf_backend_ref_abspage:n {e}
 \prop_new:N \g__pdf_tmpa_prop
 \tl_new:N   \l__pdf_tmpa_tl
 \box_new:N  \l__pdf_backend_tmpa_box
@@ -90,6 +106,7 @@
   %the code to push the values, used in shipout
 \cs_new_protected:Npn \__pdf_backend_ThisPage_gpush:n #1
   {}
+\cs_generate_variant:Nn \__pdf_backend_Page_primitive:n { e }
 \clist_const:Nn \c__pdf_backend_PageResources_clist
   {
     ExtGState,
diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def
index f8d496ad5..47210ec31 100644
--- a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def
+++ b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def
@@ -20,8 +20,9 @@
 %% 
 %% File: l3backend-testphase.dtx
 \ProvidesExplFile
-  {l3backend-testphase-luatex.def}{2023-08-29}{}
+  {l3backend-testphase-luatex.def}{2023-10-09}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (LuaTeX)}
+\cs_generate_variant:Nn \__kernel_backend_literal_page:n { e }
 \bool_if:NT \l__pdfmanagement_delayed_shipout_bool
  {
    \cs_new_protected:Npn \__kernel_backend_shipout_literal:e #1
@@ -39,20 +40,36 @@
  }
 
 \RequirePackage{l3ref-tmp}
-\cs_generate_variant:Nn \ref_label:nn {en}
-\cs_generate_variant:Nn \ref_value:nn {en}
-\cs_new_protected:Npn \__pdf_backend_ref_label:nn #1 #2
-  {
-     \@bsphack
-     \ref_label:nn{#1}{abspage}
-     \@esphack
-  }
-\cs_new:Npn \__pdf_backend_ref_value:nn #1 #2
-  {
-     \ref_value:nn{#1}{#2}
-  }
-\cs_generate_variant:Nn \__pdf_backend_ref_label:nn {en}
-\cs_generate_variant:Nn \__pdf_backend_ref_value:nn {en}
+\cs_if_exist:NTF \property_new:nnnn
+ {
+   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
+     {
+        \@bsphack
+        \property_record:nn{#1}{abspage}
+        \@esphack
+     }
+   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
+     {
+        \property_ref:nn{#1}{abspage}
+     }
+
+ }
+ {
+   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
+    %% \__pdf_backend_ref_label:nn #1 #2
+     {
+        \@bsphack
+        \ref_label:nn{#1}{abspage}
+        \@esphack
+     }
+   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
+    %% \__pdf_backend_ref_value:nn #1 #2
+     {
+        \ref_value:nn{#1}{abspage}
+     }
+ }
+\cs_generate_variant:Nn \__pdf_backend_record_abspage:n {e}
+\cs_generate_variant:Nn \__pdf_backend_ref_abspage:n {e}
 \prop_new:N \g__pdf_tmpa_prop
 \tl_new:N   \l__pdf_tmpa_tl
 \box_new:N  \l__pdf_backend_tmpa_box
@@ -160,6 +177,7 @@
       }
   }
 
+\cs_generate_variant:Nn \__pdf_backend_Page_primitive:n { e }
 \clist_const:Nn \c__pdf_backend_PageResources_clist
   {
     ExtGState,
@@ -207,17 +225,17 @@
 \cs_set_protected:Npn \__pdf_backend_bdcobject:nn #1 #2 % #1 eg. Span, #2: object name
   {
     \int_gincr:N \g__pdf_backend_name_int
-    \exp_args:Nx\__kernel_backend_literal_page:n
+    \__kernel_backend_literal_page:e
       { /#1 ~ /l3pdf\int_use:N\g__pdf_backend_name_int\c_space_tl BDC }
     \bool_if:NTF \l__pdf_backend_xform_bool
       {
-        \exp_args:Nnx\pdfdict_gput:nnn
+        \pdfdict_gput:nee
           { g__pdf_Core/Xform/Resources/Properties }
           { l3pdf\int_use:N\g__pdf_backend_name_int }
           { \__pdf_backend_object_ref:n { #2 } }
       }
       {
-        \exp_args:Nx \tex_latelua:D
+        \exp_args:Ne \tex_latelua:D
           {
             ltx.pdf.Page_Resources_Properties_gput
               (
@@ -231,17 +249,17 @@
 \cs_set_protected:Npn \__pdf_backend_bdcobject:n #1% #1 eg. Span
   {
     \int_gincr:N \g__pdf_backend_name_int
-    \exp_args:Nx\__kernel_backend_literal_page:n
+    \__kernel_backend_literal_page:e
       { /\exp_not:n{#1} ~ /l3pdf\int_use:N\g__pdf_backend_name_int\c_space_tl BDC }
     \bool_if:NTF \l__pdf_backend_xform_bool
       {
-        \exp_args:Nnx\pdfdict_gput:nnn %no handler needed
+        \pdfdict_gput:nee %no handler needed
           { g__pdf_Core/Xform/Resources/Properties }
           { l3pdf\int_use:N\g__pdf_backend_name_int }
           { \__pdf_backend_object_last: }
       }
       {
-        \exp_args:Nx \tex_latelua:D
+        \exp_args:Ne \tex_latelua:D
           {
             ltx.pdf.Page_Resources_Properties_gput
               (
diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def
index 08ff703af..71e598bfb 100644
--- a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def
+++ b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def
@@ -20,8 +20,9 @@
 %% 
 %% File: l3backend-testphase.dtx
 \ProvidesExplFile
-  {l3backend-testphase-pdftex.def}{2023-08-29}{}
+  {l3backend-testphase-pdftex.def}{2023-10-09}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (pdfTeX)}
+\cs_generate_variant:Nn \__kernel_backend_literal_page:n { e }
 \bool_if:NT \l__pdfmanagement_delayed_shipout_bool
  {
    \cs_new_protected:Npn \__kernel_backend_shipout_literal:e #1
@@ -39,20 +40,36 @@
  }
 
 \RequirePackage{l3ref-tmp}
-\cs_generate_variant:Nn \ref_label:nn {en}
-\cs_generate_variant:Nn \ref_value:nn {en}
-\cs_new_protected:Npn \__pdf_backend_ref_label:nn #1 #2
-  {
-     \@bsphack
-     \ref_label:nn{#1}{abspage}
-     \@esphack
-  }
-\cs_new:Npn \__pdf_backend_ref_value:nn #1 #2
-  {
-     \ref_value:nn{#1}{#2}
-  }
-\cs_generate_variant:Nn \__pdf_backend_ref_label:nn {en}
-\cs_generate_variant:Nn \__pdf_backend_ref_value:nn {en}
+\cs_if_exist:NTF \property_new:nnnn
+ {
+   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
+     {
+        \@bsphack
+        \property_record:nn{#1}{abspage}
+        \@esphack
+     }
+   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
+     {
+        \property_ref:nn{#1}{abspage}
+     }
+
+ }
+ {
+   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
+    %% \__pdf_backend_ref_label:nn #1 #2
+     {
+        \@bsphack
+        \ref_label:nn{#1}{abspage}
+        \@esphack
+     }
+   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
+    %% \__pdf_backend_ref_value:nn #1 #2
+     {
+        \ref_value:nn{#1}{abspage}
+     }
+ }
+\cs_generate_variant:Nn \__pdf_backend_record_abspage:n {e}
+\cs_generate_variant:Nn \__pdf_backend_ref_abspage:n {e}
 \prop_new:N \g__pdf_tmpa_prop
 \tl_new:N   \l__pdf_tmpa_tl
 \box_new:N  \l__pdf_backend_tmpa_box
@@ -104,10 +121,10 @@
   {
     %we need to know the page the resource should be added too.
     \int_gincr:N\g__pdf_backend_resourceid_int
-    \__pdf_backend_ref_label:en { l3pdf\int_use:N\g__pdf_backend_resourceid_int }{abspage}
+    \__pdf_backend_record_abspage:e { l3pdf\int_use:N\g__pdf_backend_resourceid_int }
     \tl_set:Nx \l__pdf_tmpa_tl
       {
-        \__pdf_backend_ref_value:en {l3pdf\int_use:N\g__pdf_backend_resourceid_int}{abspage}
+        \__pdf_backend_ref_abspage:e {l3pdf\int_use:N\g__pdf_backend_resourceid_int}
       }
     \pdfdict_if_exist:nF { g__pdf_Core/backend_Page\l__pdf_tmpa_tl}
       {
@@ -126,11 +143,12 @@
             \prop_gput:Nnn \g__pdf_tmpa_prop { ##1 }{ ##2 }
           }
       }
-    \exp_args:Nx \__pdf_backend_Page_primitive:n
+    \__pdf_backend_Page_primitive:e
       {
         \prop_map_function:NN \g__pdf_tmpa_prop \pdfdict_item:ne
       }
   }
+\cs_generate_variant:Nn \__pdf_backend_Page_primitive:n { e }
 \clist_const:Nn \c__pdf_backend_PageResources_clist
   {
     ExtGState,
@@ -173,28 +191,28 @@
 \cs_set_protected:Npn \__pdf_backend_bdcobject:nn #1 #2 % #1 eg. Span, #2: object name
   {
     \int_gincr:N \g__pdf_backend_name_int
-    \exp_args:Nx\__kernel_backend_literal_page:n
+    \__kernel_backend_literal_page:e
       { /#1 ~ /l3pdf\int_use:N\g__pdf_backend_name_int\c_space_tl BDC }
     % code to set the property ....
     \int_gincr:N\g__pdf_backend_resourceid_int
     \bool_if:NTF \l__pdf_backend_xform_bool
       {
-        \exp_args:Nnxx\pdfdict_gput:nnn %no handler needed
+        \pdfdict_gput:nee %no handler needed
           { g__pdf_Core/Xform/Resources/Properties }
           { l3pdf\int_use:N\g__pdf_backend_resourceid_int }
           { \__pdf_backend_object_ref:n { #2 } }
       }
       {
-        \__pdf_backend_ref_label:en{l3pdf\int_use:N\g__pdf_backend_resourceid_int}{abspage}
+        \__pdf_backend_record_abspage:e {l3pdf\int_use:N\g__pdf_backend_resourceid_int}
         \tl_set:Nx \l__pdf_tmpa_tl
           {
-            \__pdf_backend_ref_value:en{l3pdf\int_use:N\g__pdf_backend_resourceid_int}{abspage}
+            \__pdf_backend_ref_abspage:e{l3pdf\int_use:N\g__pdf_backend_resourceid_int}
           }
         \pdfdict_if_exist:nF { g__pdf_Core/backend_Page\l__pdf_tmpa_tl/Resources/Properties }
           {
             \pdfdict_new:n { g__pdf_Core/backend_Page\l__pdf_tmpa_tl/Resources/Properties }
           }
-        \exp_args:Nnxx\pdfdict_gput:nnn
+        \pdfdict_gput:nee
           { g__pdf_Core/backend_Page\l__pdf_tmpa_tl/Resources/Properties }
           { l3pdf\int_use:N\g__pdf_backend_resourceid_int }
           { \__pdf_backend_object_ref:n{#2} }
@@ -203,28 +221,28 @@
 \cs_set_protected:Npn \__pdf_backend_bdcobject:n #1% #1 eg. Span
   {
     \int_gincr:N \g__pdf_backend_name_int
-    \exp_args:Nx\__kernel_backend_literal_page:n
+    \__kernel_backend_literal_page:e
       { /\exp_not:n{#1} ~ /l3pdf\int_use:N\g__pdf_backend_name_int\c_space_tl BDC }
     % code to set the property ....
     \int_gincr:N\g__pdf_backend_resourceid_int
     \bool_if:NTF \l__pdf_backend_xform_bool
       {
-        \exp_args:Nnxx\pdfdict_gput:nnn
+        \pdfdict_gput:nee
           { g__pdf_Core/Xform/Resources/Properties }
           { l3pdf\int_use:N\g__pdf_backend_resourceid_int }
           { \__pdf_backend_object_last: }
       }
       {
-        \__pdf_backend_ref_label:en{l3pdf\int_use:N\g__pdf_backend_resourceid_int}{abspage}
+        \__pdf_backend_record_abspage:e{l3pdf\int_use:N\g__pdf_backend_resourceid_int}
         \tl_set:Nx \l__pdf_tmpa_tl
           {
-            \__pdf_backend_ref_value:en{l3pdf\int_use:N\g__pdf_backend_resourceid_int}{abspage}
+            \__pdf_backend_ref_abspage:e{l3pdf\int_use:N\g__pdf_backend_resourceid_int}
           }
         \pdfdict_if_exist:nF { g__pdf_Core/backend_Page\l__pdf_tmpa_tl/Resources/Properties }
           {
             \pdfdict_new:n { g__pdf_Core/backend_Page\l__pdf_tmpa_tl/Resources/Properties }
           }
-        \exp_args:Nnxx\pdfdict_gput:nnn
+        \pdfdict_gput:nee
           { g__pdf_Core/backend_Page\l__pdf_tmpa_tl/Resources/Properties }
           { l3pdf\int_use:N\g__pdf_backend_resourceid_int }
           { \__pdf_backend_object_last: }
@@ -277,7 +295,7 @@
 
 \cs_new_protected:Npn \__pdf_backend_PageResources_gpush:n #1
   {
-     \exp_args:NNx \tex_global:D \tex_pdfpageresources:D
+     \exp_args:NNe \tex_global:D \tex_pdfpageresources:D
        {
          \prop_if_exist:cT
            { \__kernel_pdfdict_name:n { g__pdf_Core/backend_Page#1/Resources/Properties } }
diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def
index 295ff980e..095c557ba 100644
--- a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def
+++ b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def
@@ -20,8 +20,10 @@
 %% 
 %% File: l3backend-testphase.dtx
 \ProvidesExplFile
-  {l3backend-testphase-xetex.def}{2023-08-29}{}
+  {l3backend-testphase-xetex.def}{2023-10-09}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: XeTeX}
+\cs_generate_variant:Nn \__kernel_backend_literal:n { e }
+\cs_generate_variant:Nn \__pdf_backend:n { e }
 \bool_if:NT \l__pdfmanagement_delayed_shipout_bool
  {
    \cs_new_protected:Npn \__kernel_backend_shipout_literal:e #1
@@ -29,21 +31,37 @@
  }
 
 \RequirePackage{l3ref-tmp}
-\cs_generate_variant:Nn \ref_label:nn {en}
-\cs_generate_variant:Nn \ref_value:nn {en}
-\cs_new_protected:Npn \__pdf_backend_ref_label:nn #1 #2
-  {
-     \@bsphack
-     \ref_label:nn{#1}{abspage}
-     \@esphack
-  }
-\cs_new:Npn \__pdf_backend_ref_value:nn #1 #2
-  {
-     \ref_value:nn{#1}{#2}
-  }
-\cs_generate_variant:Nn \__pdf_backend_ref_label:nn {en}
-\cs_generate_variant:Nn \__pdf_backend_ref_value:nn {en}
-    \__kernel_backend_literal:x { dvipdfmx:config~C~ 0x0010 }
+\cs_if_exist:NTF \property_new:nnnn
+ {
+   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
+     {
+        \@bsphack
+        \property_record:nn{#1}{abspage}
+        \@esphack
+     }
+   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
+     {
+        \property_ref:nn{#1}{abspage}
+     }
+
+ }
+ {
+   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
+    %% \__pdf_backend_ref_label:nn #1 #2
+     {
+        \@bsphack
+        \ref_label:nn{#1}{abspage}
+        \@esphack
+     }
+   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
+    %% \__pdf_backend_ref_value:nn #1 #2
+     {
+        \ref_value:nn{#1}{abspage}
+     }
+ }
+\cs_generate_variant:Nn \__pdf_backend_record_abspage:n {e}
+\cs_generate_variant:Nn \__pdf_backend_ref_abspage:n {e}
+    \__kernel_backend_literal:n { dvipdfmx:config~C~ 0x0010 }
 \prop_new:N \g__pdf_tmpa_prop
 \tl_new:N   \l__pdf_tmpa_tl
 \box_new:N  \l__pdf_backend_tmpa_box
@@ -113,9 +131,10 @@
   %issues the values stored in the global prop with dvi
 \cs_new_protected:Npn \__pdf_backend_ThisPage_gpush:n #1
   {
-    \exp_args:Nx \__pdf_backend_Page_primitive:n
+    \__pdf_backend_Page_primitive:e
       { \pdfdict_use:n { g__pdf_Core/Page} }
   }
+\cs_generate_variant:Nn \__pdf_backend_Page_primitive:n { e }
 \clist_const:Nn \c__pdf_backend_PageResources_clist
   {
     ExtGState,
@@ -139,11 +158,10 @@
 \cs_new_protected:Npn \__pdf_backend_PageResources_gput:nnn #1 #2 #3
   {
    % this is not used for output, but there is a test if the resource is empty
-   \exp_args:Nnx
-   \prop_gput:cnn { \__kernel_pdfdict_name:n { g__pdf_Core/Page/Resources/#1} }
+   \prop_gput:cne { \__kernel_pdfdict_name:n { g__pdf_Core/Page/Resources/#1} }
      { \str_convert_pdfname:n {#2} }{ #3 }
    %objects are not filled with \pdf_object_write as this is not additive!
-    \__pdf_backend:x
+    \__pdf_backend:e
       {
         put~\__pdf_backend_object_ref:n {__pdf/Page/Resources/#1}<</#2~#3>>
       }
@@ -155,11 +173,11 @@
  \cs_set_protected:Npn \__pdf_backend_bdcobject:nn #1 #2 % #1 eg. Span, #2: object name
    {
      \int_gincr:N \g__pdf_backend_name_int
-     \__kernel_backend_literal:x
+     \__kernel_backend_literal:e
        {
          pdf:code~/#1/l3pdf\int_use:N\g__pdf_backend_name_int\c_space_tl BDC
        }
-     \__kernel_backend_literal:x
+     \__kernel_backend_literal:e
        {
          pdf:put~@resources~
            <<
@@ -174,11 +192,11 @@
  \cs_set_protected:Npn \__pdf_backend_bdcobject:n #1  % #1 eg. Span
    {
      \int_gincr:N \g__pdf_backend_name_int
-     \__kernel_backend_literal:x
+     \__kernel_backend_literal:e
        {
          pdf:code~/\exp_not:n{#1}/l3pdf\int_use:N\g__pdf_backend_name_int\c_space_tl BDC
        }
-     \__kernel_backend_literal:x
+     \__kernel_backend_literal:e
        {
          pdf:put~@resources~
            <<
@@ -234,7 +252,7 @@
       {
         \prop_if_empty:cF { \__kernel_pdfdict_name:n { g__pdf_Core/Page/Resources/##1} }
           {
-            \__kernel_backend_literal:x
+            \__kernel_backend_literal:e
               {
                 pdf:put~@resources~
                   <</##1~\__pdf_backend_object_ref:n {__pdf/Page/Resources/##1}>>
@@ -245,7 +263,7 @@
 \cs_new_protected:Npn \__pdf_backend_Names_gpush:nn #1 #2 %#1 name of name tree, #2 array content
   {
      \pdf_object_unnamed_write:nn {dict} {/Names [#2] }
-     \__pdf_backend:x {put~@names~<</#1~\pdf_object_ref_last: >>}
+     \__pdf_backend:e {put~@names~<</#1~\pdf_object_ref_last: >>}
   }
 
 \cs_new_protected:Npn  \__pdf_backend_NamesEmbeddedFiles_add:nn #1 #2 {}
@@ -298,7 +316,7 @@
          \hook_gput_next_code:nn {shipout/background}
            {
              \mode_leave_vertical: %needed, the xform disappears without it.
-             \__pdf_backend:x
+             \__pdf_backend:e
                {
                  bxobj  ~ \__pdf_backend_xform_ref:n  { #1 }
                  \c_space_tl width  ~ \pdfxform_wd:n { #1 }
@@ -306,29 +324,29 @@
                  \c_space_tl depth  ~ \pdfxform_dp:n { #1 }
                }
              \box_use_drop:c { g__pdf_backend_xform_#1_box }
-             \__pdf_backend:x {put ~ @resources ~<<#3>> }
-             \__pdf_backend:x
+             \__pdf_backend:e {put ~ @resources ~<<#3>> }
+             \__pdf_backend:e
                {
                  put~ @resources ~
                    <<
                      /ExtGState~ \pdf_object_ref:n { __pdf/Page/Resources/ExtGState }
                    >>
                }
-             \__pdf_backend:x
+             \__pdf_backend:e
                {
                  put~ @resources ~
                  <<
                    /Pattern~ \pdf_object_ref:n { __pdf/Page/Resources/Pattern }
                  >>
                }
-             \__pdf_backend:x
+             \__pdf_backend:e
                {
                  put~ @resources ~
                  <<
                    /Shading~ \pdf_object_ref:n { __pdf/Page/Resources/Shading }
                  >>
                }
-             \__pdf_backend:x
+             \__pdf_backend:e
                {
                  put~ @resources ~
                  <<
@@ -336,8 +354,7 @@
                    \pdf_object_ref:n { __pdf/Page/Resources/ColorSpace }
                  >>
                }
-             \exp_args:Nx
-             \__pdf_backend:x {exobj ~<<#2>>}
+             \__pdf_backend:e {exobj ~<<#2>>}
            }
       }
 
@@ -350,7 +367,7 @@
      {
        \hbox_set:Nn \l__pdf_backend_tmpa_box
          {
-           \__pdf_backend:x
+           \__pdf_backend:e
              {
                uxobj~ \__pdf_backend_xform_ref:n { #1 }
              }
@@ -381,7 +398,7 @@
 \cs_set_eq:NN \__pdf_backend_link_begin_structure_goto:nnw  \__pdf_backend_link_begin_goto:nnw
 \cs_set_protected:Npn \__pdf_backend_structure_destination:nn #1#2
   {
-    \__pdf_backend:x
+    \__pdf_backend:e
       {
         dest ~ ( \exp_not:n {#1} )
         [
@@ -402,7 +419,7 @@
       }
     \exp_args:Ne \pdf_object_if_exist:nT { \l_pdf_current_structure_destination_tl }
       {
-        \__pdf_backend:x
+        \__pdf_backend:e
          {
           obj ~ @pdf.SDest.\exp_not:n{#1}
           [
@@ -453,7 +470,7 @@
               }
             \exp_args:Ne \pdf_object_if_exist:nT { \l_pdf_current_structure_destination_tl }
               {
-                \__pdf_backend:x
+                \__pdf_backend:e
                   {
                     obj ~ @pdf.SDest.\exp_not:n{#2}
                     [
diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty b/texmf/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty
index 65dde6e84..8be75cd66 100644
--- a/texmf/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty
+++ b/texmf/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty
@@ -27,7 +27,7 @@
 %% File: l3pdffield.dtx
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesExplPackage{l3pdffield-testphase}{2023-08-29}{0.95z}%
+\ProvidesExplPackage{l3pdffield-testphase}{2023-10-09}{0.96a}%
   {form fields}
 \csname HyField@NeedAppearancesfalse\endcsname % suppress NeedAppearances
 \str_new:N \l__pdffield_tmpa_str
@@ -1169,12 +1169,28 @@
       }
     \cs_gset_eq:NN \__pdffield_radio_default_appearances: \prg_do_nothing:
   }
-\ref_attribute_gset:nnnn {pdfradioindex}{0}{now}
-  {
-    \int_use:N\l__pdffield_radio_value_num_int
-  }
-\cs_generate_variant:Nn \ref_label:nn {V}
-\cs_generate_variant:Nn \ref_value:nn {V}
+\cs_if_exist:NTF \property_new:nnnn
+ {
+   \property_new:nnnn {pdfradioindex}{now}
+     {0}
+     {
+       \int_use:N\l__pdffield_radio_value_num_int
+     }
+   \cs_new_eq:NN \__pdffield_property_record:nn \property_record:nn
+   \cs_new_eq:NN \__pdffield_property_ref:nn    \property_ref:nn
+ }
+ {
+   \ref_attribute_gset:nnnn {pdfradioindex}{0}{now}
+    {
+     \int_use:N\l__pdffield_radio_value_num_int
+    }
+   \cs_new_eq:NN \__pdffield_property_record:nn \ref_label:nn
+   \cs_new_eq:NN \__pdffield_property_ref:nn    \ref_value:nn
+ }
+
+ \cs_generate_variant:Nn \__pdffield_property_record:nn {V}
+ \cs_generate_variant:Nn \__pdffield_property_ref:nn {V}
+
 \cs_new_protected:Npn \__pdffield_radio_field:n #1 %name
   {
     \pdf_object_if_exist:nF {__pdffield/field/__pdffield/radio/#1}
@@ -1188,8 +1204,8 @@
               {__pdffield/field/__pdffield/radio-Opt/#1} { array }
               {\seq_use:cn {g__pdffield_radio_opt_#1_seq}{~}}
           }
-        \pdfdict_put:nnx { l__pdffield/field }{V}  { /\ref_value:nn{#1}{pdfradioindex} }
-        \pdfdict_put:nnx { l__pdffield/field }{DV} { /\ref_value:nn{#1}{pdfradioindex} }
+        \pdfdict_put:nnx { l__pdffield/field }{V}  { /\__pdffield_property_ref:nn{#1}{pdfradioindex} }
+        \pdfdict_put:nnx { l__pdffield/field }{DV} { /\__pdffield_property_ref:nn{#1}{pdfradioindex} }
         \__pdffield_field:n { __pdffield/radio/#1 }
     \bool_if:NF \l__pdffield_radio_unison_bool
       {
@@ -1226,7 +1242,7 @@
    \tl_if_empty:NT\l__pdffield_fieldID_tl
       {
         \pdfdict_get:nnN {l__pdffield/field}{T}\l__pdffield_fieldID_tl
-        \tl_put_left:Nn \l__pdffield_fieldID_tl {__pdffield/radio/}
+        \tl_put_left:Nn \l__pdffield_fieldID_tl {@pdffield/radio/}
       }
    \cs_if_exist_use:c {g__pdffield_radio_unison_state_ \l__pdffield_fieldID_tl _tl}
     \__pdffield_radio_field:V\l__pdffield_fieldID_tl
@@ -1252,15 +1268,14 @@
      }
      \bool_if:NT\l__pdffield_radio_default_bool
       {
-        \exp_args:Ne
-        \ref_label:nn{\l__pdffield_fieldID_tl}{pdfradioindex}
+        \__pdffield_property_record:Vn\l__pdffield_fieldID_tl{pdfradioindex}
       }
 
    \int_compare:nNnTF { \l__pdffield_radio_value_num_int } =
        {
-         \ref_value:Vn\l__pdffield_fieldID_tl{pdfradioindex}
+         \__pdffield_property_ref:Vn\l__pdffield_fieldID_tl{pdfradioindex}
        }
-     { \pdfannot_dict_put:nnx {widget}{AS}{/\ref_value:Vn\l__pdffield_fieldID_tl{pdfradioindex}} }
+     { \pdfannot_dict_put:nnx {widget}{AS}{/\__pdffield_property_ref:Vn\l__pdffield_fieldID_tl{pdfradioindex}} }
      { \pdfannot_dict_put:nnx {widget}{AS}{/Off} }
     \tl_if_empty:NT\l__pdffield_radio_appearance_code_tl
       {
diff --git a/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty b/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty
index 53db782f9..4b14960d8 100644
--- a/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty
+++ b/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: pdfmanagement-firstaid.dtx
-\ProvidesExplPackage{pdfmanagement-firstaid}{2023-08-29}{0.95z}
+\ProvidesExplPackage{pdfmanagement-firstaid}{2023-10-09}{0.96a}
   {LaTeX PDF management testphase bundle / firstaid-patches}
 
 \clist_map_inline:nn
@@ -72,6 +72,7 @@
          package/xcolor/after
        }
        {\RequirePackage{xcolor-patches-tmp-ltx}}
+    \DeclareHookRule{package/xcolor/after}{pdfmanagement-firstaid}{before}{xcolor}
   }
 \bool_lazy_all:nT
   {
diff --git a/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx b/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx
index 8cee027fc..e0f6f78d8 100644
--- a/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx
+++ b/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx
@@ -27,7 +27,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: pdfmanagement-testphase.dtx
-\ProvidesExplFile{pdfmanagement-testphase.ltx}{2023-08-29}{0.95z}
+\ProvidesExplFile{pdfmanagement-testphase.ltx}{2023-10-09}{0.96a}
   {PDF~management~code~(testphase)}
 \bool_new:N\l__pdfmanagement_delayed_shipout_bool
 \msg_new:nnn {pdfmanagement}{delayed-shipout}
@@ -214,7 +214,7 @@
   }
 
 \cs_set_eq:NN \pdfdict_put:nnn \__pdfdict_put:nnn
-\cs_generate_variant:Nn \pdfdict_put:nnn {nnx,nno}
+\cs_generate_variant:Nn \pdfdict_put:nnn {nnx,nno,nee}
 
 \cs_new_protected:Npn \__pdfdict_gput:nnn #1 #2 #3  %#1 global dict, #2 name, #3 value
   {
@@ -235,7 +235,7 @@
   }
 
 \cs_set_eq:NN \pdfdict_gput:nnn \__pdfdict_gput:nnn
-\cs_generate_variant:Nn \pdfdict_gput:nnn {nnx,nno}
+\cs_generate_variant:Nn \pdfdict_gput:nnn {nnx,nno,nee}
 \cs_new_protected:Npn \__pdfdict_get:nnN  #1 #2 #3 %dict,key,macro
   {
     \__pdfdict_if_exist:nTF { #1 }
diff --git a/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty b/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty
index ca07b9400..8ef186639 100644
--- a/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty
+++ b/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: pdfmanagement-testphase.dtx
-\ProvidesExplPackage{pdfmanagement-testphase}{2023-08-29}{0.95z}
+\ProvidesExplPackage{pdfmanagement-testphase}{2023-10-09}{0.96a}
   {LaTeX PDF management testphase bundle}
 \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
 \IfFormatAtLeastTF{2020-10-01}{}{
diff --git a/texmf/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty b/texmf/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
index c5a9a8dae..29074b3de 100644
--- a/texmf/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
+++ b/texmf/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
@@ -1,6 +1,6 @@
-%% LaTeX2e file `xcolor-patches.sty'
+%% LaTeX2e file `xcolor-patches-tmp-ltx.sty'
 %%
-\ProvidesPackage{xcolor-patches-tmp-ltx}[2023-08-29 v0.95z patch xcolor for l3color]
+\ProvidesPackage{xcolor-patches-tmp-ltx}[2023-10-09 v0.96a patch xcolor for l3color]
 \@ifundefined{color_set:nn}{\RequirePackage{l3color}}{}
 
 \ExplSyntaxOn

From ab6552b522170be234b8cf2f74bd0862aef568f2 Mon Sep 17 00:00:00 2001
From: Joseph Wright <joseph.wright@morningstar2.co.uk>
Date: Tue, 10 Oct 2023 12:45:32 +0100
Subject: [PATCH 4/6] Update l3kernel, l3backemd, xparse and xtemplate to
 2023-10-10

Here, xtemplate is new: we will likely need to revisit
that later.
---
 base/testfiles/github-0479-often.lvt          |    2 +-
 base/testfiles/github-0479-often.tlg          |    8 +-
 base/testfiles/github-0944.tlg                |    2 +-
 .../latex/l3backend/l3backend-dvipdfmx.def    |  127 +-
 texmf/tex/latex/l3backend/l3backend-dvips.def |  101 +-
 .../tex/latex/l3backend/l3backend-dvisvgm.def |   69 +-
 .../tex/latex/l3backend/l3backend-luatex.def  |  100 +-
 .../tex/latex/l3backend/l3backend-pdftex.def  |  100 +-
 texmf/tex/latex/l3backend/l3backend-xetex.def |  129 +-
 texmf/tex/latex/l3kernel/expl3-code.tex       | 2038 +++++++++--------
 texmf/tex/latex/l3kernel/expl3-generic.tex    |    4 +-
 texmf/tex/latex/l3kernel/expl3.ltx            |    6 +-
 texmf/tex/latex/l3kernel/expl3.sty            |    6 +-
 texmf/tex/latex/l3kernel/l3debug.def          |  101 +-
 texmf/tex/latex/l3kernel/l3doc.cls            |  174 +-
 texmf/tex/latex/l3packages/xparse/xparse.sty  |   14 +-
 .../latex/l3packages/xtemplate/xtemplate.sty  | 1373 +++++++++++
 17 files changed, 2952 insertions(+), 1402 deletions(-)
 create mode 100644 texmf/tex/latex/l3packages/xtemplate/xtemplate.sty

diff --git a/base/testfiles/github-0479-often.lvt b/base/testfiles/github-0479-often.lvt
index 04528aaf9..2d1104756 100644
--- a/base/testfiles/github-0479-often.lvt
+++ b/base/testfiles/github-0479-often.lvt
@@ -9,7 +9,7 @@
 \makeatletter\ExplSyntaxOn
 \show \__kernel_chk_if_free_cs:N
 \show \e@alloc
-\show \__kernel_msg_error:nnx
+\show \__kernel_msg_error:nne
 \show \msg_new:nnnn
 \show \NewDocumentCommand
 \show \newcommand
diff --git a/base/testfiles/github-0479-often.tlg b/base/testfiles/github-0479-often.tlg
index cf1678947..8417258f8 100644
--- a/base/testfiles/github-0479-often.tlg
+++ b/base/testfiles/github-0479-often.tlg
@@ -1302,14 +1302,14 @@ Now handling font encoding U ...
 Already applied: [....-..-..] UTF-8 default on input line ....
 )
 > \__kernel_chk_if_free_cs:N=\protected\long macro:
-#1->\cs_if_free:NF #1{\msg_error:nnxx {kernel}{command-already-defined}{\token_to_str:N #1}{\token_to_meaning:N #1}}.
+#1->\cs_if_free:NF #1{\msg_error:nnee {kernel}{command-already-defined}{\token_to_str:N #1}{\token_to_meaning:N #1}}.
 l. ...\show \__kernel_chk_if_free_cs:N
 > \e@alloc=macro:
 #1#2#3#4#5#6->\global \advance #3\@ne \e@ch@ck {#3}{#4}{#5}#1\allocationnumber #3\relax \global #2#6\allocationnumber \wlog {\string #6=\string #1\the \allocationnumber }.
 l. ...\show \e@alloc
-> \__kernel_msg_error:nnx=\protected\long macro:
-#1->\msg_error:nnx {LaTeX/#1}.
-l. ...\show \__kernel_msg_error:nnx
+> \__kernel_msg_error:nne=\protected\long macro:
+#1->\msg_error:nne {LaTeX/#1}.
+l. ...\show \__kernel_msg_error:nne
 > \msg_new:nnnn=\protected\long macro:
 #1#2->\__msg_chk_free:nn {#1}{#2}\msg_gset:nnnn {#1}{#2}.
 l. ...\show \msg_new:nnnn
diff --git a/base/testfiles/github-0944.tlg b/base/testfiles/github-0944.tlg
index 23fa80d93..1fe59c22f 100644
--- a/base/testfiles/github-0944.tlg
+++ b/base/testfiles/github-0944.tlg
@@ -22,7 +22,7 @@ LaTeX Warning: Reference `unknown' on page 1 undefined on input line ....
 ] (github-0944.aux)
  ***********
 -formatname- <-formatversion-> pre-release-2 (-release-version-test- branch)
-L3 programming layer <2023-08-29>
+L3 programming layer <2023-10-10>
  ***********
  *File List*
  -show the file list here-
diff --git a/texmf/tex/latex/l3backend/l3backend-dvipdfmx.def b/texmf/tex/latex/l3backend/l3backend-dvipdfmx.def
index 4f3eb45eb..62fb5d14c 100644
--- a/texmf/tex/latex/l3backend/l3backend-dvipdfmx.def
+++ b/texmf/tex/latex/l3backend/l3backend-dvipdfmx.def
@@ -26,7 +26,7 @@
 %% 
 %% File: l3backend-basics.dtx
 \ProvidesExplFile
-  {l3backend-dvipdfmx.def}{2023-04-19}{}
+  {l3backend-dvipdfmx.def}{2023-10-10}{}
   {L3 backend support: dvipdfmx}
 \cs_if_exist:NTF \__kernel_dependency_version_check:nn
   {
@@ -45,7 +45,6 @@
 \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D
 \cs_new_protected:Npn \__kernel_backend_literal:n #1
   { \__kernel_backend_literal:e { \exp_not:n {#1} } }
-\cs_generate_variant:Nn \__kernel_backend_literal:n { x }
 \cs_if_exist:NTF \@ifl@t@r
   {
     \@ifl@t@r \fmtversion { 2020-10-01 }
@@ -58,7 +57,7 @@
   { \cs_new_eq:NN \__kernel_backend_first_shipout:n \use:n }
 \cs_new_protected:Npn \__kernel_backend_literal_pdf:n #1
   { \__kernel_backend_literal:n { pdf:literal~ #1 } }
-\cs_generate_variant:Nn \__kernel_backend_literal_pdf:n { x }
+\cs_generate_variant:Nn \__kernel_backend_literal_pdf:n { e }
 \cs_new_protected:Npn \__kernel_backend_literal_page:n #1
   { \__kernel_backend_literal:n { pdf:literal~direct~ #1 } }
 \cs_new_protected:Npn \__kernel_backend_scope_begin:
@@ -82,7 +81,7 @@
 \msg_new:nnn { color } { unknown-named-color }
   { Named~color~'#1'~is~not~known. }
 \prop_new:N \g__color_backend_colorant_prop
-\cs_new:Npx \__color_backend_devicen_colorants:n #1
+\cs_new:Npe \__color_backend_devicen_colorants:n #1
   {
     \exp_not:N \tl_if_blank:nF {#1}
       {
@@ -108,7 +107,7 @@
     \__color_backend_devicen_colorants:w
   }
 \cs_new_protected:Npn \__color_backend_select_separation:nn #1#2
-  { \__kernel_backend_literal:x { pdf : bc ~ \pdf_object_ref:n {#1} ~ [ #2 ] } }
+  { \__kernel_backend_literal:e { pdf : bc ~ \pdf_object_ref:n {#1} ~ [ #2 ] } }
 \cs_new_eq:NN \__color_backend_select_devicen:nn \__color_backend_select_separation:nn
 \cs_new_eq:NN \__color_backend_select_iccbased:nn \__color_backend_select_separation:nn
 \cs_new_protected:Npn \__color_backend_init_resource:n #1
@@ -116,7 +115,7 @@
   }
 \cs_new_protected:Npn \__color_backend_separation_init:nnnnn #1#2#3#4#5
   {
-    \pdf_object_unnamed_write:nx { dict }
+    \pdf_object_unnamed_write:ne { dict }
       {
         /FunctionType ~ 2
         /Domain ~ [0 ~ 1]
@@ -124,19 +123,19 @@
         /C0 ~ [#4] ~
         /C1 ~ [#5] /N ~ 1
       }
-    \exp_args:Nx \__color_backend_separation_init:nn
+    \exp_args:Ne \__color_backend_separation_init:nn
       { \str_convert_pdfname:n {#1} } {#2}
     \__color_backend_init_resource:n { color \int_use:N \g__color_model_int }
   }
 \cs_new_protected:Npn \__color_backend_separation_init:nn #1#2
   {
-    \use:x
+    \use:e
       {
         \pdf_object_new:n { color \int_use:N \g__color_model_int }
         \pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array }
           { /Separation /#1 ~ #2 ~ \pdf_object_ref_last: }
       }
-    \prop_gput:Nnx \g__color_backend_colorant_prop { /#1 }
+    \prop_gput:Nne \g__color_backend_colorant_prop { /#1 }
       { \pdf_object_ref_last: }
   }
 \cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3
@@ -144,7 +143,7 @@
     \pdf_object_if_exist:nF { __color_illuminant_CIELAB_ #1 }
       {
         \pdf_object_new:n { __color_illuminant_CIELAB_ #1 }
-        \pdf_object_write:nnx { __color_illuminant_CIELAB_ #1 } { array }
+        \pdf_object_write:nne { __color_illuminant_CIELAB_ #1 } { array }
           {
             /Lab ~
             <<
@@ -163,7 +162,7 @@
   }
 \cs_new_protected:Npn \__color_backend_devicen_init:nnn #1#2#3
   {
-    \pdf_object_unnamed_write:nx { stream }
+    \pdf_object_unnamed_write:ne { stream }
       {
         {
           /FunctionType ~ 4 ~
@@ -185,7 +184,7 @@
         }
         { {#3} }
      }
-    \use:x
+    \use:e
       {
         \pdf_object_new:n { color \int_use:N \g__color_model_int }
         \pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array }
@@ -210,7 +209,7 @@
     \pdf_object_if_exist:nF { __color_icc_ #1 }
       {
         \pdf_object_new:n { __color_icc_ #1 }
-        \pdf_object_write:nnx { __color_icc_ #1 } { fstream }
+        \pdf_object_write:nne { __color_icc_ #1 } { fstream }
           {
             {
               /N ~ \exp_not:n { #2 } ~
@@ -219,7 +218,7 @@
             {#1}
           }
       }
-    \pdf_object_unnamed_write:nx { array }
+    \pdf_object_unnamed_write:ne { array }
       { /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } }
     \__color_backend_init_resource:n { color \int_use:N \g__color_model_int }
   }
@@ -234,7 +233,7 @@
             {#1}
           }
       }
-    \pdf_object_unnamed_write:nx { array }
+    \pdf_object_unnamed_write:ne { array }
       { /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } }
     \__color_backend_init_resource:n { Default #2 }
   }
@@ -250,12 +249,12 @@
 \cs_new_eq:NN \__color_backend_stroke_rgb:n  \__color_backend_stroke:n
 \cs_new_protected:Npn \__color_backend_fill_separation:nn #1#2
   {
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       { pdf : bc ~ fill ~ \pdf_object_ref:n {#1} ~ [ #2 ] }
   }
 \cs_new_protected:Npn \__color_backend_stroke_separation:nn #1#2
   {
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       { pdf : bc ~ stroke ~ \pdf_object_ref:n {#1} ~ [ #2 ] }
   }
 \cs_new_eq:NN \__color_backend_fill_devicen:nn \__color_backend_fill_separation:nn
@@ -266,7 +265,7 @@
 \cs_new_protected:Npn \__box_backend_clip:N #1
   {
     \__kernel_backend_scope_begin:
-    \__kernel_backend_literal_pdf:x
+    \__kernel_backend_literal_pdf:e
       {
         0~
         \dim_to_decimal_in_bp:n { -\box_dp:N #1 } ~
@@ -283,7 +282,7 @@
 \cs_new_protected:Npn \__box_backend_rotate_aux:Nn #1#2
   {
     \__kernel_backend_scope_begin:
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         x:rotate~
         \fp_compare:nNnTF {#2} = \c_zero_fp
@@ -296,7 +295,7 @@
 \cs_new_protected:Npn \__box_backend_scale:Nnn #1#2#3
   {
     \__kernel_backend_scope_begin:
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         x:scale~
         \fp_eval:n { round ( #2 , 5 ) } ~
@@ -307,7 +306,7 @@
   }
 %% File: l3backend-draw.dtx
 \cs_new_eq:NN \__draw_backend_literal:n \__kernel_backend_literal_pdf:n
-\cs_generate_variant:Nn \__draw_backend_literal:n { x }
+\cs_generate_variant:Nn \__draw_backend_literal:n { e }
 \cs_new_protected:Npn \__draw_backend_begin:
   { \__draw_backend_scope_begin: }
 \cs_new_protected:Npn \__draw_backend_end:
@@ -316,17 +315,17 @@
 \cs_new_eq:NN \__draw_backend_scope_end: \__kernel_backend_scope_end:
 \cs_new_protected:Npn \__draw_backend_moveto:nn #1#2
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ m }
   }
 \cs_new_protected:Npn \__draw_backend_lineto:nn #1#2
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ l }
   }
 \cs_new_protected:Npn \__draw_backend_curveto:nnnnnn #1#2#3#4#5#6
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       {
         \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~
         \dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~
@@ -336,7 +335,7 @@
  }
 \cs_new_protected:Npn \__draw_backend_rectangle:nnnn #1#2#3#4
   {
-     \__draw_backend_literal:x
+     \__draw_backend_literal:e
       {
         \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~
         \dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~
@@ -356,24 +355,24 @@
   { \__draw_backend_literal:n { s } }
 \cs_new_protected:Npn \__draw_backend_fill:
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { f \bool_if:NT \g__draw_draw_eor_bool * }
   }
 \cs_new_protected:Npn \__draw_backend_fillstroke:
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { B \bool_if:NT \g__draw_draw_eor_bool * }
   }
 \cs_new_protected:Npn \__draw_backend_clip:
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { W \bool_if:NT \g__draw_draw_eor_bool * }
   }
 \cs_new_protected:Npn \__draw_backend_discardpath:
   { \__draw_backend_literal:n { n } }
 \cs_new_protected:Npn \__draw_backend_dash_pattern:nn #1#2
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       {
         [
           \exp_args:Nf \use:n
@@ -386,11 +385,11 @@
   { ~ \dim_to_decimal_in_bp:n {#1} }
 \cs_new_protected:Npn \__draw_backend_linewidth:n #1
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { \dim_to_decimal_in_bp:n {#1} ~ w }
   }
 \cs_new_protected:Npn \__draw_backend_miterlimit:n #1
-  { \__draw_backend_literal:x { #1 ~ M } }
+  { \__draw_backend_literal:e { #1 ~ M } }
 \cs_new_protected:Npn \__draw_backend_cap_butt:
   { \__draw_backend_literal:n { 0 ~ J } }
 \cs_new_protected:Npn \__draw_backend_cap_round:
@@ -410,20 +409,20 @@
   }
 \cs_new_protected:Npn \__draw_backend_cm_aux:nnnn #1#2#3#4
   {
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         x:rotate~
         \fp_compare:nNnTF {#1} = \c_zero_fp
           { 0 }
           { \fp_eval:n { round ( -#1 , 5 ) } }
       }
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         x:scale~
         \fp_eval:n { round ( #2 , 5 ) } ~
         \fp_eval:n { round ( #3 , 5 ) }
       }
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         x:rotate~
         \fp_compare:nNnTF {#4} = \c_zero_fp
@@ -433,7 +432,7 @@
   }
 \cs_new_protected:Npn \__draw_backend_cm_decompose:nnnnN #1#2#3#4#5
   {
-    \use:x
+    \use:e
       {
         \__draw_backend_cm_decompose_auxi:nnnnN
           { \fp_eval:n { (#1 + #4) / 2 } }
@@ -445,7 +444,7 @@
   }
 \cs_new_protected:Npn \__draw_backend_cm_decompose_auxi:nnnnN #1#2#3#4#5
   {
-    \use:x
+    \use:e
       {
         \__draw_backend_cm_decompose_auxii:nnnnN
           { \fp_eval:n { 2 * sqrt ( #1 * #1 + #4 * #4 ) } }
@@ -457,7 +456,7 @@
   }
 \cs_new_protected:Npn \__draw_backend_cm_decompose_auxii:nnnnN #1#2#3#4#5
   {
-    \use:x
+    \use:e
       {
         \__draw_backend_cm_decompose_auxiii:nnnnN
           { \fp_eval:n { ( #4 - #3 ) / 2 } }
@@ -522,7 +521,7 @@
 \int_new:N \g__graphics_track_int
 \cs_new_protected:Npn \__graphics_backend_include_eps:n #1
   {
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         PSfile = #1 \c_space_tl
         llx = \dim_to_decimal_in_bp:n \l__graphics_llx_dim \c_space_tl
@@ -541,7 +540,7 @@
   { \__graphics_backend_include_auxi:nn {#1} { epdf } }
 \cs_new_protected:Npn \__graphics_backend_include_auxi:nn #1#2
   {
-    \__graphics_backend_include_auxii:xnn
+    \__graphics_backend_include_auxii:enn
       {
         \tl_if_empty:NF \l__graphics_pagebox_tl
           { : \l__graphics_pagebox_tl }
@@ -558,17 +557,17 @@
   {
     \int_if_exist:cTF { c__graphics_ #2#1 _int }
       {
-        \__kernel_backend_literal:x
+        \__kernel_backend_literal:e
           { pdf:usexobj~@graphic \int_use:c { c__graphics_ #2#1 _int } }
       }
       { \__graphics_backend_include_auxiii:nnn {#2} {#1} {#3} }
   }
-\cs_generate_variant:Nn \__graphics_backend_include_auxii:nnn { x }
+\cs_generate_variant:Nn \__graphics_backend_include_auxii:nnn { e }
 \cs_new_protected:Npn \__graphics_backend_include_auxiii:nnn #1#2#3
   {
     \int_gincr:N \g__graphics_track_int
     \int_const:cn { c__graphics_ #1#2 _int } { \g__graphics_track_int }
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         pdf:#3~
         @graphic \int_use:c { c__graphics_ #1#2 _int } ~
@@ -601,9 +600,9 @@
   { \cs_new_eq:NN \__graphics_backend_get_pagecount:n \__graphics_get_pagecount:n }
 %% File: l3backend-pdf.dtx
 \box_new:N \l__pdf_internal_box
-\cs_new_protected:Npx \__pdf_backend:n #1
+\cs_new_protected:Npe \__pdf_backend:n #1
   { \__kernel_backend_literal:n { pdf: #1 } }
-\cs_generate_variant:Nn \__pdf_backend:n { x }
+\cs_generate_variant:Nn \__pdf_backend:n { e }
 \cs_new_protected:Npn \__pdf_backend_catalog_gput:nn #1#2
   { \__pdf_backend:n { put ~ @catalog << /#1 ~ #2 >> } }
 \cs_new_protected:Npn \__pdf_backend_info_gput:nn #1#2
@@ -624,15 +623,15 @@
     \use:c { __pdf_backend_object_write_ #2 :nn }
       { \__pdf_backend_object_ref:n {#1} } {#3}
   }
-\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nnx }
+\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nne }
 \cs_new_protected:Npn \__pdf_backend_object_write_array:nn #1#2
   {
-    \__pdf_backend:x
+    \__pdf_backend:e
       { obj ~ #1 ~ [ ~ \exp_not:n {#2} ~ ] }
   }
 \cs_new_protected:Npn \__pdf_backend_object_write_dict:nn #1#2
   {
-    \__pdf_backend:x
+    \__pdf_backend:e
       { obj ~ #1 ~ << ~ \exp_not:n {#2} ~ >> }
   }
 \cs_new_protected:Npn \__pdf_backend_object_write_fstream:nn #1#2
@@ -641,7 +640,7 @@
   { \__pdf_backend_object_write_stream:nnnn { } {#1} #2 }
 \cs_new_protected:Npn \__pdf_backend_object_write_stream:nnnn #1#2#3#4
   {
-    \__pdf_backend:x
+    \__pdf_backend:e
       {
         #1 stream ~ #2 ~
           ( \exp_not:n {#4} ) ~ << \exp_not:n {#3} >>
@@ -650,11 +649,11 @@
 \cs_new_protected:Npn \__pdf_backend_object_now:nn #1#2
   {
     \int_gincr:N \g__pdf_backend_object_int
-    \exp_args:Nnx \use:c { __pdf_backend_object_write_ #1 :nn }
+    \exp_args:Nne \use:c { __pdf_backend_object_write_ #1 :nn }
       { @pdf.obj \int_use:N \g__pdf_backend_object_int }
       {#2}
   }
-\cs_generate_variant:Nn \__pdf_backend_object_now:nn { nx }
+\cs_generate_variant:Nn \__pdf_backend_object_now:nn { ne }
 \cs_new:Npn \__pdf_backend_object_last:
  { @pdf.obj \int_use:N \g__pdf_backend_object_int }
 \cs_new:Npn \__pdf_backend_pageobject_ref:n #1
@@ -664,7 +663,7 @@
   {
     \int_gincr:N \g__pdf_backend_object_int
     \int_gset_eq:NN \g__pdf_backend_annotation_int \g__pdf_backend_object_int
-    \__pdf_backend:x
+    \__pdf_backend:e
       {
         ann ~ @pdf.obj \int_use:N \g__pdf_backend_object_int \c_space_tl
         width  ~ \dim_eval:n {#1} ~
@@ -680,10 +679,10 @@
   { \__pdf_backend_link_begin:n { #1 /Subtype /Link /A << /S /GoTo /D ( #2 ) >> } }
 \cs_new_protected:Npn \__pdf_backend_link_begin_user:nnw #1#2
   { \__pdf_backend_link_begin:n {#1#2} }
-\cs_new_protected:Npx \__pdf_backend_link_begin:n #1
+\cs_new_protected:Npe \__pdf_backend_link_begin:n #1
   {
     \exp_not:N \int_gincr:N \exp_not:N  \g__pdf_backend_link_int
-    \__pdf_backend:x
+    \__pdf_backend:e
       {
          bann ~
          @pdf.lnk
@@ -700,10 +699,10 @@
 \cs_new:Npn \__pdf_backend_link_last:
   { @pdf.lnk \int_use:N \g__pdf_backend_link_int }
 \cs_new_protected:Npn \__pdf_backend_link_margin:n #1
-  { \__kernel_backend_literal:x { dvipdfmx:config~g~ \dim_eval:n {#1} } }
+  { \__kernel_backend_literal:e { dvipdfmx:config~g~ \dim_eval:n {#1} } }
 \cs_new_protected:Npn \__pdf_backend_destination:nn #1#2
   {
-    \__pdf_backend:x
+    \__pdf_backend:e
       {
         dest ~ ( \exp_not:n {#1} )
         [
@@ -762,7 +761,7 @@
     \__kernel_kern:n { -#1 }
   }
 \cs_new_protected:Npn \__pdf_backend_compresslevel:n #1
-  { \__kernel_backend_literal:x { dvipdfmx:config~z~ \int_eval:n {#1} } }
+  { \__kernel_backend_literal:e { dvipdfmx:config~z~ \int_eval:n {#1} } }
 \cs_new_protected:Npn \__pdf_backend_compress_objects:n #1
   {
     \bool_if:nF {#1}
@@ -770,13 +769,13 @@
   }
 \cs_new_protected:Npn \__pdf_backend_version_major_gset:n #1
   {
-    \cs_gset:Npx \__pdf_backend_version_major: { \int_eval:n {#1} }
-    \__kernel_backend_literal:x { pdf:majorversion~ \__pdf_backend_version_major: }
+    \cs_gset:Npe \__pdf_backend_version_major: { \int_eval:n {#1} }
+    \__kernel_backend_literal:e { pdf:majorversion~ \__pdf_backend_version_major: }
   }
 \cs_new_protected:Npn \__pdf_backend_version_minor_gset:n #1
   {
-    \cs_gset:Npx \__pdf_backend_version_minor: { \int_eval:n {#1} }
-    \__kernel_backend_literal:x { pdf:minorversion~ \__pdf_backend_version_minor: }
+    \cs_gset:Npe \__pdf_backend_version_minor: { \int_eval:n {#1} }
+    \__kernel_backend_literal:e { pdf:minorversion~ \__pdf_backend_version_minor: }
   }
 \cs_new:Npn \__pdf_backend_version_major: { 1 }
 \cs_new:Npn \__pdf_backend_version_minor: { 5 }
@@ -808,7 +807,7 @@
 \tl_new:N \l__opacity_backend_stroke_tl
 \cs_new_protected:Npn \__opacity_backend_select:n #1
  {
-   \exp_args:Nx \__opacity_backend_select_aux:n
+   \exp_args:Ne \__opacity_backend_select_aux:n
      { \fp_eval:n { min(max(0,#1),1) } }
  }
 \cs_new_protected:Npn \__opacity_backend_select_aux:n #1
@@ -835,13 +834,13 @@
  }
 \cs_new_protected:Npn \__opacity_backend_fill:n #1
   {
-    \__opacity_backend_fill_stroke:xx
+    \__opacity_backend_fill_stroke:ee
       { \fp_eval:n { min(max(0,#1),1) } }
       \l__opacity_backend_stroke_tl
   }
 \cs_new_protected:Npn \__opacity_backend_stroke:n #1
   {
-    \__opacity_backend_fill_stroke:xx
+    \__opacity_backend_fill_stroke:ee
       \l__opacity_backend_fill_tl
       { \fp_eval:n { min(max(0,#1),1) } }
   }
@@ -863,7 +862,7 @@
         \group_insert_after:N \__opacity_backend_reset:
       }
   }
-\cs_generate_variant:Nn \__opacity_backend_fill_stroke:nn { xx }
+\cs_generate_variant:Nn \__opacity_backend_fill_stroke:nn { ee }
 %% 
 %%
 %% End of file `l3backend-dvipdfmx.def'.
diff --git a/texmf/tex/latex/l3backend/l3backend-dvips.def b/texmf/tex/latex/l3backend/l3backend-dvips.def
index 62287189d..ede182141 100644
--- a/texmf/tex/latex/l3backend/l3backend-dvips.def
+++ b/texmf/tex/latex/l3backend/l3backend-dvips.def
@@ -26,7 +26,7 @@
 %% 
 %% File: l3backend-basics.dtx
 \ProvidesExplFile
-  {l3backend-dvips.def}{2023-04-19}{}
+  {l3backend-dvips.def}{2023-10-10}{}
   {L3 backend support: dvips}
 \cs_if_exist:NTF \__kernel_dependency_version_check:nn
   {
@@ -45,7 +45,6 @@
 \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D
 \cs_new_protected:Npn \__kernel_backend_literal:n #1
   { \__kernel_backend_literal:e { \exp_not:n {#1} } }
-\cs_generate_variant:Nn \__kernel_backend_literal:n { x }
 \cs_if_exist:NTF \@ifl@t@r
   {
     \@ifl@t@r \fmtversion { 2020-10-01 }
@@ -58,10 +57,10 @@
   { \cs_new_eq:NN \__kernel_backend_first_shipout:n \use:n }
 \cs_new_protected:Npn \__kernel_backend_literal_postscript:n #1
   { \__kernel_backend_literal:n { ps:: #1 } }
-\cs_generate_variant:Nn \__kernel_backend_literal_postscript:n { x }
+\cs_generate_variant:Nn \__kernel_backend_literal_postscript:n { e }
 \cs_new_protected:Npn \__kernel_backend_postscript:n #1
   { \__kernel_backend_literal:n { ps: SDict ~ begin ~ #1 ~ end } }
-\cs_generate_variant:Nn \__kernel_backend_postscript:n { x }
+\cs_generate_variant:Nn \__kernel_backend_postscript:n { e }
 \bool_if:NT \g__kernel_backend_header_bool
   {
     \__kernel_backend_first_shipout:n
@@ -99,7 +98,7 @@
 \cs_new_protected:Npn \__color_backend_reset:
   { \__kernel_backend_literal:n { color~pop } }
 \prop_new:N \g__color_backend_colorant_prop
-\cs_new:Npx \__color_backend_devicen_colorants:n #1
+\cs_new:Npe \__color_backend_devicen_colorants:n #1
   {
     \exp_not:N \tl_if_blank:nF {#1}
       {
@@ -128,17 +127,17 @@
   { \__color_backend_select:n { separation ~ #1 ~ #2 } }
 \cs_new_eq:NN \__color_backend_select_devicen:nn \__color_backend_select_separation:nn
 \cs_new_protected:Npn \__color_backend_select_iccbased:nn #1#2 { }
-\cs_new_protected:Npx \__color_backend_separation_init:nnnnn #1#2#3#4#5
+\cs_new_protected:Npe \__color_backend_separation_init:nnnnn #1#2#3#4#5
   {
     \bool_if:NT \g__kernel_backend_header_bool
       {
-        \exp_args:Nx \__kernel_backend_first_shipout:n
+        \exp_not:N \exp_args:Ne \__kernel_backend_first_shipout:n
           {
             \exp_not:N \__color_backend_separation_init_aux:nnnnnn
               { \exp_not:N \int_use:N \g__color_model_int }
               {#1} {#2} {#3} {#4} {#5}
           }
-        \prop_gput:Nxx \exp_not:N \g__color_backend_colorant_prop
+        \prop_gput:Nee \exp_not:N \g__color_backend_colorant_prop
           { / \exp_not:N \str_convert_pdfname:n {#1} }
           {
             << ~
@@ -149,7 +148,7 @@
           }
       }
   }
-\cs_generate_variant:Nn \__color_backend_separation_init:nnnnn { nxx }
+\cs_generate_variant:Nn \__color_backend_separation_init:nnnnn { nee }
 \cs_new_protected:Npn \__color_backend_separation_init_aux:nnnnnn #1#2#3#4#5#6
   {
     \__kernel_backend_literal:e
@@ -242,7 +241,7 @@
   }
 \cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3
   {
-    \__color_backend_separation_init:nxxnn
+    \__color_backend_separation_init:neenn
       {#2}
       {
         /CIEBasedABC ~
@@ -339,7 +338,7 @@
     \__kernel_backend_literal_postscript:n
       { Resolution~72~div~VResolution~72~div~scale }
     \__kernel_backend_literal_postscript:n { DVImag~dup~scale }
-    \__kernel_backend_literal_postscript:x
+    \__kernel_backend_literal_postscript:e
       {
         0 ~
         \dim_to_decimal_in_bp:n { \box_dp:N #1 } ~
@@ -359,7 +358,7 @@
   {
     \__kernel_backend_scope_begin:
     \__kernel_backend_align_begin:
-    \__kernel_backend_literal_postscript:x
+    \__kernel_backend_literal_postscript:e
       {
         \fp_compare:nNnTF {#2} = \c_zero_fp
           { 0 }
@@ -374,7 +373,7 @@
   {
     \__kernel_backend_scope_begin:
     \__kernel_backend_align_begin:
-    \__kernel_backend_literal_postscript:x
+    \__kernel_backend_literal_postscript:e
       {
         \fp_eval:n { round ( #2 , 5 ) } ~
         \fp_eval:n { round ( #3 , 5 ) } ~
@@ -386,7 +385,7 @@
   }
 %% File: l3backend-draw.dtx
 \cs_new_eq:NN \__draw_backend_literal:n \__kernel_backend_literal_postscript:n
-\cs_generate_variant:Nn \__draw_backend_literal:n { x }
+\cs_generate_variant:Nn \__draw_backend_literal:n { e }
 \cs_new_protected:Npn \__draw_backend_begin:
   {
     \__kernel_backend_literal:n { ps::[begin] }
@@ -403,7 +402,7 @@
   { \__draw_backend_literal:n { restore } }
 \cs_new_protected:Npn \__draw_backend_moveto:nn #1#2
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       {
         \dim_to_decimal_in_bp:n {#1} ~
         \dim_to_decimal_in_bp:n {#2} ~ moveto
@@ -411,7 +410,7 @@
   }
 \cs_new_protected:Npn \__draw_backend_lineto:nn #1#2
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       {
         \dim_to_decimal_in_bp:n {#1} ~
         \dim_to_decimal_in_bp:n {#2} ~ lineto
@@ -419,7 +418,7 @@
   }
 \cs_new_protected:Npn \__draw_backend_rectangle:nnnn #1#2#3#4
   {
-     \__draw_backend_literal:x
+     \__draw_backend_literal:e
        {
          \dim_to_decimal_in_bp:n {#4} ~ \dim_to_decimal_in_bp:n {#3} ~
          \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~
@@ -428,7 +427,7 @@
   }
 \cs_new_protected:Npn \__draw_backend_curveto:nnnnnn #1#2#3#4#5#6
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       {
         \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~
         \dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~
@@ -451,7 +450,7 @@
     \__draw_backend_literal:n { grestore }
     \bool_if:NT \g__draw_draw_clip_bool
       {
-        \__draw_backend_literal:x
+        \__draw_backend_literal:e
           {
             \bool_if:NT \g__draw_draw_eor_bool { eo }
             clip
@@ -467,14 +466,14 @@
   }
 \cs_new_protected:Npn \__draw_backend_fill:
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       {
         \bool_if:NT \g__draw_draw_eor_bool { eo }
         fill
       }
     \bool_if:NT \g__draw_draw_clip_bool
       {
-        \__draw_backend_literal:x
+        \__draw_backend_literal:e
           {
             \bool_if:NT \g__draw_draw_eor_bool { eo }
             clip
@@ -485,7 +484,7 @@
   }
 \cs_new_protected:Npn \__draw_backend_fillstroke:
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       {
         \bool_if:NT \g__draw_draw_eor_bool { eo }
         fill
@@ -496,7 +495,7 @@
     \__draw_backend_literal:n { grestore }
     \bool_if:NT \g__draw_draw_clip_bool
       {
-        \__draw_backend_literal:x
+        \__draw_backend_literal:e
           {
             \bool_if:NT \g__draw_draw_eor_bool { eo }
             clip
@@ -512,7 +511,7 @@
   {
     \bool_if:NT \g__draw_draw_clip_bool
       {
-        \__draw_backend_literal:x
+        \__draw_backend_literal:e
           {
             \bool_if:NT \g__draw_draw_eor_bool { eo }
             clip
@@ -523,7 +522,7 @@
   }
 \cs_new_protected:Npn \__draw_backend_dash_pattern:nn #1#2
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       {
         [
           \exp_args:Nf \use:n
@@ -536,7 +535,7 @@
   { ~ \dim_to_decimal_in_bp:n {#1} }
 \cs_new_protected:Npn \__draw_backend_linewidth:n #1
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { \dim_to_decimal_in_bp:n {#1} ~ setlinewidth }
   }
 \cs_new_protected:Npn \__draw_backend_miterlimit:n #1
@@ -599,7 +598,7 @@
   }
 \cs_new_protected:Npn \__graphics_backend_include_eps:n #1
   {
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         PSfile = #1 \c_space_tl
         llx = \dim_to_decimal_in_bp:n \l__graphics_llx_dim \c_space_tl
@@ -615,7 +614,7 @@
 \box_new:N \l__pdf_internal_box
 \cs_new_protected:Npn \__pdf_backend_pdfmark:n #1
   { \__kernel_backend_postscript:n { mark #1 ~ pdfmark } }
-\cs_generate_variant:Nn \__pdf_backend_pdfmark:n { x }
+\cs_generate_variant:Nn \__pdf_backend_pdfmark:n { e }
 \cs_new_protected:Npn \__pdf_backend_catalog_gput:nn #1#2
   { \__pdf_backend_pdfmark:n { { Catalog } << /#1 ~ #2 >> /PUT } }
 \cs_new_protected:Npn \__pdf_backend_info_gput:nn #1#2
@@ -636,10 +635,10 @@
       { \__pdf_backend_object_ref:n {#1} }
       {#2} {#3}
   }
-\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nnx }
+\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nne }
 \cs_new_protected:Npn \__pdf_backend_object_write_aux:nnn #1#2#3
   {
-    \__pdf_backend_pdfmark:x
+    \__pdf_backend_pdfmark:e
       {
         /_objdef ~ #1
         /type
@@ -656,17 +655,17 @@
   }
 \cs_new_protected:Npn \__pdf_backend_object_write_array:nn #1#2
   {
-    \__pdf_backend_pdfmark:x
+    \__pdf_backend_pdfmark:e
       { #1 ~0~ [ ~ \exp_not:n {#2} ~ ] ~ /PUTINTERVAL }
   }
 \cs_new_protected:Npn \__pdf_backend_object_write_dict:nn #1#2
   {
-    \__pdf_backend_pdfmark:x
+    \__pdf_backend_pdfmark:e
       { #1 << \exp_not:n {#2} >> /PUT }
   }
 \cs_new_protected:Npn \__pdf_backend_object_write_fstream:nn #1#2
   {
-    \exp_args:Nx
+    \exp_args:Ne
       \__pdf_backend_object_write_fstream:nnn {#1} #2
   }
 \cs_new_protected:Npn \__pdf_backend_object_write_fstream:nnn #1#2#3
@@ -681,7 +680,7 @@
   }
 \cs_new_protected:Npn \__pdf_backend_object_write_stream:nn #1#2
   {
-    \exp_args:Nx
+    \exp_args:Ne
       \__pdf_backend_object_write_stream:nnn {#1} #2
   }
 \cs_new_protected:Npn \__pdf_backend_object_write_stream:nnn #1#2#3
@@ -699,7 +698,7 @@
       { { pdf.obj \int_use:N \g__pdf_backend_object_int } }
       {#1} {#2}
   }
-\cs_generate_variant:Nn \__pdf_backend_object_now:nn { nx }
+\cs_generate_variant:Nn \__pdf_backend_object_now:nn { ne }
 \cs_new:Npn \__pdf_backend_object_last:
   { { pdf.obj \int_use:N \g__pdf_backend_object_int } }
 \cs_new:Npn \__pdf_backend_pageobject_ref:n #1
@@ -727,7 +726,7 @@
       }
     \int_gincr:N \g__pdf_backend_object_int
     \int_gset_eq:NN \g__pdf_backend_annotation_int \g__pdf_backend_object_int
-    \__pdf_backend_pdfmark:x
+    \__pdf_backend_pdfmark:e
       {
         /_objdef { pdf.obj \int_use:N \g__pdf_backend_object_int }
         pdf.rect
@@ -786,7 +785,7 @@
     \hbox_set_end:
     \__pdf_backend_link_minima:
     \hbox_set:Nn \l__pdf_backend_model_box { Gg }
-    \exp_args:Nx \__pdf_backend_link_outerbox:n
+    \exp_args:Ne \__pdf_backend_link_outerbox:n
       {
          \int_if_odd:nTF { \value { page } }
            { \oddsidemargin }
@@ -804,7 +803,7 @@
       }
     \int_gincr:N \g__pdf_backend_object_int
     \int_gset_eq:NN \g__pdf_backend_link_int \g__pdf_backend_object_int
-    \__kernel_backend_postscript:x
+    \__kernel_backend_postscript:e
       {
         mark
         /_objdef { pdf.obj \int_use:N \g__pdf_backend_link_int }
@@ -818,7 +817,7 @@
 \cs_new_protected:Npn \__pdf_backend_link_minima:
   {
     \hbox_set:Nn \l__pdf_backend_model_box { Gg }
-    \__kernel_backend_postscript:x
+    \__kernel_backend_postscript:e
       {
         /pdf.linkdp.pad ~
           \dim_to_decimal:n
@@ -846,7 +845,7 @@
   }
 \cs_new_protected:Npn \__pdf_backend_link_outerbox:n #1
   {
-    \__kernel_backend_postscript:x
+    \__kernel_backend_postscript:e
       {
         /pdf.outerbox
           [
@@ -886,9 +885,9 @@
       {
         \tl_put_right:Nn \@makecol@hook
           {
-            \box_if_empty:NF \@cclv
+            \box_if_empty:NF \l_shipout_box
               {
-                \vbox_set:Nn \@cclv
+                \vbox_set:Nn \l_shipout_box
                   {
                     \__kernel_backend_postscript:n
                       {
@@ -896,7 +895,7 @@
                           { pdf.bordertracking.continue }
                         if
                       }
-                    \vbox_unpack_drop:N \@cclv
+                    \vbox_unpack_drop:N \l_shipout_box
                     \__kernel_backend_postscript:n
                       { pdf.bordertracking.endpage }
                   }
@@ -911,7 +910,7 @@
   { { pdf.obj \int_use:N \g__pdf_backend_link_int } }
 \cs_new_protected:Npn \__pdf_backend_link_margin:n #1
   {
-    \__kernel_backend_postscript:x
+    \__kernel_backend_postscript:e
       {
         /pdf.linkmargin { \dim_to_decimal:n {#1} ~ pdf.pt.dvi } def
       }
@@ -919,7 +918,7 @@
 \cs_new_protected:Npn \__pdf_backend_destination:nn #1#2
   {
     \__kernel_backend_postscript:n { pdf.dest.anchor }
-    \__pdf_backend_pdfmark:x
+    \__pdf_backend_pdfmark:e
       {
         /View
         [
@@ -1001,11 +1000,11 @@
   }
 \cs_new_protected:Npn \__pdf_backend_version_major_gset:n #1
   {
-    \cs_gset:Npx \__pdf_backend_version_major: { \int_eval:n {#1} }
+    \cs_gset:Npe \__pdf_backend_version_major: { \int_eval:n {#1} }
   }
 \cs_new_protected:Npn \__pdf_backend_version_minor_gset:n #1
   {
-    \cs_gset:Npx \__pdf_backend_version_minor: { \int_eval:n {#1} }
+    \cs_gset:Npe \__pdf_backend_version_minor: { \int_eval:n {#1} }
   }
 \cs_new:Npn \__pdf_backend_version_major: { -1 }
 \cs_new:Npn \__pdf_backend_version_minor: { -1 }
@@ -1026,7 +1025,7 @@
 %% File: l3backend-opacity.dtx
 \cs_new_protected:Npn \__opacity_backend_select:n #1
   {
-    \exp_args:Nx \__opacity_backend_select_aux:n
+    \exp_args:Ne \__opacity_backend_select_aux:n
       { \fp_eval:n { min(max(0,#1),1) } }
   }
 \cs_new_protected:Npn \__opacity_backend_select_aux:n #1
@@ -1036,14 +1035,14 @@
   }
 \cs_new_protected:Npn \__opacity_backend_fill:n #1
   {
-    \__opacity_backend:xnn
+    \__opacity_backend:enn
       { \fp_eval:n { min(max(0,#1),1) } }
       { fill }
       { ca }
   }
 \cs_new_protected:Npn \__opacity_backend_stroke:n #1
   {
-    \__opacity_backend:xnn
+    \__opacity_backend:enn
       { \fp_eval:n { min(max(0,#1),1) } }
       { stroke }
       { CA }
@@ -1067,7 +1066,7 @@
         ifelse
       }
   }
-\cs_generate_variant:Nn \__opacity_backend:nnn { x }
+\cs_generate_variant:Nn \__opacity_backend:nnn { e }
 %% 
 %%
 %% End of file `l3backend-dvips.def'.
diff --git a/texmf/tex/latex/l3backend/l3backend-dvisvgm.def b/texmf/tex/latex/l3backend/l3backend-dvisvgm.def
index def201f4e..3f087c526 100644
--- a/texmf/tex/latex/l3backend/l3backend-dvisvgm.def
+++ b/texmf/tex/latex/l3backend/l3backend-dvisvgm.def
@@ -26,7 +26,7 @@
 %% 
 %% File: l3backend-basics.dtx
 \ProvidesExplFile
-  {l3backend-dvisvgm.def}{2023-04-19}{}
+  {l3backend-dvisvgm.def}{2023-10-10}{}
   {L3 backend support: dvisvgm}
 \cs_if_exist:NTF \__kernel_dependency_version_check:nn
   {
@@ -45,7 +45,6 @@
 \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D
 \cs_new_protected:Npn \__kernel_backend_literal:n #1
   { \__kernel_backend_literal:e { \exp_not:n {#1} } }
-\cs_generate_variant:Nn \__kernel_backend_literal:n { x }
 \cs_if_exist:NTF \@ifl@t@r
   {
     \@ifl@t@r \fmtversion { 2020-10-01 }
@@ -58,7 +57,7 @@
   { \cs_new_eq:NN \__kernel_backend_first_shipout:n \use:n }
 \cs_new_protected:Npn \__kernel_backend_literal_svg:n #1
   { \__kernel_backend_literal:n { dvisvgm:raw~ #1 { ?nl } } }
-\cs_generate_variant:Nn \__kernel_backend_literal_svg:n { x }
+\cs_generate_variant:Nn \__kernel_backend_literal_svg:n { e }
 \int_new:N \g__kernel_backend_scope_int
 \int_new:N \l__kernel_backend_scope_int
 \cs_new_protected:Npn \__kernel_backend_scope_begin:
@@ -89,13 +88,13 @@
     \group_begin:
       \int_gset:Nn \g__kernel_backend_scope_int { 1 }
   }
-\cs_generate_variant:Nn \__kernel_backend_scope_begin:n { x }
+\cs_generate_variant:Nn \__kernel_backend_scope_begin:n { e }
 \cs_new_protected:Npn \__kernel_backend_scope:n #1
   {
     \__kernel_backend_literal_svg:n { <g ~ #1 > }
     \int_gincr:N \g__kernel_backend_scope_int
   }
-\cs_generate_variant:Nn \__kernel_backend_scope:n { x }
+\cs_generate_variant:Nn \__kernel_backend_scope:n { e }
 %% File: l3backend-color.dtx
 \cs_new_protected:Npn \__color_backend_select_cmyk:n #1
   { \__color_backend_select:n { cmyk ~ #1 } }
@@ -117,7 +116,7 @@
 \cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnnnnn #1#2#3 { }
 \cs_new_protected:Npn \__color_backend_select_iccbased:nn #1#2
   {
-    \__kernel_backend_literal_svg:x
+    \__kernel_backend_literal_svg:e
       {
         <style>
           @color-profile ~
@@ -146,7 +145,7 @@
 \cs_new_protected:Npn \__color_backend_stroke_cmyk:w
   #1 ~ #2 ~ #3 ~ #4 \s__color_stop
   {
-    \use:x
+    \use:e
       {
         \__color_backend:nnn
           { \fp_eval:n { -100 * ( 1 - min ( 1 , #1 + #4 ) ) } }
@@ -156,7 +155,7 @@
   }
 \cs_new_protected:Npn \__color_backend_stroke_gray:n #1
   {
-    \use:x
+    \use:e
       {
         \__color_backend_stroke_gray_aux:n
           { \fp_eval:n { 100 * (#1) } }
@@ -169,7 +168,7 @@
 \cs_new_protected:Npn \__color_backend_stroke_rgb:w
   #1 ~ #2 ~ #3 \s__color_stop
   {
-    \use:x
+    \use:e
       {
         \__color_backend:nnn
           { \fp_eval:n { 100 * (#1) } }
@@ -177,7 +176,7 @@
           { \fp_eval:n { 100 * (#3) } }
       }
   }
-\cs_new_protected:Npx \__color_backend:nnn #1#2#3
+\cs_new_protected:Npe \__color_backend:nnn #1#2#3
   {
     \__kernel_backend_scope:n
       {
@@ -204,9 +203,9 @@
 \cs_new_protected:Npn \__box_backend_clip:N #1
   {
     \int_gincr:N \g__kernel_clip_path_int
-    \__kernel_backend_literal_svg:x
+    \__kernel_backend_literal_svg:e
       { < clipPath~id = " l3cp \int_use:N \g__kernel_clip_path_int " > }
-    \__kernel_backend_literal_svg:x
+    \__kernel_backend_literal_svg:e
       {
         <
           path ~ d =
@@ -233,7 +232,7 @@
             scale ( 1 , -1 )
           "
       }
-    \__kernel_backend_scope:x
+    \__kernel_backend_scope:e
       {
         clip-path =
           "url ( \c_hash_str l3cp \int_use:N \g__kernel_clip_path_int ) "
@@ -253,7 +252,7 @@
 \int_new:N \g__kernel_clip_path_int
 \cs_new_protected:Npn \__box_backend_rotate:Nn #1#2
   {
-    \__kernel_backend_scope_begin:x
+    \__kernel_backend_scope_begin:e
       {
         transform =
           "
@@ -266,7 +265,7 @@
   }
 \cs_new_protected:Npn \__box_backend_scale:Nnn #1#2#3
   {
-    \__kernel_backend_scope_begin:x
+    \__kernel_backend_scope_begin:e
       {
         transform =
           "
@@ -285,7 +284,7 @@
   }
 %% File: l3backend-draw.dtx
 \cs_new_eq:NN \__draw_backend_literal:n \__kernel_backend_literal_svg:n
-\cs_generate_variant:Nn \__draw_backend_literal:n { x }
+\cs_generate_variant:Nn \__draw_backend_literal:n { e }
 \cs_new_eq:NN \__draw_backend_scope_begin: \__kernel_backend_scope_begin:
 \cs_new_eq:NN \__draw_backend_scope_end: \__kernel_backend_scope_end:
 \cs_new_protected:Npn \__draw_backend_begin:
@@ -327,7 +326,7 @@
   }
 \cs_new_protected:Npn \__draw_backend_add_to_path:n #1
   {
-    \tl_gset:Nx \g__draw_backend_path_tl
+    \tl_gset:Ne \g__draw_backend_path_tl
       {
         \g__draw_backend_path_tl
         \tl_if_empty:NF \g__draw_backend_path_tl { \c_space_tl }
@@ -346,7 +345,7 @@
     \bool_if:NTF \g__draw_draw_clip_bool
       {
         \int_gincr:N \g__kernel_clip_path_int
-        \__draw_backend_literal:x
+        \__draw_backend_literal:e
           {
             < clipPath~id = " l3cp \int_use:N \g__kernel_clip_path_int " >
               { ?nl }
@@ -358,14 +357,14 @@
                 #1
             />
           }
-        \__kernel_backend_scope:x
+        \__kernel_backend_scope:e
           {
             clip-path =
               "url( \c_hash_str l3cp \int_use:N \g__kernel_clip_path_int)"
           }
       }
       {
-        \__draw_backend_literal:x
+        \__draw_backend_literal:e
           { <path ~ d=" \g__draw_backend_path_tl " ~ #1 /> }
       }
     \tl_gclear:N \g__draw_backend_path_tl
@@ -391,14 +390,14 @@
     \bool_if:NT \g__draw_draw_clip_bool
       {
         \int_gincr:N \g__kernel_clip_path_int
-        \__draw_backend_literal:x
+        \__draw_backend_literal:e
           {
             < clipPath~id = " l3cp \int_use:N \g__kernel_clip_path_int " >
               { ?nl }
             <path~d=" \g__draw_backend_path_tl "/> { ?nl }
             < /clipPath >
           }
-        \__kernel_backend_scope:x
+        \__kernel_backend_scope:e
           {
             clip-path =
               "url( \c_hash_str l3cp \int_use:N \g__kernel_clip_path_int)"
@@ -409,7 +408,7 @@
   }
 \cs_new_protected:Npn \__draw_backend_dash_pattern:nn #1#2
   {
-    \use:x
+    \use:e
       {
         \__draw_backend_dash_aux:nn
           { \clist_map_function:nN {#1} \__draw_backend_dash:n }
@@ -420,7 +419,7 @@
   { , \dim_to_decimal_in_bp:n {#1} }
 \cs_new_protected:Npn \__draw_backend_dash_aux:nn #1#2
   {
-    \__kernel_backend_scope:x
+    \__kernel_backend_scope:e
       {
         stroke-dasharray =
           "
@@ -432,9 +431,9 @@
       }
   }
 \cs_new_protected:Npn \__draw_backend_linewidth:n #1
-  { \__kernel_backend_scope:x { stroke-width=" \dim_to_decimal:n {#1} " } }
+  { \__kernel_backend_scope:e { stroke-width=" \dim_to_decimal:n {#1} " } }
 \cs_new_protected:Npn \__draw_backend_miterlimit:n #1
-  { \__kernel_backend_scope:x { stroke-miterlimit=" #1 " } }
+  { \__kernel_backend_scope:e { stroke-miterlimit=" #1 " } }
 \cs_new_protected:Npn \__draw_backend_cap_butt:
   { \__kernel_backend_scope:n { stroke-linecap="butt" } }
 \cs_new_protected:Npn \__draw_backend_cap_round:
@@ -527,10 +526,10 @@
   }
 \cs_new_protected:Npn \__graphics_backend_getbb_svg_auxi:nNn #1#2#3
   {
-    \use:x
+    \use:e
       {
         \cs_set_protected:Npn \__graphics_backend_getbb_svg_auxii:w
-          ####1 \tl_to_str:n {#1} = ####2 \tl_to_str:n {#1} = ####3
+          ##1 \tl_to_str:n {#1} = ##2 \tl_to_str:n {#1} = ##3
           \s__graphics_stop
       }
       {
@@ -549,7 +548,7 @@
                 ##2 \s__graphics_stop
           }
       }
-    \use:x
+    \use:e
       {
         \__graphics_backend_getbb_svg_auxii:w #3
           \tl_to_str:n {#1} = \tl_to_str:n {#1} =
@@ -596,7 +595,7 @@
   { \__graphics_backend_include:nn { pdffile } {#1} }
 \cs_new_protected:Npn \__graphics_backend_include:nn #1#2
   {
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         #1 = #2 \c_space_tl
         llx = \dim_to_decimal_in_bp:n \l__graphics_llx_dim \c_space_tl
@@ -611,7 +610,7 @@
       {
         \hbox:n
           {
-            \__kernel_backend_literal:x
+            \__kernel_backend_literal:e
               {
                 dvisvgm:img~
                 \dim_to_decimal:n { \l__graphics_urx_dim } ~
@@ -635,7 +634,7 @@
 \cs_new_protected:Npn \__pdf_backend_link_begin_user:nnw #1#2 { }
 \cs_new_protected:Npn \__pdf_backend_link_begin:nnnw #1#2#3 { }
 \cs_new_protected:Npn \__pdf_backend_link_end: { }
-\cs_new:Npx \__pdf_backend_link_last: { }
+\cs_new:Npe \__pdf_backend_link_last: { }
 \cs_new_protected:Npn \__pdf_backend_link_margin:n #1 { }
 \cs_new_protected:Npn \__pdf_backend_destination:nn #1#2 { }
 \cs_new_protected:Npn \__pdf_backend_destination:nnnn #1#2#3#4 { }
@@ -644,9 +643,9 @@
 \cs_new_protected:Npn \__pdf_backend_object_new:nn #1 { }
 \cs_new:Npn \__pdf_backend_object_ref:n #1 { }
 \cs_new_protected:Npn \__pdf_backend_object_write:nnn #1#2#3 { }
-\cs_new_protected:Npn \__pdf_backend_object_write:nnx #1#2#3 { }
+\cs_new_protected:Npn \__pdf_backend_object_write:nne #1#2#3 { }
 \cs_new_protected:Npn \__pdf_backend_object_now:nn #1#2 { }
-\cs_new_protected:Npn \__pdf_backend_object_now:nx #1#2 { }
+\cs_new_protected:Npn \__pdf_backend_object_now:ne #1#2 { }
 \cs_new:Npn \__pdf_backend_object_last: { }
 \cs_new:Npn \__pdf_backend_pageobject_ref:n #1 { }
 \cs_new_protected:Npn \__pdf_backend_compresslevel:n #1 { }
@@ -666,7 +665,7 @@
 \cs_new_protected:Npn \__opacity_backend_stroke:n #1
   { \__opacity_backend:nn { {#1} } { stroke- } }
 \cs_new_protected:Npn \__opacity_backend:nn #1#2
-  { \__kernel_backend_scope:x { #2 opacity = " \fp_eval:n { min(max(0,#1),1) } " } }
+  { \__kernel_backend_scope:e { #2 opacity = " \fp_eval:n { min(max(0,#1),1) } " } }
 %% 
 %%
 %% End of file `l3backend-dvisvgm.def'.
diff --git a/texmf/tex/latex/l3backend/l3backend-luatex.def b/texmf/tex/latex/l3backend/l3backend-luatex.def
index 040c5415d..4207e0285 100644
--- a/texmf/tex/latex/l3backend/l3backend-luatex.def
+++ b/texmf/tex/latex/l3backend/l3backend-luatex.def
@@ -26,7 +26,7 @@
 %% 
 %% File: l3backend-basics.dtx
 \ProvidesExplFile
-  {l3backend-luatex.def}{2023-04-19}{}
+  {l3backend-luatex.def}{2023-10-10}{}
   {L3 backend support: PDF output (LuaTeX)}
 \cs_if_exist:NTF \__kernel_dependency_version_check:nn
   {
@@ -45,7 +45,6 @@
 \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D
 \cs_new_protected:Npn \__kernel_backend_literal:n #1
   { \__kernel_backend_literal:e { \exp_not:n {#1} } }
-\cs_generate_variant:Nn \__kernel_backend_literal:n { x }
 \cs_if_exist:NTF \@ifl@t@r
   {
     \@ifl@t@r \fmtversion { 2020-10-01 }
@@ -61,12 +60,17 @@
     \tex_pdfextension:D literal
       { \exp_not:n {#1} }
   }
-\cs_generate_variant:Nn \__kernel_backend_literal_pdf:n { x }
+\cs_generate_variant:Nn \__kernel_backend_literal_pdf:n { e }
 \cs_new_protected:Npn \__kernel_backend_literal_page:n #1
   {
     \tex_pdfextension:D literal ~
         page { \exp_not:n {#1} }
   }
+\cs_new_protected:Npn \__kernel_backend_literal_page:e #1
+  {
+    \tex_pdfextension:D literal ~
+        page {#1}
+  }
 \cs_new_protected:Npn \__kernel_backend_scope_begin:
   {
     \tex_pdfextension:D save \scan_stop:
@@ -80,7 +84,7 @@
     \tex_pdfextension:D setmatrix
         { \exp_not:n {#1} }
   }
-\cs_generate_variant:Nn \__kernel_backend_matrix:n { x }
+\cs_generate_variant:Nn \__kernel_backend_matrix:n { e }
 %% File: l3backend-color.dtx
 \int_new:N \l__color_backend_stack_int
 \cs_new_protected:Npn \__kernel_color_backend_stack_init:Nnn #1#2#3
@@ -121,7 +125,7 @@
 \cs_new_protected:Npn \__color_backend_reset:
   { \__kernel_color_backend_stack_pop:n \l__color_backend_stack_int }
 \prop_new:N \g__color_backend_colorant_prop
-\cs_new:Npx \__color_backend_devicen_colorants:n #1
+\cs_new:Npe \__color_backend_devicen_colorants:n #1
   {
     \exp_not:N \tl_if_blank:nF {#1}
       {
@@ -156,7 +160,7 @@
       { \cs_if_exist_p:N \pdfmanagement_if_active_p: }
       { \pdfmanagement_if_active_p: }
       {
-        \use:x
+        \use:e
           {
             \pdfmanagement_add:nnn
               { Page / Resources / ColorSpace }
@@ -167,7 +171,7 @@
   }
 \cs_new_protected:Npn \__color_backend_separation_init:nnnnn #1#2#3#4#5
   {
-    \pdf_object_unnamed_write:nx { dict }
+    \pdf_object_unnamed_write:ne { dict }
       {
         /FunctionType ~ 2
         /Domain ~ [0 ~ 1]
@@ -175,19 +179,19 @@
         /C0 ~ [#4] ~
         /C1 ~ [#5] /N ~ 1
       }
-    \exp_args:Nx \__color_backend_separation_init:nn
+    \exp_args:Ne \__color_backend_separation_init:nn
       { \str_convert_pdfname:n {#1} } {#2}
     \__color_backend_init_resource:n { color \int_use:N \g__color_model_int }
   }
 \cs_new_protected:Npn \__color_backend_separation_init:nn #1#2
   {
-    \use:x
+    \use:e
       {
         \pdf_object_new:n { color \int_use:N \g__color_model_int }
         \pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array }
           { /Separation /#1 ~ #2 ~ \pdf_object_ref_last: }
       }
-    \prop_gput:Nnx \g__color_backend_colorant_prop { /#1 }
+    \prop_gput:Nne \g__color_backend_colorant_prop { /#1 }
       { \pdf_object_ref_last: }
   }
 \cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3
@@ -195,7 +199,7 @@
     \pdf_object_if_exist:nF { __color_illuminant_CIELAB_ #1 }
       {
         \pdf_object_new:n { __color_illuminant_CIELAB_ #1 }
-        \pdf_object_write:nnx { __color_illuminant_CIELAB_ #1 } { array }
+        \pdf_object_write:nne { __color_illuminant_CIELAB_ #1 } { array }
           {
             /Lab ~
             <<
@@ -214,7 +218,7 @@
   }
 \cs_new_protected:Npn \__color_backend_devicen_init:nnn #1#2#3
   {
-    \pdf_object_unnamed_write:nx { stream }
+    \pdf_object_unnamed_write:ne { stream }
       {
         {
           /FunctionType ~ 4 ~
@@ -236,7 +240,7 @@
         }
         { {#3} }
      }
-    \use:x
+    \use:e
       {
         \pdf_object_new:n { color \int_use:N \g__color_model_int }
         \pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array }
@@ -261,7 +265,7 @@
     \pdf_object_if_exist:nF { __color_icc_ #1 }
       {
         \pdf_object_new:n { __color_icc_ #1 }
-        \pdf_object_write:nnx { __color_icc_ #1 } { fstream }
+        \pdf_object_write:nne { __color_icc_ #1 } { fstream }
           {
             {
               /N ~ \exp_not:n { #2 } ~
@@ -270,7 +274,7 @@
             {#1}
           }
       }
-    \pdf_object_unnamed_write:nx { array }
+    \pdf_object_unnamed_write:ne { array }
       { /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } }
     \__color_backend_init_resource:n { color \int_use:N \g__color_model_int }
   }
@@ -285,7 +289,7 @@
             {#1}
           }
       }
-    \pdf_object_unnamed_write:nx { array }
+    \pdf_object_unnamed_write:ne { array }
       { /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } }
     \__color_backend_init_resource:n { Default #2 }
   }
@@ -326,7 +330,7 @@
 \cs_new_protected:Npn \__box_backend_clip:N #1
   {
     \__kernel_backend_scope_begin:
-    \__kernel_backend_literal_pdf:x
+    \__kernel_backend_literal_pdf:e
       {
         0~
         \dim_to_decimal_in_bp:n { -\box_dp:N #1 } ~
@@ -348,7 +352,7 @@
     \fp_compare:nNnT \l__box_backend_cos_fp = \c_zero_fp
       { \fp_zero:N \l__box_backend_cos_fp }
     \fp_set:Nn \l__box_backend_sin_fp { round ( sind ( #2 ) , 5 ) }
-    \__kernel_backend_matrix:x
+    \__kernel_backend_matrix:e
       {
         \fp_use:N \l__box_backend_cos_fp \c_space_tl
         \fp_compare:nNnTF \l__box_backend_sin_fp = \c_zero_fp
@@ -369,7 +373,7 @@
 \cs_new_protected:Npn \__box_backend_scale:Nnn #1#2#3
   {
     \__kernel_backend_scope_begin:
-    \__kernel_backend_matrix:x
+    \__kernel_backend_matrix:e
       {
         \fp_eval:n { round ( #2 , 5 ) } ~
         0~0~
@@ -380,7 +384,7 @@
   }
 %% File: l3backend-draw.dtx
 \cs_new_eq:NN \__draw_backend_literal:n \__kernel_backend_literal_pdf:n
-\cs_generate_variant:Nn \__draw_backend_literal:n { x }
+\cs_generate_variant:Nn \__draw_backend_literal:n { e }
 \cs_new_protected:Npn \__draw_backend_begin:
   { \__draw_backend_scope_begin: }
 \cs_new_protected:Npn \__draw_backend_end:
@@ -389,17 +393,17 @@
 \cs_new_eq:NN \__draw_backend_scope_end: \__kernel_backend_scope_end:
 \cs_new_protected:Npn \__draw_backend_moveto:nn #1#2
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ m }
   }
 \cs_new_protected:Npn \__draw_backend_lineto:nn #1#2
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ l }
   }
 \cs_new_protected:Npn \__draw_backend_curveto:nnnnnn #1#2#3#4#5#6
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       {
         \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~
         \dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~
@@ -409,7 +413,7 @@
  }
 \cs_new_protected:Npn \__draw_backend_rectangle:nnnn #1#2#3#4
   {
-     \__draw_backend_literal:x
+     \__draw_backend_literal:e
       {
         \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~
         \dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~
@@ -429,24 +433,24 @@
   { \__draw_backend_literal:n { s } }
 \cs_new_protected:Npn \__draw_backend_fill:
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { f \bool_if:NT \g__draw_draw_eor_bool * }
   }
 \cs_new_protected:Npn \__draw_backend_fillstroke:
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { B \bool_if:NT \g__draw_draw_eor_bool * }
   }
 \cs_new_protected:Npn \__draw_backend_clip:
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { W \bool_if:NT \g__draw_draw_eor_bool * }
   }
 \cs_new_protected:Npn \__draw_backend_discardpath:
   { \__draw_backend_literal:n { n } }
 \cs_new_protected:Npn \__draw_backend_dash_pattern:nn #1#2
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       {
         [
           \exp_args:Nf \use:n
@@ -459,11 +463,11 @@
   { ~ \dim_to_decimal_in_bp:n {#1} }
 \cs_new_protected:Npn \__draw_backend_linewidth:n #1
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { \dim_to_decimal_in_bp:n {#1} ~ w }
   }
 \cs_new_protected:Npn \__draw_backend_miterlimit:n #1
-  { \__draw_backend_literal:x { #1 ~ M } }
+  { \__draw_backend_literal:e { #1 ~ M } }
 \cs_new_protected:Npn \__draw_backend_cap_butt:
   { \__draw_backend_literal:n { 0 ~ J } }
 \cs_new_protected:Npn \__draw_backend_cap_round:
@@ -510,7 +514,7 @@
   {
     \int_zero:N \l__graphics_page_int
     \tl_clear:N \l__graphics_pagebox_tl
-    \tl_set:Nx \l__graphics_attr_tl
+    \tl_set:Ne \l__graphics_attr_tl
       {
         \tl_if_empty:NF \l__graphics_decodearray_str
           { :D \l__graphics_decodearray_str }
@@ -527,7 +531,7 @@
   {
     \tl_clear:N \l__graphics_decodearray_str
     \bool_set_false:N \l__graphics_interpolate_bool
-    \tl_set:Nx \l__graphics_attr_tl
+    \tl_set:Ne \l__graphics_attr_tl
       {
         : \l__graphics_pagebox_tl
         \int_compare:nNnT \l__graphics_page_int > 1
@@ -539,7 +543,7 @@
   }
 \cs_new_protected:Npn \__graphics_backend_getbb_auxi:n #1
   {
-    \__graphics_bb_restore:xF { #1 \l__graphics_attr_tl }
+    \__graphics_bb_restore:eF { #1 \l__graphics_attr_tl }
       { \__graphics_backend_getbb_auxii:n {#1} }
   }
 \cs_new_protected:Npn \__graphics_backend_getbb_auxii:n #1
@@ -548,7 +552,7 @@
       { \__graphics_backend_dequote:w #1 " #1 " \s__graphics_stop }
     \int_const:cn { c__graphics_ #1 \l__graphics_attr_tl _int }
       { \tex_the:D \tex_pdflastximage:D }
-    \__graphics_bb_save:x { #1 \l__graphics_attr_tl }
+    \__graphics_bb_save:e { #1 \l__graphics_attr_tl }
   }
 \cs_new_protected:Npn \__graphics_backend_getbb_auxiii:n #1
   {
@@ -599,7 +603,7 @@
           \l__graphics_backend_dir_str
           \l__graphics_backend_name_str
           \l__graphics_backend_ext_str
-        \exp_args:Nx \__graphics_backend_getbb_eps:nn
+        \exp_args:Ne \__graphics_backend_getbb_eps:nn
           {
             \exp_args:Ne \__kernel_file_name_quote:n
               {
@@ -625,7 +629,7 @@
       {
         \file_parse_full_name:nNNN {#1}
           \l__graphics_backend_dir_str \l__graphics_backend_name_str \l__graphics_backend_ext_str
-        \exp_args:Nx \__graphics_backend_include_pdf:n
+        \exp_args:Ne \__graphics_backend_include_pdf:n
           {
             \exp_args:Ne \__kernel_file_name_quote:n
               {
@@ -653,7 +657,7 @@
       depth  ~ \dim_eval:n {#3} ~
       {#4}
   }
-\cs_new:Npx \__pdf_backend_annotation_last:
+\cs_new:Npe \__pdf_backend_annotation_last:
   {
     \exp_not:N \int_value:w
       \exp_not:N \tex_pdffeedback:D lastannot ~
@@ -673,7 +677,7 @@
   {
     \tex_pdfextension:D endlink \scan_stop:
   }
-\cs_new:Npx \__pdf_backend_link_last:
+\cs_new:Npe \__pdf_backend_link_last:
   {
     \exp_not:N \int_value:w
       \exp_not:N \tex_pdffeedback:D lastlink ~
@@ -758,7 +762,7 @@
             }
         }
   }
-\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nnx }
+\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nne }
 \cs_new:Npn \__pdf_exp_not_i:nn #1#2 { \exp_not:n {#1} }
 \cs_new:Npn \__pdf_exp_not_ii:nn #1#2 { \exp_not:n {#2} }
 \cs_new_protected:Npn \__pdf_backend_object_now:nn #1#2
@@ -766,14 +770,14 @@
     \tex_immediate:D \tex_pdfextension:D obj ~
       \__pdf_backend_object_write:nn {#1} {#2}
   }
-\cs_generate_variant:Nn \__pdf_backend_object_now:nn { nx }
-\cs_new:Npx \__pdf_backend_object_last:
+\cs_generate_variant:Nn \__pdf_backend_object_now:nn { ne }
+\cs_new:Npe \__pdf_backend_object_last:
   {
     \exp_not:N \int_value:w
       \exp_not:N \tex_pdffeedback:D lastobj ~
       \c_space_tl 0 ~ R
   }
-\cs_new:Npx \__pdf_backend_pageobject_ref:n #1
+\cs_new:Npe \__pdf_backend_pageobject_ref:n #1
   {
     \exp_not:N \int_value:w
       \exp_not:N \tex_pdffeedback:D pageref
@@ -797,7 +801,7 @@
       \tex_pdfvariable:D objcompresslevel
         #1 \scan_stop:
   }
-\cs_new_protected:Npx \__pdf_backend_version_major_gset:n #1
+\cs_new_protected:Npe \__pdf_backend_version_major_gset:n #1
   {
     \int_compare:nNnT \tex_luatexversion:D > { 106 }
       {
@@ -811,7 +815,7 @@
       \tex_pdfvariable:D minorversion
         \int_eval:n {#1} \scan_stop:
   }
-\cs_new:Npx \__pdf_backend_version_major:
+\cs_new:Npe \__pdf_backend_version_major:
   {
     \int_compare:nNnTF \tex_luatexversion:D > { 106 }
       { \exp_not:N \tex_the:D \tex_pdfvariable:D majorversion }
@@ -845,7 +849,7 @@
 \tl_new:N \l__opacity_backend_stroke_tl
 \cs_new_protected:Npn \__opacity_backend_select:n #1
  {
-   \exp_args:Nx \__opacity_backend_select_aux:n
+   \exp_args:Ne \__opacity_backend_select_aux:n
      { \fp_eval:n { min(max(0,#1),1) } }
  }
 \cs_new_protected:Npn \__opacity_backend_select_aux:n #1
@@ -871,13 +875,13 @@
  }
 \cs_new_protected:Npn \__opacity_backend_fill:n #1
   {
-    \__opacity_backend_fill_stroke:xx
+    \__opacity_backend_fill_stroke:ee
       { \fp_eval:n { min(max(0,#1),1) } }
       \l__opacity_backend_stroke_tl
   }
 \cs_new_protected:Npn \__opacity_backend_stroke:n #1
   {
-    \__opacity_backend_fill_stroke:xx
+    \__opacity_backend_fill_stroke:ee
       \l__opacity_backend_fill_tl
       { \fp_eval:n { min(max(0,#1),1) } }
   }
@@ -899,7 +903,7 @@
         \group_insert_after:N \__opacity_backend_reset:
       }
   }
-\cs_generate_variant:Nn \__opacity_backend_fill_stroke:nn { xx }
+\cs_generate_variant:Nn \__opacity_backend_fill_stroke:nn { ee }
 %% 
 %%
 %% End of file `l3backend-luatex.def'.
diff --git a/texmf/tex/latex/l3backend/l3backend-pdftex.def b/texmf/tex/latex/l3backend/l3backend-pdftex.def
index 1592155c3..d5c64bc74 100644
--- a/texmf/tex/latex/l3backend/l3backend-pdftex.def
+++ b/texmf/tex/latex/l3backend/l3backend-pdftex.def
@@ -26,7 +26,7 @@
 %% 
 %% File: l3backend-basics.dtx
 \ProvidesExplFile
-  {l3backend-pdftex.def}{2023-04-19}{}
+  {l3backend-pdftex.def}{2023-10-10}{}
   {L3 backend support: PDF output (pdfTeX)}
 \cs_if_exist:NTF \__kernel_dependency_version_check:nn
   {
@@ -45,7 +45,6 @@
 \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D
 \cs_new_protected:Npn \__kernel_backend_literal:n #1
   { \__kernel_backend_literal:e { \exp_not:n {#1} } }
-\cs_generate_variant:Nn \__kernel_backend_literal:n { x }
 \cs_if_exist:NTF \@ifl@t@r
   {
     \@ifl@t@r \fmtversion { 2020-10-01 }
@@ -61,12 +60,17 @@
     \tex_pdfliteral:D
       { \exp_not:n {#1} }
   }
-\cs_generate_variant:Nn \__kernel_backend_literal_pdf:n { x }
+\cs_generate_variant:Nn \__kernel_backend_literal_pdf:n { e }
 \cs_new_protected:Npn \__kernel_backend_literal_page:n #1
   {
     \tex_pdfliteral:D
         page { \exp_not:n {#1} }
   }
+\cs_new_protected:Npn \__kernel_backend_literal_page:e #1
+  {
+    \tex_pdfliteral:D
+        page {#1}
+  }
 \cs_new_protected:Npn \__kernel_backend_scope_begin:
   {
     \tex_pdfsave:D
@@ -80,7 +84,7 @@
     \tex_pdfsetmatrix:D
         { \exp_not:n {#1} }
   }
-\cs_generate_variant:Nn \__kernel_backend_matrix:n { x }
+\cs_generate_variant:Nn \__kernel_backend_matrix:n { e }
 %% File: l3backend-color.dtx
 \int_new:N \l__color_backend_stack_int
 \cs_new_protected:Npn \__kernel_color_backend_stack_init:Nnn #1#2#3
@@ -121,7 +125,7 @@
 \cs_new_protected:Npn \__color_backend_reset:
   { \__kernel_color_backend_stack_pop:n \l__color_backend_stack_int }
 \prop_new:N \g__color_backend_colorant_prop
-\cs_new:Npx \__color_backend_devicen_colorants:n #1
+\cs_new:Npe \__color_backend_devicen_colorants:n #1
   {
     \exp_not:N \tl_if_blank:nF {#1}
       {
@@ -156,7 +160,7 @@
       { \cs_if_exist_p:N \pdfmanagement_if_active_p: }
       { \pdfmanagement_if_active_p: }
       {
-        \use:x
+        \use:e
           {
             \pdfmanagement_add:nnn
               { Page / Resources / ColorSpace }
@@ -167,7 +171,7 @@
   }
 \cs_new_protected:Npn \__color_backend_separation_init:nnnnn #1#2#3#4#5
   {
-    \pdf_object_unnamed_write:nx { dict }
+    \pdf_object_unnamed_write:ne { dict }
       {
         /FunctionType ~ 2
         /Domain ~ [0 ~ 1]
@@ -175,19 +179,19 @@
         /C0 ~ [#4] ~
         /C1 ~ [#5] /N ~ 1
       }
-    \exp_args:Nx \__color_backend_separation_init:nn
+    \exp_args:Ne \__color_backend_separation_init:nn
       { \str_convert_pdfname:n {#1} } {#2}
     \__color_backend_init_resource:n { color \int_use:N \g__color_model_int }
   }
 \cs_new_protected:Npn \__color_backend_separation_init:nn #1#2
   {
-    \use:x
+    \use:e
       {
         \pdf_object_new:n { color \int_use:N \g__color_model_int }
         \pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array }
           { /Separation /#1 ~ #2 ~ \pdf_object_ref_last: }
       }
-    \prop_gput:Nnx \g__color_backend_colorant_prop { /#1 }
+    \prop_gput:Nne \g__color_backend_colorant_prop { /#1 }
       { \pdf_object_ref_last: }
   }
 \cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3
@@ -195,7 +199,7 @@
     \pdf_object_if_exist:nF { __color_illuminant_CIELAB_ #1 }
       {
         \pdf_object_new:n { __color_illuminant_CIELAB_ #1 }
-        \pdf_object_write:nnx { __color_illuminant_CIELAB_ #1 } { array }
+        \pdf_object_write:nne { __color_illuminant_CIELAB_ #1 } { array }
           {
             /Lab ~
             <<
@@ -214,7 +218,7 @@
   }
 \cs_new_protected:Npn \__color_backend_devicen_init:nnn #1#2#3
   {
-    \pdf_object_unnamed_write:nx { stream }
+    \pdf_object_unnamed_write:ne { stream }
       {
         {
           /FunctionType ~ 4 ~
@@ -236,7 +240,7 @@
         }
         { {#3} }
      }
-    \use:x
+    \use:e
       {
         \pdf_object_new:n { color \int_use:N \g__color_model_int }
         \pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array }
@@ -261,7 +265,7 @@
     \pdf_object_if_exist:nF { __color_icc_ #1 }
       {
         \pdf_object_new:n { __color_icc_ #1 }
-        \pdf_object_write:nnx { __color_icc_ #1 } { fstream }
+        \pdf_object_write:nne { __color_icc_ #1 } { fstream }
           {
             {
               /N ~ \exp_not:n { #2 } ~
@@ -270,7 +274,7 @@
             {#1}
           }
       }
-    \pdf_object_unnamed_write:nx { array }
+    \pdf_object_unnamed_write:ne { array }
       { /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } }
     \__color_backend_init_resource:n { color \int_use:N \g__color_model_int }
   }
@@ -285,7 +289,7 @@
             {#1}
           }
       }
-    \pdf_object_unnamed_write:nx { array }
+    \pdf_object_unnamed_write:ne { array }
       { /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } }
     \__color_backend_init_resource:n { Default #2 }
   }
@@ -325,7 +329,7 @@
 \cs_new_protected:Npn \__box_backend_clip:N #1
   {
     \__kernel_backend_scope_begin:
-    \__kernel_backend_literal_pdf:x
+    \__kernel_backend_literal_pdf:e
       {
         0~
         \dim_to_decimal_in_bp:n { -\box_dp:N #1 } ~
@@ -347,7 +351,7 @@
     \fp_compare:nNnT \l__box_backend_cos_fp = \c_zero_fp
       { \fp_zero:N \l__box_backend_cos_fp }
     \fp_set:Nn \l__box_backend_sin_fp { round ( sind ( #2 ) , 5 ) }
-    \__kernel_backend_matrix:x
+    \__kernel_backend_matrix:e
       {
         \fp_use:N \l__box_backend_cos_fp \c_space_tl
         \fp_compare:nNnTF \l__box_backend_sin_fp = \c_zero_fp
@@ -368,7 +372,7 @@
 \cs_new_protected:Npn \__box_backend_scale:Nnn #1#2#3
   {
     \__kernel_backend_scope_begin:
-    \__kernel_backend_matrix:x
+    \__kernel_backend_matrix:e
       {
         \fp_eval:n { round ( #2 , 5 ) } ~
         0~0~
@@ -379,7 +383,7 @@
   }
 %% File: l3backend-draw.dtx
 \cs_new_eq:NN \__draw_backend_literal:n \__kernel_backend_literal_pdf:n
-\cs_generate_variant:Nn \__draw_backend_literal:n { x }
+\cs_generate_variant:Nn \__draw_backend_literal:n { e }
 \cs_new_protected:Npn \__draw_backend_begin:
   { \__draw_backend_scope_begin: }
 \cs_new_protected:Npn \__draw_backend_end:
@@ -388,17 +392,17 @@
 \cs_new_eq:NN \__draw_backend_scope_end: \__kernel_backend_scope_end:
 \cs_new_protected:Npn \__draw_backend_moveto:nn #1#2
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ m }
   }
 \cs_new_protected:Npn \__draw_backend_lineto:nn #1#2
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ l }
   }
 \cs_new_protected:Npn \__draw_backend_curveto:nnnnnn #1#2#3#4#5#6
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       {
         \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~
         \dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~
@@ -408,7 +412,7 @@
  }
 \cs_new_protected:Npn \__draw_backend_rectangle:nnnn #1#2#3#4
   {
-     \__draw_backend_literal:x
+     \__draw_backend_literal:e
       {
         \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~
         \dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~
@@ -428,24 +432,24 @@
   { \__draw_backend_literal:n { s } }
 \cs_new_protected:Npn \__draw_backend_fill:
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { f \bool_if:NT \g__draw_draw_eor_bool * }
   }
 \cs_new_protected:Npn \__draw_backend_fillstroke:
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { B \bool_if:NT \g__draw_draw_eor_bool * }
   }
 \cs_new_protected:Npn \__draw_backend_clip:
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { W \bool_if:NT \g__draw_draw_eor_bool * }
   }
 \cs_new_protected:Npn \__draw_backend_discardpath:
   { \__draw_backend_literal:n { n } }
 \cs_new_protected:Npn \__draw_backend_dash_pattern:nn #1#2
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       {
         [
           \exp_args:Nf \use:n
@@ -458,11 +462,11 @@
   { ~ \dim_to_decimal_in_bp:n {#1} }
 \cs_new_protected:Npn \__draw_backend_linewidth:n #1
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { \dim_to_decimal_in_bp:n {#1} ~ w }
   }
 \cs_new_protected:Npn \__draw_backend_miterlimit:n #1
-  { \__draw_backend_literal:x { #1 ~ M } }
+  { \__draw_backend_literal:e { #1 ~ M } }
 \cs_new_protected:Npn \__draw_backend_cap_butt:
   { \__draw_backend_literal:n { 0 ~ J } }
 \cs_new_protected:Npn \__draw_backend_cap_round:
@@ -509,7 +513,7 @@
   {
     \int_zero:N \l__graphics_page_int
     \tl_clear:N \l__graphics_pagebox_tl
-    \tl_set:Nx \l__graphics_attr_tl
+    \tl_set:Ne \l__graphics_attr_tl
       {
         \tl_if_empty:NF \l__graphics_decodearray_str
           { :D \l__graphics_decodearray_str }
@@ -526,7 +530,7 @@
   {
     \tl_clear:N \l__graphics_decodearray_str
     \bool_set_false:N \l__graphics_interpolate_bool
-    \tl_set:Nx \l__graphics_attr_tl
+    \tl_set:Ne \l__graphics_attr_tl
       {
         : \l__graphics_pagebox_tl
         \int_compare:nNnT \l__graphics_page_int > 1
@@ -538,7 +542,7 @@
   }
 \cs_new_protected:Npn \__graphics_backend_getbb_auxi:n #1
   {
-    \__graphics_bb_restore:xF { #1 \l__graphics_attr_tl }
+    \__graphics_bb_restore:eF { #1 \l__graphics_attr_tl }
       { \__graphics_backend_getbb_auxii:n {#1} }
   }
 \cs_new_protected:Npn \__graphics_backend_getbb_auxii:n #1
@@ -547,7 +551,7 @@
       { \__graphics_backend_dequote:w #1 " #1 " \s__graphics_stop }
     \int_const:cn { c__graphics_ #1 \l__graphics_attr_tl _int }
       { \tex_the:D \tex_pdflastximage:D }
-    \__graphics_bb_save:x { #1 \l__graphics_attr_tl }
+    \__graphics_bb_save:e { #1 \l__graphics_attr_tl }
   }
 \cs_new_protected:Npn \__graphics_backend_getbb_auxiii:n #1
   {
@@ -598,7 +602,7 @@
           \l__graphics_backend_dir_str
           \l__graphics_backend_name_str
           \l__graphics_backend_ext_str
-        \exp_args:Nx \__graphics_backend_getbb_eps:nn
+        \exp_args:Ne \__graphics_backend_getbb_eps:nn
           {
             \exp_args:Ne \__kernel_file_name_quote:n
               {
@@ -624,7 +628,7 @@
       {
         \file_parse_full_name:nNNN {#1}
           \l__graphics_backend_dir_str \l__graphics_backend_name_str \l__graphics_backend_ext_str
-        \exp_args:Nx \__graphics_backend_include_pdf:n
+        \exp_args:Ne \__graphics_backend_include_pdf:n
           {
             \exp_args:Ne \__kernel_file_name_quote:n
               {
@@ -652,7 +656,7 @@
       depth  ~ \dim_eval:n {#3} ~
       {#4}
   }
-\cs_new:Npx \__pdf_backend_annotation_last:
+\cs_new:Npe \__pdf_backend_annotation_last:
   {
     \exp_not:N \int_value:w
       \exp_not:N \tex_pdflastannot:D
@@ -672,7 +676,7 @@
   {
     \tex_pdfendlink:D
   }
-\cs_new:Npx \__pdf_backend_link_last:
+\cs_new:Npe \__pdf_backend_link_last:
   {
     \exp_not:N \int_value:w
       \exp_not:N \tex_pdflastlink:D
@@ -757,7 +761,7 @@
             }
         }
   }
-\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nnx }
+\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nne }
 \cs_new:Npn \__pdf_exp_not_i:nn #1#2 { \exp_not:n {#1} }
 \cs_new:Npn \__pdf_exp_not_ii:nn #1#2 { \exp_not:n {#2} }
 \cs_new_protected:Npn \__pdf_backend_object_now:nn #1#2
@@ -765,14 +769,14 @@
     \tex_immediate:D \tex_pdfobj:D
       \__pdf_backend_object_write:nn {#1} {#2}
   }
-\cs_generate_variant:Nn \__pdf_backend_object_now:nn { nx }
-\cs_new:Npx \__pdf_backend_object_last:
+\cs_generate_variant:Nn \__pdf_backend_object_now:nn { ne }
+\cs_new:Npe \__pdf_backend_object_last:
   {
     \exp_not:N \int_value:w
       \exp_not:N \tex_pdflastobj:D
       \c_space_tl 0 ~ R
   }
-\cs_new:Npx \__pdf_backend_pageobject_ref:n #1
+\cs_new:Npe \__pdf_backend_pageobject_ref:n #1
   {
     \exp_not:N \int_value:w
       \exp_not:N \tex_pdfpageref:D
@@ -796,7 +800,7 @@
       \tex_pdfobjcompresslevel:D
         #1 \scan_stop:
   }
-\cs_new_protected:Npx \__pdf_backend_version_major_gset:n #1
+\cs_new_protected:Npe \__pdf_backend_version_major_gset:n #1
   {
     \cs_if_exist:NT \tex_pdfmajorversion:D
       {
@@ -810,7 +814,7 @@
       \tex_pdfminorversion:D
         \int_eval:n {#1} \scan_stop:
   }
-\cs_new:Npx \__pdf_backend_version_major:
+\cs_new:Npe \__pdf_backend_version_major:
   {
     \cs_if_exist:NTF \tex_pdfmajorversion:D
       { \exp_not:N \tex_the:D \tex_pdfmajorversion:D }
@@ -844,7 +848,7 @@
 \tl_new:N \l__opacity_backend_stroke_tl
 \cs_new_protected:Npn \__opacity_backend_select:n #1
  {
-   \exp_args:Nx \__opacity_backend_select_aux:n
+   \exp_args:Ne \__opacity_backend_select_aux:n
      { \fp_eval:n { min(max(0,#1),1) } }
  }
 \cs_new_protected:Npn \__opacity_backend_select_aux:n #1
@@ -870,13 +874,13 @@
  }
 \cs_new_protected:Npn \__opacity_backend_fill:n #1
   {
-    \__opacity_backend_fill_stroke:xx
+    \__opacity_backend_fill_stroke:ee
       { \fp_eval:n { min(max(0,#1),1) } }
       \l__opacity_backend_stroke_tl
   }
 \cs_new_protected:Npn \__opacity_backend_stroke:n #1
   {
-    \__opacity_backend_fill_stroke:xx
+    \__opacity_backend_fill_stroke:ee
       \l__opacity_backend_fill_tl
       { \fp_eval:n { min(max(0,#1),1) } }
   }
@@ -898,7 +902,7 @@
         \group_insert_after:N \__opacity_backend_reset:
       }
   }
-\cs_generate_variant:Nn \__opacity_backend_fill_stroke:nn { xx }
+\cs_generate_variant:Nn \__opacity_backend_fill_stroke:nn { ee }
 %% 
 %%
 %% End of file `l3backend-pdftex.def'.
diff --git a/texmf/tex/latex/l3backend/l3backend-xetex.def b/texmf/tex/latex/l3backend/l3backend-xetex.def
index 1f9966125..acdc2e794 100644
--- a/texmf/tex/latex/l3backend/l3backend-xetex.def
+++ b/texmf/tex/latex/l3backend/l3backend-xetex.def
@@ -26,7 +26,7 @@
 %% 
 %% File: l3backend-basics.dtx
 \ProvidesExplFile
-  {l3backend-xetex.def}{2023-04-19}{}
+  {l3backend-xetex.def}{2023-10-10}{}
   {L3 backend support: XeTeX}
 \cs_if_exist:NTF \__kernel_dependency_version_check:nn
   {
@@ -45,7 +45,6 @@
 \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D
 \cs_new_protected:Npn \__kernel_backend_literal:n #1
   { \__kernel_backend_literal:e { \exp_not:n {#1} } }
-\cs_generate_variant:Nn \__kernel_backend_literal:n { x }
 \cs_if_exist:NTF \@ifl@t@r
   {
     \@ifl@t@r \fmtversion { 2020-10-01 }
@@ -58,7 +57,7 @@
   { \cs_new_eq:NN \__kernel_backend_first_shipout:n \use:n }
 \cs_new_protected:Npn \__kernel_backend_literal_pdf:n #1
   { \__kernel_backend_literal:n { pdf:literal~ #1 } }
-\cs_generate_variant:Nn \__kernel_backend_literal_pdf:n { x }
+\cs_generate_variant:Nn \__kernel_backend_literal_pdf:n { e }
 \cs_new_protected:Npn \__kernel_backend_literal_page:n #1
   { \__kernel_backend_literal:n { pdf:literal~direct~ #1 } }
 \cs_new_protected:Npn \__kernel_backend_scope_begin:
@@ -82,7 +81,7 @@
 \msg_new:nnn { color } { unknown-named-color }
   { Named~color~'#1'~is~not~known. }
 \prop_new:N \g__color_backend_colorant_prop
-\cs_new:Npx \__color_backend_devicen_colorants:n #1
+\cs_new:Npe \__color_backend_devicen_colorants:n #1
   {
     \exp_not:N \tl_if_blank:nF {#1}
       {
@@ -108,7 +107,7 @@
     \__color_backend_devicen_colorants:w
   }
 \cs_new_protected:Npn \__color_backend_select_separation:nn #1#2
-  { \__kernel_backend_literal:x { pdf : bc ~ \pdf_object_ref:n {#1} ~ [ #2 ] } }
+  { \__kernel_backend_literal:e { pdf : bc ~ \pdf_object_ref:n {#1} ~ [ #2 ] } }
 \cs_new_eq:NN \__color_backend_select_devicen:nn \__color_backend_select_separation:nn
 \cs_new_eq:NN \__color_backend_select_iccbased:nn \__color_backend_select_separation:nn
 \cs_new_protected:Npn \__color_backend_init_resource:n #1
@@ -116,7 +115,7 @@
   }
 \cs_new_protected:Npn \__color_backend_separation_init:nnnnn #1#2#3#4#5
   {
-    \pdf_object_unnamed_write:nx { dict }
+    \pdf_object_unnamed_write:ne { dict }
       {
         /FunctionType ~ 2
         /Domain ~ [0 ~ 1]
@@ -124,19 +123,19 @@
         /C0 ~ [#4] ~
         /C1 ~ [#5] /N ~ 1
       }
-    \exp_args:Nx \__color_backend_separation_init:nn
+    \exp_args:Ne \__color_backend_separation_init:nn
       { \str_convert_pdfname:n {#1} } {#2}
     \__color_backend_init_resource:n { color \int_use:N \g__color_model_int }
   }
 \cs_new_protected:Npn \__color_backend_separation_init:nn #1#2
   {
-    \use:x
+    \use:e
       {
         \pdf_object_new:n { color \int_use:N \g__color_model_int }
         \pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array }
           { /Separation /#1 ~ #2 ~ \pdf_object_ref_last: }
       }
-    \prop_gput:Nnx \g__color_backend_colorant_prop { /#1 }
+    \prop_gput:Nne \g__color_backend_colorant_prop { /#1 }
       { \pdf_object_ref_last: }
   }
 \cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3
@@ -144,7 +143,7 @@
     \pdf_object_if_exist:nF { __color_illuminant_CIELAB_ #1 }
       {
         \pdf_object_new:n { __color_illuminant_CIELAB_ #1 }
-        \pdf_object_write:nnx { __color_illuminant_CIELAB_ #1 } { array }
+        \pdf_object_write:nne { __color_illuminant_CIELAB_ #1 } { array }
           {
             /Lab ~
             <<
@@ -163,7 +162,7 @@
   }
 \cs_new_protected:Npn \__color_backend_devicen_init:nnn #1#2#3
   {
-    \pdf_object_unnamed_write:nx { stream }
+    \pdf_object_unnamed_write:ne { stream }
       {
         {
           /FunctionType ~ 4 ~
@@ -185,7 +184,7 @@
         }
         { {#3} }
      }
-    \use:x
+    \use:e
       {
         \pdf_object_new:n { color \int_use:N \g__color_model_int }
         \pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array }
@@ -210,7 +209,7 @@
     \pdf_object_if_exist:nF { __color_icc_ #1 }
       {
         \pdf_object_new:n { __color_icc_ #1 }
-        \pdf_object_write:nnx { __color_icc_ #1 } { fstream }
+        \pdf_object_write:nne { __color_icc_ #1 } { fstream }
           {
             {
               /N ~ \exp_not:n { #2 } ~
@@ -219,7 +218,7 @@
             {#1}
           }
       }
-    \pdf_object_unnamed_write:nx { array }
+    \pdf_object_unnamed_write:ne { array }
       { /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } }
     \__color_backend_init_resource:n { color \int_use:N \g__color_model_int }
   }
@@ -234,7 +233,7 @@
             {#1}
           }
       }
-    \pdf_object_unnamed_write:nx { array }
+    \pdf_object_unnamed_write:ne { array }
       { /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } }
     \__color_backend_init_resource:n { Default #2 }
   }
@@ -250,12 +249,12 @@
 \cs_new_eq:NN \__color_backend_stroke_rgb:n  \__color_backend_stroke:n
 \cs_new_protected:Npn \__color_backend_fill_separation:nn #1#2
   {
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       { pdf : bc ~ fill ~ \pdf_object_ref:n {#1} ~ [ #2 ] }
   }
 \cs_new_protected:Npn \__color_backend_stroke_separation:nn #1#2
   {
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       { pdf : bc ~ stroke ~ \pdf_object_ref:n {#1} ~ [ #2 ] }
   }
 \cs_new_eq:NN \__color_backend_fill_devicen:nn \__color_backend_fill_separation:nn
@@ -266,7 +265,7 @@
 \cs_new_protected:Npn \__box_backend_clip:N #1
   {
     \__kernel_backend_scope_begin:
-    \__kernel_backend_literal_pdf:x
+    \__kernel_backend_literal_pdf:e
       {
         0~
         \dim_to_decimal_in_bp:n { -\box_dp:N #1 } ~
@@ -283,7 +282,7 @@
 \cs_new_protected:Npn \__box_backend_rotate_aux:Nn #1#2
   {
     \__kernel_backend_scope_begin:
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         x:rotate~
         \fp_compare:nNnTF {#2} = \c_zero_fp
@@ -296,7 +295,7 @@
 \cs_new_protected:Npn \__box_backend_scale:Nnn #1#2#3
   {
     \__kernel_backend_scope_begin:
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         x:scale~
         \fp_eval:n { round ( #2 , 5 ) } ~
@@ -307,7 +306,7 @@
   }
 %% File: l3backend-draw.dtx
 \cs_new_eq:NN \__draw_backend_literal:n \__kernel_backend_literal_pdf:n
-\cs_generate_variant:Nn \__draw_backend_literal:n { x }
+\cs_generate_variant:Nn \__draw_backend_literal:n { e }
 \cs_new_protected:Npn \__draw_backend_begin:
   { \__draw_backend_scope_begin: }
 \cs_new_protected:Npn \__draw_backend_end:
@@ -316,17 +315,17 @@
 \cs_new_eq:NN \__draw_backend_scope_end: \__kernel_backend_scope_end:
 \cs_new_protected:Npn \__draw_backend_moveto:nn #1#2
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ m }
   }
 \cs_new_protected:Npn \__draw_backend_lineto:nn #1#2
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ l }
   }
 \cs_new_protected:Npn \__draw_backend_curveto:nnnnnn #1#2#3#4#5#6
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       {
         \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~
         \dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~
@@ -336,7 +335,7 @@
  }
 \cs_new_protected:Npn \__draw_backend_rectangle:nnnn #1#2#3#4
   {
-     \__draw_backend_literal:x
+     \__draw_backend_literal:e
       {
         \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~
         \dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~
@@ -356,24 +355,24 @@
   { \__draw_backend_literal:n { s } }
 \cs_new_protected:Npn \__draw_backend_fill:
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { f \bool_if:NT \g__draw_draw_eor_bool * }
   }
 \cs_new_protected:Npn \__draw_backend_fillstroke:
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { B \bool_if:NT \g__draw_draw_eor_bool * }
   }
 \cs_new_protected:Npn \__draw_backend_clip:
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { W \bool_if:NT \g__draw_draw_eor_bool * }
   }
 \cs_new_protected:Npn \__draw_backend_discardpath:
   { \__draw_backend_literal:n { n } }
 \cs_new_protected:Npn \__draw_backend_dash_pattern:nn #1#2
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       {
         [
           \exp_args:Nf \use:n
@@ -386,11 +385,11 @@
   { ~ \dim_to_decimal_in_bp:n {#1} }
 \cs_new_protected:Npn \__draw_backend_linewidth:n #1
   {
-    \__draw_backend_literal:x
+    \__draw_backend_literal:e
       { \dim_to_decimal_in_bp:n {#1} ~ w }
   }
 \cs_new_protected:Npn \__draw_backend_miterlimit:n #1
-  { \__draw_backend_literal:x { #1 ~ M } }
+  { \__draw_backend_literal:e { #1 ~ M } }
 \cs_new_protected:Npn \__draw_backend_cap_butt:
   { \__draw_backend_literal:n { 0 ~ J } }
 \cs_new_protected:Npn \__draw_backend_cap_round:
@@ -410,20 +409,20 @@
   }
 \cs_new_protected:Npn \__draw_backend_cm_aux:nnnn #1#2#3#4
   {
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         x:rotate~
         \fp_compare:nNnTF {#1} = \c_zero_fp
           { 0 }
           { \fp_eval:n { round ( -#1 , 5 ) } }
       }
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         x:scale~
         \fp_eval:n { round ( #2 , 5 ) } ~
         \fp_eval:n { round ( #3 , 5 ) }
       }
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         x:rotate~
         \fp_compare:nNnTF {#4} = \c_zero_fp
@@ -433,7 +432,7 @@
   }
 \cs_new_protected:Npn \__draw_backend_cm_decompose:nnnnN #1#2#3#4#5
   {
-    \use:x
+    \use:e
       {
         \__draw_backend_cm_decompose_auxi:nnnnN
           { \fp_eval:n { (#1 + #4) / 2 } }
@@ -445,7 +444,7 @@
   }
 \cs_new_protected:Npn \__draw_backend_cm_decompose_auxi:nnnnN #1#2#3#4#5
   {
-    \use:x
+    \use:e
       {
         \__draw_backend_cm_decompose_auxii:nnnnN
           { \fp_eval:n { 2 * sqrt ( #1 * #1 + #4 * #4 ) } }
@@ -457,7 +456,7 @@
   }
 \cs_new_protected:Npn \__draw_backend_cm_decompose_auxii:nnnnN #1#2#3#4#5
   {
-    \use:x
+    \use:e
       {
         \__draw_backend_cm_decompose_auxiii:nnnnN
           { \fp_eval:n { ( #4 - #3 ) / 2 } }
@@ -507,7 +506,7 @@
 \int_new:N \g__graphics_track_int
 \cs_new_protected:Npn \__graphics_backend_include_eps:n #1
   {
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         PSfile = #1 \c_space_tl
         llx = \dim_to_decimal_in_bp:n \l__graphics_llx_dim \c_space_tl
@@ -524,7 +523,7 @@
 \cs_new_eq:NN \__graphics_backend_include_bmp:n \__graphics_backend_include_jpg:n
 \cs_new_protected:Npn \__graphics_backend_include_auxi:nn #1#2
   {
-    \__graphics_backend_include_auxii:xnn
+    \__graphics_backend_include_auxii:enn
       {
         \tl_if_empty:NF \l__graphics_pagebox_tl
           { : \l__graphics_pagebox_tl }
@@ -541,17 +540,17 @@
   {
     \int_if_exist:cTF { c__graphics_ #2#1 _int }
       {
-        \__kernel_backend_literal:x
+        \__kernel_backend_literal:e
           { pdf:usexobj~@graphic \int_use:c { c__graphics_ #2#1 _int } }
       }
       { \__graphics_backend_include_auxiii:nnn {#2} {#1} {#3} }
   }
-\cs_generate_variant:Nn \__graphics_backend_include_auxii:nnn { x }
+\cs_generate_variant:Nn \__graphics_backend_include_auxii:nnn { e }
 \cs_new_protected:Npn \__graphics_backend_include_auxiii:nnn #1#2#3
   {
     \int_gincr:N \g__graphics_track_int
     \int_const:cn { c__graphics_ #1#2 _int } { \g__graphics_track_int }
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         pdf:#3~
         @graphic \int_use:c { c__graphics_ #1#2 _int } ~
@@ -613,7 +612,7 @@
   }
 \cs_new_protected:Npn \__graphics_backend_getbb_auxiv:nnNnn #1#2#3#4#5
   {
-    \use:x
+    \use:e
       {
         \__graphics_backend_getbb_auxv:nNnn {#2} #3 { : #1 #4 }
           {
@@ -655,9 +654,9 @@
   }
 %% File: l3backend-pdf.dtx
 \box_new:N \l__pdf_internal_box
-\cs_new_protected:Npx \__pdf_backend:n #1
+\cs_new_protected:Npe \__pdf_backend:n #1
   { \__kernel_backend_literal:n { pdf: #1 } }
-\cs_generate_variant:Nn \__pdf_backend:n { x }
+\cs_generate_variant:Nn \__pdf_backend:n { e }
 \cs_new_protected:Npn \__pdf_backend_catalog_gput:nn #1#2
   { \__pdf_backend:n { put ~ @catalog << /#1 ~ #2 >> } }
 \cs_new_protected:Npn \__pdf_backend_info_gput:nn #1#2
@@ -678,15 +677,15 @@
     \use:c { __pdf_backend_object_write_ #2 :nn }
       { \__pdf_backend_object_ref:n {#1} } {#3}
   }
-\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nnx }
+\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nne }
 \cs_new_protected:Npn \__pdf_backend_object_write_array:nn #1#2
   {
-    \__pdf_backend:x
+    \__pdf_backend:e
       { obj ~ #1 ~ [ ~ \exp_not:n {#2} ~ ] }
   }
 \cs_new_protected:Npn \__pdf_backend_object_write_dict:nn #1#2
   {
-    \__pdf_backend:x
+    \__pdf_backend:e
       { obj ~ #1 ~ << ~ \exp_not:n {#2} ~ >> }
   }
 \cs_new_protected:Npn \__pdf_backend_object_write_fstream:nn #1#2
@@ -695,7 +694,7 @@
   { \__pdf_backend_object_write_stream:nnnn { } {#1} #2 }
 \cs_new_protected:Npn \__pdf_backend_object_write_stream:nnnn #1#2#3#4
   {
-    \__pdf_backend:x
+    \__pdf_backend:e
       {
         #1 stream ~ #2 ~
           ( \exp_not:n {#4} ) ~ << \exp_not:n {#3} >>
@@ -704,11 +703,11 @@
 \cs_new_protected:Npn \__pdf_backend_object_now:nn #1#2
   {
     \int_gincr:N \g__pdf_backend_object_int
-    \exp_args:Nnx \use:c { __pdf_backend_object_write_ #1 :nn }
+    \exp_args:Nne \use:c { __pdf_backend_object_write_ #1 :nn }
       { @pdf.obj \int_use:N \g__pdf_backend_object_int }
       {#2}
   }
-\cs_generate_variant:Nn \__pdf_backend_object_now:nn { nx }
+\cs_generate_variant:Nn \__pdf_backend_object_now:nn { ne }
 \cs_new:Npn \__pdf_backend_object_last:
  { @pdf.obj \int_use:N \g__pdf_backend_object_int }
 \cs_new:Npn \__pdf_backend_pageobject_ref:n #1
@@ -718,7 +717,7 @@
   {
     \int_gincr:N \g__pdf_backend_object_int
     \int_gset_eq:NN \g__pdf_backend_annotation_int \g__pdf_backend_object_int
-    \__pdf_backend:x
+    \__pdf_backend:e
       {
         ann ~ @pdf.obj \int_use:N \g__pdf_backend_object_int \c_space_tl
         width  ~ \dim_eval:n {#1} ~
@@ -734,10 +733,10 @@
   { \__pdf_backend_link_begin:n { #1 /Subtype /Link /A << /S /GoTo /D ( #2 ) >> } }
 \cs_new_protected:Npn \__pdf_backend_link_begin_user:nnw #1#2
   { \__pdf_backend_link_begin:n {#1#2} }
-\cs_new_protected:Npx \__pdf_backend_link_begin:n #1
+\cs_new_protected:Npe \__pdf_backend_link_begin:n #1
   {
     \exp_not:N \int_gincr:N \exp_not:N  \g__pdf_backend_link_int
-    \__pdf_backend:x
+    \__pdf_backend:e
       {
          bann ~
          @pdf.lnk
@@ -754,10 +753,10 @@
 \cs_new:Npn \__pdf_backend_link_last:
   { @pdf.lnk \int_use:N \g__pdf_backend_link_int }
 \cs_new_protected:Npn \__pdf_backend_link_margin:n #1
-  { \__kernel_backend_literal:x { dvipdfmx:config~g~ \dim_eval:n {#1} } }
+  { \__kernel_backend_literal:e { dvipdfmx:config~g~ \dim_eval:n {#1} } }
 \cs_new_protected:Npn \__pdf_backend_destination:nn #1#2
   {
-    \__pdf_backend:x
+    \__pdf_backend:e
       {
         dest ~ ( \exp_not:n {#1} )
         [
@@ -816,7 +815,7 @@
     \__kernel_kern:n { -#1 }
   }
 \cs_new_protected:Npn \__pdf_backend_compresslevel:n #1
-  { \__kernel_backend_literal:x { dvipdfmx:config~z~ \int_eval:n {#1} } }
+  { \__kernel_backend_literal:e { dvipdfmx:config~z~ \int_eval:n {#1} } }
 \cs_new_protected:Npn \__pdf_backend_compress_objects:n #1
   {
     \bool_if:nF {#1}
@@ -824,13 +823,13 @@
   }
 \cs_new_protected:Npn \__pdf_backend_version_major_gset:n #1
   {
-    \cs_gset:Npx \__pdf_backend_version_major: { \int_eval:n {#1} }
-    \__kernel_backend_literal:x { pdf:majorversion~ \__pdf_backend_version_major: }
+    \cs_gset:Npe \__pdf_backend_version_major: { \int_eval:n {#1} }
+    \__kernel_backend_literal:e { pdf:majorversion~ \__pdf_backend_version_major: }
   }
 \cs_new_protected:Npn \__pdf_backend_version_minor_gset:n #1
   {
-    \cs_gset:Npx \__pdf_backend_version_minor: { \int_eval:n {#1} }
-    \__kernel_backend_literal:x { pdf:minorversion~ \__pdf_backend_version_minor: }
+    \cs_gset:Npe \__pdf_backend_version_minor: { \int_eval:n {#1} }
+    \__kernel_backend_literal:e { pdf:minorversion~ \__pdf_backend_version_minor: }
   }
 \cs_new:Npn \__pdf_backend_version_major: { 1 }
 \cs_new:Npn \__pdf_backend_version_minor: { 5 }
@@ -855,7 +854,7 @@
 \tl_new:N \l__opacity_backend_stroke_tl
 \cs_new_protected:Npn \__opacity_backend_select:n #1
  {
-   \exp_args:Nx \__opacity_backend_select_aux:n
+   \exp_args:Ne \__opacity_backend_select_aux:n
      { \fp_eval:n { min(max(0,#1),1) } }
  }
 \cs_new_protected:Npn \__opacity_backend_select_aux:n #1
@@ -882,13 +881,13 @@
  }
 \cs_new_protected:Npn \__opacity_backend_fill:n #1
   {
-    \__opacity_backend_fill_stroke:xx
+    \__opacity_backend_fill_stroke:ee
       { \fp_eval:n { min(max(0,#1),1) } }
       \l__opacity_backend_stroke_tl
   }
 \cs_new_protected:Npn \__opacity_backend_stroke:n #1
   {
-    \__opacity_backend_fill_stroke:xx
+    \__opacity_backend_fill_stroke:ee
       \l__opacity_backend_fill_tl
       { \fp_eval:n { min(max(0,#1),1) } }
   }
@@ -910,7 +909,7 @@
         \group_insert_after:N \__opacity_backend_reset:
       }
   }
-\cs_generate_variant:Nn \__opacity_backend_fill_stroke:nn { xx }
+\cs_generate_variant:Nn \__opacity_backend_fill_stroke:nn { ee }
 %% 
 %%
 %% End of file `l3backend-xetex.def'.
diff --git a/texmf/tex/latex/l3kernel/expl3-code.tex b/texmf/tex/latex/l3kernel/expl3-code.tex
index ac67d0b7f..0b57711f1 100644
--- a/texmf/tex/latex/l3kernel/expl3-code.tex
+++ b/texmf/tex/latex/l3kernel/expl3-code.tex
@@ -71,7 +71,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: expl3.dtx
-\def\ExplFileDate{2023-08-29}%
+\def\ExplFileDate{2023-10-10}%
 \begingroup
   \def\next{\endgroup}%
   \expandafter\ifx\csname PackageError\endcsname\relax
@@ -236,7 +236,7 @@
   {
     \bool_if:NF \l__kernel_expl_bool
       {
-        \cs_set_protected:Npx \ExplSyntaxOff
+        \cs_set_protected:Npe \ExplSyntaxOff
           {
             \char_set_catcode:nn { 9 }   { \char_value_catcode:n { 9 } }
             \char_set_catcode:nn { 32 }  { \char_value_catcode:n { 32 } }
@@ -1508,33 +1508,41 @@
   \tex_fi:D
 \tex_fi:D
 \tex_let:D \cs_set_nopar:Npn            \tex_def:D
+\tex_let:D \cs_set_nopar:Npe            \tex_edef:D
 \tex_let:D \cs_set_nopar:Npx            \tex_edef:D
 \tex_protected:D \tex_long:D \tex_def:D \cs_set:Npn
   { \tex_long:D \tex_def:D }
-\tex_protected:D \tex_long:D \tex_def:D \cs_set:Npx
+\tex_protected:D \tex_long:D \tex_def:D \cs_set:Npe
   { \tex_long:D \tex_edef:D }
+\tex_let:D \cs_set:Npx \cs_set:Npe
 \tex_protected:D \tex_long:D \tex_def:D \cs_set_protected_nopar:Npn
   { \tex_protected:D \tex_def:D }
-\tex_protected:D \tex_long:D \tex_def:D \cs_set_protected_nopar:Npx
+\tex_protected:D \tex_long:D \tex_def:D \cs_set_protected_nopar:Npe
   { \tex_protected:D \tex_edef:D }
+\tex_let:D \cs_set_protected_nopar:Npx \cs_set_protected_nopar:Npe
 \tex_protected:D \tex_long:D \tex_def:D \cs_set_protected:Npn
   { \tex_protected:D \tex_long:D \tex_def:D }
-\tex_protected:D \tex_long:D \tex_def:D \cs_set_protected:Npx
+\tex_protected:D \tex_long:D \tex_def:D \cs_set_protected:Npe
   { \tex_protected:D \tex_long:D \tex_edef:D }
+\tex_let:D \cs_set_protected:Npx \cs_set_protected:Npe
 \tex_let:D \cs_gset_nopar:Npn           \tex_gdef:D
+\tex_let:D \cs_gset_nopar:Npe           \tex_xdef:D
 \tex_let:D \cs_gset_nopar:Npx           \tex_xdef:D
 \cs_set_protected:Npn \cs_gset:Npn
   { \tex_long:D \tex_gdef:D }
-\cs_set_protected:Npn \cs_gset:Npx
+\cs_set_protected:Npn \cs_gset:Npe
   { \tex_long:D \tex_xdef:D }
+\tex_let:D \cs_gset:Npx \cs_gset:Npe
 \cs_set_protected:Npn \cs_gset_protected_nopar:Npn
   { \tex_protected:D \tex_gdef:D }
-\cs_set_protected:Npn \cs_gset_protected_nopar:Npx
+\cs_set_protected:Npn \cs_gset_protected_nopar:Npe
   { \tex_protected:D \tex_xdef:D }
+\tex_let:D \cs_gset_protected_nopar:Npx \cs_gset_protected_nopar:Npe
 \cs_set_protected:Npn \cs_gset_protected:Npn
   { \tex_protected:D \tex_long:D \tex_gdef:D }
-\cs_set_protected:Npn \cs_gset_protected:Npx
+\cs_set_protected:Npn \cs_gset_protected:Npe
   { \tex_protected:D \tex_long:D \tex_xdef:D }
+\tex_let:D \cs_gset_protected:Npx \cs_gset_protected:Npe
 \cs_set_nopar:Npn \l__exp_internal_tl { }
 \cs_set:Npn \use:c #1 { \cs:w #1 \cs_end: }
 \cs_set_protected:Npn \use:x #1
@@ -1649,7 +1657,7 @@
   { \__prg_generate_conditional_parm:NNNpnn \cs_new_protected:Npn p }
 \cs_set_protected:Npn \__prg_generate_conditional_parm:NNNpnn #1#2#3#4#
   {
-    \use:x
+    \use:e
       {
         \__prg_generate_conditional:nnNNNnnn
           \cs_split_function:N #3
@@ -1670,7 +1678,7 @@
   { \__prg_generate_conditional_count:NNNnn \cs_new_protected:Npn p }
 \cs_set_protected:Npn \__prg_generate_conditional_count:NNNnn #1#2#3
   {
-    \use:x
+    \use:e
       {
         \__prg_generate_conditional_count:nnNNNnn
         \cs_split_function:N #3
@@ -1683,7 +1691,7 @@
       { \__prg_generate_conditional:nnNNNnnn {#1} {#2} #3 #4 #5 }
       { \tl_count:n {#2} }
       {
-        \msg_error:nnxx { kernel } { bad-number-of-arguments }
+        \msg_error:nnee { kernel } { bad-number-of-arguments }
           { \token_to_str:c { #1 : #2 } }
           { \tl_count:n {#2} }
         \use_none:nn
@@ -1692,11 +1700,11 @@
 \cs_set_protected:Npn \__prg_generate_conditional:nnNNNnnn #1#2#3#4#5#6#7#8
   {
     \if_meaning:w \c_false_bool #3
-      \msg_error:nnx { kernel } { missing-colon }
+      \msg_error:nne { kernel } { missing-colon }
         { \token_to_str:c {#1} }
       \exp_after:wN \use_none:nn
     \fi:
-    \use:x
+    \use:e
       {
         \exp_not:N \__prg_generate_conditional:NNnnnnNw
         \exp_not:n { #4 #5 {#1} {#2} {#6} }
@@ -1723,7 +1731,7 @@
     \use:c { __prg_generate_ #8 _form:wNNnnnnN }
         \tl_if_empty:nF {#8}
           {
-            \msg_error:nnxx
+            \msg_error:nnee
               { kernel } { conditional-form-unknown }
               {#8} { \token_to_str:c { #3 : #4 } }
           }
@@ -1747,7 +1755,7 @@
           { #7 \__prg_p_true:w \fi: \c_false_bool }
       }
       {
-        \msg_error:nnx { kernel } { protected-predicate }
+        \msg_error:nne { kernel } { protected-predicate }
           { \token_to_str:c { #4 _p: #5 } }
       }
   }
@@ -1787,7 +1795,7 @@
   { \__prg_set_eq_conditional:NNNn \cs_new_eq:cc }
 \cs_set_protected:Npn \__prg_set_eq_conditional:NNNn #1#2#3#4
   {
-    \use:x
+    \use:e
       {
         \exp_not:N \__prg_set_eq_conditional:nnNnnNNw
           \cs_split_function:N #2
@@ -1800,12 +1808,12 @@
 \cs_set_protected:Npn \__prg_set_eq_conditional:nnNnnNNw #1#2#3#4#5#6
   {
     \if_meaning:w \c_false_bool #3
-      \msg_error:nnx { kernel } { missing-colon }
+      \msg_error:nne { kernel } { missing-colon }
         { \token_to_str:c {#1} }
       \exp_after:wN \__prg_use_none_delimit_by_q_recursion_stop:w
     \fi:
     \if_meaning:w \c_false_bool #6
-      \msg_error:nnx { kernel } { missing-colon }
+      \msg_error:nne { kernel } { missing-colon }
         { \token_to_str:c {#4} }
       \exp_after:wN \__prg_use_none_delimit_by_q_recursion_stop:w
     \fi:
@@ -1819,7 +1827,7 @@
     \use:c { __prg_set_eq_conditional_ #6 _form:wNnnnn }
         \tl_if_empty:nF {#6}
           {
-            \msg_error:nnxx
+            \msg_error:nnee
               { kernel } { conditional-form-unknown }
               {#6} { \token_to_str:c { #1 : #2 } }
           }
@@ -1935,7 +1943,7 @@
   { \cs_if_exist:cTF {#1} { \use:c {#1} #2 } { } }
 \cs_set:Npn \cs_if_exist_use:c #1
   { \cs_if_exist:cTF {#1} { \use:c {#1} } { } }
-\cs_set_protected:Npn \msg_error:nnxx #1#2#3#4
+\cs_set_protected:Npn \msg_error:nnee #1#2#3#4
   {
     \tex_newlinechar:D = `\^^J \scan_stop:
     \tex_errmessage:D
@@ -1948,21 +1956,21 @@
       }
     \tex_end:D
   }
-\cs_set_protected:Npn \msg_error:nnx #1#2#3
-  { \msg_error:nnxx {#1} {#2} {#3} { } }
+\cs_set_protected:Npn \msg_error:nne #1#2#3
+  { \msg_error:nnee {#1} {#2} {#3} { } }
 \cs_set_protected:Npn \msg_error:nn #1#2
-  { \msg_error:nnxx {#1} {#2} { } { } }
+  { \msg_error:nnee {#1} {#2} { } { } }
 \cs_set:Npn \msg_line_context:
   { on~line~ \tex_the:D \tex_inputlineno:D }
-\cs_set_protected:Npn \iow_log:x
+\cs_set_protected:Npn \iow_log:e
   { \tex_immediate:D \tex_write:D -1 }
-\cs_set_protected:Npn \iow_term:x
+\cs_set_protected:Npn \iow_term:e
   { \tex_immediate:D \tex_write:D 16 }
 \cs_set_protected:Npn \__kernel_chk_if_free_cs:N #1
   {
     \cs_if_free:NF #1
       {
-        \msg_error:nnxx { kernel } { command-already-defined }
+        \msg_error:nnee { kernel } { command-already-defined }
           { \token_to_str:N #1 } { \token_to_meaning:N #1 }
       }
   }
@@ -1977,38 +1985,54 @@
       }
   }
 \__cs_tmp:w \cs_new_nopar:Npn           \cs_gset_nopar:Npn
+\__cs_tmp:w \cs_new_nopar:Npe           \cs_gset_nopar:Npe
 \__cs_tmp:w \cs_new_nopar:Npx           \cs_gset_nopar:Npx
 \__cs_tmp:w \cs_new:Npn                 \cs_gset:Npn
+\__cs_tmp:w \cs_new:Npe                 \cs_gset:Npe
 \__cs_tmp:w \cs_new:Npx                 \cs_gset:Npx
 \__cs_tmp:w \cs_new_protected_nopar:Npn \cs_gset_protected_nopar:Npn
+\__cs_tmp:w \cs_new_protected_nopar:Npe \cs_gset_protected_nopar:Npe
 \__cs_tmp:w \cs_new_protected_nopar:Npx \cs_gset_protected_nopar:Npx
 \__cs_tmp:w \cs_new_protected:Npn       \cs_gset_protected:Npn
+\__cs_tmp:w \cs_new_protected:Npe       \cs_gset_protected:Npe
 \__cs_tmp:w \cs_new_protected:Npx       \cs_gset_protected:Npx
 \cs_set:Npn \__cs_tmp:w #1#2
   { \cs_new_protected_nopar:Npn #1 { \exp_args:Nc #2 } }
 \__cs_tmp:w \cs_set_nopar:cpn  \cs_set_nopar:Npn
+\__cs_tmp:w \cs_set_nopar:cpe  \cs_set_nopar:Npe
 \__cs_tmp:w \cs_set_nopar:cpx  \cs_set_nopar:Npx
 \__cs_tmp:w \cs_gset_nopar:cpn \cs_gset_nopar:Npn
+\__cs_tmp:w \cs_gset_nopar:cpe \cs_gset_nopar:Npe
 \__cs_tmp:w \cs_gset_nopar:cpx \cs_gset_nopar:Npx
 \__cs_tmp:w \cs_new_nopar:cpn  \cs_new_nopar:Npn
+\__cs_tmp:w \cs_new_nopar:cpe  \cs_new_nopar:Npe
 \__cs_tmp:w \cs_new_nopar:cpx  \cs_new_nopar:Npx
 \__cs_tmp:w \cs_set:cpn  \cs_set:Npn
+\__cs_tmp:w \cs_set:cpe  \cs_set:Npe
 \__cs_tmp:w \cs_set:cpx  \cs_set:Npx
 \__cs_tmp:w \cs_gset:cpn \cs_gset:Npn
+\__cs_tmp:w \cs_gset:cpe \cs_gset:Npe
 \__cs_tmp:w \cs_gset:cpx \cs_gset:Npx
 \__cs_tmp:w \cs_new:cpn  \cs_new:Npn
+\__cs_tmp:w \cs_new:cpe  \cs_new:Npe
 \__cs_tmp:w \cs_new:cpx  \cs_new:Npx
 \__cs_tmp:w \cs_set_protected_nopar:cpn  \cs_set_protected_nopar:Npn
+\__cs_tmp:w \cs_set_protected_nopar:cpe  \cs_set_protected_nopar:Npe
 \__cs_tmp:w \cs_set_protected_nopar:cpx  \cs_set_protected_nopar:Npx
 \__cs_tmp:w \cs_gset_protected_nopar:cpn \cs_gset_protected_nopar:Npn
+\__cs_tmp:w \cs_gset_protected_nopar:cpe \cs_gset_protected_nopar:Npe
 \__cs_tmp:w \cs_gset_protected_nopar:cpx \cs_gset_protected_nopar:Npx
 \__cs_tmp:w \cs_new_protected_nopar:cpn  \cs_new_protected_nopar:Npn
+\__cs_tmp:w \cs_new_protected_nopar:cpe  \cs_new_protected_nopar:Npe
 \__cs_tmp:w \cs_new_protected_nopar:cpx  \cs_new_protected_nopar:Npx
 \__cs_tmp:w \cs_set_protected:cpn  \cs_set_protected:Npn
+\__cs_tmp:w \cs_set_protected:cpe  \cs_set_protected:Npe
 \__cs_tmp:w \cs_set_protected:cpx  \cs_set_protected:Npx
 \__cs_tmp:w \cs_gset_protected:cpn \cs_gset_protected:Npn
+\__cs_tmp:w \cs_gset_protected:cpe \cs_gset_protected:Npe
 \__cs_tmp:w \cs_gset_protected:cpx \cs_gset_protected:Npx
 \__cs_tmp:w \cs_new_protected:cpn  \cs_new_protected:Npn
+\__cs_tmp:w \cs_new_protected:cpe  \cs_new_protected:Npe
 \__cs_tmp:w \cs_new_protected:cpx  \cs_new_protected:Npx
 \cs_new_protected:Npn \cs_set_eq:NN #1 { \tex_let:D #1 =~ }
 \cs_new_protected:Npn \cs_set_eq:cN { \exp_args:Nc  \cs_set_eq:NN }
@@ -2039,7 +2063,7 @@
   }
 \cs_set_protected:Npn \__kernel_cs_parm_from_arg_count:nnF #1#2
   {
-    \exp_args:Nx \__cs_parm_from_arg_count_test:nnF
+    \exp_args:Ne \__cs_parm_from_arg_count_test:nnF
       {
         \exp_after:wN \exp_not:n
         \if_case:w \int_eval:n {#2}
@@ -2085,7 +2109,7 @@
   {
     \__kernel_cs_parm_from_arg_count:nnF { \use:nnn #2 #1 } {#3}
       {
-        \msg_error:nnxx { kernel } { bad-number-of-arguments }
+        \msg_error:nnee { kernel } { bad-number-of-arguments }
           { \token_to_str:N #1 } { \int_eval:n {#3} }
         \use_none:n
       }
@@ -2105,7 +2129,7 @@
   }
 \cs_new_protected:Npn \__cs_generate_from_signature:NNn #1#2
   {
-    \use:x
+    \use:e
       {
         \__cs_generate_from_signature:nnNNNn
         \cs_split_function:N #2
@@ -2120,14 +2144,14 @@
           { \tl_map_function:nN {#2} \__cs_generate_from_signature:n }
         \tl_if_empty:oF \__cs_tmp:w
           {
-            \msg_error:nnxxx { kernel } { non-base-function }
+            \msg_error:nneee { kernel } { non-base-function }
               { \token_to_str:N #5 } {#2} { \__cs_tmp:w }
           }
         \cs_generate_from_arg_count:NNnn
           #5 #4 { \tl_count:n {#2} } {#6}
       }
       {
-        \msg_error:nnx { kernel } { missing-colon }
+        \msg_error:nne { kernel } { missing-colon }
           { \token_to_str:N #5 }
       }
   }
@@ -2137,28 +2161,40 @@
     \if:w T #1 \else: \if:w F #1 \else: #1 \fi: \fi: \fi: \fi:
   }
 \__cs_tmp:w { set }                  { Nn } { Npn }
+\__cs_tmp:w { set }                  { Ne } { Npe }
 \__cs_tmp:w { set }                  { Nx } { Npx }
 \__cs_tmp:w { set_nopar }            { Nn } { Npn }
+\__cs_tmp:w { set_nopar }            { Ne } { Npe }
 \__cs_tmp:w { set_nopar }            { Nx } { Npx }
 \__cs_tmp:w { set_protected }        { Nn } { Npn }
+\__cs_tmp:w { set_protected }        { Ne } { Npe }
 \__cs_tmp:w { set_protected }        { Nx } { Npx }
 \__cs_tmp:w { set_protected_nopar }  { Nn } { Npn }
+\__cs_tmp:w { set_protected_nopar }  { Ne } { Npe }
 \__cs_tmp:w { set_protected_nopar }  { Nx } { Npx }
 \__cs_tmp:w { gset }                 { Nn } { Npn }
+\__cs_tmp:w { gset }                 { Ne } { Npe }
 \__cs_tmp:w { gset }                 { Nx } { Npx }
 \__cs_tmp:w { gset_nopar }           { Nn } { Npn }
+\__cs_tmp:w { gset_nopar }           { Ne } { Npe }
 \__cs_tmp:w { gset_nopar }           { Nx } { Npx }
 \__cs_tmp:w { gset_protected }       { Nn } { Npn }
+\__cs_tmp:w { gset_protected }       { Ne } { Npe }
 \__cs_tmp:w { gset_protected }       { Nx } { Npx }
 \__cs_tmp:w { gset_protected_nopar } { Nn } { Npn }
+\__cs_tmp:w { gset_protected_nopar } { Ne } { Npe }
 \__cs_tmp:w { gset_protected_nopar } { Nx } { Npx }
 \__cs_tmp:w { new }                  { Nn } { Npn }
+\__cs_tmp:w { new }                  { Ne } { Npe }
 \__cs_tmp:w { new }                  { Nx } { Npx }
 \__cs_tmp:w { new_nopar }            { Nn } { Npn }
+\__cs_tmp:w { new_nopar }            { Ne } { Npe }
 \__cs_tmp:w { new_nopar }            { Nx } { Npx }
 \__cs_tmp:w { new_protected }        { Nn } { Npn }
+\__cs_tmp:w { new_protected }        { Ne } { Npe }
 \__cs_tmp:w { new_protected }        { Nx } { Npx }
 \__cs_tmp:w { new_protected_nopar }  { Nn } { Npn }
+\__cs_tmp:w { new_protected_nopar }  { Ne } { Npe }
 \__cs_tmp:w { new_protected_nopar }  { Nx } { Npx }
 \cs_set:Npn \__cs_tmp:w #1#2
   {
@@ -2169,28 +2205,40 @@
       }
   }
 \__cs_tmp:w { set }                  { n }
+\__cs_tmp:w { set }                  { e }
 \__cs_tmp:w { set }                  { x }
 \__cs_tmp:w { set_nopar }            { n }
+\__cs_tmp:w { set_nopar }            { e }
 \__cs_tmp:w { set_nopar }            { x }
 \__cs_tmp:w { set_protected }        { n }
+\__cs_tmp:w { set_protected }        { e }
 \__cs_tmp:w { set_protected }        { x }
 \__cs_tmp:w { set_protected_nopar }  { n }
+\__cs_tmp:w { set_protected_nopar }  { e }
 \__cs_tmp:w { set_protected_nopar }  { x }
 \__cs_tmp:w { gset }                 { n }
+\__cs_tmp:w { gset }                 { e }
 \__cs_tmp:w { gset }                 { x }
 \__cs_tmp:w { gset_nopar }           { n }
+\__cs_tmp:w { gset_nopar }           { e }
 \__cs_tmp:w { gset_nopar }           { x }
 \__cs_tmp:w { gset_protected }       { n }
+\__cs_tmp:w { gset_protected }       { e }
 \__cs_tmp:w { gset_protected }       { x }
 \__cs_tmp:w { gset_protected_nopar } { n }
+\__cs_tmp:w { gset_protected_nopar } { e }
 \__cs_tmp:w { gset_protected_nopar } { x }
 \__cs_tmp:w { new }                  { n }
+\__cs_tmp:w { new }                  { e }
 \__cs_tmp:w { new }                  { x }
 \__cs_tmp:w { new_nopar }            { n }
+\__cs_tmp:w { new_nopar }            { e }
 \__cs_tmp:w { new_nopar }            { x }
 \__cs_tmp:w { new_protected }        { n }
+\__cs_tmp:w { new_protected }        { e }
 \__cs_tmp:w { new_protected }        { x }
 \__cs_tmp:w { new_protected_nopar }  { n }
+\__cs_tmp:w { new_protected_nopar }  { e }
 \__cs_tmp:w { new_protected_nopar }  { x }
 \prg_new_conditional:Npnn \cs_if_eq:NN #1#2 { p , T , F , TF }
   {
@@ -2214,7 +2262,7 @@
     \cs_if_exist:NTF #1
       {#2}
       {
-        \msg_error:nnx { kernel } { variable-not-defined }
+        \msg_error:nne { kernel } { variable-not-defined }
           { \token_to_str:N #1 }
       }
   }
@@ -2246,7 +2294,7 @@
   {
     \group_begin:
       \int_set:Nn \tex_escapechar:D { `\\ }
-      \exp_args:NNx
+      \exp_args:NNe
     \group_end:
     #1 { \token_to_str:N #2 = \cs_meaning:N #2 }
   }
@@ -2256,7 +2304,7 @@
   { \__kernel_group_show:NN \int_zero:N 0 }
 \cs_new_protected:Npn \__kernel_group_show:NN #1#2
   {
-    \use:x
+    \use:e
       {
         #1 \tex_interactionmode:D
         \int_set:Nn \tex_tracingonline:D  {#2}
@@ -2271,7 +2319,7 @@
           { \int_use:N \tex_errorcontextlines:D }
       }
   }
-\use:x
+\use:e
   {
     \exp_not:n { \cs_new:Npn \__kernel_prefix_arg_replacement:wN #1 }
     \tl_to_str:n { macro : } \exp_not:n { #2 -> #3 \s__kernel_stop #4 }
@@ -2345,7 +2393,7 @@
 \use:nn { \cs_new_eq:NN \exp_stop_f: } { ~ }
 \cs_new_protected:Npn \::x #1 \::: #2#3
   {
-    \cs_set_nopar:Npx \l__exp_internal_tl
+    \cs_set_nopar:Npe \l__exp_internal_tl
       { \exp_not:n { #1 \::: } { \exp_not:n {#2} {#3} } }
     \l__exp_internal_tl
   }
@@ -2480,6 +2528,13 @@
     \exp_after:wN #3
     \exp_after:wN { \exp:w \__exp_eval_register:c {#4} }
   }
+\cs_new:Npn \exp_args:NNNe #1#2#3#4
+  {
+    \exp_after:wN #1
+    \exp_after:wN #2
+    \exp_after:wN #3
+    \tex_expanded:D { {#4} }
+  }
 \cs_new:Npn \exp_args:NcNc #1#2#3#4
   {
     \exp_after:wN #1
@@ -2525,7 +2580,7 @@
   }
 \cs_new_protected:Npn \::x_unbraced \::: #1#2
   {
-    \cs_set_nopar:Npx \l__exp_internal_tl { \exp_not:n {#1} #2 }
+    \cs_set_nopar:Npe \l__exp_internal_tl { \exp_not:n {#1} #2 }
     \l__exp_internal_tl
   }
 \cs_new:Npn \exp_last_unbraced:No #1#2 { \exp_after:wN #1 #2 }
@@ -2631,7 +2686,7 @@
 \cs_new_protected:Npn \cs_generate_variant:Nn #1#2
   {
     \__cs_generate_variant:N #1
-    \use:x
+    \use:e
       {
         \__cs_generate_variant:nnNN
           \cs_split_function:N #1
@@ -2643,18 +2698,18 @@
   }
 \cs_new_protected:Npn \cs_generate_variant:cn
   { \exp_args:Nc \cs_generate_variant:Nn }
-\cs_new_protected:Npx \__cs_generate_variant:N #1
+\cs_new_protected:Npe \__cs_generate_variant:N #1
   {
     \exp_not:N \exp_after:wN \exp_not:N \if_meaning:w
       \exp_not:N \exp_not:N #1 #1
-      \cs_set_eq:NN \exp_not:N \__cs_tmp:w \cs_new_protected:Npx
+      \cs_set_eq:NN \exp_not:N \__cs_tmp:w \cs_new_protected:Npe
     \exp_not:N \else:
       \exp_not:N \exp_after:wN \exp_not:N \__cs_generate_variant:ww
         \exp_not:N \token_to_meaning:N #1 \tl_to_str:n { ma }
           \s__cs_mark
-        \s__cs_mark \cs_new_protected:Npx
+        \s__cs_mark \cs_new_protected:Npe
         \tl_to_str:n { pr }
-        \s__cs_mark \cs_new:Npx
+        \s__cs_mark \cs_new:Npe
         \s__cs_stop
     \exp_not:N \fi:
   }
@@ -2669,7 +2724,7 @@
 \cs_new_protected:Npn \__cs_generate_variant:nnNN #1#2#3#4
   {
     \if_meaning:w \c_false_bool #3
-      \msg_error:nnx { kernel } { missing-colon }
+      \msg_error:nne { kernel } { missing-colon }
         { \token_to_str:c {#1} }
       \exp_after:wN \__cs_use_none_delimit_by_q_recursion_stop:w
     \fi:
@@ -2680,7 +2735,7 @@
     \if_meaning:w \scan_stop: #4
       \exp_after:wN \__cs_use_none_delimit_by_q_recursion_stop:w
     \fi:
-    \use:x
+    \use:e
       {
         \exp_not:N \__cs_generate_variant:wwNN
         \__cs_generate_variant_loop:nNwN { }
@@ -2754,7 +2809,7 @@
     \exp_not:n
       {
         \s__cs_mark
-        \msg_error:nnxx { kernel } { variant-too-long }
+        \msg_error:nnee { kernel } { variant-too-long }
           {#5} { \token_to_str:N #3 }
         \use_none:nnn
         \s__cs_stop
@@ -2769,7 +2824,7 @@
     \exp_not:n
       {
         \s__cs_mark
-        \msg_error:nnxxxx { kernel } { invalid-variant }
+        \msg_error:nneeee { kernel } { invalid-variant }
           {#7} { \token_to_str:N #5 } {#1} {#2}
         \use_none:nnn
         \s__cs_stop
@@ -2783,7 +2838,7 @@
     #3 \s__cs_stop #4 #5 {#6} {#7}
     \exp_not:n
       {
-        \msg_error:nnxxxx
+        \msg_error:nneeee
           { kernel } { deprecated-variant }
           {#7} { \token_to_str:N #5 } {#1} {#2}
       }
@@ -2811,11 +2866,11 @@
         \group_end:
       }
   }
-\cs_new_protected:Npx \__cs_generate_internal_variant:n #1
+\cs_new_protected:Npe \__cs_generate_internal_variant:n #1
   {
     \exp_not:N \__cs_generate_internal_variant:wwnNwn
       #1 \s__cs_mark
-        { \cs_set_eq:NN \exp_not:N \__cs_tmp:w \cs_new_protected:Npx }
+        { \cs_set_eq:NN \exp_not:N \__cs_tmp:w \cs_new_protected:Npe }
         \cs_new_protected:cpn
         \use:x
       \token_to_str:N x \s__cs_mark
@@ -2848,7 +2903,7 @@
         ##3
         \s__cs_mark
         {
-          \use:x
+          \use:e
             {
               ##1 { exp_args:N ##3 }
                 { \__cs_generate_internal_variant_loop:n ##3 { : \use_i:nn } }
@@ -2920,7 +2975,7 @@
   }
 \cs_new_protected:Npn \prg_generate_conditional_variant:Nnn #1
   {
-    \use:x
+    \use:e
       {
         \__cs_generate_variant:nnNnn
           \cs_split_function:N #1
@@ -2929,7 +2984,7 @@
 \cs_new_protected:Npn \__cs_generate_variant:nnNnn #1#2#3#4#5
   {
     \if_meaning:w \c_false_bool #3
-      \msg_error:nnx { kernel } { missing-colon }
+      \msg_error:nne { kernel } { missing-colon }
         { \token_to_str:c {#1} }
       \__cs_use_i_delimit_by_s_stop:nw
     \fi:
@@ -2949,7 +3004,7 @@
       \cs_if_exist_use:cTF { __cs_generate_variant_#1_form:nnn }
         { {#3} {#4} {#5} }
         {
-          \msg_error:nnxx
+          \msg_error:nnee
             { kernel } { conditional-form-unknown }
             {#1} { \token_to_str:c { #3 : #4 } }
         }
@@ -3137,18 +3192,18 @@
       \__kernel_tl_to_str:w \exp_after:wN {#1} \q_nil
   }
 \cs_new_protected:Npn \__kernel_quark_new_test:N #1
-  { \__quark_new_test_aux:Nx #1 { \__quark_module_name:N #1 } }
+  { \__quark_new_test_aux:Ne #1 { \__quark_module_name:N #1 } }
 \cs_new_protected:Npn \__quark_new_test_aux:Nn #1 #2
   {
     \if_meaning:w \q_nil #2 \q_nil
-      \msg_error:nnx { quark } { invalid-function }
+      \msg_error:nne { quark } { invalid-function }
         { \token_to_str:N #1 }
     \else:
       \__quark_new_test:Nccn #1
         { q__#2_recursion_tail } { q__#2_recursion_stop } { __#2 }
     \fi:
   }
-\cs_generate_variant:Nn \__quark_new_test_aux:Nn { Nx }
+\cs_generate_variant:Nn \__quark_new_test_aux:Nn { Ne }
 \cs_new_protected:Npn \__quark_new_test:NNNn #1
   {
     \exp_last_unbraced:Nf \__quark_new_test_aux:nnNNnnnn
@@ -3158,18 +3213,18 @@
 \cs_generate_variant:Nn \__quark_new_test:NNNn { Ncc }
 \cs_new_protected:Npn \__kernel_quark_new_conditional:Nn #1
   {
-    \__quark_new_conditional:Nxxn #1
+    \__quark_new_conditional:Neen #1
       { \__quark_quark_conditional_name:N #1 }
       { \__quark_module_name:N #1 }
   }
 \cs_new_protected:Npn \__quark_new_conditional:Nnnn #1#2#3#4
   {
     \if_meaning:w \q_nil #2 \q_nil
-      \msg_error:nnx { quark } { invalid-function }
+      \msg_error:nne { quark } { invalid-function }
         { \token_to_str:N #1 }
     \else:
       \if_meaning:w \q_nil #3 \q_nil
-        \msg_error:nnx { quark } { invalid-function }
+        \msg_error:nne { quark } { invalid-function }
           { \token_to_str:N #1 }
       \else:
         \exp_last_unbraced:Nf \__quark_new_test_aux:nnNNnnnn
@@ -3179,12 +3234,12 @@
       \fi:
     \fi:
   }
-\cs_generate_variant:Nn \__quark_new_conditional:Nnnn { Nxx }
+\cs_generate_variant:Nn \__quark_new_conditional:Nnnn { Nee }
 \cs_new_protected:Npn \__quark_new_test_aux:nnNNnnnn #1 #2 #3 #4 #5
   {
     \cs_if_exist_use:cTF { __quark_new_#5_#2:Nnnn } { #4 }
       {
-        \msg_error:nnxx { quark } { invalid-function }
+        \msg_error:nnee { quark } { invalid-function }
           { \token_to_str:N #4 } {#2}
         \use_none:nnn
       }
@@ -3312,7 +3367,7 @@
   {
     \tl_if_in:NnTF \g__scan_marks_tl { #1 }
       {
-        \msg_error:nnx { scanmark } { already-defined }
+        \msg_error:nne { scanmark } { already-defined }
           { \token_to_str:N #1 }
       }
       {
@@ -3330,8 +3385,8 @@
   }
 \cs_new:Npn \use_none_delimit_by_s_stop:w #1 \s_stop { }
 %% File: l3tl.dtx
-\cs_new_eq:NN \__kernel_tl_set:Nx  \cs_set_nopar:Npx
-\cs_new_eq:NN \__kernel_tl_gset:Nx \cs_gset_nopar:Npx
+\cs_new_eq:NN \__kernel_tl_set:Ne  \cs_set_nopar:Npe
+\cs_new_eq:NN \__kernel_tl_gset:Ne \cs_gset_nopar:Npe
 \cs_new_protected:Npn \tl_new:N #1
   {
     \__kernel_chk_if_free_cs:N #1
@@ -3341,15 +3396,10 @@
 \cs_new_protected:Npn \tl_const:Nn #1#2
   {
     \__kernel_chk_if_free_cs:N #1
-    \cs_gset_nopar:Npx #1 { \__kernel_exp_not:w {#2} }
-  }
-\cs_new_protected:Npn \tl_const:Nx #1#2
-  {
-    \__kernel_chk_if_free_cs:N #1
-    \cs_gset_nopar:Npx #1 {#2}
+    \cs_gset_nopar:Npe #1 { \__kernel_exp_not:w {#2} }
   }
-\cs_generate_variant:Nn \tl_const:Nn { c }
-\cs_generate_variant:Nn \tl_const:Nx { c }
+\cs_generate_variant:Nn \tl_const:Nn { Ne , c , ce }
+\cs_generate_variant:Nn \tl_const:Nn { Nx , cx }
 \cs_new_protected:Npn \tl_clear:N  #1
   { \tex_let:D #1 = ~ \c_empty_tl }
 \cs_new_protected:Npn \tl_gclear:N #1
@@ -3370,7 +3420,7 @@
 \cs_generate_variant:Nn \tl_gset_eq:NN { cN, Nc, cc }
 \cs_new_protected:Npn \tl_concat:NNN #1#2#3
   {
-    \__kernel_tl_set:Nx #1
+    \__kernel_tl_set:Ne #1
       {
         \__kernel_exp_not:w \exp_after:wN {#2}
         \__kernel_exp_not:w \exp_after:wN {#3}
@@ -3378,7 +3428,7 @@
   }
 \cs_new_protected:Npn \tl_gconcat:NNN #1#2#3
   {
-    \__kernel_tl_gset:Nx #1
+    \__kernel_tl_gset:Ne #1
       {
         \__kernel_exp_not:w \exp_after:wN {#2}
         \__kernel_exp_not:w \exp_after:wN {#3}
@@ -3391,143 +3441,167 @@
 \tl_const:Nn \c_empty_tl { }
 \group_begin:
 \tex_catcode:D `- = 11 ~
-\tl_const:Nx \c_novalue_tl { - NoValue \token_to_str:N - }
+\tl_const:Ne \c_novalue_tl { - NoValue \token_to_str:N - }
 \group_end:
 \tl_const:Nn \c_space_tl { ~ }
 \cs_new_protected:Npn \tl_set:Nn #1#2
-  { \__kernel_tl_set:Nx #1 { \__kernel_exp_not:w {#2} } }
+  { \__kernel_tl_set:Ne #1 { \__kernel_exp_not:w {#2} } }
 \cs_new_protected:Npn \tl_set:No #1#2
-  { \__kernel_tl_set:Nx #1 { \__kernel_exp_not:w \exp_after:wN {#2} } }
-\cs_new_protected:Npn \tl_set:Nx #1#2
-  { \__kernel_tl_set:Nx #1 {#2} }
+  { \__kernel_tl_set:Ne #1 { \__kernel_exp_not:w \exp_after:wN {#2} } }
 \cs_new_protected:Npn \tl_gset:Nn #1#2
-  { \__kernel_tl_gset:Nx #1 { \__kernel_exp_not:w {#2} } }
+  { \__kernel_tl_gset:Ne #1 { \__kernel_exp_not:w {#2} } }
 \cs_new_protected:Npn \tl_gset:No #1#2
-  { \__kernel_tl_gset:Nx #1 { \__kernel_exp_not:w \exp_after:wN {#2} } }
-\cs_new_protected:Npn \tl_gset:Nx #1#2
-  { \__kernel_tl_gset:Nx #1 {#2} }
+  { \__kernel_tl_gset:Ne #1 { \__kernel_exp_not:w \exp_after:wN {#2} } }
 \cs_generate_variant:Nn \tl_set:Nn  {    NV , Nv , Ne , Nf }
 \cs_generate_variant:Nn \tl_set:Nn  { c, cV , cv , ce , cf }
-\cs_generate_variant:Nn \tl_set:Nx  { c }
 \cs_generate_variant:Nn \tl_set:No  { c }
+\cs_generate_variant:Nn \tl_set:Nn  { Nx , cx }
 \cs_generate_variant:Nn \tl_gset:Nn {    NV , Nv , Ne , Nf }
 \cs_generate_variant:Nn \tl_gset:Nn { c, cV , cv , ce , cf }
-\cs_generate_variant:Nn \tl_gset:Nx { c }
 \cs_generate_variant:Nn \tl_gset:No { c }
+\cs_generate_variant:Nn \tl_gset:Nn { Nx , cx }
 \cs_new_protected:Npn \tl_put_left:Nn #1#2
   {
-    \__kernel_tl_set:Nx #1
+    \__kernel_tl_set:Ne #1
       { \__kernel_exp_not:w {#2} \__kernel_exp_not:w \exp_after:wN {#1} }
   }
 \cs_new_protected:Npn \tl_put_left:NV #1#2
   {
-    \__kernel_tl_set:Nx #1
+    \__kernel_tl_set:Ne #1
       { \exp_not:V #2 \__kernel_exp_not:w \exp_after:wN {#1} }
   }
 \cs_new_protected:Npn \tl_put_left:Nv #1#2
   {
-    \__kernel_tl_set:Nx #1
+    \__kernel_tl_set:Ne #1
       { \exp_not:v {#2} \__kernel_exp_not:w \exp_after:wN {#1} }
   }
+\cs_new_protected:Npn \tl_put_left:Ne #1#2
+  {
+    \__kernel_tl_set:Ne #1
+      {
+        \__kernel_exp_not:w \tex_expanded:D { {#2} }
+        \__kernel_exp_not:w \exp_after:wN {#1}
+      }
+  }
 \cs_new_protected:Npn \tl_put_left:No #1#2
   {
-    \__kernel_tl_set:Nx #1
+    \__kernel_tl_set:Ne #1
       {
         \__kernel_exp_not:w \exp_after:wN {#2}
         \__kernel_exp_not:w \exp_after:wN {#1}
       }
   }
-\cs_new_protected:Npn \tl_put_left:Nx #1#2
-  { \__kernel_tl_set:Nx #1 { #2 \__kernel_exp_not:w \exp_after:wN {#1} } }
 \cs_new_protected:Npn \tl_gput_left:Nn #1#2
   {
-    \__kernel_tl_gset:Nx #1
+    \__kernel_tl_gset:Ne #1
       { \__kernel_exp_not:w {#2} \__kernel_exp_not:w \exp_after:wN {#1} }
   }
 \cs_new_protected:Npn \tl_gput_left:NV #1#2
   {
-    \__kernel_tl_gset:Nx #1
+    \__kernel_tl_gset:Ne #1
       { \exp_not:V #2 \__kernel_exp_not:w \exp_after:wN {#1} }
   }
 \cs_new_protected:Npn \tl_gput_left:Nv #1#2
   {
-    \__kernel_tl_gset:Nx #1
+    \__kernel_tl_gset:Ne #1
       { \exp_not:v {#2} \__kernel_exp_not:w \exp_after:wN {#1} }
   }
+\cs_new_protected:Npn \tl_gput_left:Ne #1#2
+  {
+    \__kernel_tl_gset:Ne #1
+      {
+        \__kernel_exp_not:w \tex_expanded:D { {#2} }
+        \__kernel_exp_not:w \exp_after:wN {#1}
+      }
+  }
 \cs_new_protected:Npn \tl_gput_left:No #1#2
   {
-    \__kernel_tl_gset:Nx #1
+    \__kernel_tl_gset:Ne #1
       {
         \__kernel_exp_not:w \exp_after:wN {#2}
         \__kernel_exp_not:w \exp_after:wN {#1}
       }
   }
-\cs_new_protected:Npn \tl_gput_left:Nx #1#2
-  { \__kernel_tl_gset:Nx #1 { #2 \__kernel_exp_not:w \exp_after:wN {#1} } }
 \cs_generate_variant:Nn \tl_put_left:Nn  { c }
 \cs_generate_variant:Nn \tl_put_left:NV  { c }
 \cs_generate_variant:Nn \tl_put_left:Nv  { c }
+\cs_generate_variant:Nn \tl_put_left:Ne  { c }
 \cs_generate_variant:Nn \tl_put_left:No  { c }
-\cs_generate_variant:Nn \tl_put_left:Nx  { c }
+\cs_generate_variant:Nn \tl_put_left:Nn  { Nx, cx }
 \cs_generate_variant:Nn \tl_gput_left:Nn { c }
 \cs_generate_variant:Nn \tl_gput_left:NV { c }
-\cs_generate_variant:Nn \tl_gput_left:NV { c }
+\cs_generate_variant:Nn \tl_gput_left:Nv { c }
+\cs_generate_variant:Nn \tl_gput_left:Ne { c }
 \cs_generate_variant:Nn \tl_gput_left:No { c }
-\cs_generate_variant:Nn \tl_gput_left:Nx { c }
+\cs_generate_variant:Nn \tl_gput_left:Nn { Nx , cx }
 \cs_new_protected:Npn \tl_put_right:Nn #1#2
-  { \__kernel_tl_set:Nx #1 { \__kernel_exp_not:w \exp_after:wN { #1 #2 } } }
+  { \__kernel_tl_set:Ne #1 { \__kernel_exp_not:w \exp_after:wN { #1 #2 } } }
 \cs_new_protected:Npn \tl_put_right:NV #1#2
   {
-    \__kernel_tl_set:Nx #1
+    \__kernel_tl_set:Ne #1
       { \__kernel_exp_not:w \exp_after:wN {#1} \exp_not:V #2 }
   }
 \cs_new_protected:Npn \tl_put_right:Nv #1#2
   {
-    \__kernel_tl_set:Nx #1
+    \__kernel_tl_set:Ne #1
       { \__kernel_exp_not:w \exp_after:wN {#1} \exp_not:v {#2} }
   }
+\cs_new_protected:Npn \tl_put_right:Ne #1#2
+  {
+    \__kernel_tl_set:Ne #1
+      {
+        \__kernel_exp_not:w \exp_after:wN {#1}
+        \__kernel_exp_not:w \tex_expanded:D { {#2} }
+      }
+  }
 \cs_new_protected:Npn \tl_put_right:No #1#2
   {
-    \__kernel_tl_set:Nx #1
+    \__kernel_tl_set:Ne #1
       {
         \__kernel_exp_not:w \exp_after:wN {#1}
         \__kernel_exp_not:w \exp_after:wN {#2}
       }
   }
-\cs_new_protected:Npn \tl_put_right:Nx #1#2
-  { \__kernel_tl_set:Nx #1 { \__kernel_exp_not:w \exp_after:wN {#1} #2 } }
 \cs_new_protected:Npn \tl_gput_right:Nn #1#2
-  { \__kernel_tl_gset:Nx #1 { \__kernel_exp_not:w \exp_after:wN { #1 #2 } } }
+  { \__kernel_tl_gset:Ne #1 { \__kernel_exp_not:w \exp_after:wN { #1 #2 } } }
 \cs_new_protected:Npn \tl_gput_right:NV #1#2
   {
-    \__kernel_tl_gset:Nx #1
+    \__kernel_tl_gset:Ne #1
       { \__kernel_exp_not:w \exp_after:wN {#1} \exp_not:V #2 }
   }
 \cs_new_protected:Npn \tl_gput_right:Nv #1#2
   {
-    \__kernel_tl_gset:Nx #1
+    \__kernel_tl_gset:Ne #1
       { \__kernel_exp_not:w \exp_after:wN {#1} \exp_not:v {#2} }
   }
+\cs_new_protected:Npn \tl_gput_right:Ne #1#2
+  {
+    \__kernel_tl_gset:Ne #1
+      {
+        \__kernel_exp_not:w \exp_after:wN {#1}
+        \__kernel_exp_not:w \tex_expanded:D { {#2} }
+      }
+  }
 \cs_new_protected:Npn \tl_gput_right:No #1#2
   {
-    \__kernel_tl_gset:Nx #1
+    \__kernel_tl_gset:Ne #1
       {
         \__kernel_exp_not:w \exp_after:wN {#1}
         \__kernel_exp_not:w \exp_after:wN {#2}
       }
   }
-\cs_new_protected:Npn \tl_gput_right:Nx #1#2
-  { \__kernel_tl_gset:Nx #1 { \__kernel_exp_not:w \exp_after:wN {#1} #2 } }
 \cs_generate_variant:Nn \tl_put_right:Nn  { c }
 \cs_generate_variant:Nn \tl_put_right:NV  { c }
 \cs_generate_variant:Nn \tl_put_right:Nv  { c }
+\cs_generate_variant:Nn \tl_put_right:Ne  { c }
 \cs_generate_variant:Nn \tl_put_right:No  { c }
-\cs_generate_variant:Nn \tl_put_right:Nx  { c }
+\cs_generate_variant:Nn \tl_put_right:Nn  { Nx , cx }
 \cs_generate_variant:Nn \tl_gput_right:Nn { c }
 \cs_generate_variant:Nn \tl_gput_right:NV { c }
 \cs_generate_variant:Nn \tl_gput_right:Nv { c }
+\cs_generate_variant:Nn \tl_gput_right:Ne { c }
 \cs_generate_variant:Nn \tl_gput_right:No { c }
-\cs_generate_variant:Nn \tl_gput_right:Nx { c }
+\cs_generate_variant:Nn \tl_gput_right:Nn { Nx, cx }
 \quark_new:N \q__tl_nil
 \quark_new:N \q__tl_mark
 \quark_new:N \q__tl_stop
@@ -3535,7 +3609,7 @@
 \quark_new:N \q__tl_recursion_stop
 \__kernel_quark_new_test:N \__tl_if_recursion_tail_break:nN
 \__kernel_quark_new_conditional:Nn \__tl_quark_if_nil:n { TF }
-\tl_const:Nx \c__tl_rescan_marker_tl { : \token_to_str:N : }
+\tl_const:Ne \c__tl_rescan_marker_tl { : \token_to_str:N : }
 \cs_new_protected:Npn \tl_rescan:nn #1#2
   {
     \tl_set_rescan:Nnn \l__tl_internal_a_tl {#1} {#2}
@@ -3576,10 +3650,10 @@
     \group_end:
     #1 #2 {#3}
   }
-\cs_generate_variant:Nn \tl_set_rescan:Nnn  {     NnV , Nno , Nnx }
-\cs_generate_variant:Nn \tl_set_rescan:Nnn  { c , cnV , cno , cnx }
-\cs_generate_variant:Nn \tl_gset_rescan:Nnn {     NnV , Nno , Nnx }
-\cs_generate_variant:Nn \tl_gset_rescan:Nnn { c , cnV , cno , cnx }
+\cs_generate_variant:Nn \tl_set_rescan:Nnn  { NnV , Nne , c , cnV , cne }
+\cs_generate_variant:Nn \tl_set_rescan:Nnn  { Nno , Nnx , cno , cnx }
+\cs_generate_variant:Nn \tl_gset_rescan:Nnn { NnV , Nne , c , cnV , cne }
+\cs_generate_variant:Nn \tl_gset_rescan:Nnn { Nno , Nnx , cno , cnx }
 \cs_new_protected:Npn \__tl_set_rescan:nNN #1
   {
     \int_compare:nNnTF \tex_newlinechar:D < 0
@@ -3636,26 +3710,34 @@
   \c__tl_rescan_marker_tl #2
   { \use_i:nn \exp_end: #1 }
 \cs_new_protected:Npn \tl_replace_once:Nnn
-  { \__tl_replace:NnNNNnn \q__tl_mark ? \__tl_replace_wrap:w \__kernel_tl_set:Nx  }
+  { \__tl_replace:NnNNNnn \q__tl_mark ? \__tl_replace_wrap:w \__kernel_tl_set:Ne  }
 \cs_new_protected:Npn \tl_greplace_once:Nnn
-  { \__tl_replace:NnNNNnn \q__tl_mark ? \__tl_replace_wrap:w \__kernel_tl_gset:Nx }
+  { \__tl_replace:NnNNNnn \q__tl_mark ? \__tl_replace_wrap:w \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \tl_replace_all:Nnn
-  { \__tl_replace:NnNNNnn \q__tl_mark ? \__tl_replace_next:w \__kernel_tl_set:Nx  }
+  { \__tl_replace:NnNNNnn \q__tl_mark ? \__tl_replace_next:w \__kernel_tl_set:Ne  }
 \cs_new_protected:Npn \tl_greplace_all:Nnn
-  { \__tl_replace:NnNNNnn \q__tl_mark ? \__tl_replace_next:w \__kernel_tl_gset:Nx }
+  { \__tl_replace:NnNNNnn \q__tl_mark ? \__tl_replace_next:w \__kernel_tl_gset:Ne }
+\cs_generate_variant:Nn \tl_replace_once:Nnn
+  { NnV , Nne , NV , Ne , Nee , c , cnV , cne , cV , ce , cee }
 \cs_generate_variant:Nn \tl_replace_once:Nnn
-  { NV , NnV , Nx , Nnx , Nxx , c , cV , cnV , cx , cnx , cxx }
+  { Nx , Nnx , Nxx , cxn , cnx , cxx }
 \cs_generate_variant:Nn \tl_greplace_once:Nnn
-  { NV , NnV , Nx , Nnx , Nxx , c , cV , cnV , cx , cnx , cxx }
+  { NnV , Nne , NV , Ne , Nee , c , cnV , cne , cV , ce , cee }
+\cs_generate_variant:Nn \tl_greplace_once:Nnn
+  { Nx , Nnx , Nxx , cxn , cnx , cxx }
+\cs_generate_variant:Nn \tl_replace_all:Nnn
+  { NnV , Nne , NV , Ne , Nee , c , cnV , cne , cV , ce , cee }
 \cs_generate_variant:Nn \tl_replace_all:Nnn
-  { NV , NnV , Nx , Nnx , Nxx , c , cV , cnV , cx , cnx , cxx }
+  { Nx , Nnx , Nxx , cxn , cnx , cxx }
 \cs_generate_variant:Nn \tl_greplace_all:Nnn
-  { NV , NnV , Nx , Nnx , Nxx , c , cV , cnV , cx , cnx , cxx }
+  { NnV , Nne , NV , Ne , Nee , c , cnV , cne , cV , ce , cee }
+\cs_generate_variant:Nn \tl_greplace_all:Nnn
+  { Nx , Nnx , Nxx , cxn , cnx , cxx }
 \cs_new_protected:Npn \__tl_replace:NnNNNnn #1#2#3#4#5#6#7
   {
     \tl_if_empty:nTF {#6}
       {
-        \msg_error:nnx { kernel } { empty-search-pattern }
+        \msg_error:nne { kernel } { empty-search-pattern }
           { \tl_to_str:n {#7} }
       }
       {
@@ -3684,7 +3766,7 @@
     \group_align_safe_begin:
     \cs_set:Npn \__tl_replace_wrap:w ##1 #1 ##2
       { \__kernel_exp_not:w \exp_after:wN { \use_none:nn ##1 } ##2 }
-    \cs_set:Npx \__tl_replace_next:w ##1 #5
+    \cs_set:Npe \__tl_replace_next:w ##1 #5
       {
         \exp_not:N \__tl_replace_wrap:w ##1
         \exp_not:n { #1 }
@@ -3711,14 +3793,16 @@
   { \tl_replace_once:Nnn #1 {#2} { } }
 \cs_new_protected:Npn \tl_gremove_once:Nn #1#2
   { \tl_greplace_once:Nnn #1 {#2} { } }
-\cs_generate_variant:Nn \tl_remove_once:Nn  { NV , Nx , c , cV , cx }
-\cs_generate_variant:Nn \tl_gremove_once:Nn { NV , Nx , c , cV , cx }
+\cs_generate_variant:Nn \tl_remove_once:Nn  { NV , Ne , c , cV , ce }
+\cs_generate_variant:Nn \tl_gremove_once:Nn { NV , Ne , c , cV , ce }
 \cs_new_protected:Npn \tl_remove_all:Nn #1#2
   { \tl_replace_all:Nnn #1 {#2} { } }
 \cs_new_protected:Npn \tl_gremove_all:Nn #1#2
   { \tl_greplace_all:Nnn #1 {#2} { } }
-\cs_generate_variant:Nn \tl_remove_all:Nn  { NV , Nx , c , cV , cx }
-\cs_generate_variant:Nn \tl_gremove_all:Nn { NV , Nx , c , cV , cx }
+\cs_generate_variant:Nn \tl_remove_all:Nn  { NV , Ne , c , cV , ce }
+\cs_generate_variant:Nn \tl_remove_all:Nn  { Nx , cx }
+\cs_generate_variant:Nn \tl_gremove_all:Nn { NV , Ne , c , cV , ce }
+\cs_generate_variant:Nn \tl_gremove_all:Nn { Nx , cx }
 \prg_new_conditional:Npnn \tl_if_empty:N #1 { p , T , F , TF }
   {
     \if_meaning:w #1 \c_empty_tl
@@ -3794,7 +3878,9 @@
       \prg_return_false:
     \fi:
   }
-\prg_generate_conditional_variant:Nnn \tl_if_eq:nn { V , nV , x , nx } { TF , T , F }
+\prg_generate_conditional_variant:Nnn \tl_if_eq:nn
+  { nV , ne , nx , e , ee , x , xx }
+  { TF , T , F }
 \cs_new_protected:Npn \tl_if_in:NnT  { \exp_args:No \tl_if_in:nnT  }
 \cs_new_protected:Npn \tl_if_in:NnF  { \exp_args:No \tl_if_in:nnF  }
 \cs_new_protected:Npn \tl_if_in:NnTF { \exp_args:No \tl_if_in:nnTF }
@@ -3829,6 +3915,7 @@
 \cs_new:Npn \tl_if_single:NT  { \exp_args:No \tl_if_single:nT  }
 \cs_new:Npn \tl_if_single:NF  { \exp_args:No \tl_if_single:nF  }
 \cs_new:Npn \tl_if_single:NTF { \exp_args:No \tl_if_single:nTF }
+\prg_generate_conditional_variant:Nnn \tl_if_single:N {c} { p , T , F , TF }
 \prg_new_conditional:Npnn \tl_if_single:n #1 { p , T , F , TF }
   {
     \if:w \scan_stop: \exp_after:wN \__tl_if_single:nnw
@@ -3990,14 +4077,14 @@
       { \__tl_trim_mark: #1 }
       { \__kernel_exp_not:w \exp_after:wN }
   }
-\cs_generate_variant:Nn \tl_trim_spaces:n { o }
+\cs_generate_variant:Nn \tl_trim_spaces:n { V , v , e , o }
 \cs_new:Npn \tl_trim_spaces_apply:nN #1#2
   { \__tl_trim_spaces:nn { \__tl_trim_mark: #1 } { \exp_args:No #2 } }
 \cs_generate_variant:Nn \tl_trim_spaces_apply:nN { o }
 \cs_new_protected:Npn \tl_trim_spaces:N #1
-  { \__kernel_tl_set:Nx #1 { \exp_args:No \tl_trim_spaces:n {#1} } }
+  { \__kernel_tl_set:Ne #1 { \exp_args:No \tl_trim_spaces:n {#1} } }
 \cs_new_protected:Npn \tl_gtrim_spaces:N #1
-  { \__kernel_tl_gset:Nx #1 { \exp_args:No \tl_trim_spaces:n {#1} } }
+  { \__kernel_tl_gset:Ne #1 { \exp_args:No \tl_trim_spaces:n {#1} } }
 \cs_generate_variant:Nn \tl_trim_spaces:N  { c }
 \cs_generate_variant:Nn \tl_gtrim_spaces:N { c }
 \cs_set_protected:Npn \__tl_tmp:w #1
@@ -4201,7 +4288,7 @@
       {##1}
   }
 \__tl_tmp:w { ~ }
-\exp_args:Nnx \use:n { \cs_new:Npn \__tl_act_loop:w #1 \s__tl_act_stop }
+\exp_args:Nne \use:n { \cs_new:Npn \__tl_act_loop:w #1 \s__tl_act_stop }
   {
     \exp_not:o { \__tl_act_if_head_is_space:nTF {#1} }
       \exp_not:N \__tl_act_space:wwNNN
@@ -4267,9 +4354,9 @@
 \cs_new:Npn \__tl_reverse_space:
   { \__tl_act_reverse_output:n { ~ } }
 \cs_new_protected:Npn \tl_reverse:N #1
-  { \__kernel_tl_set:Nx #1 { \exp_args:No \tl_reverse:n { #1 } } }
+  { \__kernel_tl_set:Ne #1 { \exp_args:No \tl_reverse:n { #1 } } }
 \cs_new_protected:Npn \tl_greverse:N #1
-  { \__kernel_tl_gset:Nx #1 { \exp_args:No \tl_reverse:n { #1 } } }
+  { \__kernel_tl_gset:Ne #1 { \exp_args:No \tl_reverse:n { #1 } } }
 \cs_generate_variant:Nn \tl_reverse:N  { c }
 \cs_generate_variant:Nn \tl_greverse:N { c }
 \cs_new:Npn \tl_item:nn #1#2
@@ -4415,14 +4502,14 @@
               { \token_to_str:N #2 = \__kernel_exp_not:w \exp_after:wN {#2} }
           }
           {
-            \msg_error:nnxxx { kernel } { bad-type }
+            \msg_error:nneee { kernel } { bad-type }
               { \token_to_str:N #2 } { \token_to_meaning:N #2 } { tl }
           }
       }
   }
 \cs_new_protected:Npn \tl_show:n #1
   { \iow_wrap:nnnN { >~ \tl_to_str:n {#1} . } { } { } \__tl_show:n }
-\cs_generate_variant:Nn \tl_show:n { x }
+\cs_generate_variant:Nn \tl_show:n { e , x }
 \cs_new_protected:Npn \__tl_show:n #1
   {
     \tl_set:Nf \l__tl_internal_a_tl { \__tl_show:w #1 \s__tl_stop }
@@ -4438,7 +4525,7 @@
 \cs_new:Npn \__tl_show:w #1 > #2 . \s__tl_stop {#2}
 \cs_new_protected:Npn \tl_log:n #1
   { \iow_wrap:nnnN { > ~ \tl_to_str:n {#1} . } { } { } \iow_log:n }
-\cs_generate_variant:Nn \tl_log:n { x }
+\cs_generate_variant:Nn \tl_log:n { e , x }
 \cs_new_protected:Npn \__kernel_chk_tl_type:NnnT #1#2#3#4
   {
     \__kernel_chk_defined:NT #1
@@ -4446,17 +4533,17 @@
         \exp_args:Nf \tl_if_empty:nTF
           { \cs_prefix_spec:N #1 \cs_parameter_spec:N #1 }
           {
-            \tl_set:Nx \l__tl_internal_a_tl {#3}
+            \tl_set:Ne \l__tl_internal_a_tl {#3}
             \tl_if_eq:NNTF #1 \l__tl_internal_a_tl
               {#4}
               {
-                \msg_error:nnxxxx { kernel } { bad-type }
+                \msg_error:nneeee { kernel } { bad-type }
                   { \token_to_str:N #1 } { \tl_to_str:N #1 }
                   {#2} { \tl_to_str:N \l__tl_internal_a_tl }
               }
           }
           {
-            \msg_error:nnxxx { kernel } { bad-type }
+            \msg_error:nneee { kernel } { bad-type }
               { \token_to_str:N #1 } { \token_to_meaning:N #1 } {#2}
           }
       }
@@ -4510,12 +4597,13 @@
     {
       \tl_if_blank:nF {#1}
         {
-          \cs_new_protected:cpx { str_ #1 :Nn } ##1##2
+          \cs_new_protected:cpe { str_ #1 :Nn } ##1##2
             {
-              \exp_not:c { tl_ #1 :Nx } ##1
+              \exp_not:c { tl_ #1 :Ne } ##1
                 { \exp_not:N \tl_to_str:n {##2} }
             }
-          \cs_generate_variant:cn { str_ #1 :Nn } { NV , Nx , cn , cV , cx }
+          \cs_generate_variant:cn { str_ #1 :Nn }
+            { NV , Ne , Nx , cn , cV , ce , cx }
           \__str_tmp:n
         }
     }
@@ -4530,13 +4618,13 @@
     { }
 \group_end:
 \cs_new_protected:Npn \str_replace_once:Nnn
-  { \__str_replace:NNNnn \prg_do_nothing: \__kernel_tl_set:Nx  }
+  { \__str_replace:NNNnn \prg_do_nothing: \__kernel_tl_set:Ne  }
 \cs_new_protected:Npn \str_greplace_once:Nnn
-  { \__str_replace:NNNnn \prg_do_nothing: \__kernel_tl_gset:Nx }
+  { \__str_replace:NNNnn \prg_do_nothing: \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \str_replace_all:Nnn
-  { \__str_replace:NNNnn \__str_replace_next:w \__kernel_tl_set:Nx  }
+  { \__str_replace:NNNnn \__str_replace_next:w \__kernel_tl_set:Ne  }
 \cs_new_protected:Npn \str_greplace_all:Nnn
-  { \__str_replace:NNNnn \__str_replace_next:w \__kernel_tl_gset:Nx }
+  { \__str_replace:NNNnn \__str_replace_next:w \__kernel_tl_gset:Ne }
 \cs_generate_variant:Nn \str_replace_once:Nnn  { c }
 \cs_generate_variant:Nn \str_greplace_once:Nnn { c }
 \cs_generate_variant:Nn \str_replace_all:Nnn   { c }
@@ -4545,10 +4633,10 @@
   {
     \tl_if_empty:nTF {#4}
       {
-        \msg_error:nnx { kernel } { empty-search-pattern } {#5}
+        \msg_error:nne { kernel } { empty-search-pattern } {#5}
       }
       {
-        \use:x
+        \use:e
           {
             \exp_not:n { \__str_replace_aux:NNNnnn #1 #2 #3 }
               { \tl_to_str:N #3 }
@@ -4625,7 +4713,7 @@
   { c , Nc , cc } { T , F , TF , p }
 \prg_new_protected_conditional:Npnn \str_if_in:Nn #1#2 { T , F , TF }
   {
-    \use:x
+    \use:e
       { \tl_if_in:nnTF { \tl_to_str:N #1 } { \tl_to_str:n {#2} } }
       { \prg_return_true: } { \prg_return_false: }
   }
@@ -4633,7 +4721,7 @@
   { c } { T , F , TF }
 \prg_new_protected_conditional:Npnn \str_if_in:nn #1#2 { T , F , TF }
   {
-    \use:x
+    \use:e
       { \tl_if_in:nnTF { \tl_to_str:n {#1} } { \tl_to_str:n {#2} } }
       { \prg_return_true: } { \prg_return_false: }
   }
@@ -4727,7 +4815,7 @@
     \int_gincr:N \g__kernel_prg_map_int
     \cs_gset_protected:cpn
       { __str_map_ \int_use:N \g__kernel_prg_map_int :w } ##1 {#2}
-    \use:x
+    \use:e
       {
         \exp_not:N \__str_map_inline:NN
         \exp_not:c { __str_map_ \int_use:N \g__kernel_prg_map_int :w }
@@ -4748,7 +4836,7 @@
   }
 \cs_new_protected:Npn \str_map_variable:nNn #1#2#3
   {
-    \use:x
+    \use:e
       {
         \exp_not:n { \__str_map_variable:NnN #2 {#3} }
         \__kernel_str_to_other_fast:n {#1}
@@ -5098,7 +5186,7 @@
   \cs_new:Npn \__str_change_case_codepoint:nN #1#2
     { \__str_change_case_char:fnn { \int_eval:n {`#2} } {#1} {#2} }
 \else:
-    \cs_new:Npx \__str_change_case_codepoint:nN #1#2
+    \cs_new:Npe \__str_change_case_codepoint:nN #1#2
       {
         \exp_not:N \int_compare:nNnTF {`#2} > { "80 }
           {
@@ -5186,19 +5274,19 @@
   }
 \cs_new:Npn \str_mdfive_hash:n #1 { \tex_mdfivesum:D { \tl_to_str:n {#1} } }
 \cs_new:Npn \str_mdfive_hash:e #1 { \tex_mdfivesum:D {#1} }
-\str_const:Nx \c_ampersand_str   { \cs_to_str:N \& }
-\str_const:Nx \c_atsign_str      { \cs_to_str:N \@ }
-\str_const:Nx \c_backslash_str   { \cs_to_str:N \\ }
-\str_const:Nx \c_left_brace_str  { \cs_to_str:N \{ }
-\str_const:Nx \c_right_brace_str { \cs_to_str:N \} }
-\str_const:Nx \c_circumflex_str  { \cs_to_str:N \^ }
-\str_const:Nx \c_colon_str       { \cs_to_str:N \: }
-\str_const:Nx \c_dollar_str      { \cs_to_str:N \$ }
-\str_const:Nx \c_hash_str        { \cs_to_str:N \# }
-\str_const:Nx \c_percent_str     { \cs_to_str:N \% }
-\str_const:Nx \c_tilde_str       { \cs_to_str:N \~ }
-\str_const:Nx \c_underscore_str  { \cs_to_str:N \_ }
-\str_const:Nx \c_zero_str        { 0 }
+\str_const:Ne \c_ampersand_str   { \cs_to_str:N \& }
+\str_const:Ne \c_atsign_str      { \cs_to_str:N \@ }
+\str_const:Ne \c_backslash_str   { \cs_to_str:N \\ }
+\str_const:Ne \c_left_brace_str  { \cs_to_str:N \{ }
+\str_const:Ne \c_right_brace_str { \cs_to_str:N \} }
+\str_const:Ne \c_circumflex_str  { \cs_to_str:N \^ }
+\str_const:Ne \c_colon_str       { \cs_to_str:N \: }
+\str_const:Ne \c_dollar_str      { \cs_to_str:N \$ }
+\str_const:Ne \c_hash_str        { \cs_to_str:N \# }
+\str_const:Ne \c_percent_str     { \cs_to_str:N \% }
+\str_const:Ne \c_tilde_str       { \cs_to_str:N \~ }
+\str_const:Ne \c_underscore_str  { \cs_to_str:N \_ }
+\str_const:Ne \c_zero_str        { 0 }
 \str_new:N \l_tmpa_str
 \str_new:N \l_tmpb_str
 \str_new:N \g_tmpa_str
@@ -5258,22 +5346,22 @@
 \cs_new_eq:NN \seq_gset_eq:cc \tl_gset_eq:cc
 \cs_new_protected:Npn \seq_set_from_clist:NN #1#2
   {
-    \__kernel_tl_set:Nx #1
+    \__kernel_tl_set:Ne #1
       { \s__seq \clist_map_function:NN #2 \__seq_wrap_item:n }
   }
 \cs_new_protected:Npn \seq_set_from_clist:Nn #1#2
   {
-    \__kernel_tl_set:Nx #1
+    \__kernel_tl_set:Ne #1
       { \s__seq \clist_map_function:nN {#2} \__seq_wrap_item:n }
   }
 \cs_new_protected:Npn \seq_gset_from_clist:NN #1#2
   {
-    \__kernel_tl_gset:Nx #1
+    \__kernel_tl_gset:Ne #1
       { \s__seq \clist_map_function:NN #2 \__seq_wrap_item:n }
   }
 \cs_new_protected:Npn \seq_gset_from_clist:Nn #1#2
   {
-    \__kernel_tl_gset:Nx #1
+    \__kernel_tl_gset:Ne #1
       { \s__seq \clist_map_function:nN {#2} \__seq_wrap_item:n }
   }
 \cs_generate_variant:Nn \seq_set_from_clist:NN  {     Nc }
@@ -5284,18 +5372,18 @@
 \cs_generate_variant:Nn \seq_gset_from_clist:Nn { c      }
 \cs_new_protected:Npn \seq_const_from_clist:Nn #1#2
   {
-    \tl_const:Nx #1
+    \tl_const:Ne #1
       { \s__seq \clist_map_function:nN {#2} \__seq_wrap_item:n }
   }
 \cs_generate_variant:Nn \seq_const_from_clist:Nn { c }
 \cs_new_protected:Npn \seq_set_split:Nnn
-  { \__seq_set_split:NNNnn \__kernel_tl_set:Nx \tl_trim_spaces:n }
+  { \__seq_set_split:NNNnn \__kernel_tl_set:Ne \tl_trim_spaces:n }
 \cs_new_protected:Npn \seq_gset_split:Nnn
-  { \__seq_set_split:NNNnn \__kernel_tl_gset:Nx \tl_trim_spaces:n }
+  { \__seq_set_split:NNNnn \__kernel_tl_gset:Ne \tl_trim_spaces:n }
 \cs_new_protected:Npn \seq_set_split_keep_spaces:Nnn
-  { \__seq_set_split:NNNnn \__kernel_tl_set:Nx \exp_not:n }
+  { \__seq_set_split:NNNnn \__kernel_tl_set:Ne \exp_not:n }
 \cs_new_protected:Npn \seq_gset_split_keep_spaces:Nnn
-  { \__seq_set_split:NNNnn \__kernel_tl_gset:Nx \exp_not:n }
+  { \__seq_set_split:NNNnn \__kernel_tl_gset:Ne \exp_not:n }
 \cs_new_protected:Npn \__seq_set_split:NNNnn #1#2#3#4#5
   {
     \tl_if_empty:nTF {#4}
@@ -5315,7 +5403,7 @@
             \__seq_set_split_end:
             \__seq_set_split:Nw #2 \prg_do_nothing:
           }
-        \__kernel_tl_set:Nx \l__seq_internal_a_tl { \l__seq_internal_a_tl }
+        \__kernel_tl_set:Ne \l__seq_internal_a_tl { \l__seq_internal_a_tl }
       }
     #1 #3 { \s__seq \l__seq_internal_a_tl }
   }
@@ -5327,8 +5415,10 @@
   }
 \cs_new:Npn \__seq_set_split:w #1 \__seq_set_split_end:
   { \__seq_wrap_item:n {#1} }
-\cs_generate_variant:Nn \seq_set_split:Nnn  { NV , NnV , NVV , Nnx , Nxx }
-\cs_generate_variant:Nn \seq_gset_split:Nnn { NV , NnV , NVV , Nnx , Nxx }
+\cs_generate_variant:Nn \seq_set_split:Nnn  { NV , NnV , NVV , Nne , Nee }
+\cs_generate_variant:Nn \seq_set_split:Nnn  { Nnx , Nxx }
+\cs_generate_variant:Nn \seq_gset_split:Nnn { NV , NnV , NVV , Nne , Nee }
+\cs_generate_variant:Nn \seq_gset_split:Nnn { Nnx , Nxx }
 \cs_generate_variant:Nn \seq_set_split_keep_spaces:Nnn  { NnV }
 \cs_generate_variant:Nn \seq_gset_split_keep_spaces:Nnn { NnV }
 \cs_new_protected:Npn \seq_concat:NNN #1#2#3
@@ -5343,7 +5433,7 @@
   { TF , T , F , p }
 \cs_new_protected:Npn \seq_put_left:Nn #1#2
   {
-    \__kernel_tl_set:Nx #1
+    \__kernel_tl_set:Ne #1
       {
         \exp_not:n { \s__seq \__seq_item:n {#2} }
         \exp_not:f { \exp_after:wN \__seq_put_left_aux:w #1 }
@@ -5351,25 +5441,25 @@
   }
 \cs_new_protected:Npn \seq_gput_left:Nn #1#2
   {
-    \__kernel_tl_gset:Nx #1
+    \__kernel_tl_gset:Ne #1
       {
         \exp_not:n { \s__seq \__seq_item:n {#2} }
         \exp_not:f { \exp_after:wN \__seq_put_left_aux:w #1 }
       }
   }
 \cs_new:Npn \__seq_put_left_aux:w \s__seq { \exp_stop_f: }
-\cs_generate_variant:Nn \seq_put_left:Nn  {     NV , Nv , No , Nx }
-\cs_generate_variant:Nn \seq_put_left:Nn  { c , cV , cv , co , cx }
-\cs_generate_variant:Nn \seq_gput_left:Nn  {     NV , Nv , No , Nx }
-\cs_generate_variant:Nn \seq_gput_left:Nn  { c , cV , cv , co , cx }
+\cs_generate_variant:Nn \seq_put_left:Nn  {     NV , Nv , Ne , No , Nx }
+\cs_generate_variant:Nn \seq_put_left:Nn  { c , cV , cv , ce , co ,cx }
+\cs_generate_variant:Nn \seq_gput_left:Nn {     NV , Nv , Ne , No , Nx }
+\cs_generate_variant:Nn \seq_gput_left:Nn { c , cV , cv , ce , co , cx }
 \cs_new_protected:Npn \seq_put_right:Nn #1#2
   { \tl_put_right:Nn #1 { \__seq_item:n {#2} } }
 \cs_new_protected:Npn \seq_gput_right:Nn #1#2
   { \tl_gput_right:Nn #1 { \__seq_item:n {#2} } }
-\cs_generate_variant:Nn \seq_gput_right:Nn {     NV , Nv , No , Nx }
-\cs_generate_variant:Nn \seq_gput_right:Nn { c , cV , cv , co , cx }
-\cs_generate_variant:Nn \seq_put_right:Nn {     NV , Nv , No , Nx }
-\cs_generate_variant:Nn \seq_put_right:Nn { c , cV , cv , co , cx }
+\cs_generate_variant:Nn \seq_put_right:Nn  {     NV , Nv , Ne , No , Nx }
+\cs_generate_variant:Nn \seq_put_right:Nn  { c , cV , cv , ce , co , cx }
+\cs_generate_variant:Nn \seq_gput_right:Nn {     NV , Nv , Ne , No , Nx }
+\cs_generate_variant:Nn \seq_gput_right:Nn { c , cV , cv , ce , co , cx }
 \cs_new:Npn \__seq_wrap_item:n #1 { \exp_not:n { \__seq_item:n {#1} } }
 \seq_new:N \l__seq_remove_seq
 \cs_new_protected:Npn \seq_remove_duplicates:N
@@ -5389,9 +5479,9 @@
 \cs_generate_variant:Nn \seq_remove_duplicates:N  { c }
 \cs_generate_variant:Nn \seq_gremove_duplicates:N { c }
 \cs_new_protected:Npn \seq_remove_all:Nn
-  { \__seq_remove_all_aux:NNn \__kernel_tl_set:Nx }
+  { \__seq_remove_all_aux:NNn \__kernel_tl_set:Ne }
 \cs_new_protected:Npn \seq_gremove_all:Nn
-  { \__seq_remove_all_aux:NNn \__kernel_tl_gset:Nx }
+  { \__seq_remove_all_aux:NNn \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \__seq_remove_all_aux:NNn #1#2#3
   {
     \__seq_push_item_def:n
@@ -5412,19 +5502,21 @@
     #1 #2 {#2}
     \__seq_pop_item_def:
   }
-\cs_generate_variant:Nn \seq_remove_all:Nn  { NV , Nx , c , cV , cx }
-\cs_generate_variant:Nn \seq_gremove_all:Nn { NV , Nx , c , cV , cx }
+\cs_generate_variant:Nn \seq_remove_all:Nn  { NV , Ne , c , cV , ce }
+\cs_generate_variant:Nn \seq_remove_all:Nn  { Nx , cx }
+\cs_generate_variant:Nn \seq_gremove_all:Nn { NV , Ne , c , cV , ce }
+\cs_generate_variant:Nn \seq_gremove_all:Nn { Nx , cx }
 \cs_new_eq:NN \__seq_int_eval:w \tex_numexpr:D
 \cs_new_protected:Npn \seq_set_item:Nnn #1#2#3
-  { \__seq_set_item:NnnNN #1 {#2} {#3} \__kernel_tl_set:Nx \use_i:nn }
+  { \__seq_set_item:NnnNN #1 {#2} {#3} \__kernel_tl_set:Ne \use_i:nn }
 \cs_new_protected:Npn \seq_gset_item:Nnn #1#2#3
-  { \__seq_set_item:NnnNN #1 {#2} {#3} \__kernel_tl_gset:Nx \use_i:nn }
+  { \__seq_set_item:NnnNN #1 {#2} {#3} \__kernel_tl_gset:Ne \use_i:nn }
 \cs_generate_variant:Nn \seq_set_item:Nnn { c }
 \cs_generate_variant:Nn \seq_gset_item:Nnn { c }
 \prg_new_protected_conditional:Npnn \seq_set_item:Nnn #1#2#3 { TF , T , F }
-  { \__seq_set_item:NnnNN #1 {#2} {#3} \__kernel_tl_set:Nx \use_ii:nn }
+  { \__seq_set_item:NnnNN #1 {#2} {#3} \__kernel_tl_set:Ne \use_ii:nn }
 \prg_new_protected_conditional:Npnn \seq_gset_item:Nnn #1#2#3 { TF , T , F }
-  { \__seq_set_item:NnnNN #1 {#2} {#3} \__kernel_tl_gset:Nx \use_ii:nn }
+  { \__seq_set_item:NnnNN #1 {#2} {#3} \__kernel_tl_gset:Ne \use_ii:nn }
 \prg_generate_conditional_variant:Nnn \seq_set_item:Nnn { c } { TF , T , F }
 \prg_generate_conditional_variant:Nnn \seq_gset_item:Nnn { c } { TF , T , F }
 \cs_new_protected:Npn \__seq_set_item:NnnNN #1#2#3
@@ -5450,7 +5542,7 @@
   {
     #6
       {
-        \msg_error:nnxxx { seq } { item-too-large }
+        \msg_error:nneee { seq } { item-too-large }
           { \token_to_str:N #3 } {#2} {#1}
       }
       { \prg_return_false: }
@@ -5481,9 +5573,9 @@
     #5 #2
   }
 \cs_new_protected:Npn \seq_reverse:N
-  { \__seq_reverse:NN \__kernel_tl_set:Nx }
+  { \__seq_reverse:NN \__kernel_tl_set:Ne }
 \cs_new_protected:Npn \seq_greverse:N
-  { \__seq_reverse:NN \__kernel_tl_gset:Nx }
+  { \__seq_reverse:NN \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \__seq_reverse:NN #1 #2
   {
     \cs_set_eq:NN \__seq_tmp:w \__seq_item:n
@@ -5515,7 +5607,7 @@
   {
     \int_compare:nNnTF { \seq_count:N #2 } > \c_max_register_int
       {
-        \msg_error:nnx { seq } { shuffle-too-large }
+        \msg_error:nne { seq } { shuffle-too-large }
           { \token_to_str:N #2 }
       }
       {
@@ -5528,7 +5620,7 @@
           \seq_gclear:N \g__seq_internal_seq
           \int_step_inline:nn \l__seq_internal_a_int
             {
-              \seq_gput_right:Nx \g__seq_internal_seq
+              \seq_gput_right:Ne \g__seq_internal_seq
                 { \tex_the:D \tex_toks:D ##1 }
             }
         \group_end:
@@ -5567,7 +5659,7 @@
 \cs_new:Npn \__seq_if_in:
   { \prg_break:n { \group_end: \prg_return_true: } }
 \prg_generate_conditional_variant:Nnn \seq_if_in:Nn
-  { NV , Nv , No , Nx , c , cV , cv , co , cx } { T , F , TF }
+  { NV , Nv , Ne , No , Nx , c , cV , cv , ce , co , cx } { T , F , TF }
 \cs_new_protected:Npn \__seq_pop:NNNN #1#2#3#4
   {
     \if_meaning:w #3 \c_empty_seq
@@ -5588,7 +5680,7 @@
   }
 \cs_new_protected:Npn \seq_get_left:NN #1#2
   {
-    \__kernel_tl_set:Nx #2
+    \__kernel_tl_set:Ne #2
       {
         \exp_after:wN \__seq_get_left:wnw
         #1 \__seq_item:n { \q_no_value } \s__seq_stop
@@ -5613,7 +5705,7 @@
 \cs_generate_variant:Nn \seq_gpop_left:NN { c }
 \cs_new_protected:Npn \seq_get_right:NN #1#2
   {
-    \__kernel_tl_set:Nx #2
+    \__kernel_tl_set:Ne #2
       {
         \exp_after:wN \use_i_ii:nnn
         \exp_after:wN \__seq_get_right_loop:nw
@@ -5630,9 +5722,9 @@
 \cs_new:Npn \__seq_get_right_end:NnN #1#2#3 { \exp_not:n {#2} }
 \cs_generate_variant:Nn \seq_get_right:NN { c }
 \cs_new_protected:Npn \seq_pop_right:NN
-  { \__seq_pop:NNNN \__seq_pop_right:NNN \__kernel_tl_set:Nx }
+  { \__seq_pop:NNNN \__seq_pop_right:NNN \__kernel_tl_set:Ne }
 \cs_new_protected:Npn \seq_gpop_right:NN
-  { \__seq_pop:NNNN \__seq_pop_right:NNN \__kernel_tl_gset:Nx }
+  { \__seq_pop:NNNN \__seq_pop_right:NNN \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \__seq_pop_right:NNN #1#2#3
   {
     \cs_set_eq:NN \__seq_tmp:w \__seq_item:n
@@ -5644,7 +5736,7 @@
         #2
         {
           \if_false: { \fi: }
-          \__kernel_tl_set:Nx #3
+          \__kernel_tl_set:Ne #3
         }
         { } \use_none:nn
     \cs_set_eq:NN \__seq_item:n \__seq_tmp:w
@@ -5672,10 +5764,10 @@
   { \__seq_pop_TF:NNNN \__seq_pop_left:NNN \tl_gset:Nn #1 #2 }
 \prg_new_protected_conditional:Npnn \seq_pop_right:NN #1#2
   { T , F , TF }
-  { \__seq_pop_TF:NNNN \__seq_pop_right:NNN \__kernel_tl_set:Nx #1 #2 }
+  { \__seq_pop_TF:NNNN \__seq_pop_right:NNN \__kernel_tl_set:Ne #1 #2 }
 \prg_new_protected_conditional:Npnn \seq_gpop_right:NN #1#2
   { T , F , TF }
-  { \__seq_pop_TF:NNNN \__seq_pop_right:NNN \__kernel_tl_gset:Nx #1 #2 }
+  { \__seq_pop_TF:NNNN \__seq_pop_right:NNN \__kernel_tl_gset:Ne #1 #2 }
 \prg_generate_conditional_variant:Nnn \seq_pop_left:NN { c }
   { T , F , TF }
 \prg_generate_conditional_variant:Nnn \seq_gpop_left:NN { c }
@@ -5747,10 +5839,10 @@
     \__seq_push_item_def:
     \cs_gset:Npn \__seq_item:n ##1
   }
-\cs_new_protected:Npn \__seq_push_item_def:x
+\cs_new_protected:Npn \__seq_push_item_def:e
   {
     \__seq_push_item_def:
-    \cs_gset:Npx \__seq_item:n ##1
+    \cs_gset:Npe \__seq_item:n ##1
   }
 \cs_new_protected:Npn \__seq_push_item_def:
   {
@@ -5795,7 +5887,7 @@
   }
 \cs_new_protected:Npn \seq_map_variable:NNn #1#2#3
   {
-    \__seq_push_item_def:x
+    \__seq_push_item_def:e
       {
         \tl_set:Nn \exp_not:N #2 {##1}
         \exp_not:n {#3}
@@ -5861,9 +5953,9 @@
   }
 \cs_generate_variant:Nn \seq_map_pairwise_function:NNN { Nc , c , cc }
 \cs_new_protected:Npn \seq_set_map_x:NNn
-  { \__seq_set_map_x:NNNn \__kernel_tl_set:Nx }
+  { \__seq_set_map_x:NNNn \__kernel_tl_set:Ne }
 \cs_new_protected:Npn \seq_gset_map_x:NNn
-  { \__seq_set_map_x:NNNn \__kernel_tl_gset:Nx }
+  { \__seq_set_map_x:NNNn \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \__seq_set_map_x:NNNn #1#2#3#4
   {
     \__seq_push_item_def:n { \exp_not:N \__seq_item:n {#4} }
@@ -5871,9 +5963,9 @@
     \__seq_pop_item_def:
   }
 \cs_new_protected:Npn \seq_set_map:NNn
-  { \__seq_set_map:NNNn \__kernel_tl_set:Nx }
+  { \__seq_set_map:NNNn \__kernel_tl_set:Ne }
 \cs_new_protected:Npn \seq_gset_map:NNn
-  { \__seq_set_map:NNNn \__kernel_tl_gset:Nx }
+  { \__seq_set_map:NNNn \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \__seq_set_map:NNNn #1#2#3#4
   {
     \__seq_push_item_def:n { \exp_not:n { \__seq_item:n {#4} } }
@@ -5941,26 +6033,12 @@
 \cs_new:Npn \seq_use:Nn #1#2
   { \seq_use:Nnnn #1 {#2} {#2} {#2} }
 \cs_generate_variant:Nn \seq_use:Nn { c }
-\cs_new_eq:NN \seq_push:Nn  \seq_put_left:Nn
-\cs_new_eq:NN \seq_push:NV  \seq_put_left:NV
-\cs_new_eq:NN \seq_push:Nv  \seq_put_left:Nv
-\cs_new_eq:NN \seq_push:No  \seq_put_left:No
-\cs_new_eq:NN \seq_push:Nx  \seq_put_left:Nx
-\cs_new_eq:NN \seq_push:cn  \seq_put_left:cn
-\cs_new_eq:NN \seq_push:cV  \seq_put_left:cV
-\cs_new_eq:NN \seq_push:cv  \seq_put_left:cv
-\cs_new_eq:NN \seq_push:co  \seq_put_left:co
-\cs_new_eq:NN \seq_push:cx  \seq_put_left:cx
+\cs_new_eq:NN \seq_push:Nn \seq_put_left:Nn
+\cs_generate_variant:Nn \seq_push:Nn { NV , Nv , Ne , c , cV , cv , ce }
+\cs_generate_variant:Nn \seq_push:Nn { No , Nx , co , cx }
 \cs_new_eq:NN \seq_gpush:Nn \seq_gput_left:Nn
-\cs_new_eq:NN \seq_gpush:NV \seq_gput_left:NV
-\cs_new_eq:NN \seq_gpush:Nv \seq_gput_left:Nv
-\cs_new_eq:NN \seq_gpush:No \seq_gput_left:No
-\cs_new_eq:NN \seq_gpush:Nx \seq_gput_left:Nx
-\cs_new_eq:NN \seq_gpush:cn \seq_gput_left:cn
-\cs_new_eq:NN \seq_gpush:cV \seq_gput_left:cV
-\cs_new_eq:NN \seq_gpush:cv \seq_gput_left:cv
-\cs_new_eq:NN \seq_gpush:co \seq_gput_left:co
-\cs_new_eq:NN \seq_gpush:cx \seq_gput_left:cx
+\cs_generate_variant:Nn \seq_gpush:Nn { NV , Nv , Ne , c , cV , cv , ce }
+\cs_generate_variant:Nn \seq_gpush:Nn { No , Nx , co , cx }
 \cs_new_eq:NN \seq_get:NN \seq_get_left:NN
 \cs_new_eq:NN \seq_get:cN \seq_get_left:cN
 \cs_new_eq:NN \seq_pop:NN \seq_pop_left:NN
@@ -5973,9 +6051,9 @@
 \prg_new_eq_conditional:NNn \seq_pop:cN  \seq_pop_left:cN  { T , F , TF }
 \prg_new_eq_conditional:NNn \seq_gpop:NN \seq_gpop_left:NN { T , F , TF }
 \prg_new_eq_conditional:NNn \seq_gpop:cN \seq_gpop_left:cN { T , F , TF }
-\cs_new_protected:Npn \seq_show:N { \__seq_show:NN \msg_show:nnxxxx }
+\cs_new_protected:Npn \seq_show:N { \__seq_show:NN \msg_show:nneeee }
 \cs_generate_variant:Nn \seq_show:N { c }
-\cs_new_protected:Npn \seq_log:N { \__seq_show:NN \msg_log:nnxxxx }
+\cs_new_protected:Npn \seq_log:N { \__seq_show:NN \msg_log:nneeee }
 \cs_generate_variant:Nn \seq_log:N { c }
 \cs_new_protected:Npn \__seq_show:NN #1#2
   {
@@ -6110,7 +6188,8 @@
   }
 \cs_generate_variant:Nn \int_new:N { c }
 \cs_new_protected:Npn \int_const:Nn #1#2
-  { \exp_args:Nx \__int_const:nN { \int_eval:n {#2} } #1 }
+  { \__int_const:eN { \int_eval:n {#2} } #1 }
+\cs_generate_variant:Nn \int_const:Nn { c }
 \cs_new_protected:Npn \__int_const:nN #1#2
   {
     \int_compare:nNnTF {#1} < \c_zero_int
@@ -6131,7 +6210,7 @@
       }
     #2 = \__int_eval:w #1 \__int_eval_end:
   }
-\cs_generate_variant:Nn \int_const:Nn { c }
+\cs_generate_variant:Nn \__int_const:nN { e }
 \if_int_odd:w 0
   \cs_if_exist:NT \tex_luatexversion:D { 1 }
   \cs_if_exist:NT \tex_omathchardef:D  { 1 }
@@ -6436,7 +6515,7 @@
   {
     \int_gincr:N \g__kernel_prg_map_int
     \exp_args:NNc \__int_step:NNnnnn
-      \cs_gset_protected:Npx
+      \cs_gset_protected:Npe
       { __int_map_ \int_use:N \g__kernel_prg_map_int :w }
       {#1}{#2}{#3}
       {
@@ -6456,7 +6535,7 @@
   {
     \int_compare:nNnTF {#1} > {#2}
       {
-        \exp_args:NNo \exp_args:No \__int_to_symbols:nnnn
+        \__int_to_symbols:ennn
           {
             \int_case:nn
               { 1 + \int_mod:nn { #1 - 1 } {#2} }
@@ -6472,6 +6551,7 @@
       { \int_div_truncate:nn { #2 - 1 } {#3} } {#3} {#4}
     #1
   }
+\cs_generate_variant:Nn \__int_to_symbols:nnnn { e }
 \cs_new:Npn \int_to_alph:n #1
   {
     \int_to_symbols:nnn {#1} { 26 }
@@ -6859,7 +6939,7 @@
   {
     \exp_args:Nc \__kernel_chk_defined:NT { flag~#2 }
       {
-        \exp_args:Nx #1
+        \exp_args:Ne #1
           { \tl_to_str:n { flag~#2~height } = \flag_height:n {#2} }
       }
   }
@@ -6974,11 +7054,11 @@
       {
         \token_case_meaning:NnF #2
           {
-            \c_true_bool { \exp_args:Nx #1 { \token_to_str:N #2 = true } }
-            \c_false_bool { \exp_args:Nx #1 { \token_to_str:N #2 = false } }
+            \c_true_bool { \exp_args:Ne #1 { \token_to_str:N #2 = true } }
+            \c_false_bool { \exp_args:Ne #1 { \token_to_str:N #2 = false } }
           }
           {
-            \msg_error:nnxxx { kernel } { bad-type }
+            \msg_error:nneee { kernel } { bad-type }
               { \token_to_str:N #2 } { \token_to_meaning:N #2 } { bool }
           }
       }
@@ -7254,7 +7334,7 @@
         \cs_new_eq:cN { #1 _p: } \c_false_bool
       }
   }
-\str_const:Nx \c_sys_engine_str
+\str_const:Ne \c_sys_engine_str
   {
     \cs_if_exist:NT \tex_luatexversion:D { luatex }
     \cs_if_exist:NT \tex_pdftexversion:D { pdftex }
@@ -7273,7 +7353,7 @@
   }
 \group_begin:
   \cs_set_eq:NN \lua_now:e    \tex_directlua:D
-  \str_const:Nx \c_sys_engine_exec_str
+  \str_const:Ne \c_sys_engine_exec_str
     {
       \sys_if_engine_pdftex:T { pdf }
       \sys_if_engine_xetex:T  { xe  }
@@ -7291,7 +7371,7 @@
       tex
     }
 \group_end:
-\str_const:Nx \c_sys_engine_format_str
+\str_const:Ne \c_sys_engine_format_str
   {
     \cs_if_exist:NTF \fmtname
       {
@@ -7323,7 +7403,7 @@
       }
       { unknown }
   }
-\str_const:Nx \c_sys_engine_version_str
+\str_const:Ne \c_sys_engine_version_str
   {
     \str_case:on \c_sys_engine_str
       {
@@ -7392,7 +7472,7 @@
         \tl_if_blank:nF {#1}
           { \tl_gset:Nn \g__sys_backend_tl {#1} }
         \__sys_load_backend_check:N \g__sys_backend_tl
-        \str_const:Nx \c_sys_backend_str { \g__sys_backend_tl }
+        \str_const:Ne \c_sys_backend_str { \g__sys_backend_tl }
         \__kernel_sys_configuration_load:n
           { l3backend- \c_sys_backend_str }
       }
@@ -7408,7 +7488,7 @@
             { xetex }     { }
           }
           {
-            \msg_error:nnxx { sys } { wrong-backend }
+            \msg_error:nnee { sys } { wrong-backend }
               #1 { xetex }
             \tl_gset:Nn #1 { xetex }
           }
@@ -7427,7 +7507,7 @@
                   { \str_if_eq_p:Vn #1 { luatex } }
                   { \str_if_eq_p:Vn #1 { pdftex } }
                   {
-                    \msg_error:nnxx { sys } { wrong-backend }
+                    \msg_error:nnee { sys } { wrong-backend }
                       #1 { \sys_if_engine_luatex:TF { luatex } { pdftex } }
                     \sys_if_engine_luatex:TF
                       { \tl_gset:Nn #1 { luatex } }
@@ -7443,7 +7523,7 @@
                 { dvisvgm }  { }
               }
               {
-                \msg_error:nnxx { sys } { wrong-backend }
+                \msg_error:nnee { sys } { wrong-backend }
                   #1 { dvips }
                 \tl_gset:Nn #1 { dvips }
               }
@@ -7463,7 +7543,7 @@
     \bool_gset_true:N \g__sys_debug_bool
   }
 \tl_new:N \l__sys_internal_tl
-\tl_const:Nx \c__sys_marker_tl { : \token_to_str:N : }
+\tl_const:Ne \c__sys_marker_tl { : \token_to_str:N : }
 \cs_new_protected:Npn \sys_get_shell:nnN #1#2#3
   {
     \sys_get_shell:nnNF {#1} {#2} #3
@@ -7479,7 +7559,7 @@
   {
     \tl_if_in:nnTF {#1} { " }
       {
-        \msg_error:nnx
+        \msg_error:nne
           { kernel } { quote-in-shell } {#1}
         \prg_return_false:
       }
@@ -7515,7 +7595,7 @@
     \cs_new_protected:Npn \sys_shell_now:n #1
       { \iow_now:Nn \c__sys_shell_stream_int {#1} }
   }
-\cs_generate_variant:Nn \sys_shell_now:n { x }
+\cs_generate_variant:Nn \sys_shell_now:n { e, x }
 \sys_if_engine_luatex:TF
   {
     \cs_new_protected:Npn \sys_shell_shipout:n #1
@@ -7525,7 +7605,7 @@
     \cs_new_protected:Npn \sys_shell_shipout:n #1
       { \iow_shipout:Nn \c__sys_shell_stream_int {#1} }
   }
-\cs_generate_variant:Nn \sys_shell_shipout:n { x }
+\cs_generate_variant:Nn \sys_shell_shipout:n { e , x }
 \cs_new_protected:Npn \sys_everyjob:
   {
     \tl_use:N \g__sys_everyjob_tl
@@ -7570,7 +7650,7 @@
   }
 \__sys_everyjob:n
   {
-    \str_const:Nx \c_sys_timestamp_str
+    \str_const:Ne \c_sys_timestamp_str
       {
         \cs_if_exist:NTF \tex_directlua:D
           { \tex_directlua:D { tex.print(pdf.getcreationdate()) } }
@@ -7643,7 +7723,7 @@
 \tl_new:N \g__sys_finalise_tl
 \__sys_finalise:n
   {
-    \str_const:Nx \c_sys_output_str
+    \str_const:Ne \c_sys_output_str
       {
         \int_compare:nNnTF
           { \cs_if_exist_use:NF \tex_pdfoutput:D { 0 } } > { 0 }
@@ -7658,7 +7738,7 @@
 \tl_new:N \g__sys_backend_tl
 \__sys_finalise:n
   {
-    \__kernel_tl_gset:Nx \g__sys_backend_tl
+    \__kernel_tl_gset:Ne \g__sys_backend_tl
       {
         \sys_if_engine_xetex:TF
           { xetex }
@@ -7756,8 +7836,9 @@
 \cs_new_eq:NN \clist_new:N \tl_new:N
 \cs_new_eq:NN \clist_new:c \tl_new:c
 \cs_new_protected:Npn \clist_const:Nn #1#2
-  { \tl_const:Nx #1 { \__clist_sanitize:n {#2} } }
-\cs_generate_variant:Nn \clist_const:Nn { c , Nx , cx }
+  { \tl_const:Ne #1 { \__clist_sanitize:n {#2} } }
+\cs_generate_variant:Nn \clist_const:Nn { Ne , c , ce }
+\cs_generate_variant:Nn \clist_const:Nn { Nx , cx }
 \cs_new_eq:NN \clist_clear:N  \tl_clear:N
 \cs_new_eq:NN \clist_clear:c  \tl_clear:c
 \cs_new_eq:NN \clist_gclear:N \tl_gclear:N
@@ -7775,9 +7856,9 @@
 \cs_new_eq:NN \clist_gset_eq:cN \tl_gset_eq:cN
 \cs_new_eq:NN \clist_gset_eq:cc \tl_gset_eq:cc
 \cs_new_protected:Npn \clist_set_from_seq:NN
-  { \__clist_set_from_seq:NNNN \clist_clear:N  \__kernel_tl_set:Nx  }
+  { \__clist_set_from_seq:NNNN \clist_clear:N  \__kernel_tl_set:Ne  }
 \cs_new_protected:Npn \clist_gset_from_seq:NN
-  { \__clist_set_from_seq:NNNN \clist_gclear:N \__kernel_tl_gset:Nx }
+  { \__clist_set_from_seq:NNNN \clist_gclear:N \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \__clist_set_from_seq:NNNN #1#2#3#4
   {
     \seq_if_empty:NTF #4
@@ -7802,9 +7883,9 @@
 \cs_generate_variant:Nn \clist_gset_from_seq:NN {     Nc }
 \cs_generate_variant:Nn \clist_gset_from_seq:NN { c , cc }
 \cs_new_protected:Npn \clist_concat:NNN
-  { \__clist_concat:NNNN \__kernel_tl_set:Nx }
+  { \__clist_concat:NNNN \__kernel_tl_set:Ne }
 \cs_new_protected:Npn \clist_gconcat:NNN
-  { \__clist_concat:NNNN \__kernel_tl_gset:Nx }
+  { \__clist_concat:NNNN \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \__clist_concat:NNNN #1#2#3#4
   {
     #1 #2
@@ -7821,11 +7902,13 @@
 \prg_new_eq_conditional:NNn \clist_if_exist:c \cs_if_exist:c
   { TF , T , F , p }
 \cs_new_protected:Npn \clist_set:Nn #1#2
-  { \__kernel_tl_set:Nx #1 { \__clist_sanitize:n {#2} } }
+  { \__kernel_tl_set:Ne #1 { \__clist_sanitize:n {#2} } }
 \cs_new_protected:Npn \clist_gset:Nn #1#2
-  { \__kernel_tl_gset:Nx #1 { \__clist_sanitize:n {#2} } }
-\cs_generate_variant:Nn \clist_set:Nn  { NV , No , Nx , c , cV , co , cx }
-\cs_generate_variant:Nn \clist_gset:Nn { NV , No , Nx , c , cV , co , cx }
+  { \__kernel_tl_gset:Ne #1 { \__clist_sanitize:n {#2} } }
+\cs_generate_variant:Nn \clist_set:Nn  { NV , Ne , c , cV , ce }
+\cs_generate_variant:Nn \clist_set:Nn  { No , Nx , co , cx }
+\cs_generate_variant:Nn \clist_gset:Nn { NV , Ne , c , cV , ce }
+\cs_generate_variant:Nn \clist_gset:Nn { No , Nx , co , cx }
 \cs_new_protected:Npn \clist_put_left:Nn
   { \__clist_put_left:NNNn \clist_concat:NNN \clist_set:Nn }
 \cs_new_protected:Npn \clist_gput_left:Nn
@@ -7835,10 +7918,10 @@
     #2 \l__clist_internal_clist {#4}
     #1 #3 \l__clist_internal_clist #3
   }
-\cs_generate_variant:Nn \clist_put_left:Nn  {     NV , Nv , No , Nx }
-\cs_generate_variant:Nn \clist_put_left:Nn  { c , cV , cv , co , cx }
-\cs_generate_variant:Nn \clist_gput_left:Nn {     NV , Nv , No , Nx }
-\cs_generate_variant:Nn \clist_gput_left:Nn { c , cV , cv , co , cx }
+\cs_generate_variant:Nn \clist_put_left:Nn  { NV , Nv , Ne , c , cV , cv , ce }
+\cs_generate_variant:Nn \clist_put_left:Nn  { No , Nx , co , cx }
+\cs_generate_variant:Nn \clist_gput_left:Nn { NV , Nv , Ne , c , cV , cv , ce }
+\cs_generate_variant:Nn \clist_gput_left:Nn { No , Nx , co , cx }
 \cs_new_protected:Npn \clist_put_right:Nn
   { \__clist_put_right:NNNn \clist_concat:NNN \clist_set:Nn }
 \cs_new_protected:Npn \clist_gput_right:Nn
@@ -7848,10 +7931,14 @@
     #2 \l__clist_internal_clist {#4}
     #1 #3 #3 \l__clist_internal_clist
   }
-\cs_generate_variant:Nn \clist_put_right:Nn  {     NV , Nv , No , Nx }
-\cs_generate_variant:Nn \clist_put_right:Nn  { c , cV , cv , co , cx }
-\cs_generate_variant:Nn \clist_gput_right:Nn {     NV , Nv , No , Nx }
-\cs_generate_variant:Nn \clist_gput_right:Nn { c , cV , cv , co , cx }
+\cs_generate_variant:Nn \clist_put_right:Nn
+  { NV , Nv , Ne , c , cV , cv , ce }
+\cs_generate_variant:Nn \clist_put_right:Nn
+  { No , Nx , co , cx }
+\cs_generate_variant:Nn \clist_gput_right:Nn
+  { NV , Nv , Ne , c , cV , cv , ce }
+\cs_generate_variant:Nn \clist_gput_right:Nn
+  { No , Nx , co , cx }
 \cs_new_protected:Npn \clist_get:NN #1#2
   {
     \if_meaning:w #1 \c_empty_clist
@@ -7864,9 +7951,9 @@
   { \tl_set:Nn #3 {#1} }
 \cs_generate_variant:Nn \clist_get:NN { c }
 \cs_new_protected:Npn \clist_pop:NN
-  { \__clist_pop:NNN \__kernel_tl_set:Nx }
+  { \__clist_pop:NNN \__kernel_tl_set:Ne }
 \cs_new_protected:Npn \clist_gpop:NN
-  { \__clist_pop:NNN \__kernel_tl_gset:Nx }
+  { \__clist_pop:NNN \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \__clist_pop:NNN #1#2#3
   {
     \if_meaning:w #2 \c_empty_clist
@@ -7900,9 +7987,9 @@
   }
 \prg_generate_conditional_variant:Nnn \clist_get:NN { c } { T , F , TF }
 \prg_new_protected_conditional:Npnn \clist_pop:NN #1#2 { T , F , TF }
-  { \__clist_pop_TF:NNN \__kernel_tl_set:Nx #1 #2 }
+  { \__clist_pop_TF:NNN \__kernel_tl_set:Ne #1 #2 }
 \prg_new_protected_conditional:Npnn \clist_gpop:NN #1#2 { T , F , TF }
-  { \__clist_pop_TF:NNN \__kernel_tl_gset:Nx #1 #2 }
+  { \__clist_pop_TF:NNN \__kernel_tl_gset:Ne #1 #2 }
 \cs_new_protected:Npn \__clist_pop_TF:NNN #1#2#3
   {
     \if_meaning:w #2 \c_empty_clist
@@ -7915,21 +8002,9 @@
 \prg_generate_conditional_variant:Nnn \clist_pop:NN { c } { T , F , TF }
 \prg_generate_conditional_variant:Nnn \clist_gpop:NN { c } { T , F , TF }
 \cs_new_eq:NN \clist_push:Nn  \clist_put_left:Nn
-\cs_new_eq:NN \clist_push:NV  \clist_put_left:NV
-\cs_new_eq:NN \clist_push:No  \clist_put_left:No
-\cs_new_eq:NN \clist_push:Nx  \clist_put_left:Nx
-\cs_new_eq:NN \clist_push:cn  \clist_put_left:cn
-\cs_new_eq:NN \clist_push:cV  \clist_put_left:cV
-\cs_new_eq:NN \clist_push:co  \clist_put_left:co
-\cs_new_eq:NN \clist_push:cx  \clist_put_left:cx
+\cs_generate_variant:Nn \clist_push:Nn { NV , No , Nx , c , cV , co , cx }
 \cs_new_eq:NN \clist_gpush:Nn \clist_gput_left:Nn
-\cs_new_eq:NN \clist_gpush:NV \clist_gput_left:NV
-\cs_new_eq:NN \clist_gpush:No \clist_gput_left:No
-\cs_new_eq:NN \clist_gpush:Nx \clist_gput_left:Nx
-\cs_new_eq:NN \clist_gpush:cn \clist_gput_left:cn
-\cs_new_eq:NN \clist_gpush:cV \clist_gput_left:cV
-\cs_new_eq:NN \clist_gpush:co \clist_gput_left:co
-\cs_new_eq:NN \clist_gpush:cx \clist_gput_left:cx
+\cs_generate_variant:Nn \clist_gpush:Nn { NV , No , Nx , c , cV , co , cx }
 \clist_new:N \l__clist_internal_remove_clist
 \seq_new:N \l__clist_internal_remove_seq
 \cs_new_protected:Npn \clist_remove_duplicates:N
@@ -7943,7 +8018,7 @@
       {
         \clist_if_in:NnF \l__clist_internal_remove_clist {##1}
           {
-            \tl_put_right:Nx \l__clist_internal_remove_clist
+            \tl_put_right:Ne \l__clist_internal_remove_clist
               {
                 \clist_if_empty:NF \l__clist_internal_remove_clist { , }
                 \__clist_if_wrap:nTF {##1} { \exp_not:n { {##1} } } { \exp_not:n {##1} }
@@ -7955,9 +8030,9 @@
 \cs_generate_variant:Nn \clist_remove_duplicates:N  { c }
 \cs_generate_variant:Nn \clist_gremove_duplicates:N { c }
 \cs_new_protected:Npn \clist_remove_all:Nn
-  { \__clist_remove_all:NNNn \clist_set_from_seq:NN \__kernel_tl_set:Nx }
+  { \__clist_remove_all:NNNn \clist_set_from_seq:NN \__kernel_tl_set:Ne }
 \cs_new_protected:Npn \clist_gremove_all:Nn
-  { \__clist_remove_all:NNNn \clist_gset_from_seq:NN \__kernel_tl_gset:Nx }
+  { \__clist_remove_all:NNNn \clist_gset_from_seq:NN \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \__clist_remove_all:NNNn #1#2#3#4
   {
     \__clist_if_wrap:nTF {#4}
@@ -7994,9 +8069,9 @@
 \cs_generate_variant:Nn \clist_remove_all:Nn  { c , NV , cV }
 \cs_generate_variant:Nn \clist_gremove_all:Nn { c , NV , cV }
 \cs_new_protected:Npn \clist_reverse:N #1
-  { \__kernel_tl_set:Nx #1 { \exp_args:No \clist_reverse:n {#1} } }
+  { \__kernel_tl_set:Ne #1 { \exp_args:No \clist_reverse:n {#1} } }
 \cs_new_protected:Npn \clist_greverse:N #1
-  { \__kernel_tl_gset:Nx #1 { \exp_args:No \clist_reverse:n {#1} } }
+  { \__kernel_tl_gset:Ne #1 { \exp_args:No \clist_reverse:n {#1} } }
 \cs_generate_variant:Nn \clist_reverse:N { c }
 \cs_generate_variant:Nn \clist_greverse:N { c }
 \cs_new:Npn \clist_reverse:n #1
@@ -8043,7 +8118,7 @@
   {
     \__clist_if_wrap:nTF {#2}
       {
-        \cs_set:Npx \__clist_tmp:w ##1
+        \cs_set:Npe \__clist_tmp:w ##1
           {
             \exp_not:N \tl_if_eq:nnT {##1}
             \exp_not:n
@@ -8097,6 +8172,7 @@
       \s__clist_stop \clist_map_break: ,
     \prg_break_point:Nn \clist_map_break: { }
   }
+\cs_generate_variant:Nn \clist_map_function:nN { e }
 \cs_new:Npn \__clist_map_function_n:Nn #1 #2
   {
     \__clist_use_none_delimit_by_s_stop:w #2 \s__clist_stop
@@ -8211,6 +8287,7 @@
       }
   }
 \exp_args:No \__clist_tmp:w \c_space_tl
+\cs_generate_variant:Nn \clist_count:n { e }
 \cs_new:Npn \clist_use:Nnnn #1#2#3#4
   {
     \clist_if_exist:NTF #1
@@ -8316,6 +8393,7 @@
       {#1}
       \__clist_item_n:nw
   }
+\cs_generate_variant:Nn \clist_item:nn { e }
 \cs_new:Npn \__clist_item_n:nw #1
   { \__clist_item_n_loop:nw {#1} \prg_do_nothing: }
 \cs_new:Npn \__clist_item_n_loop:nw #1 #2,
@@ -8349,9 +8427,9 @@
       { \clist_item:Nn #1 { \int_rand:nn { 1 } { \clist_count:N #1 } } }
   }
 \cs_generate_variant:Nn \clist_rand_item:N { c }
-\cs_new_protected:Npn \clist_show:N { \__clist_show:NN \msg_show:nnxxxx }
+\cs_new_protected:Npn \clist_show:N { \__clist_show:NN \msg_show:nneeee }
 \cs_generate_variant:Nn \clist_show:N { c }
-\cs_new_protected:Npn \clist_log:N { \__clist_show:NN \msg_log:nnxxxx }
+\cs_new_protected:Npn \clist_log:N { \__clist_show:NN \msg_log:nneeee }
 \cs_generate_variant:Nn \clist_log:N { c }
 \cs_new_protected:Npn \__clist_show:NN #1#2
   {
@@ -8366,13 +8444,13 @@
               { } { }
           }
           {
-            \msg_error:nnxx { clist } { non-clist }
+            \msg_error:nnee { clist } { non-clist }
               { \token_to_str:N #2 } { \tl_to_str:N #2 }
           }
       }
   }
-\cs_new_protected:Npn \clist_show:n { \__clist_show:Nn \msg_show:nnxxxx }
-\cs_new_protected:Npn \clist_log:n { \__clist_show:Nn \msg_log:nnxxxx }
+\cs_new_protected:Npn \clist_show:n { \__clist_show:Nn \msg_show:nneeee }
+\cs_new_protected:Npn \clist_log:n { \__clist_show:Nn \msg_log:nneeee }
 \cs_new_protected:Npn \__clist_show:Nn #1#2
   {
     #1 { clist } { show }
@@ -8496,7 +8574,7 @@
             \char_set_lccode:nn { `\^^@ } { ##1 }
           \tex_lowercase:D { \group_end: #2 ^^@ }
         }
-      \cs_new_protected:cpx { #1 :NN } ##1
+      \cs_new_protected:cpe { #1 :NN } ##1
         { \exp_not:c { #1 : nN } { `##1 } }
     }
   \__char_tmp:nN { char_set_active_eq }  \cs_set_eq:NN
@@ -8563,7 +8641,7 @@
     \char_set_catcode_math_superscript:n { 0 }
     \tl_put_right:Nn \l__char_tmp_tl { ^^@ \exp_not:N \or: }
     \char_set_catcode_parameter:n { 0 }
-    \tl_put_right:Nn \l__char_tmp_tl { ^^@^^@ \exp_not:N \or: }
+    \tl_put_right:Nn \l__char_tmp_tl { ^^@ \exp_not:N \or: }
     \tl_put_right:Nn \l__char_tmp_tl { { \if_false: } \fi: \exp_not:N \or: }
     \char_set_catcode_alignment:n { 0 }
     \tl_put_right:Nn \l__char_tmp_tl { ^^@ \exp_not:N \or: }
@@ -8577,9 +8655,9 @@
         {
           \char_set_lccode:nn { 0 } {#1}
           \char_set_lccode:nn { 32 } {#1}
-          \exp_args:Nx \tex_lowercase:D
+          \exp_args:Ne \tex_lowercase:D
             {
-              \tl_const:Nx
+              \tl_const:Ne
                 \exp_not:c { c__char_ \__char_int_to_roman:w #1 _tl }
                 { \exp_not:o \l__char_tmp_tl }
             }
@@ -8725,7 +8803,7 @@
   \char_set_lccode:nn { `* } { `\ }
   \tex_lowercase:D { \tl_const:Nn \c_catcode_active_space_tl { * } }
 \group_end:
-\tl_const:Nx \c_catcode_other_space_tl { \char_generate:nn { `\  } { 12 } }
+\tl_const:Ne \c_catcode_other_space_tl { \char_generate:nn { `\  } { 12 } }
 \scan_new:N \s__token_mark
 \scan_new:N \s__token_stop
 \group_begin:
@@ -8821,17 +8899,17 @@
     \if_charcode:w \exp_not:N #1 \exp_not:N #2
       \prg_return_true: \else: \prg_return_false: \fi:
   }
-\use:x
+\use:e
   {
-    \prg_new_conditional:Npnn \exp_not:N \token_if_macro:N ##1
+    \prg_new_conditional:Npnn \exp_not:N \token_if_macro:N #1
       { p , T ,  F , TF }
       {
         \exp_not:N \exp_after:wN \exp_not:N \__token_if_macro_p:w
-        \exp_not:N \token_to_meaning:N ##1 \tl_to_str:n { ma : }
+        \exp_not:N \token_to_meaning:N #1 \tl_to_str:n { ma : }
           \s__token_stop
       }
     \cs_new:Npn \exp_not:N  \__token_if_macro_p:w
-      ##1 \tl_to_str:n { ma } ##2 \c_colon_str ##3 \s__token_stop
+      #1 \tl_to_str:n { ma } #2 \c_colon_str #3 \s__token_stop
   }
       {
         \str_if_eq:nnTF { #2 } { cro }
@@ -8858,11 +8936,11 @@
 \group_begin:
 \cs_set_protected:Npn \__token_tmp:w #1
   {
-    \use:x
+    \use:e
       {
         \cs_new:Npn \exp_not:c { __token_delimit_by_ #1 :w }
-            ####1 \tl_to_str:n {#1} ####2 \s__token_stop
-          { ####1 \tl_to_str:n {#1} }
+            ##1 \tl_to_str:n {#1} ##2 \s__token_stop
+          { ##1 \tl_to_str:n {#1} }
       }
   }
 \__token_tmp:w { char" }
@@ -8877,17 +8955,17 @@
 \group_begin:
 \cs_set_protected:Npn \__token_tmp:w #1#2#3
   {
-    \use:x
+    \use:e
       {
-        \prg_new_conditional:Npnn \exp_not:c { token_if_ #1 :N } ####1
+        \prg_new_conditional:Npnn \exp_not:c { token_if_ #1 :N } ##1
           { p , T ,  F , TF }
           {
             \cs_if_exist:cT { tex_ #2 :D }
               {
-                \exp_not:N \if_meaning:w ####1 \exp_not:c { tex_ #2 :D }
+                \exp_not:N \if_meaning:w ##1 \exp_not:c { tex_ #2 :D }
                 \exp_not:N \prg_return_false:
                 \exp_not:N \else:
-                \exp_not:N \if_meaning:w ####1 \exp_not:c { tex_ #2 def:D }
+                \exp_not:N \if_meaning:w ##1 \exp_not:c { tex_ #2 def:D }
                 \exp_not:N \prg_return_false:
                 \exp_not:N \else:
               }
@@ -8895,7 +8973,7 @@
               {
                 \exp_not:N \exp_after:wN
                 \exp_not:c { __token_delimit_by_ #2 :w }
-                \exp_not:N \token_to_meaning:N ####1
+                \exp_not:N \token_to_meaning:N ##1
                 ? \tl_to_str:n {#2} \s__token_stop
               }
               { \exp_not:n {#3} }
@@ -8932,26 +9010,26 @@
   }
   {
     \tex_chardef:D \c__token_A_int = `A ~ %
-    \use:x
+    \use:e
       {
-        \prg_new_conditional:Npnn \exp_not:N \token_if_primitive:N ##1
+        \prg_new_conditional:Npnn \exp_not:N \token_if_primitive:N #1
           { p , T , F , TF }
           {
-            \exp_not:N \token_if_macro:NTF ##1
+            \exp_not:N \token_if_macro:NTF #1
               \exp_not:N \prg_return_false:
               {
                 \exp_not:N \exp_after:wN \exp_not:N \__token_if_primitive:NNw
-                \exp_not:N \token_to_meaning:N ##1
-                  \tl_to_str:n { : : : } \s__token_stop ##1
+                \exp_not:N \token_to_meaning:N #1
+                  \tl_to_str:n { : : : } \s__token_stop #1
               }
           }
         \cs_new:Npn \exp_not:N \__token_if_primitive:NNw
-          ##1##2 ##3 \c_colon_str ##4 \s__token_stop
+          #1#2 #3 \c_colon_str #4 \s__token_stop
           {
             \exp_not:N \tl_if_empty:oTF
-              { \exp_not:N \__token_if_primitive_space:w ##3 ~ }
+              { \exp_not:N \__token_if_primitive_space:w #3 ~ }
               {
-                \exp_not:N \__token_if_primitive_loop:N ##3
+                \exp_not:N \__token_if_primitive_loop:N #3
                   \c_colon_str \s__token_stop
               }
               { \exp_not:N \__token_if_primitive_nullfont:N }
@@ -9054,7 +9132,7 @@
   }
 \cs_new_protected:Npn \peek_remove_spaces:n #1
   {
-    \cs_set:Npx \__peek_false:w { \exp_not:n {#1} }
+    \cs_set:Npe \__peek_false:w { \exp_not:n {#1} }
     \group_align_safe_begin:
     \cs_set:Npn \__peek_true_aux:w { \peek_after:Nw \__peek_remove_spaces: }
     \__peek_true_aux:w
@@ -9071,7 +9149,7 @@
 \cs_new_protected:Npn \peek_remove_filler:n #1
   {
     \cs_set:Npn \__peek_true_aux:w { \__peek_remove_filler:w }
-    \cs_set:Npx \__peek_false:w
+    \cs_set:Npe \__peek_false:w
       {
         \exp_not:N \group_align_safe_end:
         \exp_not:n {#1}
@@ -9111,13 +9189,13 @@
     \group_align_safe_begin:
     \cs_set_eq:NN \l__peek_search_token #3
     \tl_set:Nn \l__peek_search_tl {#3}
-    \cs_set:Npx \__peek_true_aux:w
+    \cs_set:Npe \__peek_true_aux:w
       {
         \exp_not:N \group_align_safe_end:
         \exp_not:n {#4}
       }
     \cs_set_eq:NN \__peek_true:w #1
-    \cs_set:Npx \__peek_false:w
+    \cs_set:Npe \__peek_false:w
       {
         \exp_not:N \group_align_safe_end:
         \exp_not:n {#5}
@@ -9183,7 +9261,7 @@
       {
         \tl_map_inline:nn { { TF } { T } { F } }
           {
-            \cs_new_protected:cpx { peek_ #1 ##1 :N ####1 }
+            \cs_new_protected:cpe { peek_ #1 ##1 :N ####1 }
               {
                 \exp_not:c { __peek_token ##1 _generic:NN ####1 }
                 \exp_not:c { __peek_execute_branches_ #1 : }
@@ -9302,7 +9380,7 @@
 \cs_new_protected:Npn \prop_const_from_keyval:Nn #1#2
   {
     \prop_set_from_keyval:Nn \l__prop_internal_prop {#2}
-    \tl_const:Nx #1 { \exp_not:o \l__prop_internal_prop }
+    \tl_const:Ne #1 { \exp_not:o \l__prop_internal_prop }
     \prop_clear:N \l__prop_internal_prop
   }
 \cs_generate_variant:Nn \prop_const_from_keyval:Nn { c }
@@ -9353,18 +9431,17 @@
       { \tl_gset:Nn #1 { ##1 ##3 } }
       { }
   }
-\cs_generate_variant:Nn \prop_remove:Nn  {     NV }
-\cs_generate_variant:Nn \prop_remove:Nn  { c , cV }
-\cs_generate_variant:Nn \prop_gremove:Nn {     NV }
-\cs_generate_variant:Nn \prop_gremove:Nn { c , cV }
+\cs_generate_variant:Nn \prop_remove:Nn  { NV , Ne , c , cV , ce }
+\cs_generate_variant:Nn \prop_gremove:Nn { NV , Ne , c , cV , ce }
 \cs_new_protected:Npn \prop_get:NnN #1#2#3
   {
     \__prop_split:NnTF #1 {#2}
       { \tl_set:Nn #3 {##2} }
       { \tl_set:Nn #3 { \q_no_value } }
   }
-\cs_generate_variant:Nn \prop_get:NnN {     NV , Nv , No , Nx }
-\cs_generate_variant:Nn \prop_get:NnN { c , cV , cv , co , cx , cnc }
+\cs_generate_variant:Nn \prop_get:NnN { NV , Nv , Ne , c , cV , cv , ce }
+\cs_generate_variant:Nn \prop_get:NnN { No , Nx , co , cx }
+\cs_generate_variant:Nn \prop_get:NnN { cnc }
 \cs_new_protected:Npn \prop_pop:NnN #1#2#3
   {
     \__prop_split:NnTF #1 {#2}
@@ -9383,10 +9460,10 @@
       }
       { \tl_set:Nn #3 { \q_no_value } }
   }
-\cs_generate_variant:Nn \prop_pop:NnN  {     No }
-\cs_generate_variant:Nn \prop_pop:NnN  { c , co }
-\cs_generate_variant:Nn \prop_gpop:NnN {     No }
-\cs_generate_variant:Nn \prop_gpop:NnN { c , co }
+\cs_generate_variant:Nn \prop_pop:NnN  {     NV , No }
+\cs_generate_variant:Nn \prop_pop:NnN  { c , cV , co }
+\cs_generate_variant:Nn \prop_gpop:NnN {     NV , No }
+\cs_generate_variant:Nn \prop_gpop:NnN { c , cV , co }
 \cs_new:Npn \prop_item:Nn #1#2
   {
     \exp_args:NNo \prop_map_tokens:Nn #1
@@ -9446,10 +9523,10 @@
       }
       { \prg_return_false: }
   }
-\prg_generate_conditional_variant:Nnn \prop_pop:NnN { c } { T , F , TF }
-\prg_generate_conditional_variant:Nnn \prop_gpop:NnN { c } { T , F , TF }
-\cs_new_protected:Npn \prop_put:Nnn  { \__prop_put:NNnn \__kernel_tl_set:Nx }
-\cs_new_protected:Npn \prop_gput:Nnn { \__prop_put:NNnn \__kernel_tl_gset:Nx }
+\prg_generate_conditional_variant:Nnn \prop_pop:NnN  { NV , c , cV } { T , F , TF }
+\prg_generate_conditional_variant:Nnn \prop_gpop:NnN { NV , c , cV } { T , F , TF }
+\cs_new_protected:Npn \prop_put:Nnn  { \__prop_put:NNnn \__kernel_tl_set:Ne }
+\cs_new_protected:Npn \prop_gput:Nnn { \__prop_put:NNnn \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \__prop_put:NNnn #1#2#3#4
   {
     \tl_set:Nn \l__prop_internal_tl
@@ -9462,17 +9539,37 @@
       { #1 #2 { \exp_not:o {#2} \l__prop_internal_tl } }
   }
 \cs_generate_variant:Nn \prop_put:Nnn
-  {     NnV , Nno , Nne , Nnx , NV , NVV , NVx , Nvx , No , Nx , NxV , Noo , Nxx }
+  {
+         NnV , Nnv , Nne , NV , NVV , NVv , NVe ,
+    Nv , NvV , Nvv , Nve , Ne , NeV , Nev , Nee
+  }
+\cs_generate_variant:Nn \prop_put:Nnn
+  { Nno , No , Noo , Nnx , NVx , NxV , Nxx }
+\cs_generate_variant:Nn \prop_put:Nnn
+  {
+    c  , cnV , cnv , cne , cV , cVV , cVv , cVe ,
+    cv , cvV , cvv , cve , ce , ceV , cev , cee
+  }
 \cs_generate_variant:Nn \prop_put:Nnn
-  { c , cnV , cno , cne , cnx , cV , cVV , cVx , cvx , co , cx , cxV , coo , cxx }
+  { cno , co , coo , cnx , cVx , cxV , cxx }
+\cs_generate_variant:Nn \prop_gput:Nnn
+  {
+         NnV , Nnv , Nne , NV , NVV , NVv , NVe ,
+    Nv , NvV , Nvv , Nve , Ne , NeV , Nev , Nee
+  }
 \cs_generate_variant:Nn \prop_gput:Nnn
-  {     NnV , Nno , Nne , Nnx , NV , NVV , NVx , Nvx , No , Nx , NxV , Noo , Nxx }
+  { Nno , No , Noo , Nnx , NVx , NxV , Nxx }
 \cs_generate_variant:Nn \prop_gput:Nnn
-  { c , cnV , cno , cne , cnx , cV , cVV , cVx , cvx , co , cx , cxV , coo , cxx }
+  {
+    c  , cnV , cnv , cne , cV , cVV , cVv , cVe ,
+    cv , cvV , cvv , cve , ce , ceV , cev , cee
+  }
+\cs_generate_variant:Nn \prop_gput:Nnn
+  { cno , co , coo , cnx , cVx , cxV , cxx }
 \cs_new_protected:Npn \prop_put_if_new:Nnn
-  { \__prop_put_if_new:NNnn \__kernel_tl_set:Nx }
+  { \__prop_put_if_new:NNnn \__kernel_tl_set:Ne }
 \cs_new_protected:Npn \prop_gput_if_new:Nnn
-  { \__prop_put_if_new:NNnn \__kernel_tl_gset:Nx }
+  { \__prop_put_if_new:NNnn \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \__prop_put_if_new:NNnn #1#2#3#4
   {
     \tl_set:Nn \l__prop_internal_tl
@@ -9484,8 +9581,10 @@
       { }
       { #1 #2 { \exp_not:o {#2} \l__prop_internal_tl } }
   }
-\cs_generate_variant:Nn \prop_put_if_new:Nnn  { c }
-\cs_generate_variant:Nn \prop_gput_if_new:Nnn { c }
+\cs_generate_variant:Nn \prop_put_if_new:Nnn
+  { NnV , NV , cnV , cV }
+\cs_generate_variant:Nn \prop_gput_if_new:Nnn
+  { NnV , NV , cnV , cV }
 \prg_new_eq_conditional:NNn \prop_if_exist:N \cs_if_exist:N
   { TF , T , F , p }
 \prg_new_eq_conditional:NNn \prop_if_exist:c \cs_if_exist:c
@@ -9509,7 +9608,7 @@
       { \prop_map_break:n { \use_i:nn \prg_return_true: } }
   }
 \prg_generate_conditional_variant:Nnn \prop_if_in:Nn
-  { NV , No , c , cV , co } { p , T , F , TF }
+  { NV , Ne , No , c , cV , ce , co } { p , T , F , TF }
 \prg_new_protected_conditional:Npnn \prop_get:NnN #1#2#3 { T , F , TF }
   {
     \__prop_split:NnTF #1 {#2}
@@ -9520,7 +9619,11 @@
       { \prg_return_false: }
   }
 \prg_generate_conditional_variant:Nnn \prop_get:NnN
-  { NV , Nv , No , Nx , c , cV , cv , co , cx , cnc } { T , F , TF }
+  { NV , Nv , Ne , c , cV , cv , ce } { T , F , TF }
+\prg_generate_conditional_variant:Nnn \prop_get:NnN
+  { No , Nx , co , cx } { T , F , TF }
+\prg_generate_conditional_variant:Nnn \prop_get:NnN
+  { cnc } { T , F , TF }
 \cs_new:Npn \prop_map_function:NN #1#2
   {
     \exp_after:wN \use_i_ii:nnn
@@ -9588,9 +9691,9 @@
   { \prg_map_break:Nn \prop_map_break: { } }
 \cs_new:Npn \prop_map_break:n
   { \prg_map_break:Nn \prop_map_break: }
-\cs_new_protected:Npn \prop_show:N { \__prop_show:NN \msg_show:nnxxxx }
+\cs_new_protected:Npn \prop_show:N { \__prop_show:NN \msg_show:nneeee }
 \cs_generate_variant:Nn \prop_show:N { c }
-\cs_new_protected:Npn \prop_log:N { \__prop_show:NN \msg_log:nnxxxx }
+\cs_new_protected:Npn \prop_log:N { \__prop_show:NN \msg_log:nneeee }
 \cs_generate_variant:Nn \prop_log:N { c }
 \cs_new_protected:Npn \__prop_show:NN #1#2
   {
@@ -9631,7 +9734,7 @@
   {
     \msg_if_exist:nnT {#1} {#2}
       {
-        \msg_error:nnxx { msg } { already-defined }
+        \msg_error:nnnn { msg } { already-defined }
           {#1} {#2}
       }
   }
@@ -9640,10 +9743,10 @@
     \__msg_chk_free:nn {#1} {#2}
     \msg_gset:nnnn {#1} {#2}
   }
-\cs_generate_variant:Nn \msg_new:nnnn { nnxx }
+\cs_generate_variant:Nn \msg_new:nnnn { nnee , nnxx }
 \cs_new_protected:Npn \msg_new:nnn #1#2#3
   { \msg_new:nnnn {#1} {#2} {#3} { } }
-\cs_generate_variant:Nn \msg_new:nnn { nnx }
+\cs_generate_variant:Nn \msg_new:nnn { nne , nnx }
 \cs_new_protected:Npn \msg_set:nnnn #1#2#3#4
   {
     \cs_set:cpn { \c__msg_text_prefix_tl #1 / #2 }
@@ -9703,8 +9806,8 @@
   }
 \cs_new_protected:Npn \__msg_interrupt:NnnnN #1#2#3#4#5
   {
-    \str_set:Nx \l__msg_text_str { #1 {#2} }
-    \str_set:Nx \l__msg_name_str { \msg_module_name:n {#2} }
+    \str_set:Ne \l__msg_text_str { #1 {#2} }
+    \str_set:Ne \l__msg_name_str { \msg_module_name:n {#2} }
     \cs_if_eq:cNTF
       { \c__msg_more_text_prefix_tl #2 / #3 }
       \__msg_no_more_text:nnnn
@@ -9735,7 +9838,7 @@
     \iow_wrap:nnnN { \\ #3 } { } { } \__msg_interrupt_more_text:n
     \group_begin:
       \int_sub:Nn \l_iow_line_count_int { 2 }
-      \iow_wrap:nxnN { \l__msg_text_str : ~ #1 }
+      \iow_wrap:nenN { \l__msg_text_str : ~ #1 }
         {
           ( \l__msg_name_str )
           \prg_replicate:nn
@@ -9756,7 +9859,7 @@
     \tl_set:Nn \l__msg_internal_tl {#1}
   }
 \cs_new_protected:Npn \__msg_interrupt_more_text:n #1
-  { \exp_args:Nx \tex_errhelp:D { #1 \iow_newline: } }
+  { \exp_args:Ne \tex_errhelp:D { #1 \iow_newline: } }
 \group_begin:
   \char_set_lccode:nn { 38 } { 32 } % &
   \char_set_lccode:nn { 46 } { 32 } % .
@@ -9846,39 +9949,28 @@
           ##1##2##3##4##5##6 {#2}
       \cs_new_protected:cpn { msg_ #1 :nnnnnn } ##1##2##3##4##5##6
         {
-          \use:x
+          \use:e
             {
               \exp_not:n { \__msg_use:nnnnnnn {#1} {##1} {##2} }
                 { \tl_to_str:n {##3} } { \tl_to_str:n {##4} }
                 { \tl_to_str:n {##5} } { \tl_to_str:n {##6} }
             }
         }
-      \cs_new_protected:cpx { msg_ #1 :nnnnn } ##1##2##3##4##5
+      \cs_new_protected:cpe { msg_ #1 :nnnnn } ##1##2##3##4##5
         { \exp_not:c { msg_ #1 :nnnnnn } {##1} {##2} {##3} {##4} {##5} { } }
-      \cs_new_protected:cpx { msg_ #1 :nnnn } ##1##2##3##4
+      \cs_new_protected:cpe { msg_ #1 :nnnn } ##1##2##3##4
         { \exp_not:c { msg_ #1 :nnnnnn } {##1} {##2} {##3} {##4} { } { } }
-      \cs_new_protected:cpx { msg_ #1 :nnn } ##1##2##3
+      \cs_new_protected:cpe { msg_ #1 :nnn } ##1##2##3
         { \exp_not:c { msg_ #1 :nnnnnn } {##1} {##2} {##3} { } { } { } }
-      \cs_new_protected:cpx { msg_ #1 :nn } ##1##2
+      \cs_new_protected:cpe { msg_ #1 :nn } ##1##2
         { \exp_not:c { msg_ #1 :nnnnnn } {##1} {##2} { } { } { } { } }
-      \cs_generate_variant:cn { msg_ #1 :nnn } { nnV }
-      \cs_generate_variant:cn { msg_ #1 :nnnn } { nnVV , nnVn , nnnV , nnnx }
-      \cs_generate_variant:cn { msg_ #1 :nnnnn } { nnnxx }
-      \cs_new_protected:cpx { msg_ #1 :nnxxxx } ##1##2##3##4##5##6
-        {
-          \use:x
-            {
-              \exp_not:N \exp_not:n
-                { \exp_not:c { msg_ #1 :nnnnnn } {##1} {##2} }
-                {##3} {##4} {##5} {##6}
-            }
-        }
-      \cs_new_protected:cpx { msg_ #1 :nnxxx } ##1##2##3##4##5
-        { \exp_not:c { msg_ #1 :nnxxxx } {##1} {##2} {##3} {##4} {##5} { } }
-      \cs_new_protected:cpx { msg_ #1 :nnxx } ##1##2##3##4
-        { \exp_not:c { msg_ #1 :nnxxxx } {##1} {##2} {##3} {##4} { } { } }
-      \cs_new_protected:cpx { msg_ #1 :nnx } ##1##2##3
-        { \exp_not:c { msg_ #1 :nnxxxx } {##1} {##2} {##3} { } { } { } }
+      \cs_generate_variant:cn { msg_ #1 :nnn }
+        { nnV , nne , nnx }
+      \cs_generate_variant:cn { msg_ #1 :nnnn }
+        { nnVV , nnVn , nnnV , nnne , nnnx , nnee , nnxx }
+      \cs_generate_variant:cn { msg_ #1 :nnnnn }
+        { nnnee , nnnxx , nneee , nnxxx }
+       \cs_generate_variant:cn { msg_ #1 :nnnnnn } { nneeee , nnxxxx }
     }
   \__msg_class_new:nn { fatal }
     {
@@ -9901,8 +9993,8 @@
         \c__msg_critical_text_tl
       \tex_endinput:D
     }
-  \cs_undefine:N \msg_error:nnxx
-  \cs_undefine:N \msg_error:nnx
+  \cs_undefine:N \msg_error:nnee
+  \cs_undefine:N \msg_error:nne
   \cs_undefine:N \msg_error:nn
   \__msg_class_new:nn { error }
     {
@@ -9913,10 +10005,10 @@
     }
   \cs_new_protected:Npn \__msg_info_aux:NNnnnnnn #1#2#3#4#5#6#7#8
     {
-      \str_set:Nx \l__msg_text_str { #2 {#3} }
-      \str_set:Nx \l__msg_name_str { \msg_module_name:n {#3} }
+      \str_set:Ne \l__msg_text_str { #2 {#3} }
+      \str_set:Ne \l__msg_name_str { \msg_module_name:n {#3} }
       #1 { }
-      \iow_wrap:nxnN
+      \iow_wrap:nenN
         {
           \l__msg_text_str : ~
           \use:c { \c__msg_text_prefix_tl #3 / #4 } {#5} {#6} {#7} {#8}
@@ -9996,18 +10088,18 @@
         }
     }
 \group_end:
-\cs_new:Npx \msg_show_item:n #1
+\cs_new:Npe \msg_show_item:n #1
   { ^^J > ~ \c_space_tl \exp_not:N \tl_to_str:n { {#1} } }
-\cs_new:Npx \msg_show_item_unbraced:n #1
+\cs_new:Npe \msg_show_item_unbraced:n #1
   { ^^J > ~ \c_space_tl \exp_not:N \tl_to_str:n {#1} }
-\cs_new:Npx \msg_show_item:nn #1#2
+\cs_new:Npe \msg_show_item:nn #1#2
   {
     ^^J > \use:nn { ~ } { ~ }
     \exp_not:N \tl_to_str:n { {#1} }
     \use:nn { ~ } { ~ } => \use:nn { ~ } { ~ }
     \exp_not:N \tl_to_str:n { {#2} }
   }
-\cs_new:Npx \msg_show_item_unbraced:nn #1#2
+\cs_new:Npe \msg_show_item_unbraced:nn #1#2
   {
     ^^J > \use:nn { ~ } { ~ }
     \exp_not:N \tl_to_str:n {#1}
@@ -10017,7 +10109,7 @@
 \cs_new:Npn \__msg_class_chk_exist:nT #1
   {
     \cs_if_free:cTF { __msg_ #1 _code:nnnnnn }
-      { \msg_error:nnx { msg } { class-unknown } {#1} }
+      { \msg_error:nnn { msg } { class-unknown } {#1} }
   }
 \tl_new:N \l__msg_class_tl
 \tl_new:N \l__msg_current_class_tl
@@ -10032,7 +10124,7 @@
         \__msg_class_chk_exist:nT {#1}
           {
             \tl_set:Nn \l__msg_current_class_tl {#1}
-            \cs_set_protected:Npx \__msg_use_code:
+            \cs_set_protected:Npe \__msg_use_code:
               {
                 \exp_not:n
                   {
@@ -10043,7 +10135,7 @@
             \__msg_use_redirect_name:n { #2 / #3 }
           }
       }
-      { \msg_error:nnxx { msg } { unknown } {#2} {#3} }
+      { \msg_error:nnnn { msg } { unknown } {#2} {#3} }
     \cs_if_exist_use:N \conditionally@traceon
   }
 \cs_new_protected:Npn \__msg_use_code: { }
@@ -10131,7 +10223,7 @@
             \tl_if_eq:NNTF \l__msg_class_tl \l__msg_current_class_tl
               {
                 \prop_put:cnn { l__msg_redirect_ #2 _prop } {#3} {#2}
-                \msg_warning:nnxxxx
+                \msg_warning:nneeee
                   { msg } { redirect-loop }
                   { \seq_item:Nn \l__msg_class_loop_seq { 1 } }
                   { \seq_item:Nn \l__msg_class_loop_seq { 2 } }
@@ -10157,18 +10249,18 @@
   { \msg_new:nnnn { LaTeX / #1 } }
 \cs_new_protected:Npn \__kernel_msg_new:nnn #1
   { \msg_new:nnn { LaTeX / #1 } }
-\cs_new_protected:Npn \__kernel_msg_info:nnxx #1
-  { \msg_info:nnxx { LaTeX / #1 } }
-\cs_new_protected:Npn \__kernel_msg_warning:nnx #1
-  { \msg_warning:nnx { LaTeX / #1 } }
-\cs_new_protected:Npn \__kernel_msg_warning:nnxx #1
-  { \msg_warning:nnxx { LaTeX / #1 } }
-\cs_new_protected:Npn \__kernel_msg_error:nnx #1
-  { \msg_error:nnx { LaTeX / #1 } }
-\cs_new_protected:Npn \__kernel_msg_error:nnxx #1
-  { \msg_error:nnxx { LaTeX / #1 } }
-\cs_new_protected:Npn \__kernel_msg_error:nnxxx #1
-  { \msg_error:nnxxx { LaTeX / #1 } }
+\cs_new_protected:Npn \__kernel_msg_info:nnee #1
+  { \msg_info:nnee { LaTeX / #1 } }
+\cs_new_protected:Npn \__kernel_msg_warning:nne #1
+  { \msg_warning:nne { LaTeX / #1 } }
+\cs_new_protected:Npn \__kernel_msg_warning:nnee #1
+  { \msg_warning:nnee { LaTeX / #1 } }
+\cs_new_protected:Npn \__kernel_msg_error:nne #1
+  { \msg_error:nne { LaTeX / #1 } }
+\cs_new_protected:Npn \__kernel_msg_error:nnee #1
+  { \msg_error:nnee { LaTeX / #1 } }
+\cs_new_protected:Npn \__kernel_msg_error:nneee #1
+  { \msg_error:nneee { LaTeX / #1 } }
 \cs_new:Npn \__kernel_msg_expandable_error:nnn #1
   { \msg_expandable_error:nnn { LaTeX / #1 } }
 \cs_new:Npn \__kernel_msg_expandable_error:nnf #1
@@ -10608,12 +10700,12 @@
       { \__ior_open_stream:Nn #1 {#2} }
       {
         \__ior_new:N #1
-        \__kernel_tl_set:Nx \l__ior_stream_tl { \int_eval:n {#1} }
+        \__kernel_tl_set:Ne \l__ior_stream_tl { \int_eval:n {#1} }
         \__ior_open_stream:Nn #1 {#2}
       }
   }
 \cs_generate_variant:Nn \__kernel_ior_open:Nn { No }
-\cs_new_protected:Npx \__ior_open_stream:Nn #1#2
+\cs_new_protected:Npe \__ior_open_stream:Nn #1#2
   {
     \tex_global:D \tex_chardef:D #1 = \exp_not:N \l__ior_stream_tl \scan_stop:
     \prop_gput:NVn \exp_not:N \g__ior_streams_prop #1 {#2}
@@ -10625,18 +10717,19 @@
 \cs_new_protected:Npn \ior_shell_open:Nn #1#2
   {
     \sys_if_shell:TF
-      { \exp_args:No \__ior_shell_open:nN { \tl_to_str:n {#2} } #1 }
+      { \__ior_shell_open:oN { \tl_to_str:n {#2} } #1 }
       { \msg_error:nn { kernel } { pipe-failed } }
   }
 \cs_new_protected:Npn \__ior_shell_open:nN #1#2
   {
     \tl_if_in:nnTF {#1} { " }
       {
-        \msg_error:nnx
+        \msg_error:nne
           { kernel } { quote-in-shell } {#1}
       }
       { \__kernel_ior_open:Nn #2 { |#1 } }
   }
+\cs_generate_variant:Nn \__ior_shell_open:nN { o }
 \msg_new:nnnn { kernel } { pipe-failed }
   { Cannot~run~piped~system~commands. }
   {
@@ -10665,14 +10758,14 @@
       {
         \prop_get:NVNTF \g__ior_streams_prop #2 \l__ior_internal_tl
           {
-            \exp_args:Nx #1
+            \exp_args:Ne #1
               { \token_to_str:N #2 ~ open: ~ \l__ior_internal_tl }
           }
-          { \exp_args:Nx #1 { \token_to_str:N #2 ~ closed } }
+          { \exp_args:Ne #1 { \token_to_str:N #2 ~ closed } }
       }
   }
-\cs_new_protected:Npn \ior_show_list: { \__ior_list:N \msg_show:nnxxxx }
-\cs_new_protected:Npn \ior_log_list: { \__ior_list:N \msg_log:nnxxxx }
+\cs_new_protected:Npn \ior_show_list: { \__ior_list:N \msg_show:nneeee }
+\cs_new_protected:Npn \ior_log_list: { \__ior_list:N \msg_log:nneeee }
 \cs_new_protected:Npn \__ior_list:N #1
   {
     #1 { kernel } { show-streams }
@@ -10845,14 +10938,14 @@
 \tl_new:N \l__iow_file_name_tl
 \cs_new_protected:Npn \iow_open:Nn #1#2
   {
-    \__kernel_tl_set:Nx \l__iow_file_name_tl
+    \__kernel_tl_set:Ne \l__iow_file_name_tl
       { \__kernel_file_name_sanitize:n {#2} }
     \iow_close:N #1
     \seq_gpop:NNTF \g__iow_streams_seq \l__iow_stream_tl
       { \__iow_open_stream:NV #1 \l__iow_file_name_tl }
       {
         \__iow_new:N #1
-        \__kernel_tl_set:Nx \l__iow_stream_tl { \int_eval:n {#1} }
+        \__kernel_tl_set:Ne \l__iow_stream_tl { \int_eval:n {#1} }
         \__iow_open_stream:NV #1 \l__iow_file_name_tl
       }
   }
@@ -10868,18 +10961,19 @@
 \cs_new_protected:Npn \iow_shell_open:Nn #1#2
   {
     \sys_if_shell:TF
-      { \exp_args:No \__iow_shell_open:nN { \tl_to_str:n {#2} } #1 }
+      { \__iow_shell_open:oN { \tl_to_str:n {#2} } #1 }
       { \msg_error:nn { kernel } { pipe-failed } }
   }
 \cs_new_protected:Npn \__iow_shell_open:nN #1#2
   {
     \tl_if_in:nnTF {#1} { " }
       {
-        \msg_error:nnx
+        \msg_error:nne
           { kernel } { quote-in-shell } {#1}
       }
       { \__kernel_iow_open:Nn #2 { |#1 } }
   }
+\cs_generate_variant:Nn \__iow_shell_open:nN { o }
 \cs_new_protected:Npn \iow_close:N #1
   {
     \int_compare:nT { \c_log_iow < #1 < \c_term_iow }
@@ -10902,14 +10996,14 @@
       {
         \prop_get:NVNTF \g__iow_streams_prop #2 \l__iow_internal_tl
           {
-            \exp_args:Nx #1
+            \exp_args:Ne #1
               { \token_to_str:N #2 ~ open: ~ \l__iow_internal_tl }
           }
-          { \exp_args:Nx #1 { \token_to_str:N #2 ~ closed } }
+          { \exp_args:Ne #1 { \token_to_str:N #2 ~ closed } }
       }
   }
-\cs_new_protected:Npn \iow_show_list: { \__iow_list:N \msg_show:nnxxxx }
-\cs_new_protected:Npn \iow_log_list: { \__iow_list:N \msg_log:nnxxxx }
+\cs_new_protected:Npn \iow_show_list: { \__iow_list:N \msg_show:nneeee }
+\cs_new_protected:Npn \iow_log_list: { \__iow_list:N \msg_log:nneeee }
 \cs_new_protected:Npn \__iow_list:N #1
   {
     #1 { kernel } { show-streams }
@@ -10920,17 +11014,18 @@
       }
       { } { }
   }
-\cs_new_protected:Npn \iow_shipout_x:Nn #1#2
+\cs_new_protected:Npn \iow_shipout_e:Nn #1#2
   { \tex_write:D #1 {#2} }
-\cs_generate_variant:Nn \iow_shipout_x:Nn { c, Nx, cx }
+\cs_generate_variant:Nn \iow_shipout_e:Nn { Ne , c, ce }
 \cs_new_protected:Npn \iow_shipout:Nn #1#2
   { \tex_write:D #1 { \exp_not:n {#2} } }
-\cs_generate_variant:Nn \iow_shipout:Nn { c, Nx, cx }
+\cs_generate_variant:Nn \iow_shipout:Nn { Ne , c, ce }
+\cs_generate_variant:Nn \iow_shipout:Nn { Nx , cx }
 \cs_new_protected:Npn \__kernel_iow_with:Nnn #1#2
   {
     \int_compare:nNnTF {#1} = {#2}
       { \use:n }
-      { \exp_args:No \__iow_with:nNnn { \int_use:N #1 } #1 {#2} }
+      { \__iow_with:oNnn { \int_use:N #1 } #1 {#2} }
   }
 \cs_new_protected:Npn \__iow_with:nNnn #1#2#3#4
   {
@@ -10938,16 +11033,20 @@
     #4
     \int_set:Nn #2 {#1}
   }
+\cs_generate_variant:Nn \__iow_with:nNnn { o }
 \cs_new_protected:Npn \iow_now:Nn #1#2
   {
     \__kernel_iow_with:Nnn \tex_newlinechar:D { `\^^J }
       { \tex_immediate:D \tex_write:D #1 { \exp_not:n {#2} } }
   }
-\cs_generate_variant:Nn \iow_now:Nn { NV , Nx , c , cV , cx }
-\cs_set_protected:Npn \iow_log:x  { \iow_now:Nx \c_log_iow  }
+\cs_generate_variant:Nn \iow_now:Nn { NV , Ne , c , cV , ce }
+\cs_generate_variant:Nn \iow_now:Nn { Nx , cx }
 \cs_new_protected:Npn \iow_log:n  { \iow_now:Nn \c_log_iow  }
-\cs_set_protected:Npn \iow_term:x { \iow_now:Nx \c_term_iow }
+\cs_set_protected:Npn \iow_log:e  { \iow_now:Ne \c_log_iow  }
+\cs_generate_variant:Nn \iow_log:n { x }
 \cs_new_protected:Npn \iow_term:n { \iow_now:Nn \c_term_iow }
+\cs_set_protected:Npn \iow_term:e { \iow_now:Ne \c_term_iow }
+\cs_generate_variant:Nn \iow_term:n { x }
 \cs_new:Npn \iow_newline: { ^^J }
 \cs_new_eq:NN \iow_char:N \cs_to_str:N
 \int_new:N  \l_iow_line_count_int
@@ -10959,14 +11058,14 @@
 \cs_new:Npn \__iow_unindent:w { }
 \cs_new_protected:Npn \__iow_set_indent:n #1
   {
-    \__kernel_tl_set:Nx \l__iow_one_indent_tl
+    \__kernel_tl_set:Ne \l__iow_one_indent_tl
       { \exp_args:No \__kernel_str_to_other_fast:n { \tl_to_str:n {#1} } }
     \int_set:Nn \l__iow_one_indent_int
       { \str_count:N \l__iow_one_indent_tl }
     \exp_last_unbraced:NNo
       \cs_set:Npn \__iow_unindent:w \l__iow_one_indent_tl { }
   }
-\exp_args:Nx \__iow_set_indent:n { \prg_replicate:nn { 4 } { ~ } }
+\exp_args:Ne \__iow_set_indent:n { \prg_replicate:nn { 4 } { ~ } }
 \tl_new:N \l__iow_indent_tl
 \int_new:N \l__iow_indent_int
 \tl_new:N \l__iow_line_tl
@@ -10975,13 +11074,13 @@
 \tl_new:N \l__iow_wrap_tl
 \group_begin:
   \int_set:Nn \tex_escapechar:D { -1 }
-  \tl_const:Nx \c__iow_wrap_marker_tl
+  \tl_const:Ne \c__iow_wrap_marker_tl
     { \tl_to_str:n { \^^I \^^O \^^W \^^_ \^^W \^^R \^^A \^^P } }
 \group_end:
 \tl_map_inline:nn
   { { end } { newline } { allow_break } { indent } { unindent } }
   {
-    \tl_const:cx { c__iow_wrap_ #1 _marker_tl }
+    \tl_const:ce { c__iow_wrap_ #1 _marker_tl }
       {
         \c__iow_wrap_marker_tl
         #1
@@ -10993,7 +11092,7 @@
     \msg_error:nnnn { kernel } { iow-indent }
       { \iow_wrap:nnnN } { \iow_wrap_allow_break: }
   }
-\cs_new:Npx \__iow_wrap_allow_break: { \c__iow_wrap_allow_break_marker_tl }
+\cs_new:Npe \__iow_wrap_allow_break: { \c__iow_wrap_allow_break_marker_tl }
 \cs_new:Npn \__iow_wrap_allow_break_error:
   {
     \msg_expandable_error:nnnn { kernel } { iow-indent }
@@ -11005,7 +11104,7 @@
       { \iow_wrap:nnnN } { \iow_indent:n } {#1}
     #1
   }
-\cs_new:Npx \__iow_indent:n #1
+\cs_new:Npe \__iow_indent:n #1
   {
     \c__iow_wrap_indent_marker_tl
     #1
@@ -11022,11 +11121,11 @@
     \group_begin:
       \cs_if_exist_use:N \conditionally@traceoff
       \int_set:Nn \tex_escapechar:D { -1 }
-      \cs_set:Npx \{ { \token_to_str:N \{ }
-      \cs_set:Npx \# { \token_to_str:N \# }
-      \cs_set:Npx \} { \token_to_str:N \} }
-      \cs_set:Npx \% { \token_to_str:N \% }
-      \cs_set:Npx \~ { \token_to_str:N \~ }
+      \cs_set:Npe \{ { \token_to_str:N \{ }
+      \cs_set:Npe \# { \token_to_str:N \# }
+      \cs_set:Npe \} { \token_to_str:N \} }
+      \cs_set:Npe \% { \token_to_str:N \% }
+      \cs_set:Npe \~ { \token_to_str:N \~ }
       \int_set:Nn \tex_escapechar:D { 92 }
       \cs_set_eq:NN \\ \iow_newline:
       \cs_set_eq:NN \  \c_catcode_other_space_tl
@@ -11034,11 +11133,11 @@
       \cs_set_eq:NN \iow_indent:n \__iow_indent:n
       #3
       \cs_set_eq:NN \protect \token_to_str:N
-      \__kernel_tl_set:Nx \l__iow_wrap_tl {#1}
+      \__kernel_tl_set:Ne \l__iow_wrap_tl {#1}
       \cs_set_eq:NN \iow_wrap_allow_break: \__iow_wrap_allow_break_error:
       \cs_set_eq:NN \iow_indent:n \__iow_indent_error:n
-      \__kernel_tl_set:Nx \l__iow_newline_tl { \iow_newline: #2 }
-      \__kernel_tl_set:Nx \l__iow_newline_tl { \tl_to_str:N \l__iow_newline_tl }
+      \__kernel_tl_set:Ne \l__iow_newline_tl { \iow_newline: #2 }
+      \__kernel_tl_set:Ne \l__iow_newline_tl { \tl_to_str:N \l__iow_newline_tl }
       \int_set:Nn \l__iow_line_target_int
         { \l_iow_line_count_int - \str_count:N \l__iow_newline_tl + 1 }
        \int_compare:nNnT { \l__iow_line_target_int } < 0
@@ -11051,15 +11150,15 @@
     \exp_args:NNf \group_end:
     #4 { \tl_to_str:N \l__iow_wrap_tl }
   }
-\cs_generate_variant:Nn \iow_wrap:nnnN { nx }
+\cs_generate_variant:Nn \iow_wrap:nnnN { ne }
 \cs_new_protected:Npn \__iow_wrap_do:
   {
-    \__kernel_tl_set:Nx \l__iow_wrap_tl
+    \__kernel_tl_set:Ne \l__iow_wrap_tl
       {
         \exp_args:No \__kernel_str_to_other_fast:n \l__iow_wrap_tl
         \c__iow_wrap_end_marker_tl
       }
-    \__kernel_tl_set:Nx \l__iow_wrap_tl
+    \__kernel_tl_set:Ne \l__iow_wrap_tl
       {
         \exp_after:wN \__iow_wrap_fix_newline:w \l__iow_wrap_tl
           ^^J \q__iow_nil ^^J \s__iow_stop
@@ -11217,7 +11316,7 @@
   }
 \cs_new_protected:Npn \__iow_wrap_allow_break:n #1
   {
-    \__kernel_tl_set:Nx \l__iow_line_tl
+    \__kernel_tl_set:Ne \l__iow_line_tl
       { \l__iow_line_tl \__iow_wrap_trim:N \l__iow_line_part_tl }
     \bool_set_false:N \l__iow_line_break_bool
     \tl_if_empty:NTF \l__iow_line_part_tl
@@ -11226,7 +11325,7 @@
   }
 \cs_new_protected:Npn \__iow_wrap_indent:n #1
   {
-    \tl_put_right:Nx \l__iow_line_tl { \l__iow_line_part_tl }
+    \tl_put_right:Ne \l__iow_line_tl { \l__iow_line_part_tl }
     \bool_set_false:N \l__iow_line_break_bool
     \int_add:Nn \l__iow_indent_int { \l__iow_one_indent_int }
     \tl_put_right:No \l__iow_indent_tl { \l__iow_one_indent_tl }
@@ -11234,10 +11333,10 @@
   }
 \cs_new_protected:Npn \__iow_wrap_unindent:n #1
   {
-    \tl_put_right:Nx \l__iow_line_tl { \l__iow_line_part_tl }
+    \tl_put_right:Ne \l__iow_line_tl { \l__iow_line_part_tl }
     \bool_set_false:N \l__iow_line_break_bool
     \int_sub:Nn \l__iow_indent_int { \l__iow_one_indent_int }
-    \__kernel_tl_set:Nx \l__iow_indent_tl
+    \__kernel_tl_set:Ne \l__iow_indent_tl
       { \exp_after:wN \__iow_unindent:w \l__iow_indent_tl }
     \__iow_wrap_chunk:nw {#1}
   }
@@ -11256,9 +11355,9 @@
   }
 \cs_new_protected:Npn \__iow_wrap_store_do:n #1
   {
-    \__kernel_tl_set:Nx \l__iow_line_tl
+    \__kernel_tl_set:Ne \l__iow_line_tl
       { \l__iow_line_tl \l__iow_line_part_tl }
-    \__kernel_tl_set:Nx \l__iow_wrap_tl
+    \__kernel_tl_set:Ne \l__iow_wrap_tl
       {
         \l__iow_wrap_tl
         \l__iow_newline_tl
@@ -11275,6 +11374,8 @@
     \cs_new:Npn \__iow_wrap_trim_aux:w ##1 \s__iow_mark ##2 \s__iow_stop {##1}
   }
 \exp_args:NV \__iow_tmp:w \c_catcode_other_space_tl
+\cs_new_eq:NN \iow_shipout_x:Nn \iow_shipout_e:Nn
+\cs_generate_variant:Nn \iow_shipout_x:Nn { Nx , c, cx }
 \tl_new:N \l__file_internal_tl
 \str_new:N \g_file_curr_dir_str
 \str_new:N \g_file_curr_ext_str
@@ -11287,7 +11388,7 @@
         {
           \cs_set:Npn \__file_tmp:w ##1 " ##2 " ##3 \s__file_stop
             { { } {##2} {  } }
-          \seq_gput_right:Nx \g__file_stack_seq
+          \seq_gput_right:Ne \g__file_stack_seq
             {
               \exp_after:wN \__file_tmp:w \tex_jobname:D
                 " \tex_jobname:D " \s__file_stop
@@ -11401,12 +11502,13 @@
       { #1 }
       { "#1" }
   }
-\tl_const:Nx \c__file_marker_tl { : \token_to_str:N : }
+\tl_const:Ne \c__file_marker_tl { : \token_to_str:N : }
 \cs_new_protected:Npn \file_get:nnN #1#2#3
   {
     \file_get:nnNF {#1} {#2} #3
       { \tl_set:Nn #3 { \q_no_value } }
   }
+\cs_generate_variant:Nn \file_get:nnN { V }
 \prg_new_protected_conditional:Npnn \file_get:nnN #1#2#3 { T , F , TF }
   {
     \file_get_full_name:nNTF {#1} \l__file_full_name_tl
@@ -11418,7 +11520,8 @@
       }
       { \prg_return_false: }
   }
-\cs_new_protected:Npx \__file_get_aux:nnN #1#2#3
+\prg_generate_conditional_variant:Nnn \file_get:nnN { V } { T , F , TF }
+\cs_new_protected:Npe \__file_get_aux:nnN #1#2#3
   {
     \exp_not:N \if_false: { \exp_not:N \fi:
     \group_begin:
@@ -11448,6 +11551,7 @@
     \exp_args:Ne \__file_full_name:n
       { \__kernel_file_name_sanitize:n {#1} }
   }
+\cs_generate_variant:Nn \file_full_name:n { V }
 \cs_new:Npn \__file_full_name:n #1
   {
     \tl_if_blank:nF {#1}
@@ -11527,7 +11631,7 @@
       }
       { \__file_ext_check:nnw {#1} { #2 #3 / } #4 / #5 \s__file_stop }
   }
-\cs_new:Npx \__file_ext_check:nnnw #1#2#3#4 . #5 . #6 \s__file_stop
+\cs_new:Npe \__file_ext_check:nnnw #1#2#3#4 . #5 . #6 \s__file_stop
   {
     \exp_not:N \__file_quark_if_nil:nTF {#5}
       {
@@ -11558,20 +11662,21 @@
 \cs_generate_variant:Nn \file_get_full_name:nN { V }
 \prg_new_protected_conditional:Npnn \file_get_full_name:nN #1#2 { T , F , TF }
   {
-    \__kernel_tl_set:Nx #2
+    \__kernel_tl_set:Ne #2
       { \file_full_name:n {#1} }
     \tl_if_empty:NTF #2
       { \prg_return_false: }
       { \prg_return_true: }
   }
-\cs_generate_variant:Nn \file_get_full_name:nNT  { V }
-\cs_generate_variant:Nn \file_get_full_name:nNF  { V }
-\cs_generate_variant:Nn \file_get_full_name:nNTF { V }
+\prg_generate_conditional_variant:Nnn \file_get_full_name:nN
+  { V } { T , F ,  TF }
 \ior_new:N \g__file_internal_ior
 \cs_new:Npn \file_size:n #1
   { \__file_details:nn {#1} { size } }
+\cs_generate_variant:Nn \file_size:n { V }
 \cs_new:Npn \file_timestamp:n #1
   { \__file_details:nn {#1} { moddate } }
+\cs_generate_variant:Nn \file_timestamp:n { V }
 \cs_new:Npn \__file_details:nn #1#2
   {
     \exp_args:Ne \__file_details_aux:nn
@@ -11584,6 +11689,7 @@
   }
 \cs_new:Npn \file_mdfive_hash:n #1
   { \exp_args:Ne \__file_mdfive_hash:n { \file_full_name:n {#1} } }
+\cs_generate_variant:Nn \file_mdfive_hash:n { V }
 \cs_new:Npn \__file_mdfive_hash:n #1
   { \tex_mdfivesum:D file {#1} }
 \cs_new:Npn \file_hex_dump:nnn #1#2#3
@@ -11593,6 +11699,7 @@
       { \int_eval:n {#2} }
       { \int_eval:n {#3} }
   }
+\cs_generate_variant:Nn \file_hex_dump:nnn { V }
 \cs_new:Npn \__file_hex_dump_auxi:nnn #1#2#3
   {
     \bool_lazy_any:nF
@@ -11636,6 +11743,7 @@
   }
 \cs_new:Npn \file_hex_dump:n #1
   { \exp_args:Ne \__file_hex_dump:n { \file_full_name:n {#1} } }
+\cs_generate_variant:Nn \file_hex_dump:n { V }
 \sys_if_engine_luatex:TF
   {
     \cs_new:Npn \__file_hex_dump:n #1
@@ -11653,23 +11761,35 @@
   }
 \cs_new_protected:Npn \file_get_hex_dump:nN #1#2
   { \file_get_hex_dump:nNF {#1} #2 { \tl_set:Nn #2 { \q_no_value } } }
+\cs_generate_variant:Nn \file_get_hex_dump:nN { V }
 \cs_new_protected:Npn \file_get_mdfive_hash:nN #1#2
   { \file_get_mdfive_hash:nNF {#1} #2 { \tl_set:Nn #2 { \q_no_value } } }
+\cs_generate_variant:Nn \file_get_mdfive_hash:nN { V }
 \cs_new_protected:Npn \file_get_size:nN #1#2
   { \file_get_size:nNF {#1} #2 { \tl_set:Nn #2 { \q_no_value } } }
+\cs_generate_variant:Nn \file_get_size:nN { V }
 \cs_new_protected:Npn \file_get_timestamp:nN #1#2
   { \file_get_timestamp:nNF {#1} #2 { \tl_set:Nn #2 { \q_no_value } } }
+\cs_generate_variant:Nn \file_get_timestamp:nN { V }
 \prg_new_protected_conditional:Npnn \file_get_hex_dump:nN #1#2 { T , F , TF }
   { \__file_get_details:nnN {#1} { hex_dump } #2 }
+\prg_generate_conditional_variant:Nnn \file_get_hex_dump:nN
+  { V } { T , F , TF }
 \prg_new_protected_conditional:Npnn \file_get_mdfive_hash:nN #1#2 { T , F , TF }
   { \__file_get_details:nnN {#1} { mdfive_hash } #2 }
+\prg_generate_conditional_variant:Nnn \file_get_mdfive_hash:nN
+  { V } { T , F , TF }
 \prg_new_protected_conditional:Npnn \file_get_size:nN #1#2 { T , F , TF }
   { \__file_get_details:nnN {#1} { size } #2 }
+\prg_generate_conditional_variant:Nnn \file_get_size:nN
+  { V } { T , F , TF }
 \prg_new_protected_conditional:Npnn \file_get_timestamp:nN #1#2 { T , F , TF }
   { \__file_get_details:nnN {#1} { timestamp } #2 }
+\prg_generate_conditional_variant:Nnn \file_get_timestamp:nN
+  { V } { T , F , TF }
 \cs_new_protected:Npn \__file_get_details:nnN #1#2#3
   {
-    \__kernel_tl_set:Nx #3
+    \__kernel_tl_set:Ne #3
       { \use:c { file_ #2 :n } {#1} }
     \tl_if_empty:NTF #3
       { \prg_return_false: }
@@ -11680,15 +11800,18 @@
     \file_get_hex_dump:nnnNF {#1} {#2} {#3} #4
       { \tl_set:Nn #4 { \q_no_value } }
   }
+\cs_generate_variant:Nn \file_get_hex_dump:nnnN { V }
 \prg_new_protected_conditional:Npnn \file_get_hex_dump:nnnN #1#2#3#4
   { T , F , TF }
   {
-    \__kernel_tl_set:Nx #4
+    \__kernel_tl_set:Ne #4
       { \file_hex_dump:nnn {#1} {#2} {#3} }
     \tl_if_empty:NTF #4
       { \prg_return_false: }
       { \prg_return_true: }
   }
+\prg_generate_conditional_variant:Nnn \file_get_hex_dump:nnnN
+  { V } { T , F , TF }
 \cs_new_eq:NN \__file_str_cmp:nn \tex_strcmp:D
 \prg_new_conditional:Npnn \file_compare_timestamp:nNn #1#2#3
   { p , T , F , TF }
@@ -11698,6 +11821,8 @@
       { \file_full_name:n {#3} }
       #2
    }
+\prg_generate_conditional_variant:Nnn \file_compare_timestamp:nNn
+  { nNV , V , VNV } { p , T , F , TF }
 \cs_new:Npn \__file_compare_timestamp:nnN #1#2#3
   {
     \tl_if_blank:nTF {#1}
@@ -11731,28 +11856,30 @@
       }
   }
 \cs_new_eq:NN \__file_timestamp:n \tex_filemoddate:D
-\prg_new_protected_conditional:Npnn \file_if_exist:n #1 { T , F , TF }
+\prg_new_conditional:Npnn \file_if_exist:n #1 { p , T , F , TF }
   {
-    \file_get_full_name:nNTF {#1} \l__file_full_name_tl
-      { \prg_return_true: }
+    \tl_if_blank:eTF { \file_full_name:n {#1} }
       { \prg_return_false: }
+      { \prg_return_true: }
   }
-\prg_generate_conditional_variant:Nnn \file_if_exist:n { V } { T , F , TF }
+\prg_generate_conditional_variant:Nnn \file_if_exist:n { V } { p , T , F , TF }
 \cs_new_protected:Npn \file_if_exist_input:n #1
   {
     \file_get_full_name:nNT {#1} \l__file_full_name_tl
       { \__file_input:V \l__file_full_name_tl }
   }
+\cs_generate_variant:Nn \file_if_exist_input:n { V }
 \cs_new_protected:Npn \file_if_exist_input:nF #1#2
   {
     \file_get_full_name:nNTF {#1} \l__file_full_name_tl
       { \__file_input:V \l__file_full_name_tl }
       {#2}
   }
+\cs_generate_variant:Nn \file_if_exist_input:nF { V }
 \cs_new_protected:Npn \file_input_stop: { \tex_endinput:D }
 \cs_new_protected:Npn \__kernel_file_missing:n #1
   {
-    \msg_error:nnx { kernel } { file-not-found }
+    \msg_error:nne { kernel } { file-not-found }
       { \__kernel_file_name_sanitize:n {#1} }
   }
 \cs_new_protected:Npn \file_input:n #1
@@ -11762,7 +11889,7 @@
       { \__kernel_file_missing:n {#1} }
   }
 \cs_generate_variant:Nn \file_input:n { V }
-\cs_new_protected:Npx \__file_input:n #1
+\cs_new_protected:Npe \__file_input:n #1
   {
     \exp_not:N \clist_if_exist:NTF \exp_not:N \@filelist
       { \exp_not:N \@addtofilelist {#1} }
@@ -11777,7 +11904,7 @@
 \cs_generate_variant:Nn \__file_input:n { V }
 \cs_new_protected:Npn \__file_input_push:n #1
   {
-    \seq_gpush:Nx \g__file_stack_seq
+    \seq_gpush:Ne \g__file_stack_seq
       {
         { \g_file_curr_dir_str }
         { \g_file_curr_name_str }
@@ -11804,7 +11931,8 @@
   }
 \cs_new:Npn \file_input_raw:n #1
   { \exp_args:Ne \__file_input_raw:nn { \file_full_name:n {#1} } {#1} }
-\cs_new:Npx \__file_input_raw:nn #1#2
+\cs_generate_variant:Nn \file_input_raw:n { V }
+\cs_new:Npe \__file_input_raw:nn #1#2
   {
     \exp_not:N \tl_if_blank:nTF {#1}
       {
@@ -11825,11 +11953,13 @@
     \file_parse_full_name_apply:nN {#1}
       \prg_do_nothing:
   }
+\cs_generate_variant:Nn \file_parse_full_name:n { V }
 \cs_new:Npn \file_parse_full_name_apply:nN #1
   {
     \exp_args:Ne \__file_parse_full_name_auxi:nN
       { \__kernel_file_name_sanitize:n {#1} }
   }
+\cs_generate_variant:Nn \file_parse_full_name_apply:nN { V }
 \cs_new:Npn \__file_parse_full_name_auxi:nN #1
   {
     \__file_parse_full_name_area:nw { } #1
@@ -11877,14 +12007,14 @@
     \str_set:Nn #6 {#3}
   }
 \cs_generate_variant:Nn \file_parse_full_name:nNNN { V }
-\cs_new_protected:Npn \file_show_list: { \__file_list:N \msg_show:nnxxxx }
-\cs_new_protected:Npn \file_log_list: { \__file_list:N \msg_log:nnxxxx }
+\cs_new_protected:Npn \file_show_list: { \__file_list:N \msg_show:nneeee }
+\cs_new_protected:Npn \file_log_list: { \__file_list:N \msg_log:nneeee }
 \cs_new_protected:Npn \__file_list:N #1
   {
     \seq_clear:N \l__file_tmp_seq
     \clist_if_exist:NT \@filelist
       {
-        \exp_args:NNx \seq_set_from_clist:Nn \l__file_tmp_seq
+        \exp_args:NNe \seq_set_from_clist:Nn \l__file_tmp_seq
           { \tl_to_str:N \@filelist }
       }
     \seq_concat:NNN \l__file_tmp_seq \l__file_tmp_seq \g__file_record_seq
@@ -11898,7 +12028,7 @@
   {
     \AtBeginDocument
       {
-        \exp_args:NNx \seq_set_from_clist:Nn \l__file_tmp_seq
+        \exp_args:NNe \seq_set_from_clist:Nn \l__file_tmp_seq
           { \tl_to_str:N \@filelist }
         \seq_gconcat:NNN
           \g__file_record_seq
@@ -11964,7 +12094,7 @@
 \cs_new:Npn \__file_parse_version:w #1 - #2 - #3 \s__file_stop {#1#2#3}
 \cs_new_protected:Npn \__file_mismatched_dependency_error:nn #1 #2
   {
-    \exp_args:NNx \ior_shell_open:Nn \g__file_internal_ior
+    \exp_args:NNe \ior_shell_open:Nn \g__file_internal_ior
       {
         kpsewhich ~ --all ~
           --engine = \c_sys_engine_exec_str
@@ -12054,7 +12184,7 @@
   }
 \sys_if_engine_luatex:TF
   {
-    \str_const:Nx \c_sys_platform_str
+    \str_const:Ne \c_sys_platform_str
       { \tex_directlua:D { tex.print(os.type) } }
   }
   {
@@ -12346,7 +12476,7 @@
   {
     \int_gincr:N \g__kernel_prg_map_int
     \exp_args:NNc \__dim_step:NNnnnn
-      \cs_gset_protected:Npx
+      \cs_gset_protected:Npe
       { __dim_map_ \int_use:N \g__kernel_prg_map_int :w }
       {#1}{#2}{#3}
       {
@@ -12387,10 +12517,10 @@
     \exp_after:wN
       \__dim_to_decimal:w \dim_use:N \__dim_eval:w #1 \__dim_eval_end:
   }
-\use:x
+\use:e
   {
     \cs_new:Npn \exp_not:N \__dim_to_decimal:w
-      ##1 . ##2 \tl_to_str:n { pt }
+      #1 . #2 \tl_to_str:n { pt }
   }
       {
         \int_compare:nNnTF {#2} > \c_zero_int
@@ -12934,9 +13064,10 @@
   }
 \cs_new_protected:Npn \keys_define:nn
   { \__keys_define:onn \l__keys_module_str }
+\cs_generate_variant:Nn \keys_define:nn { ne , nx }
 \cs_new_protected:Npn \__keys_define:nnn #1#2#3
   {
-    \str_set:Nx \l__keys_module_str { \__keys_trim_spaces:n {#2} }
+    \str_set:Ne \l__keys_module_str { \__keys_trim_spaces:n {#2} }
     \keyval_parse:NNn \__keys_define:n \__keys_define:nn {#3}
     \str_set:Nn \l__keys_module_str {#1}
   }
@@ -12959,14 +13090,14 @@
       {
         \str_if_empty:NF \l__keys_property_str
           {
-            \msg_error:nnxx { keys } { property-unknown }
+            \msg_error:nnee { keys } { property-unknown }
               \l__keys_property_str \l_keys_path_str
           }
       }
   }
 \cs_new_protected:Npn \__keys_property_find:n #1
   {
-    \cs_set_nopar:Npx \l__keys_property_str { \__keys_trim_spaces:n { #1 } }
+    \cs_set_nopar:Npe \l__keys_property_str { \__keys_trim_spaces:n { #1 } }
     \exp_after:wN \__keys_property_find_auxi:w \l__keys_property_str
       \s__keys_nil \__keys_property_find_auxii:w
       . \s__keys_nil \__keys_property_find_err:w
@@ -12979,22 +13110,22 @@
     #1 \s__keys_mark #2 \s__keys_nil \__keys_property_find_auxii:w . \s__keys_nil
     \__keys_property_find_err:w
   {
-    \cs_set_nopar:Npx \l_keys_path_str
+    \cs_set_nopar:Npe \l_keys_path_str
       { \str_if_empty:NF \l__keys_module_str { \l__keys_module_str / } #1 }
     \__keys_property_find_auxi:w #2 \s__keys_nil \__keys_property_find_auxiii:w . \s__keys_nil
       \__keys_property_find_auxiv:w
   }
 \cs_new_protected:Npn \__keys_property_find_auxiii:w #1 \s__keys_mark
   {
-    \cs_set_nopar:Npx \l_keys_path_str { \l_keys_path_str . #1 }
+    \cs_set_nopar:Npe \l_keys_path_str { \l_keys_path_str . #1 }
     \__keys_property_find_auxi:w
   }
 \cs_new_protected:Npn \__keys_property_find_auxiv:w
     #1 \s__keys_nil \__keys_property_find_auxiii:w
     \s__keys_mark \s__keys_nil \__keys_property_find_auxiv:w
   {
-    \cs_set_nopar:Npx \l__keys_property_str { . #1 }
-    \cs_set_nopar:Npx \l_keys_path_str
+    \cs_set_nopar:Npe \l__keys_property_str { . #1 }
+    \cs_set_nopar:Npe \l_keys_path_str
       { \exp_after:wN \__keys_trim_spaces:n \exp_after:wN { \l_keys_path_str } }
     \tl_set_eq:NN \l_keys_path_tl \l_keys_path_str
   }
@@ -13012,7 +13143,7 @@
           \l__keys_property_str \s__keys_stop
           { \use:c { \c__keys_props_root_str \l__keys_property_str } }
           {
-            \msg_error:nnxx { keys } { property-requires-value }
+            \msg_error:nnee { keys } { property-requires-value }
               \l__keys_property_str \l_keys_path_str
           }
       }
@@ -13031,13 +13162,13 @@
   {
     \bool_if_exist:NF #1 { \bool_new:N #1 }
     \__keys_choice_make:
-    \__keys_cmd_set:nx { \l_keys_path_str / true }
+    \__keys_cmd_set:ne { \l_keys_path_str / true }
       { \exp_not:c { bool_ #2 set_ #3 :N } \exp_not:N #1 }
-    \__keys_cmd_set:nx { \l_keys_path_str / false }
+    \__keys_cmd_set:ne { \l_keys_path_str / false }
       { \exp_not:c { bool_ #2 set_ #4 :N } \exp_not:N #1 }
     \__keys_cmd_set_direct:nn { \l_keys_path_str / unknown }
       {
-        \msg_error:nnx { keys } { boolean-values-only }
+        \msg_error:nne { keys } { boolean-values-only }
           \l_keys_path_str
       }
     \__keys_default_set:n { true }
@@ -13056,7 +13187,7 @@
           { \c__keys_type_root_str \__keys_parent:o \l_keys_path_str }
           { choice }
           {
-            \msg_error:nnxx { keys } { nested-choice-key }
+            \msg_error:nnee { keys } { nested-choice-key }
               \l_keys_path_tl { \__keys_parent:o \l_keys_path_str }
           }
           { \__keys_choice_make_aux:N #1 }
@@ -13070,7 +13201,7 @@
     \__keys_cmd_set_direct:nn \l_keys_path_str { #1 {##1} }
     \__keys_cmd_set_direct:nn { \l_keys_path_str / unknown }
       {
-        \msg_error:nnxx { keys } { choice-unknown }
+        \msg_error:nnee { keys } { choice-unknown }
           \l_keys_path_str {##1}
       }
   }
@@ -13085,7 +13216,7 @@
     \clist_map_inline:nn {#2}
       {
         \int_incr:N \l_keys_choice_int
-        \__keys_cmd_set:nx
+        \__keys_cmd_set:ne
           { \l_keys_path_str / \__keys_trim_spaces:n {##1} }
           {
             \tl_set:Nn \exp_not:N \l_keys_choice_tl {##1}
@@ -13097,12 +13228,12 @@
   }
 \cs_new_protected:Npn \__keys_cmd_set:nn #1#2
   {  \__keys_cmd_set_direct:nn {#1} { \__keys_precompile:n {#2} } }
-\cs_generate_variant:Nn \__keys_cmd_set:nn { nx , Vn , Vo }
+\cs_generate_variant:Nn \__keys_cmd_set:nn { ne , Vn , Vo }
 \cs_new_protected:Npn \__keys_cmd_set_direct:nn #1#2
   { \cs_set_protected:cpn { \c__keys_code_root_str #1 } ##1 {#2} }
 \cs_new_protected:Npn \__keys_cs_set:NNpn #1#2#3#
   {
-    \cs_set_protected:cpx { \c__keys_code_root_str \l_keys_path_str } ##1
+    \cs_set_protected:cpe { \c__keys_code_root_str \l_keys_path_str } ##1
       {
         \__keys_precompile:n
           { #1 \exp_not:N #2 \exp_not:n {#3} {##1} }
@@ -13119,7 +13250,7 @@
           \tex_undefined:D
       }
       {
-        \cs_set_nopar:cpx
+        \cs_set_nopar:cpe
           { \c__keys_default_root_str \l_keys_path_str }
           { \exp_not:n {#1} }
         \__keys_value_requirement:nn { required } { false }
@@ -13168,13 +13299,13 @@
 \cs_new_protected:Npn \__keys_legacy_if_set:nnnn #1#2#3#4
   {
     \__keys_choice_make:
-    \__keys_cmd_set:nx { \l_keys_path_str / true }
+    \__keys_cmd_set:ne { \l_keys_path_str / true }
       { \exp_not:c { legacy_if_#2  set_ #3 :n } { \exp_not:n {#1} } }
-    \__keys_cmd_set:nx { \l_keys_path_str / false }
+    \__keys_cmd_set:ne { \l_keys_path_str / false }
       { \exp_not:c { legacy_if_#2  set_ #4 :n } { \exp_not:n {#1} } }
     \__keys_cmd_set:nn { \l_keys_path_str / unknown }
       {
-        \msg_error:nnx { keys } { boolean-values-only }
+        \msg_error:nne { keys } { boolean-values-only }
           \l_keys_path_str
       }
     \__keys_default_set:n { true }
@@ -13202,7 +13333,7 @@
     \prop_if_exist:NF #1 { \prop_new:N #1 }
     \exp_after:wN \__keys_find_key_module:wNN \l_keys_path_str \s__keys_stop
       \l__keys_tmpa_tl \l__keys_tmpb_tl
-    \__keys_cmd_set:nx \l_keys_path_str
+    \__keys_cmd_set:ne \l_keys_path_str
       {
         \exp_not:c { prop_ #2 put:Nnn }
         \exp_not:N #1
@@ -13244,7 +13375,7 @@
           }
       }
       {
-        \msg_error:nnx { keys }
+        \msg_error:nne { keys }
           { boolean-values-only }
           { .value_ #1 :n }
       }
@@ -13253,7 +13384,7 @@
   {
     \bool_if:NF \l__keys_no_value_bool
       {
-        \msg_error:nnxx { keys } { value-forbidden }
+        \msg_error:nnee { keys } { value-forbidden }
           \l_keys_path_str \l_keys_value_tl
         \use_none:nnn
       }
@@ -13262,7 +13393,7 @@
   {
     \bool_if:NT \l__keys_no_value_bool
       {
-        \msg_error:nnx { keys } { value-required }
+        \msg_error:nne { keys } { value-required }
           \l_keys_path_str
         \use_none:nnn
       }
@@ -13304,7 +13435,7 @@
   {
     \prop_get:NVNF #1 \l__keys_module_str \l__keys_tmpa_tl
       { \tl_clear:N \l__keys_tmpa_tl }
-    \tl_set:Nx \l__keys_tmpb_tl
+    \tl_set:Ne \l__keys_tmpb_tl
       { \exp_after:wN \__keys_usage:w \l_keys_path_str \s__keys_stop }
     \bool_if:NTF #2
       { \clist_put_right:NV \l__keys_tmpa_tl \l__keys_tmpb_tl }
@@ -13316,7 +13447,7 @@
 \cs_new_protected:Npn \__keys_variable_set:NnnN #1#2#3#4
   {
     \use:c { #2_if_exist:NF } #1 { \use:c { #2 _new:N } #1 }
-    \__keys_cmd_set:nx \l_keys_path_str
+    \__keys_cmd_set:ne \l_keys_path_str
       {
         \exp_not:c { #2 _ #3 set:N #4 }
         \exp_not:N #1
@@ -13352,6 +13483,8 @@
   { \__keys_choices_make:nn #1 }
 \cs_new_protected:cpn { \c__keys_props_root_str .choices:Vn } #1
   { \exp_args:NV \__keys_choices_make:nn #1 }
+\cs_new_protected:cpn { \c__keys_props_root_str .choices:en } #1
+  { \exp_args:Ne \__keys_choices_make:nn #1 }
 \cs_new_protected:cpn { \c__keys_props_root_str .choices:on } #1
   { \exp_args:No \__keys_choices_make:nn #1 }
 \cs_new_protected:cpn { \c__keys_props_root_str .choices:xn } #1
@@ -13386,6 +13519,8 @@
   { \__keys_default_set:n {#1} }
 \cs_new_protected:cpn { \c__keys_props_root_str .default:V } #1
   { \exp_args:NV \__keys_default_set:n #1 }
+\cs_new_protected:cpn { \c__keys_props_root_str .default:e } #1
+  { \exp_args:Ne \__keys_default_set:n {#1} }
 \cs_new_protected:cpn { \c__keys_props_root_str .default:o } #1
   { \exp_args:No \__keys_default_set:n {#1} }
 \cs_new_protected:cpn { \c__keys_props_root_str .default:x } #1
@@ -13414,6 +13549,8 @@
   { \__keys_initialise:n {#1} }
 \cs_new_protected:cpn { \c__keys_props_root_str .initial:V } #1
   { \exp_args:NV \__keys_initialise:n #1 }
+\cs_new_protected:cpn { \c__keys_props_root_str .initial:e } #1
+  { \exp_args:Ne \__keys_initialise:n {#1} }
 \cs_new_protected:cpn { \c__keys_props_root_str .initial:o } #1
   { \exp_args:No \__keys_initialise:n {#1} }
 \cs_new_protected:cpn { \c__keys_props_root_str .initial:x } #1
@@ -13444,6 +13581,8 @@
   { \__keys_multichoices_make:nn #1 }
 \cs_new_protected:cpn { \c__keys_props_root_str .multichoices:Vn } #1
   { \exp_args:NV \__keys_multichoices_make:nn #1 }
+\cs_new_protected:cpn { \c__keys_props_root_str .multichoices:en } #1
+  { \exp_args:Ne \__keys_multichoices_make:nn #1 }
 \cs_new_protected:cpn { \c__keys_props_root_str .multichoices:on } #1
   { \exp_args:No \__keys_multichoices_make:nn #1 }
 \cs_new_protected:cpn { \c__keys_props_root_str .multichoices:xn } #1
@@ -13476,34 +13615,34 @@
   { \__keys_variable_set:NnnN #1 { str } { } n }
 \cs_new_protected:cpn { \c__keys_props_root_str .str_set:c } #1
   { \__keys_variable_set:cnnN {#1} { str } { } n }
-\cs_new_protected:cpn { \c__keys_props_root_str .str_set_x:N } #1
-  { \__keys_variable_set:NnnN #1 { str } { } x }
-\cs_new_protected:cpn { \c__keys_props_root_str .str_set_x:c } #1
-  { \__keys_variable_set:cnnN {#1} { str } { } x }
+\cs_new_protected:cpn { \c__keys_props_root_str .str_set_e:N } #1
+  { \__keys_variable_set:NnnN #1 { str } { } e }
+\cs_new_protected:cpn { \c__keys_props_root_str .str_set_e:c } #1
+  { \__keys_variable_set:cnnN {#1} { str } { } e }
 \cs_new_protected:cpn { \c__keys_props_root_str .str_gset:N } #1
   { \__keys_variable_set:NnnN #1 { str } { g } n }
 \cs_new_protected:cpn { \c__keys_props_root_str .str_gset:c } #1
   { \__keys_variable_set:cnnN {#1} { str } { g } n }
-\cs_new_protected:cpn { \c__keys_props_root_str .str_gset_x:N } #1
-  { \__keys_variable_set:NnnN #1 { str } { g } x }
-\cs_new_protected:cpn { \c__keys_props_root_str .str_gset_x:c } #1
-  { \__keys_variable_set:cnnN {#1} { str } { g } x }
+\cs_new_protected:cpn { \c__keys_props_root_str .str_gset_e:N } #1
+  { \__keys_variable_set:NnnN #1 { str } { g } e }
+\cs_new_protected:cpn { \c__keys_props_root_str .str_gset_e:c } #1
+  { \__keys_variable_set:cnnN {#1} { str } { g } e }
 \cs_new_protected:cpn { \c__keys_props_root_str .tl_set:N } #1
   { \__keys_variable_set:NnnN #1 { tl } { } n }
 \cs_new_protected:cpn { \c__keys_props_root_str .tl_set:c } #1
   { \__keys_variable_set:cnnN {#1} { tl } { } n }
-\cs_new_protected:cpn { \c__keys_props_root_str .tl_set_x:N } #1
-  { \__keys_variable_set:NnnN #1 { tl } { } x }
-\cs_new_protected:cpn { \c__keys_props_root_str .tl_set_x:c } #1
-  { \__keys_variable_set:cnnN {#1} { tl } { } x }
+\cs_new_protected:cpn { \c__keys_props_root_str .tl_set_e:N } #1
+  { \__keys_variable_set:NnnN #1 { tl } { } e }
+\cs_new_protected:cpn { \c__keys_props_root_str .tl_set_e:c } #1
+  { \__keys_variable_set:cnnN {#1} { tl } { } e }
 \cs_new_protected:cpn { \c__keys_props_root_str .tl_gset:N } #1
   { \__keys_variable_set:NnnN #1 { tl } { g } n }
 \cs_new_protected:cpn { \c__keys_props_root_str .tl_gset:c } #1
   { \__keys_variable_set:cnnN {#1} { tl } { g } n }
-\cs_new_protected:cpn { \c__keys_props_root_str .tl_gset_x:N } #1
-  { \__keys_variable_set:NnnN #1 { tl } { g } x }
-\cs_new_protected:cpn { \c__keys_props_root_str .tl_gset_x:c } #1
-  { \__keys_variable_set:cnnN {#1} { tl } { g } x }
+\cs_new_protected:cpn { \c__keys_props_root_str .tl_gset_e:N } #1
+  { \__keys_variable_set:NnnN #1 { tl } { g } e }
+\cs_new_protected:cpn { \c__keys_props_root_str .tl_gset_e:c } #1
+  { \__keys_variable_set:cnnN {#1} { tl } { g } e }
 \cs_new_protected:cpn { \c__keys_props_root_str .undefine: }
   { \__keys_undefine: }
 \cs_new_protected:cpn { \c__keys_props_root_str .usage:n } #1
@@ -13514,7 +13653,7 @@
   { \__keys_value_requirement:nn { required } {#1} }
 \cs_new_protected:Npn \keys_set:nn #1#2
   {
-    \use:x
+    \use:e
       {
         \bool_set_false:N \exp_not:N \l__keys_only_known_bool
         \bool_set_false:N \exp_not:N \l__keys_filtered_bool
@@ -13532,12 +13671,12 @@
           { \exp_not:o \l__keys_relative_tl }
       }
   }
-\cs_generate_variant:Nn \keys_set:nn { nV , nv , no , nx }
+\cs_generate_variant:Nn \keys_set:nn { nV , nv , ne , no , nx }
 \cs_new_protected:Npn \__keys_set:nn #1#2
   { \exp_args:No \__keys_set:nnn \l__keys_module_str {#1} {#2} }
 \cs_new_protected:Npn \__keys_set:nnn #1#2#3
   {
-    \str_set:Nx \l__keys_module_str { \__keys_trim_spaces:n {#2} }
+    \str_set:Ne \l__keys_module_str { \__keys_trim_spaces:n {#2} }
     \keyval_parse:NNn \__keys_set_keyval:n \__keys_set_keyval:nn {#3}
     \str_set:Nn \l__keys_module_str {#1}
   }
@@ -13546,26 +13685,26 @@
     \exp_args:No \__keys_set_known:nnnnN
       \l__keys_unused_clist \q__keys_no_value {#1} {#2} #3
   }
-\cs_generate_variant:Nn \keys_set_known:nnN { nV , nv , no }
+\cs_generate_variant:Nn \keys_set_known:nnN { nV , nv , ne , no }
 \cs_new_protected:Npn \keys_set_known:nnnN #1#2#3#4
   {
     \exp_args:No \__keys_set_known:nnnnN
       \l__keys_unused_clist {#3} {#1} {#2} #4
   }
-\cs_generate_variant:Nn \keys_set_known:nnnN { nV , nv , no }
+\cs_generate_variant:Nn \keys_set_known:nnnN { nV , nv , ne , no }
 \cs_new_protected:Npn \__keys_set_known:nnnnN #1#2#3#4#5
   {
     \clist_clear:N \l__keys_unused_clist
     \__keys_set_known:nnn {#2} {#3} {#4}
-    \__kernel_tl_set:Nx #5 { \exp_not:o \l__keys_unused_clist }
+    \__kernel_tl_set:Ne #5 { \exp_not:o \l__keys_unused_clist }
     \tl_set:Nn \l__keys_unused_clist {#1}
   }
 \cs_new_protected:Npn \keys_set_known:nn #1#2
   { \__keys_set_known:nnn \q__keys_no_value {#1} {#2} }
-\cs_generate_variant:Nn \keys_set_known:nn { nV , nv , no }
+\cs_generate_variant:Nn \keys_set_known:nn { nV , nv , ne , no }
 \cs_new_protected:Npn \__keys_set_known:nnn #1#2#3
   {
-    \use:x
+    \use:e
       {
         \bool_set_true:N \exp_not:N \l__keys_only_known_bool
         \bool_set_false:N \exp_not:N \l__keys_filtered_bool
@@ -13599,7 +13738,7 @@
   {
     \clist_clear:N \l__keys_unused_clist
     \__keys_set_filter:nnnn {#2} {#3} {#4} {#5}
-    \__kernel_tl_set:Nx #6 { \exp_not:o \l__keys_unused_clist }
+    \__kernel_tl_set:Ne #6 { \exp_not:o \l__keys_unused_clist }
     \tl_set:Nn \l__keys_unused_clist {#1}
   }
 \cs_new_protected:Npn \keys_set_filter:nnn #1#2#3
@@ -13607,7 +13746,7 @@
 \cs_generate_variant:Nn \keys_set_filter:nnn { nnV , nnv , nno }
 \cs_new_protected:Npn \__keys_set_filter:nnnn #1#2#3#4
   {
-    \use:x
+    \use:e
       {
         \bool_set_false:N \exp_not:N \l__keys_only_known_bool
         \bool_set_true:N \exp_not:N \l__keys_filtered_bool
@@ -13626,7 +13765,7 @@
   }
 \cs_new_protected:Npn \keys_set_groups:nnn #1#2#3
   {
-    \use:x
+    \use:e
       {
         \bool_set_false:N \exp_not:N \l__keys_only_known_bool
         \bool_set_false:N \exp_not:N \l__keys_filtered_bool
@@ -13673,7 +13812,7 @@
   }
 \cs_new_protected:Npn \__keys_set_keyval:nnn #1#2#3
   {
-    \__kernel_tl_set:Nx \l_keys_path_str
+    \__kernel_tl_set:Ne \l_keys_path_str
       {
         \tl_if_blank:nF {#1}
           { #1 / }
@@ -13703,12 +13842,12 @@
 \cs_new_protected:Npn \__keys_find_key_module_auxii:Nw
     #1 #2 \s__keys_mark #3 \s__keys_nil \__keys_find_key_module_auxii:Nw
   {
-    \cs_set_nopar:Npx #1 { \tl_if_empty:NF #1 { #1 / } #2 }
+    \cs_set_nopar:Npe #1 { \tl_if_empty:NF #1 { #1 / } #2 }
     \__keys_find_key_module_auxi:Nw #1 #3 \s__keys_nil \__keys_find_key_module_auxiii:Nw
   }
 \cs_new_protected:Npn \__keys_find_key_module_auxiii:Nw #1 #2 \s__keys_mark
   {
-    \cs_set_nopar:Npx #1 { \tl_if_empty:NF #1 { #1 / } #2 }
+    \cs_set_nopar:Npe #1 { \tl_if_empty:NF #1 { #1 / } #2 }
     \__keys_find_key_module_auxi:Nw #1
   }
 \cs_new_protected:Npn \__keys_find_key_module_auxiv:Nw
@@ -13830,7 +13969,7 @@
           { \c__keys_code_root_str \l__keys_module_str / unknown }
           { \__keys_execute:no { \l__keys_module_str / unknown } \l_keys_value_tl }
           {
-            \msg_error:nnxx { keys } { unknown }
+            \msg_error:nnee { keys } { unknown }
               \l_keys_path_str \l__keys_module_str
           }
       }
@@ -13849,7 +13988,7 @@
   {
     \__keys_quark_if_no_value:NTF \l__keys_relative_tl
       {
-        \clist_put_right:Nx \l__keys_unused_clist
+        \clist_put_right:Ne \l__keys_unused_clist
           {
             \l_keys_key_str
             \bool_if:NF \l__keys_no_value_bool
@@ -13859,7 +13998,7 @@
       {
         \tl_if_empty:NTF \l__keys_relative_tl
           {
-            \clist_put_right:Nx \l__keys_unused_clist
+            \clist_put_right:Ne \l__keys_unused_clist
               {
                 \l_keys_path_str
                 \bool_if:NF \l__keys_no_value_bool
@@ -13871,30 +14010,30 @@
   }
 \cs_new_protected:Npn \__keys_store_unused_aux:
   {
-    \__kernel_tl_set:Nx \l__keys_relative_tl
+    \__kernel_tl_set:Ne \l__keys_relative_tl
       { \exp_args:No \__keys_trim_spaces:n \l__keys_relative_tl }
-    \use:x
+    \use:e
       {
         \cs_set_protected:Npn \__keys_store_unused:w
-          ####1 \l__keys_relative_tl /
-          ####2 \l__keys_relative_tl /
-          ####3 \s__keys_stop
+          ##1 \l__keys_relative_tl /
+          ##2 \l__keys_relative_tl /
+          ##3 \s__keys_stop
       }
         {
           \tl_if_blank:nF {##1}
             {
-              \msg_error:nnxx { keys } { bad-relative-key-path }
+              \msg_error:nnee { keys } { bad-relative-key-path }
                 \l_keys_path_str
                 \l__keys_relative_tl
             }
-          \clist_put_right:Nx \l__keys_unused_clist
+          \clist_put_right:Ne \l__keys_unused_clist
             {
               \exp_not:n {##2}
               \bool_if:NF \l__keys_no_value_bool
                 { = { \exp_not:o \l_keys_value_tl } }
             }
         }
-    \use:x
+    \use:e
       {
         \__keys_store_unused:w \l_keys_path_str
           \l__keys_relative_tl / \l__keys_relative_tl /
@@ -13989,9 +14128,9 @@
       { \prg_return_false: }
   }
 \cs_new_protected:Npn \keys_show:nn
-  { \__keys_show:Nnn \msg_show:nnxxxx }
+  { \__keys_show:Nnn \msg_show:nneeee }
 \cs_new_protected:Npn \keys_log:nn
-  { \__keys_show:Nnn \msg_log:nnxxxx }
+  { \__keys_show:Nnn \msg_log:nneeee }
 \cs_new_protected:Npn \__keys_show:Nnn #1#2#3
   {
     #1 { keys } { show-key }
@@ -14014,7 +14153,7 @@
       }
       { } { }
   }
-\cs_new:Npx \__keys_show:n #1
+\cs_new:Npe \__keys_show:n #1
   {
     \exp_not:N \__keys_show:w
       #1
@@ -14023,21 +14162,21 @@
       \tl_to_str:n { \__keys_precompile:n }
       \exp_not:N \s__keys_stop
   }
-\use:x
+\use:e
   {
     \cs_new:Npn \exp_not:N \__keys_show:w
-      ##1 \tl_to_str:n { \__keys_precompile:n }
-      ##2 \tl_to_str:n { \__keys_precompile:n }
-      ##3 \exp_not:N \s__keys_stop
+      #1 \tl_to_str:n { \__keys_precompile:n }
+      #2 \tl_to_str:n { \__keys_precompile:n }
+      #3 \exp_not:N \s__keys_stop
   }
   {
     \tl_if_blank:nTF {#2}
       {#1}
       { \__keys_show:Nw #2 \s__keys_stop }
   }
-\use:x
+\use:e
   {
-    \cs_new:Npn \exp_not:N \__keys_show:Nw ##1##2
+    \cs_new:Npn \exp_not:N \__keys_show:Nw #1#2
       \c_right_brace_str \exp_not:N \s__keys_stop
   }
   {#2}
@@ -14086,6 +14225,22 @@
   }
 \prop_gput:Nnn \g_msg_module_name_prop { keys } { LaTeX }
 \prop_gput:Nnn \g_msg_module_type_prop { keys } { }
+\cs_new_protected:cpn { \c__keys_props_root_str .str_set_x:N } #1
+  { \__keys_variable_set:NnnN #1 { str } { } x }
+\cs_new_protected:cpn { \c__keys_props_root_str .str_set_x:c } #1
+  { \__keys_variable_set:cnnN {#1} { str } { } x }
+\cs_new_protected:cpn { \c__keys_props_root_str .str_gset_x:N } #1
+  { \__keys_variable_set:NnnN #1 { str } { g } x }
+\cs_new_protected:cpn { \c__keys_props_root_str .str_gset_x:c } #1
+  { \__keys_variable_set:cnnN {#1} { str } { g } x }
+\cs_new_protected:cpn { \c__keys_props_root_str .tl_set_x:N } #1
+  { \__keys_variable_set:NnnN #1 { tl } { } x }
+\cs_new_protected:cpn { \c__keys_props_root_str .tl_set_x:c } #1
+  { \__keys_variable_set:cnnN {#1} { tl } { } x }
+\cs_new_protected:cpn { \c__keys_props_root_str .tl_gset_x:N } #1
+  { \__keys_variable_set:NnnN #1 { tl } { g } x }
+\cs_new_protected:cpn { \c__keys_props_root_str .tl_gset_x:c } #1
+  { \__keys_variable_set:cnnN {#1} { tl } { g } x }
 %% File: l3intarray.dtx
 \msg_new:nnn { kernel } { negative-array-size }
   { Size~of~array~may~not~be~negative:~#1 }
@@ -14098,7 +14253,7 @@
       {
         \__kernel_chk_if_free_cs:N #1
         \int_gincr:N \g__intarray_table_int
-        \cs_gset_nopar:Npx #1 { \__intarray:w \int_use:N \g__intarray_table_int \c_space_tl }
+        \cs_gset_nopar:Npe #1 { \__intarray:w \int_use:N \g__intarray_table_int \c_space_tl }
       }
     \cs_new_protected:Npn \intarray_new:Nn #1#2
       {
@@ -14106,7 +14261,7 @@
         \__intarray_gset_count:Nw #1 \int_eval:n {#2} \scan_stop:
         \int_compare:nNnT { \intarray_count:N #1 } < 0
           {
-            \msg_error:nnx { kernel } { negative-array-size }
+            \msg_error:nne { kernel } { negative-array-size }
               { \intarray_count:N #1 }
           }
       }
@@ -14118,7 +14273,7 @@
       {
         \__intarray_gset:wF \int_eval:n {#2} #1 \int_eval:n{#3}
           {
-            \msg_error:nnxxx { kernel } { out-of-bounds }
+            \msg_error:nneee { kernel } { out-of-bounds }
               { \token_to_str:N #1 } { \int_use:N \l__intarray_bad_index_int } { \intarray_count:N #1 }
           }
       }
@@ -14182,7 +14337,7 @@
         \__intarray_count:w #1 = \int_eval:n {#2} \scan_stop:
         \int_compare:nNnT { \intarray_count:N #1 } < 0
           {
-            \msg_error:nnx { kernel } { negative-array-size }
+            \msg_error:nne { kernel } { negative-array-size }
               { \intarray_count:N #1 }
           }
         \int_compare:nNnT { \intarray_count:N #1 } > 0
@@ -14223,7 +14378,7 @@
     \cs_generate_variant:Nn \intarray_gset:Nnn { c }
     \cs_new_protected:Npn \__intarray_gset:Nww #1#2 ; #3 ;
       {
-        \__intarray_bounds:NNnTF \msg_error:nnxxx #1 {#2}
+        \__intarray_bounds:NNnTF \msg_error:nneee #1 {#2}
           {
             \__intarray_gset_overflow_test:nw {#3}
             \__kernel_intarray_gset:Nnn #1 {#2} {#3}
@@ -14249,7 +14404,7 @@
       }
     \cs_new_protected:Npn \__intarray_gset_overflow:NNnn #1#2#3#4
       {
-        \msg_error:nnxxxx { kernel } { overflow }
+        \msg_error:nneeee { kernel } { overflow }
           { \token_to_str:N #2 } {#3} {#4} {  \__intarray_signed_max_dim:n {#4} }
         #1 #2 {#3} { \__intarray_signed_max_dim:n {#4} }
       }
@@ -14347,9 +14502,9 @@
         \__intarray_gset_range:Nw #1
       }
   }
-\cs_new_protected:Npn \intarray_show:N { \__intarray_show:NN \msg_show:nnxxxx }
+\cs_new_protected:Npn \intarray_show:N { \__intarray_show:NN \msg_show:nneeee }
 \cs_generate_variant:Nn \intarray_show:N { c }
-\cs_new_protected:Npn \intarray_log:N { \__intarray_show:NN \msg_log:nnxxxx }
+\cs_new_protected:Npn \intarray_log:N { \__intarray_show:NN \msg_log:nneeee }
 \cs_generate_variant:Nn \intarray_log:N { c }
 \cs_new_protected:Npn \__intarray_show:NN #1#2
   {
@@ -14378,7 +14533,7 @@
 \cs_new:Npn \__fp_use_i:ww #1; #2; { #1; }
 \cs_new:Npn \__fp_use_i:www #1; #2; #3; { #1; }
 \cs_new_protected:Npn \__fp_misused:n #1
-  { \msg_error:nnx { fp } { misused } { \fp_to_tl:n {#1} } }
+  { \msg_error:nne { fp } { misused } { \fp_to_tl:n {#1} } }
 \scan_new:N \s__fp
 \cs_new_protected:Npn \__fp_chk:w #1 ;
   { \__fp_misused:n { \s__fp \__fp_chk:w #1 ; } }
@@ -14404,7 +14559,7 @@
 \int_const:Nn \c__fp_minus_min_exponent_int { 10000 }
 \int_const:Nn \c__fp_max_exponent_int { 10000 }
 \int_const:Nn \c__fp_max_exp_exponent_int { 5 }
-\tl_const:Nx \c__fp_overflowing_fp
+\tl_const:Ne \c__fp_overflowing_fp
   {
     \s__fp \__fp_chk:w 1 0
       { \int_eval:n { \c__fp_max_exponent_int + 1 } }
@@ -14526,7 +14681,7 @@
       \s__fp { \__fp_type_from_scan_other:N #1 }
       \s__fp_stop
   }
-\cs_new:Npx \__fp_type_from_scan_other:N #1
+\cs_new:Npe \__fp_type_from_scan_other:N #1
   {
     \exp_not:N \exp_after:wN \exp_not:N \__fp_type_from_scan:w
     \exp_not:N \token_to_str:N #1 \s__fp_mark
@@ -14770,11 +14925,11 @@
           { invalid_operation , division_by_zero , overflow , underflow }
           {#1}
           {
-            \msg_error:nnxx { fp }
+            \msg_error:nnee { fp }
               { unknown-fpu-trap-type } {#1} {#2}
           }
           {
-            \msg_error:nnx
+            \msg_error:nne
               { fp } { unknown-fpu-exception } {#1}
           }
       }
@@ -15344,7 +15499,7 @@
         \exp_after:wN \__fp_parse_exponent:N
         \exp:w \__fp_parse_expand:w
   }
-\cs_new:Npx \__fp_parse_one_register_aux:Nw #1
+\cs_new:Npe \__fp_parse_one_register_aux:Nw #1
   {
     \exp_not:n
       {
@@ -15928,7 +16083,7 @@
     \fi:
     \__fp_parse_expand:w
   }
-\cs_new:Npx \__fp_parse_lparen_after:NwN #1#2 @ #3
+\cs_new:Npe \__fp_parse_lparen_after:NwN #1#2 @ #3
   {
     \exp_not:N \token_if_eq_meaning:NNTF #3
       \exp_not:c { __fp_parse_infix_):N }
@@ -16574,11 +16729,11 @@
   { \cs_new_eq:NN #1 \c_zero_fp }
 \cs_generate_variant:Nn \fp_new:N {c}
 \cs_new_protected:Npn \fp_set:Nn   #1#2
-  { \__kernel_tl_set:Nx #1 { \exp_not:f { \__fp_parse:n {#2} } } }
+  { \__kernel_tl_set:Ne #1 { \exp_not:f { \__fp_parse:n {#2} } } }
 \cs_new_protected:Npn \fp_gset:Nn  #1#2
-  { \__kernel_tl_gset:Nx #1 { \exp_not:f { \__fp_parse:n {#2} } } }
+  { \__kernel_tl_gset:Ne #1 { \exp_not:f { \__fp_parse:n {#2} } } }
 \cs_new_protected:Npn \fp_const:Nn #1#2
-  { \tl_const:Nx #1 { \exp_not:f { \__fp_parse:n {#2} } } }
+  { \tl_const:Ne #1 { \exp_not:f { \__fp_parse:n {#2} } } }
 \cs_generate_variant:Nn \fp_set:Nn {c}
 \cs_generate_variant:Nn \fp_gset:Nn {c}
 \cs_generate_variant:Nn \fp_const:Nn {c}
@@ -16620,7 +16775,7 @@
             \s__fp \__fp_chk:w ??? ; \s__fp_stop
           }
       }
-      { \exp_args:Nx #1 { \token_to_str:N #2 = \fp_to_tl:N #2 } }
+      { \exp_args:Ne #1 { \token_to_str:N #2 = \fp_to_tl:N #2 } }
   }
 \cs_new:Npn \__fp_show_validate:w
     #1 \s__fp \__fp_chk:w #2#3#4#5 ; #6 \s__fp_stop
@@ -16909,7 +17064,7 @@
   {
     \int_gincr:N \g__kernel_prg_map_int
     \exp_args:NNc \__fp_step:NNnnnn
-      \cs_gset_protected:Npx
+      \cs_gset_protected:Npe
       { __fp_map_ \int_use:N \g__kernel_prg_map_int :w }
       {#1} {#2} {#3}
       {
@@ -17066,7 +17221,7 @@
   { \__fp_parse_unary_function:NNN \__fp_sign_o:w ? }
 \cs_new:Npn \__fp_parse_word_sqrt:N
   { \__fp_parse_unary_function:NNN \__fp_sqrt_o:w ? }
-\cs_new:cpx { __fp_-_o:ww } \s__fp
+\cs_new:cpe { __fp_-_o:ww } \s__fp
   {
     \exp_not:c { __fp_+_o:ww }
     \exp_not:n { \s__fp \__fp_neg_sign:N }
@@ -17566,11 +17721,11 @@
   {
     + 5 * #1
     \exp_after:wN \__fp_div_significand_vi:Nw
-    \int_value:w \__fp_int_eval:w -20 + 2*#2#3 - #1*#6#7 +
+    \int_value:w \__fp_int_eval:w -50 + 2*#2#3 - #1*#6#7 +
       \exp_after:wN \__fp_div_significand_v:NN
-      \int_value:w \__fp_int_eval:w 199980 + 2*#4 - #1*#8 +
+      \int_value:w \__fp_int_eval:w 499950 + 2*#4 - #1*#8 +
         \exp_after:wN \__fp_div_significand_v:NN
-        \int_value:w \__fp_int_eval:w 200000 + 2*#5 - #1*#9 ;
+        \int_value:w \__fp_int_eval:w 500000 + 2*#5 - #1*#9 ;
   }
 \cs_new:Npn \__fp_div_significand_v:NN #1#2 { #1#2 \__fp_int_eval_end: + }
 \cs_new:Npn \__fp_div_significand_vi:Nw #1#2;
@@ -19069,13 +19224,13 @@
     {cos} {cot} {csc} {sec} {sin} {tan}
   }
   {
-    \cs_new:cpx { __fp_parse_word_#1:N }
+    \cs_new:cpe { __fp_parse_word_#1:N }
       {
         \exp_not:N \__fp_parse_unary_function:NNN
         \exp_not:c { __fp_#1_o:w }
         \exp_not:N \use_i:nn
       }
-    \cs_new:cpx { __fp_parse_word_#1d:N }
+    \cs_new:cpe { __fp_parse_word_#1d:N }
       {
         \exp_not:N \__fp_parse_unary_function:NNN
         \exp_not:c { __fp_#1_o:w }
@@ -19687,7 +19842,7 @@
       { #1 { acot } { acotd } }
       { \__fp_atan_default:w \__fp_acotii_o:Nww #1 }
   }
-\cs_new:Npx \__fp_atan_default:w #1#2#3 @ { #1 #2 #3 \c_one_fp @ }
+\cs_new:Npe \__fp_atan_default:w #1#2#3 @ { #1 #2 #3 \c_one_fp @ }
 \cs_new:Npn \__fp_atanii_o:Nww
     #1 \s__fp \__fp_chk:w #2#3#4; \s__fp \__fp_chk:w #5 #6 @
   {
@@ -20576,7 +20731,7 @@
 \cs_generate_variant:Nn \fparray_gset:Nnn { c }
 \cs_new_protected:Npn \__fp_array_gset:NNNNww #1#2#3#4#5 ; #6 ;
   {
-    \__fp_array_bounds:NNnTF \msg_error:nnxxx #4 {#5}
+    \__fp_array_bounds:NNnTF \msg_error:nneee #4 {#5}
       {
         \exp_after:wN \__fp_change_func_type:NNN
           \__fp_use_i_until_s:nw #6 ;
@@ -20837,7 +20992,7 @@
       {
         \seq_gpop:NNF \g__cctab_unused_seq \l__cctab_internal_a_tl
           { \__cctab_begin_aux: }
-        \exp_args:Nx \__cctab_chk_group_begin:n
+        \__cctab_chk_group_begin:e
           { \__cctab_nesting_number:N \l__cctab_internal_a_tl }
         \seq_gpush:NV \g__cctab_stack_seq \l__cctab_internal_a_tl
         \exp_args:NV \__cctab_gset:n \l__cctab_internal_a_tl
@@ -20850,7 +21005,7 @@
     \seq_gpop:NNTF \g__cctab_stack_seq \l__cctab_internal_a_tl
       {
         \seq_gpush:NV \g__cctab_unused_seq \l__cctab_internal_a_tl
-        \exp_args:Nx \__cctab_chk_group_end:n
+        \exp_args:Ne \__cctab_chk_group_end:n
           { \__cctab_nesting_number:N \l__cctab_internal_a_tl }
         \__cctab_select:N \l__cctab_internal_a_tl
       }
@@ -20858,10 +21013,11 @@
   }
 \cs_new_protected:Npn \__cctab_chk_group_begin:n #1
   {
-    \seq_gpush:Nx \g__cctab_group_seq
+    \seq_gpush:Ne \g__cctab_group_seq
       { \int_use:N \tex_currentgrouplevel:D }
     \cs_set_eq:cN { __cctab_group_ #1 _chk: } \prg_do_nothing:
   }
+\cs_generate_variant:Nn \__cctab_chk_group_begin:n { e }
 \cs_new_protected:Npn \__cctab_chk_group_end:n #1
   {
     \seq_gpop:NN \g__cctab_group_seq \l__cctab_internal_b_tl
@@ -20872,7 +21028,7 @@
       }
       { \cs_if_exist_p:c { __cctab_group_ #1 _chk: } }
       {
-        \msg_error:nnx { cctab } { group-mismatch }
+        \msg_error:nne { cctab } { group-mismatch }
           {
             \int_sign:n
               { \tex_currentgrouplevel:D - \l__cctab_internal_b_tl }
@@ -20888,10 +21044,10 @@
         \exp_after:wN \exp_after:wN \exp_after:wN \__cctab_nesting_number:w
           \exp_after:wN \token_to_str:N #1
       }
-    \use:x
+    \use:e
       {
         \cs_new:Npn \exp_not:N \__cctab_nesting_number:w
-          ##1 \tl_to_str:n { g__cctab_ } ##2 \tl_to_str:n { _cctab } {##2}
+          #1 \tl_to_str:n { g__cctab_ } #2 \tl_to_str:n { _cctab } {#2}
       }
   }
 \cs_if_exist:NT \hook_gput_code:nnn
@@ -20930,13 +21086,13 @@
         \__cctab_chk_if_valid_aux:NTF #1
           { \prg_return_true: }
           {
-            \msg_error:nnx { cctab } { invalid-cctab }
+            \msg_error:nne { cctab } { invalid-cctab }
               { \token_to_str:N #1 }
             \prg_return_false:
           }
       }
       {
-        \msg_error:nnx { kernel } { command-not-defined }
+        \msg_error:nne { kernel } { command-not-defined }
           { \token_to_str:N #1 }
         \prg_return_false:
       }
@@ -21191,7 +21347,7 @@
   {
     \group_begin:
       \__sort_main:NNNn \tl_map_inline:Nn \tl_map_break:n #2 {#3}
-      \__kernel_tl_gset:Nx \g__sort_internal_tl
+      \__kernel_tl_gset:Ne \g__sort_internal_tl
         { \__sort_tl_toks:w \l__sort_min_int ; }
     \group_end:
     #1 #2 \g__sort_internal_tl
@@ -21232,7 +21388,7 @@
       \int_step_inline:nnn
         \l__sort_min_int { \l__sort_top_int - 1 }
         {
-          \seq_gput_right:Nx \g__sort_internal_seq
+          \seq_gput_right:Ne \g__sort_internal_seq
             { \tex_the:D \tex_toks:D ##1 }
         }
     \group_end:
@@ -21313,14 +21469,14 @@
 \cs_new_protected:Npn \__sort_return_mark:w #1 \s__sort_mark { }
 \cs_new_protected:Npn \__sort_return_none_error:
   {
-    \msg_error:nnxx { sort } { return-none }
+    \msg_error:nnee { sort } { return-none }
       { \tex_the:D \tex_toks:D \l__sort_A_int }
       { \tex_the:D \tex_toks:D \l__sort_C_int }
     \__sort_return_same:w \__sort_return_none_error:
   }
 \cs_new_protected:Npn \__sort_return_two_error:
   {
-    \msg_error:nnxx { sort } { return-two }
+    \msg_error:nnee { sort } { return-two }
       { \tex_the:D \tex_toks:D \l__sort_A_int }
       { \tex_the:D \tex_toks:D \l__sort_C_int }
   }
@@ -21450,7 +21606,7 @@
   { \cs_set_eq:NN \toksdef \__sort_disabled_toksdef:n }
 \cs_new_protected:Npn \__sort_disabled_toksdef:n #1
   {
-    \msg_error:nnx { sort } { toksdef }
+    \msg_error:nne { sort } { toksdef }
       { \token_to_str:N #1 }
     \__sort_error:
     \tex_toksdef:D #1
@@ -21466,7 +21622,7 @@
 \cs_new_protected:Npn \__sort_too_long_error:NNw #1#2 \fi:
   {
     \fi:
-    \msg_error:nnxxx { sort } { too-large }
+    \msg_error:nneee { sort } { too-large }
       { \token_to_str:N #2 }
       { \int_eval:n { \l__sort_true_max_int - \l__sort_min_int } }
       { \int_eval:n { \l__sort_top_int - \l__sort_min_int } }
@@ -21588,12 +21744,12 @@
     \fi:
   }
 \group_begin:
-  \__kernel_tl_set:Nx \l__str_internal_tl { \tl_to_str:n { 0123456789ABCDEF } }
+  \__kernel_tl_set:Ne \l__str_internal_tl { \tl_to_str:n { 0123456789ABCDEF } }
    \tl_map_inline:Nn \l__str_internal_tl
      {
         \tl_map_inline:Nn \l__str_internal_tl
           {
-            \tl_const:cx { c__str_byte_ \int_eval:n {"#1##1} _tl }
+            \tl_const:ce { c__str_byte_ \int_eval:n {"#1##1} _tl }
                { \char_generate:nn { "#1##1 } { 12 } #1 ##1 }
           }
      }
@@ -21633,7 +21789,7 @@
   }
 \cs_new_protected:Npn \__str_convert_gmap:N #1
   {
-    \__kernel_tl_gset:Nx \g__str_result_tl
+    \__kernel_tl_gset:Ne \g__str_result_tl
       {
         \exp_after:wN \__str_convert_gmap_loop:NN
         \exp_after:wN #1
@@ -21649,7 +21805,7 @@
   }
 \cs_new_protected:Npn \__str_convert_gmap_internal:N #1
   {
-    \__kernel_tl_gset:Nx \g__str_result_tl
+    \__kernel_tl_gset:Ne \g__str_result_tl
       {
         \exp_after:wN \__str_convert_gmap_internal_loop:Nww
         \exp_after:wN #1
@@ -21663,13 +21819,13 @@
     #1 {#3}
     \__str_convert_gmap_internal_loop:Nww #1
   }
-\cs_new_protected:Npn \__str_if_flag_error:nnx #1
+\cs_new_protected:Npn \__str_if_flag_error:nne #1
   {
     \flag_if_raised:nTF {#1}
-      { \msg_error:nnx { str } }
+      { \msg_error:nne { str } }
       { \use_none:nn }
   }
-\cs_new_protected:Npn \__str_if_flag_no_error:nnx #1#2#3
+\cs_new_protected:Npn \__str_if_flag_no_error:nne #1#2#3
   { \flag_if_raised:nT {#1} { \bool_gset_true:N \g__str_error_bool } }
 \cs_new:Npn \__str_if_flag_times:nT #1#2
   { \flag_if_raised:nT {#1} { #2~(x \flag_height:n {#1} ) } }
@@ -21682,7 +21838,7 @@
   {
     \bool_gset_false:N \g__str_error_bool
     \__str_convert:nNNnnn
-      { \cs_set_eq:NN \__str_if_flag_error:nnx \__str_if_flag_no_error:nnx }
+      { \cs_set_eq:NN \__str_if_flag_error:nne \__str_if_flag_no_error:nne }
       \tl_set_eq:NN #1 {#2} {#3} {#4}
     \bool_if:NTF \g__str_error_bool \prg_return_false: \prg_return_true:
   }
@@ -21691,7 +21847,7 @@
   {
     \bool_gset_false:N \g__str_error_bool
     \__str_convert:nNNnnn
-      { \cs_set_eq:NN \__str_if_flag_error:nnx \__str_if_flag_no_error:nnx }
+      { \cs_set_eq:NN \__str_if_flag_error:nne \__str_if_flag_no_error:nne }
       \tl_gset_eq:NN #1 {#2} {#3} {#4}
     \bool_if:NTF \g__str_error_bool \prg_return_false: \prg_return_true:
   }
@@ -21699,7 +21855,7 @@
   {
     \group_begin:
       #1
-      \__kernel_tl_gset:Nx \g__str_result_tl { \__kernel_str_to_other_fast:n {#4} }
+      \__kernel_tl_gset:Ne \g__str_result_tl { \__kernel_str_to_other_fast:n {#4} }
       \exp_after:wN \__str_convert:wwwnn
         \tl_to_str:n {#5} /// \s__str_stop
         { decode } { unescape }
@@ -21725,7 +21881,7 @@
   {
     \if_meaning:w #1 #5
       \tl_if_empty:nF {#3}
-        { \msg_error:nnx { str } { native-escaping } {#3} }
+        { \msg_error:nne { str } { native-escaping } {#3} }
       #1
     \else:
       #4 #2 #1
@@ -21735,7 +21891,7 @@
   {
     \cs_if_exist:cF { __str_convert_#2_#3: }
       {
-        \exp_args:Nx \__str_convert:nnnn
+        \exp_args:Ne \__str_convert:nnnn
           { \__str_convert_lowercase_alphanum:n {#3} }
           {#1} {#2} {#3}
       }
@@ -21757,7 +21913,7 @@
               }
               {
                 \tl_clear:N \l__str_internal_tl
-                \msg_error:nnxx { str } { unknown-#2 } {#4} {#1}
+                \msg_error:nnee { str } { unknown-#2 } {#4} {#1}
               }
           }
         \cs_if_exist:cF { __str_convert_#3_#1: }
@@ -21827,9 +21983,9 @@
     \cs_new_protected:Npn \__str_convert_unescape_:
       {
         \flag_clear:n { str_byte }
-        \__kernel_tl_gset:Nx \g__str_result_tl
+        \__kernel_tl_gset:Ne \g__str_result_tl
           { \exp_args:No \__str_filter_bytes:n \g__str_result_tl }
-        \__str_if_flag_error:nnx { str_byte } { non-byte } { bytes }
+        \__str_if_flag_error:nne { str_byte } { non-byte } { bytes }
       }
   }
   { \cs_new_protected:Npn \__str_convert_unescape_: { } }
@@ -21856,7 +22012,7 @@
       {
         \flag_clear:n { str_error }
         \__str_convert_gmap_internal:N \__str_encode_native_char:n
-        \__str_if_flag_error:nnx { str_error }
+        \__str_if_flag_error:nne { str_error }
           { native-overflow } { }
       }
     \cs_new:Npn \__str_encode_native_char:n #1
@@ -21879,7 +22035,7 @@
 \cs_new_protected:Npn \__str_convert_decode_clist:
   {
     \clist_gset:No \g__str_result_tl \g__str_result_tl
-    \__kernel_tl_gset:Nx \g__str_result_tl
+    \__kernel_tl_gset:Ne \g__str_result_tl
       {
         \exp_args:No \clist_map_function:nN
           \g__str_result_tl \__str_decode_clist_char:n
@@ -21890,7 +22046,7 @@
 \cs_new_protected:Npn \__str_convert_encode_clist:
   {
     \__str_convert_gmap_internal:N \__str_encode_clist_char:n
-    \__kernel_tl_gset:Nx \g__str_result_tl { \tl_tail:N \g__str_result_tl }
+    \__kernel_tl_gset:Ne \g__str_result_tl { \tl_tail:N \g__str_result_tl }
   }
 \cs_new:Npn \__str_encode_clist_char:n #1 { , #1 }
 \cs_new_protected:Npn \__str_declare_eight_bit_encoding:nnnn #1
@@ -21943,14 +22099,14 @@
   }
 \cs_new_protected:Npn \__str_convert_decode_eight_bit:n #1
   {
-    \cs_set:Npx \__str_tmp:w
+    \cs_set:Npe \__str_tmp:w
       {
         \exp_not:N \__str_decode_eight_bit_aux:Nn
         \exp_not:c { g__str_decode_#1_intarray }
       }
     \flag_clear:n { str_error }
     \__str_convert_gmap:N \__str_tmp:w
-    \__str_if_flag_error:nnx { str_error } { decode-8-bit } {#1}
+    \__str_if_flag_error:nne { str_error } { decode-8-bit } {#1}
   }
 \cs_new:Npn \__str_decode_eight_bit_aux:Nn #1#2
   {
@@ -21971,7 +22127,7 @@
 \int_new:N \l__str_modulo_int
 \cs_new_protected:Npn \__str_convert_encode_eight_bit:n #1
   {
-    \cs_set:Npx \__str_tmp:w
+    \cs_set:Npe \__str_tmp:w
       {
         \exp_not:N \__str_encode_eight_bit_aux:NNn
         \exp_not:c { g__str_encode_#1_intarray }
@@ -21979,7 +22135,7 @@
       }
     \flag_clear:n { str_error }
     \__str_convert_gmap_internal:N \__str_tmp:w
-    \__str_if_flag_error:nnx { str_error } { encode-8-bit } {#1}
+    \__str_if_flag_error:nne { str_error } { encode-8-bit } {#1}
   }
 \cs_new:Npn \__str_encode_eight_bit_aux:NNn #1#2#3
   {
@@ -22048,7 +22204,7 @@
     \group_begin:
       \flag_clear:n { str_error }
       \int_set:Nn \tex_escapechar:D { 92 }
-      \__kernel_tl_gset:Nx \g__str_result_tl
+      \__kernel_tl_gset:Ne \g__str_result_tl
         {
           \__str_output_byte:w "
             \exp_last_unbraced:Nf \__str_unescape_hex_auxi:N
@@ -22057,7 +22213,7 @@
             \prg_break_point:
           \__str_output_end:
         }
-      \__str_if_flag_error:nnx { str_error } { unescape-hex } { }
+      \__str_if_flag_error:nne { str_error } { unescape-hex } { }
     \group_end:
   }
 \cs_new:Npn \__str_unescape_hex_auxi:N #1
@@ -22097,14 +22253,14 @@
           \flag_clear:n { str_byte }
           \flag_clear:n { str_error }
           \int_set:Nn \tex_escapechar:D { 92 }
-          \__kernel_tl_gset:Nx \g__str_result_tl
+          \__kernel_tl_gset:Ne \g__str_result_tl
             {
               \exp_after:wN #3 \g__str_result_tl
                 #1 ? { ? \prg_break: }
               \prg_break_point:
             }
-          \__str_if_flag_error:nnx { str_byte } { non-byte } { #2 }
-          \__str_if_flag_error:nnx { str_error } { unescape-#2 } { }
+          \__str_if_flag_error:nne { str_byte } { non-byte } { #2 }
+          \__str_if_flag_error:nne { str_error } { unescape-#2 } { }
         \group_end:
       }
     \cs_new:Npn #3 ##1#1##2##3
@@ -22150,20 +22306,20 @@
             \flag_clear:n { str_byte }
             \flag_clear:n { str_error }
             \int_set:Nn \tex_escapechar:D { 92 }
-            \__kernel_tl_gset:Nx \g__str_result_tl
+            \__kernel_tl_gset:Ne \g__str_result_tl
               {
                 \exp_after:wN \__str_unescape_string_newlines:wN
                   \g__str_result_tl \prg_break: ^^M ?
                 \prg_break_point:
               }
-            \__kernel_tl_gset:Nx \g__str_result_tl
+            \__kernel_tl_gset:Ne \g__str_result_tl
               {
                 \exp_after:wN \__str_unescape_string_loop:wNNN
                   \g__str_result_tl #1 ?? { ? \prg_break: }
                 \prg_break_point:
               }
-            \__str_if_flag_error:nnx { str_byte } { non-byte } { string }
-            \__str_if_flag_error:nnx { str_error } { unescape-string } { }
+            \__str_if_flag_error:nne { str_byte } { non-byte } { string }
+            \__str_if_flag_error:nne { str_error } { unescape-string } { }
           \group_end:
         }
     }
@@ -22254,7 +22410,7 @@
       \fi:
     \fi:
   }
-\str_const:Nx \c__str_escape_string_str
+\str_const:Ne \c__str_escape_string_str
   { \c_backslash_str ( ) }
 \cs_new_protected:Npn \__str_convert_escape_string:
   { \__str_convert_gmap:N \__str_escape_string_char:N }
@@ -22389,13 +22545,13 @@
     \flag_clear:n { str_extra }
     \flag_clear:n { str_overlong }
     \flag_clear:n { str_overflow }
-    \__kernel_tl_gset:Nx \g__str_result_tl
+    \__kernel_tl_gset:Ne \g__str_result_tl
       {
         \exp_after:wN \__str_decode_utf_viii_start:N \g__str_result_tl
           { \prg_break: \__str_decode_utf_viii_end: }
         \prg_break_point:
       }
-    \__str_if_flag_error:nnx { str_error } { utf8-decode } { }
+    \__str_if_flag_error:nne { str_error } { utf8-decode } { }
   }
 \cs_new:Npn \__str_decode_utf_viii_start:N #1
   {
@@ -22481,7 +22637,7 @@
   \cs_new_protected:cpn { __str_convert_encode_utf16: }
     {
       \__str_encode_utf_xvi_aux:N \__str_output_byte_pair_be:n
-      \tl_gput_left:Nx \g__str_result_tl { ^^fe ^^ff }
+      \tl_gput_left:Ne \g__str_result_tl { ^^fe ^^ff }
     }
   \cs_new_protected:cpn { __str_convert_encode_utf16be: }
     { \__str_encode_utf_xvi_aux:N \__str_output_byte_pair_be:n }
@@ -22492,7 +22648,7 @@
       \flag_clear:n { str_error }
       \cs_set_eq:NN \__str_tmp:w #1
       \__str_convert_gmap_internal:N \__str_encode_utf_xvi_char:n
-      \__str_if_flag_error:nnx { str_error } { utf16-encode } { }
+      \__str_if_flag_error:nne { str_error } { utf16-encode } { }
     }
   \cs_new:Npn \__str_encode_utf_xvi_char:n #1
     {
@@ -22589,13 +22745,13 @@
       \flag_clear:n { str_extra }
       \flag_clear:n { str_end }
       \cs_set:Npn \__str_tmp:w ##1 ##2 { ` ## #1 }
-      \__kernel_tl_gset:Nx \g__str_result_tl
+      \__kernel_tl_gset:Ne \g__str_result_tl
         {
           \exp_after:wN \__str_decode_utf_xvi_pair:NN
             #2 \q__str_nil \q__str_nil
           \prg_break_point:
         }
-      \__str_if_flag_error:nnx { str_error } { utf16-decode } { }
+      \__str_if_flag_error:nne { str_error } { utf16-decode } { }
     }
   \cs_new:Npn \__str_decode_utf_xvi_pair:NN #1#2
     {
@@ -22664,7 +22820,7 @@
   \cs_new_protected:cpn { __str_convert_encode_utf32: }
     {
       \__str_convert_gmap_internal:N \__str_encode_utf_xxxii_be:n
-      \tl_gput_left:Nx \g__str_result_tl { ^^00 ^^00 ^^fe ^^ff }
+      \tl_gput_left:Ne \g__str_result_tl { ^^00 ^^00 ^^fe ^^ff }
     }
   \cs_new_protected:cpn { __str_convert_encode_utf32be: }
     { \__str_convert_gmap_internal:N \__str_encode_utf_xxxii_be:n }
@@ -22746,13 +22902,13 @@
       \flag_clear:n { str_end }
       \flag_clear:n { str_error }
       \cs_set:Npn \__str_tmp:w ##1 ##2 { ` ## #1 }
-      \__kernel_tl_gset:Nx \g__str_result_tl
+      \__kernel_tl_gset:Ne \g__str_result_tl
         {
           \exp_after:wN \__str_decode_utf_xxxii_loop:NNNN
             #2 \s__str_stop \s__str_stop \s__str_stop \s__str_stop
           \prg_break_point:
         }
-      \__str_if_flag_error:nnx { str_error } { utf32-decode } { }
+      \__str_if_flag_error:nne { str_error } { utf32-decode } { }
     }
   \cs_new:Npn \__str_decode_utf_xxxii_loop:NNNN #1#2#3#4
     {
@@ -22811,7 +22967,7 @@
       }
     \cs_new:Npn \__str_convert_pdfname_bytes_aux:n #1
       { \__str_convert_pdfname_bytes_aux:nnnn #1 }
-    \cs_new:Npx \__str_convert_pdfname_bytes_aux:nnnn #1#2#3#4
+    \cs_new:Npe \__str_convert_pdfname_bytes_aux:nnnn #1#2#3#4
       {
         \c_hash_str \exp_not:N \__str_output_hexadecimal:n {#1}
         \c_hash_str \exp_not:N \__str_output_hexadecimal:n {#2}
@@ -22834,7 +22990,7 @@
 \tl_new:N \l__tl_peek_code_tl
 \group_begin:
 \char_set_active_eq:NN \  \scan_stop:
-\tl_const:Nx \c__tl_peek_catcodes_tl
+\tl_const:Ne \c__tl_peek_catcodes_tl
   {
     \char_generate:nn { 32 } { 3 }   3
     \char_generate:nn { 32 } { 4 }   4
@@ -23042,7 +23198,7 @@
   }
 \cs_new_protected:Npn \__tl_analysis_b:n #1
   {
-    \__kernel_tl_gset:Nx \g__tl_analysis_result_tl
+    \__kernel_tl_gset:Ne \g__tl_analysis_result_tl
       {
         \__tl_analysis_b_loop:w 0; #1
         \prg_break_point:
@@ -23074,7 +23230,7 @@
     \fi:
     #3 #1; #2;
   }
-\cs_new:Npx \__tl_analysis_b_char:Nn #1#2
+\cs_new:Npe \__tl_analysis_b_char:Nn #1#2
   {
     \exp_not:N \if_meaning:w #2 \exp_not:N \tex_undefined:D
       \token_to_str:N D \exp_not:N \else:
@@ -23180,9 +23336,9 @@
     \__tl_analysis_map:NwNw #1
   }
 \cs_new_protected:Npn \tl_analysis_show:N
-  { \__tl_analysis_show:NNN \msg_show:nnxxxx \tl_show:N }
+  { \__tl_analysis_show:NNN \msg_show:nneeee \tl_show:N }
 \cs_new_protected:Npn \tl_analysis_log:N
-  { \__tl_analysis_show:NNN \msg_log:nnxxxx \tl_log:N }
+  { \__tl_analysis_show:NNN \msg_log:nneeee \tl_log:N }
 \cs_new_protected:Npn \__tl_analysis_show:NNN #1#2#3
   {
     \tl_if_exist:NTF #3
@@ -23194,9 +23350,9 @@
       { #2 #3 }
   }
 \cs_new_protected:Npn \tl_analysis_show:n
-  { \__tl_analysis_show:Nn \msg_show:nnxxxx }
+  { \__tl_analysis_show:Nn \msg_show:nneeee }
 \cs_new_protected:Npn \tl_analysis_log:n
-  { \__tl_analysis_show:Nn \msg_log:nnxxxx }
+  { \__tl_analysis_show:Nn \msg_log:nneeee }
 \cs_new_protected:Npn \__tl_analysis_show:Nn #1#2
   {
     \__tl_analysis:n {#2}
@@ -23304,7 +23460,7 @@
 \cs_new_protected:Npn \__tl_peek_analysis_loop:NNn #1#2#3
   {
     \group_begin:
-    \tl_set:Nx \l__tl_peek_code_tl
+    \tl_set:Ne \l__tl_peek_code_tl
       {
         \exp_not:c
           { __tl_analysis_map_ \int_use:N \g__kernel_prg_map_int :nnN }
@@ -23333,7 +23489,7 @@
   }
 \cs_new_protected:Npn \__tl_peek_analysis_exp:N #1
   {
-    \cs_set_nopar:Npx \l__tl_peek_code_tl
+    \cs_set_nopar:Npe \l__tl_peek_code_tl
       {
         \tex_let:D \exp_not:N #1 \scan_stop:
         \exp_not:o \l__tl_peek_code_tl
@@ -23355,7 +23511,7 @@
       }
     \l__tl_peek_code_tl
   }
-\cs_new:Npx \__tl_peek_analysis_exp_active:N #1
+\cs_new:Npe \__tl_peek_analysis_exp_active:N #1
   { { \exp_not:N \int_value:w `#1 } \token_to_str:N D }
 \cs_new_protected:Npn \__tl_peek_analysis_nonexp:N #1
   {
@@ -23373,7 +23529,7 @@
   { \l__tl_peek_code_tl { \exp_not:n {#1} } { -1 } 0 }
 \group_begin:
 \char_set_active_eq:NN \ \scan_stop:
-\cs_new_protected:Npx \__tl_peek_analysis_char:N #1
+\cs_new_protected:Npe \__tl_peek_analysis_char:N #1
   {
     \cs_set_eq:NN
       \char_generate:nn { 32 } { 13 }
@@ -23381,7 +23537,7 @@
     \tex_lccode:D `#1 = 32 \exp_stop_f:
     \tex_lowercase:D
       {
-        \tl_put_right:Nx \exp_not:N \l__tl_peek_code_tl
+        \tl_put_right:Ne \exp_not:N \l__tl_peek_code_tl
           { \exp_not:n { \__tl_analysis_b_char:Nn \use_none:n } {#1} }
       }
     \exp_not:n
@@ -23460,7 +23616,7 @@
   }
 \cs_new_protected:Npn \__tl_peek_analysis_active_str:n #1
   {
-    \tl_put_right:Nx \l__tl_peek_code_tl
+    \tl_put_right:Ne \l__tl_peek_code_tl
       {
         { \char_generate:nn { `#1 } { 13 } }
         { \int_value:w `#1 }
@@ -23470,7 +23626,7 @@
   }
 \cs_new_protected:Npn \__tl_peek_analysis_explicit:n #1
   {
-    \tl_put_right:Nx \l__tl_peek_code_tl
+    \tl_put_right:Ne \l__tl_peek_code_tl
       {
         \if_meaning:w \l_peek_token \c_space_token
           { ~ } { 32 } \token_to_str:N A
@@ -23529,7 +23685,7 @@
 \cs_new_protected:Npn \__tl_peek_analysis_collect_end:NNN #1#2#3
   {
     #1 #2
-    \tl_put_right:Nx \l__tl_peek_code_tl
+    \tl_put_right:Ne \l__tl_peek_code_tl
       {
         { \exp_not:N \exp_not:n { \exp_not:c { \l__tl_internal_a_tl } } }
         { -1 }
@@ -23537,7 +23693,7 @@
       }
     \l__tl_peek_code_tl
   }
-\tl_const:Nx \c__tl_analysis_show_etc_str % (
+\tl_const:Ne \c__tl_analysis_show_etc_str % (
   { \token_to_str:N \ETC.) }
 \msg_new:nnn { tl } { show-analysis }
   {
@@ -23565,15 +23721,15 @@
         \int_incr:N #2
       }
   }
-\cs_new_protected:Npn \__regex_toks_put_left:Nx #1#2
+\cs_new_protected:Npn \__regex_toks_put_left:Ne #1#2
   {
-    \cs_set_nopar:Npx \__regex_tmp:w { #2 }
+    \cs_set_nopar:Npe \__regex_tmp:w { #2 }
     \tex_toks:D #1 \exp_after:wN \exp_after:wN \exp_after:wN
       { \exp_after:wN \__regex_tmp:w \tex_the:D \tex_toks:D #1 }
   }
-\cs_new_protected:Npn \__regex_toks_put_right:Nx #1#2
+\cs_new_protected:Npn \__regex_toks_put_right:Ne #1#2
   {
-    \cs_set_nopar:Npx \__regex_tmp:w {#2}
+    \cs_set_nopar:Npe \__regex_tmp:w {#2}
     \tex_toks:D #1 \exp_after:wN
       { \tex_the:D \tex_toks:D \exp_after:wN #1 \__regex_tmp:w }
   }
@@ -23736,7 +23892,7 @@
   {
     \int_compare:nNnTF \l__regex_curr_catcode_int = 0
       {
-        \__kernel_tl_set:Nx \l__regex_internal_a_tl
+        \__kernel_tl_set:Ne \l__regex_internal_a_tl
           { \scan_stop: \__regex_curr_cs_to_str: \scan_stop: }
         \tl_if_in:noTF { \scan_stop: #1 \scan_stop: }
           \l__regex_internal_a_tl
@@ -23754,7 +23910,7 @@
           \__regex_build_for_cs:n {#1}
           \bool_set_eq:NN \l__regex_saved_success_bool
             \g__regex_success_bool
-          \exp_args:Nx \__regex_match_cs:n { \__regex_curr_cs_to_str: }
+          \exp_args:Ne \__regex_match_cs:n { \__regex_curr_cs_to_str: }
           \if_meaning:w \c_true_bool \g__regex_success_bool
             \group_insert_after:N \__regex_break_true:w
           \fi:
@@ -23846,9 +24002,9 @@
       \cs_set:Npn \__regex_escape_escaped:N ##1 { #2 }
       \cs_set:Npn \__regex_escape_raw:N ##1 { #3 }
       \__regex_standard_escapechar:
-      \__kernel_tl_gset:Nx \g__regex_internal_tl
+      \__kernel_tl_gset:Ne \g__regex_internal_tl
         { \__kernel_str_to_other_fast:n {#4} }
-      \tl_put_right:Nx \l__regex_internal_a_tl
+      \tl_put_right:Ne \l__regex_internal_a_tl
         {
           \exp_after:wN \__regex_escape_loop:N \g__regex_internal_tl
           \scan_stop: \prg_break_point:
@@ -23880,17 +24036,17 @@
     \prg_break:
   }
 \cs_new:cpn { __regex_escape_~:w } { }
-\cs_new:cpx { __regex_escape_/a:w }
+\cs_new:cpe { __regex_escape_/a:w }
   { \exp_not:N \__regex_escape_raw:N \iow_char:N \^^G }
-\cs_new:cpx { __regex_escape_/t:w }
+\cs_new:cpe { __regex_escape_/t:w }
   { \exp_not:N \__regex_escape_raw:N \iow_char:N \^^I }
-\cs_new:cpx { __regex_escape_/n:w }
+\cs_new:cpe { __regex_escape_/n:w }
   { \exp_not:N \__regex_escape_raw:N \iow_char:N \^^J }
-\cs_new:cpx { __regex_escape_/f:w }
+\cs_new:cpe { __regex_escape_/f:w }
   { \exp_not:N \__regex_escape_raw:N \iow_char:N \^^L }
-\cs_new:cpx { __regex_escape_/r:w }
+\cs_new:cpe { __regex_escape_/r:w }
   { \exp_not:N \__regex_escape_raw:N \iow_char:N \^^M }
-\cs_new:cpx { __regex_escape_/e:w }
+\cs_new:cpe { __regex_escape_/e:w }
   { \exp_not:N \__regex_escape_raw:N \iow_char:N \^^[ }
 \cs_new:cpn { __regex_escape_/x:w } \__regex_escape_loop:N
   {
@@ -24185,7 +24341,7 @@
         }
         { }
       \if_int_compare:w \l__regex_group_level_int > \c_zero_int
-        \msg_error:nnx { regex } { missing-rparen }
+        \msg_error:nne { regex } { missing-rparen }
           { \int_use:N \l__regex_group_level_int }
         \prg_replicate:nn
           { \l__regex_group_level_int }
@@ -24204,7 +24360,7 @@
       \fi:
       \tl_build_put_right:Nn \l__regex_build_tl { \if_false: { \fi: } }
       \tl_build_end:N \l__regex_build_tl
-      \exp_args:NNNx
+      \exp_args:NNNe
     \group_end:
     \tl_set:Nn \l__regex_internal_regex { \l__regex_build_tl }
   }
@@ -24269,7 +24425,7 @@
         \tl_build_put_right:Nn \l__regex_build_tl
           { \__regex_class:NnnnN \c_true_bool { \if_false: } \fi: }
       }
-    \tl_build_put_right:Nx \l__regex_build_tl
+    \tl_build_put_right:Ne \l__regex_build_tl
       {
         \if_int_compare:w \l__regex_catcodes_int <
           \c__regex_all_catcodes_int
@@ -24284,13 +24440,13 @@
   }
 \cs_new_protected:Npn \__regex_compile_abort_tokens:n #1
   {
-    \use:x
+    \use:e
       {
         \exp_args:No \tl_map_function:nN { \tl_to_str:n {#1} }
           \__regex_compile_raw:N
       }
   }
-\cs_generate_variant:Nn \__regex_compile_abort_tokens:n { x }
+\cs_generate_variant:Nn \__regex_compile_abort_tokens:n { e }
 \cs_new_protected:Npn \__regex_compile_if_quantifier:TFw #1#2#3#4
   {
     \token_if_eq_meaning:NNTF #3 \__regex_compile_special:N
@@ -24312,11 +24468,11 @@
     \tl_build_put_right:Nn \l__regex_build_tl
       { \if_false: { \fi: } { 1 } { 0 } \c_false_bool }
   }
-\cs_new_protected:Npn \__regex_compile_quantifier_abort:xNN #1#2#3
+\cs_new_protected:Npn \__regex_compile_quantifier_abort:eNN #1#2#3
   {
     \__regex_compile_quantifier_none:
-    \msg_warning:nnxx { regex } { invalid-quantifier } {#1} {#3}
-    \__regex_compile_abort_tokens:x {#1}
+    \msg_warning:nnee { regex } { invalid-quantifier } {#1} {#3}
+    \__regex_compile_abort_tokens:e {#1}
     #2 #3
   }
 \cs_new_protected:Npn \__regex_compile_quantifier_lazyness:nnNN #1#2#3#4
@@ -24342,7 +24498,7 @@
   {
     \__regex_get_digits:NTFw \l__regex_internal_a_int
       { \__regex_compile_quantifier_braced_auxi:w }
-      { \__regex_compile_quantifier_abort:xNN { \c_left_brace_str } }
+      { \__regex_compile_quantifier_abort:eNN { \c_left_brace_str } }
   }
 \cs_new_protected:Npn \__regex_compile_quantifier_braced_auxi:w #1#2
   {
@@ -24361,7 +24517,7 @@
           }
       }
       {
-        \__regex_compile_quantifier_abort:xNN
+        \__regex_compile_quantifier_abort:eNN
           { \c_left_brace_str \int_use:N \l__regex_internal_a_int }
         #1 #2
       }
@@ -24374,7 +24530,7 @@
           { \int_use:N \l__regex_internal_a_int } { -1 }
       }
       {
-        \__regex_compile_quantifier_abort:xNN
+        \__regex_compile_quantifier_abort:eNN
           { \c_left_brace_str \int_use:N \l__regex_internal_a_int , }
         #1 #2
       }
@@ -24385,7 +24541,7 @@
       {
         \if_int_compare:w \l__regex_internal_a_int >
           \l__regex_internal_b_int
-          \msg_error:nnxx { regex } { backwards-quantifier }
+          \msg_error:nnee { regex } { backwards-quantifier }
             { \int_use:N \l__regex_internal_a_int }
             { \int_use:N \l__regex_internal_b_int }
           \int_zero:N \l__regex_internal_b_int
@@ -24397,7 +24553,7 @@
           { \int_use:N \l__regex_internal_b_int }
       }
       {
-        \__regex_compile_quantifier_abort:xNN
+        \__regex_compile_quantifier_abort:eNN
           {
             \c_left_brace_str
             \int_use:N \l__regex_internal_a_int ,
@@ -24408,7 +24564,7 @@
   }
 \cs_new_protected:Npn \__regex_compile_raw_error:N #1
   {
-    \msg_error:nnx { regex } { bad-escape } {#1}
+    \msg_error:nne { regex } { bad-escape } {#1}
     \__regex_compile_raw:N #1
   }
 \cs_new_protected:Npn \__regex_compile_raw:N #1#2#3
@@ -24450,9 +24606,9 @@
     \__regex_if_end_range:NNTF #2 #3
       {
         \if_int_compare:w `#1 > `#3 \exp_stop_f:
-          \msg_error:nnxx { regex } { range-backwards } {#1} {#3}
+          \msg_error:nnee { regex } { range-backwards } {#1} {#3}
         \else:
-          \tl_build_put_right:Nx \l__regex_build_tl
+          \tl_build_put_right:Ne \l__regex_build_tl
             {
               \if_int_compare:w `#1 = `#3 \exp_stop_f:
                 \__regex_item_equal:n
@@ -24464,9 +24620,9 @@
         \fi:
       }
       {
-        \msg_warning:nnxx { regex } { range-missing-end }
+        \msg_warning:nnee { regex } { range-missing-end }
           {#1} { \c_backslash_str #3 }
-        \tl_build_put_right:Nx \l__regex_build_tl
+        \tl_build_put_right:Ne \l__regex_build_tl
           {
             \__regex_item_equal:n { \int_value:w `#1 \exp_stop_f: }
             \__regex_item_equal:n { \int_value:w `- \exp_stop_f: }
@@ -24474,7 +24630,7 @@
         #2#3
       }
   }
-\cs_new_protected:cpx { __regex_compile_.: }
+\cs_new_protected:cpe { __regex_compile_.: }
   {
     \exp_not:N \__regex_if_in_class:TF
       { \__regex_compile_raw:N . }
@@ -24488,9 +24644,9 @@
   }
 \cs_set_protected:Npn \__regex_tmp:w #1#2
   {
-    \cs_new_protected:cpx { __regex_compile_/#1: }
+    \cs_new_protected:cpe { __regex_compile_/#1: }
       { \__regex_compile_one:n \exp_not:c { __regex_prop_#1: } }
-    \cs_new_protected:cpx { __regex_compile_/#2: }
+    \cs_new_protected:cpe { __regex_compile_/#2: }
       {
         \__regex_compile_one:n
           { \__regex_item_reverse:n { \exp_not:c { __regex_prop_#1: } } }
@@ -24534,8 +24690,8 @@
           }
       }
   }
-\exp_args:Nx \__regex_tmp:w { \iow_char:N \^ } { \__regex_A_test: }
-\exp_args:Nx \__regex_tmp:w { \iow_char:N \$ } { \__regex_Z_test: }
+\exp_args:Ne \__regex_tmp:w { \iow_char:N \^ } { \__regex_A_test: }
+\exp_args:Ne \__regex_tmp:w { \iow_char:N \$ } { \__regex_Z_test: }
 \cs_new_protected:cpn { __regex_compile_]: }
   {
     \__regex_if_in_class:TF
@@ -24609,11 +24765,11 @@
           {
             : { \__regex_compile_class_posix:NNNNw }
             = {
-                \msg_warning:nnx { regex }
+                \msg_warning:nne { regex }
                   { posix-unsupported } { = }
               }
             . {
-                \msg_warning:nnx { regex }
+                \msg_warning:nne { regex }
                   { posix-unsupported } { . }
               }
           }
@@ -24625,12 +24781,12 @@
     \__regex_two_if_eq:NNNNTF #5 #6 \__regex_compile_special:N ^
       {
         \bool_set_false:N \l__regex_internal_bool
-        \__kernel_tl_set:Nx \l__regex_internal_a_tl { \if_false: } \fi:
+        \__kernel_tl_set:Ne \l__regex_internal_a_tl { \if_false: } \fi:
           \__regex_compile_class_posix_loop:w
       }
       {
         \bool_set_true:N \l__regex_internal_bool
-        \__kernel_tl_set:Nx \l__regex_internal_a_tl { \if_false: } \fi:
+        \__kernel_tl_set:Ne \l__regex_internal_a_tl { \if_false: } \fi:
           \__regex_compile_class_posix_loop:w #5 #6
       }
   }
@@ -24655,9 +24811,9 @@
               }
           }
           {
-            \msg_warning:nnx { regex } { posix-unknown }
+            \msg_warning:nne { regex } { posix-unknown }
               { \l__regex_internal_a_tl }
-            \__regex_compile_abort_tokens:x
+            \__regex_compile_abort_tokens:e
               {
                 [: \bool_if:NF \l__regex_internal_bool { ^ }
                 \l__regex_internal_a_tl :]
@@ -24665,9 +24821,9 @@
           }
       }
       {
-        \msg_error:nnxx { regex } { posix-missing-close }
+        \msg_error:nnee { regex } { posix-missing-close }
           { [: \l__regex_internal_a_tl } { #2 #4 }
-        \__regex_compile_abort_tokens:x { [: \l__regex_internal_a_tl }
+        \__regex_compile_abort_tokens:e { [: \l__regex_internal_a_tl }
         #1 #2 #3 #4
       }
   }
@@ -24687,7 +24843,7 @@
     \if_int_compare:w \l__regex_group_level_int > \c_zero_int
         \tl_build_put_right:Nn \l__regex_build_tl { \if_false: { \fi: } }
         \tl_build_end:N \l__regex_build_tl
-        \exp_args:NNNx
+        \exp_args:NNNe
       \group_end:
       \tl_build_put_right:Nn \l__regex_build_tl { \l__regex_build_tl }
       \int_set_eq:NN \l__regex_catcodes_int \l__regex_default_catcodes_int
@@ -24717,7 +24873,7 @@
         \cs_if_exist_use:cF
           { __regex_compile_special_group_\token_to_str:N #4 :w }
           {
-            \msg_warning:nnx { regex } { special-group-unknown }
+            \msg_warning:nne { regex } { special-group-unknown }
               { (? #4 }
             \__regex_compile_group_begin:N \__regex_group:nnnN
               \__regex_compile_raw:N ? #3 #4
@@ -24755,7 +24911,7 @@
           { \__regex_item_caseless_range:nn }
       }
       {
-        \msg_warning:nnx { regex } { unknown-option } { (?i #2 }
+        \msg_warning:nne { regex } { unknown-option } { (?i #2 }
         \__regex_compile_raw:N (
         \__regex_compile_raw:N ?
         \__regex_compile_raw:N i
@@ -24774,7 +24930,7 @@
           { \__regex_item_caseful_range:nn }
       }
       {
-        \msg_warning:nnx { regex } { unknown-option } { (?-#2#4 }
+        \msg_warning:nne { regex } { unknown-option } { (?-#2#4 }
         \__regex_compile_raw:N (
         \__regex_compile_raw:N ?
         \__regex_compile_raw:N -
@@ -24802,7 +24958,7 @@
       }
       { \cs_if_exist_use:cF { __regex_compile_c_#2:w } }
           {
-            \msg_error:nnx { regex } { c-missing-category } {#2}
+            \msg_error:nne { regex } { c-missing-category } {#2}
             #1 #2
           }
   }
@@ -24854,7 +25010,7 @@
           { \__regex_compile_c_lbrack_end: }
       }
           {
-            \msg_error:nnx { regex } { c-missing-rbrack } {#2}
+            \msg_error:nne { regex } { c-missing-rbrack } {#2}
             \__regex_compile_c_lbrack_end:
             #1 #2
           }
@@ -24901,12 +25057,12 @@
   {
     \__regex_compile_end:
     \flag_clear:n { __regex_cs }
-    \__kernel_tl_set:Nx \l__regex_internal_a_tl
+    \__kernel_tl_set:Ne \l__regex_internal_a_tl
       {
         \exp_after:wN \__regex_compile_cs_aux:Nn \l__regex_internal_regex
         \q__regex_nil \q__regex_nil \q__regex_recursion_stop
       }
-    \exp_args:Nx \__regex_compile_one:n
+    \exp_args:Ne \__regex_compile_one:n
       {
         \flag_if_raised:nTF { __regex_cs }
           { \__regex_item_cs:n { \exp_not:o \l__regex_internal_regex } }
@@ -24970,7 +25126,7 @@
     \__regex_two_if_eq:NNNNTF #2 #3 \__regex_compile_special:N \c_left_brace_str
       {
         \tl_set:Nn \l__regex_internal_b_tl {#1}
-        \__kernel_tl_set:Nx \l__regex_internal_a_tl { \if_false: } \fi:
+        \__kernel_tl_set:Ne \l__regex_internal_a_tl { \if_false: } \fi:
         \__regex_compile_u_loop:NN
       }
       {
@@ -25001,7 +25157,7 @@
           }
           {
             \if_false: { \fi: }
-            \msg_error:nnx { regex } { u-missing-rbrace } {#2}
+            \msg_error:nne { regex } { u-missing-rbrace } {#2}
             \l__regex_internal_b_tl
             #1 #2
           }
@@ -25012,7 +25168,7 @@
     \group_begin:
       \cs_set:Npn \__regex_group:nnnN { \__regex_group_no_capture:nnnN }
       \cs_set:Npn \__regex_group_resetting:nnnN { \__regex_group_no_capture:nnnN }
-      \exp_args:NNx
+      \exp_args:NNe
     \group_end:
     \__regex_compile_ur:n { \use:c { \l__regex_internal_a_tl } }
   }
@@ -25055,12 +25211,12 @@
   }
 \cs_new_protected:Npn \__regex_compile_u_in_cs:
   {
-    \__kernel_tl_gset:Nx \g__regex_internal_tl
+    \__kernel_tl_gset:Ne \g__regex_internal_tl
       {
         \exp_args:No \__kernel_str_to_other_fast:n
           { \l__regex_internal_a_tl }
       }
-    \tl_build_put_right:Nx \l__regex_build_tl
+    \tl_build_put_right:Ne \l__regex_build_tl
       {
         \tl_map_function:NN \g__regex_internal_tl
           \__regex_compile_u_in_cs_aux:n
@@ -25076,7 +25232,7 @@
   {
     \tl_analysis_map_inline:Nn \l__regex_internal_a_tl
       {
-        \tl_build_put_right:Nx \l__regex_build_tl
+        \tl_build_put_right:Ne \l__regex_build_tl
           {
             \__regex_class:NnnnN \c_true_bool
               {
@@ -25322,7 +25478,7 @@
 \cs_new_protected:Npn \__regex_show_one:n #1
   {
     \int_incr:N \l__regex_show_lines_int
-    \tl_build_put_right:Nx \l__regex_build_tl
+    \tl_build_put_right:Ne \l__regex_build_tl
       {
         \exp_not:N \iow_newline:
         \seq_map_function:NN \l__regex_show_prefix_seq \use:n
@@ -25330,7 +25486,7 @@
       }
   }
 \cs_new_protected:Npn \__regex_show_push:n #1
-  { \seq_put_right:Nx \l__regex_show_prefix_seq { #1 ~ } }
+  { \seq_put_right:Ne \l__regex_show_prefix_seq { #1 ~ } }
 \cs_new_protected:Npn \__regex_show_pop:
   { \seq_pop_right:NN \l__regex_show_prefix_seq \l__regex_internal_a_tl }
 \cs_new_protected:Npn \__regex_show_scope:nn #1#2
@@ -25380,7 +25536,7 @@
                 \bool_if:NTF #1 { Match } { Don't~match }
                 \__regex_msg_repeated:nnN {#3} {#4} #5
               }
-            \tl_build_put_right:Nx \l__regex_build_tl
+            \tl_build_put_right:Ne \l__regex_build_tl
               { \exp_not:o \l__regex_internal_a_tl }
           }
       }
@@ -25443,7 +25599,7 @@
     \__regex_case_build_aux:Nn \c_true_bool {#1}
     \int_gzero:N \g__regex_case_int
   }
-\cs_generate_variant:Nn \__regex_case_build:n { x }
+\cs_generate_variant:Nn \__regex_case_build:n { e }
 \cs_new_protected:Npn \__regex_case_build_aux:Nn #1#2
   {
     \__regex_standard_escapechar:
@@ -25454,7 +25610,7 @@
       { \__regex_action_start_wildcard:N #1 }
     %
     \__regex_build_new_state:
-    \__regex_toks_put_left:Nx \l__regex_left_state_int
+    \__regex_toks_put_left:Ne \l__regex_left_state_int
       { \__regex_action_submatch:nN { 0 } < }
     \__regex_push_lr_states:
     \int_zero:N \l__regex_case_max_group_int
@@ -25478,7 +25634,7 @@
       }
     \seq_pop:NN \l__regex_right_state_seq \l__regex_internal_a_tl
     \int_set:Nn \l__regex_right_state_int \l__regex_internal_a_tl
-    \__regex_toks_put_left:Nx \l__regex_right_state_int
+    \__regex_toks_put_left:Ne \l__regex_right_state_int
       {
         \__regex_action_submatch:nN { 0 } >
         \int_gset:Nn \g__regex_case_int
@@ -25520,9 +25676,9 @@
     \int_set:Nn \l__regex_right_state_int \l__regex_internal_a_tl
   }
 \cs_new_protected:Npn \__regex_build_transition_left:NNN #1#2#3
-  { \__regex_toks_put_left:Nx  #2 { #1 { \int_eval:n { #3 - #2 } } } }
+  { \__regex_toks_put_left:Ne  #2 { #1 { \int_eval:n { #3 - #2 } } } }
 \cs_new_protected:Npn \__regex_build_transition_right:nNn #1#2#3
-  { \__regex_toks_put_right:Nx #2 { #1 { \int_eval:n { #3 - #2 } } } }
+  { \__regex_toks_put_right:Ne #2 { #1 { \int_eval:n { #3 - #2 } } } }
 \cs_new_protected:Npn \__regex_build_new_state:
   {
     \__regex_toks_clear:N \l__regex_max_state_int
@@ -25533,7 +25689,7 @@
 \cs_new_protected:Npn \__regex_build_transitions_lazyness:NNNNN #1#2#3#4#5
   {
     \__regex_build_new_state:
-    \__regex_toks_put_right:Nx \l__regex_left_state_int
+    \__regex_toks_put_right:Ne \l__regex_left_state_int
       {
         \if_meaning:w \c_true_bool #1
           #2 { \int_eval:n { #3 - \l__regex_left_state_int } }
@@ -25546,7 +25702,7 @@
   }
 \cs_new_protected:Npn \__regex_class:NnnnN #1#2#3#4#5
   {
-    \cs_set:Npx \__regex_tests_action_cost:n ##1
+    \cs_set:Npe \__regex_tests_action_cost:n ##1
       {
         \exp_not:n { \exp_not:n {#2} }
         \bool_if:NTF #1
@@ -25672,8 +25828,8 @@
 \cs_new_protected:Npn \__regex_group_submatches:nNN #1#2#3
   {
     \if_int_compare:w #1 > - \c_one_int
-      \__regex_toks_put_left:Nx #2 { \__regex_action_submatch:nN {#1} < }
-      \__regex_toks_put_left:Nx #3 { \__regex_action_submatch:nN {#1} > }
+      \__regex_toks_put_left:Ne #2 { \__regex_action_submatch:nN {#1} < }
+      \__regex_toks_put_left:Ne #3 { \__regex_action_submatch:nN {#1} > }
     \fi:
   }
 \cs_new_protected:Npn \__regex_group_repeat_aux:n #1
@@ -25764,7 +25920,7 @@
 \cs_new_protected:Npn \__regex_assertion:Nn #1#2
   {
     \__regex_build_new_state:
-    \__regex_toks_put_right:Nx \l__regex_left_state_int
+    \__regex_toks_put_right:Ne \l__regex_left_state_int
       {
         \exp_not:n {#2}
         \__regex_break_point:TF
@@ -25809,7 +25965,7 @@
 \cs_new_protected:Npn \__regex_command_K:
   {
     \__regex_build_new_state:
-    \__regex_toks_put_right:Nx \l__regex_left_state_int
+    \__regex_toks_put_right:Ne \l__regex_left_state_int
       {
         \__regex_action_submatch:nN { 0 } <
         \bool_set_true:N \l__regex_fresh_thread_bool
@@ -25904,7 +26060,7 @@
     \fi:
     \int_set_eq:NN \l__regex_start_pos_int \l__regex_success_pos_int
     \bool_set_false:N \l__regex_match_success_bool
-    \tl_set:Nx \l__regex_curr_submatches_tl
+    \tl_set:Ne \l__regex_curr_submatches_tl
       { \prg_replicate:nn { 2 * \l__regex_capturing_group_int } { 0 , } }
     \int_set_eq:NN \l__regex_max_thread_int \l__regex_min_thread_int
     \__regex_store_state:n { \l__regex_min_state_int }
@@ -25954,10 +26110,10 @@
     \tl_set:Nn \l__regex_curr_token_tl {#1}
     \int_set:Nn \l__regex_curr_char_int {#2}
     \int_set:Nn \l__regex_curr_catcode_int { "#3 }
-    \tl_build_put_right:Nx \l__regex_matched_analysis_tl
+    \tl_build_put_right:Ne \l__regex_matched_analysis_tl
       { \exp_not:o \l__regex_curr_analysis_tl }
     \tl_set:Nn \l__regex_curr_analysis_tl { { {#1} {#2} #3 } }
-    \use:x
+    \use:e
       {
         \int_set_eq:NN \l__regex_max_thread_int \l__regex_min_thread_int
         \int_step_function:nnN
@@ -26017,7 +26173,7 @@
   { \__regex_action_free_aux:nn { < \l__regex_step_int } }
 \cs_new_protected:Npn \__regex_action_free_aux:nn #1#2
   {
-    \use:x
+    \use:e
       {
         \int_add:Nn \l__regex_curr_state_int {#2}
         \exp_not:n
@@ -26037,7 +26193,7 @@
   }
 \cs_new_protected:Npn \__regex_action_cost:n #1
   {
-    \exp_args:Nx \__regex_store_state:n
+    \exp_args:Ne \__regex_store_state:n
       { \int_eval:n { \l__regex_curr_state_int + #1 } }
   }
 \cs_new_protected:Npn \__regex_store_state:n #1
@@ -26069,7 +26225,7 @@
   }
 \cs_new_protected:Npn \__regex_action_submatch_aux:w #1 ; #2#3
   {
-    \tl_set:Nx \l__regex_curr_submatches_tl
+    \tl_set:Ne \l__regex_curr_submatches_tl
       {
         \prg_replicate:nn
           { #2 \if_meaning:w > #3 + \l__regex_capturing_group_int \fi: }
@@ -26180,25 +26336,25 @@
         {#2}
       \prg_do_nothing: \prg_do_nothing:
       \if_int_compare:w \l__regex_replacement_csnames_int > \c_zero_int
-        \msg_error:nnx { regex } { replacement-missing-rbrace }
+        \msg_error:nne { regex } { replacement-missing-rbrace }
           { \int_use:N \l__regex_replacement_csnames_int }
-        \tl_build_put_right:Nx \l__regex_build_tl
+        \tl_build_put_right:Ne \l__regex_build_tl
           { \prg_replicate:nn \l__regex_replacement_csnames_int \cs_end: }
       \fi:
       \seq_if_empty:NF \l__regex_replacement_category_seq
         {
-          \msg_error:nnx { regex } { replacement-missing-rparen }
+          \msg_error:nne { regex } { replacement-missing-rparen }
             { \seq_count:N \l__regex_replacement_category_seq }
           \seq_clear:N \l__regex_replacement_category_seq
         }
-      \tl_gput_right:Nx \g__regex_balance_tl
+      \tl_gput_right:Ne \g__regex_balance_tl
         { + \int_use:N \l__regex_balance_int }
       \tl_build_end:N \l__regex_build_tl
       \exp_args:NNo
     \group_end:
     #1 \l__regex_build_tl
   }
-\cs_generate_variant:Nn \__regex_replacement:n { x }
+\cs_generate_variant:Nn \__regex_replacement:n { e }
 \cs_new_protected:Npn \__regex_replacement_set:n #1
   {
     \cs_set:Npn \__regex_replacement_do_one_match:n ##1
@@ -26239,7 +26395,7 @@
     \exp_args:No \__regex_replacement_set:n
       { \g__regex_case_replacement_tl \fi: }
   }
-\cs_generate_variant:Nn \__regex_case_replacement:n { x }
+\cs_generate_variant:Nn \__regex_case_replacement:n { e }
 \cs_new_protected:Npn \__regex_case_replacement_aux:n #1
   {
     \tl_gput_right:Nn \g__regex_case_replacement_tl { \or: #1 }
@@ -26505,7 +26661,7 @@
 \group_end:
 \cs_new_protected:Npn \__regex_replacement_error:NNN #1#2#3
   {
-    \msg_error:nnx { regex } { replacement-#1 } {#3}
+    \msg_error:nne { regex } { replacement-#1 } {#3}
     #2 #3
   }
 \cs_new_protected:Npn \regex_new:N #1
@@ -26527,10 +26683,10 @@
 \cs_new_protected:Npn \regex_const:Nn #1#2
   {
     \__regex_compile:n {#2}
-    \tl_const:Nx #1 { \exp_not:o \l__regex_internal_regex }
+    \tl_const:Ne #1 { \exp_not:o \l__regex_internal_regex }
   }
-\cs_new_protected:Npn \regex_show:n { \__regex_show:Nn \msg_show:nnxxxx }
-\cs_new_protected:Npn \regex_log:n { \__regex_show:Nn \msg_log:nnxxxx }
+\cs_new_protected:Npn \regex_show:n { \__regex_show:Nn \msg_show:nneeee }
+\cs_new_protected:Npn \regex_log:n { \__regex_show:Nn \msg_log:nneeee }
 \cs_new_protected:Npn \__regex_show:Nn #1#2
   {
     \__regex_compile:n {#2}
@@ -26539,8 +26695,8 @@
       { \tl_to_str:n {#2} } { }
       { \l__regex_internal_a_tl } { }
   }
-\cs_new_protected:Npn \regex_show:N { \__regex_show:NN \msg_show:nnxxxx }
-\cs_new_protected:Npn \regex_log:N { \__regex_show:NN \msg_log:nnxxxx }
+\cs_new_protected:Npn \regex_show:N { \__regex_show:NN \msg_show:nneeee }
+\cs_new_protected:Npn \regex_log:N { \__regex_show:NN \msg_log:nneeee }
 \cs_new_protected:Npn \__regex_show:NN #1#2
   {
     \__kernel_chk_tl_type:NnnT #2 { regex }
@@ -26611,15 +26767,15 @@
   {
     \int_if_odd:nTF { \tl_count:n {#1} }
       {
-        \msg_error:nnxxxx { regex } { case-odd }
+        \msg_error:nneeee { regex } { case-odd }
           { \token_to_str:N \regex_replace_case_once:nN(TF) } { code }
           { \tl_count:n {#1} } { \tl_to_str:n {#1} }
         \use_ii:nn
       }
       {
         \__regex_replace_once_aux:nnN
-          { \__regex_case_build:x { \__regex_tl_odd_items:n {#1} } }
-          { \__regex_replacement:x { \tl_item:nn {#1} { 2 * \g__regex_case_int } } }
+          { \__regex_case_build:e { \__regex_tl_odd_items:n {#1} } }
+          { \__regex_replacement:e { \tl_item:nn {#1} { 2 * \g__regex_case_int } } }
           #2
         \bool_if:NTF \g__regex_success_bool
       }
@@ -26634,15 +26790,15 @@
   {
     \int_if_odd:nTF { \tl_count:n {#1} }
       {
-        \msg_error:nnxxxx { regex } { case-odd }
+        \msg_error:nneeee { regex } { case-odd }
           { \token_to_str:N \regex_replace_case_all:nN(TF) } { code }
           { \tl_count:n {#1} } { \tl_to_str:n {#1} }
         \use_ii:nn
       }
       {
         \__regex_replace_all_aux:nnN
-          { \__regex_case_build:x { \__regex_tl_odd_items:n {#1} } }
-          { \__regex_case_replacement:x { \__regex_tl_even_items:n {#1} } }
+          { \__regex_case_build:e { \__regex_tl_odd_items:n {#1} } }
+          { \__regex_case_replacement:e { \__regex_tl_even_items:n {#1} } }
           #2
         \bool_if:NTF \g__regex_success_bool
       }
@@ -26708,14 +26864,14 @@
   {
     \int_if_odd:nTF { \tl_count:n {#1} }
       {
-        \msg_error:nnxxxx { regex } { case-odd }
+        \msg_error:nneeee { regex } { case-odd }
           { \token_to_str:N \regex_match_case:nn(TF) } { code }
           { \tl_count:n {#1} } { \tl_to_str:n {#1} }
         \use_ii:nn
       }
       {
         \__regex_if_match:nn
-          { \__regex_case_build:x { \__regex_tl_odd_items:n {#1} } }
+          { \__regex_case_build:e { \__regex_tl_odd_items:n {#1} } }
           {#2}
         \bool_if:NTF \g__regex_success_bool
       }
@@ -26797,7 +26953,7 @@
       \flag_clear:n { __regex_begin }
       \flag_clear:n { __regex_end }
       \cs_set_eq:NN \__regex_tmp:w \scan_stop:
-      \__kernel_tl_gset:Nx \g__regex_internal_tl
+      \__kernel_tl_gset:Ne \g__regex_internal_tl
         {
           \int_step_function:nnN { \l__regex_min_submatch_int }
             { \l__regex_submatch_int - 1 } \__regex_extract_seq_aux:n
@@ -26808,12 +26964,12 @@
       \int_set:Nn \l__regex_added_end_int
         { \flag_height:n { __regex_end } }
       \tex_afterassignment:D \__regex_extract_check:w
-      \__kernel_tl_gset:Nx \g__regex_internal_tl
+      \__kernel_tl_gset:Ne \g__regex_internal_tl
         { \g__regex_internal_tl \if_false: { \fi: } }
       \int_compare:nNnT
         { \l__regex_added_begin_int + \l__regex_added_end_int } > 0
         {
-          \msg_error:nnxxx { regex } { result-unbalanced }
+          \msg_error:nneee { regex } { result-unbalanced }
             { splitting~or~extracting~submatches }
             { \int_use:N \l__regex_added_begin_int }
             { \int_use:N \l__regex_added_end_int }
@@ -26872,7 +27028,7 @@
         \int_incr:N \l__regex_added_begin_int
         \int_incr:N \l__regex_added_end_int
         \tex_afterassignment:D \__regex_extract_check:w
-        \__kernel_tl_gset:Nx \g__regex_internal_tl
+        \__kernel_tl_gset:Ne \g__regex_internal_tl
           {
             \exp_after:wN \__regex_extract_check_loop:w
             \g__regex_internal_tl
@@ -26949,7 +27105,7 @@
             \__regex_replacement_balance_one_match:n
               { \l__regex_zeroth_submatch_int }
           }
-        \__kernel_tl_set:Nx \l__regex_internal_a_tl
+        \__kernel_tl_set:Ne \l__regex_internal_a_tl
           {
             \__regex_replacement_do_one_match:n
               { \l__regex_zeroth_submatch_int }
@@ -26983,7 +27139,7 @@
             { \l__regex_submatch_int - 1 }
             \__regex_replacement_balance_one_match:n
         }
-      \__kernel_tl_set:Nx \l__regex_internal_a_tl
+      \__kernel_tl_set:Ne \l__regex_internal_a_tl
         {
           \int_step_function:nnnN
             { \l__regex_min_submatch_int }
@@ -27004,7 +27160,7 @@
     \__regex_group_end_replace_try:
     \int_compare:nNnT { \l__regex_added_begin_int + \l__regex_added_end_int } > 0
       {
-        \msg_error:nnxxx { regex } { result-unbalanced }
+        \msg_error:nneee { regex } { result-unbalanced }
           { replacing } { \int_use:N \l__regex_added_begin_int }
           { \int_use:N \l__regex_added_end_int }
       }
@@ -27014,7 +27170,7 @@
 \cs_new_protected:Npn \__regex_group_end_replace_try:
   {
     \tex_afterassignment:D \__regex_group_end_replace_check:w
-    \__kernel_tl_gset:Nx \g__regex_internal_tl
+    \__kernel_tl_gset:Ne \g__regex_internal_tl
       {
         \prg_replicate:nn { \l__regex_added_begin_int } { { \if_false: } \fi: }
         \l__regex_internal_a_tl
@@ -27167,7 +27323,7 @@
         \cs_set_eq:NN \__regex_replacement_exp_not:N \__regex_peek_replacement_token:n
         \cs_set_eq:NN \__regex_replacement_exp_not:V \__regex_peek_replacement_var:N
         \exp_args:No \__regex_replacement:n { \l__regex_replacement_tl }
-        \use:x
+        \use:e
           {
             \exp_not:n { \exp_after:wN \l__regex_peek_true_tl \exp:w }
             \__regex_replacement_do_one_match:n
@@ -27226,7 +27382,7 @@
     \exp_after:wN #1
     \exp:w
   }
-\use:x
+\use:e
   {
     \msg_new:nnn { regex } { trailing-backslash }
       { Trailing~'\iow_char:N\\'~in~regex~or~replacement. }
@@ -27533,14 +27689,14 @@
       }
   }
 \cs_new_protected:Npn \__regex_trace_push:nnN #1#2#3
-  { \__regex_trace:nnx {#1} {#2} { entering~ \token_to_str:N #3 } }
+  { \__regex_trace:nne {#1} {#2} { entering~ \token_to_str:N #3 } }
 \cs_new_protected:Npn \__regex_trace_pop:nnN #1#2#3
-   { \__regex_trace:nnx {#1} {#2} { leaving~ \token_to_str:N #3 } }
-\cs_new_protected:Npn \__regex_trace:nnx #1#2#3
+   { \__regex_trace:nne {#1} {#2} { leaving~ \token_to_str:N #3 } }
+\cs_new_protected:Npn \__regex_trace:nne #1#2#3
   {
     \int_compare:nNnF
       { \int_use:c { g__regex_trace_#1_int } } < {#2}
-      { \iow_term:x { Trace:~#3 } }
+      { \iow_term:e { Trace:~#3 } }
   }
 \int_new:N \g__regex_trace_regex_int
 \cs_new_protected:Npn \__regex_trace_states:n #1
@@ -27549,7 +27705,7 @@
       \l__regex_min_state_int
       { \l__regex_max_state_int - 1 }
       {
-        \__regex_trace:nnx { regex } {#1}
+        \__regex_trace:nne { regex } {#1}
           { \iow_char:N \\toks ##1 = { \__regex_toks_use:w ##1 } }
       }
   }
@@ -27698,7 +27854,7 @@
         \group_end:
       }
       {
-        \msg_error:nnx { kernel } { variable-not-defined }
+        \msg_error:nne { kernel } { variable-not-defined }
           { \token_to_str:N #2 }
       }
   }
@@ -28389,7 +28545,7 @@
 \cs_generate_variant:Nn \exp_last_unbraced:Nf { c }
 \cs_new_protected:Npn \__color_convert:nnnN #1#2#3#4
   {
-    \tl_set:Nx #4
+    \tl_set:Ne #4
       {
         \cs_if_exist_use:cTF { __color_convert_ #1 _ #2 :w }
           { #3 \s__color_stop }
@@ -28463,11 +28619,11 @@
 \tl_new:N \l__color_value_tl
 \tl_new:N \l__color_next_model_tl
 \tl_new:N \l__color_next_value_tl
-\cs_new_protected:Npx \__color_parse:nN #1#2
+\cs_new_protected:Npe \__color_parse:nN #1#2
   {
-    \tl_set:Nx \exp_not:c { l__color_named_ . _tl }
+    \tl_set:Ne \exp_not:c { l__color_named_ . _tl }
       { \exp_not:N \__color_model:N \exp_not:N \l__color_current_tl }
-    \prop_put:NVx \exp_not:c { l__color_named_ . _prop }
+    \prop_put:NVe \exp_not:c { l__color_named_ . _prop }
       \exp_not:c { l__color_named_ . _tl }
       { \exp_not:N \__color_values:N \exp_not:N \l__color_current_tl }
     \exp_not:N \exp_args:Ne \exp_not:N \__color_parse_aux:nN
@@ -28492,14 +28648,14 @@
     \prop_get:cnNTF
       { l__color_named_ #3 _prop } {#1}
       \l__color_value_tl
-      { \tl_set:Nx #2 { {#1} { \l__color_value_tl } } }
+      { \tl_set:Ne #2 { {#1} { \l__color_value_tl } } }
       {
         \tl_set_eq:Nc \l__color_model_tl { l__color_named_ #3 _tl }
         \prop_get:cVN { l__color_named_ #3 _prop } \l__color_model_tl
           \l__color_value_tl
          \__color_convert:nnN
            \l__color_model_tl {#1} \l__color_value_tl
-        \tl_set:Nx #2
+        \tl_set:Ne #2
           {
             {#1}
             { \l__color_value_tl }
@@ -28524,7 +28680,7 @@
     \group_begin:
       \__color_extract:nNN {#2} \l__color_model_tl \l__color_value_tl
       \__color_parse_loop:w #3 ! ! ! ! \s__color_stop
-      \tl_set:Nx \l__color_internal_tl
+      \tl_set:Ne \l__color_internal_tl
         { { \l__color_model_tl } { \l__color_value_tl } }
     \exp_args:NNNV \group_end:
     \tl_set:Nn #1 \l__color_internal_tl
@@ -28537,7 +28693,7 @@
           { \fp_compare_p:nNn {#1} > { 0 } }
           { \fp_compare_p:nNn {#1} < { 100 } }
           {
-            \use:x
+            \use:e
               {
                 \__color_parse_loop:nn {#1}
                   { \tl_if_blank:nTF {#2} { white } {#2} }
@@ -28577,7 +28733,7 @@
               { \__color_parse_gray:n {#2} }
               { \__color_parse_std:n {#2} }
           }
-        \tl_set:Nx \l__color_value_tl
+        \tl_set:Ne \l__color_value_tl
           {
             \__color_parse_mix:NVVn
               \l__color_model_tl \l__color_value_tl \l__color_next_value_tl {#1}
@@ -28848,7 +29004,7 @@
             \__color_convert:VVN \l__color_model_tl \l_color_fixed_model_tl
               \l__color_value_tl
           }
-        \tl_set:Nx #1
+        \tl_set:Ne #1
           { { \l_color_fixed_model_tl } { \l__color_value_tl } }
       }
   }
@@ -28857,12 +29013,12 @@
     \tl_set:Nn \l__color_model_tl {#1}
     \tl_set:Nn \l__color_value_tl {#2}
   }
-\cs_new_protected:Npx \__color_finalise_current:
+\cs_new_protected:Npe \__color_finalise_current:
   {
-    \tl_set:Nx \exp_not:c { l__color_named_ . _tl }
+    \tl_set:Ne \exp_not:c { l__color_named_ . _tl }
       { \exp_not:N \__color_model:N \exp_not:N \l__color_current_tl }
     \prop_clear:N \exp_not:c { l__color_named_ . _prop }
-    \prop_put:NVx \exp_not:c { l__color_named_ . _prop }
+    \prop_put:NVe \exp_not:c { l__color_named_ . _prop }
       \exp_not:c { l__color_named_ . _tl }
       { \exp_not:N \__color_values:N \exp_not:N \l__color_current_tl }
   }
@@ -28903,7 +29059,7 @@
   {
     \cs_if_exist:cTF { __color_parse_model_ #1 :w }
       {
-        \tl_set:Nx #3
+        \tl_set:Ne #3
           { \use:c { __color_parse_model_ #1 :w } #2 , 0 , 0 , 0 , 0 \s__color_stop }
       }
       { \msg_error:nnn { color } { unknown-model } {#1} }
@@ -28911,7 +29067,7 @@
 \cs_new_protected:Npn \__color_select_swap:Nnn #1#2#3
   {
     \__color_convert:nVnN {#2} \l_color_fixed_model_tl {#3} \l__color_value_tl
-    \tl_set:Nx #1
+    \tl_set:Ne #1
       { { \l_color_fixed_model_tl } { \l__color_value_tl } }
   }
 \tl_new:N \l_color_math_active_tl
@@ -29059,10 +29215,10 @@
       {
         \__color_parse:nN {#2} \l__color_named_tl
         \tl_clear_new:c { l__color_named_ #1 _tl }
-        \tl_set:cx { l__color_named_ #1 _tl }
+        \tl_set:ce { l__color_named_ #1 _tl }
           { \__color_model:N \l__color_named_tl }
         \prop_clear_new:c { l__color_named_ #1 _prop }
-        \prop_put:cvx { l__color_named_ #1 _prop } { l__color_named_ #1 _tl }
+        \prop_put:cve { l__color_named_ #1 _prop } { l__color_named_ #1 _tl }
           { \__color_values:N \l__color_named_tl }
         \__color_set:nnw {#1} {#2} #2 ! \s__color_stop
       }
@@ -29081,7 +29237,7 @@
                   \__color_parse:nN {#2} \l__color_internal_tl
                 \exp_args:NNNV \group_end:
                 \tl_set:Nn \l__color_internal_tl \l__color_internal_tl
-                \prop_put:cxx { l__color_named_ #1 _prop }
+                \prop_put:cee { l__color_named_ #1 _prop }
                   { \__color_model:N \l__color_internal_tl }
                   { \__color_values:N \l__color_internal_tl }
               }
@@ -29098,16 +29254,16 @@
           {#1} {#3}
       }
   }
-\cs_new_protected:Npx \__color_set_aux:nnn #1#2#3
+\cs_new_protected:Npe \__color_set_aux:nnn #1#2#3
   {
     \exp_not:N \__color_set_colon:nnw {#2} {#3}
       #1 \c_colon_str \c_colon_str \exp_not:N \s__color_stop
   }
-\use:x
+\use:e
   {
     \cs_new_protected:Npn \exp_not:N \__color_set_colon:nnw
-      ##1##2 ##3 \c_colon_str ##4 \c_colon_str
-      ##5 \exp_not:N \s__color_stop
+      #1#2 #3 \c_colon_str #4 \c_colon_str
+      #5 \exp_not:N \s__color_stop
   }
   {
     \tl_if_blank:nTF {#4}
@@ -29121,10 +29277,10 @@
     \tl_if_blank:nF {#2}
       {
         \__color_select:nnN {#2} {#4} \l__color_named_tl
-        \tl_set:Nx \l__color_internal_tl { \__color_model:N \l__color_named_tl }
+        \tl_set:Ne \l__color_internal_tl { \__color_model:N \l__color_named_tl }
         \tl_if_empty:cT { l__color_named_ #1 _tl }
           { \tl_set_eq:cN { l__color_named_ #1 _tl } \l__color_internal_tl }
-        \prop_put:cVx { l__color_named_ #1 _prop } \l__color_internal_tl
+        \prop_put:cVe { l__color_named_ #1 _prop } \l__color_internal_tl
           { \__color_values:N \l__color_named_tl }
         \__color_set_loop:nw {#1} #3 \s__color_mark #5 \s__color_stop
       }
@@ -29137,9 +29293,9 @@
         \prop_clear_new:c { l__color_named_ #1 _prop }
         \str_if_eq:nnTF {#2} { . }
           {
-            \tl_set:cx { l__color_named_ #1 _tl }
+            \tl_set:ce { l__color_named_ #1 _tl }
               { \__color_model:N \l__color_current_tl }
-            \prop_put:cvx { l__color_named_ #1 _prop } { l__color_named_ #1 _tl }
+            \prop_put:cve { l__color_named_ #1 _prop } { l__color_named_ #1 _tl }
               { \__color_values:N \l__color_current_tl }
           }
           {
@@ -29161,7 +29317,7 @@
 \color_set:nnn { blue }  { rgb } { 0 , 0 , 1 }
 \prop_new:c { l__color_named_._prop }
 \tl_new:c { l__color_named_._tl }
-\tl_set:cx { l__color_named_._tl } { \__color_model:N \l__color_current_tl }
+\tl_set:ce { l__color_named_._tl } { \__color_model:N \l__color_current_tl }
 \cs_new_protected:Npn \color_export:nnN #1#2#3
   {
     \group_begin:
@@ -29209,7 +29365,7 @@
 \group_begin:
   \cs_set_protected:Npn \__color_tmp:w #1#2
     {
-      \cs_new_protected:cpx { __color_export_format_ #1 :nnN } ##1##2##3
+      \cs_new_protected:cpe { __color_export_format_ #1 :nnN } ##1##2##3
         {
           \exp_not:N \__color_export:nnnNN {#2} {##1} {##2} ##3
             \exp_not:c { __color_export_ #1 :Nw }
@@ -29228,10 +29384,10 @@
 \cs_new_protected:cpn { __color_export_space-sep-cmyk:Nw } #1#2 \s__color_stop
   { \tl_set:Nn #1 {#2} }
 \cs_new_protected:cpn { __color_export_comma-sep-rgb:Nw } #1#2 ~ #3 ~ #4 \s__color_stop
-  { \tl_set:Nx #1 { #2 , #3 , #4 } }
+  { \tl_set:Ne #1 { #2 , #3 , #4 } }
 \cs_new_protected:Npn \__color_export_HTML:Nw #1#2 ~ #3 ~ #4 \s__color_stop
   {
-    \tl_set:Nx #1
+    \tl_set:Ne #1
       {
         \__color_export_HTML:n {#2}
         \__color_export_HTML:n {#3}
@@ -29312,13 +29468,13 @@
     \int_gincr:N \g__color_model_int
     \clist_map_inline:nn { fill , stroke , select }
       {
-        \cs_new_protected:cpx { __color_backend_ ##1 _ #1 :n } ####1
+        \cs_new_protected:cpe { __color_backend_ ##1 _ #1 :n } ####1
           {
             \exp_not:c { __color_backend_ ##1 _ #2 :nn }
               { color \int_use:N \g__color_model_int } {####1}
           }
       }
-    \cs_new_protected:cpx { __color_model_ #1 _white: }
+    \cs_new_protected:cpe { __color_model_ #1 _white: }
       {
         \prop_put:Nnn \exp_not:N \l__color_named_white_prop {#1}
           { \exp_not:n {#3} }
@@ -29327,7 +29483,7 @@
       }
     \use:c { __color_model_ #1 _white: }
   }
-\cs_generate_variant:Nn \__color_model_init:nnn { nnx }
+\cs_generate_variant:Nn \__color_model_init:nnn { nne }
 \cs_new_protected:Npn \__color_model_separation:n #1
   {
     \prop_get:NnNTF \l__color_internal_prop { name }
@@ -29384,7 +29540,7 @@
     \use:c { __color_model_separation_ #8 :nnnnnn }
       {#6} {#7} {#1} {#2} {#3} {#4}
     \prop_gput:Nnn \g__color_alternative_model_prop {#6} {#8}
-    \prop_gput:Nnx \g__color_colorants_prop {#6}
+    \prop_gput:Nne \g__color_colorants_prop {#6}
       { \str_convert_pdfname:n {#7} }
   }
 \cs_new_protected:Npn \__color_model_separation_cmyk:nnnnnn #1#2#3#4#5#6
@@ -29427,7 +29583,7 @@
   }
 \cs_new_protected:Npn \__color_model_convert:nnn #1#2#3
   {
-    \cs_new:cpx { __color_convert_ #1 _ #3 :w } ##1 \s__color_stop
+    \cs_new:cpe { __color_convert_ #1 _ #3 :w } ##1 \s__color_stop
       {
         \exp_not:N \exp_args:NNe \exp_not:N \use:nn
         \exp_not:c { __color_convert_  #2 _ #3 :w }
@@ -29514,12 +29670,12 @@
   }
 \cs_new_protected:Npn \__color_model_devicen:nnn #1#2#3
   {
-    \exp_args:Nx \__color_model_devicen:nnnn
+    \exp_args:Ne \__color_model_devicen:nnnn
       { \clist_count:n {#2} } {#1} {#2} {#3}
   }
 \cs_new_protected:Npn \__color_model_devicen:nnnn #1#2#3#4
   {
-    \__color_model_init:nnx {#4} { devicen }
+    \__color_model_init:nne {#4} { devicen }
       {
         0 \prg_replicate:nn { #1 - 1 } { ~ 0 }
       }
@@ -29527,7 +29683,7 @@
       { \__color_model_devicen_parse_generic:nn }
         {#4} {#1}
     \__color_model_devicen_init:nnn {#1} {#2} {#3}
-    \__color_model_devicen_convert:nnnx {#4} {#2} {#3}
+    \__color_model_devicen_convert:nnne {#4} {#2} {#3}
       {
         1 \prg_replicate:nn { #1 - 1 } { ~ 1 }
       }
@@ -29584,7 +29740,7 @@
         {#1}
         { \__color_model_devicen_parse:nw {#2} ##1 , ##2 , \q_nil , \s__color_stop }
       }
-    \cs_new:cpx { __color_parse_mix_ #1 :nw }
+    \cs_new:cpe { __color_parse_mix_ #1 :nw }
       ##1 ##2 \s__color_mark ##3 \s__color_stop
       {
         \exp_not:N \__color_model_devicen_mix:nw {##1}
@@ -29630,7 +29786,7 @@
   }
 \cs_new_protected:Npn \__color_model_devicen_init:nnnn #1#2#3#4
   {
-    \tl_set:Nx \l__color_internal_tl
+    \tl_set:Ne \l__color_internal_tl
       { \prg_replicate:nn {#1} { 1.0 ~ }   }
     \int_zero:N \l__color_internal_int
     \clist_map_inline:nn {#4}
@@ -29641,7 +29797,7 @@
         \exp_after:wN \__color_model_devicen_transform:w
           \l__color_value_tl , 0 , 0 , 0 , \s__color_stop {#1} {#2}
       }
-    \tl_put_right:Nx \l__color_internal_tl
+    \tl_put_right:Ne \l__color_internal_tl
       {
         \prg_replicate:nn {#1}
           { neg ~ 1.0 ~ add ~ #1 ~ -1 ~ roll ~ }
@@ -29649,7 +29805,7 @@
         \prg_replicate:nn {#2} { ~ pop } ~
         #1 ~ 1 ~ roll
       }
-    \use:x
+    \use:e
       {
         \__color_backend_devicen_init:nnn
           {
@@ -29687,7 +29843,7 @@
   }
 \cs_new_protected:Npn \__color_model_devicen_transform:nnn #1#2#3
   {
-    \tl_put_right:Nx \l__color_internal_tl
+    \tl_put_right:Ne \l__color_internal_tl
       {
         \fp_compare:nNnF {#3} = \c_zero_fp
           {
@@ -29705,7 +29861,7 @@
   {
     \use:c { __color_model_devicen_convert_ #2 :nnn } {#1} {#3}
   }
-\cs_generate_variant:Nn \__color_model_devicen_convert:nnnn { nnnx }
+\cs_generate_variant:Nn \__color_model_devicen_convert:nnnn { nnne }
 \cs_new_protected:Npn \__color_model_devicen_convert_cmyk:nnn #1#2
   {
     \tl_const:cn { c__color_fallback_ #1 _tl } { cmyk }
@@ -29724,7 +29880,7 @@
 \cs_new_protected:Npn \__color_model_devicen_convert:nnnnn #1#2#3#4#5
   {
     \cs_new:cpn { __color_convert_ #2 _ #1 :w } ##1 \s__color_stop {#5}
-    \cs_new:cpx { __color_convert_ #1 _ #2 :w } ##1 \s__color_stop
+    \cs_new:cpe { __color_convert_ #1 _ #2 :w } ##1 \s__color_stop
       {
         \exp_not:c { __color_convert_devicen_ #2 : \prg_replicate:nn {#3} { n } w }
           \prg_replicate:nn {#3} { { 1 } }
@@ -29861,7 +30017,7 @@
   }
 \cs_new_protected:Npn \__color_model_iccbased:nn #1#2
   {
-    \exp_args:NNx \prop_get:NnNTF \c__color_icc_colorspace_signatures_prop
+    \prop_get:NeNTF \c__color_icc_colorspace_signatures_prop
       { \file_hex_dump:nnn { #1 } { 17 } { 20 } } \l__color_internal_tl
       {
         \exp_last_unbraced:NV \__color_model_iccbased_aux:nnnnnn
@@ -29879,7 +30035,7 @@
     \cs_new:cpn { __color_convert_ #5 _gray:w } ##1 \s__color_stop { 0 }
     \cs_new:cpn { __color_convert_gray_ #5 :w } ##1 \s__color_stop { #2 }
     \use:c { __color_model_devicen_parse_ #1 :nn } {#5} {#1}
-    \exp_args:Nx \__color_backend_iccbased_init:nnn
+    \exp_args:Ne \__color_backend_iccbased_init:nnn
       { \file_full_name:n {#6} } {#1} {#4}
   }
 \cs_new_protected:Npn \color_profile_apply:nn #1#2
@@ -29912,9 +30068,9 @@
     \__color_backend_iccbased_device:nnn {#1} { CMYK } { 4 }
   }
 \cs_new_protected:Npn \color_show:n
-  { \__color_show:Nn \msg_show:nnxxxx }
+  { \__color_show:Nn \msg_show:nneeee }
 \cs_new_protected:Npn \color_log:n
-  { \__color_show:Nn \msg_log:nnxxxx }
+  { \__color_show:Nn \msg_log:nneeee }
 \cs_new_protected:Npn \__color_show:Nn #1#2
   {
     #1 { color } { show }
@@ -30123,14 +30279,14 @@
     \__pdf_backend_object_write:nnn {#1} {#2} {#3}
     \bool_gset_true:N \g__pdf_init_bool
   }
-\cs_generate_variant:Nn \pdf_object_write:nnn { nnx }
+\cs_generate_variant:Nn \pdf_object_write:nnn { nne , nnx }
 \cs_new:Npn \pdf_object_ref:n #1 { \__pdf_backend_object_ref:n {#1} }
 \cs_new_protected:Npn \pdf_object_unnamed_write:nn #1#2
   {
     \__pdf_backend_object_now:nn {#1} {#2}
     \bool_gset_true:N \g__pdf_init_bool
   }
-\cs_generate_variant:Nn \pdf_object_unnamed_write:nn { nx }
+\cs_generate_variant:Nn \pdf_object_unnamed_write:nn { ne , nx }
 \cs_new:Npn \pdf_object_ref_last: { \__pdf_backend_object_last: }
 \prg_new_conditional:Npnn \pdf_object_if_exist:n #1 { p , T , F , TF }
   {
@@ -30247,7 +30403,7 @@
   }
 \cs_new_protected:Npn \pdf_object_write:nn #1#2
   {
-    \exp_args:Nnx \__pdf_backend_object_write:nnn
+    \exp_args:Nne \__pdf_backend_object_write:nnn
       {#1} { \prop_item:Nn \g__pdf_object_prop {#1} } {#2}
     \bool_gset_true:N \g__pdf_init_bool
   }
@@ -30304,7 +30460,7 @@
     \coffin_if_exist:NTF #1
       { #2 }
       {
-        \msg_error:nnx { coffin } { unknown }
+        \msg_error:nne { coffin } { unknown }
           { \token_to_str:N #1 }
       }
   }
@@ -30389,7 +30545,7 @@
           }
         #5 #1
         \vbox_set_top:Nn \l__coffin_internal_box { \vbox_unpack:N #1 }
-        \__coffin_set_pole:Nnx #1 { T }
+        \__coffin_set_pole:Nne #1 { T }
           {
             { 0pt }
             {
@@ -30402,7 +30558,7 @@
         \box_clear:N \l__coffin_internal_box
       }
   }
-\cs_new_protected:Npx \__coffin_set_vertical_aux:
+\cs_new_protected:Npe \__coffin_set_vertical_aux:
   {
     \bool_lazy_and:nnT
       { \cs_if_exist_p:N \fmtname }
@@ -30466,7 +30622,7 @@
               #5
               #6 #1
               \vbox_set_top:Nn \l__coffin_internal_box { \vbox_unpack:N #1 }
-              \__coffin_set_pole:Nnx #1 { T }
+              \__coffin_set_pole:Nne #1 { T }
                 {
                   { 0pt }
                   {
@@ -30524,7 +30680,7 @@
     \prop_get:cnNF
       { coffin ~ \__coffin_to_value:N #1 ~ poles } {#2} #3
       {
-        \msg_error:nnxx { coffin } { unknown-pole }
+        \msg_error:nnee { coffin } { unknown-pole }
           { \exp_not:n {#2} } { \token_to_str:N #1 }
         \tl_set:Nn #3 { { 0pt } { 0pt } { 0pt } { 0pt } }
       }
@@ -30544,10 +30700,10 @@
       \c__coffin_poles_prop
   }
 \cs_new_protected:Npn \coffin_set_horizontal_pole:Nnn #1#2#3
-  { \__coffin_set_horizontal_pole:NnnN #1 {#2} {#3} \prop_put:cnx }
+  { \__coffin_set_horizontal_pole:NnnN #1 {#2} {#3} \prop_put:cne }
 \cs_generate_variant:Nn \coffin_set_horizontal_pole:Nnn { c }
 \cs_new_protected:Npn \coffin_gset_horizontal_pole:Nnn #1#2#3
-  { \__coffin_set_horizontal_pole:NnnN #1 {#2} {#3} \prop_gput:cnx }
+  { \__coffin_set_horizontal_pole:NnnN #1 {#2} {#3} \prop_gput:cne }
 \cs_generate_variant:Nn \coffin_gset_horizontal_pole:Nnn { c }
 \cs_new_protected:Npn \__coffin_set_horizontal_pole:NnnN #1#2#3#4
   {
@@ -30562,10 +30718,10 @@
       }
   }
 \cs_new_protected:Npn \coffin_set_vertical_pole:Nnn #1#2#3
-  { \__coffin_set_vertical_pole:NnnN #1 {#2} {#3} \prop_put:cnx }
+  { \__coffin_set_vertical_pole:NnnN #1 {#2} {#3} \prop_put:cne }
 \cs_generate_variant:Nn \coffin_set_vertical_pole:Nnn { c }
 \cs_new_protected:Npn \coffin_gset_vertical_pole:Nnn #1#2#3
-  { \__coffin_set_vertical_pole:NnnN #1 {#2} {#3} \prop_gput:cnx }
+  { \__coffin_set_vertical_pole:NnnN #1 {#2} {#3} \prop_gput:cne }
   \cs_generate_variant:Nn \coffin_gset_vertical_pole:Nnn { c }
 \cs_new_protected:Npn \__coffin_set_vertical_pole:NnnN #1#2#3#4
   {
@@ -30584,7 +30740,7 @@
     \prop_put:cnn { coffin ~ \__coffin_to_value:N #1 ~ poles }
       {#2} {#3}
   }
-\cs_generate_variant:Nn \__coffin_set_pole:Nnn { Nnx }
+\cs_generate_variant:Nn \__coffin_set_pole:Nnn { Nne }
 \cs_new_protected:Npn \coffin_reset_poles:N #1
   {
     \__coffin_reset_structure:N #1
@@ -30598,9 +30754,9 @@
     \__coffin_gupdate_poles:N #1
   }
 \cs_new_protected:Npn \__coffin_update_corners:N #1
-  { \__coffin_update_corners:NN #1 \prop_put:Nnx }
+  { \__coffin_update_corners:NN #1 \prop_put:Nne }
 \cs_new_protected:Npn \__coffin_gupdate_corners:N #1
-  { \__coffin_update_corners:NN #1 \prop_gput:Nnx }
+  { \__coffin_update_corners:NN #1 \prop_gput:Nne }
 \cs_new_protected:Npn \__coffin_update_corners:NN #1#2
   {
     \exp_args:Nc \__coffin_update_corners:NNN
@@ -30629,9 +30785,9 @@
       }
   }
 \cs_new_protected:Npn \__coffin_update_poles:N #1
-  { \__coffin_update_poles:NN #1 \prop_put:Nnx }
+  { \__coffin_update_poles:NN #1 \prop_put:Nne }
 \cs_new_protected:Npn \__coffin_gupdate_poles:N #1
-  { \__coffin_update_poles:NN #1 \prop_gput:Nnx }
+  { \__coffin_update_poles:NN #1 \prop_gput:Nne }
 \cs_new_protected:Npn \__coffin_update_poles:NN #1#2
   {
     \exp_args:Nc \__coffin_update_poles:NNN
@@ -30734,7 +30890,7 @@
               }
           }
           {
-            \use:x
+            \use:e
               {
                 \__coffin_calculate_intersection:nnnnnn
                   { \dim_to_fp:n {#4} / \dim_to_fp:n {#3} }
@@ -30831,17 +30987,17 @@
   }
 \cs_new_protected:Npn \__coffin_set_bounding:N #1
   {
-    \prop_put:Nnx \l__coffin_bounding_prop { tl }
+    \prop_put:Nne \l__coffin_bounding_prop { tl }
       { { 0pt } { \dim_eval:n { \box_ht:N #1 } } }
-    \prop_put:Nnx \l__coffin_bounding_prop { tr }
+    \prop_put:Nne \l__coffin_bounding_prop { tr }
       {
         { \dim_eval:n { \box_wd:N #1 } }
         { \dim_eval:n { \box_ht:N #1 } }
       }
     \dim_set:Nn \l__coffin_internal_dim { -\box_dp:N #1 }
-    \prop_put:Nnx \l__coffin_bounding_prop { bl }
+    \prop_put:Nne \l__coffin_bounding_prop { bl }
       { { 0pt } { \dim_use:N \l__coffin_internal_dim } }
-    \prop_put:Nnx \l__coffin_bounding_prop { br }
+    \prop_put:Nne \l__coffin_bounding_prop { br }
       {
         { \dim_eval:n { \box_wd:N #1 } }
         { \dim_use:N \l__coffin_internal_dim }
@@ -30850,13 +31006,13 @@
 \cs_new_protected:Npn \__coffin_rotate_bounding:nnn #1#2#3
   {
     \__coffin_rotate_vector:nnNN {#2} {#3} \l__coffin_x_dim \l__coffin_y_dim
-    \prop_put:Nnx \l__coffin_bounding_prop {#1}
+    \prop_put:Nne \l__coffin_bounding_prop {#1}
       { { \dim_use:N \l__coffin_x_dim } { \dim_use:N \l__coffin_y_dim } }
   }
 \cs_new_protected:Npn \__coffin_rotate_corner:Nnnn #1#2#3#4
   {
     \__coffin_rotate_vector:nnNN {#3} {#4} \l__coffin_x_dim \l__coffin_y_dim
-    \prop_put:Nnx \l__coffin_corners_prop {#2}
+    \prop_put:Nne \l__coffin_corners_prop {#2}
       { { \dim_use:N \l__coffin_x_dim } { \dim_use:N \l__coffin_y_dim } }
   }
 \cs_new_protected:Npn \__coffin_rotate_pole:Nnnnnn #1#2#3#4#5#6
@@ -30864,7 +31020,7 @@
     \__coffin_rotate_vector:nnNN {#3} {#4} \l__coffin_x_dim \l__coffin_y_dim
     \__coffin_rotate_vector:nnNN {#5} {#6}
       \l__coffin_x_prime_dim \l__coffin_y_prime_dim
-    \prop_put:Nnx \l__coffin_poles_prop {#2}
+    \prop_put:Nne \l__coffin_poles_prop {#2}
       {
         { \dim_use:N \l__coffin_x_dim } { \dim_use:N \l__coffin_y_dim }
         { \dim_use:N \l__coffin_x_prime_dim }
@@ -30923,7 +31079,7 @@
   }
 \cs_new_protected:Npn \__coffin_shift_corner:Nnnn #1#2#3#4
   {
-    \prop_put:Nnx \l__coffin_corners_prop {#2}
+    \prop_put:Nne \l__coffin_corners_prop {#2}
       {
         { \dim_eval:n { #3 - \l__coffin_left_corner_dim } }
         { \dim_eval:n { #4 - \l__coffin_bottom_corner_dim } }
@@ -30931,7 +31087,7 @@
   }
 \cs_new_protected:Npn \__coffin_shift_pole:Nnnnnn #1#2#3#4#5#6
   {
-    \prop_put:Nnx \l__coffin_poles_prop {#2}
+    \prop_put:Nne \l__coffin_poles_prop {#2}
       {
         { \dim_eval:n { #3 - \l__coffin_left_corner_dim } }
         { \dim_eval:n { #4 - \l__coffin_bottom_corner_dim } }
@@ -31021,13 +31177,13 @@
 \cs_new_protected:Npn \__coffin_scale_corner:Nnnn #1#2#3#4
   {
     \__coffin_scale_vector:nnNN {#3} {#4} \l__coffin_x_dim \l__coffin_y_dim
-    \prop_put:Nnx \l__coffin_corners_prop {#2}
+    \prop_put:Nne \l__coffin_corners_prop {#2}
       { { \dim_use:N \l__coffin_x_dim } { \dim_use:N \l__coffin_y_dim } }
   }
 \cs_new_protected:Npn \__coffin_scale_pole:Nnnnnn #1#2#3#4#5#6
   {
     \__coffin_scale_vector:nnNN {#3} {#4} \l__coffin_x_dim \l__coffin_y_dim
-    \prop_put:Nnx \l__coffin_poles_prop {#2}
+    \prop_put:Nne \l__coffin_poles_prop {#2}
       {
         { \dim_use:N \l__coffin_x_dim } { \dim_use:N \l__coffin_y_dim }
         {#5} {#6}
@@ -31035,14 +31191,14 @@
   }
 \cs_new_protected:Npn \__coffin_x_shift_corner:Nnnn #1#2#3#4
   {
-    \prop_put:Nnx \l__coffin_corners_prop {#2}
+    \prop_put:Nne \l__coffin_corners_prop {#2}
       {
         { \dim_eval:n { #3 + \box_wd:N #1 } } {#4}
       }
   }
 \cs_new_protected:Npn \__coffin_x_shift_pole:Nnnnnn #1#2#3#4#5#6
   {
-    \prop_put:Nnx \l__coffin_poles_prop {#2}
+    \prop_put:Nne \l__coffin_poles_prop {#2}
       {
         { \dim_eval:n { #3 + \box_wd:N #1 } } {#4}
         {#5} {#6}
@@ -31172,7 +31328,7 @@
     \tl_if_in:nnTF {#2} { - }
       { \tl_set:Nn \l__coffin_internal_tl { {#2} } }
       { \tl_set:Nn \l__coffin_internal_tl { { #1 - #2 } } }
-    \exp_last_unbraced:NNo \__coffin_set_pole:Nnx \l__coffin_aligned_coffin
+    \exp_last_unbraced:NNo \__coffin_set_pole:Nne \l__coffin_aligned_coffin
       { \l__coffin_internal_tl }
       {
         { \dim_use:N \l__coffin_x_dim } { \dim_use:N \l__coffin_y_dim }
@@ -31186,7 +31342,7 @@
   }
 \cs_new_protected:Npn \__coffin_offset_corner:Nnnnn #1#2#3#4#5#6
   {
-    \prop_put:cnx
+    \prop_put:cne
       {
         coffin ~ \__coffin_to_value:N \l__coffin_aligned_coffin
         \c_space_tl corners
@@ -31212,11 +31368,11 @@
   {
     \dim_compare:nNnTF {#2} < {#6}
       {
-        \__coffin_set_pole:Nnx #9 { T }
+        \__coffin_set_pole:Nne #9 { T }
           { { 0pt } {#6} { 1000pt } { 0pt } }
       }
       {
-        \__coffin_set_pole:Nnx #9 { T }
+        \__coffin_set_pole:Nne #9 { T }
           { { 0pt } {#2} { 1000pt } { 0pt } }
       }
   }
@@ -31224,11 +31380,11 @@
   {
     \dim_compare:nNnTF {#2} < {#6}
       {
-        \__coffin_set_pole:Nnx #9 { B }
+        \__coffin_set_pole:Nne #9 { B }
           { { 0pt } {#2}  { 1000pt } { 0pt } }
       }
       {
-        \__coffin_set_pole:Nnx #9 { B }
+        \__coffin_set_pole:Nne #9 { B }
           { { 0pt } {#6} { 1000pt } { 0pt } }
       }
   }
@@ -31446,10 +31602,10 @@
     \box_set_eq:NN \l__coffin_display_coffin \l__coffin_aligned_coffin
   }
 \cs_new_protected:Npn \coffin_show_structure:N
-  { \__coffin_show_structure:NN \msg_show:nnxxxx }
+  { \__coffin_show_structure:NN \msg_show:nneeee }
 \cs_generate_variant:Nn \coffin_show_structure:N { c }
 \cs_new_protected:Npn \coffin_log_structure:N
-  { \__coffin_show_structure:NN \msg_log:nnxxxx }
+  { \__coffin_show_structure:NN \msg_log:nneeee }
 \cs_generate_variant:Nn \coffin_log_structure:N { c }
 \cs_new_protected:Npn \__coffin_show_structure:NN #1#2
   {
@@ -31477,10 +31633,10 @@
   { \coffin_log:Nnn #1 \c_max_int \c_max_int }
 \cs_generate_variant:Nn \coffin_log:N { c }
 \cs_new_protected:Npn \coffin_show:Nnn
-  { \__coffin_show:NNNnn \msg_term:nnxxxx \box_show:Nnn }
+  { \__coffin_show:NNNnn \msg_term:nneeee \box_show:Nnn }
 \cs_generate_variant:Nn \coffin_show:Nnn { c }
 \cs_new_protected:Npn \coffin_log:Nnn
-  { \__coffin_show:NNNnn \msg_log:nnxxxx \box_show:Nnn }
+  { \__coffin_show:NNNnn \msg_log:nneeee \box_show:Nnn }
 \cs_generate_variant:Nn \coffin_log:Nnn { c }
 \cs_new_protected:Npn \__coffin_show:NNNnn #1#2#3#4#5
   {
@@ -31828,7 +31984,7 @@
     }
   \cs_set_protected:Npn \__codepoint_data_auxii:w #1 ; #2 ~ #3 \q_stop
     {
-      \tl_const:cx
+      \tl_const:ce
         { c__codepoint_nfd_ \codepoint_str_generate:n {"#1} _tl }
         {
           {"#2}
@@ -31868,11 +32024,11 @@
       \__codepoint_add:nn { lowercase } {#5}
       \int_compare:nNnF {#4} = { \__codepoint_data_offset:nn {#1} {#6} }
         {
-          \tl_const:cx
+          \tl_const:ce
             { c__codepoint_titlecase_ \codepoint_str_generate:n {"#1} _tl }
             { {"#6} { } { } }
         }
-      \tl_set:Nx \l__codepoint_next_codepoint_fint_tl
+      \tl_set:Ne \l__codepoint_next_codepoint_fint_tl
         { \int_eval:n { "#1 + 1 } }
     }
   \cs_set_protected:Npn \__codepoint_add:nn #1#2
@@ -31882,7 +32038,7 @@
         = \c__codepoint_block_size_int
         { \__codepoint_save_blocks:nn {#1} { 1 } }
     }
-  \cs_set_protected:Npx \__codepoint_data_auxv:nnnnw #1#2#3#4#5 Last> #6 \q_stop
+  \cs_set_protected:Npe \__codepoint_data_auxv:nnnnw #1#2#3#4#5 Last> #6 \q_stop
     {
        \exp_not:N \tl_if_blank:nTF {#6}
          {
@@ -31925,7 +32081,7 @@
      \int_compare:nNnF
        { \int_div_truncate:nn { #2 - #1 } \c__codepoint_block_size_int } = 0
        {
-         \tl_set:cx { l__codepoint_ #3 _block_clist }
+         \tl_set:ce { l__codepoint_ #3 _block_clist }
            {
              \exp_args:NNe \use:nn \use_none:n
                { \prg_replicate:nn { \c__codepoint_block_size_int } { , #4 } }
@@ -31935,7 +32091,7 @@
         }
      \prg_replicate:nn
        { \int_mod:nn { #2 - #1 } \c__codepoint_block_size_int }
-       { \clist_put_right:cx { l__codepoint_ #3 _block_clist } {#4} }
+       { \clist_put_right:ce { l__codepoint_ #3 _block_clist } {#4} }
     }
   \cs_set_protected:Npn \__codepoint_save_blocks:nn #1#2
     {
@@ -31955,12 +32111,12 @@
                 \tl_use:c { l__codepoint_ #1 _block_tl } _clist
               }
               { l__codepoint_ #1 _block_clist }
-            \tl_set:cx { l__codepoint_ #1 _block_tl }
+            \tl_set:ce { l__codepoint_ #1 _block_tl }
               { \int_eval:n { \tl_use:c { l__codepoint_ #1 _block_tl } + 1 } }
           }
         \prg_replicate:nn {#2}
           {
-            \tl_set:cx { l__codepoint_ #1 _pos_tl }
+            \tl_set:ce { l__codepoint_ #1 _pos_tl }
               { \int_eval:n { \tl_use:c { l__codepoint_ #1 _pos_tl } + 1 } }
             \exp_args:Nc \__kernel_intarray_gset:Nnn
               { g__codepoint_ #1 _index_intarray }
@@ -32055,7 +32211,7 @@
         \reverse_if:N \if_int_compare:w
           \int_eval:n { \__kernel_codepoint_data:nn { lowercase } {"#1} + "#1 }
             = "#3 ~
-          \tl_const:cx
+          \tl_const:ce
             { c__codepoint_casefold_ \codepoint_str_generate:n {"#1} _tl }
             { {"#3} { } { } }
         \fi:
@@ -32067,7 +32223,7 @@
     }
   \cs_set_protected:Npn \__codepoint_data_auxii:w #1 ~ #2 ~ #3 ~ #4 \q_stop
     {
-      \tl_const:cx { c__codepoint_casefold_ \codepoint_str_generate:n {"#1} _tl }
+      \tl_const:ce { c__codepoint_casefold_ \codepoint_str_generate:n {"#1} _tl }
         {
           {"#2}
           {"#3}
@@ -32095,7 +32251,7 @@
     {
       \tl_if_empty:nF {#4}
         {
-          \tl_const:cx { c__codepoint_ #2 case_ \codepoint_str_generate:n {"#1} _tl }
+          \tl_const:ce { c__codepoint_ #2 case_ \codepoint_str_generate:n {"#1} _tl }
             {
               {"#3}
               {"#4}
@@ -32159,7 +32315,7 @@
         {
           \str_if_empty:NF \l__text_tmpb_str
             {
-              \clist_const:cx { c__text_grapheme_ \l__text_tmpb_str _clist }
+              \clist_const:ce { c__text_grapheme_ \l__text_tmpb_str _clist }
                 { \exp_after:wN \use_none:n \l__text_tmpa_str }
               \cs_set_nopar:Npn \l__text_tmpa_str { }
             }
@@ -32169,7 +32325,7 @@
     }
   \cs_set_protected:Npn \__text_data_auxii:w #1 .. #2 .. #3 \q_stop
     {
-      \cs_set_nopar:Npx \l__text_tmpa_str
+      \cs_set_nopar:Npe \l__text_tmpa_str
         {
           \l__text_tmpa_str ,
           \tl_trim_spaces:n {#1} .. \tl_trim_spaces:n {#2}
@@ -32353,7 +32509,7 @@
     \cs_new:Npn \__text_codepoint_process:nN #1#2 { #1 {#2} }
   }
   {
-    \cs_new:Npx \__text_codepoint_process:nN #1#2
+    \cs_new:Npe \__text_codepoint_process:nN #1#2
       {
         \exp_not:N \int_compare:nNnTF {`#2} > { "80 }
           {
@@ -32406,7 +32562,7 @@
             #2 {#3}
           \prg_return_true: \prg_return_false:
       }
-    \cs_new:Npx \__text_codepoint_from_chars:Nw #1
+    \cs_new:Npe \__text_codepoint_from_chars:Nw #1
       {
         \exp_not:N \if_int_compare:w `#1 > "80 \exp_not:N \exp_stop_f:
           \sys_if_engine_pdftex:TF
@@ -32461,7 +32617,7 @@
 \tl_new:N \l_text_accents_tl
 \tl_new:N \l_text_letterlike_tl
 \tl_new:N \l_text_case_exclude_arg_tl
-\tl_set:Nx \l_text_case_exclude_arg_tl
+\tl_set:Ne \l_text_case_exclude_arg_tl
   {
     \exp_not:n { \begin \cite \end \label \ref }
     \exp_not:c { cite ~ }
@@ -32730,7 +32886,7 @@
       }
       { \__text_expand_letterlike:NN #1 }
   }
-\cs_new:Npx \__text_expand_cs:N #1
+\cs_new:Npe \__text_expand_cs:N #1
   {
     \exp_not:N \str_if_eq:nnTF {#1} { \exp_not:N \protect }
       { \exp_not:N \__text_expand_protect:w }
@@ -32906,15 +33062,15 @@
   }
 \cs_new:Npn \__text_change_case_auxi:nnn #1#2#3
   { \exp_args:No \__text_change_case_BCP:nnn { \tl_to_str:n {#3} } {#1} {#2} }
-\cs_new:Npx \__text_change_case_BCP:nnn #1#2#3
+\cs_new:Npe \__text_change_case_BCP:nnn #1#2#3
   {
     \exp_not:N \__text_change_case_BCP:nnw
       {#2} {#3} #1 \tl_to_str:n { -x- -x- } \exp_not:N \q__text_stop
   }
-\use:x
+\use:e
   {
     \cs_new:Npn \exp_not:N \__text_change_case_BCP:nnw
-      ##1##2##3 \tl_to_str:n { -x- } ##4 \tl_to_str:n { -x- } ##5
+      #1#2#3 \tl_to_str:n { -x- } #4 \tl_to_str:n { -x- } #5
       \exp_not:N \q__text_stop
   }
   { \__text_change_case_BCP:nnnnw {#1} {#2} {#4} {#3} #3 - - \q__text_stop }
@@ -33001,9 +33157,9 @@
       }
     \__text_change_case_break:w
   }
-\use:x
+\use:e
   {
-    \cs_new:Npn \exp_not:N \__text_change_case_space:nnw ##1##2 \c_space_tl
+    \cs_new:Npn \exp_not:N \__text_change_case_space:nnw #1#2 \c_space_tl
   }
   {
     \__text_change_case_store:n { ~ }
@@ -33066,9 +33222,9 @@
     \__text_change_case_store:n { {#4} }
     \__text_change_case_math_loop:nnNw {#1} {#2} #3
   }
-\use:x
+\use:e
   {
-    \cs_new:Npn \exp_not:N \__text_change_case_math_space:nnNw ##1##2##3
+    \cs_new:Npn \exp_not:N \__text_change_case_math_space:nnNw #1#2#3
       \c_space_tl
   }
   {
@@ -34518,8 +34674,8 @@
     }
     \__text_map_loop:Nnw #1 { }
   }
-\use:x
-  { \cs_new:Npn \exp_not:N \__text_map_space:Nnw ##1##2 \c_space_tl }
+\use:e
+  { \cs_new:Npn \exp_not:N \__text_map_space:Nnw #1#2 \c_space_tl }
   {
     \__text_map_output:Nn #1 {#2}
     #1 { ~ }
@@ -35037,7 +35193,7 @@
     \tl_clear_new:c { l__text_purify_ \token_to_str:N #1 _tl }
     \tl_set:cn { l__text_purify_ \token_to_str:N #1 _tl } {#2}
   }
-\cs_generate_variant:Nn \text_declare_purify_equivalent:Nn { Nx }
+\cs_generate_variant:Nn \text_declare_purify_equivalent:Nn { Ne }
 \tl_map_inline:nn
   {
     \fontencoding
@@ -35099,14 +35255,14 @@
 \text_declare_purify_equivalent:Nn \\ { }
 \tl_map_inline:nn
   { \{ \} \# \$ \% \_ }
-  { \text_declare_purify_equivalent:Nx #1 { \cs_to_str:N #1 } }
+  { \text_declare_purify_equivalent:Ne #1 { \cs_to_str:N #1 } }
 \text_declare_purify_equivalent:Nn \label { \use_none:n }
 \group_begin:
 \char_set_catcode_active:N \~
 \use:n
   {
     \group_end:
-    \text_declare_purify_equivalent:Nx ~ { \c_space_tl }
+    \text_declare_purify_equivalent:Ne ~ { \c_space_tl }
   }
 \text_declare_purify_equivalent:Nn \nobreakspace { ~ }
 \text_declare_purify_equivalent:Nn \  { ~ }
@@ -35114,7 +35270,7 @@
 \cs_set_protected:Npn \__text_loop:Nn #1#2
   {
     \quark_if_recursion_tail_stop:N #1
-    \text_declare_purify_equivalent:Nx #1
+    \text_declare_purify_equivalent:Ne #1
       {
         \codepoint_generate:nn {"#2}
           { \char_value_catcode:n {"#2} }
@@ -35167,7 +35323,7 @@
   \cs_set_protected:Npn \__text_loop:Nn #1#2
     {
       \quark_if_recursion_tail_stop:N #1
-      \tl_const:cx { c__text_purify_ \token_to_str:N #1 _tl }
+      \tl_const:ce { c__text_purify_ \token_to_str:N #1 _tl }
         { \codepoint_generate:nn {"#2} { \char_value_catcode:n { "#2 } } }
       \__text_loop:Nn
     }
@@ -35193,7 +35349,7 @@
   \cs_set_protected:Npn \__text_loop:NNn #1#2#3
     {
       \quark_if_recursion_tail_stop:N #1
-      \tl_const:cx
+      \tl_const:ce
         { c__text_purify_ \token_to_str:N #1 _ \token_to_str:N #2 _tl }
         { \codepoint_generate:nn {"#3} { \char_value_catcode:n { "#3 } } }
       \__text_loop:NNn
@@ -35411,9 +35567,9 @@
 \group_end:
 %% File: l3candidates.dtx
 \cs_new_protected:Npn \seq_set_filter:NNn
-  { \__seq_set_filter:NNNn \__kernel_tl_set:Nx }
+  { \__seq_set_filter:NNNn \__kernel_tl_set:Ne }
 \cs_new_protected:Npn \seq_gset_filter:NNn
-  { \__seq_set_filter:NNNn \__kernel_tl_gset:Nx }
+  { \__seq_set_filter:NNNn \__kernel_tl_gset:Ne }
 \cs_new_protected:Npn \__seq_set_filter:NNNn #1#2#3#4
   {
     \__seq_push_item_def:n { \bool_if:nT {#4} { \__seq_wrap_item:n {##1} } }
@@ -35421,9 +35577,9 @@
     \__seq_pop_item_def:
   }
 \cs_new_protected:Npn \tl_build_begin:N #1
-  { \__tl_build_begin:NN \cs_set_nopar:Npx #1 }
+  { \__tl_build_begin:NN \cs_set_nopar:Npe #1 }
 \cs_new_protected:Npn \tl_build_gbegin:N #1
-  { \__tl_build_begin:NN \cs_gset_nopar:Npx #1 }
+  { \__tl_build_begin:NN \cs_gset_nopar:Npe #1 }
 \cs_new_protected:Npn \__tl_build_begin:NN #1#2
   { \exp_args:Nc \__tl_build_begin:NNN { \cs_to_str:N #2 ' } #2 #1 }
 \cs_new_protected:Npn \__tl_build_begin:NNN #1#2#3
@@ -35439,24 +35595,16 @@
 \cs_new_eq:NN \tl_build_gclear:N \tl_build_gbegin:N
 \cs_new_protected:Npn \tl_build_put_right:Nn #1#2
   {
-    \cs_set_nopar:Npx #1
+    \cs_set_nopar:Npe #1
       { \exp_after:wN \exp_not:n \exp_after:wN { \exp:w #1 #2 } }
   }
-\cs_new_protected:Npn \tl_build_put_right:Nx #1#2
-  {
-    \cs_set_nopar:Npx #1
-      { \exp_after:wN \exp_not:n \exp_after:wN { \exp:w #1 } #2 }
-  }
+\cs_generate_variant:Nn \tl_build_put_right:Nn { Ne , Nx }
 \cs_new_protected:Npn \tl_build_gput_right:Nn #1#2
   {
-    \cs_gset_nopar:Npx #1
+    \cs_gset_nopar:Npe #1
       { \exp_after:wN \exp_not:n \exp_after:wN { \exp:w #1 #2 } }
   }
-\cs_new_protected:Npn \tl_build_gput_right:Nx #1#2
-  {
-    \cs_gset_nopar:Npx #1
-      { \exp_after:wN \exp_not:n \exp_after:wN { \exp:w #1 } #2 }
-  }
+\cs_generate_variant:Nn \tl_build_gput_right:Nn { Ne , Nx }
 \cs_new_protected:Npn \__tl_build_last:NNn #1#2
   {
     \if_false: { { \fi:
@@ -35478,11 +35626,11 @@
 \cs_new_protected:Npn \__tl_build_put:nw #1#2 \__tl_build_last:NNn #3#4#5
   { #2 \__tl_build_last:NNn #3 #4 { #1 #5 } }
 \cs_new_protected:Npn \tl_build_put_left:Nn #1
-  { \__tl_build_put_left:NNn \cs_set_nopar:Npx #1 }
-\cs_generate_variant:Nn \tl_build_put_left:Nn { Nx }
+  { \__tl_build_put_left:NNn \cs_set_nopar:Npe #1 }
+\cs_generate_variant:Nn \tl_build_put_left:Nn { Ne , Nx }
 \cs_new_protected:Npn \tl_build_gput_left:Nn #1
-  { \__tl_build_put_left:NNn \cs_gset_nopar:Npx #1 }
-\cs_generate_variant:Nn \tl_build_gput_left:Nn { Nx }
+  { \__tl_build_put_left:NNn \cs_gset_nopar:Npe #1 }
+\cs_generate_variant:Nn \tl_build_gput_left:Nn { Ne , Nx }
 \cs_new_protected:Npn \__tl_build_put_left:NNn #1#2#3
   {
     #1 #2
@@ -35495,7 +35643,7 @@
       }
   }
 \cs_new_protected:Npn \tl_build_get:NN
-  { \__tl_build_get:NNN \__kernel_tl_set:Nx }
+  { \__tl_build_get:NNN \__kernel_tl_set:Ne }
 \cs_new_protected:Npn \__tl_build_get:NNN #1#2#3
   { #1 #3 { \if_false: { \fi: \exp_after:wN \__tl_build_get:w #2 } } }
 \cs_new:Npn \__tl_build_get:w #1 \__tl_build_last:NNn #2#3#4
@@ -35510,12 +35658,12 @@
   { \exp_after:wN \exp_not:n \exp_after:wN { \if_false: } \fi: }
 \cs_new_protected:Npn \tl_build_end:N #1
   {
-    \__tl_build_get:NNN \__kernel_tl_set:Nx #1 #1
+    \__tl_build_get:NNN \__kernel_tl_set:Ne #1 #1
     \exp_args:Nc \__tl_build_end_loop:NN { \cs_to_str:N #1 ' } \tl_clear:N
   }
 \cs_new_protected:Npn \tl_build_gend:N #1
   {
-    \__tl_build_get:NNN \__kernel_tl_gset:Nx #1 #1
+    \__tl_build_get:NNN \__kernel_tl_gset:Ne #1 #1
     \exp_args:Nc \__tl_build_end_loop:NN { \cs_to_str:N #1 ' } \tl_gclear:N
   }
 \cs_new_protected:Npn \__tl_build_end_loop:NN #1#2
@@ -35571,11 +35719,11 @@
   }
 \cs_new_protected:Npn \__deprecation_warn_once:nnNnn #1#2#3#4#5
   {
-    \cs_gset_protected:Npx #3
+    \cs_gset_protected:Npe #3
       {
         \__kernel_if_debug:TF
           {
-            \exp_not:N \msg_warning:nnxxx
+            \exp_not:N \msg_warning:nneee
               { deprecation } { deprecated-command }
               {#1}
               { \token_to_str:N #3 }
@@ -35602,7 +35750,7 @@
         \exp_not:N \msg_expandable_error:nnnnn
           { deprecation } { deprecated-command }
           { \tl_to_str:n {#3} } { \token_to_str:N #1 } { \tl_to_str:n {#2} }
-        \exp_not:N \msg_error:nnxxx
+        \exp_not:N \msg_error:nneee
           { deprecation } { deprecated-command }
           { \tl_to_str:n {#3} } { \token_to_str:N #1 } { \tl_to_str:n {#2} }
       }
@@ -35932,25 +36080,25 @@
     { meaning } { meaning_remove }
   }
   {
-    \use:x
+    \use:e
       {
         \__kernel_patch_deprecation:nnNNpn { 2022-01-11 } { \peek_remove_spaces:n }
-        \cs_gset_protected:Npn \exp_not:c { peek_ #1 _ignore_spaces:NTF } ####1####2####3
+        \cs_gset_protected:Npn \exp_not:c { peek_ #1 _ignore_spaces:NTF } ##1##2##3
           {
             \peek_remove_spaces:n
-              { \exp_not:c { peek_ #1 :NTF } ####1 {####2} {####3} }
+              { \exp_not:c { peek_ #1 :NTF } ##1 {##2} {##3} }
           }
         \__kernel_patch_deprecation:nnNNpn { 2022-01-11 } { \peek_remove_spaces:n }
-        \cs_gset_protected:Npn \exp_not:c { peek_ #1 _ignore_spaces:NT } ####1####2
+        \cs_gset_protected:Npn \exp_not:c { peek_ #1 _ignore_spaces:NT } ##1##2
           {
             \peek_remove_spaces:n
-              { \exp_not:c { peek_ #1 :NT } ####1 {####2} }
+              { \exp_not:c { peek_ #1 :NT } ##1 {##2} }
           }
         \__kernel_patch_deprecation:nnNNpn { 2022-01-11 } { \peek_remove_spaces:n }
-        \cs_gset_protected:Npn \exp_not:c { peek_ #1 _ignore_spaces:NF } ####1####2
+        \cs_gset_protected:Npn \exp_not:c { peek_ #1 _ignore_spaces:NF } ##1##2
           {
             \peek_remove_spaces:n
-              { \exp_not:c { peek_ #1 :NF } ####1 {####2} }
+              { \exp_not:c { peek_ #1 :NF } ##1 {##2} }
           }
       }
   }
diff --git a/texmf/tex/latex/l3kernel/expl3-generic.tex b/texmf/tex/latex/l3kernel/expl3-generic.tex
index 45d89a2b1..84a815a5f 100644
--- a/texmf/tex/latex/l3kernel/expl3-generic.tex
+++ b/texmf/tex/latex/l3kernel/expl3-generic.tex
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: expl3.dtx
-\def\ExplFileDate{2023-08-29}%
+\def\ExplFileDate{2023-10-10}%
 \let\ExplLoaderFileDate\ExplFileDate
 \begingroup
   \catcode`\_=11
@@ -88,7 +88,7 @@
     \cs_set_protected:Npn \ProvidesExplFileAux ##1##2##3##4
       {
         \group_end:
-        \iow_log:x { File:~##1~##2~v##3~##4 }
+        \iow_log:e { File:~##1~##2~v##3~##4 }
       }
     \tex_input:D #1 .def \scan_stop:
   }
diff --git a/texmf/tex/latex/l3kernel/expl3.ltx b/texmf/tex/latex/l3kernel/expl3.ltx
index 2cbd97f25..fc9349d64 100644
--- a/texmf/tex/latex/l3kernel/expl3.ltx
+++ b/texmf/tex/latex/l3kernel/expl3.ltx
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: expl3.dtx
-\def\ExplFileDate{2023-08-29}%
+\def\ExplFileDate{2023-10-10}%
 \let\ExplLoaderFileDate\ExplFileDate
 \begingroup
   \catcode`\_=11
@@ -151,12 +151,12 @@
   }
 \cs_gset_protected:Npn \@expl@push@filename@@
   {
-    \exp_args:Nx \__kernel_file_input_push:n
+    \exp_args:Ne \__kernel_file_input_push:n
       {
         \tl_to_str:N \@currname .
         \tl_to_str:N \@currext
       }
-    \tl_put_left:Nx \l__expl_status_stack_tl
+    \tl_put_left:Ne \l__expl_status_stack_tl
       {
         \bool_if:NTF \l__kernel_expl_bool
           { 1 }
diff --git a/texmf/tex/latex/l3kernel/expl3.sty b/texmf/tex/latex/l3kernel/expl3.sty
index ddd58a9ac..2e3d4947d 100644
--- a/texmf/tex/latex/l3kernel/expl3.sty
+++ b/texmf/tex/latex/l3kernel/expl3.sty
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: expl3.dtx
-\def\ExplFileDate{2023-08-29}%
+\def\ExplFileDate{2023-10-10}%
 \let\ExplLoaderFileDate\ExplFileDate
 \ProvidesPackage{expl3}
   [%
@@ -178,12 +178,12 @@
   }
 \cs_gset_protected:Npn \@expl@push@filename@@
   {
-    \exp_args:Nx \__kernel_file_input_push:n
+    \exp_args:Ne \__kernel_file_input_push:n
       {
         \tl_to_str:N \@currname .
         \tl_to_str:N \@currext
       }
-    \tl_put_left:Nx \l__expl_status_stack_tl
+    \tl_put_left:Ne \l__expl_status_stack_tl
       {
         \bool_if:NTF \l__kernel_expl_bool
           { 1 }
diff --git a/texmf/tex/latex/l3kernel/l3debug.def b/texmf/tex/latex/l3kernel/l3debug.def
index af741efb1..5a506c6cb 100644
--- a/texmf/tex/latex/l3kernel/l3debug.def
+++ b/texmf/tex/latex/l3kernel/l3debug.def
@@ -71,7 +71,7 @@
   }
 \cs_set_protected:Npn \debug_resume:
   {
-    \__kernel_tl_set:Nx \l__debug_suspended_tl
+    \__kernel_tl_set:Ne \l__debug_suspended_tl
       { \tl_tail:N \l__debug_suspended_tl }
     \tl_if_empty:NT \l__debug_suspended_tl
       {
@@ -93,7 +93,7 @@
         \__debug_suspended:T \use_none:nnn
         \cs_if_exist:NF ##1
           {
-            \msg_error:nnx { debug } { non-declared-variable }
+            \msg_error:nne { debug } { non-declared-variable }
               { \token_to_str:N ##1 }
           }
       }
@@ -102,7 +102,7 @@
         \__debug_suspended:T \use_none:nnn
         \cs_if_exist:NF ##1
           {
-            \msg_error:nnx { kernel } { command-not-defined }
+            \msg_error:nne { kernel } { command-not-defined }
               { \token_to_str:N ##1 }
           }
       }
@@ -163,7 +163,7 @@
       \if:w #1 \scan_stop:
         \cs_gset_nopar:Npn #1 {#2}
       \else:
-        \msg_error:nnxxx { debug } { local-global }
+        \msg_error:nneee { debug } { local-global }
           {#1} {#2} { \iow_char:N \\ #3 }
       \fi:
     \fi:
@@ -171,12 +171,12 @@
 \use:c { __debug_check-declarations_off: }
 \cs_new_protected:cpn { __debug_log-functions_on: }
   {
-    \cs_set_protected:Npn \__kernel_debug_log:x
-      { \__debug_suspended:T \use_none:nn \iow_log:x }
+    \cs_set_protected:Npn \__kernel_debug_log:e
+      { \__debug_suspended:T \use_none:nn \iow_log:e }
   }
 \cs_new_protected:cpn { __debug_log-functions_off: }
-  { \cs_set_protected:Npn \__kernel_debug_log:x { \use_none:n } }
-\cs_new_protected:Npn \__kernel_debug_log:x { \use_none:n }
+  { \cs_set_protected:Npn \__kernel_debug_log:e { \use_none:n } }
+\cs_new_protected:Npn \__kernel_debug_log:e { \use_none:n }
 \cs_new_protected:cpn { __debug_check-expressions_on: }
   {
     \cs_set:Npn \__kernel_chk_expr:nNnN ##1##2
@@ -213,11 +213,11 @@
 \tl_new:N \l__debug_tmpb_tl
 \cs_new_protected:Npn \__debug_generate_parameter_list:NNN #1#2#3
   {
-    \__kernel_tl_set:Nx \l__debug_internal_tl
+    \__kernel_tl_set:Ne \l__debug_internal_tl
       { \exp_last_unbraced:Nf \use_ii:nnn \cs_split_function:N #1 }
-    \__kernel_tl_set:Nx #2
+    \__kernel_tl_set:Ne #2
       { \exp_args:NV \__debug_build_parm_text:n \l__debug_internal_tl }
-    \__kernel_tl_set:Nx #3
+    \__kernel_tl_set:Ne #3
       { \exp_args:NV \__debug_build_arg_list:n \l__debug_internal_tl }
   }
 \cs_new:Npn \__debug_build_parm_text:n #1
@@ -317,7 +317,7 @@
     {
       \cs_gset_eq:cN { __debug_ \cs_to_str:N #1 } #1
       \__debug_generate_parameter_list:NNN #1 \l__debug_tmpa_tl \l__debug_tmpb_tl
-      \exp_args:Nx \tex_scantokens:D
+      \exp_args:Ne \tex_scantokens:D
         {
           \tex_global:D \cs_prefix_spec:N #1
           \tex_def:D \exp_not:N #1
@@ -332,23 +332,23 @@
     }
   \cs_set_protected:Npn \__debug_add_to_debug_code:Nnn #1#2#3
     {
-      \use:x
+      \use:e
         {
           \cs_set:Npn \exp_not:N \__debug_tmp:w
-            ####1 \tl_to_str:n { macro: }
-            ####2 \tl_to_str:n { -> }
-            ####3 \c_backslash_str \tl_to_str:n { __debug_ }
+            ##1 \tl_to_str:n { macro: }
+            ##2 \tl_to_str:n { -> }
+            ##3 \c_backslash_str \tl_to_str:n { __debug_ }
                     \cs_to_str:N #1
-            ####4 \s__debug_stop
+            ##4 \s__debug_stop
             {
-              \exp_not:N \exp_args:Nx \exp_not:N \tex_scantokens:D
+              \exp_not:N \exp_args:Ne \exp_not:N \tex_scantokens:D
                 {
-                  \tex_global:D ####1
-                  \tex_def:D \exp_not:N #1 ####2
+                  \tex_global:D ##1
+                  \tex_def:D \exp_not:N #1 ##2
                     {
-                      ####3 \tl_to_str:n {#2}
+                      ##3 \tl_to_str:n {#2}
                       \c_backslash_str __debug_ \cs_to_str:N #1
-                      ####4 \tl_to_str:n {#3}
+                      ##4 \tl_to_str:n {#3}
                     }
                 }
             }
@@ -372,7 +372,7 @@
     }
   \cs_set_protected:Npn \__debug_patch_weird:Nnn #1#2#3
     {
-      \use:x
+      \use:e
         {
           \tex_endlinechar:D -1 \scan_stop:
           \exp_not:N \tex_scantokens:D
@@ -423,8 +423,8 @@
       \tl_concat:NNN
       \tl_gconcat:NNN
     }
-\cs_gset_protected:Npn \__kernel_tl_set:Nx  { \cs_set_nopar:Npx }
-\cs_gset_protected:Npn \__kernel_tl_gset:Nx { \cs_gset_nopar:Npx }
+\cs_gset_protected:Npn \__kernel_tl_set:Ne  { \cs_set_nopar:Npe }
+\cs_gset_protected:Npn \__kernel_tl_gset:Ne { \cs_gset_nopar:Npe }
   \__kernel_patch:nnn
     { \__kernel_chk_var_local:N #1 }
     { }
@@ -466,20 +466,21 @@
       \skip_set_eq:NN
       \skip_add:Nn
       \skip_sub:Nn
-      \__kernel_tl_set:Nx
+      \__kernel_tl_set:Ne
       \tl_clear:N
       \tl_set_eq:NN
       \tl_put_left:Nn
       \tl_put_left:NV
+      \tl_put_left:Nv
+      \tl_put_left:Ne
       \tl_put_left:No
-      \tl_put_left:Nx
       \tl_put_right:Nn
       \tl_put_right:NV
+      \tl_put_right:Nv
+      \tl_put_right:Ne
       \tl_put_right:No
-      \tl_put_right:Nx
       \tl_build_begin:N
       \tl_build_put_right:Nn
-      \tl_build_put_right:Nx
       \tl_build_put_left:Nn
       \vbox_set:Nn
       \vbox_set_top:Nn
@@ -530,20 +531,21 @@
       \skip_gset_eq:NN
       \skip_gadd:Nn
       \skip_gsub:Nn
-      \__kernel_tl_gset:Nx
+      \__kernel_tl_gset:Ne
       \tl_gclear:N
       \tl_gset_eq:NN
       \tl_gput_left:Nn
       \tl_gput_left:NV
+      \tl_gput_left:Nv
+      \tl_gput_left:Ne
       \tl_gput_left:No
-      \tl_gput_left:Nx
       \tl_gput_right:Nn
       \tl_gput_right:NV
+      \tl_gput_right:Nv
+      \tl_gput_right:Ne
       \tl_gput_right:No
-      \tl_gput_right:Nx
       \tl_build_gbegin:N
       \tl_build_gput_right:Nn
-      \tl_build_gput_right:Nx
       \tl_build_gput_left:Nn
       \vbox_gset:Nn
       \vbox_gset_top:Nn
@@ -564,7 +566,6 @@
       \muskip_const:Nn
       \skip_const:Nn
       \tl_const:Nn
-      \tl_const:Nx
     }
   \__kernel_patch:nnn
     { \__kernel_chk_flag_exist:n {#1} }
@@ -601,7 +602,7 @@
   \__kernel_patch:nnn
     { }
     {
-      \__kernel_debug_log:x
+      \__kernel_debug_log:e
         { Defining~\token_to_str:N #1~ \msg_line_context: }
     }
     { \__kernel_chk_if_free_cs:N }
@@ -609,7 +610,7 @@
     {
       \cs_if_free:NF #4
         {
-          \__kernel_debug_log:x
+          \__kernel_debug_log:e
             {
               Variant~\token_to_str:N #4~%
               already~defined;~ not~ changing~ it~ \msg_line_context:
@@ -621,14 +622,14 @@
   \__kernel_patch:nnn
     {
       \cs_if_exist:cF { \c__keys_code_root_str #1 }
-        { \__kernel_debug_log:x { Defining~key~#1~\msg_line_context: } }
+        { \__kernel_debug_log:e { Defining~key~#1~\msg_line_context: } }
     }
     { }
     { \__keys_cmd_set_direct:nn }
   \__kernel_patch:nnn
     { }
     {
-      \__kernel_debug_log:x
+      \__kernel_debug_log:e
         { Defining~message~ #1 / #2 ~\msg_line_context: }
     }
     { \__msg_chk_free:nn }
@@ -652,7 +653,7 @@
     {
       \__regex_trace_push:nnN { regex } { 1 } \__regex_escape_use:nnnn
       \group_begin:
-        \__kernel_tl_set:Nx \l__regex_internal_a_tl
+        \__kernel_tl_set:Ne \l__regex_internal_a_tl
           { \__regex_trace_pop:nnN { regex } { 1 } \__regex_escape_use:nnnn }
         \use_none:nnn
     }
@@ -674,7 +675,7 @@
     { \__regex_build_for_cs:n }
   \__kernel_patch:nnn
     {
-      \__regex_trace:nnx { regex } { 2 }
+      \__regex_trace:nne { regex } { 2 }
         {
           regex~new~state~
           L=\int_use:N \l__regex_left_state_int ~ -> ~
@@ -696,24 +697,24 @@
   \__kernel_patch:nnn
     {
       \__regex_trace_push:nnN { regex } { 1 } \__regex_match:n
-      \__regex_trace:nnx { regex } { 1 } { analyzing~query~token~list }
+      \__regex_trace:nne { regex } { 1 } { analyzing~query~token~list }
     }
     { \__regex_trace_pop:nnN { regex } { 1 } \__regex_match:n }
     { \__regex_match:n }
   \__kernel_patch:nnn
     {
       \__regex_trace_push:nnN { regex } { 1 } \__regex_match_cs:n
-      \__regex_trace:nnx { regex } { 1 } { analyzing~query~token~list }
+      \__regex_trace:nne { regex } { 1 } { analyzing~query~token~list }
     }
     { \__regex_trace_pop:nnN { regex } { 1 } \__regex_match_cs:n }
     { \__regex_match_cs:n }
   \__kernel_patch:nnn
-    { \__regex_trace:nnx { regex } { 1 } { initializing } }
+    { \__regex_trace:nne { regex } { 1 } { initializing } }
     { }
     { \__regex_match_init: }
   \__kernel_patch:nnn
     {
-      \__regex_trace:nnx { regex } { 2 }
+      \__regex_trace:nne { regex } { 2 }
         { state~\int_use:N \l__regex_curr_state_int }
     }
     { }
@@ -734,7 +735,7 @@
     {
         \char_set_catcode_parameter:N \#
         \tex_endlinechar:D -1 \scan_stop:
-        \exp_args:Nx \tex_scantokens:D
+        \exp_args:Ne \tex_scantokens:D
           {
             \tex_global:D \cs_prefix_spec:N #1 \tex_def:D \exp_not:N #1
               \cs_parameter_spec:N #1
@@ -746,7 +747,7 @@
     {
       \tl_map_inline:nn {#1}
         {
-          \exp_args:NNx \__kernel_patch:Nn ##1
+          \exp_args:NNe \__kernel_patch:Nn ##1
             {
               { \c_hash_str 1 }
               {
@@ -805,7 +806,7 @@
     {
       \tl_map_inline:nn {#1}
         {
-          \exp_args:NNx \__kernel_patch:Nn ##1
+          \exp_args:NNe \__kernel_patch:Nn ##1
             {
               {
                 \exp_not:N \__kernel_chk_expr:nNnN { \c_hash_str 1 }
@@ -850,7 +851,7 @@
     {
       \tl_map_inline:nn {#1}
         {
-          \exp_args:NNx \__kernel_patch:Nn ##1
+          \exp_args:NNe \__kernel_patch:Nn ##1
             {
               {
                 \exp_not:N \__kernel_chk_expr:nNnN { \c_hash_str 1 }
@@ -883,7 +884,7 @@
     {
       \clist_map_inline:nn { :nNnT , :nNnF , :nNnTF , _p:nNn }
         {
-          \exp_args:Ncx \__kernel_patch:Nn { #1 ##1 }
+          \exp_args:Nce \__kernel_patch:Nn { #1 ##1 }
             {
               {
                 \exp_not:N \__kernel_chk_expr:nNnN { \c_hash_str 1 }
@@ -905,7 +906,7 @@
     {
       \clist_map_inline:nn { :nT , :nF , :nTF , _p:n }
         {
-          \exp_args:Ncx \__kernel_patch:Nn { #1 ##1 }
+          \exp_args:Nce \__kernel_patch:Nn { #1 ##1 }
             {
               {
                 \exp_not:N \__kernel_chk_expr:nNnN { \c_hash_str 1 }
diff --git a/texmf/tex/latex/l3kernel/l3doc.cls b/texmf/tex/latex/l3kernel/l3doc.cls
index 663dc7b91..4191b7df9 100644
--- a/texmf/tex/latex/l3kernel/l3doc.cls
+++ b/texmf/tex/latex/l3kernel/l3doc.cls
@@ -120,9 +120,6 @@
 \cs_generate_variant:Nn \tl_replace_once:Nnn { Noo }
 \cs_generate_variant:Nn \tl_set_rescan:Nnn { NnV }
 \cs_generate_variant:Nn \tl_to_str:n { f , o }
-\cs_generate_variant:Nn \prop_get:NnNTF { Nx }
-\cs_generate_variant:Nn \prop_put:Nnn { Nx }
-\cs_generate_variant:Nn \prop_gput:Nnn { NVx }
 \prg_new_protected_conditional:Npnn \__codedoc_if_almost_str:n #1 { TF , T , F }
   {
     \int_compare:nNnTF
@@ -135,7 +132,7 @@
 \cs_new_protected:Npn \__codedoc_trim_right:Nn #1#2
   {
     \cs_set:Npn \__codedoc_tmp:w ##1 #2 ##2 \q_stop { \exp_not:n {##1} }
-    \__kernel_tl_set:Nx #1 { \exp_after:wN \__codedoc_tmp:w #1 #2 \q_stop }
+    \__kernel_tl_set:Ne #1 { \exp_after:wN \__codedoc_tmp:w #1 #2 \q_stop }
   }
 \cs_generate_variant:Nn \__codedoc_trim_right:Nn { No }
 \prg_new_protected_conditional:Npnn \__codedoc_str_if_begin:nn #1#2 { TF , T , F }
@@ -156,7 +153,7 @@
           #1 \g__codedoc_module_name_tl
       }
   }
-\cs_new_protected:Npx \__codedoc_replace_at_at_aux:Nn #1#2
+\cs_new_protected:Npe \__codedoc_replace_at_at_aux:Nn #1#2
   {
     \tl_replace_all:Nnn #1 { \token_to_str:N @ } { @ }
     \tl_replace_all:Nnn #1 { \token_to_str:N _ } { _ }
@@ -190,7 +187,7 @@
               \__codedoc_trim_right:Nn \l__codedoc_detect_internals_tl _
               \__codedoc_trim_right:Nn \l__codedoc_detect_internals_tl :
               \__codedoc_trim_right:No \l__codedoc_detect_internals_tl { \token_to_str:N : }
-              \msg_warning:nnxxx { l3doc } { foreign-internal }
+              \msg_warning:nneee { l3doc } { foreign-internal }
                 { \tl_to_str:N \l__codedoc_detect_internals_cs_tl }
                 { \tl_to_str:N \l__codedoc_detect_internals_tl }
                 { \tl_to_str:N \g__codedoc_module_name_tl }
@@ -270,14 +267,14 @@
     \__codedoc_if_almost_str:nTF {#1}
       {
         \__codedoc_key_get_base_TF:nN {#1} \l__codedoc_tmpa_tl
-        \__kernel_tl_set:Nx #2
+        \__kernel_tl_set:Ne #2
           { \__codedoc_split_function_do:on \l__codedoc_tmpa_tl { \__codedoc_base_form_aux:nnN } }
       }
       { \tl_set:Nn #2 {#1} }
   }
-\cs_new:Npx \__codedoc_key_get_base_TF:nN #1#2
+\cs_new:Npe \__codedoc_key_get_base_TF:nN #1#2
   {
-    \__kernel_tl_set:Nx #2 { \exp_not:N \tl_to_str:n {#1} }
+    \__kernel_tl_set:Ne #2 { \exp_not:N \tl_to_str:n {#1} }
     \tl_if_in:NoF #2 { \tl_to_str:n {:} }
       { \exp_not:N \prg_break: }
     \tl_if_in:onT { #2 z } { \tl_to_str:n {TF} z }
@@ -320,7 +317,7 @@
         \tl_if_head_eq_charcode:nNTF {#4} :
           { #2 {#1} }
           {
-            \use:x
+            \use:e
               {
                 \exp_not:n {#3}
                 { \__codedoc_base_form_aux:nnN {#4} {#5} #6 }
@@ -492,7 +489,7 @@
 \cs_gset_eq:NN \endverbatim \endVerbatim
 \cs_set_protected:Npn \ifnot@excluded
   {
-    \exp_args:Nxx \expanded@notin
+    \exp_args:Nee \expanded@notin
       { \c_backslash_str \tl_to_str:N \macro@namepart , }
       { \exp_args:NV \tl_to_str:n \index@excludelist }
   }
@@ -708,7 +705,7 @@
         \verbatim@font
         \__codedoc_if_almost_str:VT \l__codedoc_cmd_tl
           {
-            \__kernel_tl_set:Nx \l__codedoc_cmd_tl { \tl_to_str:N \l__codedoc_cmd_tl }
+            \__kernel_tl_set:Ne \l__codedoc_cmd_tl { \tl_to_str:N \l__codedoc_cmd_tl }
             \bool_if:NT \g__codedoc_cs_break_bool
               {
                 \regex_replace_all:nnN
@@ -727,13 +724,13 @@
        {
         \quark_if_no_value:NF \l__codedoc_cmd_index_tl
           {
-            \__kernel_tl_set:Nx \l__codedoc_cmd_tl
+            \__kernel_tl_set:Ne \l__codedoc_cmd_tl
               { \c_backslash_str \exp_not:o { \l__codedoc_cmd_index_tl } }
           }
         \exp_args:No \__codedoc_key_get:n { \l__codedoc_cmd_tl }
         \quark_if_no_value:NF \l__codedoc_cmd_module_tl
           {
-            \__kernel_tl_set:Nx \l__codedoc_index_module_tl
+            \__kernel_tl_set:Ne \l__codedoc_index_module_tl
               { \tl_to_str:N \l__codedoc_cmd_module_tl }
           }
         \__codedoc_special_index_module:ooonN
@@ -811,29 +808,29 @@
   }
 \cs_new_protected:Npn \__codedoc_get_hyper_target:nN #1#2
   {
-    \__kernel_tl_set:Nx #2 { \tl_to_str:n {#1} }
-    \tl_replace_all:Nxn #2 { \c_underscore_str } { / }
-    \tl_remove_all:Nx   #2 { \c_backslash_str }
+    \__kernel_tl_set:Ne #2 { \tl_to_str:n {#1} }
+    \tl_replace_all:Nen #2 { \c_underscore_str } { / }
+    \tl_remove_all:Ne   #2 { \c_backslash_str }
     \tl_put_left:Nn #2 { doc/function// }
   }
-\cs_generate_variant:Nn \__codedoc_get_hyper_target:nN { o , x }
+\cs_generate_variant:Nn \__codedoc_get_hyper_target:nN { o , e }
 \cs_new_protected:Npn \__codedoc_names_get_seq:nN #1#2
   {
-    \__kernel_tl_set:Nx \l__codedoc_tmpa_tl { \tl_to_str:n {#1} }
+    \__kernel_tl_set:Ne \l__codedoc_tmpa_tl { \tl_to_str:n {#1} }
     \bool_if:NTF \l__codedoc_names_verb_bool
       {
         \seq_clear:N #2
         \seq_put_right:NV #2 \l__codedoc_tmpa_tl
       }
       {
-        \tl_remove_all:Nx \l__codedoc_tmpa_tl
+        \tl_remove_all:Ne \l__codedoc_tmpa_tl
           { \iow_char:N \^^M \c_percent_str }
-        \tl_remove_all:Nx \l__codedoc_tmpa_tl { \tl_to_str:n { ^ ^ A } }
-        \tl_remove_all:Nx \l__codedoc_tmpa_tl { \iow_char:N \^^I }
-        \tl_remove_all:Nx \l__codedoc_tmpa_tl { \iow_char:N \^^M }
+        \tl_remove_all:Ne \l__codedoc_tmpa_tl { \tl_to_str:n { ^ ^ A } }
+        \tl_remove_all:Ne \l__codedoc_tmpa_tl { \iow_char:N \^^I }
+        \tl_remove_all:Ne \l__codedoc_tmpa_tl { \iow_char:N \^^M }
         \__codedoc_detect_internals:N \l__codedoc_tmpa_tl
         \__codedoc_replace_at_at:N \l__codedoc_tmpa_tl
-        \exp_args:NNx \seq_set_from_clist:Nn #2
+        \exp_args:NNe \seq_set_from_clist:Nn #2
           { \tl_to_str:N \l__codedoc_tmpa_tl }
       }
   }
@@ -857,14 +854,14 @@
         \tl_if_head_eq_charcode:nNTF {#2} :
           { \__codedoc_names_parse_aux:nnn {#4} {#4} { \scan_stop: } }
           {
-            \exp_args:Nx \__codedoc_names_parse_aux:nnn
+            \exp_args:Ne \__codedoc_names_parse_aux:nnn
               { \__codedoc_base_form_aux:nnN {#1} {#2} #3 }
               {#1} {#2}
           }
       }
       {
         \bool_if:NT \l__codedoc_macro_TF_bool
-          { \msg_error:nnx { l3doc } { no-signature-TF } {#4} }
+          { \msg_error:nne { l3doc } { no-signature-TF } {#4} }
         \__codedoc_names_parse_aux:nnn {#4} {#4} { \scan_stop: }
       }
   }
@@ -895,12 +892,12 @@
     \str_if_eq:VnTF \l__codedoc_tmpa_tl { \scan_stop: }
       {
         \seq_gclear:N \g__codedoc_variants_seq
-        \__codedoc_names_typeset_auxii:x { \g__codedoc_base_name_tl }
+        \__codedoc_names_typeset_auxii:e { \g__codedoc_base_name_tl }
       }
       {
         \seq_gset_eq:NN \g__codedoc_variants_seq #1
         \seq_gpop:NN \g__codedoc_variants_seq \l__codedoc_tmpb_tl
-        \__codedoc_names_typeset_auxii:x
+        \__codedoc_names_typeset_auxii:e
           { \g__codedoc_base_name_tl : \l__codedoc_tmpb_tl }
       }
   }
@@ -908,7 +905,7 @@
   {
     \bool_if:NT \l__codedoc_macro_pTF_bool
       {
-        \__codedoc_names_typeset_block:xN
+        \__codedoc_names_typeset_block:eN
           { \__codedoc_predicate_from_base:n {#1} }
           \c_false_bool
       }
@@ -916,14 +913,14 @@
       { \__codedoc_names_typeset_block:nN {#1} \c_false_bool }
     \__codedoc_names_typeset_block:nN {#1} \l__codedoc_macro_TF_bool
   }
-\cs_generate_variant:Nn \__codedoc_names_typeset_auxii:n { x }
+\cs_generate_variant:Nn \__codedoc_names_typeset_auxii:n { e }
 \cs_new_protected:Npn \__codedoc_names_typeset_block:nN
   {
     \int_compare:nNnTF \l__codedoc_nested_macro_int = 0
       { \__codedoc_typeset_function_block:nN }
       { \__codedoc_macro_typeset_block:nN }
   }
-\cs_generate_variant:Nn \__codedoc_names_typeset_block:nN { x }
+\cs_generate_variant:Nn \__codedoc_names_typeset_block:nN { e }
 \prg_new_conditional:Npnn \__codedoc_if_macro_internal:n #1 { p , T , F , TF }
   {
     \bool_if:NTF \l__codedoc_macro_internal_set_bool
@@ -950,7 +947,7 @@
           \seq_set_eq:NN \l__codedoc_tmpa_seq ##1
           \seq_pop:NN \l__codedoc_tmpa_seq \l__codedoc_tmpa_tl
           \seq_get:NN \l__codedoc_tmpa_seq \l__codedoc_tmpb_tl
-          \exp_args:NNx
+          \exp_args:NNe
         \group_end:
         #1
           {
@@ -1023,7 +1020,7 @@
     \exp_args:No \__codedoc_date_compare:nNnT
       {#1} > { \c_sys_year_int - \c_sys_month_int - \c_sys_day_int }
       {
-        \msg_error:nnxx { l3doc } { future-date }
+        \msg_error:nnee { l3doc } { future-date }
           { \tl_to_str:N \l__codedoc_macro_argument_tl }
           {#1}
       }
@@ -1156,9 +1153,9 @@
   }
 \cs_new_protected:Npn \__codedoc_typeset_function_block:nN #1#2
   {
-    \__codedoc_function_index:x
+    \__codedoc_function_index:e
       { #1 \bool_if:NT #2 { \tl_to_str:n {TF} } }
-    \__codedoc_function_label:xN {#1} #2
+    \__codedoc_function_label:eN {#1} #2
     #1
     \bool_if:NT #2 { \__codedoc_typeset_TF: }
     \__codedoc_typeset_expandability:
@@ -1166,13 +1163,13 @@
       { \__codedoc_typeset_variant_list:nN {#1} #2 }
     \\
   }
-\cs_generate_variant:Nn \__codedoc_typeset_function_block:nN { x }
+\cs_generate_variant:Nn \__codedoc_typeset_function_block:nN { e }
 \cs_new_protected:Npn \__codedoc_function_index:n #1
   {
     \seq_gput_right:Nn \g_doc_functions_seq {#1}
     \__codedoc_special_index:nn {#1} { usage }
   }
-\cs_generate_variant:Nn \__codedoc_function_index:n { x }
+\cs_generate_variant:Nn \__codedoc_function_index:n { e }
 \cs_new_protected:Npn \__codedoc_typeset_expandability:
   {
     &
@@ -1224,7 +1221,7 @@
   {
     \bool_if:NF \l__codedoc_no_label_bool
       {
-        \__codedoc_get_hyper_target:xN
+        \__codedoc_get_hyper_target:eN
           {
             \exp_not:n {#1}
             \bool_if:NT #2 { \tl_to_str:n {TF} }
@@ -1233,7 +1230,7 @@
         \exp_args:No \label { \l__codedoc_tmpa_tl }
       }
   }
-\cs_generate_variant:Nn \__codedoc_function_label:nN { x }
+\cs_generate_variant:Nn \__codedoc_function_label:nN { e }
 \cs_new:Npn \__codedoc_typeset_dates:
   {
     \bool_lazy_and:nnF
@@ -1417,7 +1414,7 @@
           \l__codedoc_macro_do_not_index_tl
         \exp_args:NNV \seq_set_from_clist:Nn
           \l__codedoc_tmpa_seq \l__codedoc_macro_do_not_index_tl
-        \__kernel_tl_set:Nx \l__codedoc_macro_do_not_index_tl
+        \__kernel_tl_set:Ne \l__codedoc_macro_do_not_index_tl
           { \seq_use:Nn \l__codedoc_tmpa_seq { , } }
         \exp_args:NV \DoNotIndex \l__codedoc_macro_do_not_index_tl
       }
@@ -1445,7 +1442,7 @@
     \__codedoc_macro_single:nNN {#1} \c_true_bool #2
     \seq_if_empty:NF \g__codedoc_variants_seq
       {
-        \__codedoc_macro_typeset_variant_list:xN
+        \__codedoc_macro_typeset_variant_list:eN
           { \__codedoc_get_function_name:n {#1} } #2
       }
   }
@@ -1455,13 +1452,13 @@
     \seq_map_inline:Nn \g__codedoc_variants_seq
       { \__codedoc_macro_single:nNN { #1 : ##1 } \c_false_bool #2 }
   }
-\cs_generate_variant:Nn \__codedoc_macro_typeset_variant_list:nN { x }
+\cs_generate_variant:Nn \__codedoc_macro_typeset_variant_list:nN { e }
 \cs_new_protected:Npn \__codedoc_macro_single:nNN #1#2#3
   {
     \tl_set:Nn \saved@macroname {#1}
     \__codedoc_macro_typeset_one:nN {#1} #3
     \bool_if:NT #3 { \DoNotIndex {#1} }
-    \exp_args:Nx \__codedoc_macro_index:nN
+    \exp_args:Ne \__codedoc_macro_index:nN
       { #1 \bool_if:NT #3 { \tl_to_str:n { TF } } }
       #2
   }
@@ -1495,7 +1492,7 @@
 \cs_new_protected:Npn \__codedoc_print_macroname:nN #1#2
   {
     \strut
-    \__codedoc_get_hyper_target:xN
+    \__codedoc_get_hyper_target:eN
       {
         \exp_not:n {#1}
         \bool_if:NT #2 { \tl_to_str:n {TF} }
@@ -1565,7 +1562,7 @@
   { \__codedoc_test_missing:n {#1} }
 \cs_new_protected:Npn \__codedoc_test_missing:n #1
   {
-    \__codedoc_test_missing_aux:Nxn
+    \__codedoc_test_missing_aux:Nen
       \g__codedoc_missing_tests_prop
       { \seq_use:Nn \l__codedoc_names_seq { , } }
       { { \g_file_curr_name_str \c_space_tl (#1) } }
@@ -1577,7 +1574,7 @@
       { \tl_set:Nn \l__codedoc_tmpa_tl {#3} }
     \prop_put:Nno #1 {#2} \l__codedoc_tmpa_tl
   }
-\cs_generate_variant:Nn \__codedoc_test_missing_aux:Nnn { Nx }
+\cs_generate_variant:Nn \__codedoc_test_missing_aux:Nnn { Ne }
 \cs_new_protected:Npn \__codedoc_macro_end:
   {
     \endtrivlist
@@ -1596,7 +1593,7 @@
      {
        \seq_set_filter:NNn \l__codedoc_tmpa_seq \l__codedoc_names_seq
          { ! \__codedoc_if_macro_internal_p:n {##1} }
-       \seq_gput_right:Nx \g__codedoc_not_tested_seq
+       \seq_gput_right:Ne \g__codedoc_not_tested_seq
          {
            \seq_use:Nn \l__codedoc_tmpa_seq { , }
            \bool_if:NTF \l__codedoc_macro_pTF_bool {~(pTF)}
@@ -1644,10 +1641,10 @@
         \bool_if:NTF \l__codedoc_macro_var_bool {variable} {function}
         \int_compare:nNnTF \l__codedoc_tmpa_int = 1 {~is~} {s~are~}
         documented~on~page~
-        \__codedoc_get_hyper_target:xN
+        \__codedoc_get_hyper_target:eN
           { \seq_item:Nn \g__codedoc_nested_names_seq { 1 } }
           \l__codedoc_tmpa_tl
-        \exp_args:Nx \pageref { \l__codedoc_tmpa_tl } .
+        \exp_args:Ne \pageref { \l__codedoc_tmpa_tl } .
       }
     \seq_gclear:N \g__codedoc_nested_names_seq
   }
@@ -1698,6 +1695,31 @@
   {
     \NewDocumentEnvironment{NOTE}{m}{\comment}{\endcomment}
   }
+\providecommand\Hy@footnote@currentHref{}
+\prop_new:N\g__codedoc_fnmark_prop
+\cs_new_protected:Npn \__codedoc_fn_store:
+ {
+   \prop_gput:Nee\g__codedoc_fnmark_prop
+     {fn\int_use:N\c@footnote}{{\Hy@footnote@currentHref}{\int_use:N\c@footnote}}
+ }
+\cs_new_protected:Npn \__codedoc_fn_restore:n  #1
+ {
+   \prop_get:NnN \g__codedoc_fnmark_prop {fn#1}\l__codedoc_tmpa_tl
+   \tl_gset:Ne\Hy@footnote@currentHref
+     {\exp_last_unbraced:NV\use_i:nn \l__codedoc_tmpa_tl }
+   \setcounter{footnote}{\exp_last_unbraced:NV\use_ii:nn \l__codedoc_tmpa_tl}
+ }
+
+\cs_generate_variant:Nn \hook_gput_next_code:nn {ne}
+\cs_new_protected:Npn \__codedoc_fn_footnote:nn #1 #2
+  {
+    \footnotemark
+    \__codedoc_fn_store:
+    \hook_gput_next_code:ne {env/#1/after}
+      {\exp_not:N\__codedoc_fn_restore:n{\int_use:N\c@footnote}{\exp_not:n{\footnotetext{#2}}}}}
+
+\AddToHook{env/function/begin}{\def\footnote{\__codedoc_fn_footnote:nn{function}}}
+\AddToHook{env/variable/begin}{\def\footnote{\__codedoc_fn_footnote:nn{variable}}}
 \newenvironment{TemplateInterfaceDescription}[1]
   {
     \subsection{The~object~type~`#1'}
@@ -1806,7 +1828,7 @@
     \@tempswatrue
     \if@partsw
       \@tempswafalse
-      \cs_set:Npx \@tempb {#1}
+      \cs_set:Npe \@tempb {#1}
       \clist_map_inline:Nn \@partlist
         {
           \if_meaning:w \@tempa \@tempb
@@ -1827,7 +1849,7 @@
       \part{\currentfile}
       {
         \cs_set_eq:NN \ttfamily\relax
-        \cs_gset:Npx \filekey
+        \cs_gset:Npe \filekey
           { \filekey,~ \thepart = { \ttfamily \currentfile } }
       }
       \DocInput{\currentfile}
@@ -1960,12 +1982,14 @@
 \tl_new:N \l__codedoc_doc_def_tl
 \tl_new:N \l__codedoc_doc_undef_tl
 \tl_new:N \l__codedoc_undoc_def_tl
+\tl_const:Nn \c__codedoc_iow_separator_tl { ---- }
+\tl_const:Nn \c__codedoc_iow_midrule_tl  { -- }
 \cs_new_protected:Npn \__codedoc_show_functions_defined:
   {
     \bool_lazy_and:nnT
       { \g__codedoc_typeset_implementation_bool } { \g__codedoc_checkfunc_bool }
       {
-        \iow_term:x { \c__codedoc_iow_separator_tl \iow_newline: }
+        \iow_term:e { \c__codedoc_iow_separator_tl \iow_newline: }
         \iow_open:Nn \g__codedoc_func_iow { \c_sys_jobname_str .cmds }
 
         \tl_clear:N \l__codedoc_doc_def_tl
@@ -1975,12 +1999,12 @@
           {
             \seq_if_in:NnTF \g_doc_macros_seq {##1}
               {
-                \tl_put_right:Nx \l__codedoc_doc_def_tl
+                \tl_put_right:Ne \l__codedoc_doc_def_tl
                   { ##1 \iow_newline: }
                 \iow_now:Nn \g__codedoc_func_iow { > ~ ##1 }
               }
               {
-                \tl_put_right:Nx \l__codedoc_doc_undef_tl
+                \tl_put_right:Ne \l__codedoc_doc_undef_tl
                   { ##1 \iow_newline: }
                 \iow_now:Nn \g__codedoc_func_iow { ! ~ ##1 }
               }
@@ -1989,7 +2013,7 @@
           {
             \seq_if_in:NnF \g_doc_functions_seq {##1}
               {
-                \tl_put_right:Nx \l__codedoc_undoc_def_tl
+                \tl_put_right:Ne \l__codedoc_undoc_def_tl
                   { ##1 \iow_newline: }
                 \iow_now:Nn \g__codedoc_func_iow { ? ~ ##1 }
               }
@@ -2008,7 +2032,7 @@
           \l__codedoc_undoc_def_tl
 
         \iow_close:N \g__codedoc_func_iow
-        \iow_term:x { \c__codedoc_iow_separator_tl }
+        \iow_term:e { \c__codedoc_iow_separator_tl }
       }
   }
 \AtEndDocument { \__codedoc_show_functions_defined: }
@@ -2044,7 +2068,7 @@
                 \iow_newline:
                 \space\space\space\space\space\space * ~ ##1
               }
-            \tl_put_right:Nx \l__codedoc_tmpa_tl
+            \tl_put_right:Ne \l__codedoc_tmpa_tl
               {
                 \iow_newline: \iow_newline:
                 The~ following~ macro(s)~ have~ incomplete~ tests:
@@ -2062,7 +2086,7 @@
                 \iow_newline:
                 \space\space\space\space ##1
               }
-            \tl_put_right:Nx \l__codedoc_tmpa_tl
+            \tl_put_right:Ne \l__codedoc_tmpa_tl
               {
                 \iow_newline:
                 \iow_newline:
@@ -2089,7 +2113,7 @@
       \HD@savedestfalse \HD@target
     \group_end:
   }
-\cs_set_nopar:Npx \theCodelineNo
+\cs_set_nopar:Npe \theCodelineNo
   {
     \group_begin:
       \exp_not:N \HD@savedestfalse
@@ -2098,7 +2122,7 @@
   }
 \bool_new:N \l__codedoc_allow_indexing_bool
 \bool_set_true:N \l__codedoc_allow_indexing_bool
-\use:x
+\use:e
   {
     \exp_not:n { \cs_set_nopar:Npn \@starttoc #1 }
       {
@@ -2137,7 +2161,7 @@
   { \AtEndDocument { \msg_info:nn { l3doc } { print-index-howto } } }
 \cs_gset_protected:Npn \it@is@a #1
   {
-    \use:x
+    \use:e
       {
         \__codedoc_special_index_module:nnnnN
           {#1}
@@ -2164,7 +2188,7 @@
 \tl_new:N \l__codedoc_index_escaped_key_tl
 \cs_new_protected:Npn \__codedoc_special_index_module:nnnnN #1#2#3#4#5
   {
-    \use:x
+    \use:e
       {
         \exp_not:n { \__codedoc_special_index_aux:nnnnnn {#1} {#2} }
           \tl_if_empty:nTF {#3}
@@ -2214,7 +2238,7 @@
   }
 \group_begin:
 \char_set_active_eq:NN - \scan_stop:
-\tl_const:Nx \c__codedoc_active_minus_tl { \char_generate:nn { `- } { 13 } }
+\tl_const:Ne \c__codedoc_active_minus_tl { \char_generate:nn { `- } { 13 } }
 \group_end:
 \cs_new_eq:NN \__codedoc_old_hdpindex:nn \hdpindex
 \cs_new_eq:NN \__codedoc_old_hdclindex:nnn \hdclindex
@@ -2225,7 +2249,7 @@
 \cs_new_protected:Npn \__codedoc_hdindex:nn #1#2
   {
     \tl_set:Nn \l__codedoc_tmpa_tl {#2}
-    \tl_replace_all:Nxn \l__codedoc_tmpa_tl
+    \tl_replace_all:Nen \l__codedoc_tmpa_tl
       { \exp_not:V \c__codedoc_active_minus_tl \exp_not:V \c__codedoc_active_minus_tl }
       { -- }
     \seq_set_split:NnV \l__codedoc_tmpa_seq { -- } \l__codedoc_tmpa_tl
@@ -2239,16 +2263,16 @@
     \tl_replace_all:Nnn \l__codedoc_tmpa_tl { MMMM } { \use_none:nn }
     \tl_if_in:NnT \l__codedoc_tmpa_tl { MMMD }
       {
-        \tl_replace_all:Nxn \l__codedoc_tmpa_tl
+        \tl_replace_all:Nen \l__codedoc_tmpa_tl
           { \exp_not:V \c__codedoc_active_minus_tl MMMD } { - MMMD }
         \tl_replace_all:Nnn \l__codedoc_tmpa_tl { - MMMD } { \__codedoc_hdindex_aux:w }
       }
-    \use:x { \exp_not:n {#1} { \exp_not:V \l__codedoc_tmpa_tl } }
+    \use:e { \exp_not:n {#1} { \exp_not:V \l__codedoc_tmpa_tl } }
   }
 \cs_new_protected:Npn \__codedoc_hdindex_aux:w #1 M { }
 \cs_new_protected:Npn \__codedoc_special_index_set:Nn #1#2
   {
-    \__kernel_tl_set:Nx #1 { \tl_to_str:n {#2} }
+    \__kernel_tl_set:Ne #1 { \tl_to_str:n {#2} }
     \__codedoc_if_almost_str:nTF {#2}
       {
         \tl_replace_all:Non #1 { \tl_to_str:n { __ } }
@@ -2257,7 +2281,7 @@
             \token_to_str:N \_ \token_to_str:N \_
             \token_to_str:N \verb * \verbatimchar
           }
-        \exp_args:Nx \tl_map_inline:nn
+        \exp_args:Ne \tl_map_inline:nn
           { \tl_to_str:N \verbatimchar \token_to_str:N _ }
           {
             \tl_replace_all:Nnn #1 {##1}
@@ -2266,7 +2290,7 @@
                 \token_to_str:N \verb * \verbatimchar
               }
           }
-        \__kernel_tl_set:Nx #1
+        \__kernel_tl_set:Ne #1
           {
             \token_to_str:N \verb * \verbatimchar
             #1 \verbatimchar
@@ -2284,14 +2308,14 @@
   {
     \tl_map_inline:nn { \quotechar \actualchar \encapchar \levelchar \bslash }
       {
-        \tl_replace_all:Nxn #1
+        \tl_replace_all:Nen #1
           { \tl_to_str:N ##1 } { \quotechar \tl_to_str:N ##1 }
       }
   }
 \cs_new_protected:Npn \__codedoc_key_get:n #1
   {
     \__codedoc_key_get_base:nN {#1} \l__codedoc_index_macro_tl
-    \__kernel_tl_set:Nx \l__codedoc_index_key_tl
+    \__kernel_tl_set:Ne \l__codedoc_index_key_tl
       { \tl_to_str:N \l__codedoc_index_macro_tl }
     \tl_clear:N \l__codedoc_index_module_tl
     \tl_if_in:NoTF \l__codedoc_index_key_tl { \tl_to_str:n { __ } }
@@ -2314,14 +2338,14 @@
   }
 \cs_new_protected:Npn \__codedoc_key_pop:
   {
-    \__kernel_tl_set:Nx \l__codedoc_index_key_tl
+    \__kernel_tl_set:Ne \l__codedoc_index_key_tl
       { \tl_tail:N \l__codedoc_index_key_tl }
   }
 \cs_new_protected:Npn \__codedoc_key_trim_module:n #1
   {
     \cs_set:Npn \__codedoc_tmpa:w ##1 #1 ##2 \q_stop
       { \exp_not:n {##1} }
-    \__kernel_tl_set:Nx \l__codedoc_index_module_tl
+    \__kernel_tl_set:Ne \l__codedoc_index_module_tl
       { \exp_after:wN \__codedoc_tmpa:w \l__codedoc_index_module_tl #1 \q_stop }
   }
 \cs_new_protected:Npn \__codedoc_key_drop_underscores:
@@ -2340,7 +2364,7 @@
   }
 \cs_new_protected:Npn \__codedoc_key_var:
   {
-    \exp_args:Nx \tl_if_head_eq_charcode:nNTF
+    \exp_args:Ne \tl_if_head_eq_charcode:nNTF
       { \exp_args:No \str_tail:n \l__codedoc_index_key_tl } _
       {
         \str_case:fn { \str_head:N \l__codedoc_index_key_tl }
@@ -2372,7 +2396,7 @@
       }
   }
 \clist_new:N \g__codedoc_non_modules_clist
-\clist_gset:Nx \g__codedoc_non_modules_clist
+\clist_gset:Ne \g__codedoc_non_modules_clist
   {
     \tl_to_str:n
       {
diff --git a/texmf/tex/latex/l3packages/xparse/xparse.sty b/texmf/tex/latex/l3packages/xparse/xparse.sty
index fed28004c..6dd25e9b1 100644
--- a/texmf/tex/latex/l3packages/xparse/xparse.sty
+++ b/texmf/tex/latex/l3packages/xparse/xparse.sty
@@ -60,7 +60,7 @@
       }
   }
 \ExplSyntaxOff
-\ProvidesExplPackage{xparse}{2023-08-29}{}
+\ProvidesExplPackage{xparse}{2023-10-10}{}
   {L3 Experimental document command parser}
 \clist_new:N \l__cmd_options_clist
 \DeclareOption* { \clist_put_right:NV \l__cmd_options_clist \CurrentOption }
@@ -78,7 +78,7 @@
       { \msg_redirect_module:nnn {#1} { info } { none } }
     \cs_new_protected:Npn \__cmd_unknown_argument_type_error:n ##1
       {
-        \msg_error:nnxx {#1} { unknown-argument-type }
+        \msg_error:nnee {#1} { unknown-argument-type }
           { \__cmd_environment_or_command: } { \tl_to_str:n {##1} }
       }
   }
@@ -95,7 +95,7 @@
         \__cmd_bad_def:wn
       }
   }
-\cs_new_protected:Npx \__cmd_normalize_type_g:w
+\cs_new_protected:Npe \__cmd_normalize_type_g:w
   { \exp_not:N \__cmd_normalize_type_G:w { \exp_not:V \c_novalue_tl } }
 \cs_new_protected:Npn \__cmd_normalize_type_G:w #1
   {
@@ -219,7 +219,7 @@
 \cs_gset_protected:Npn \__cmd_get_arg_spec_error:n #1
   {
     \bool_set_true:N \l__cmd_environment_bool
-    \str_set:Nx \l__cmd_environment_str {#1}
+    \str_set:Ne \l__cmd_environment_str {#1}
     \__cmd_get_arg_spec_error_aux:n
       { \cs_if_exist:cTF { \l__cmd_environment_str } }
   }
@@ -227,11 +227,11 @@
   {
     #1
       {
-        \msg_error:nnx { cmd } { non-xparse }
+        \msg_error:nne { cmd } { non-xparse }
           { \__cmd_environment_or_command: }
       }
       {
-        \msg_error:nnx { cmd } { unknown }
+        \msg_error:nne { cmd } { unknown }
           { \__cmd_environment_or_command: }
       }
   }
@@ -239,7 +239,7 @@
   {
     \__kernel_cmd_if_xparse:NTF #1
       {
-        \tl_set:Nx \ArgumentSpecification { \tl_item:Nn #1 { 2 } }
+        \tl_set:Ne \ArgumentSpecification { \tl_item:Nn #1 { 2 } }
         #2
       }
       {#3}
diff --git a/texmf/tex/latex/l3packages/xtemplate/xtemplate.sty b/texmf/tex/latex/l3packages/xtemplate/xtemplate.sty
new file mode 100644
index 000000000..9d524ce88
--- /dev/null
+++ b/texmf/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -0,0 +1,1373 @@
+%%
+%% This is file `xtemplate.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% xtemplate.dtx  (with options: `package')
+%% 
+%% Copyright (C) 2011-2023 The LaTeX Project
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This file is part of the "l3packages bundle" (The Work in LPPL)
+%% and all files in that bundle must be distributed together.
+%% 
+%% File: xtemplate.dtx
+\RequirePackage{expl3}[2018/02/21]
+\@ifpackagelater{expl3}{2018/02/21}
+  {}
+  {%
+    \PackageError{xtemplate}{Support package l3kernel too old}
+      {%
+        Please install an up to date version of l3kernel\MessageBreak
+        using your TeX package manager or from CTAN.\MessageBreak
+        \MessageBreak
+        Loading xtemplate will abort!%
+      }%
+    \endinput
+  }
+\ProvidesExplPackage{xtemplate}{2023-10-10}{}
+  {L3 Experimental prototype document functions}
+\tl_const:Nn \c__xtemplate_code_root_tl      { template~code~>~ }
+\tl_const:Nn \c__xtemplate_defaults_root_tl  { template~defaults~>~ }
+\tl_const:Nn \c__xtemplate_instances_root_tl { template~instance~>~  }
+\tl_const:Nn \c__xtemplate_keytypes_root_tl  { template~key~types~>~ }
+\tl_const:Nn \c__xtemplate_key_order_root_tl { template~key~order~>~ }
+\tl_const:Nn \c__xtemplate_restrict_root_tl  { template~restrictions~>~ }
+\tl_const:Nn \c__xtemplate_values_root_tl    { template~values~>~ }
+\tl_const:Nn \c__xtemplate_vars_root_tl      { template~vars~>~ }
+\seq_const_from_clist:Nn \c__xtemplate_keytypes_arg_seq
+  { choice , function , instance }
+\prop_new:N \g__xtemplate_object_type_prop
+\tl_new:N \l__xtemplate_assignments_tl
+\tl_new:N \l__xtemplate_collection_tl
+\prop_new:N \l__xtemplate_collections_prop
+\tl_new:N \l__xtemplate_default_tl
+\bool_new:N \l__xtemplate_error_bool
+\bool_new:N \l__xtemplate_global_bool
+\bool_new:N \l__xtemplate_restrict_bool
+\clist_new:N \l__xtemplate_restrict_clist
+\tl_new:N \l__xtemplate_key_name_tl
+\tl_new:N \l__xtemplate_keytype_tl
+\tl_new:N \l__xtemplate_keytype_arg_tl
+\tl_new:N \l__xtemplate_value_tl
+\tl_new:N \l__xtemplate_var_tl
+\prop_new:N \l__xtemplate_keytypes_prop
+\seq_new:N \l__xtemplate_key_order_seq
+\prop_new:N \l__xtemplate_values_prop
+\prop_new:N \l__xtemplate_vars_prop
+\clist_new:N \l__xtemplate_tmp_clist
+\dim_new:N \l__xtemplate_tmp_dim
+\int_new:N \l__xtemplate_tmp_int
+\muskip_new:N \l__xtemplate_tmp_muskip
+\skip_new:N \l__xtemplate_tmp_skip
+\tl_new:N \l__xtemplate_tmp_tl
+\scan_new:N \s__xtemplate_mark
+\scan_new:N \s__xtemplate_stop
+\quark_new:N \q__xtemplate_nil
+\__kernel_quark_new_conditional:Nn \__xtemplate_quark_if_nil:N { F }
+\cs_generate_variant:Nn \prop_get:NnNTF { No }
+\cs_generate_variant:Nn \prop_get:NnNT  { No }
+\cs_generate_variant:Nn \prop_get:NnNF  { No }
+\cs_new_protected:Npn \__xtemplate_execute_if_arg_agree:nnT #1#2#3
+  {
+    \prop_get:NnN \g__xtemplate_object_type_prop {#1} \l__xtemplate_tmp_tl
+    \int_compare:nNnTF {#2} = \l__xtemplate_tmp_tl
+       {#3}
+       {
+         \msg_error:nneee { xtemplate }
+           { argument-number-mismatch } {#1} { \l__xtemplate_tmp_tl } {#2}
+       }
+  }
+\cs_new_protected:Npn \__xtemplate_execute_if_code_exist:nnT #1#2#3
+  {
+    \cs_if_exist:cTF { \c__xtemplate_code_root_tl #1 / #2 }
+      {#3}
+      {
+        \msg_error:nnee { xtemplate } { no-template-code }
+          {#1} {#2}
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_execute_if_keytype_exist:nT #1#2
+  {
+    \cs_if_exist:cTF { __xtemplate_store_value_ #1 :n }
+      {#2}
+      { \msg_error:nne { xtemplate } { unknown-keytype } {#1} }
+  }
+\cs_generate_variant:Nn \__xtemplate_execute_if_keytype_exist:nT { o }
+\cs_new_protected:Npn \__xtemplate_execute_if_type_exist:nT #1#2
+  {
+    \prop_if_in:NnTF \g__xtemplate_object_type_prop {#1}
+      {#2}
+      { \msg_error:nne { xtemplate } { unknown-object-type } {#1} }
+  }
+\cs_new_protected:Npn \__xtemplate_if_keys_exist:nnT #1#2#3
+  {
+    \cs_if_exist:cTF { \c__xtemplate_keytypes_root_tl #1 / #2 }
+      {#3}
+      {
+        \msg_error:nnee { xtemplate } { unknown-template }
+          {#1} {#2}
+      }
+   }
+\prg_new_conditional:Npnn \__xtemplate_if_key_value:n #1 { T , F , TF }
+  {
+    \str_if_eq:noTF { \KeyValue } { \tl_head:w #1 \q_nil \q_stop }
+      { \prg_return_true: }
+      { \prg_return_false: }
+  }
+\cs_generate_variant:Nn \__xtemplate_if_key_value:nT  { o }
+\cs_generate_variant:Nn \__xtemplate_if_key_value:nF  { o }
+\cs_generate_variant:Nn \__xtemplate_if_key_value:nTF { o }
+\prg_new_conditional:Npnn \__xtemplate_if_instance_exist:nnn #1#2#3
+  { T, F, TF }
+  {
+    \cs_if_exist:cTF { \c__xtemplate_instances_root_tl #1 / #2 / #3 }
+      { \prg_return_true: }
+      { \prg_return_false: }
+ }
+\prg_new_conditional:Npnn \__xtemplate_if_use_template:n #1 { TF }
+  {
+    \str_if_eq:noTF { \UseTemplate } { \tl_head:w #1 \q_nil \q_stop }
+      { \prg_return_true: }
+      { \prg_return_false: }
+}
+\cs_new_protected:Npn \__xtemplate_store_defaults:n #1
+  {
+    \prop_gclear_new:c { \c__xtemplate_defaults_root_tl #1 }
+    \prop_gset_eq:cN { \c__xtemplate_defaults_root_tl #1 }
+      \l__xtemplate_values_prop
+  }
+\cs_new_protected:Npn \__xtemplate_store_keytypes:n #1
+  {
+    \prop_gclear_new:c { \c__xtemplate_keytypes_root_tl #1 }
+    \prop_gset_eq:cN { \c__xtemplate_keytypes_root_tl #1 }
+      \l__xtemplate_keytypes_prop
+    \seq_gclear_new:c { \c__xtemplate_key_order_root_tl #1 }
+    \seq_gset_eq:cN { \c__xtemplate_key_order_root_tl #1 }
+      \l__xtemplate_key_order_seq
+  }
+\cs_new_protected:Npn \__xtemplate_store_values:n #1
+  {
+    \prop_clear_new:c { \c__xtemplate_values_root_tl #1 }
+    \prop_set_eq:cN { \c__xtemplate_values_root_tl #1 }
+      \l__xtemplate_values_prop
+  }
+\cs_new_protected:Npn \__xtemplate_store_restrictions:n #1
+  {
+    \clist_gclear_new:c { \c__xtemplate_restrict_root_tl #1 }
+    \clist_gset_eq:cN { \c__xtemplate_restrict_root_tl #1 }
+      \l__xtemplate_restrict_clist
+  }
+\cs_new_protected:Npn \__xtemplate_store_vars:n #1
+  {
+    \prop_gclear_new:c { \c__xtemplate_vars_root_tl #1 }
+    \prop_gset_eq:cN { \c__xtemplate_vars_root_tl #1 }
+      \l__xtemplate_vars_prop
+  }
+\cs_new_protected:Npn \__xtemplate_recover_defaults:n #1
+  {
+    \prop_if_exist:cTF
+      { \c__xtemplate_defaults_root_tl #1 }
+      {
+        \prop_set_eq:Nc \l__xtemplate_values_prop
+          { \c__xtemplate_defaults_root_tl #1 }
+      }
+      { \prop_clear:N \l__xtemplate_values_prop }
+  }
+\cs_new_protected:Npn \__xtemplate_recover_keytypes:n #1
+  {
+    \prop_if_exist:cTF
+      { \c__xtemplate_keytypes_root_tl #1 }
+      {
+        \prop_set_eq:Nc \l__xtemplate_keytypes_prop
+          { \c__xtemplate_keytypes_root_tl #1 }
+      }
+      { \prop_clear:N \l__xtemplate_keytypes_prop }
+    \seq_if_exist:cTF { \c__xtemplate_key_order_root_tl #1 }
+      {
+        \seq_set_eq:Nc \l__xtemplate_key_order_seq
+          { \c__xtemplate_key_order_root_tl #1 }
+      }
+      { \seq_clear:N \l__xtemplate_key_order_seq }
+  }
+\cs_new_protected:Npn \__xtemplate_recover_restrictions:n #1
+  {
+    \clist_if_exist:cTF
+      { \c__xtemplate_restrict_root_tl #1 }
+      {
+        \clist_set_eq:Nc \l__xtemplate_restrict_clist
+          { \c__xtemplate_restrict_root_tl #1 }
+      }
+      { \clist_clear:N \l__xtemplate_restrict_clist }
+  }
+\cs_new_protected:Npn \__xtemplate_recover_values:n #1
+  {
+    \prop_if_exist:cTF
+      { \c__xtemplate_values_root_tl #1 }
+      {
+        \prop_set_eq:Nc \l__xtemplate_values_prop
+          { \c__xtemplate_values_root_tl #1 }
+      }
+      { \prop_clear:N \l__xtemplate_values_prop }
+  }
+\cs_new_protected:Npn \__xtemplate_recover_vars:n #1
+  {
+    \prop_if_exist:cTF
+      { \c__xtemplate_vars_root_tl #1 }
+      {
+        \prop_set_eq:Nc \l__xtemplate_vars_prop
+          { \c__xtemplate_vars_root_tl #1 }
+      }
+      { \prop_clear:N \l__xtemplate_vars_prop }
+  }
+\cs_new_protected:Npn \__xtemplate_declare_object_type:nn #1#2
+  {
+    \int_set:Nn \l__xtemplate_tmp_int {#2}
+    \int_compare:nTF { 0 <= \l__xtemplate_tmp_int <= 9 }
+      {
+        \msg_info:nnnV { xtemplate } { declare-object-type }
+          {#1} \l__xtemplate_tmp_int
+        \prop_gput:NnV \g__xtemplate_object_type_prop {#1}
+          \l__xtemplate_tmp_int
+      }
+      {
+        \msg_error:nnee { xtemplate } { bad-number-of-arguments }
+          {#1} { \exp_not:V \l__xtemplate_tmp_int }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_declare_template_keys:nnnn #1#2#3#4
+  {
+    \__xtemplate_execute_if_type_exist:nT {#1}
+      {
+        \__xtemplate_execute_if_arg_agree:nnT {#1} {#3}
+          {
+            \prop_clear:N \l__xtemplate_values_prop
+            \prop_clear:N \l__xtemplate_keytypes_prop
+            \seq_clear:N \l__xtemplate_key_order_seq
+            \keyval_parse:NNn
+              \__xtemplate_parse_keys_elt:n \__xtemplate_parse_keys_elt:nn {#4}
+            \__xtemplate_store_defaults:n { #1 / #2 }
+            \__xtemplate_store_keytypes:n { #1 / #2 }
+          }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_parse_keys_elt:n #1
+  {
+    \__xtemplate_split_keytype:n {#1}
+    \bool_if:NF \l__xtemplate_error_bool
+      {
+        \__xtemplate_execute_if_keytype_exist:oT \l__xtemplate_keytype_tl
+          {
+            \seq_map_function:NN \c__xtemplate_keytypes_arg_seq
+              \__xtemplate_parse_keys_elt_aux:n
+            \bool_if:NF \l__xtemplate_error_bool
+              {
+                \seq_if_in:NoTF \l__xtemplate_key_order_seq
+                  \l__xtemplate_key_name_tl
+                  {
+                    \msg_error:nne { xtemplate }
+                      { duplicate-key-interface }
+                      { \l__xtemplate_key_name_tl }
+                  }
+                  { \__xtemplate_parse_keys_elt_aux: }
+              }
+          }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_parse_keys_elt_aux:n #1
+  {
+    \str_if_eq:onT \l__xtemplate_keytype_tl {#1}
+      {
+        \tl_if_empty:NT \l__xtemplate_keytype_arg_tl
+          {
+            \msg_error:nne { xtemplate }
+              { keytype-requires-argument } {#1}
+            \bool_set_true:N \l__xtemplate_error_bool
+            \seq_map_break:
+          }
+      }
+  }
+\cs_new:Npn \__xtemplate_parse_keys_elt_aux:
+  {
+    \tl_set:Ne \l__xtemplate_tmp_tl
+      {
+        \l__xtemplate_keytype_tl
+        \tl_if_empty:NF \l__xtemplate_keytype_arg_tl
+          { { \l__xtemplate_keytype_arg_tl } }
+      }
+    \prop_put:Noo \l__xtemplate_keytypes_prop \l__xtemplate_key_name_tl
+      \l__xtemplate_tmp_tl
+    \seq_put_right:No \l__xtemplate_key_order_seq \l__xtemplate_key_name_tl
+    \str_if_eq:onT \l__xtemplate_keytype_tl { choice }
+      {
+        \exp_args:No \clist_if_in:nnT \l__xtemplate_keytype_arg_tl { unknown }
+          { \msg_error:nn { xtemplate } { choice-unknown-reserved } }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_parse_keys_elt:nn #1#2
+  {
+    \__xtemplate_parse_keys_elt:n {#1}
+    \use:c { __xtemplate_store_value_ \l__xtemplate_keytype_tl :n } {#2}
+  }
+\cs_new_protected:Npe \__xtemplate_split_keytype:n #1
+  {
+    \exp_not:N \bool_set_false:N \exp_not:N \l__xtemplate_error_bool
+    \tl_set:Nn \exp_not:N \l__xtemplate_tmp_tl {#1}
+    \tl_replace_all:Nnn \exp_not:N \l__xtemplate_tmp_tl { : } { \token_to_str:N : }
+    \tl_if_in:onTF \exp_not:N \l__xtemplate_tmp_tl { \token_to_str:N : }
+      {
+        \exp_not:n
+          {
+            \tl_clear:N \l__xtemplate_key_name_tl
+            \exp_after:wN \__xtemplate_split_keytype_aux:w
+              \l__xtemplate_tmp_tl \s__xtemplate_stop
+          }
+      }
+      {
+        \exp_not:N \bool_set_true:N \exp_not:N \l__xtemplate_error_bool
+        \msg_error:nne { xtemplate } { missing-keytype } {#1}
+      }
+  }
+\use:e
+  {
+    \cs_new_protected:Npn \exp_not:N \__xtemplate_split_keytype_aux:w
+      #1 \token_to_str:N : #2 \s__xtemplate_stop
+      {
+        \tl_put_right:Ne \exp_not:N \l__xtemplate_key_name_tl
+          {
+            \exp_not:N \tl_trim_spaces:e
+              { \exp_not:N \tl_to_str:n {#1} }
+          }
+        \tl_if_in:nnTF {#2} { \token_to_str:N : }
+          {
+            \tl_put_right:Nn \exp_not:N \l__xtemplate_key_name_tl
+              { \token_to_str:N : }
+            \exp_not:N \__xtemplate_split_keytype_aux:w #2 \s__xtemplate_stop
+          }
+          {
+            \exp_not:N \tl_if_empty:NTF \exp_not:N \l__xtemplate_key_name_tl
+              {
+                \msg_error:nne { xtemplate } { empty-key-name }
+                  { \token_to_str:N : #2 }
+              }
+              { \exp_not:N \__xtemplate_split_keytype_arg:n {#2} }
+          }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_split_keytype_arg:n #1
+  {
+    \tl_set:Ne \l__xtemplate_keytype_tl { \tl_trim_spaces:n {#1} }
+    \tl_clear:N \l__xtemplate_keytype_arg_tl
+    \cs_set_protected:Npn \__xtemplate_split_keytype_arg_aux:n ##1
+      {
+        \tl_if_in:nnT {#1} {##1}
+          {
+            \cs_set:Npn \__xtemplate_split_keytype_arg_aux:w
+              ####1 ##1 ####2 \s__xtemplate_stop
+              {
+                \tl_if_blank:nT {####1}
+                  {
+                    \tl_set:Ne \l__xtemplate_keytype_tl
+                      { \tl_trim_spaces:n {##1} }
+                    \tl_if_blank:nF {####2}
+                      {
+                        \tl_set:Ne \l__xtemplate_keytype_arg_tl
+                          { \use:n ####2 }
+                      }
+                    \seq_map_break:
+                  }
+              }
+            \__xtemplate_split_keytype_arg_aux:w #1 \s__xtemplate_stop
+          }
+      }
+    \seq_map_function:NN \c__xtemplate_keytypes_arg_seq
+      \__xtemplate_split_keytype_arg_aux:n
+  }
+\cs_generate_variant:Nn \__xtemplate_split_keytype_arg:n { o }
+\cs_new:Npn \__xtemplate_split_keytype_arg_aux:n #1 { }
+\cs_new:Npn \__xtemplate_split_keytype_arg_aux:w #1 \s__xtemplate_stop { }
+\cs_new_protected:Npn \__xtemplate_store_value_boolean:n #1
+  { \prop_put:Non \l__xtemplate_values_prop \l__xtemplate_key_name_tl {#1} }
+\cs_new_protected:Npn \__xtemplate_store_value:n #1
+  { \prop_put:Non \l__xtemplate_values_prop \l__xtemplate_key_name_tl {#1} }
+\cs_new_eq:NN \__xtemplate_store_value_choice:n    \__xtemplate_store_value:n
+\cs_new_eq:NN \__xtemplate_store_value_function:n  \__xtemplate_store_value:n
+\cs_new_eq:NN \__xtemplate_store_value_instance:n  \__xtemplate_store_value:n
+\cs_new_protected:Npn \__xtemplate_store_value_aux:Nn #1#2
+  { \prop_put:Non \l__xtemplate_values_prop \l__xtemplate_key_name_tl {#2} }
+\cs_new_protected:Npn \__xtemplate_store_value_integer:n
+  { \__xtemplate_store_value_aux:Nn \int_eval:n }
+\cs_new_protected:Npn \__xtemplate_store_value_length:n
+  { \__xtemplate_store_value_aux:Nn \dim_eval:n }
+\cs_new_protected:Npn \__xtemplate_store_value_muskip:n
+  { \__xtemplate_store_value_aux:Nn \muskip_eval:n }
+\cs_new_protected:Npn \__xtemplate_store_value_real:n
+  { \__xtemplate_store_value_aux:Nn \fp_eval:n }
+\cs_new_protected:Npn \__xtemplate_store_value_skip:n
+  { \__xtemplate_store_value_aux:Nn \skip_eval:n }
+\cs_new_protected:Npn \__xtemplate_store_value_tokenlist:n
+  { \__xtemplate_store_value_aux:Nn \use:n }
+\cs_new_eq:NN \__xtemplate_store_value_commalist:n \__xtemplate_store_value_tokenlist:n
+\cs_new_protected:Npn \__xtemplate_declare_template_code:nnnnn #1#2#3#4#5
+  {
+    \__xtemplate_execute_if_type_exist:nT {#1}
+      {
+        \__xtemplate_execute_if_arg_agree:nnT {#1}{#3}
+         {
+          \__xtemplate_if_keys_exist:nnT {#1} {#2}
+            {
+              \__xtemplate_store_key_implementation:nnn {#1} {#2} {#4}
+              \regex_match:nnTF { \c { AssignTemplateKeys } } {#5}
+                { \__xtemplate_declare_template_code:nnn { #1 / #2 } {#3} {#5} }
+                {
+                  \__xtemplate_declare_template_code:nnn
+                    { #1 / #2 } {#3} { \AssignTemplateKeys #5 }
+                }
+            }
+         }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_declare_template_code:nnn #1#2#3
+  {
+    \cs_generate_from_arg_count:cNnn
+      { \c__xtemplate_code_root_tl #1 }
+      \cs_gset_protected:Npn {#2} {#3}
+  }
+\cs_new_protected:Npn \__xtemplate_store_key_implementation:nnn #1#2#3
+  {
+    \__xtemplate_recover_defaults:n { #1 / #2 }
+    \__xtemplate_recover_restrictions:n { #1 / #2 }
+    \__xtemplate_recover_keytypes:n { #1 / #2 }
+    \prop_clear:N \l__xtemplate_vars_prop
+    \keyval_parse:nnn
+      { \__xtemplate_parse_vars_elt:n } { \__xtemplate_parse_vars_elt:nnn { #1 / #2 } } {#3}
+    \__xtemplate_store_vars:n { #1 / #2 }
+    \__xtemplate_store_restrictions:n { #1 / #2 }
+    \prop_map_inline:Nn \l__xtemplate_keytypes_prop
+      {
+        \msg_error:nneee { xtemplate } { key-not-implemented }
+          {##1} {#2} {#1}
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_parse_vars_elt:n #1
+  { \msg_error:nne { xtemplate } { key-no-variable } {#1} }
+\cs_new_protected:Npn \__xtemplate_parse_vars_elt:nnn #1#2#3
+ {
+    \tl_set:Ne \l__xtemplate_key_name_tl
+      { \tl_trim_spaces:e { \tl_to_str:n {#2} } }
+    \prop_get:NoNTF
+      \l__xtemplate_keytypes_prop
+      \l__xtemplate_key_name_tl
+      \l__xtemplate_keytype_tl
+      {
+        \__xtemplate_split_keytype_arg:o \l__xtemplate_keytype_tl
+        \__xtemplate_parse_vars_elt_aux:nn {#1} {#3}
+        \prop_remove:NV \l__xtemplate_keytypes_prop \l__xtemplate_key_name_tl
+      }
+      { \msg_error:nne { xtemplate } { unknown-key } {#2} }
+  }
+\cs_new_protected:Npn \__xtemplate_parse_vars_elt_aux:nn #1#2
+  {
+    \__xtemplate_parse_vars_elt_aux:nw {#1} #2 global global \s__xtemplate_stop
+  }
+\cs_new_protected:Npn \__xtemplate_parse_vars_elt_aux:nw
+  #1#2 global #3 global #4 \s__xtemplate_stop
+  {
+    \tl_if_blank:nTF {#4}
+      { \__xtemplate_parse_vars_elt_aux:nnn {#1} { } {#2} }
+      {
+        \tl_if_blank:nTF {#2}
+          {
+            \exp_args:Nnne \__xtemplate_parse_vars_elt_aux:nnn
+              {#1} { global } { \tl_trim_spaces:n {#3} }
+          }
+          { \msg_error:nnn { xtemplate } { bad-variable } { #2 global #3 } }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_parse_vars_elt_aux:nnn #1#2#3
+  {
+    \str_case:VnF \l__xtemplate_keytype_tl
+      {
+        { choice } { \__xtemplate_implement_choices:nn {#1} {#3} }
+        { function }
+          {
+            \cs_if_exist:NF #3
+              { \cs_new:Npn #3 { } }
+            \__xtemplate_parse_vars_elt_key:nn {#1}
+              {
+                .code:n =
+                  {
+                    \cs_generate_from_arg_count:NNnn
+                      \exp_not:N #3
+                      \exp_not:c
+                        { cs_ \str_if_eq:nnT {#1} { global } { g } set:Npn }
+                      { \exp_not:o \l__xtemplate_keytype_arg_tl }
+                      {##1}
+                  }
+              }
+            \prop_put:Non \l__xtemplate_vars_prop
+              \l__xtemplate_key_name_tl {#2#3}
+          }
+        { instance }
+          {
+            \__xtemplate_parse_vars_elt_key:nn {#1}
+              {
+                .code:n =
+                  {
+                    \exp_not:c
+                      { cs_ \str_if_eq:nnT {#1} { global } { g } set:Npn }
+                      \exp_not:N #3 { \UseInstance {##1} }
+                  }
+              }
+            \prop_put:Non \l__xtemplate_vars_prop
+              \l__xtemplate_key_name_tl {#2#3}
+          }
+      }
+      {
+        \tl_if_single:nTF {#3}
+          {
+            \cs_if_exist:NF #3
+              { \use:c { \__xtemplate_map_var_type: _new:N } #3 }
+            \__xtemplate_parse_vars_elt_key:nn {#1}
+              {
+                . \__xtemplate_map_var_type:
+                  _ \str_if_eq:nnT {#1} { global } { g } set:N
+                    = \exp_not:N #3
+              }
+            \prop_put:Non \l__xtemplate_vars_prop
+              \l__xtemplate_key_name_tl {#2#3}
+          }
+          { \msg_error:nne { xtemplate } { bad-variable } { #2#3 } }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_parse_vars_elt_key:nn #1#2
+  {
+    \keys_define:ne { template / #1 }
+      { \l__xtemplate_key_name_tl #2 }
+  }
+\cs_new:Npn \__xtemplate_map_var_type:
+  {
+    \str_case:on \l__xtemplate_keytype_tl
+      {
+        { boolean }   { bool }
+        { commalist } { clist }
+        { integer }   { int }
+        { length }    { dim }
+        { muskip }    { muskip }
+        { real }      { fp }
+        { skip }      { skip }
+        { tokenlist } { tl }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_implement_choices:nn #1#2
+  {
+    \clist_set:No \l__xtemplate_tmp_clist { \l__xtemplate_keytype_arg_tl }
+    \prop_put:Non \l__xtemplate_vars_prop \l__xtemplate_key_name_tl { }
+    \keys_define:ne { template / #1 } { \l__xtemplate_key_name_tl .choice: }
+    \keyval_parse:nnn
+      { \__xtemplate_implement_choice_elt:n }
+      { \__xtemplate_implement_choice_elt:nnn {#1} }
+      {#2}
+    \prop_get:NoNT \l__xtemplate_values_prop \l__xtemplate_key_name_tl
+      \l__xtemplate_tmp_tl
+      { \__xtemplate_implement_choices_default: }
+    \clist_if_empty:NF \l__xtemplate_tmp_clist
+      {
+        \clist_map_inline:Nn \l__xtemplate_tmp_clist
+          {
+            \msg_error:nne { xtemplate } { choice-not-implemented }
+              {##1}
+          }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_implement_choices_default:
+  {
+    \tl_set:Ne \l__xtemplate_tmp_tl
+      { \l__xtemplate_key_name_tl \c_space_tl \l__xtemplate_tmp_tl }
+    \prop_if_in:NoF \l__xtemplate_vars_prop \l__xtemplate_tmp_tl
+      {
+        \tl_set:Ne \l__xtemplate_tmp_tl
+          { \l__xtemplate_key_name_tl \c_space_tl \l__xtemplate_tmp_tl }
+        \prop_if_in:NoF \l__xtemplate_vars_prop \l__xtemplate_tmp_tl
+          {
+            \prop_get:NoN \l__xtemplate_keytypes_prop \l__xtemplate_key_name_tl
+              \l__xtemplate_tmp_tl
+            \__xtemplate_split_keytype_arg:o \l__xtemplate_tmp_tl
+            \prop_get:NoN \l__xtemplate_values_prop \l__xtemplate_key_name_tl
+              \l__xtemplate_tmp_tl
+            \msg_error:nneee { xtemplate } { unknown-default-choice }
+              { \l__xtemplate_key_name_tl } { \l__xtemplate_key_name_tl }
+              { \l__xtemplate_keytype_arg_tl }
+          }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_implement_choice_elt:nnn #1#2#3
+  {
+    \clist_if_empty:NTF \l__xtemplate_tmp_clist
+      {
+        \str_if_eq:nnTF {#2} { unknown }
+          { \__xtemplate_implement_choice_elt_aux:nnn {#1} {#2} {#3} }
+          {
+            \prop_get:NoN \l__xtemplate_keytypes_prop \l__xtemplate_key_name_tl
+              \l__xtemplate_tmp_tl
+            \__xtemplate_split_keytype_arg:o \l__xtemplate_tmp_tl
+            \msg_error:nneee { xtemplate } { unknown-choice }
+              { \l__xtemplate_key_name_tl } {#2}
+              { \l__xtemplate_keytype_arg_tl }
+          }
+      }
+      {
+        \clist_if_in:NnTF \l__xtemplate_tmp_clist {#2}
+          {
+            \clist_remove_all:Nn \l__xtemplate_tmp_clist {#2}
+            \__xtemplate_implement_choice_elt_aux:nnn {#1} {#2} {#3}
+          }
+          {
+            \prop_get:NoN \l__xtemplate_keytypes_prop \l__xtemplate_key_name_tl
+              \l__xtemplate_tmp_tl
+            \__xtemplate_split_keytype_arg:o \l__xtemplate_tmp_tl
+            \msg_error:nneee { xtemplate } { unknown-choice }
+              { \l__xtemplate_key_name_tl } {#2}
+              { \l__xtemplate_keytype_arg_tl }
+          }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_implement_choice_elt_aux:nnn #1#2#3
+  {
+    \keys_define:ne { template / #1 }
+      { \l__xtemplate_key_name_tl / #2 .code:n = { \exp_not:n {#3} } }
+    \tl_set:Ne \l__xtemplate_tmp_tl
+      { \l__xtemplate_key_name_tl \c_space_tl #2 }
+    \prop_put:Non \l__xtemplate_vars_prop \l__xtemplate_tmp_tl {#3}
+  }
+\cs_new_protected:Npn \__xtemplate_implement_choice_elt:n #1
+  {
+    \msg_error:nneee { xtemplate } { choice-requires-code }
+      { \l__xtemplate_key_name_tl } {#1}
+  }
+\cs_new_protected:Npn \__xtemplate_declare_restricted:nnnn #1#2#3#4
+  {
+    \__xtemplate_if_keys_exist:nnT {#1} {#2}
+      {
+        \__xtemplate_set_template_eq:nn { #1 / #3 } { #1 / #2 }
+        \bool_set_true:N \l__xtemplate_restrict_bool
+        \__xtemplate_edit_defaults_aux:nnn {#1} {#3} {#4}
+        \bool_set_false:N \l__xtemplate_restrict_bool
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_edit_defaults:nnn
+  {
+    \bool_set_false:N \l__xtemplate_restrict_bool
+    \__xtemplate_edit_defaults_aux:nnn
+  }
+\cs_new_protected:Npn \__xtemplate_edit_defaults_aux:nnn #1#2#3
+  {
+    \__xtemplate_if_keys_exist:nnT {#1} {#2}
+      {
+        \__xtemplate_recover_defaults:n { #1 / #2 }
+        \__xtemplate_recover_restrictions:n { #1 / #2 }
+        \__xtemplate_parse_values:nn { #1 / #2 } {#3}
+        \__xtemplate_store_defaults:n { #1 / #2 }
+        \__xtemplate_store_restrictions:n { #1 / #2 }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_parse_values:nn #1#2
+  {
+    \clist_clear:N \l__xtemplate_restrict_clist
+    \__xtemplate_parse_values_aux:nn {#1} {#2}
+  }
+\cs_new_protected:Npn \__xtemplate_parse_values_aux:nn #1#2
+  {
+    \__xtemplate_recover_keytypes:n {#1}
+    \keyval_parse:NNn
+      \__xtemplate_parse_values_elt:n \__xtemplate_parse_values_elt:nn {#2}
+  }
+\cs_new_protected:Npn \__xtemplate_parse_values_elt:n #1
+  {
+    \bool_set_true:N \l__xtemplate_error_bool
+    \msg_error:nne { xtemplate } { key-no-value } {#1}
+  }
+\cs_new_protected:Npn \__xtemplate_parse_values_elt:nn #1#2
+  {
+    \tl_set:Ne \l__xtemplate_key_name_tl
+      { \tl_trim_spaces:e { \tl_to_str:n {#1} } }
+    \prop_get:NoNTF \l__xtemplate_keytypes_prop \l__xtemplate_key_name_tl
+      \l__xtemplate_tmp_tl
+      {
+        \bool_if:NTF \l__xtemplate_restrict_bool
+          {
+            \clist_if_in:NoF \l__xtemplate_restrict_clist
+              \l__xtemplate_key_name_tl
+                { \__xtemplate_parse_values_elt_aux:n {#2} }
+          }
+          { \__xtemplate_parse_values_elt_aux:n {#2} }
+      }
+      {
+        \msg_error:nne { xtemplate } { unknown-key }
+          { \l__xtemplate_key_name_tl }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_parse_values_elt_aux:n #1
+  {
+    \clist_put_right:No \l__xtemplate_restrict_clist \l__xtemplate_key_name_tl
+    \__xtemplate_split_keytype_arg:o \l__xtemplate_tmp_tl
+    \use:c { __xtemplate_store_value_ \l__xtemplate_keytype_tl :n } {#1}
+  }
+\cs_new_protected:Npn \__xtemplate_set_template_eq:nn #1#2
+  {
+    \__xtemplate_recover_defaults:n {#2}
+    \__xtemplate_store_defaults:n {#1}
+    \__xtemplate_recover_keytypes:n {#2}
+    \__xtemplate_store_keytypes:n {#1}
+    \__xtemplate_recover_vars:n {#2}
+    \__xtemplate_store_vars:n {#1}
+    \cs_gset_eq:cc { \c__xtemplate_code_root_tl #1 }
+      { \c__xtemplate_code_root_tl #2 }
+  }
+\cs_new_protected:Npn \__xtemplate_declare_instance:nnnnn #1#2#3#4#5
+  {
+    \__xtemplate_execute_if_code_exist:nnT {#1} {#2}
+      {
+        \__xtemplate_recover_defaults:n { #1 / #2 }
+        \__xtemplate_recover_restrictions:n { #1 / #2 }
+        \__xtemplate_recover_vars:n { #1 / #2 }
+        \__xtemplate_declare_instance_aux:nnnnn {#1} {#2} {#3} {#4} {#5}
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_declare_instance_aux:nnnnn #1#2#3#4#5
+  {
+    \bool_set_false:N \l__xtemplate_error_bool
+    \__xtemplate_parse_values_aux:nn { #1 / #2 } {#5}
+    \bool_if:NF \l__xtemplate_error_bool
+      {
+        \prop_put:Nnn \l__xtemplate_values_prop { from~template } {#2}
+        \__xtemplate_store_values:n { #1 / #3 / #4 }
+        \__xtemplate_convert_to_assignments:
+        \cs_set_protected:cpe { \c__xtemplate_instances_root_tl #1 / #3 / #4 }
+          {
+            \exp_not:N \__xtemplate_assignments_push:n
+              { \exp_not:o \l__xtemplate_assignments_tl }
+            \exp_not:c { \c__xtemplate_code_root_tl #1 / #2 }
+          }
+        \__xtemplate_if_instance_exist:nnnF {#1} { } {#4}
+          {
+            \cs_set_eq:cc
+              { \c__xtemplate_instances_root_tl #1 /    / #4 }
+              { \c__xtemplate_instances_root_tl #1 / #3 / #4 }
+          }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_copy_instance:nnnn #1#2#3#4
+  {
+    \__xtemplate_if_instance_exist:nnnTF {#1} {#2} {#3}
+      {
+        \__xtemplate_recover_values:n { #1 / #2 / #3 }
+        \__xtemplate_store_values:n { #1 / #2 / #4 }
+        \cs_set_eq:cc { \c__xtemplate_instances_root_tl #1 / #2 / #4 }
+          { \c__xtemplate_instances_root_tl #1 / #2 / #3 }
+      }
+      {
+        \msg_error:nnee { xtemplate } { unknown-instance }
+          {#1} {#3}
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_edit_instance:nnnn #1#2#3#4
+  {
+    \__xtemplate_if_instance_exist:nnnTF {#1} {#2} {#3}
+      {
+        \__xtemplate_recover_values:n { #1 / #2 / #3 }
+        \prop_get:NnN \l__xtemplate_values_prop { from~template }
+          \l__xtemplate_tmp_tl
+        \__xtemplate_edit_instance_aux:nonnn {#1} \l__xtemplate_tmp_tl
+          {#2} {#3} {#4}
+      }
+      {
+        \msg_error:nnee { xtemplate } { unknown-instance }
+          {#1} {#3}
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_edit_instance_aux:nnnnn #1#2
+  {
+    \__xtemplate_recover_vars:n { #1 / #2 }
+    \__xtemplate_declare_instance_aux:nnnnn {#1} {#2}
+  }
+\cs_generate_variant:Nn \__xtemplate_edit_instance_aux:nnnnn { no }
+\cs_new_protected:Npn \__xtemplate_convert_to_assignments:
+  {
+    \tl_clear:N \l__xtemplate_assignments_tl
+    \seq_map_function:NN \l__xtemplate_key_order_seq
+      \__xtemplate_convert_to_assignments_aux:n
+  }
+\cs_new_protected:Npn \__xtemplate_convert_to_assignments_aux:n #1
+  {
+    \prop_get:NnN \l__xtemplate_keytypes_prop {#1} \l__xtemplate_tmp_tl
+    \__xtemplate_convert_to_assignments_aux:no {#1} \l__xtemplate_tmp_tl
+  }
+\cs_new_protected:Npn \__xtemplate_convert_to_assignments_aux:nn #1#2
+  {
+    \prop_get:NnNT \l__xtemplate_values_prop {#1} \l__xtemplate_value_tl
+      {
+        \prop_get:NnNTF \l__xtemplate_vars_prop {#1} \l__xtemplate_var_tl
+          {
+            \__xtemplate_split_keytype_arg:n {#2}
+            \str_if_eq:onF \l__xtemplate_keytype_tl { choice }
+              {
+                \str_if_eq:onF \l__xtemplate_keytype_tl { code }
+                  { \__xtemplate_find_global: }
+              }
+            \tl_set:Nn \l__xtemplate_key_name_tl {#1}
+            \use:c { __xtemplate_assign_ \l__xtemplate_keytype_tl : }
+          }
+          { \msg_error:nne { xtemplate } { unknown-attribute } {#1} }
+      }
+  }
+\cs_generate_variant:Nn \__xtemplate_convert_to_assignments_aux:nn { no }
+\cs_new_protected:Npn \__xtemplate_find_global:
+  {
+    \bool_set_false:N \l__xtemplate_global_bool
+    \tl_if_in:onT \l__xtemplate_var_tl { global }
+      {
+        \exp_after:wN \__xtemplate_find_global_aux:w \l__xtemplate_var_tl \s__xtemplate_stop
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_find_global_aux:w  #1 global #2 \s__xtemplate_stop
+  {
+    \tl_set:Nn \l__xtemplate_var_tl {#2}
+    \bool_set_true:N \l__xtemplate_global_bool
+  }
+\cs_new_protected:Npn \__xtemplate_use_template:nnn #1#2#3
+  {
+    \__xtemplate_execute_if_code_exist:nnT {#1} {#2}
+      {
+        \__xtemplate_recover_defaults:n { #1 / #2 }
+        \__xtemplate_recover_vars:n { #1 / #2 }
+        \__xtemplate_parse_values:nn { #1 / #2 } {#3}
+        \__xtemplate_convert_to_assignments:
+        \use:c { \c__xtemplate_code_root_tl #1 / #2  }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_assign_boolean:
+  {
+    \bool_if:NTF \l__xtemplate_global_bool
+      { \__xtemplate_assign_boolean_aux:n { bool_gset } }
+      { \__xtemplate_assign_boolean_aux:n { bool_set } }
+  }
+\cs_new_protected:Npn \__xtemplate_assign_boolean_aux:n #1
+  {
+    \__xtemplate_if_key_value:oTF \l__xtemplate_value_tl
+      {
+        \__xtemplate_key_to_value:
+        \tl_put_right:Ne \l__xtemplate_assignments_tl
+          {
+            \exp_not:c { #1 _eq:NN }
+            \exp_not:o \l__xtemplate_var_tl
+            \exp_not:o \l__xtemplate_value_tl
+          }
+      }
+      {
+        \tl_put_right:Ne \l__xtemplate_assignments_tl
+          {
+            \exp_not:c { #1 _ \l__xtemplate_value_tl :N }
+            \exp_not:o \l__xtemplate_var_tl
+          }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_assign_choice:
+  {
+    \__xtemplate_assign_choice_aux:eF
+      { \l__xtemplate_key_name_tl \c_space_tl \l__xtemplate_value_tl }
+      {
+        \__xtemplate_assign_choice_aux:eF
+          { \l__xtemplate_key_name_tl \c_space_tl unknown }
+          {
+            \prop_get:NoN \l__xtemplate_keytypes_prop \l__xtemplate_key_name_tl
+              \l__xtemplate_tmp_tl
+            \__xtemplate_split_keytype_arg:o \l__xtemplate_tmp_tl
+            \msg_error:nneee { xtemplate } { unknown-choice }
+              { \l__xtemplate_key_name_tl } { \l__xtemplate_value_tl }
+              { \l__xtemplate_keytype_arg_tl }
+          }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_assign_choice_aux:nF #1
+  {
+    \prop_get:NnNTF
+      \l__xtemplate_vars_prop
+      {#1}
+      \l__xtemplate_tmp_tl
+      { \tl_put_right:No \l__xtemplate_assignments_tl \l__xtemplate_tmp_tl }
+  }
+\cs_generate_variant:Nn \__xtemplate_assign_choice_aux:nF { e }
+\cs_new_protected:Npn \__xtemplate_assign_function:
+  {
+    \bool_if:NTF \l__xtemplate_global_bool
+      { \__xtemplate_assign_function_aux:N \cs_gset:Npn }
+      { \__xtemplate_assign_function_aux:N \cs_set:Npn  }
+  }
+\cs_new_protected:Npn \__xtemplate_assign_function_aux:N #1
+  {
+    \tl_put_right:Ne \l__xtemplate_assignments_tl
+      {
+        \cs_generate_from_arg_count:NNnn
+          \exp_not:o \l__xtemplate_var_tl
+          \exp_not:N #1
+          { \exp_not:o \l__xtemplate_keytype_arg_tl }
+          { \exp_not:o \l__xtemplate_value_tl }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_assign_instance:
+  {
+    \bool_if:NTF \l__xtemplate_global_bool
+      { \__xtemplate_assign_instance_aux:N \cs_gset_protected:Npn }
+      { \__xtemplate_assign_instance_aux:N \cs_set_protected:Npn  }
+  }
+\cs_new_protected:Npn \__xtemplate_assign_instance_aux:N #1
+  {
+    \tl_put_right:Ne \l__xtemplate_assignments_tl
+      {
+        \exp_not:N #1 \exp_not:o \l__xtemplate_var_tl
+          {
+            \__xtemplate_use_instance:nn
+              { \exp_not:o \l__xtemplate_keytype_arg_tl }
+              { \exp_not:o \l__xtemplate_value_tl }
+          }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_assign_integer:
+  {
+    \bool_if:NTF \l__xtemplate_global_bool
+      { \__xtemplate_assign_variable:N \int_gset:Nn }
+      { \__xtemplate_assign_variable:N \int_set:Nn  }
+  }
+\cs_new_protected:Npn \__xtemplate_assign_length:
+  {
+    \bool_if:NTF \l__xtemplate_global_bool
+      { \__xtemplate_assign_variable:N \dim_gset:Nn }
+      { \__xtemplate_assign_variable:N \dim_set:Nn  }
+}
+\cs_new_protected:Npn \__xtemplate_assign_muskip:
+  {
+    \bool_if:NTF \l__xtemplate_global_bool
+      { \__xtemplate_assign_variable:N \muskip_gset:Nn }
+      { \__xtemplate_assign_variable:N \muskip_set:Nn  }
+  }
+\cs_new_protected:Npn \__xtemplate_assign_real:
+  {
+    \bool_if:NTF \l__xtemplate_global_bool
+      { \__xtemplate_assign_variable:N \fp_gset:Nn }
+      { \__xtemplate_assign_variable:N \fp_set:Nn  }
+  }
+\cs_new_protected:Npn \__xtemplate_assign_skip:
+  {
+    \bool_if:NTF \l__xtemplate_global_bool
+      { \__xtemplate_assign_variable:N \skip_gset:Nn }
+      { \__xtemplate_assign_variable:N \skip_set:Nn  }
+  }
+\cs_new_protected:Npn \__xtemplate_assign_tokenlist:
+  {
+    \bool_if:NTF \l__xtemplate_global_bool
+      { \__xtemplate_assign_tokenlist_aux:NN \tl_gset:NV \tl_gset:Nn }
+      { \__xtemplate_assign_tokenlist_aux:NN \tl_set:NV  \tl_set:Nn }
+  }
+\cs_new_protected:Npn \__xtemplate_assign_tokenlist_aux:NN #1#2
+  {
+    \__xtemplate_if_key_value:oTF \l__xtemplate_value_tl
+      {
+        \__xtemplate_key_to_value:
+        \tl_put_right:Ne \l__xtemplate_assignments_tl
+          {
+            #1 \exp_not:o \l__xtemplate_var_tl
+              \exp_not:o \l__xtemplate_value_tl
+          }
+      }
+      {
+        \tl_put_right:Ne \l__xtemplate_assignments_tl
+          {
+            #2 \exp_not:o \l__xtemplate_var_tl
+              { \exp_not:o \l__xtemplate_value_tl }
+          }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_assign_commalist:
+  {
+    \bool_if:NTF \l__xtemplate_global_bool
+      { \__xtemplate_assign_tokenlist_aux:NN \clist_gset:NV \clist_gset:Nn }
+      { \__xtemplate_assign_tokenlist_aux:NN \clist_set:NV  \clist_set:Nn }
+  }
+\cs_new_protected:Npn \__xtemplate_assign_variable:N #1
+  {
+    \__xtemplate_if_key_value:oT \l__xtemplate_value_tl
+      { \__xtemplate_key_to_value: }
+    \tl_put_right:Ne \l__xtemplate_assignments_tl
+      {
+        #1 \exp_not:o \l__xtemplate_var_tl
+         { \exp_not:o \l__xtemplate_value_tl }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_key_to_value:
+  { \exp_after:wN \__xtemplate_key_to_value_auxi:w \l__xtemplate_value_tl }
+\cs_new_protected:Npn \__xtemplate_key_to_value_auxi:w \KeyValue #1
+  {
+    \tl_set:Ne \l__xtemplate_tmp_tl { \tl_trim_spaces:e { \tl_to_str:n {#1} } }
+    \prop_get:NoNTF
+      \l__xtemplate_vars_prop
+      \l__xtemplate_tmp_tl
+      \l__xtemplate_value_tl
+      {
+        \exp_after:wN \__xtemplate_key_to_value_auxii:w \l__xtemplate_value_tl
+          \s__xtemplate_mark global \q__xtemplate_nil \s__xtemplate_stop
+      }
+      {
+        \msg_error:nne { xtemplate } { unknown-attribute }
+          { \l__xtemplate_tmp_tl }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_key_to_value_auxii:w #1 global #2#3 \s__xtemplate_stop
+  {
+    \__xtemplate_quark_if_nil:NF #2
+      { \tl_set:Nn \l__xtemplate_value_tl {#2} }
+  }
+\cs_new_protected:Npn \__xtemplate_use_instance:nn #1#2
+  {
+    \__xtemplate_if_use_template:nTF {#2}
+      { \__xtemplate_use_instance_aux:nNnnn {#1} #2 }
+      { \__xtemplate_use_instance_aux:nn {#1} {#2} }
+  }
+\cs_new_protected:Npn \__xtemplate_use_instance_aux:nNnnn #1#2#3#4#5
+  {
+    \str_if_eq:nnTF {#1} {#3}
+      { \__xtemplate_use_template:nnn {#3} {#4} {#5} }
+      { \msg_error:nnee { xtemplate } { type-mismatch } {#1} {#3} }
+}
+\cs_new_protected:Npn \__xtemplate_use_instance_aux:nn #1#2
+  {
+    \__xtemplate_get_collection:n {#1}
+    \__xtemplate_if_instance_exist:nnnTF
+      {#1} { \l__xtemplate_collection_tl } {#2}
+        {
+          \use:c
+            {
+              \c__xtemplate_instances_root_tl #1 /
+                \l__xtemplate_collection_tl / #2
+            }
+        }
+        {
+          \__xtemplate_if_instance_exist:nnnTF {#1} { } {#2}
+            { \use:c { \c__xtemplate_instances_root_tl #1 / / #2 } }
+            {
+              \msg_error:nnee { xtemplate } { unknown-instance }
+                {#1} {#2}
+            }
+        }
+  }
+\cs_new_protected:Npn \__xtemplate_use_collection:nn #1#2
+  { \prop_put:Nnn \l__xtemplate_collections_prop {#1} {#2} }
+\cs_new_protected:Npn \__xtemplate_get_collection:n #1
+  {
+    \prop_get:NnNF \l__xtemplate_collections_prop {#1}
+      \l__xtemplate_collection_tl
+      { \tl_clear:N \l__xtemplate_collection_tl }
+  }
+\cs_new:Npn \__xtemplate_assignments_pop: { \l__xtemplate_assignments_tl }
+\cs_new_protected:Npn \__xtemplate_assignments_push:n #1
+  { \tl_set:Nn \l__xtemplate_assignments_tl {#1} }
+\cs_new_protected:Npn \__xtemplate_show_code:nn #1#2
+  { \cs_show:c { \c__xtemplate_code_root_tl #1 / #2 } }
+\cs_new_protected:Npn \__xtemplate_show_defaults:nn #1#2
+  {
+    \__xtemplate_if_keys_exist:nnT {#1} {#2}
+      {
+        \__xtemplate_recover_defaults:n { #1 / #2 }
+        \__xtemplate_show:Nnnn \l__xtemplate_values_prop
+          {#1} {#2} { default~values }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_show_keytypes:nn #1#2
+  {
+    \__xtemplate_if_keys_exist:nnT {#1} {#2}
+      {
+        \__xtemplate_recover_keytypes:n { #1 / #2 }
+        \__xtemplate_show:Nnnn \l__xtemplate_keytypes_prop
+          {#1} {#2} { interface }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_show_vars:nn #1#2
+  {
+     \__xtemplate_execute_if_code_exist:nnT {#1} {#2}
+      {
+        \__xtemplate_recover_vars:n { #1 / #2 }
+        \__xtemplate_show:Nnnn \l__xtemplate_vars_prop
+          {#1} {#2} { variable~mapping }
+      }
+  }
+\cs_new_protected:Npn \__xtemplate_show:Nnnn #1#2#3#4
+  {
+    \msg_show:nneeee { xtemplate } { show-attribute }
+      { \tl_to_str:n {#2} }
+      { \tl_to_str:n {#3} }
+      { \tl_to_str:n {#4} }
+      { \prop_map_function:NN #1 \msg_show_item_unbraced:nn }
+  }
+\cs_new_protected:Npn \__xtemplate_show_values:nnn #1#2#3
+  {
+    \__xtemplate_if_instance_exist:nnnT {#1} {#2} {#3}
+      {
+        \__xtemplate_recover_values:n { #1 / #2 / #3 }
+        \msg_show:nneeee { xtemplate } { show-values }
+          { \tl_to_str:n {#1} }
+          { \tl_to_str:n {#2} }
+          { \tl_to_str:n {#3} }
+          {
+            \prop_map_function:NN \l__xtemplate_values_prop
+              \msg_show_item_unbraced:nn
+          }
+      }
+  }
+\msg_new:nnnn { xtemplate } { argument-number-mismatch }
+  { Object~type~'#1'~takes~#2~argument(s). }
+  {
+    Objects~of~type~'#1'~require~#2~argument(s).\\
+    You~have~tried~to~make~a~template~for~'#1'~
+    with~#3~argument(s),~which~is~not~possible:~
+    the~number~of~arguments~must~agree.
+  }
+\msg_new:nnnn { xtemplate } { bad-number-of-arguments }
+  { Bad~number~of~arguments~for~object~type~'#1'. }
+  {
+    An~object~may~accept~between~0~and~9~arguments.\\
+    You~asked~to~use~#2~arguments:~this~is~not~supported.
+  }
+\msg_new:nnnn { xtemplate } { bad-variable }
+  { Incorrect~variable~description~'#1'. }
+  {
+    The~argument~'#1'~is~not~of~the~form \\
+    ~~'<variable>'\\
+    ~or~\\
+    ~~'global~<variable>'.\\
+    It~must~be~given~in~one~of~these~formats~to~be~used~in~a~template.
+  }
+\msg_new:nnnn { xtemplate } { choice-not-implemented }
+  { The~choice~'#1'~has~no~implementation. }
+  {
+    Each~choice~listed~in~the~interface~for~a~template~must~
+    have~an~implementation.
+  }
+\msg_new:nnnn { xtemplate } { choice-no-code }
+  { The~choice~'#1'~requires~implementation~details. }
+  {
+    When~creating~template~code~using~\DeclareTemplateCode,~
+    each~choice~name~must~have~an~associated~implementation.\\
+    This~should~be~given~after~a~'='~sign:~LaTeX~did~not~find~one.
+  }
+\msg_new:nnnn { xtemplate } { choice-requires-code }
+  { The~choice~'#2'~for~key~'#1'~requires~an~implementation. }
+  {
+    You~should~have~put:\\
+    \ \ #1~:~choice~{~#2 = <code> ~} \\
+    but~LaTeX~did~not~find~any~<code>.
+  }
+\msg_new:nnnn { xtemplate } { duplicate-key-interface }
+  { Key~'#1'~appears~twice~in~interface~definition~\msg_line_context:. }
+  {
+    Each~key~can~only~have~one~interface~declared~in~a~template.\\
+    LaTeX~found~two~interfaces~for~'#1'.
+  }
+\msg_new:nnnn { xtemplate } { keytype-requires-argument }
+  { The~key~type~'#1'~requires~an~argument~\msg_line_context:. }
+  {
+    You~should~have~put:\\
+    \ \ <key-name>~:~#1~{~<argument>~} \\
+    but~LaTeX~did~not~find~an~<argument>.
+  }
+\msg_new:nnnn { xtemplate } { invalid-keytype }
+  { The~key~'#1'~is~missing~a~key-type~\msg_line_context:. }
+  {
+    Each~key~in~a~template~requires~a~key-type,~given~in~the~form:\\
+    \ \ <key>~:~<key-type>\\
+    LaTeX~could~not~find~a~<key-type>~in~your~input.
+  }
+\msg_new:nnnn { xtemplate } { key-no-value }
+  { The~key~'#1'~has~no~value~\msg_line_context:. }
+  {
+    When~creating~an~instance~of~a~template~
+    every~key~listed~must~include~a~value:\\
+    \ \ <key>~=~<value>
+  }
+\msg_new:nnnn { xtemplate } { key-no-variable }
+  { The~key~'#1'~requires~implementation~details~\msg_line_context:. }
+  {
+    When~creating~template~code~using~\DeclareTemplateCode,~
+    each~key~name~must~have~an~associated~implementation.\\
+    This~should~be~given~after~a~'='~sign:~LaTeX~did~not~find~one.
+  }
+\msg_new:nnnn { xtemplate } { key-not-implemented }
+  { Key~'#1'~has~no~implementation~\msg_line_context:. }
+  {
+    The~definition~of~key~implementations~for~template~'#2'~
+    of~object~type~'#3'~does~not~include~any~details~for~key~'#1'.\\
+    The~key~was~declared~in~the~interface~definition,~
+    and~so~an~implementation~is~required.
+  }
+\msg_new:nnnn { xtemplate } { missing-keytype }
+  { The~key~'#1'~is~missing~a~key-type~\msg_line_context:. }
+  {
+    Key~interface~definitions~should~be~of~the~form\\
+    \ \ #1~:~<key-type>\\
+    but~LaTeX~could~not~find~a~<key-type>.
+  }
+\msg_new:nnnn { xtemplate } { no-template-code }
+  {
+    The~template~'#2'~of~type~'#1'~is~unknown~
+    or~has~no~implementation.
+  }
+  {
+    There~is~no~code~available~for~the~template~name~given.\\
+    This~should~be~given~using~\DeclareTemplateCode.
+  }
+\msg_new:nnnn { xtemplate } { object-type-mismatch }
+  { Object~types~'#1'~and~'#2'~do~not~agree. }
+  {
+    You~are~trying~to~use~a~template~directly~with~\UseInstance
+    (or~a~similar~function),~but~the~object~types~do~not~match.
+  }
+\msg_new:nnnn { xtemplate } { unknown-attribute }
+  { The~template~attribute~'#1'~is~unknown. }
+  {
+    There~is~a~definition~in~the~current~template~reading\\
+    \ \ \token_to_str:N \KeyValue {~#1~} \\
+    but~there~is~no~key~called~'#1'.
+  }
+\msg_new:nnnn { xtemplate } { unknown-choice }
+  { The~choice~'#2'~was~not~declared~for~key~'#1'. }
+  {
+    The~key~'#1'~takes~a~fixed~list~of~choices~
+    and~this~list~does~not~include~'#2'.
+  }
+\msg_new:nnnn { xtemplate } { unknown-default-choice }
+  { The~default~choice~'#2'~was~not~declared~for~key~'#1'. }
+  {
+    The~key~'#1'~takes~a~fixed~list~of~choices~
+    and~this~list~does~not~include~'#2'.
+  }
+\msg_new:nnnn { xtemplate } { unknown-instance }
+  { The~instance~'#2'~of~type~'#1'~is~unknown. }
+  {
+    You~have~asked~to~use~an~instance~'#2',~
+    but~this~has~not~been~created.
+  }
+\msg_new:nnnn { xtemplate } { unknown-key }
+  { Unknown~template~key~'#1'. }
+  {
+    The~key~'#1'~was~not~declared~in~the~interface~
+    for~the~current~template.
+  }
+\msg_new:nnnn { xtemplate } { unknown-keytype }
+  { The~key-type~'#1'~is~unknown. }
+  {
+    Valid~key-types~are:\\
+    -~boolean;\\
+    -~choice;\\
+    -~commalist;\\
+    -~function;\\
+    -~instance;\\
+    -~integer;\\
+    -~length;\\
+    -~muskip;\\
+    -~real;\\
+    -~skip;\\
+    -~tokenlist.
+  }
+\msg_new:nnnn { xtemplate } { unknown-object-type }
+  { The~object~type~'#1'~is~unknown. }
+  {
+    An~object~type~needs~to~be~declared~with~\DeclareObjectType
+    prior~to~using~it.
+  }
+\msg_new:nnnn { xtemplate } { unknown-template }
+  { The~template~'#2'~of~type~'#1'~is~unknown. }
+  {
+    No~interface~has~been~declared~for~a~template~
+    '#2'~of~object~type~'#1'.
+  }
+\msg_new:nnn { xtemplate } { declare-object-type }
+  { Declaring~object~type~'#1'~taking~#2~argument(s)~\msg_line_context:. }
+\msg_new:nnn { xtemplate } { declare-template-code }
+  { Declaring~code~for~template~'#2'~of~object~type'#1'~\msg_line_context:. }
+\msg_new:nnn { xtemplate } { declare-template-interface }
+  {
+    Declaring~interface~for~template~'#2'~of~object~type~'#1'~
+    \msg_line_context:.
+  }
+\msg_new:nnn { xtemplate } { show-attribute }
+  {
+    The~template~'#2'~of~object~type~'#1'~has~
+    \tl_if_empty:nTF {#4} { no~#3. } { #3 : #4 }
+  }
+\msg_new:nnn { xtemplate } { show-values }
+  {
+    \tl_if_empty:nTF {#2}
+      { The~instance~'#3'~ }
+      { The~collection~ instance~'#3'~ (from~collection~'#2')~ }
+    of~object~type~'#1'~has~
+    \tl_if_empty:nTF {#4} { no~values. } { values: #4 }
+  }
+\cs_new_protected:Npn \DeclareObjectType #1#2
+  { \__xtemplate_declare_object_type:nn {#1} {#2} }
+\cs_new_protected:Npn \DeclareTemplateInterface #1#2#3#4
+  { \__xtemplate_declare_template_keys:nnnn {#1} {#2} {#3} {#4} }
+\cs_new_protected:Npn \DeclareTemplateCode #1#2#3#4#5
+  { \__xtemplate_declare_template_code:nnnnn {#1} {#2} {#3} {#4} {#5} }
+\cs_new_protected:Npn \DeclareRestrictedTemplate #1#2#3#4
+  { \__xtemplate_declare_restricted:nnnn {#1} {#2} {#3} {#4} }
+\cs_new_protected:Npn \DeclareInstance #1#2#3#4
+  { \__xtemplate_declare_instance:nnnnn {#1} {#3} { } {#2} {#4} }
+\cs_new_protected:Npn \DeclareCollectionInstance #1#2#3#4#5
+  { \__xtemplate_declare_instance:nnnnn {#2} {#4} {#1} {#3} {#5} }
+\cs_new_protected:Npn \DeclareInstanceCopy #1#2#3
+  { \__xtemplate_copy_instance:nnnn {#1} { } {#3} {#2} }
+\cs_new_protected:Npn \EditTemplateDefaults #1#2#3
+  { \__xtemplate_edit_defaults:nnn {#1} {#2} {#3} }
+\cs_new_protected:Npn \EditInstance #1#2#3
+  { \__xtemplate_edit_instance:nnnn {#1} { } {#2} {#3} }
+\cs_new_protected:Npn \EditCollectionInstance #1#2#3#4
+  { \__xtemplate_edit_instance:nnnn {#2} {#1} {#3} {#4} }
+\cs_new_protected:Npn \UseTemplate #1#2#3
+  { \__xtemplate_use_template:nnn {#1} {#2} {#3} }
+\cs_new_protected:Npn \UseInstance #1#2
+  { \__xtemplate_use_instance:nn {#1} {#2} }
+\cs_new_protected:Npn \UseCollection #1#2
+  { \__xtemplate_use_collection:nn {#1} {#2} }
+\cs_new_protected:Npn \ShowTemplateCode #1#2
+  { \__xtemplate_show_code:nn {#1} {#2} }
+\cs_new_protected:Npn \ShowTemplateDefaults #1#2
+  { \__xtemplate_show_defaults:nn {#1} {#2} }
+\cs_new_protected:Npn \ShowTemplateInterface #1#2
+  { \__xtemplate_show_keytypes:nn {#1} {#2} }
+\cs_new_protected:Npn \ShowTemplateVariables #1#2
+  { \__xtemplate_show_vars:nn {#1} {#2} }
+\cs_new_protected:Npn \ShowInstanceValues #1#2
+  { \__xtemplate_show_values:nnn {#1} { } {#2} }
+\cs_new_protected:Npn \ShowCollectionInstanceValues #1#2#3
+  { \__xtemplate_show_values:nnn {#1} {#2} {#3} }
+\cs_new:Npn \IfInstanceExistTF #1#2
+  { \__xtemplate_if_instance_exist:nnnTF {#1} { } {#2} }
+\cs_new:Npn \IfInstanceExistT #1#2
+  { \__xtemplate_if_instance_exist:nnnT {#1} { } {#2} }
+\cs_new:Npn \IfInstanceExistF #1#2
+  { \__xtemplate_if_instance_exist:nnnF {#1} { } {#2} }
+\cs_new_protected:Npn \KeyValue #1 {#1}
+\cs_new_protected:Npn \AssignTemplateKeys
+  { \__xtemplate_assignments_pop: }
+\cs_new_protected:Npn \SetTemplateKeys #1#2#3
+  { \keys_set_known:nnN { template / #1 / #2 } {#3} \l__xtemplate_tmp_clist }
+\cs_new_eq:NN \ShowTemplateKeytypes \ShowTemplateInterface
+%% 
+%%
+%% End of file `xtemplate.sty'.

From e6f1750bf75254e7a2313b0e8e26f1e546ba1ee6 Mon Sep 17 00:00:00 2001
From: Joseph Wright <joseph.wright@morningstar2.co.uk>
Date: Tue, 10 Oct 2023 17:25:31 +0100
Subject: [PATCH 5/6] Update engine-specific .tlg files

---
 base/testfiles/github-0479-often.luatex.tlg | 8 ++++----
 base/testfiles/github-0479-often.xetex.tlg  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/base/testfiles/github-0479-often.luatex.tlg b/base/testfiles/github-0479-often.luatex.tlg
index 58b5cb493..45f350a90 100644
--- a/base/testfiles/github-0479-often.luatex.tlg
+++ b/base/testfiles/github-0479-often.luatex.tlg
@@ -877,14 +877,14 @@ Applying: [....-..-..] UTF-8 default on input line ....
 Already applied: [....-..-..] UTF-8 default on input line ....
 )
 > \__kernel_chk_if_free_cs:N=\protected\long macro:
-#1->\cs_if_free:NF #1{\msg_error:nnxx {kernel}{command-already-defined}{\token_to_str:N #1}{\token_to_meaning:N #1}}.
+#1->\cs_if_free:NF #1{\msg_error:nnee {kernel}{command-already-defined}{\token_to_str:N #1}{\token_to_meaning:N #1}}.
 l. ...\show \__kernel_chk_if_free_cs:N
 > \e@alloc=macro:
 #1#2#3#4#5#6->\global \advance #3\@ne \e@ch@ck {#3}{#4}{#5}#1\allocationnumber #3\relax \global #2#6\allocationnumber \wlog {\string #6=\string #1\the \allocationnumber }.
 l. ...\show \e@alloc
-> \__kernel_msg_error:nnx=\protected\long macro:
-#1->\msg_error:nnx {LaTeX/#1}.
-l. ...\show \__kernel_msg_error:nnx
+> \__kernel_msg_error:nne=\protected\long macro:
+#1->\msg_error:nne {LaTeX/#1}.
+l. ...\show \__kernel_msg_error:nne
 > \msg_new:nnnn=\protected\long macro:
 #1#2->\__msg_chk_free:nn {#1}{#2}\msg_gset:nnnn {#1}{#2}.
 l. ...\show \msg_new:nnnn
diff --git a/base/testfiles/github-0479-often.xetex.tlg b/base/testfiles/github-0479-often.xetex.tlg
index 577983062..c937c6fca 100644
--- a/base/testfiles/github-0479-often.xetex.tlg
+++ b/base/testfiles/github-0479-often.xetex.tlg
@@ -874,14 +874,14 @@ Applying: [....-..-..] UTF-8 default on input line ....
 Already applied: [....-..-..] UTF-8 default on input line ....
 )
 > \__kernel_chk_if_free_cs:N=\protected\long macro:
-#1->\cs_if_free:NF #1{\msg_error:nnxx {kernel}{command-already-defined}{\token_to_str:N #1}{\token_to_meaning:N #1}}.
+#1->\cs_if_free:NF #1{\msg_error:nnee {kernel}{command-already-defined}{\token_to_str:N #1}{\token_to_meaning:N #1}}.
 l. ...\show \__kernel_chk_if_free_cs:N
 > \e@alloc=macro:
 #1#2#3#4#5#6->\global \advance #3\@ne \e@ch@ck {#3}{#4}{#5}#1\allocationnumber #3\relax \global #2#6\allocationnumber \wlog {\string #6=\string #1\the \allocationnumber }.
 l. ...\show \e@alloc
-> \__kernel_msg_error:nnx=\protected\long macro:
-#1->\msg_error:nnx {LaTeX/#1}.
-l. ...\show \__kernel_msg_error:nnx
+> \__kernel_msg_error:nne=\protected\long macro:
+#1->\msg_error:nne {LaTeX/#1}.
+l. ...\show \__kernel_msg_error:nne
 > \msg_new:nnnn=\protected\long macro:
 #1#2->\__msg_chk_free:nn {#1}{#2}\msg_gset:nnnn {#1}{#2}.
 l. ...\show \msg_new:nnnn

From 8d7f2a2ea3059be69594280e54b773cc41fcf4d0 Mon Sep 17 00:00:00 2001
From: Joseph Wright <joseph.wright@morningstar2.co.uk>
Date: Tue, 10 Oct 2023 17:29:20 +0100
Subject: [PATCH 6/6] Update patch code to track l3doc change

---
 base/source2edoc.cls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/source2edoc.cls b/base/source2edoc.cls
index f0f1479ca..5f731af7a 100644
--- a/base/source2edoc.cls
+++ b/base/source2edoc.cls
@@ -30,7 +30,7 @@
     \seq_if_empty:NF \g__codedoc_nested_names_seq
       {
 % This is a crude change: we grab the first name
-        \__codedoc_get_hyper_target:xN
+        \__codedoc_get_hyper_target:eN
           { \seq_item:Nn \g__codedoc_nested_names_seq { 1 } }
           \l__codedoc_tmpa_tl
 % ... and check if it has a reference