Some minor changes in yank-pop