Move tagged union into expression field to match MessageSet definition.