Switch to using arbitrary and suchThat rather than specialized generators