Adapt to Data.List/Foldable generalisation