const fixes.  Integrated hash table.