Changes per #3175 review.