[vim-machine] Tweaks