Fix spurious paren in hash-map.
Merge remote-tracking branch 'myfork/master'