Fixes per #3131 review.