4 files changed, 11 insertions, 9 deletions
diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl
index 6e8f45f6d..92cc1fe7f 100644
--- a/tex/context/base/mkxl/cont-new.mkxl
+++ b/tex/context/base/mkxl/cont-new.mkxl
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2022.01.15 11:02}
+\newcontextversion{2022.01.15 17:29}
 
 %D This file is loaded at runtime, thereby providing an excellent place for hacks,
 %D patches, extensions and new features. There can be local overloads in cont-loc
diff --git a/tex/context/base/mkxl/context.mkxl b/tex/context/base/mkxl/context.mkxl
index 9cd838a16..6cd516c3d 100644
--- a/tex/context/base/mkxl/context.mkxl
+++ b/tex/context/base/mkxl/context.mkxl
@@ -29,7 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \immutable\edef\contextformat {\jobname}
-\immutable\edef\contextversion{2022.01.15 11:02}
+\immutable\edef\contextversion{2022.01.15 17:29}
 
 %overloadmode 1 % check frozen / warning
 %overloadmode 2 % check frozen / error
diff --git a/tex/context/base/mkxl/math-frc.mkxl b/tex/context/base/mkxl/math-frc.mkxl
index c7165187c..1175eef1b 100644
--- a/tex/context/base/mkxl/math-frc.mkxl
+++ b/tex/context/base/mkxl/math-frc.mkxl
@@ -282,7 +282,7 @@
 
 \protected\defcsname\??mathfractionalternative\v!inner\endcsname#1#2%
   {\math_frac_command_u
-{}%     {\expandedmathstyleparameter\mathfractionparameter}%
+     {}%     {\expandedmathstyleparameter\mathfractionparameter}%
      {\math_fraction_margin_kern
 \usemathstyleparameter\mathfractionparameter
       \m_fractions_strut_top#1%
@@ -323,7 +323,6 @@
    \endmathgroup
    \math_frac_wrapup}
 
-
 \nulldelimiterspace\zeropoint % was 1.2pt
 
 \definemathfraction[xfrac] [\c!alternative=\v!inner,\c!mathstyle=\s!script]
diff --git a/tex/context/base/mkxl/math-ini.mkxl b/tex/context/base/mkxl/math-ini.mkxl
index f0db89cf2..f65856e73 100644
--- a/tex/context/base/mkxl/math-ini.mkxl
+++ b/tex/context/base/mkxl/math-ini.mkxl
@@ -2464,12 +2464,15 @@
    \fi}
 
 \permanent\def\expandedmathstyleparameter#1%
-  {\ifcsname\??mathstyle#1\c!mathstyle\endcsname
+  {\normalexpanded{\noexpand\math_style_set_expanded{#1\c!mathstyle}}}
+
+\def\math_style_set_expanded#1%
+  {\ifcsname\??mathstyle#1e\endcsname
      \lastnamedcs
-   \orelse\ifcsname\??mathstylecache#1\c!mathstyle\endcsname
+   \orelse\ifcsname\??mathstylecache#1\endcsname
      \lastnamedcs
    \else
-     \math_style_set_mathstyle_mathstylecache#1%
+     \math_style_set_mathstyle_mathstylecache{#1}%
    \fi}
 
 \permanent\protected\def\usemathstyleparameter#1%
@@ -2492,14 +2495,14 @@
 
 \def\math_style_set_mathstyle_mathstylecache#1%
   {\beginlocalcontrol % so we can expand
-   \edef\m_math_style_asked{#1\c!mathstyle}%
+   \edef\m_math_style_asked{#1}%
    \c_math_styles_state_style  \zerocount
    \c_math_styles_state_cramped\zerocount
    \c_math_styles_state_size   \zerocount
    \rawprocesscommacommand[\m_math_style_asked]\math_style_collect
    \gletcsname\??mathstylecache\m_math_style_asked\normalexpanded{\endcsname\math_style_add_to_cache_choice}%
    \endlocalcontrol
-   \csname\??mathstylecache#1\c!mathstyle\endcsname}
+   \csname\??mathstylecache#1\endcsname}
 
 % \letcsname\??mathstyle     \??mathstyle     \endcsname\math_style_set_mathstyle_mathstyle      % still needed?
 % \letcsname\??mathstylecache\??mathstylecache\endcsname\math_style_set_mathstyle_mathstylecache % still needed?