Improved CLI nvim support.