WyC: going through combining the code generation phases together, and starting to tidy up the code.