Incorporate review comments from Daira.