More pluralization fixes.