Do not interfere window switching history

Many plugins rely on 'wincmd p' to work properly, we need to preserve
at least one-level backwards window switching history.
Small cleanup of last patch