More code review feedback.
IOS-496