Extended wrapped collection support (and tests).