Replace "(s)" with proper plurals when needed, plus tests.