Had similar hair pulling experience with X32...  but sure, if you want to do it that way, I'll add in the version blocks for all architectures I expect to have support for over the next 3-4 months.