Do 'count' parameter replacement and pluralize 0 in choice method

These changes bring the choice() method closer into line with the Symfony implementation.