Fix complex parameters, it requires handling generics as well...