It seems like they have different rules for contribution vs deferral, if I am not mistaken, you need to report the excess deferral amount if that amount is distributed by April 15, but for excess contribution you report the year that the amount is distributed. I can be wrong, but that was what I read.
