WP-2879 A few more small changes.