Issue #3319582 by mondrake, Spokje, longwave, mallezie: Fix calls to methods with too many parameters passed in
