Merge branch 'jk/oideq-hasheq-cleanup'

Code clean-up.

* jk/oideq-hasheq-cleanup:
  more oideq/hasheq conversions

diff --cc commit-reach.c
Simple merge

diff --cc midx.c
Simple merge