s/pir::/nqp::/ in some places, and uncomment.
A couple of small cleanups.