Rehash tidied and collision updates correctly.