anchor.diff:  
   mk_one_map_field_of_each_type() ->
       %% Reduced set of int types to shorten compilation times,
  -    %% while still cover all code paths.
  -    ValueTypes = [sint32, sint64, uint32, uint64,
  +    %% while still cover all (most) code paths.
  +    ValueTypes = [sint32, sint64,
                     bool,
                     double, string, bytes,
                     float, {enum, ee}, {msg, submsg1}],
  +    ValueTypes2 = ValueTypes -- [sint64],
       KeyTypes   = [T || T <- ValueTypes, gpb:is_allowed_as_key_type(T)],
       %% Enum value in map must define 0 as the first value.
       EnumDef    = {{enum, ee}, [{en0, 0}, {en1, 1}, {en2, 2}]},
       SubMsgDef  = {{msg, submsg1}, mk_fields_of_type([uint32], required)},
  -    MapMsg1    = {{msg, map1},  mk_map_fields_of_type(KeyTypes, ValueTypes)},
  -    [EnumDef, SubMsgDef, MapMsg1].
  +    MapfldMsg1 = {{msg, map1},  mk_map_fields_of_type(KeyTypes, ValueTypes2)},
  +    [EnumDef, SubMsgDef, MapfldMsg1].
   
   mk_proto3_fields() ->
       EachType   = [sint32, sint64, bool, double, string, bytes, {enum, ee}],
  
positive.code:            || VT <- ValueTypes1],
      Fs2 = [#?gpb_field{type={map,KT,VT1}, occurrence=repeated, opts=[]}
             || KT <- KeyTypes1],
      [F#?gpb_field{name=list_to_atom(lists:concat([f,I])), rnum=I+1, fnum=I}
       || {I, F} <- index_seq(Fs1 ++ Fs2)].
  
  index_seq(L) -> lists:zip(lists:seq(1, length(L)), L).
  
  
negative.code:                   end,
                    Alts).
  
  nif_encode_decode_mapfields() ->
      with_tmpdir(
        fun(TmpDir) ->
                NEDM = gpb_nif_test_ed_mapfields1,
  