We made the collision method a lot less ghetto. (And maybe did some other nice things.)