collectionRepeat: a few fixes and tweaks