Ofcourse you’d like to see USA stop linking India specific conditions when dealing with Pakistan - and it would be quite easy. All Pakistan has to do is stop terrorism inside its own and across the border.
Naming A.Q.Khan was bad enough but now it is not limited to A.Q.Khan. If Pakistan takes this deal, they are authorizing access to all military, intelligence and scientific personnel involved.