Many tools were broken after the recent hash-table refactorings, fix them and ensure they won't silently break again.