Fix for the upstream removal of add_args() function.