Vimscript improvements