diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/filter-rep.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/filter-rep.rkt
index 0fb4e229..368aaf25 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/filter-rep.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/filter-rep.rkt
@@ -1,7 +1,11 @@
 #lang racket/base
 
 ;;TODO use contract-req
-(require "rep-utils.rkt" "free-variance.rkt" racket/contract/base)
+(require "rep-utils.rkt" "free-variance.rkt" racket/contract/base
+         racket/lazy-require)
+
+;; TODO use something other than lazy-require.
+(lazy-require ["type-rep.rkt" (Type/c Univ? Bottom?)])
 
 (provide Filter/c FilterSet/c name-ref/c hash-name filter-equal?)
 
@@ -20,17 +24,19 @@
 (define name-ref/c (or/c identifier? (list/c integer? integer?)))
 (define (hash-name v) (if (identifier? v) (hash-id v) (list v)))
 
+(define ((length>=/c len) l)
+  (and (list? l)
+       (>= (length l) len)))
+
 (def-filter Bot () [#:fold-rhs #:base])
 (def-filter Top () [#:fold-rhs #:base])
 
-;; TODO: t should only be a Type/c, but that leads to circular dependencies
-(def-filter TypeFilter ([t Type?] [p (listof PathElem?)] [v name-ref/c])
+(def-filter TypeFilter ([t (and/c Type/c (not/c Univ?) (not/c Bottom?))] [p (listof PathElem?)] [v name-ref/c])
   [#:intern (list (Rep-seq t) (map Rep-seq p) (hash-name v))]
   [#:frees (λ (f) (combine-frees (map f (cons t p))))]
   [#:fold-rhs (*TypeFilter (type-rec-id t) (map pathelem-rec-id p) v)])
 
-;; TODO: t should only be a Type/c, but that leads to circular dependencies
-(def-filter NotTypeFilter ([t Type?] [p (listof PathElem?)] [v name-ref/c])
+(def-filter NotTypeFilter ([t (and/c Type/c (not/c Univ?) (not/c Bottom?))] [p (listof PathElem?)] [v name-ref/c])
   [#:intern (list (Rep-seq t) (map Rep-seq p) (hash-name v))]
   [#:frees (λ (f) (combine-frees (map f (cons t p))))]
   [#:fold-rhs (*NotTypeFilter (type-rec-id t) (map pathelem-rec-id p) v)])
@@ -38,12 +44,14 @@
 ;; implication
 (def-filter ImpFilter ([a Filter/c] [c Filter/c]))
 
-(def-filter AndFilter ([fs (non-empty-listof Filter/c)])
-  [#:fold-rhs (*AndFilter (map filter-rec-id fs))]
+(def-filter OrFilter ([fs (and/c (length>=/c 2)
+                                 (listof (or/c TypeFilter? NotTypeFilter? ImpFilter?)))])
+  [#:fold-rhs (*OrFilter (map filter-rec-id fs))]
   [#:frees (λ (f) (combine-frees (map f fs)))])
 
-(def-filter OrFilter ([fs (non-empty-listof Filter/c)])
-  [#:fold-rhs (*OrFilter (map filter-rec-id fs))]
+(def-filter AndFilter ([fs (and/c (length>=/c 2)
+                                  (listof (or/c OrFilter? TypeFilter? NotTypeFilter? ImpFilter?)))])
+  [#:fold-rhs (*AndFilter (map filter-rec-id fs))]
   [#:frees (λ (f) (combine-frees (map f fs)))])
 
 (def-filter FilterSet ([thn Filter/c] [els Filter/c])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/type-rep.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/type-rep.rkt
index b3da4724..53e5830d 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/type-rep.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/type-rep.rkt
@@ -24,6 +24,7 @@
          Filter? Object?
          Type/c Type/c?
          Values/c SomeValues/c
+         Bottom?
          Poly-n
          PolyDots-n
          Class? Row? Row:
@@ -80,6 +81,10 @@
 
 (define Type/c (flat-named-contract 'Type Type/c?))
 (define Values/c (flat-named-contract 'Values Values/c?))
+(define Bottom?
+  (match-lambda
+    [(Union: (list)) #t]
+    [else #f]))
 
 ;; Name = Symbol