Fix our MacroAssembler to use the macro assembler rather than assembler, ude to 'odd' offsets.