codegen, toplevel: cosmetic changes