WP-3060 A little code cleanup.