WP-2606 A little code cleanup.