Changes per #3614 comments