Revert "Inspired by the recent commit from @ceedubs [1] which adds xmap to Choose, this"

This reverts commit 9ede3b2d418dfb134f85727543357fc7d8465243.

Not compatible with Scala 2.9.3.
ScalaCheck 1.11.5 release.