Clean up and finish data source specs.