CRUNCH-363: Fix protobufs to work with collection and union wrapper types.