This was a fun episode. And that was my first thought when I saw Bruce Davison too. My only problem with that is that it's getting to a point now where I can figure out who's gonna be the bad guy based solely on who the guest actors are.
Yeah, that was the sole reason why I didn't started thinking that the counter terrorist guy (the flying dude from Heroes) was in on it, because no way he'd play a bad guy. (When the story shifted to misguided "patriots", I started thinking though, that I can see him do...)