Address final code review comments.