Changes per #3174 review.