Updates from code review comments.