Treat pop-to-buffer-same-window as if switch-to-buffer