Make C-w do what I expect