Maybe to split into two issues if necessary.

Thanks for #2974 - we can now avoid parser errors related to that.

PHPUnit doesn't support it yet, but data provider FCCs are a tempting candidates to use that.