Cosmetics: Use the IID_PPV_ARGS macro when possible. Part 2