A few more style cleanup changes I missed in my last commit.