Minor pathfinding cleanup