Refactor VFMatter into a single subtyped item