I started on this, but I'm actually thinking it's not better. If the EventProperties table changes in the future, the upgrade for version 2 needs to create the original form, not the new form, or the upgrades after that could fail. The definition of the schema now and the upgrade steps required to reach it do not necessarily stay the same.