Map and unmap the old top-level window instead of xte hacking.

Fixes holding ctrl-alt-shift and hitting forward/back repeatedly with Xephyr.
Xorg of course still doesn't support that (it never did).