Refactor VC merging to fix a layer violation.