Fixes per #3230 review.