Cosmetics. Moved the hash-table routines.