Revised expansion so `__variant_tuple` is only built in the catch-all itself.

Also, seriously attempted to clean up the code itself.  Added a bunch
of comments attempting to document what I learned as I worked through
the original code and adapted it to this new strategy.