More code_generator work