Checking hash-table branch health. Some cleanup.