Added support for multiple effect collections.

Moved wrap to a fork of when.