Rewrite collision handling from scratch.