more support for struct list upgrades