diff --git a/basis/compiler/tests/redefine13.factor b/basis/compiler/tests/redefine13.factor
index 1befdd5b5d..656881ddc9 100644
--- a/basis/compiler/tests/redefine13.factor
+++ b/basis/compiler/tests/redefine13.factor
@@ -3,7 +3,7 @@ IN: compiler.tests.redefine13
 
 : breakage-word ( a b -- c ) + ;
 
-<< MACRO: breakage-macro ( a -- ) '[ _ breakage-word ] ; >>
+<< MACRO: breakage-macro ( a -- quot ) '[ _ breakage-word ] ; >>
 
 GENERIC: breakage-caller ( a -- c )
 
diff --git a/basis/cpu/x86/sse/sse.factor b/basis/cpu/x86/sse/sse.factor
index facc8fe276..4379bfa6f6 100644
--- a/basis/cpu/x86/sse/sse.factor
+++ b/basis/cpu/x86/sse/sse.factor
@@ -54,7 +54,7 @@ M: float-4-rep copy-register* drop MOVAPS ;
 M: double-2-rep copy-register* drop MOVAPS ;
 M: vector-rep copy-register* drop MOVDQA ;
 
-MACRO: available-reps ( alist -- )
+MACRO: available-reps ( alist -- quot )
     ! Each SSE version adds new representations and supports
     ! all old ones
     unzip { } [ append ] accumulate rest swap suffix
diff --git a/basis/formatting/formatting.factor b/basis/formatting/formatting.factor
index 708480aed4..f36b042622 100644
--- a/basis/formatting/formatting.factor
+++ b/basis/formatting/formatting.factor
@@ -107,7 +107,7 @@ MACRO: printf ( format-string -- quot )
         @ output-stream get [ stream-write ] curry _ napply
     ] ;
 
-MACRO: sprintf ( format-string -- result )
+MACRO: sprintf ( format-string -- quot )
     printf-quot '[
         @ _ "" nappend-as
     ] ;
diff --git a/basis/game/input/xinput/xinput.factor b/basis/game/input/xinput/xinput.factor
index c51ec1e098..6a38f96e2f 100644
--- a/basis/game/input/xinput/xinput.factor
+++ b/basis/game/input/xinput/xinput.factor
@@ -15,7 +15,7 @@ xinput-game-input-backend game-input-backend set-global
     255 /f ; inline
 : >vibration ( float -- short )
     65535 * >fixnum 0 65535 clamp ; inline
-MACRO: map-index-compose ( seq quot -- seq )
+MACRO: map-index-compose ( seq quot -- quot' )
     '[ '[ _ execute _ ] _ compose ] map-index 1quotation ;
 
 : fill-buttons ( button-bitmap -- button-array )
diff --git a/basis/inverse/inverse.factor b/basis/inverse/inverse.factor
index 21a4df0f84..896b0d920a 100644
--- a/basis/inverse/inverse.factor
+++ b/basis/inverse/inverse.factor
@@ -281,7 +281,7 @@ DEFER: __
 : [matches?] ( quot -- undoes?-quot )
     [undo] dup infer [ true-out ] [ false-recover ] bi curry ;
 
-MACRO: matches? ( quot -- ? ) [matches?] ;
+MACRO: matches? ( quot -- quot' ) [matches?] ;
 
 ERROR: no-match ;
 M: no-match summary drop "Fall through in switch" ;
diff --git a/basis/windows/com/syntax/syntax.factor b/basis/windows/com/syntax/syntax.factor
index 668c1871d3..79d5c5db8a 100755
--- a/basis/windows/com/syntax/syntax.factor
+++ b/basis/windows/com/syntax/syntax.factor
@@ -8,7 +8,7 @@ IN: windows.com.syntax
 
 <PRIVATE
 
-MACRO: com-invoke ( n return parameters -- )
+MACRO: com-invoke ( n return parameters -- quot )
     [ 2nip length ] 3keep
     '[
         _ npick void* deref _ cell * alien-cell _ _
diff --git a/basis/xml/data/data.factor b/basis/xml/data/data.factor
index 27f2d5a00f..ef20d8045f 100644
--- a/basis/xml/data/data.factor
+++ b/basis/xml/data/data.factor
@@ -169,7 +169,7 @@ M: tag like
         rot dup [ V{ } like ] when <tag>
     ] if ;
 
-MACRO: clone-slots ( class -- tuple )
+MACRO: clone-slots ( class -- quot )
     [
         "slots" word-prop
         [ name>> reader-word '[ _ execute clone ] ] map
diff --git a/extra/rosetta-code/probabilistic-choice/probabilistic-choice.factor b/extra/rosetta-code/probabilistic-choice/probabilistic-choice.factor
index cee4003bbd..4a3248d4be 100644
--- a/extra/rosetta-code/probabilistic-choice/probabilistic-choice.factor
+++ b/extra/rosetta-code/probabilistic-choice/probabilistic-choice.factor
@@ -37,7 +37,7 @@ CONSTANT: data
     { "heth"    f }
 }
 
-MACRO: case-probas ( data -- case-probas )
+MACRO: case-probas ( data -- quot )
     [ first2 [ swap 1quotation 2array ] [ 1quotation ] if* ] map 1quotation ;
 
 : expected ( name data -- float )