PIE/PIC: more refinements.