A few improvements.
Ctrl-K, Ctrl-D