Pluralization fixes.