WyIL: Continuing to refactor VcGenerator.