Fix up final review comments.