WL-2371 Cleanup from review.