diff --git a/core/core-defuns.el b/core/core-defuns.el
index dc5e0fa25..951487ebc 100644
--- a/core/core-defuns.el
+++ b/core/core-defuns.el
@@ -126,8 +126,7 @@ Examples:
                        ("e" . emacs)
                        ("o" . operator)
                        ("m" . motion)
-                       ("r" . replace)
-                       ("I" . iedit))))
+                       ("r" . replace))))
       (unless keymaps
         (setq keymaps default-keymaps))
       (while rest
@@ -178,12 +177,9 @@ Examples:
                       out-forms)
                   (dolist (keymap keymaps)
                     (if (not states)
-                        ;; (add-to-list 'out-forms `(define-key ,keymap ,key ,def) t)
                         (add-to-list 'out-forms `(evil-define-key nil ,keymap ,key ,def) t)
                       (dolist (state states)
                         (add-to-list 'out-forms `(evil-define-key ',state ,keymap ,key ,def) t))))
-                  ;; (add-to-list 'out-forms `(define-key (evil-get-auxiliary-keymap ,keymap ',state) ,key ,def) t))))
-
                   (setq prefix  (if (eq first-key :prefix) first-value))
                   (setq keymaps (if (eq first-key :map) first-value default-keymaps))
                   (setq states '())
diff --git a/core/core-evil.el b/core/core-evil.el
index 14f36ca4d..0786eba6e 100644
--- a/core/core-evil.el
+++ b/core/core-evil.el
@@ -105,13 +105,13 @@ See https://bitbucket.org/lyro/evil/issue/527"
   :functions (iedit-current-occurrence-string iedit-restrict-region)
   :commands (evil-iedit-state evil-iedit-state/iedit-mode)
   :config
-  (bind! ; Don't interfere with evil-snipe
-   :I :unset "s"
-   :I :unset "S"
-   :I "V"   'evil-visual-line
-   :I "C"   'evil-iedit-state/substitute  ; instead of s/S
-   :I "za"  'iedit-toggle-unmatched-lines-visible
-   :v "SPC" 'narf:iedit-restrict-to-region))
+  (bind! :map evil-iedit-state-map ; Don't interfere with evil-snipe
+         "s"   nil
+         "S"   nil
+         "V"   'evil-visual-line
+         "C"   'evil-iedit-state/substitute  ; instead of s/S
+         "za"  'iedit-toggle-unmatched-lines-visible)
+  (bind! :v "SPC" 'narf:iedit-restrict-to-region))
 
 (use-package evil-indent-textobject
   :commands (evil-indent-i-indent
@@ -190,12 +190,8 @@ See https://bitbucket.org/lyro/evil/issue/527"
   (evil-space-setup "?" "N" "n")
 
   (after! evil-snipe
-    (evil-space-setup 'evil-snipe-f 'evil-snipe-repeat 'evil-snipe-repeat-reverse)
-    (evil-space-setup 'evil-snipe-F 'evil-snipe-repeat 'evil-snipe-repeat-reverse)
-    (evil-space-setup 'evil-snipe-t 'evil-snipe-repeat 'evil-snipe-repeat-reverse)
-    (evil-space-setup 'evil-snipe-T 'evil-snipe-repeat 'evil-snipe-repeat-reverse)
-    (evil-space-setup 'evil-snipe-s 'evil-snipe-repeat 'evil-snipe-repeat-reverse)
-    (evil-space-setup 'evil-snipe-S 'evil-snipe-repeat 'evil-snipe-repeat-reverse))
+    (mapc (lambda (x) (evil-space-setup x 'evil-snipe-repeat 'evil-snipe-repeat-reverse))
+          '(evil-snipe-f evil-snipe-F evil-snipe-t evil-snipe-T evil-snipe-s evil-snipe-S)))
 
   (after! evil-visualstar
     (evil-space-setup 'evil-visualstar/begin-search-forward "n" "N")
diff --git a/core/core-ui.el b/core/core-ui.el
index e01b1a1c4..2d788fa5f 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -115,7 +115,7 @@
                         path)))
                 (powerline-buffer-id)))
             (if (buffer-modified-p)
-                (propertize "*" 'font-lock-face '(:inherit other-face :foreground "orange")))
+                (propertize "*" 'font-lock-face `(:inherit ,other-face :foreground "orange")))
             " ")
     :tight-right t)