Treat organizations as singular nouns in chapter 2.

Comments welcome.