Clean up collections to be more generic (2)