1 files changed, 4 insertions, 19 deletions
diff --git a/tex/context/base/strc-ref.mkvi b/tex/context/base/strc-ref.mkvi
index 69ad4629e..c82a09d20 100644
--- a/tex/context/base/strc-ref.mkvi
+++ b/tex/context/base/strc-ref.mkvi
@@ -75,8 +75,6 @@
 %D document). By setting the \type{interaction} variable, one
 %D can influences the way interactive references are set.
 
-\let\referenceprefix\empty
-
 \installcorenamespace{referencing}
 
 \installdirectcommandhandler \??referencing {referencing} % \??referencing
@@ -232,7 +230,6 @@
      \dontleavehmode\hbox attr \destinationattribute\lastdestinationattribute\bgroup
        \strc_references_flush_destination_nodes
      \egroup
-     \prewordbreak % new
    \fi}
 
 \def\strc_references_set_page_only_destination_attribute#labels% could in fact be fully expandable
@@ -774,24 +771,12 @@
 \unexpanded\def\setupglobalreferenceprefix[#prefix]%
   {\xdef\referenceprefix{#prefix}}
 
-% \unexpanded\def\pushreferenceprefix#prefix%
-%   {\pushmacro\referenceprefix
-%    \xdef\referenceprefix{#prefix}} % global
-
-% \unexpanded\def\popreferenceprefix
-%   {\popmacro\referenceprefix}
-
-\unexpanded\def\globalpushreferenceprefix#prefix%
-  {\xdef\referenceprefix{\ctxcommand{pushreferenceprefix("#prefix")}}}
-
-\unexpanded\def\globalpopreferenceprefix
-  {\xdef\referenceprefix{\ctxcommand{popreferenceprefix()}}}
-
 \unexpanded\def\pushreferenceprefix#prefix%
-  {\edef\referenceprefix{\ctxcommand{pushreferenceprefix("#prefix")}}}
+  {\pushmacro\referenceprefix
+   \xdef\referenceprefix{#prefix}}
 
 \unexpanded\def\popreferenceprefix
-  {\edef\referenceprefix{\ctxcommand{popreferenceprefix()}}}
+  {\popmacro\referenceprefix}
 
 \def\m_strc_references_prefix_yes{+}
 \def\m_strc_references_prefix_nop{-}
@@ -814,7 +799,7 @@
    \fi\fi\fi\fi}
 
 \appendtoks
-    \setupreferenceprefix[\referencingparameter\c!prefix]
+  \setupreferenceprefix[\referencingparameter\c!prefix]
 \to \everysetupreferencing
 
 %D We can typeset a reference using \type{\in}, \type{\at} and