Add other bits from Andre Rauh's patch. Variadic invoke can go
directly, internal invokes are done via `this`. The previous commit's
Closure type information is enough to suppress the warning.