Revisions per Jamie's code review on #2082