No, it shouldn't. Stuff like recapture has no likelihood of passing. The reason country caps exist is precisely because everyone wants to carve out some provisions for their favorite group in hopes of getting the mythical comprehensive immigration reform. A one sentence bill on this matter has better odds of passing if it were to ever come to a vote. There is really no tenable position in favor of country based discrimination. The challenge is getting it to a vote.