diff --git a/extra/xmode/catalog/catalog.factor b/extra/xmode/catalog/catalog.factor
index 8c6025f726..98276caf83 100755
--- a/extra/xmode/catalog/catalog.factor
+++ b/extra/xmode/catalog/catalog.factor
@@ -5,7 +5,7 @@ IN: xmode.catalog
 
 TUPLE: mode file file-name-glob first-line-glob ;
 
-<TAGS: parse-mode-tag
+<TAGS: parse-mode-tag ( modes tag -- )
 
 TAG: MODE
     "NAME" over at >r
diff --git a/extra/xmode/loader/loader.factor b/extra/xmode/loader/loader.factor
index 5cf3675941..8039db0ac9 100755
--- a/extra/xmode/loader/loader.factor
+++ b/extra/xmode/loader/loader.factor
@@ -7,15 +7,15 @@ IN: xmode.loader
 ! Based on org.gjt.sp.jedit.XModeHandler
 
 ! RULES and its children
-<TAGS: parse-rule-tag
+<TAGS: parse-rule-tag ( rule-set tag -- )
 
-TAG: PROPS ( rule-set tag -- )
+TAG: PROPS
     parse-props-tag swap set-rule-set-props ;
 
-TAG: IMPORT ( rule-set tag -- )
+TAG: IMPORT
     "DELEGATE" swap at swap import-rule-set ;
 
-TAG: TERMINATE ( rule-set tag -- )
+TAG: TERMINATE
     "AT_CHAR" swap at string>number swap set-rule-set-terminate-char ;
 
 RULE: SEQ seq-rule
diff --git a/extra/xmode/loader/syntax/syntax.factor b/extra/xmode/loader/syntax/syntax.factor
index 175c8ed22f..b3adf5cb60 100644
--- a/extra/xmode/loader/syntax/syntax.factor
+++ b/extra/xmode/loader/syntax/syntax.factor
@@ -75,7 +75,7 @@ SYMBOL: ignore-case?
     [ parse-literal-matcher swap set-rule-end ] , ;
 
 ! SPAN's children
-<TAGS: parse-begin/end-tag
+<TAGS: parse-begin/end-tag ( rule tag -- )
 
 TAG: BEGIN
     ! XXX
diff --git a/extra/xmode/utilities/utilities.factor b/extra/xmode/utilities/utilities.factor
index 0321974c9e..2e1d0a2872 100644
--- a/extra/xmode/utilities/utilities.factor
+++ b/extra/xmode/utilities/utilities.factor
@@ -48,11 +48,10 @@ SYMBOL: tag-handler-word
 : (TAG:) ( name quot -- ) swap tag-handlers get set-at ;
 
 : TAG:
-    f set-word
     scan parse-definition
     (TAG:) ; parsing
 
 : TAGS>
     tag-handler-word get
     tag-handlers get >alist [ >r dup name-tag r> case ] curry
-    (( tag -- )) define-declared ; parsing
+    define ; parsing