   (ar/csetq idle-update-delay 2)
 
   ;; Increase mark ring size.
-  (ar/csetq global-mark-ring-max 500)
-
-  (defun ar/kill-ring-save--mark-whole-buffer (orig-fun &rest r)
-    "Remember point location prior to `mark-whole-buffer' with an advice around `kill-ring-save' (ORIG-FUN and R)."
-    (apply orig-fun r)
-    (when (eq last-command 'mark-whole-buffer)
-      (pop-to-mark-command)
-      (pop-to-mark-command)
-      (message "Restored location prior to 'mark-whole-buffer")))
-
-  (advice-add 'kill-ring-save
-              :around
-              'ar/kill-ring-save--mark-whole-buffer)
-
-  (advice-add 'indent-for-tab-command
-              :around
-              'ar/kill-ring-save--mark-whole-buffer))
+  (ar/csetq global-mark-ring-max 500))
 
 ;; Open rc files with conf-mode.
 (use-package conf-mode

(use-package re-builder
  :config
  (ar/csetq reb-re-syntax 'string))
;; No double escaping needed.

  :config
  ;; (ar/csetq expand-region-smart-cursor t)
  ;; Skip marking word. Most of the time, I want symbol.
  (ar/vsetq er/try-expand-list (remq 'er/mark-word er/try-expand-list)))

(use-package dabbrev
  :config
