Changes per #3570 review