WyC: switched over to new code generation class (which is essentially the same as before, but grouped together).