Collision detection now handles breaching and shoaling properly.