Hello!
> I think it did; the v5 adds 3 injection points while the v4 added 4
> injection points.
The overall patch size wasn't that different, the main reduction came
from removing the redundant last testcase, but your changes definitely
move it toward a simpler direction.
The changes look good to me. I squashed the previous 0002 and this
diff together for easier review / CI, fixed one whitespace issue, and
adjusted the commit message.