Simplify popup buffer quit/restore using `quit-window'.