Clean up ContainmentType, CurveContinuity