Collapse duplicate $existingExpiry == 'infinity' case into else