and I could remove the bits from codegen that tried to make it unnecessary