more cleanups around the new curves feature.