Polishing contribution from Derek Eskens.

+review REVIEW-5186