WP-4634 A small code cleanup change.