Senators link Pakistan aid to focus on extremists