Hopefully final fix to yank-selection code