Fix in 'x' and 'X' Vi key bindings. Correctly handle line endings and args.