diff --git a/slime-tests.el b/../slime-2.19/slime-tests.el
index c0aa11b..87f81f1 100644
--- a/slime-tests.el
+++ b/slime-tests.el
@@ -553,7 +553,7 @@ confronted with nasty #.-fu."
         (slime-check "Definition now at point." (looking-at snippet))))))
 
 (def-slime-test (find-definition.3
+                 (:fails-for "abcl" "allegro" "clisp" "lispworks" 
-                 (:fails-for "abcl" "allegro" "clisp" "lispworks" "sbcl"
                              "ecl"))
     (name source regexp)
     "Extra tests for defstruct."

diff --git a/../slime-2.19/slime-tests.el b/slime-tests.el
index b572966..800f206 100644
--- a/slime-tests.el
+++ b/slime-tests.el
@@ -483,8 +483,6 @@ after quitting Slime's temp buffer."
     '(("start-server" "SWANK" "(defun start-server ")
       ("swank::start-server" "CL-USER" "(defun start-server ")
       ("swank:start-server" "CL-USER" "(defun start-server ")
-      ("swank::connection" "CL-USER" "(defstruct (connection")
-      ("swank::*emacs-connection*" "CL-USER" "(defvar \\*emacs-connection\\*")
       )
   (switch-to-buffer "*scratch*")        ; not buffer of definition
   (slime-check-top-level)


diff --git a/../slime-2.19/contrib/swank-sbcl-exts.lisp b/contrib/swank-sbcl-exts.lisp
index 29235cd..5a0cf89 100644
--- a/contrib/swank-sbcl-exts.lisp
+++ b/contrib/swank-sbcl-exts.lisp
@@ -37,6 +37,9 @@
                      (symbol
                       (string-downcase instruction))))
                  (instr-fn
+                   #+#.(swank/backend:with-symbol 'op-encoder-name 'sb-assem)
+		   (or (sb-assem::op-encoder-name instr-name)
+		       (sb-assem::op-encoder-name (string-upcase instr-name)))
                    #+#.(swank/backend:with-symbol 'inst-emitter-symbol 'sb-assem)
                    (sb-assem::inst-emitter-symbol instr-name)
                    #+(and