Set persp-add-on-switch-or-display to nil by default. Next time
switch/display-buffer advices will be removed. Small cosmetic changes.