More pirops to nqpops2

passes the spectests

Previous pull request had a little git mistake, this one should apply in a cleaner way.