WP-2879 A little code cleanup. Light dusting.