Update codegen to match precending changes.