Fixes per #3581 review.