WP-4741 A little code cleanup.