WyC: begun the process of combining the code generation into a single (albeit large) file.  I believe this will help to improve the coherency of the whole thing; however, there's work to be done.