Fixed pluralization rules.

Closes #443