WyIL: Further updates to VcGenerator.