Make control point selection more consistent.