Modifier cleanup in all CollectionResource and Collector classes.