Small cleanups from review comments.