Reporting excess deferrals

Employee participated in 2 different company plans and ultimately exceeded 402(g) limit for the prior year.

Excess deferral was distributed prior to 4/15 of the next year.

Are there one or two 1099-R's reported?

If there is one, I believe it is in year of distribution with Code P (referring to prior year).

If there are two, in addition to the one above, one for the prior year with Code 8? Alternatively, is the W-2 corrected?

Or as I believe, there is just one 1099-R issued for current year and in this case, employee provides tax preparer with letter describing the excess deferral distribution.

Each plan that issues a refund for excess deferrals between 1/1/20xx+1 and 4/15/20xx+1 would issue a 1099-R in January of 20xx+2 for year 20xx+1 with code P indicating that the refund was taxable in year 20xx.

No correction to the W-2 is required.