More codegen refactors
More codegen refactors.