Fix for format_args! changes