Refactored avoidance.