Simplified the wrapping of functions resolved as void* thus handling more cases