Merge branch 'matt-codegen-v4' into codegen-immutable-ish