WP-2879 Some small code changes.