rearrange order of args to set-union
remove sets from expand/expand-piece/bw-1pc-1step
remove lists from expand/expand-piece/bw-1pc-1step