Stylistic fixes per PR feedback.