You would want to go further and actually have laws passed to make metadata collection and foreign surveillance illegal (or at least more strictly controlled) s

You would want to go further and actually have laws passed to make metadata collection and foreign surveillance illegal (or at least more strictly controlled) since otherwise they'd still be legal after repealing FISA and its amendments. And then go further along with repealing the odious portions of the USA PATRIOT Act.