Code review feedback.
IOS-496