Use `quit-window' instead of `kill-buffer-and-window`.

This should (I think) let previously split frames retain their
splits.