diff --git a/.gitignore b/.gitignore
index 016d3b1..769ff00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-*.elc
\ No newline at end of file
+*.elc
+/benchmarks/profile.txt
\ No newline at end of file
diff --git a/phpinspect-bmap.el b/phpinspect-bmap.el
index a155e69..732027b 100644
--- a/phpinspect-bmap.el
+++ b/phpinspect-bmap.el
@@ -74,10 +74,10 @@
        (<= (phpinspect-region-start reg) point)))
 
 (defsubst phpinspect-region-overlaps (reg1 reg2)
-  (or (phpinspect-region-reg2s-point reg1 (phpinspect-region-start reg2))
-      (phpinspect-region-reg2s-point reg1 (- (phpinspect-region-end reg2) 1))
-      (phpinspect-region-reg2s-point reg2 (phpinspect-region-start reg1))
-      (phpinspect-region-reg2s-point reg2 (- (phpinspect-region-end reg1) 1))))
+  (or (phpinspect-region-overlaps-point reg1 (phpinspect-region-start reg2))
+      (phpinspect-region-overlaps-point reg1 (- (phpinspect-region-end reg2) 1))
+      (phpinspect-region-overlaps-point reg2 (phpinspect-region-start reg1))
+      (phpinspect-region-overlaps-point reg2 (- (phpinspect-region-end reg1) 1))))
 
 (defsubst phpinspect-region-encloses (reg1 reg2)
   (and (<= (phpinspect-region-start reg1) (phpinspect-region-start reg2))
@@ -109,6 +109,7 @@
         (region-start (gensym))
         (region-end (gensym)))
     `(let ((,bmap)
+           ,(when (symbolp place) place)
            (,bmap-stack (list ,(cadr place-and-bmap)))
            (,region-start (car ,region))
            (,region-end (cadr ,region)))
@@ -124,10 +125,7 @@
   (declare (indent defun))
   (let ((place (car place-and-bmap))
         (bmap (gensym))
-        (bmap-stack (gensym))
-        (_ignored (gensym))
-        (overlay-start (gensym))
-        (overlay-end (gensym)))
+        (_ignored (gensym)))
     `(let ((,bmap ,(cadr place-and-bmap)))
        (maphash (lambda (,_ignored ,place)
                   ,@body
diff --git a/phpinspect-edtrack.el b/phpinspect-edtrack.el
index d60c4b4..78fc722 100644
--- a/phpinspect-edtrack.el
+++ b/phpinspect-edtrack.el
@@ -66,7 +66,6 @@
 
 (defsubst phpinspect-edit-end (edit)
   (let ((end (or (caar edit) 0))
-        (delta 0)
         (previous-edit (cdr edit)))
     (+ end (phpinspect-edit-delta previous-edit))))
 
diff --git a/phpinspect-meta.el b/phpinspect-meta.el
index f1c877a..2ba41ba 100644
--- a/phpinspect-meta.el
+++ b/phpinspect-meta.el
@@ -136,7 +136,7 @@
 (cl-defmethod phpinspect-meta-find-overlapping-child ((meta (head meta)) (point integer))
   (let ((child (phpinspect-splayt-find-largest-before
                 (phpinspect-meta-children meta) (phpinspect-meta--point-offset meta point))))
-    (when (and child (phpinspect-meta-overlaps-point point))
+    (when (and child (phpinspect-meta-overlaps-point child point))
       child)))
 
 (cl-defmethod phpinspect-meta-find-overlapping-children ((meta (head meta)) (point integer))
diff --git a/phpinspect-project.el b/phpinspect-project.el
index 723a218..68312b2 100644
--- a/phpinspect-project.el
+++ b/phpinspect-project.el
@@ -233,9 +233,7 @@ before the search is executed."
 
   (condition-case error
       (let* ((file (phpinspect-project-get-type-filepath project type))
-             (visited-buffer (when file (find-buffer-visiting file)))
-             (new-index)
-             (class-index))
+             (visited-buffer (when file (find-buffer-visiting file))))
         (when file
           (if visited-buffer
               (with-current-buffer visited-buffer (phpinspect-index-current-buffer))
diff --git a/phpinspect-resolvecontext.el b/phpinspect-resolvecontext.el
index 0363686..9c5ec4e 100644
--- a/phpinspect-resolvecontext.el
+++ b/phpinspect-resolvecontext.el
@@ -106,8 +106,7 @@
          ;; When there are no enclosing tokens, point is probably at the absolute
          ;; end of the buffer, so we find the last child before point.
          (subject (phpinspect-bmap-last-token-before-point bmap point))
-         (subject-token)
-         (siblings))
+         (subject-token))
     (phpinspect--log "Last token before point: %s, right siblings: %s, parent: %s"
                      (phpinspect-meta-string subject)
                      (mapcar #'phpinspect-meta-token (phpinspect-meta-right-siblings subject))
diff --git a/phpinspect-splayt.el b/phpinspect-splayt.el
index 4d6ddc3..76d7668 100644
--- a/phpinspect-splayt.el
+++ b/phpinspect-splayt.el
@@ -244,6 +244,7 @@ apeared to be a little more performant than using `let'."
             (,queue-sym (when ,node-sym
                           (list ,node-sym)))
             (,reverse-sym t)
+            ,current-sym
             ,size-sym
             ,stack-sym
             ,(if (symbolp place) place (gensym)))
diff --git a/phpinspect-suggest.el b/phpinspect-suggest.el
index 6e42da9..98c653c 100644
--- a/phpinspect-suggest.el
+++ b/phpinspect-suggest.el
@@ -95,7 +95,7 @@ more recent"
         (phpinspect--log "Failed to find methods for class %s :(" class))
       methods))
 
-(defun phpinspect--get-variables-for-class (buffer-classes class-name &optional static)
+(defun phpinspect--get-variables-for-class (class-name &optional static)
   (let ((class (phpinspect-get-or-create-cached-project-class
                 (phpinspect-current-project-root)
                 class-name)))
@@ -132,7 +132,6 @@ static variables and static methods."
       (when statement-type
         (let ((type (funcall type-resolver statement-type)))
           (append (phpinspect--get-variables-for-class
-                   buffer-classes
                    type
                    static)
                   (funcall method-lister type)))))))