Fix calling conventions for non-vmethod calls