Changes per #3246 review