There is room to expand warrantless surveillance? Colour me surprised.

We are already so far down that road.

IIRC the first draft of this bill was a 5 year renewal, but some people managed to get it lowered to a 2 year renewal, with hopes that one day it can stop being renewed.

Source: I think Kyle on secular talk mentioned something about it in the recent past.