swift

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