* 1.13.8.4  Code cleanup (more preparation for 1.13.9).

git-svn-id: https://plugins.svn.wordpress.org/regular-board/trunk@899864 b8457f37-d9ea-0310-8a92-e5e31aec5664