[master 9/11] Adapt our code to changes in the representation of LVs