Use values iterator and update in map equality/hash (#718)

Use values iterator and update in map equality/hash (#718) #23