diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bind.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bind.rkt
index 0d19da6d..7686510c 100644
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bind.rkt
+++ b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bind.rkt
@@ -93,7 +93,7 @@
     (define (gen defn?)
       (if sig
           (*sig-elem #:defn? defn? (sig-id sig) name)
-          (annote-exporting-library
+          ((if defn? annote-exporting-library values)
            (to-element #:defn? defn? (make-just-context name stx-id)))))
     (values (gen #t) (gen #f))))
 
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-class.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-class.rkt
index 9586f350..d26f986c 100644
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-class.rkt
+++ b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-class.rkt
@@ -197,8 +197,7 @@
           (list (let ([target-maker (id-to-target-maker stx-id #t)]
                       [content (annote-exporting-library
                                 (to-element #:defn? #t stx-id))]
-                      [ref-content (annote-exporting-library
-                                    (to-element stx-id))])
+                      [ref-content (to-element stx-id)])
                   (if target-maker
                       (target-maker
                        content
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-proc.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-proc.rkt
index 95b05068..e28c2f63 100644
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-proc.rkt
+++ b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-proc.rkt
@@ -708,7 +708,7 @@
                            (if link?
                                (let ()
                                  (define (gen defn?)
-                                   (annote-exporting-library
+                                   ((if defn? annote-exporting-library values)
                                     (to-element #:defn? defn? name-id)))
                                  (define content (gen #t))
                                  (define ref-content (gen #f))