Merge "Fix codegen for wildcards in type args"