   (pcre-mode +1))
 
 (use-package re-builder
-  :config
-  (ar/csetq reb-re-syntax 'string))
+  :validate-custom
+  (reb-re-syntax 'string))
 
 (use-package diverted
   :defer 20

                                (buffer-name buffer))
                          (with-current-buffer buffer
                            (whitespace-mode +1)))))))
  ;; When nil, fill-column is used instead.
  (ar/vsetq whitespace-line-column nil)
  ;; Highlight empty lines, TABs, blanks at beginning/end, lines
  ;; longer than fill-column, and trailing blanks.
  (ar/vsetq whitespace-style '(face empty tabs lines-tail trailing))
  (ar/vsetq show-trailing-whitespace t)
  (set-face-attribute 'whitespace-line nil
                      :foreground "DarkOrange1"
                      :background nil))

  ;; Automatically remove whitespace on saving.
  :hook ((before-save . whitespace-cleanup)
         (prog-mode . ar/whitespace-mode-enable))
  :validate-custom
  ;; When nil, fill-column is used instead.
  (whitespace-line-column nil)
  ;; Highlight empty lines, TABs, blanks at beginning/end, lines
  ;; longer than fill-column, and trailing blanks.
  (whitespace-style '(face empty tabs lines-tail trailing))
  (show-trailing-whitespace t)
  :config
  (defun ar/whitespace-mode-enable ()
    "Delayed enabling of whitespace-mode to ensure fill-column is set for loaded buffer."
