More avoidance of crashing due to separator changes.