diff --git a/collects/racket/private/class-internal.rkt b/collects/racket/private/class-internal.rkt
index 239d11374c..6f62ad3e57 100644
--- a/collects/racket/private/class-internal.rkt
+++ b/collects/racket/private/class-internal.rkt
@@ -3793,10 +3793,8 @@
                      (generate-temporaries (syntax (1 2 3)))])
         (quasisyntax/loc stx
           (let*-values ([(sym) (quasiquote (unsyntax (localize name)))]
-                        [(method receiver)
-                         (find-method/who '(unsyntax form)
-                                          (unsyntax obj)
-                                          sym)])
+                        [(receiver) (unsyntax obj)]
+                        [(method) (find-method/who '(unsyntax form) receiver sym)])
             (unsyntax
              (make-method-call
               traced?
@@ -3862,16 +3860,14 @@
 ;; find-method/who : symbol[top-level-form/proc-name]
 ;;                   any[object] 
 ;;                   symbol[method-name] 
-;;               -> (values method-proc object)
-;; returns the method's procedure and the object.  If the object is a contract
-;; wrapped one and the original class was a primitive one, then the method
-;; will automatically unwrap both the object and any wrapped arguments on entry.
+;;               -> method-proc
+;; returns the method's procedure
 (define (find-method/who who in-object name)
   (let ([cls (object-ref in-object #f)])
     (if cls
         (let ([pos (hash-ref (class-method-ht cls) name #f)])
           (if pos
-              (values (vector-ref (class-methods cls) pos) in-object)
+              (vector-ref (class-methods cls) pos)
               (obj-error who "no such method: ~a~a"
                          name
                          (for-class (class-name cls)))))
@@ -3929,8 +3925,7 @@
                        (string->symbol (format "generic:~a~a" name (for-intf (interface-name intf))))
                        (format "instance~a" (for-intf (interface-name intf)))
                        obj))
-                    (let-values ([(mth ths) (find-method/who 'make-generic obj name)])
-                      mth)))
+                    (find-method/who 'make-generic obj name)))
                 (let* ([pos (hash-ref (class-method-ht class) name
                                       (lambda ()
                                         (obj-error 'make-generic "no such method: ~a~a"
@@ -4168,7 +4163,8 @@
                            [trace-flag (if traced? (syntax/loc stx #t) (syntax/loc stx #f))])
                (syntax/loc stx (let-values ([(method method-obj)
                                              (let ([obj obj-expr])
-                                               (find-method/who 'with-method obj `name))]
+                                               (values (find-method/who 'with-method obj `name)
+                                                       obj))]
                                             ...)
                                  (letrec-syntaxes+values ([(id) (make-with-method-map
                                                                  trace-flag
diff --git a/collects/typed-scheme/typecheck/tc-expr-unit.rkt b/collects/typed-scheme/typecheck/tc-expr-unit.rkt
index 62a7c86aa5..04bd53d339 100644
--- a/collects/typed-scheme/typecheck/tc-expr-unit.rkt
+++ b/collects/typed-scheme/typecheck/tc-expr-unit.rkt
@@ -304,8 +304,9 @@
          (tc/lambda/check form #'(formals ...) #'(body ...) expected)]
         ;; send
         [(let-values (((_) meth))
-           (let-values (((_ _) (~and find-app (#%plain-app find-method/who _ rcvr _))))
-             (#%plain-app _ _ args ...)))
+           (let-values (((_) rcvr))
+             (let-values (((_) (~and find-app (#%plain-app find-method/who _ _ _))))
+               (#%plain-app _ _ args ...))))
          (tc/send #'find-app #'rcvr #'meth #'(args ...) expected)]
         ;; let
         [(let-values ([(name ...) expr] ...) . body)
@@ -367,8 +368,9 @@
        (tc/lambda form #'(formals ...) #'(body ...))]
       ;; send
       [(let-values (((_) meth))
-         (let-values (((_ _) (~and find-app (#%plain-app find-method/who _ rcvr _))))
-           (#%plain-app _ _ args ...)))
+         (let-values (((_) rcvr))
+           (let-values (((_) (~and find-app (#%plain-app find-method/who _ _ _))))
+             (#%plain-app _ _ args ...))))
        (tc/send #'find-app #'rcvr #'meth #'(args ...))]
       ;; let
       [(let-values ([(name ...) expr] ...) . body)