Further code review from the end of #2730