Fix collision bugs.

Things were over-colliding. Now, be sure to be on the lookout for
under-colliding bugs...