WyIL: more updates to support new CodeBlock API.