Fix style according to post-commit review comments.