Improve vimfiler/mask source behavior