NumberOfParameterFilter correctly handles argument count greater than zero.
Return boolean instead of if statement.
Cleaned up annotations for tests of #6083
Merge branch 'hotfix/#6083-hydrator-number-of-parameters-filter-honored'

Close #6083