codegen, toplevel: fix merge fallout