More minor code review changes.