Fix style issues from PR feedback.