Fix documentation for DataSourceCollection.

Also code cleanup.  Fixes #1514