WP-4387 A little cleanup. Scrub, scrub... :)