Address final review comments.