Fixup for string callback implementation
Fixup for map_key callback implementation