WP-2879 More code cleanup.