Use values iterator and update in map equality/hash

Use values iterator and update in map equality/hash #114