0313397
diff -up tex/latex/pkgloader/pkgloader.sty.nol3regex tex/latex/pkgloader/pkgloader.sty
0313397
--- tex/latex/pkgloader/pkgloader.sty.nol3regex	2020-05-12 15:43:34.909265349 -0400
0313397
+++ tex/latex/pkgloader/pkgloader.sty	2020-05-12 15:44:42.157074791 -0400
0313397
@@ -71,7 +71,6 @@
0313397
 %    \begin{macrocode}
0313397
 \RequirePackage{xparse}
0313397
 \RequirePackage{l3keys2e}
0313397
-\RequirePackage{l3regex}
0313397
 \RequirePackage{lt3graph}
0313397
 %    \end{macrocode}
0313397
 %
0313397
@@ -660,7 +659,7 @@
0313397
 %  
0313397
 %    \begin{macrocode}
0313397
     \prop_map_inline:Nn \g__pkgloader_known_pkg_prop {%%%%%%%%%%%%%%   ##1
0313397
-    \int_step_inline:nncn {1} {1} {g__pkgloader_count_(##1)_int} {%% ####1
0313397
+    \int_step_inline:nnvn {1} {1} {g__pkgloader_count_(##1)_int} {%% ####1
0313397
 %    \end{macrocode}
0313397
 %  
0313397
 %  If the current configuration should be loaded but still
0313397
@@ -767,9 +766,8 @@
0313397
 %    \end{macrocode}
0313397
 %    \uninteresting\begin{macrocode}
0313397
 }
0313397
-\cs_generate_variant:Nn \int_step_inline:nnnn  {nncn}
0313397
+\cs_generate_variant:Nn \int_step_inline:nnnn  {nnvn}
0313397
 \cs_generate_variant:Nn \bool_if:nT            {vT}
0313397
-\cs_generate_variant:Nn \withargs:nnn          {vvn}
0313397
 \cs_generate_variant:Nn \graph_gput_vertex:Nnn {Nnf}
0313397
 \graph_new:N \l__pkgloader_order_graph
0313397
 \tl_new:N    \l__pkgloader_used_configs_tl
0313397
@@ -836,8 +834,8 @@
0313397
     }
0313397
   }
0313397
 }
0313397
-\cs_generate_variant:Nn \withargs:nn {xn}
0313397
-\cs_generate_variant:Nn \withargs:nnnnn {vvfvn}
0313397
+\cs_generate_variant:Nn \withargs:nn {x}
0313397
+\cs_generate_variant:Nn \withargs:nnnnn {vvfv}
0313397
 %    \end{macrocode}
0313397
 %  
0313397
 %  And it needs the following auxiliary function to strip