 ;;
 
 
-(defn match? [midje-classification actual expected looseness]
-  (let [comparison (compare-results midje-classification actual expected looseness)]
+(defn match? [actual expected looseness]
+  (let [comparison (compare-results (midje-classification actual) actual expected looseness)]
     (or (total-match? comparison)
         (apply noted-falsehood
-               (cons (best-actual-match midje-classification comparison)
-                     (best-expected-match midje-classification comparison expected))))))
-
-
-(defn- actual-x-contains? [actual expected looseness]
-  (match? (midje-classification actual) actual expected looseness))
-
-(defn- add-actual [actual result]
-  (if (chatty-checker-falsehood? result)
-    (merge result {:actual actual})
-    result))
-  
-
+               (cons (best-actual-match (midje-classification actual) comparison)
+                     (best-expected-match (midje-classification actual) comparison expected))))))
+
+ ;; The interface
 
 (defn- container-checker-maker [name checker-fn]

              (try-re expected actual re-find)
                 
              :else
              (apply actual-x-contains? [actual expected looseness]))))))

(def just (container-checker-maker 'just
    (fn [actual expected looseness]

              (try-re expected actual re-matches)
            
              (same-lengths? actual expected)
              (match? actual expected looseness)

              :else
              (tag-as-chatty-falsehood
