diff --git a/collects/compiler/zo-marshal.rkt b/collects/compiler/zo-marshal.rkt
index 872afea1b1..a34d4c6445 100644
--- a/collects/compiler/zo-marshal.rkt
+++ b/collects/compiler/zo-marshal.rkt
@@ -425,13 +425,17 @@
 (define (or-pred? v . ps)
   (ormap (lambda (?) (? v)) ps))
 
+
+(define quoting? (make-parameter #f))
+
 (define (shareable? v)
-  (not (or-pred? v char? maybe-same-as-fixnum? empty? boolean? void?)))
+  (not (or quoting? (or-pred? v char? maybe-same-as-fixnum? empty? boolean? void?))))
 
 (define (maybe-same-as-fixnum? v)
   (and (exact-integer? v)
        (and (v . >= . -1073741824) (v . <= . 1073741823))))
 
+
 (define (out-anything v out)
   (out-shared 
    v out
@@ -771,7 +775,8 @@
        [else
         (out-byte CPT_QUOTE out)
         (if (quoted? v)
-            (out-anything (quoted-v v) out)
+            (parameterize ([quoting? #t])
+              (out-anything (quoted-v v) out))
             (let ([s (open-output-bytes)])
               (parameterize ([pretty-print-size-hook
                               (lambda (v mode port)
diff --git a/collects/compiler/zo-structs.rkt b/collects/compiler/zo-structs.rkt
index 509a2dc7d5..cbb987a5fa 100644
--- a/collects/compiler/zo-structs.rkt
+++ b/collects/compiler/zo-structs.rkt
@@ -22,7 +22,7 @@
 
 (define-syntax-rule (define-form-struct* id id+par ([field-id field-contract] ...))
   (begin
-    (define-struct id+par (field-id ...) #:prefab)
+    (define-struct id+par (field-id ...))
     #;(provide (struct-out id))
     (provide/contract
      [struct id ([field-id field-contract] ...)])))