Some codegen changes, this breaks structures for now.