WP-3316 A little code cleanup to remove unit testing code.