Left over code review comments from #2844