Additional code review items. #4137