BUGFIX:  This change fixes #2475, where contour labels added manually
produce ugly spikes in the contours.  The problem was that screen
coordinates were being passed as data coordinates when the contour was
split to add room for the label.