swift

[di] Hide some internal state and give some methods better names given current usage.

#28885

Merged