More hacking
Cut the complexity of the code generator.