Eliminate a bunch of pir::.
Update test to not pass due to a PCC fail.

Something that takes no parameters will not check that it got none.
Fixing the test, rather than porting the bug.
Further portability tweak.