Some CharacterCollisionHandling simplification