Moving back some minor changes from the WordPress trunk.