Fixed lack of value typing for map.