Changes per third PR review.