Improve clarity and speed of [25320].


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