diff --git a/core/core-defuns.el b/core/core-defuns.el
index b970b665e..374e69594 100644
--- a/core/core-defuns.el
+++ b/core/core-defuns.el
@@ -190,8 +190,8 @@ Examples:
 (after! evil
   (defalias 'ex! 'evil-ex-define-cmd)
 
-  ;; NOTE evil-mode doesn't read local `evil-ex-commands', and will
-  ;; not autocomplete local commands.
+  ;; NOTE evil-mode doesn't read local `evil-ex-commands', and will not
+  ;; autocomplete local commands.
   (defun ex-local! (cmd fn)
     "Define a buffer-local ex command."
     (unless (local-variable-p 'evil-ex-commands)
diff --git a/core/core-eval.el b/core/core-eval.el
index 0babc1b10..694cb4ef1 100644
--- a/core/core-eval.el
+++ b/core/core-eval.el
@@ -63,7 +63,6 @@
         :n "k" 'evil-previous-line
         :n "h" 'evil-backward-char
         :n "l" 'evil-forward-char
-        ;; FIXME Greedy command buffer always grabs focus
         :m "n" 'realgud:cmd-next
         :m "b" 'realgud:cmd-break
         :m "B" 'realgud:cmd-clear
diff --git a/core/core-ui.el b/core/core-ui.el
index 0f48f7f5a..ce447013f 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -97,9 +97,8 @@
   :init (add-hook! (prog-mode markdown-mode) 'hl-line-mode)
   :config
   ;; Doesn't seem to play nice in emacs 25+
-  (when (< emacs-major-version 25)
-    (setq hl-line-sticky-flag nil
-          global-hl-line-sticky-flag nil))
+  (setq hl-line-sticky-flag nil
+        global-hl-line-sticky-flag nil)
 
   (defvar-local doom--hl-line-mode nil)
   (defun doom|hl-line-on ()  (if doom--hl-line-mode (hl-line-mode +1)))
@@ -394,9 +393,11 @@ anzu to be enabled."
                                                      'doom-flycheck-warning
                                                    'mode-line))))))))))
 
+  (defvar *pad-active (pl/percent-xpm powerline-height 100 0 100 0 3 "#00B3EF" nil))
+  (defvar *pad-inactive (pl/percent-xpm powerline-height 100 0 100 0 3 nil nil))
   (spaceline-define-segment *pad
     "Padding, to ensure the mode-line is `powerline-height' pixels tall"
-    (pl/percent-xpm powerline-height 100 0 100 0 3 (if active "#00B3EF") nil)
+    (if active *pad-active *pad-inactive)
     :tight t)
 
   (spaceline-compile
@@ -441,9 +442,10 @@ anzu to be enabled."
     :tight t
     :face 'mode-line)
 
+  (defvar *eldoc-pad-xpm (pl/percent-xpm powerline-height 100 0 100 0 3 "#B3EF00" nil))
   (spaceline-define-segment *eldoc-pad
     "Padding, to ensure the mode-line is `powerline-height' pixels tall"
-    (pl/percent-xpm powerline-height 100 0 100 0 3 "#B3EF00" nil)
+    *eldoc-pad-xpm
     :tight t
     :face 'mode-line)
 
diff --git a/core/core-vcs.el b/core/core-vcs.el
index ab1b9058b..643826a4a 100644
--- a/core/core-vcs.el
+++ b/core/core-vcs.el
@@ -68,6 +68,7 @@
             (select-window (get-buffer-window doom-prev-buffer)))
           (switch-to-buffer b)))
 
+  ;; Prevent magit and evil-snipe conflicts
   (add-hook 'magit-mode-hook 'turn-off-evil-snipe-override-mode)
 
   (require 'evil-magit)
diff --git a/core/core-yasnippet.el b/core/core-yasnippet.el
index a13c9563e..5b4e8f039 100644
--- a/core/core-yasnippet.el
+++ b/core/core-yasnippet.el
@@ -43,9 +43,7 @@
   ;; Strip out whitespace before a line selection
   (add-hook 'yas-before-expand-snippet-hook 'doom|yas-before-expand)
   ;; Fix previous hook persisting yas-selected-text between expansions
-  (add-hook 'yas-after-exit-snippet-hook 'doom|yas-after-expand)
-  ;; Suppress yasnippet with helm
-  (after! helm (push 'helm-alive-p yas-dont-activate-functions)))
+  (add-hook 'yas-after-exit-snippet-hook 'doom|yas-after-expand))
 
 (use-package auto-yasnippet
   :commands (aya-create aya-expand aya-open-line aya-persist-snippet)
diff --git a/core/defuns/defuns-popups.el b/core/defuns/defuns-popups.el
index 702c52e75..e0578c043 100644
--- a/core/defuns/defuns-popups.el
+++ b/core/defuns/defuns-popups.el
@@ -144,7 +144,6 @@ the display (unless DONT-REDRAW is non-nil)."
                           doom-popup-rules))))
     (setq doom-last-popup (current-buffer))
     (setq-local doom-popup-rule rules)
-    ;; (set-window-dedicated-p (selected-window) doom-popup-mode)
     (unless (memq :noesc rules)
       (make-local-variable 'doom-popup-mode-map)
       (let ((map doom-popup-mode-map))
diff --git a/modules/module-cc.el b/modules/module-cc.el
index ddb40f347..88795420f 100644
--- a/modules/module-cc.el
+++ b/modules/module-cc.el
@@ -45,7 +45,7 @@
   :config
   (setq irony-server-install-prefix (concat doom-temp-dir "/irony/"))
   (add-hook! c++-mode
-    (make-variable-buffer-local 'irony-additional-clang-options)
+    (make-local-variable 'irony-additional-clang-options)
     (push "-std=c++11" irony-additional-clang-options))
 
   (require 'irony-eldoc)
diff --git a/modules/module-csharp.el b/modules/module-csharp.el
index 40c7562e6..13167107a 100644
--- a/modules/module-csharp.el
+++ b/modules/module-csharp.el
@@ -12,7 +12,7 @@
   (setq omnisharp-auto-complete-want-documentation nil
         omnisharp-server-executable-path (concat doom-ext-dir "/OmniSharp.exe"))
   :when (file-exists-p omnisharp-server-executable-path)
-  :init (add-hook! csharp-mode '(turn-on-eldoc-mode omnisharp-mode))
+  :init (add-hook! csharp-mode '(eldoc-mode omnisharp-mode))
   :config
   (def-company-backend! csharp-mode (omnisharp))
   (map! :map omnisharp-mode-map
diff --git a/modules/module-elisp.el b/modules/module-elisp.el
index b5c9649bb..d1aabf650 100644
--- a/modules/module-elisp.el
+++ b/modules/module-elisp.el
@@ -1,7 +1,7 @@
 ;;; module-elisp --- all things lisp
 
 (associate! emacs-lisp-mode :match "\\(/Cask\\|\\.\\(el\\|gz\\)\\)$")
-(add-hook! emacs-lisp-mode '(turn-on-eldoc-mode flycheck-mode highlight-numbers-mode))
+(add-hook! emacs-lisp-mode '(eldoc-mode flycheck-mode highlight-numbers-mode))
 
 ;; Real go-to-definition for elisp
 (map! :map emacs-lisp-mode-map :m "gd" 'doom/elisp-find-function-at-pt)
@@ -103,11 +103,10 @@
   :config (setq inferior-lisp-program "clisp"))
 
 (use-package auto-compile
-  :commands (auto-compile-on-save-mode)
+  :commands auto-compile-on-save-mode
   :init (add-hook 'emacs-lisp-mode-hook 'auto-compile-on-save-mode)
   :config (setq auto-compile-display-buffer nil))
 
-
 ;;
 (def-project-type! emacs-ert "ert"
   :modes (emacs-lisp-mode)
diff --git a/modules/module-php.el b/modules/module-php.el
index d48b0a9e4..af4a2c552 100644
--- a/modules/module-php.el
+++ b/modules/module-php.el
@@ -29,7 +29,7 @@
 
 (use-package php-extras
   :after php-mode
-  :init (add-hook 'php-mode-hook 'turn-on-eldoc-mode)
+  :init (add-hook 'php-mode-hook 'eldoc-mode)
   :config
   (defun php-extras-company-setup ()) ;; company will set up itself
   ;; Generate php-extras documentation and completion asynchronously
diff --git a/modules/module-scala.el b/modules/module-scala.el
index fdd91fe23..41337c8b2 100644
--- a/modules/module-scala.el
+++ b/modules/module-scala.el
@@ -2,7 +2,7 @@
 
 (use-package scala-mode
   :mode "\\.s\\(cala\\|bt\\)$"
-  :init (add-hook 'scala-mode-hook 'turn-on-eldoc-mode)
+  :init (add-hook 'scala-mode-hook 'eldoc-mode)
   :config (def-company-backend! scala-mode '(ensime-company (company-yasnippet))))
 
 (use-package sbt-mode
diff --git a/modules/module-text.el b/modules/module-text.el
index 9585203ac..95dd05f64 100644
--- a/modules/module-text.el
+++ b/modules/module-text.el
@@ -6,7 +6,7 @@
   :mode ("\\.m\\(d\\|arkdown\\)$" "/README$"
          ("/README\\.md$" . gfm-mode))
   :init
-  (add-hook 'markdown-mode-hook 'turn-on-auto-fill)
+  (add-hook 'markdown-mode-hook 'auto-fill-mode)
   (setq markdown-enable-wiki-links t
         markdown-italic-underscore t
         markdown-enable-math t