revisions based on comments on #8434