improve autocomplete when inserting over existing arguments GitOrigin-RevId: 8d1401cca141348dd33b965c92e120cf66350d7e