Issue #3319582 by mondrake, Spokje, longwave, mallezie: Fix calls to methods with too many parameters passed in (cherry picked from commit 3485d805718435f0595f95217076a00d97151752)