My fear is that we lose the plot if these distinctions become meaningless. Calling something non-custodial when it isn't is an Orwellian move and, imo, an attempt at the erosion of this distinction.