Refactor to ensure args are passed properly

The fun_get_args() function omits default values. Passing them manually instead.