Use custom macro instead of eval-after-load + progn
Eventually correctly switch between pairing modes?