Initial work to support Map.Entry; now serialization works, some improvements to type handling as well
Fix #565: add support for `Map.Entry`
Add one more unit test for Map.Entry handling