diff --git a/init.el b/init.el
index 29a68f0..5cc9a2b 100644
--- a/init.el
+++ b/init.el
@@ -255,10 +255,10 @@
 
   ;; Fixes
 
-  (eval-after-load "enriched"
-    '(defun enriched-decode-display-prop (start end &optional params)
-       (ignore params)
-       (list start end)))
+  (with-eval-after-load 'enriched
+    (defun enriched-decode-display-prop (start end &optional params)
+      (ignore params)
+      (list start end)))
 
   ;; Start Server when not running already
 
@@ -1206,9 +1206,9 @@ are assumed to be of the form *.crt."
                       (cmucl ("cmucl") :coding-system utf-8-unix)
                       (ccl   ("ccl")   :coding-system utf-8-unix)))
 
-              (eval-after-load 'slime-repl
-               '(setq slime-repl-history-remove-duplicates t
-                      slime-repl-history-trim-whitespaces t))))
+              (with-eval-after-load 'slime-repl
+               (setq slime-repl-history-remove-duplicates t
+                     slime-repl-history-trim-whitespaces t))))
 
 (use-package hy-mode
   :commands (hy-mode)
@@ -1223,14 +1223,13 @@ are assumed to be of the form *.crt."
   :commands (turn-on-reftex)
   :init (add-hook 'latex-mode-hook 'turn-on-reftex)  ; with Emacs latex mode
   :config (progn
-            (eval-after-load 'helm-mode
-              '(add-to-list
-                'helm-completing-read-handlers-alist
-                '(reftex-citation . nil)))
+            (with-eval-after-load 'helm-mode
+              (add-to-list 'helm-completing-read-handlers-alist
+                           '(reftex-citation . nil)))
             (setq reftex-plug-into-AUCTeX t)))
 
-(eval-after-load 'tex-mode
-  '(use-package db-latex))
+(with-eval-after-load 'tex-mode
+  (use-package db-latex))
 
 (use-package ebib
   :commands (ebib))
diff --git a/site-lisp/db-latex.el b/site-lisp/db-latex.el
index 088247c..6fc6180 100644
--- a/site-lisp/db-latex.el
+++ b/site-lisp/db-latex.el
@@ -67,11 +67,10 @@
              '(output-pdf "Evince"))
 
 ;; use pdf-tools when loaded
-(eval-after-load 'pdf-tools
-  `(progn
-     (add-to-list 'TeX-view-program-selection '(output-pdf "PDF Tools"))
-     (add-to-list 'TeX-after-compilation-finished-functions
-                  #'TeX-revert-document-buffer)))
+(with-eval-after-load 'pdf-tools
+  (add-to-list 'TeX-view-program-selection '(output-pdf "PDF Tools"))
+  (add-to-list 'TeX-after-compilation-finished-functions
+               #'TeX-revert-document-buffer))
 
 
 
diff --git a/site-lisp/db-org.el b/site-lisp/db-org.el
index 2208a2b..87f8186 100644
--- a/site-lisp/db-org.el
+++ b/site-lisp/db-org.el
@@ -612,18 +612,17 @@ _y_: ?y? year       _q_: quit          _L__l__c_: ?l?
      (org-agenda-redo)))
   ("q" (message "Abort") :exit t))
 
-(eval-after-load 'org-agenda
-  '(bind-key "v" #'hydra-org-agenda-view/body org-agenda-mode-map))
+(with-eval-after-load 'org-agenda
+  (bind-key "v" #'hydra-org-agenda-view/body org-agenda-mode-map))
 
 
 ;;; Capturing
 
 ;; disable usage of helm for `org-capture'
-(eval-after-load 'helm-mode
-  '(progn
-     (defvar helm-completing-read-handlers-alist) ; for the byte compiler
-     (add-to-list 'helm-completing-read-handlers-alist
-                  '(org-capture . nil))))
+(with-eval-after-load 'helm-mode
+  (defvar helm-completing-read-handlers-alist) ; for the byte compiler
+  (add-to-list 'helm-completing-read-handlers-alist
+               '(org-capture . nil)))
 
 (setq org-capture-use-agenda-date nil)
 
@@ -837,7 +836,7 @@ This is done only if the value of this variable is not null."
 (setq org-export-use-babel nil
       org-export-with-broken-links 'mark)
 
-(with-eval-after-load "ox-latex"
+(with-eval-after-load 'ox-latex
   (add-to-list 'org-latex-classes
                `("scrartcl"
                  ,(concat "\\documentclass{scrartcl}\n"