Fixup for 0381a0f0
Fixup for map_key callback
fixup: integer callback
Fixup start_map callback