Preserve the number of available control points to be near but under the maximum, see #83