further code review comments from #2730