Minor refactorings for CollisionFilter and CollisionSystem