1 files changed, 3 insertions, 9 deletions
diff --git a/tex/context/base/buff-ver.mkiv b/tex/context/base/buff-ver.mkiv
index 1ade44c7c..f1d733d76 100644
--- a/tex/context/base/buff-ver.mkiv
+++ b/tex/context/base/buff-ver.mkiv
@@ -115,18 +115,10 @@
 \def\setupcommonverbatim
   {\let\prettyidentifier\s!default
    %
-%  \doifelse{\typingparameter\c!text}\v!yes
-%    \naturaltextexttrue
-%    \naturaltextextfalse
    \def\prettyidentifierfont{\typingparameter\c!icommand}%
    \def\prettyvariablefont  {\typingparameter\c!vcommand}%
    \def\prettynaturalfont   {\typingparameter\c!ccommand}%
    %
-   \doif{\typingparameter\c!space}\v!on
-     {\def\obeyspaces{\setcontrolspaces}}%
-   \doif{\typingparameter\c!page }\v!no
-     {\def\obeypages {\ignorepages}}%
-   %
    \ignorehyphens % default
    \getvalue{\??tp:\c!lines:\typingparameter\c!lines}%
    \getvalue{\??tp:\c!empty:\typingparameter\c!empty}%
@@ -151,7 +143,9 @@
 
 \def\doinitializeverbatim
   {\ctxlua{buffers.visualizers.reset()}%
-   \def\obs{\obeyedspace}%
+   \doifelse{\typingparameter\c!space}\v!on
+     {\let\obs\fastcontrolspace}%
+     {\let\obs\specialobeyedspace}%
    \ctxlua{buffers.doifelsevisualizer("\prettyidentifier")}
      {\ctxlua{buffers.setvisualizer("\prettyidentifier")}%
       \let\bop\doverbatimbop