CORE-4971: Correcting argument group delete logic