Update for the new distinction between linear and nonlinear cone