Edits per Jamie's code review on #2142