diff --git a/Changelog.md b/Changelog.md
new file mode 100644
index 0000000..a506866
--- /dev/null
+++ b/Changelog.md
@@ -0,0 +1,4 @@
+# Unreleased
+
+- Add support for treesitter mode.
+- Fix warnings resulting from rust-utils.el. [Fixes #509](https://github.com/rust-lang/rust-mode/issues/509).
diff --git a/rust-utils.el b/rust-utils.el
index cb55172..d93bd0a 100644
--- a/rust-utils.el
+++ b/rust-utils.el
@@ -41,22 +41,22 @@ visit the new file."
 if not. Move cursor to the end of macro."
   (when (rust-in-str)
     (up-list -1 t t))
-  (setq safe-to-forward t)
-  (save-excursion
-    (condition-case nil
-        (forward-sexp)
-      (error (setq safe-to-forward nil)
-             nil)))
-  (cond
-   ((not safe-to-forward)
-    (rust-insert-dbg-alone))
-   (t
-    (insert "(")
-    (forward-sexp)
-    (insert ")")
-    (backward-sexp)
-    (insert "dbg!")
-    (forward-sexp))))
+  (let ((safe-to-forward t))
+    (save-excursion
+      (condition-case nil
+          (forward-sexp)
+        (error (setq safe-to-forward nil)
+               nil)))
+    (cond
+     ((not safe-to-forward)
+      (rust-insert-dbg-alone))
+     (t
+      (insert "(")
+      (forward-sexp)
+      (insert ")")
+      (backward-sexp)
+      (insert "dbg!")
+      (forward-sexp)))))
 
 (defun rust-insert-dbg-region ()
   "Insert the dbg! macro around a region. Move cursor to the end of macro."
@@ -77,9 +77,9 @@ if not. Move cursor to the end of macro."
 (defun rust-dbg-wrap-or-unwrap ()
   "Either remove or add the dbg! macro."
   (interactive)
-  
+
   (cond
-   
+
    ;; region
    ((region-active-p)
     (rust-insert-dbg-region))
@@ -106,7 +106,7 @@ if not. Move cursor to the end of macro."
              (delete-pair))
             (t (rust-insert-dbg-sexp)))))
    )
-)
+  )
 
 (defun rust-toggle-mutability ()
   "Toggles the mutability of the variable defined on the current line"