Iterate on code review comments from Kannan.