More minor changes. This should be the last ones for a while..

git-svn-id: https://plugins.svn.wordpress.org/zen4wp/trunk@993229 b8457f37-d9ea-0310-8a92-e5e31aec5664