Wrap Option and Collection Extractors around a 'real' extractor.
CollectionExtract is no longer bound to String; rename
Temporarily restore backwards compatible behavior.