Tweak variable ordering to play nicer w/gcc register allocation