Consolidated and fix the simple hash table code.