code review tidies for #1094