More refactoring in CollisionHelper.