Better cleanup of the set_arguments() call after its GCC side update.