Changes per #3417 review.