Replaced more macros in the z80.
Replaced more macros in the z80.