More intersection-avoidance tweaks.