Revert "remove ucpp-style collections used before Mike's lists"
This reverts commit b388d1baad1af006ac9ea384e38dd2abb5f0ba6e.