Simplify cb_gather_arguments in RestoreTab.
Clean up.