Combine old & new arch files into a single file

[joeyballentine]

I figure I can reduce code duplication by simply passing in a flag/enum into the arch code and changing what keys the VariableBuilder uses based on that.