[philwelch]

Thanks!

> and places four-year sunsets on the other two

It looks like those were sections 206 and 215, which were somewhat weakened by the same act.

Confusingly, there's a third provision, the "lone wolf" provision, which was extended during the Obama administration; that seems to be part of the Intelligence Reform and Terrorism Prevention Act of 2004 and got rolled into the "USA Freedom Act" reauthorization in 2015.