Add support for 'proper' invoke calls