WyIL: Updates to VcGenerator