More code review changes on #19480