diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 9be5696..6e7882a 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -502,7 +502,7 @@ MODE1 is enabled and vice-versa."
 ;; Replace certain characters with html entities in HTML mode buffers.
 (add-hook 'before-save-hook 'oni:replace-html-special-chars-in-html-mode)
 
-(add-hook 'css-mode-hook #'rainbow-mode)
+(add-hook 'css-mode-hook 'rainbow-mode)
 (add-hook 'diary-display-hook 'diary-fancy-display)
 
 ;; Make sure git commit messages are always checked in english.
@@ -516,7 +516,7 @@ MODE1 is enabled and vice-versa."
 (add-hook 'outline-minor-mode-hook 'oni:set-tab-maybe-toggle-outline)
 
 (add-hook 'scheme-mode-hook (lambda () (setq ac-sources '(ac-source-geiser))))
-(add-hook 'slime-mode-hook #'set-up-slime-ac)
+(add-hook 'slime-mode-hook 'set-up-slime-ac)
 
 ;; Support the prompt from MariaDB
 (add-hook 'sql-interactive-mode-hook 'oni:augment-sql-prompt)
@@ -544,7 +544,7 @@ MODE1 is enabled and vice-versa."
 (add-hook 'ruby-mode-hook 'ruby-tools-mode)
 (add-hook 'ruby-mode-hook 'ruby-refactor-mode-launch)
 (add-hook 'ruby-mode-hook 'robe-mode)
-(add-hook 'projectile-after-switch-project-hook #'oni:select-corresponding-ruby)
+(add-hook 'projectile-after-switch-project-hook 'oni:select-corresponding-ruby)
 (add-hook 'prog-mode-hook 'highlight-numbers-mode)
 (add-hook 'compilation-filter-hook 'colorize-compilation-buffer)
 
@@ -579,7 +579,7 @@ MODE1 is enabled and vice-versa."
   'Info-mode-hook 'gnus-article-mode-hook 'gnus-group-mode-hook
   'org-agenda-mode-hook)
 
-(oni:add-function-to-hooks #'paredit-mode
+(oni:add-function-to-hooks 'paredit-mode
   'clojure-mode-hook 'geiser-repl-mode-hook 'sawfish-mode-hook
   'scheme-mode-hook)
 
@@ -590,11 +590,11 @@ MODE1 is enabled and vice-versa."
                        ac-source-variables
                        ac-source-symbols)))
   'oni:locally-enable-double-spaces 'oni:set-emacs-lisp-symbols
-  #'paredit-mode #'eldoc-mode 'oni:set-emacs-lisp-keys)
+  'paredit-mode #'eldoc-mode 'oni:set-emacs-lisp-keys)
 
 (oni:add-hooks 'eshell-mode-hook
   #'buffer-disable-undo 'oni:set-keys-for-eshell
-  #'eshell-fringe-status-mode)
+  'eshell-fringe-status-mode)
 
 (oni:add-hooks 'gnus-summary-mode-hook
   (lambda ()
@@ -608,10 +608,10 @@ MODE1 is enabled and vice-versa."
   #'turn-off-auto-fill)
 
 (oni:add-hooks 'hy-mode-hook
-  #'paredit-mode 'oni:set-keys-for-hy)
+  'paredit-mode 'oni:set-keys-for-hy)
 
 (oni:add-hooks 'ielm-mode-hook
-  #'paredit-mode #'eldoc-mode 'oni:set-emacs-lisp-keys)
+  'paredit-mode #'eldoc-mode 'oni:set-emacs-lisp-keys)
 
 ;; Bind Jabber chat-specific keys
 (add-hook 'jabber-chat-mode-hook 'oni:set-keys-for-jabber-chat)
@@ -623,11 +623,11 @@ MODE1 is enabled and vice-versa."
 (add-hook 'jabber-chat-mode-hook 'oni:reset-default-directory)
 
 (oni:add-hooks 'js2-mode-hook
-  #'tern-mode #'moz-minor-mode)
+  #'tern-mode 'moz-minor-mode)
 
 (oni:add-hooks 'lisp-mode-hook
   (lambda () (setf ac-sources '(ac-source-slime-simple)))
-  'oni:set-emacs-lisp-symbols #'paredit-mode)
+  'oni:set-emacs-lisp-symbols 'paredit-mode)
 
 (oni:add-hooks 'lua-mode-hook 'oni:set-keys-for-lua)
 
@@ -635,7 +635,7 @@ MODE1 is enabled and vice-versa."
   #'whitespace-mode 'oni:show-trailing-whitespace)
 
 (oni:add-hooks 'prog-mode-hook
-  'oni:maybe-fci-mode #'rainbow-delimiters-mode
+  'oni:maybe-fci-mode 'rainbow-delimiters-mode
   'oni:maybe-prettify-symbols-mode)
 
 ;; Set autocompletion sources for Python
@@ -657,7 +657,7 @@ MODE1 is enabled and vice-versa."
 (add-hook 'python-mode-hook 'subword-mode)
 
 (oni:add-hooks 'slime-repl-mode-hook
-  #'paredit-mode #'set-up-slime-ac)
+  'paredit-mode 'set-up-slime-ac)
 
 ;; Use all the cool experimental tagedit features
 (add-hook 'tagedit-mode-hook 'tagedit-add-experimental-features)
@@ -710,7 +710,7 @@ MODE1 is enabled and vice-versa."
 (global-set-key (kbd "C-c l") #'org-store-link)
 (global-set-key (kbd "C-c d c") 'desktop-clear)
 (global-set-key (kbd "C-c d d") 'desktop-registry-change-desktop)
-(global-set-key (kbd "C-c d k") #'desktop-registry-remove-desktop)
+(global-set-key (kbd "C-c d k") 'desktop-registry-remove-desktop)
 (global-set-key (kbd "C-c d s") 'desktop-save-in-desktop-dir)
 (global-set-key (kbd "C-c g b") 'magit-checkout)
 (global-set-key (kbd "C-c g f") 'magit-fetch)
@@ -721,12 +721,12 @@ MODE1 is enabled and vice-versa."
 (global-set-key (kbd "C-c m") 'gnus)
 (global-set-key (kbd "C-c s") #'split-window-below)
 (global-set-key (kbd "C-c t") 'oni:raise-ansi-term)
-(global-set-key (kbd "C-c u") #'upcase-transient-mode)
+(global-set-key (kbd "C-c u") 'upcase-transient-mode)
 (global-set-key (kbd "C-c w d") 'oni:downcase-prev)
 (global-set-key (kbd "C-c w u") 'oni:upcase-prev)
 (global-set-key (kbd "C-e") 'oni:move-end-of-dwim)
-(global-set-key (kbd "C-x 4 f") #'fiplr-find-file-other-window)
-(global-set-key (kbd "C-x 5 f") #'fiplr-find-file-other-frame)
+(global-set-key (kbd "C-x 4 f") 'fiplr-find-file-other-window)
+(global-set-key (kbd "C-x 5 f") 'fiplr-find-file-other-frame)
 (global-set-key (kbd "C-x 8 e") "€")
 (global-set-key (kbd "C-x C-b") 'ibuffer)
 (global-set-key (kbd "C-x f") 'fiplr-find-file)