Changed variants to use an arena rather than composite literals.

This goes most (but not all) of the way towards making MSVC happy with the
tests.
Self-review