We have two options, we could either make a new "addressing" mode in both Air and MacroAssembler or we could just change the Air and make sure we vet all the existing cases.