short-names: Eliminate use of old hash table data structure.