1 files changed, 20 insertions, 10 deletions
diff --git a/tex/context/base/file-ini.mkvi b/tex/context/base/file-ini.mkvi
index 989241dd1..cb9f18cf9 100644
--- a/tex/context/base/file-ini.mkvi
+++ b/tex/context/base/file-ini.mkvi
@@ -103,11 +103,11 @@
    \the\everystartreadingfile
    \pushcatcodetable       % saveguard
    \setcatcodetable\ctxcatcodes
-   \ctxcommand{pushregime()}}% temporarily this way
+   \clf_pushregime}% temporarily this way
 
 \unexpanded\def\stopreadingfile
   {\popcatcodetable      % saveguard
-   \ctxcommand{popregime()}% temporarily this way
+   \clf_popregime % temporarily this way
    \the\everystopreadingfile
    \global\advance\readingfilelevel\minusone}
 
@@ -125,7 +125,7 @@
 \def\inputgivenfile#name{\normalinput{#name}}
 
 %D \macros
-%D   {doiffileelse}
+%D   {doifelsefile}
 %D
 %D The next alternative only looks if a file is present. No
 %D loading is done. This one obeys the standard \TEX\ lookup.
@@ -134,11 +134,19 @@
 %D \doiffileelse {filename} {found} {not found}
 %D \stoptyping
 
-\def\doiffileexistselse#name{\ctxcommand{doiffileexistelse([[#name]])}}
+\unexpanded\def\doifelsefile     {\clf_doifelsefileexist}
+\unexpanded\def\doifelsepath     {\clf_doifelsepathexist}
+\unexpanded\def\doiffile    #name{\clf_doifelsefileexist{#name}\firstofoneargument\gobbleoneargument}
+\unexpanded\def\doifnotfile #name{\clf_doifelsefileexist{#name}\gobbleoneargument\firstofoneargument}
 
-\def\doiffileelse     {\doiffileexistselse}
-\def\doiffile    #name{\doiffileexistselse{#name}\firstofoneargument\gobbleoneargument}
-\def\doifnotfile #name{\doiffileexistselse{#name}\gobbleoneargument\firstofoneargument}
+\let\doiffileelse\doifelsefile
+\let\doifpathelse\doifelsepath
+
+\let\doifelsefileexists\doifelsefile
+\let\doifelsepathexists\doifelsepath
+
+\let\doiffileexistselse\doifelsefileexists
+\let\doifpathexistselse\doifelsepathexists
 
 %D \macros
 %D   {doifparentfileelse}
@@ -149,7 +157,9 @@
 
 \ifx\outputfilename\undefined \def\outputfilename{\jobname} \fi
 
-\def\doifparentfileelse#name{\ctxcommand{doifparentfileelse([[#name]])}}
+\unexpanded\def\doifelseparentfile{\clf_doifelseparentfile}
+
+\let\doifparentfileelse\doifelseparentfile
 
 %D \macros
 %D   {splitfilename}
@@ -185,7 +195,7 @@
 \let\splitoffname\empty
 \let\splitofftype\empty
 
-\def\splitfilename#name{\ctxcommand{splitfilename([[#name]])}}
+\unexpanded\def\splitfilename{\clf_splitfilename}
 
 %D \macros
 %D   {doonlyonce, doinputonce, doendinputonce}
@@ -216,7 +226,7 @@
    \fi}
 
 \unexpanded\def\doinputonce#name%
-  {\doonlyonce{#name}{\doiffileelse{#name}{\inputgivenfile{#name}}\donothing}}
+  {\doonlyonce{#name}{\doifelsefile{#name}{\inputgivenfile{#name}}\donothing}}
 
 \unexpanded\def\doendinputonce#name%
   {\ifcsname\??fileonce#name\endcsname