Fix option parsing and pass correct options to distinct
PHP-1301: Collection::aggregate()