Second cut at adding support for 'collection-valued attributes'.