Work in more review comments.