anchor.diff:           {repeated, false} ->
                format_repeated_field_encoder2(MsgName, FieldDef, AnRes);
            {repeated, true} ->
  -             format_packed_field_encoder2(MsgName, FieldDef);
  +             format_packed_field_encoder2(MsgName, FieldDef, AnRes);
            {optional, false} ->
                [];
            {required, false} ->
                []
        end].
   
  -possibly_format_mfield_encoder(MsgName, #?gpb_field{type={msg,SubMsg}}=FieldDef,
  +possibly_format_mfield_encoder(MsgName,
  +                               #?gpb_field{type={msg,SubMsg}}=FieldDef,
                                  AnRes) ->
       FnName = mk_field_encode_fn_name(MsgName, FieldDef),
       case is_msgsize_known_at_generationtime(SubMsg, AnRes) of
  
positive.code:                 X when X == records;
                         X == {maps, present_undefined} ->
                      ?expr(
                         if '<F>' == undefined -> '<Bin>';
                            true -> '<enc>'('<F>', <<'<Bin>'/binary, '<Key>'>>)
                         end,
                         Transforms);
                  {maps, omitted} ->
                      ?expr(
                         case 'M' of
                             '#{fieldname := <F>}' ->
                                 '<enc>'('<F>', <<'<Bin>'/binary, '<Key>'>>);
                             _ ->
                                 '<Bin>'
                         end,
  
negative.code:              %% undefined is already handled, we have a match,
               %% the field occurs, as if it had been required
               OField2 = OField#?gpb_field{occurrence=required},
               Tr2 = Tr({update_elem_path,Name}),
               EncExpr = field_encode_expr(MsgName, MsgVar, OField2, OFVar,
                                           PrevBVar, Defs, Tr2, AnRes, Opts,
                                           no_typedefault_checking),
               [replace_tree('<oneof...>', MatchPattern),
                replace_tree('<expr>', EncExpr)]
  