Improved contour splitting.