Conversions: Refactoring the plural handling