Minor tweaks; refactor code to use vMAT_ALL, etc.