diff --git a/collections/sequences/cords/cords.factor b/collections/sequences/cords/cords.factor
index f8be7ec3a3..6dd474e112 100644
--- a/collections/sequences/cords/cords.factor
+++ b/collections/sequences/cords/cords.factor
@@ -41,7 +41,7 @@ M: T cord-append
     2dup [ T instance? ] both?
     [ T-cord boa ] [ generic-cord boa ] if ; inline
 
-;FUNCTOR
+FUNCTOR;
 
 : cord-map ( cord quot -- cord' )
     [ [ head>> ] dip call ]
diff --git a/collections/specialized-arrays/specialized-arrays.factor b/collections/specialized-arrays/specialized-arrays.factor
index 3f65f299b7..e2d7f8849f 100644
--- a/collections/specialized-arrays/specialized-arrays.factor
+++ b/collections/specialized-arrays/specialized-arrays.factor
@@ -103,7 +103,7 @@ M: A vs* [ * \ T c-type-clamp ] 2map ; inline
 
 M: A v*high [ * \ T heap-size neg shift ] 2map ; inline
 
-;FUNCTOR
+FUNCTOR;
 
 : specialized-array-vocab ( c-type -- vocab )
     [
diff --git a/collections/specialized-vectors/specialized-vectors.factor b/collections/specialized-vectors/specialized-vectors.factor
index de768594a3..76c236d490 100644
--- a/collections/specialized-vectors/specialized-vectors.factor
+++ b/collections/specialized-vectors/specialized-vectors.factor
@@ -56,7 +56,7 @@ SYNTAX: V{ \ } [ >V ] parse-literal ;
 INSTANCE: V specialized-vector ;
 INSTANCE: V growable ;
 
-;FUNCTOR
+FUNCTOR;
 
 : specialized-vector-vocab ( c-type -- vocab )
     [
diff --git a/collections/vectors/functor/functor.factor b/collections/vectors/functor/functor.factor
index 8dc288f631..c50fe99039 100644
--- a/collections/vectors/functor/functor.factor
+++ b/collections/vectors/functor/functor.factor
@@ -32,4 +32,4 @@ M: V equal? over V instance? [ sequence= ] [ 2drop f ] if ;
 
 INSTANCE: V growable ;
 
-;FUNCTOR
+FUNCTOR;
diff --git a/demos/talks/tc-lisp-talk/tc-lisp-talk.factor b/demos/talks/tc-lisp-talk/tc-lisp-talk.factor
index 4f55bef016..e64543b7ff 100644
--- a/demos/talks/tc-lisp-talk/tc-lisp-talk.factor
+++ b/demos/talks/tc-lisp-talk/tc-lisp-talk.factor
@@ -191,7 +191,7 @@ WHERE
 : NAME>=< ( obj1 obj2 -- >=< )
     NAME<=> invert-comparison ;
 
-;FUNCTOR"
+FUNCTOR;"
         }
     }
     { $slide "Example of sorting functor"
diff --git a/frameworks/ui/pixel-formats/pixel-formats.factor b/frameworks/ui/pixel-formats/pixel-formats.factor
index cbce576519..08498b8f22 100644
--- a/frameworks/ui/pixel-formats/pixel-formats.factor
+++ b/frameworks/ui/pixel-formats/pixel-formats.factor
@@ -81,7 +81,7 @@ M: pixel-format-attribute >PFA
 : >PFA-int-array ( attribute -- int-array )
     [ >PFA ] map concat PERM prepend 0 suffix int >c-array ;
 
-;FUNCTOR
+FUNCTOR;
 
 SYNTAX: PIXEL-FORMAT-ATTRIBUTE-TABLE:
     scan-token scan-object scan-object ";" expect define-pixel-format-attribute-table ;
diff --git a/language/alien/complex/functor/functor.factor b/language/alien/complex/functor/functor.factor
index b97a2c9877..eb03d9b2c4 100644
--- a/language/alien/complex/functor/functor.factor
+++ b/language/alien/complex/functor/functor.factor
@@ -29,4 +29,4 @@ T-class lookup-c-type
 complex >>boxed-class
 drop
 
-;FUNCTOR
+FUNCTOR;
diff --git a/language/alien/destructors/destructors.factor b/language/alien/destructors/destructors.factor
index 8e3d1a0d7c..d17b7f71f5 100644
--- a/language/alien/destructors/destructors.factor
+++ b/language/alien/destructors/destructors.factor
@@ -27,6 +27,6 @@ M: F-destructor dispose alien>> F N ndrop ;
 
 : |F ( alien -- alien ) dup <F-destructor> |dispose drop ; inline
 
-;FUNCTOR
+FUNCTOR;
 
 SYNTAX: destructor: scan-word define-destructor ;
diff --git a/language/classes/struct/vectored/vectored.factor b/language/classes/struct/vectored/vectored.factor
index ca6ed4114e..0fa81a5c3f 100644
--- a/language/classes/struct/vectored/vectored.factor
+++ b/language/classes/struct/vectored/vectored.factor
@@ -54,7 +54,7 @@ M: T S>>
 M: T S<<
     [ (n)>> ] [ (vectored)>> S>> ] bi set-nth-unsafe ; inline
 
-;FUNCTOR
+FUNCTOR;
 
 PRIVATE>
 
@@ -111,7 +111,7 @@ M: T-array struct-transpose
     dup length [ nip iota ] [ drop ] [ nip (vectored-T) ] 2tri
     [ [ [ nth ] [ set-nth ] bi-curry* bi ] 2curry each ] keep ; inline
 
-;FUNCTOR
+FUNCTOR;
 
 SYNTAX: VECTORED-STRUCT:
     scan-word define-vectored-struct ;
diff --git a/language/compiler/cfg/dataflow-analysis/dataflow-analysis.factor b/language/compiler/cfg/dataflow-analysis/dataflow-analysis.factor
index aa932e060c..e8741075df 100644
--- a/language/compiler/cfg/dataflow-analysis/dataflow-analysis.factor
+++ b/language/compiler/cfg/dataflow-analysis/dataflow-analysis.factor
@@ -77,7 +77,7 @@ symbol: name-outs
 
 : name-out ( bb -- set ) name-outs get at ;
 
-;FUNCTOR
+FUNCTOR;
 
 ! ! ! Forward dataflow analysis
 
@@ -103,7 +103,7 @@ INSTANCE: name forward-analysis ;
     name run-dataflow-analysis
     [ name-ins set ] [ name-outs set ] bi* ;
 
-;FUNCTOR
+FUNCTOR;
 
 ! ! ! Backward dataflow analysis
 
@@ -129,7 +129,7 @@ INSTANCE: name backward-analysis ;
     \ name run-dataflow-analysis
     [ name-outs set ] [ name-ins set ] bi* ;
 
-;FUNCTOR
+FUNCTOR;
 
 PRIVATE>
 
diff --git a/language/compiler/cfg/renaming/functor/functor.factor b/language/compiler/cfg/renaming/functor/functor.factor
index fe24b436a0..52fd774c58 100644
--- a/language/compiler/cfg/renaming/functor/functor.factor
+++ b/language/compiler/cfg/renaming/functor/functor.factor
@@ -83,6 +83,6 @@ insn-classes get [ insn-temp-slots empty? ] reject [
     define
 ] each
 
-;FUNCTOR
+FUNCTOR;
 
 SYNTAX: RENAMING: scan-token scan-object scan-object scan-object ";" expect define-renaming ;
diff --git a/language/functors/functors-tests.factor b/language/functors/functors-tests.factor
index 799bd54475..48efd0f821 100644
--- a/language/functors/functors-tests.factor
+++ b/language/functors/functors-tests.factor
@@ -16,7 +16,7 @@ TUPLE: B { value T } ;
 
 C: <B> B ( T -- B ) ;
 
-;FUNCTOR
+FUNCTOR;
 
 \ float define-box
 
@@ -38,7 +38,7 @@ WHERE
 
 : WW ( a -- b ) \ W twice ;
 
-;FUNCTOR
+FUNCTOR;
 
 \ sq wrapper-test
 
@@ -56,7 +56,7 @@ WHERE
 
 : W ( a b -- c ) \ + execute ;
 
-;FUNCTOR
+FUNCTOR;
 
 "blah" wrapper-test-2
 
@@ -74,7 +74,7 @@ WHERE
 
 symbol: W
 
-;FUNCTOR
+FUNCTOR;
 
 "blorgh" symbol-test
 
@@ -94,7 +94,7 @@ GENERIC: W ( a -- b ) ;
 M: object W ;
 M: integer W 1 + ;
 
-;FUNCTOR
+FUNCTOR;
 
 "snurv" generic-test
 
@@ -141,7 +141,7 @@ GENERIC: W-generic ( a -- b ) ;
 M: W-tuple W-generic ;
 symbol: W-symbol
 
-;FUNCTOR
+FUNCTOR;
 
 [ [ ] ] [
     "in: functors.tests
@@ -165,7 +165,7 @@ STRUCT: T-class
     { z TYPE initial: 5 }
     { float { c:float 2 } } ;
 
-;FUNCTOR
+FUNCTOR;
 
 "a-struct" "nemo" c:char 2 define-a-struct
 
@@ -223,7 +223,7 @@ WHERE
 : W ( -- ) ; inline
 : W-W ( -- ) W W ;
 
-;FUNCTOR
+FUNCTOR;
 
 "an-inline-word" define-an-inline-word
 
@@ -245,7 +245,7 @@ TUPLE: T ; final
 
 : W ( -- ) ;
 
-;FUNCTOR
+FUNCTOR;
 
 "a-final-tuple" "a-word" define-a-final-class
 
diff --git a/language/functors/functors.factor b/language/functors/functors.factor
index ff72fc3afb..55ca5be4fb 100644
--- a/language/functors/functors.factor
+++ b/language/functors/functors.factor
@@ -153,7 +153,7 @@ SYNTAX: DEFINES-PRIVATE [ begin-private create-word-in end-private ] (INTERPOLAT
 
 SYNTAX: DEFINES-CLASS [ create-class-in ] (INTERPOLATE) ;
 
-defer: ;FUNCTOR delimiter
+defer: FUNCTOR; delimiter
 
 <PRIVATE
 
@@ -175,7 +175,7 @@ defer: ;FUNCTOR delimiter
     functor-words [
         "WHERE" parse-bindings drop
         [ swap <def> suffix ] { } assoc>map concat
-        \ ;FUNCTOR parse-until [ ] append-as
+        \ FUNCTOR; parse-until [ ] append-as
         qualified-vocabs pop* ! unuse the bindings
     ] with-lambda-scope ;
 
diff --git a/language/promises/promises.factor b/language/promises/promises.factor
index e8817b5a9c..d207997835 100644
--- a/language/promises/promises.factor
+++ b/language/promises/promises.factor
@@ -18,5 +18,5 @@ TUPLE: promise quot forced? value ;
 : make-lazy-quot ( quot effect -- quot )
     in>> length '[ _ _ ncurry <promise> ] ;
 
-SYNTAX: LAZY:
+SYNTAX: \ LAZY:
     (:) [ make-lazy-quot ] [ 2nip ] 3bi define-declared ;
diff --git a/language/shuffle/shuffle.factor b/language/shuffle/shuffle.factor
index 8696b2078b..8407999663 100644
--- a/language/shuffle/shuffle.factor
+++ b/language/shuffle/shuffle.factor
@@ -11,7 +11,7 @@ MACRO: shuffle-effect ( effect -- quot )
     [ [ of '[ _ swap nth ] ] with map ] 2bi
     '[ @ _ cleave ] ;
 
-SYNTAX: shuffle(
+SYNTAX: \ shuffle(
     ")" parse-effect suffix! \ shuffle-effect suffix! ;
 
 : tuck ( x y -- y x y ) swap over ; inline deprecated
diff --git a/language/tr/tr.factor b/language/tr/tr.factor
index bce37a107e..eac6465894 100644
--- a/language/tr/tr.factor
+++ b/language/tr/tr.factor
@@ -41,7 +41,7 @@ M: bad-tr summary
 
 PRIVATE>
 
-SYNTAX: TR:
+SYNTAX: \ TR:
     scan-token parse-definition
     unclip-last [ unclip-last ] dip compute-tr
     [ check-tr ]
diff --git a/language/tuple-arrays/tuple-arrays.factor b/language/tuple-arrays/tuple-arrays.factor
index 1b8121074c..87d53e845b 100644
--- a/language/tuple-arrays/tuple-arrays.factor
+++ b/language/tuple-arrays/tuple-arrays.factor
@@ -71,6 +71,6 @@ M: CLASS-array like drop dup CLASS-array? [ >CLASS-array ] unless ; inline
 
 INSTANCE: CLASS-array sequence ;
 
-;FUNCTOR
+FUNCTOR;
 
-SYNTAX: TUPLE-ARRAY: scan-word define-tuple-array ;
+SYNTAX: \ TUPLE-ARRAY: scan-word define-tuple-array ;
diff --git a/libs/annotations/annotations.factor b/libs/annotations/annotations.factor
index 111694e8b2..74e5b0011c 100644
--- a/libs/annotations/annotations.factor
+++ b/libs/annotations/annotations.factor
@@ -31,7 +31,7 @@ SYNTAX: !NAME (parse-annotation) \ (NAME) suffix! ;
 : NAMEs. ( -- )
     NAMEs sorted-definitions. ;
 
-;FUNCTOR
+FUNCTOR;
 
 CONSTANT: annotation-tags {
     "XXX" "TODO" "FIXME" "BUG" "REVIEW" "LICENSE"
diff --git a/libs/math/blas/matrices/matrices.factor b/libs/math/blas/matrices/matrices.factor
index 04b83ed045..169cfb81ad 100644
--- a/libs/math/blas/matrices/matrices.factor
+++ b/libs/math/blas/matrices/matrices.factor
@@ -296,7 +296,7 @@ SYNTAX: XMATRIX{ \ } [ >MATRIX ] parse-literal ;
 M: MATRIX pprint-delims
     drop \ XMATRIX{ \ } ;
 
-;FUNCTOR
+FUNCTOR;
 
 
 : define-real-blas-matrix ( TYPE T -- )
diff --git a/libs/math/blas/vectors/vectors.factor b/libs/math/blas/vectors/vectors.factor
index c4dceffeb2..ae9eed4c29 100644
--- a/libs/math/blas/vectors/vectors.factor
+++ b/libs/math/blas/vectors/vectors.factor
@@ -184,7 +184,7 @@ SYNTAX: XVECTOR{ \ } [ >VECTOR ] parse-literal ;
 M: VECTOR pprint-delims
     drop \ XVECTOR{ \ } ;
 
-;FUNCTOR
+FUNCTOR;
 
 
 FUNCTOR: (define-real-blas-vector) ( TYPE T -- )
@@ -205,7 +205,7 @@ M: VECTOR Vnorm
 M: VECTOR Vasum
     (prepare-nrm2) XASUM ;
 
-;FUNCTOR
+FUNCTOR;
 
 
 FUNCTOR: (define-complex-blas-vector) ( TYPE C S -- )
@@ -227,7 +227,7 @@ M: VECTOR Vnorm
 M: VECTOR Vasum
     (prepare-nrm2) XXASUM ;
 
-;FUNCTOR
+FUNCTOR;
 
 
 : define-real-blas-vector ( TYPE T -- )
diff --git a/libs/math/vectors/simd/cords/cords.factor b/libs/math/vectors/simd/cords/cords.factor
index 2a31b13575..e9bdc39c22 100644
--- a/libs/math/vectors/simd/cords/cords.factor
+++ b/libs/math/vectors/simd/cords/cords.factor
@@ -72,7 +72,7 @@ SYNTAX: A{ \ } [ >A ] parse-literal ;
     A-rep >>rep
 \ A typedef
 
-;FUNCTOR
+FUNCTOR;
 
 : define-simd-128-cord ( A/2 T -- )
     [ define-specialized-cord ]
diff --git a/libs/math/vectors/simd/simd.factor b/libs/math/vectors/simd/simd.factor
index 91fd530a25..09eb8bd3a6 100644
--- a/libs/math/vectors/simd/simd.factor
+++ b/libs/math/vectors/simd/simd.factor
@@ -329,7 +329,7 @@ c:<c-type>
     A-rep >>rep
 \ A c:typedef
 
-;FUNCTOR
+FUNCTOR;
 
 SYNTAX: SIMD-128:
     scan-token define-simd-128 ;
diff --git a/libs/sorting/functor/functor.factor b/libs/sorting/functor/functor.factor
index 969a16100c..f8ad687a8d 100644
--- a/libs/sorting/functor/functor.factor
+++ b/libs/sorting/functor/functor.factor
@@ -13,4 +13,4 @@ WHERE
 : NAME<=> ( obj1 obj2 -- <=> ) QUOT compare ;
 : NAME>=< ( obj1 obj2 -- >=< ) NAME<=> invert-comparison ;
 
-;FUNCTOR
+FUNCTOR;
diff --git a/libs/tokyo/assoc-functor/assoc-functor.factor b/libs/tokyo/assoc-functor/assoc-functor.factor
index 70af3c70b6..ae7f435147 100644
--- a/libs/tokyo/assoc-functor/assoc-functor.factor
+++ b/libs/tokyo/assoc-functor/assoc-functor.factor
@@ -57,4 +57,4 @@ M: TYPE equal? assoc= ;
 
 M: TYPE hashcode* assoc-hashcode ;
 
-;FUNCTOR
+FUNCTOR;
diff --git a/unmaintained/alien/marshall/private/private.factor b/unmaintained/alien/marshall/private/private.factor
index a4555c9ac9..5b57817a10 100644
--- a/unmaintained/alien/marshall/private/private.factor
+++ b/unmaintained/alien/marshall/private/private.factor
@@ -55,7 +55,7 @@ PRIVATE>
     *TYPE ; inline
 : unmarshall-TYPE*-free ( alien -- n )
     [ unmarshall-TYPE* ] keep add-malloc free ;
-;FUNCTOR
+FUNCTOR;
 
 SYNTAX: PRIMITIVE-MARSHALLERS:
 ";" parse-tokens [ define-primitive-marshallers ] each ;
diff --git a/unmaintained/models/combinators/templates/templates.factor b/unmaintained/models/combinators/templates/templates.factor
index 4a872b2698..b062e80e87 100644
--- a/unmaintained/models/combinators/templates/templates.factor
+++ b/unmaintained/models/combinators/templates/templates.factor
@@ -20,4 +20,4 @@ MACRO: w-n* ( int -- quot ) dup '[ [ _ narray <collection> #1 ] dip [ _ firstn ]
 : w-2* ( a b quot -- mapped ) 2 w-n* ; inline
 : w-3* ( a b c quot -- mapped ) 3 w-n* ; inline
 : w-4* ( a b c d quot -- mapped ) 4 w-n* ; inline
-;FUNCTOR
+FUNCTOR;