(This might have to be triggered by a flag on the provider though, because I could imagine there might be providers for which this guarantee wouldn't hold--though I can't think of any offhand. In those cases, we would need to choose between the cases you have here anyway, neither of which seems right. But hopefully that won't be a common case.)