Fixup vc-containment implementation.