Fix coding policy violations missed in previous commit.