1 files changed, 8 insertions, 4 deletions
diff --git a/tex/context/base/strc-sbe.mkiv b/tex/context/base/strc-sbe.mkiv
index fc48307ec..9f1d214cf 100644
--- a/tex/context/base/strc-sbe.mkiv
+++ b/tex/context/base/strc-sbe.mkiv
@@ -65,7 +65,7 @@
     \resetallstructuremarks
     \strc_sectionblock_get_environment\currentsectionblock
     \sectionblockparameter\c!before % don't move
-    \dostarttagged\t!division\currentsectionblock
+    \dostarttagged\t!division\currentsectionblock % no parents
 \to \everybeforesectionblock
 
 \appendtoks
@@ -81,7 +81,9 @@
 \def\strc_sectionblock_set[#1][#2]% used to set the default
   {\edef\currentsectionblock{#1}% from now on we assume a value
    \setupcurrentsectionblock[#2]%
-   \ctxcommand{setsectionblock("#1", { bookmark = "\sectionblockparameter\c!bookmark" })}}
+   \clf_setsectionblock{#1}
+      bookmark {\sectionblockparameter\c!bookmark}%
+   \relax}
 
 \let\currentsectionblock\empty % was \s!unknown
 
@@ -93,7 +95,9 @@
    \begingroup
    \edef\currentsectionblock{#1}% from now on we assume a value
    \setupcurrentsectionblock[#2]%
-   \ctxcommand{pushsectionblock("#1", { bookmark = "\sectionblockparameter\c!bookmark" })}%
+   \clf_pushsectionblock{#1}
+     bookmark {\sectionblockparameter\c!bookmark}%
+   \relax
    \csname #1true\endcsname % obsolete
    \setsystemmode\currentsectionblock
    \the\everybeforesectionblock\relax
@@ -102,7 +106,7 @@
 \unexpanded\def\stopsectionblock
   {\showmessage\m!structures2\currentsectionblock
    \the\everyaftersectionblock\relax
-   \ctxcommand{popsectionblock()}%
+   \clf_popsectionblock
    \endgroup}
 
 %D \starttyping