Change modes that used same-window-* vars to use switch-to-buffer.