This includes upstream fixes, and in particular a converter for going between map types with different element types.