Edits from code review comments.