Some small improvements to Map and Dictionary.