Fixes per #3095 review.