WP-3020 Code cleanup.