1 files changed, 9 insertions, 9 deletions
diff --git a/tex/context/base/mkiv/strc-con.mkvi b/tex/context/base/mkiv/strc-con.mkvi
index 57b69cc7f..d67307ba7 100644
--- a/tex/context/base/mkiv/strc-con.mkvi
+++ b/tex/context/base/mkiv/strc-con.mkvi
@@ -980,11 +980,11 @@
    \xdef\currentconstructionincrementnumber{\constructionparameter\c!incrementnumber}%
    %
    \ifx\currentconstructionexpansion\empty
-     \global\let\currentconstructionexpansion\v!no
+     \glet\currentconstructionexpansion\v!no
    \fi
    %
    \ifx\currentconstructionreferenceprefix\empty
-     \global\let\currentconstructionreferenceprefix\referenceprefix
+     \glet\currentconstructionreferenceprefix\referenceprefix
    \fi
    \ifx\currentconstructionexpansion\s!xml
      \xmlstartraw
@@ -994,9 +994,9 @@
        \xdef\currentconstructionlist    {\constructionparameter\c!list}%
      \xmlstopraw
      \ifx\currentconstructionlist\empty
-       \global\let\currentconstructionlist\currentconstructiontitle
+       \glet\currentconstructionlist\currentconstructiontitle
      \fi
-     \global\let\currentconstructioncoding\s!xml
+     \glet\currentconstructioncoding\s!xml
    \else
      \ifx\currentconstructionexpansion\v!yes
        \xdef\currentconstructiontitle   {\constructionparameter\c!title}%
@@ -1016,9 +1016,9 @@
        \fi \fi
      \fi
      \ifx\currentconstructionlist\empty
-       \globallet\currentconstructionlist\currentconstructiontitle
+       \glet\currentconstructionlist\currentconstructiontitle
      \fi
-     \globallet\currentconstructioncoding\s!tex
+     \glet\currentconstructioncoding\s!tex
    \fi
    %
    \ifx\currentconstructiontitle\v!none % will become obsolete
@@ -1093,7 +1093,7 @@
        \endgroup
        \edef\noexpand\currentconstructionlistentry  {\the\scratchcounter}%
        \edef\noexpand\currentconstructionattribute  {\the\lastdestinationattribute}%
-       \edef\noexpand\currentconstructionsynchronize{\ctxlatecommand{enhancelist(\the\scratchcounter)}}%
+       \edef\noexpand\currentconstructionsynchronize{\clf_deferredenhancelist\the\scratchcounter}%
      }%
    \fi}
 
@@ -1103,11 +1103,11 @@
 
 \def\reinstateconstructionnumberentry#1% was xdef
   {\edef\currentconstructionattribute  {\clf_getinternallistreference#1}%
-   \edef\currentconstructionsynchronize{\ctxlatecommand{enhancelist(#1)}}}
+   \edef\currentconstructionsynchronize{\clf_deferredenhancelist\number#1}}
 
 \def\reinstatecachedconstructionnumberentry#1% was xdef | #1 = cached index can be different from real
   {\edef\currentconstructionattribute  {\clf_getinternalcachedlistreference#1}% destination
-   \edef\currentconstructionsynchronize{\ctxlatecommand{enhancelist(#1)}}}
+   \edef\currentconstructionsynchronize{\clf_deferredenhancelist\number#1}}
 
 \installstructurelistprocessor{construction}{\usestructurelistprocessor{number+title}}