Make notices added in [30459] less ugly.

see #25569, #25571, [30505].

git-svn-id: https://develop.svn.wordpress.org/trunk@30657 602fd350-edb4-49c9-b593-d223f7449a82