Make our C-z shortcut smarter