[Refactor] Consolidate logic for wrapping/unwrapping map values in framework types.

[Refactor] Consolidate logic for wrapping/unwrapping map values in framework types. #4832