Not even that. Why not have an "OOPS...not terrorism! My Bad!" clause backing up the whole Patriot Act.
That is, just stipulate that any evidence found in a "terrorism" investigation CANNOT and WILL NOT be used in any NON-TERRORIST prosecution.
These are unpleasant alternatives that proponents of National Security MUST pass by if they are really only interested in national security.
The concerns of Patriot Act opponents is that this law is not JUST for terrorism, but to enhance Police Power across the board. Whether we need more domestic police powers or not should be debated OUTSIDE the argument about terrorism and national security.
I personally think that is a great idea.