Make --target=pir a little less special.

Whole thing needs a good bit of reviewing, though.