[untested] Create a better variable order for XFAs

If you have comparisons (testnectr2) between two variables,
it will interleave those variables. Otherwise it won't. It
used to interleave everything.

This hasn't even been remotely tested yet.