More z80 macro removal.
Converted more macros.