Add back underlying support in wrappers for both args and kwargs for wrapper function.