Changes per 4th PR review.