Update after incorporating comments from Nick Almonte code review.