Remove decorator duplication; improve collection decorator handling