diff --git a/collects/typed-scheme/rep/free-variance.ss b/collects/typed-scheme/rep/free-variance.ss
index 6b87ae63..7a210bc7 100644
--- a/collects/typed-scheme/rep/free-variance.ss
+++ b/collects/typed-scheme/rep/free-variance.ss
@@ -32,17 +32,17 @@
 
 (define ((input/c tbl) val) (hash-ref tbl val #f))
 
-(define (free-idxs* t)
+#;
+(define (free-idxs* t) #;(Type-free-idxs t)
+  
   (hash-ref index-table t (lambda _ (int-err "type ~a not in index-table" t))))
-(define (free-vars* t)
+#;
+(define (free-vars* t) #;(Type-free-vars t)
   (hash-ref var-table t (lambda _ (int-err "type ~a not in var-table" t))))
 
 (define empty-hash-table (make-immutable-hasheq null))
 
-(p/c [free-vars* (-> (input/c var-table) (hash/c symbol? variance?))]
-     [free-idxs* (-> (input/c index-table) (hash/c exact-nonnegative-integer? variance?))])
-
-(provide empty-hash-table make-invariant)
+(provide empty-hash-table make-invariant input/c variance?)
 
 ;; frees = HT[Idx,Variance] where Idx is either Symbol or Number
 ;; (listof frees) -> frees
diff --git a/collects/typed-scheme/rep/rep-utils.ss b/collects/typed-scheme/rep/rep-utils.ss
index 85a933e6..cf203fc8 100644
--- a/collects/typed-scheme/rep/rep-utils.ss
+++ b/collects/typed-scheme/rep/rep-utils.ss
@@ -25,8 +25,12 @@
 
 (provide == defintern hash-id (for-syntax fold-target))
 
+(define-struct Rep (seq
+                    free-vars  
+                    free-idxs))
+
 (define-for-syntax fold-target #'fold-target)
-(define-for-syntax default-fields (list #'seq #;#;#'free-vars #'free-idxs))
+(define-for-syntax default-fields (list #'seq #'free-vars #'free-idxs))
 
 (define-for-syntax (mk par ht-stx key?)
   (define-syntax-class opt-cnt-id
@@ -57,10 +61,9 @@
              #:with f2 #'empty-hash-table
              #:with def #'(begin))
     (pattern e:expr
-             #:with id (generate-temporary)
-             #:with def #'(define id e)
-             #:with f1 #'(id free-vars*)
-             #:with f2 #'(id free-idxs*)))
+             #:with def #'(begin)
+             #:with f1 #'(e Rep-free-vars)
+             #:with f2 #'(e Rep-free-idxs)))
   (define-syntax-class (fold-pat fold-name)
     #:transparent
     #:attributes (e proc)
@@ -79,13 +82,13 @@
              #:with ex (format-id #'nm "~a:" #'nm)
              #:with fold (format-id #f "~a-fold" #'nm)
              #:with kw (string->keyword (symbol->string (syntax-e #'nm)))
-             #:with *maker (format-id #'nm "*~a" #'nm)
-             #:with **maker (format-id #'nm "**~a" #'nm)))
+             #:with *maker (format-id #'nm "*~a" #'nm)))
   (lambda (stx)          
     (syntax-parse stx 
       [(dform nm:form-nm flds:idlist (~or 
                                       (~optional (~and (~fail #:unless key? "#:key not allowed")
-                                                       [#:key key-expr:expr]))
+                                                       [#:key key-expr:expr])
+                                                 #:defaults ([key-expr #'#f]))
                                       (~optional [#:intern intern?:expr]
                                                  #:defaults
                                                  ([intern? (syntax-parse #'flds.fs
@@ -95,8 +98,8 @@
                                       (~optional [#:frees frees:frees-pat]
                                                  #:defaults 
                                                  ([frees.def #'(begin)]
-                                                  [frees.f1 (combiner #'free-vars* #'flds.fs)]
-                                                  [frees.f2 (combiner #'free-idxs* #'flds.fs)]))
+                                                  [frees.f1 (combiner #'Rep-free-vars #'flds.fs)]
+                                                  [frees.f2 (combiner #'Rep-free-idxs #'flds.fs)]))
                                       (~optional [#:fold-rhs (~var fold-rhs (fold-pat #'nm.fold))]
                                                  #:defaults
                                                  ([fold-rhs.proc
@@ -108,35 +111,13 @@
                                       (~optional no-provide?:no-provide-kw)) ...)
        (with-syntax* 
         ([(s:ty maker pred acc ...) (build-struct-names #'nm (syntax->list #'flds.fs) #f #t #'nm)]
-         [*maker-cnt (if enable-contracts?
-                         (or (attribute cnt) #'(flds.cnt ... . -> . pred))
-                         #'any/c)]
+         [*maker-cnt (or (attribute cnt) #'(flds.cnt ... . -> . pred))]
          [provides (if (attribute no-provide?)
                        #'(begin)                                 
                        #`(begin 
                            (provide nm.ex pred acc ...)
                            (p/c (rename nm.*maker maker *maker-cnt))))]
-         [intern 
-          (let ([mk (lambda (int) 
-		      (if key? 
-			  #`(defintern (nm.**maker . flds.fs) maker #,int 
-                              #:extra-args #,(attribute key-expr))
-			  #`(defintern (nm.**maker . flds.fs) maker #,int
-                              #:extra-args)))])
-            (mk #'intern?))]
-         [(ign-pats ...) (append (map (lambda (x) #'_) default-fields) (if key? (list #'_) (list)))]
-         [frees 
-            (quasisyntax/loc stx
-		(w/c nm ([nm.*maker *maker-cnt])
-                     #,(syntax/loc #'nm
-                         (define (nm.*maker . flds.fs)
-                           (define v (nm.**maker . flds.fs))
-                           frees.def
-                           (unless-in-table 
-                            var-table v
-                            (hash-set! var-table v frees.f1)
-                            (hash-set! index-table v frees.f2))
-                           v))))])
+         [(ign-pats ...) (append (map (lambda (x) #'_) default-fields) (if key? (list #'_) (list)))])
         #`(begin
             (define-struct (nm #,par) flds.fs #:inspector #f)
             (define-match-expander nm.ex
@@ -147,10 +128,15 @@
                    (syntax/loc s (struct nm pat))])))
             (begin-for-syntax
               (hash-set! #,ht-stx 'nm.kw (list #'nm.ex #'flds.fs fold-rhs.proc #f)))
-            (w/c nm ()
-		 intern
-		 frees)
-	    provides))])))
+            #,(quasisyntax/loc stx
+                (w/c nm ([nm.*maker *maker-cnt])
+                     #,(quasisyntax/loc #'nm
+                         (defintern (nm.*maker . flds.fs) maker intern?
+                           #:extra-args
+                           frees.f1 frees.f2 
+                           #,@(begin                                 
+                                (if key? (list #'key-expr) null))))))
+            provides))])))
 
 (define-for-syntax (mk-fold ht type-rec-id rec-ids kws)
   (lambda (stx)
@@ -214,9 +200,9 @@
     #:transparent
     (pattern [i:id (~optional (~and #:key
                                     (~bind [key? #'#t]
-                                           [(fld-names 1) (append default-fields (list #'key))]))
+                                           [(fld-names 1) (list #'key)]))
                               #:defaults ([key? #'#f]
-                                          [(fld-names 1) default-fields]))
+                                          [(fld-names 1) null]))
                    #:d d-id:id]))
   (define-syntax-class type-name
     #:transparent
@@ -239,7 +225,7 @@
                   (for-syntax i.ht ... i.rec-id ...))
          (define-syntax i.d-id (mk #'i.name #'i.ht i.key?)) ...
          (define-for-syntax i.ht (make-hasheq)) ...
-         (define-struct/printer i.name (i.fld-names ...) (lambda (a b c) ((unbox i.printer) a b c))) ...
+         (define-struct/printer (i.name Rep) (i.fld-names ...) (lambda (a b c) ((unbox i.printer) a b c))) ...
          (define-for-syntax i.rec-id #'i.rec-id) ...   
          (provide i.case ...)           
          (define-syntaxes (i.case ...)
@@ -260,4 +246,10 @@
                 [LatentObject #:d dlo]
                 [PathElem #:d dpe])
 
-(provide PathElem?)
\ No newline at end of file
+(provide PathElem? (rename-out [Rep-seq Type-seq]
+                               [Rep-free-vars free-vars*]
+                               [Rep-free-idxs free-idxs*]))
+
+(p/c (struct Rep ([seq integer?] 
+                  [free-vars (hash/c symbol? variance?)] 
+                  [free-idxs (hash/c exact-nonnegative-integer? variance?)])))
diff --git a/collects/typed-scheme/rep/type-rep.ss b/collects/typed-scheme/rep/type-rep.ss
index 5db6f744..f260109e 100644
--- a/collects/typed-scheme/rep/type-rep.ss
+++ b/collects/typed-scheme/rep/type-rep.ss
@@ -234,7 +234,7 @@
                                          (for/fold ([sorted? #t]
                                                     [last -1])
                                            ([e es])
-                                           (let ([seq (Type-seq e)])
+                                           (let ([seq (Rep-seq e)])
                                              (values
                                               (and sorted?
                                                    (< last seq))
diff --git a/collects/typed-scheme/utils/utils.ss b/collects/typed-scheme/utils/utils.ss
index 766ba3c2..7706c327 100644
--- a/collects/typed-scheme/utils/utils.ss
+++ b/collects/typed-scheme/utils/utils.ss
@@ -150,13 +150,14 @@ at least theoretically.
 (define custom-printer (make-parameter #t))
   
 (define-syntax (define-struct/printer stx)
-  (syntax-case stx ()
-    [(form name (flds ...) printer)
-     #`(define-struct/properties name (flds ...) 
-         #,(if printing?
-               #'([prop:custom-write (lambda (a b c) (if (custom-printer) (printer a b c) (pseudo-printer a b c)))]) 
-               #'([prop:custom-write pseudo-printer]))
-         #f)]))
+  (syntax-parse stx
+    [(form name (flds ...) printer:expr)
+     #`(define-struct name (flds ...) 
+         #:property prop:custom-write 
+         #,(if printing? 
+               #'(lambda (a b c) (if (custom-printer) (printer a b c) (pseudo-printer a b c)))
+               #'pseudo-printer)
+         #:inspector #f)]))
 
 
 ;; turn contracts on and off - off by default for performance.